Initial kde-tde rename

13 files changed, 142 insertions, 142 deletions

diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/Makefile.am b/tde-i18n-en_GB/docs/kdebase/kdeprint/Makefile.am
index b93906d5126..3e8c74108df 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/Makefile.am
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/Makefile.am
@@ -1,4 +1,4 @@
 KDE_LANG = en_GB
 SUBDIRS = $(AUTODIRS)
-KDE_DOCS = kdeprint
+KDE_DOCS = tdeprint
 KDE_MANS = AUTO
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/Makefile.in b/tde-i18n-en_GB/docs/kdebase/kdeprint/Makefile.in
index 10eec897e86..e2adfc97181 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/Makefile.in
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/Makefile.in
@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-subdir = docs/kdebase/kdeprint
+subdir = docs/tdebase/tdeprint
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -162,7 +162,7 @@ kde_styledir = @kde_styledir@
 kde_templatesdir = @kde_templatesdir@
 kde_wallpaperdir = @kde_wallpaperdir@
 kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
+tdeinitdir = @tdeinitdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -188,7 +188,7 @@ KDE_LANG = en_GB
 #>- SUBDIRS = $(AUTODIRS)
 #>+ 1
 SUBDIRS =.
-KDE_DOCS = kdeprint
+KDE_DOCS = tdeprint
 KDE_MANS = AUTO
 #>- all: all-recursive
 #>+ 1
@@ -204,9 +204,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 #>- 	      exit 1;; \
 #>- 	  esac; \
 #>- 	done; \
-#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kdeprint/Makefile'; \
+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/tdeprint/Makefile'; \
 #>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/kdebase/kdeprint/Makefile
+#>- 	  $(AUTOMAKE) --gnu  docs/tdebase/tdeprint/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/kdebase/kdeprint/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/tdeprint/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kdeprint/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kdeprint/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/tdeprint/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/tdeprint/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) extensions.docboo
 docs-am: index.cache.bz2
 
 install-docs: docs-am install-nls
-	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint
 	@if test -f index.cache.bz2; then \
-	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/; \
-	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/; \
+	echo $(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint/; \
+	$(INSTALL_DATA) index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint/; \
 	elif test -f  $(srcdir)/index.cache.bz2; then \
-	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/; \
-	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/; \
+	echo $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint/; \
+	$(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint/; \
 	fi
-	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/common
-	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/common
+	-rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint/common
+	$(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint/common
 
 uninstall-docs:
-	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
+	-rm -rf $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint
 
 clean-docs:
 	-rm -f index.cache.bz2
@@ -554,15 +554,15 @@ clean-docs:
 
 #>+ 13
 install-nls:
-	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint
+	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint
 	@for base in extensions.docbook tech-overview.docbook highlights.docbook add-printer-wiz.docbook lpd.docbook lpr-bsd.docbook external-command.docbook cups-config.docbook index.docbook rlpr.docbook cupsoptions.docbook final-word.docbook lprng.docbook theory.docbook getting-started.docbook ; do \
-	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
-	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
+	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint/$$base ;\
+	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint/$$base ;\
 	done
 
 uninstall-nls:
 	for base in extensions.docbook tech-overview.docbook highlights.docbook add-printer-wiz.docbook lpd.docbook lpr-bsd.docbook external-command.docbook cups-config.docbook index.docbook rlpr.docbook cupsoptions.docbook final-word.docbook lprng.docbook theory.docbook getting-started.docbook ; do \
-	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdeprint/$$base ;\
+	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/tdeprint/$$base ;\
 	done
 
 
@@ -582,10 +582,10 @@ force-reedit:
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/kdebase/kdeprint/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/tdebase/tdeprint/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/kdebase/kdeprint/Makefile
-	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/kdebase/kdeprint/Makefile.in
+	  $(AUTOMAKE) --gnu  docs/tdebase/tdeprint/Makefile
+	cd $(top_srcdir) && perl ../scripts/admin/am_edit -p../scripts/admin docs/tdebase/tdeprint/Makefile.in
 
 
 #>+ 21
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/add-printer-wiz.docbook b/tde-i18n-en_GB/docs/kdebase/kdeprint/add-printer-wiz.docbook
index 5124dddaa9a..1ece07bc322 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/add-printer-wiz.docbook
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/add-printer-wiz.docbook
@@ -27,7 +27,7 @@
 
 <screenshot>
 <screeninfo
->The &kdeprint; wizard introduction screen</screeninfo>
+>The &tdeprint; wizard introduction screen</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsaddprinterwizard1.png"
@@ -125,14 +125,14 @@ format="PNG"/></imageobject>
 
 <screenshot>
 <screeninfo
->&kdeprint; wizard network scan</screeninfo>
+>&tdeprint; wizard network scan</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsaddprinterwizard3_networkscan.png"
 format="PNG"/></imageobject>
 <textobject>
 <phrase
->In the &kdeprint; wizard, you can enter network details directly, or you can scan the network automatically.</phrase
+>In the &tdeprint; wizard, you can enter network details directly, or you can scan the network automatically.</phrase
 ></textobject>
 </mediaobject>
 </screenshot>
@@ -152,7 +152,7 @@ format="PNG"/></imageobject>
 <para
 >In the case of <acronym
 >SMB</acronym
->, &kdeprint; will use the Samba utilities <command
+>, &tdeprint; will use the Samba utilities <command
 >nmblookup</command
 > and <command
 >smbclient</command
@@ -161,7 +161,7 @@ format="PNG"/></imageobject>
 <para
 >In the case of &IPP; (Port 631) and <acronym
 >TCP</acronym
-> Network/AppSocket (Port 9100) &kdeprint; will try to open the port and, if successful, send an <command
+> Network/AppSocket (Port 9100) &tdeprint; will try to open the port and, if successful, send an <command
 >ipp-get-printer-attribute</command
 > request to the printer. For newer &HP; printers the latter usually works, because they support both AppSocket and &IPP;.</para>
 
@@ -177,14 +177,14 @@ format="PNG"/></imageobject>
 
 <screenshot>
 <screeninfo
->&kdeprint; wizard network configuration dialogue</screeninfo>
+>&tdeprint; wizard network configuration dialogue</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="cupsaddprinterwizard4_networkscan_config.png"
 format="PNG"/></imageobject>
 <textobject>
 <phrase
->In the &kdeprint; wizard, you can enter parameters to have the wizard scan parts of your network.</phrase
+>In the &tdeprint; wizard, you can enter parameters to have the wizard scan parts of your network.</phrase
 ></textobject>
 </mediaobject>
 </screenshot>
@@ -204,7 +204,7 @@ format="PNG"/></imageobject>
 >database</quote
 > of available drivers on your system, select the manufacturer in the left part of the window first, then the device model in the right part. This split window shows all &PPD;s found by &CUPS; in its standard repository of installable &PPD;s. This repository normally is <filename class="directory"
 >/usr/share/cups/model/</filename
->. If you want your driver to be found automatically by &CUPS; and &kdeprint;, place it in there.</para>
+>. If you want your driver to be found automatically by &CUPS; and &tdeprint;, place it in there.</para>
 
 <!-- Insert Screenshot here:  -->
 
@@ -260,8 +260,8 @@ url="http://www.linuxprinting.org"
 </itemizedlist>
 
 <para
->And ask for help. At a later stage, a document detailing the differences between the different driver and &PPD; models will appear at <ulink url="http://kdeprint.sourceforge.net"
->http://kdeprint.sourceforge.net/</ulink
+>And ask for help. At a later stage, a document detailing the differences between the different driver and &PPD; models will appear at <ulink url="http://tdeprint.sourceforge.net"
+>http://tdeprint.sourceforge.net/</ulink
 > Watch out for this!</para>
 
 <para
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/cups-config.docbook b/tde-i18n-en_GB/docs/kdebase/kdeprint/cups-config.docbook
index 419111a86dd..5e6b8169168 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/cups-config.docbook
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/cups-config.docbook
@@ -14,7 +14,7 @@
 >ASCII</acronym
 > file with a syntax similar to the configuration file of the <application
 >Apache</application
-> web server. It is a good idea to create a backup copy, just in case something goes wrong with the configuration through &kdeprint;/&CUPS; Server Configuration dialogues:</para>
+> web server. It is a good idea to create a backup copy, just in case something goes wrong with the configuration through &tdeprint;/&CUPS; Server Configuration dialogues:</para>
 
 <screen
 ><userinput
@@ -57,7 +57,7 @@
 >Longer Help</title>
 
 <para
->For the best, most detailed and most recent information you should always refer to the original &CUPS; documentation. &CUPS; is, much like &kde; in a rapid development process. There are constantly new features being added. New features might for times be only configurable by directly editing the configuration files. The &kdeprint; &GUI; might not have caught up with &CUPS; development.</para>
+>For the best, most detailed and most recent information you should always refer to the original &CUPS; documentation. &CUPS; is, much like &kde; in a rapid development process. There are constantly new features being added. New features might for times be only configurable by directly editing the configuration files. The &tdeprint; &GUI; might not have caught up with &CUPS; development.</para>
 
 <para
 >Just in case you want to look at the original configuration files of your &CUPS; system -- they are here:</para>
@@ -245,12 +245,12 @@
 </variablelist>
 
 <para
->And finally, there will be a WebSite for &kdeprint; and related documentation, at <ulink url="http://kdeprint.sourceforge.net/"
-> http://kdeprint.sourceforge.net/</ulink
+>And finally, there will be a WebSite for &tdeprint; and related documentation, at <ulink url="http://tdeprint.sourceforge.net/"
+> http://tdeprint.sourceforge.net/</ulink
 ></para>
 
 <para
->In the next section I will step you through most of the configuration options of &kdeprint; with &CUPS;.</para>
+>In the next section I will step you through most of the configuration options of &tdeprint; with &CUPS;.</para>
 
 </sect1>
 <sect1 id="explaining-different-gui-elements">
@@ -596,7 +596,7 @@ format="PNG"/></imageobject>
 
 <note>
 <para
->Contrary to what the quickhelp suggests, it is also legal to send an email full of praise and enthusiasm about &CUPS; and &kdeprint; to the server administrator.</para>
+>Contrary to what the quickhelp suggests, it is also legal to send an email full of praise and enthusiasm about &CUPS; and &tdeprint; to the server administrator.</para>
 </note>
 </listitem>
 </varlistentry>
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/cupsoptions.docbook b/tde-i18n-en_GB/docs/kdebase/kdeprint/cupsoptions.docbook
index dd99dcad9fd..a6ecddc1ee0 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/cupsoptions.docbook
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/cupsoptions.docbook
@@ -3,14 +3,14 @@
 >&CUPS; options presently not available through &kcontrol;</title>
 
 <para
->This chapter gives you some hints about further configuration possibilities which may not be available through the &kdeprint; &GUI; interface to &CUPS;.</para>
+>This chapter gives you some hints about further configuration possibilities which may not be available through the &tdeprint; &GUI; interface to &CUPS;.</para>
 
 <sect1>
 <title
 >Overview of provided features</title>
 
 <para
->All of the most often used features and functions &CUPS; provides are supported in &kdeprint;.</para>
+>All of the most often used features and functions &CUPS; provides are supported in &tdeprint;.</para>
 
 <itemizedlist>
 <listitem>
@@ -43,10 +43,10 @@
 > if you are new to &CUPS;.</para>
 
 <para
->&CUPS; is accessible through other means than &kdeprint;: commandline and browser are two native &CUPS; interfaces. The many commandline utilities add up to the most complete control you have on &CUPS;. The web interface is only a subset of all available configuration or control options. </para>
+>&CUPS; is accessible through other means than &tdeprint;: commandline and browser are two native &CUPS; interfaces. The many commandline utilities add up to the most complete control you have on &CUPS;. The web interface is only a subset of all available configuration or control options. </para>
 
 <para
->This is also true for &kdeprint;. Generally, as &CUPS; develops, most new features will first be implemented through the commandline. Be sure to check the latest versions of the man pages for &CUPS; to stay up-to-date with new features after you install a new version.</para>
+>This is also true for &tdeprint;. Generally, as &CUPS; develops, most new features will first be implemented through the commandline. Be sure to check the latest versions of the man pages for &CUPS; to stay up-to-date with new features after you install a new version.</para>
 
 <tip>
 <para
@@ -110,7 +110,7 @@ filter (1)        - cups file conversion filter interfaces
 
 <sect1 id="tips-and-tricks-for-cups">
 <title
->Outside &kdeprint;: Hints &amp; Tips Tricks with &CUPS; on the Commandline</title>
+>Outside &tdeprint;: Hints &amp; Tips Tricks with &CUPS; on the Commandline</title>
 
 <para
 >Here are a few examples of options that are presently only available if you use the commandline. </para>
@@ -478,10 +478,10 @@ filter (1)        - cups file conversion filter interfaces
 </sect1>
 <sect1 id="troubleshooting-cups">
 <title
->Troubleshooting &CUPS; in &kdeprint;</title>
+>Troubleshooting &CUPS; in &tdeprint;</title>
 
 <para
->This section of the &kdeprint; Handbook will live from the readers' feedback. Here is just a small beginning.</para>
+>This section of the &tdeprint; Handbook will live from the readers' feedback. Here is just a small beginning.</para>
 
 <sect2>
 <title
@@ -886,7 +886,7 @@ filter (1)        - cups file conversion filter interfaces
 >ImplicitClasses On</quote
 > activated, &CUPS; tries to stuff all printers it sees on the network into a <quote
 >Class</quote
-> name lp. All jobs destined to lp are sent to this class and the first available member prints it. So if you had this nice fellow (who listened closely when you raved about &CUPS; and &kdeprint;) install &CUPS; and poke around the system...get the idea?</para>
+> name lp. All jobs destined to lp are sent to this class and the first available member prints it. So if you had this nice fellow (who listened closely when you raved about &CUPS; and &tdeprint;) install &CUPS; and poke around the system...get the idea?</para>
 
 <para
 >Take my advice: choose a unique name for any network printer! (Mind you, the one on your parallel port also turns out to be a network printer for the rest of the world if you don't take care of your settings).</para>
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/extensions.docbook b/tde-i18n-en_GB/docs/kdebase/kdeprint/extensions.docbook
index 275a933fb47..8d1feffc7ba 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/extensions.docbook
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/extensions.docbook
@@ -1,6 +1,6 @@
 <chapter id="extensions-to-all-printsubsystems">
 <title
->&kdeprint; Extensions To All Print Subsystems</title>
+>&tdeprint; Extensions To All Print Subsystems</title>
 
 <sect1>
 <title
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/final-word.docbook b/tde-i18n-en_GB/docs/kdebase/kdeprint/final-word.docbook
index 36028488805..7fb084fd0e4 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/final-word.docbook
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/final-word.docbook
@@ -50,7 +50,7 @@
 >kups</application
 > and <application
 >qtcups</application
->, the predecessors of &kdeprint;</para>
+>, the predecessors of &tdeprint;</para>
 </listitem>
 <listitem>
 <para
@@ -85,7 +85,7 @@
 >Caveats</title>
 
 <para
->&kdeprint; has been developed on a system using &CUPS; 1.1.6. &kdeprint; has been tested on other versions of &CUPS; and so far no incompatibilities are known. By the time of writing this Handbook, &CUPS; 1.1.9 is out with a few new features not yet supported by &kdeprint;. Of course you are able to access these features, but you will need to bypass &kdeprint; and use the &CUPS; command-line tools or edit configuration files manually. &kdeprint;'s development will go on and this Handbook strives to always be the best available user documentation resource for it.</para>
+>&tdeprint; has been developed on a system using &CUPS; 1.1.6. &tdeprint; has been tested on other versions of &CUPS; and so far no incompatibilities are known. By the time of writing this Handbook, &CUPS; 1.1.9 is out with a few new features not yet supported by &tdeprint;. Of course you are able to access these features, but you will need to bypass &tdeprint; and use the &CUPS; command-line tools or edit configuration files manually. &tdeprint;'s development will go on and this Handbook strives to always be the best available user documentation resource for it.</para>
 
 </sect1>
 
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/getting-started.docbook b/tde-i18n-en_GB/docs/kdebase/kdeprint/getting-started.docbook
index 71f16e0b030..e39ba2627c9 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/getting-started.docbook
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/getting-started.docbook
@@ -3,14 +3,14 @@
 >Getting Started</title>
 
 <para
->This chapter of the &kdeprint; Handbook will walk you through most of the configuration or selection options of &kdeprint;. It will mainly deal with &CUPS; in this version, as the author is most familiar with it, and also because &kdeprint; started off with supporting &CUPS; best. Later versions of the &kdeprint; software and editions of this handbook will support and explore other printing systems more closely.</para>
+>This chapter of the &tdeprint; Handbook will walk you through most of the configuration or selection options of &tdeprint;. It will mainly deal with &CUPS; in this version, as the author is most familiar with it, and also because &tdeprint; started off with supporting &CUPS; best. Later versions of the &tdeprint; software and editions of this handbook will support and explore other printing systems more closely.</para>
 
 <sect1 id="selecting-your-print-subsystem">
 <title
 >Selecting Your Print Subsystem</title>
 
 <para
->You need to define your print subsystem, before you are able to install any printer with the &kdeprint; framework. There are two areas where you can define this: either in &kcontrol; (The <guilabel
+>You need to define your print subsystem, before you are able to install any printer with the &tdeprint; framework. There are two areas where you can define this: either in &kcontrol; (The <guilabel
 >Printing Manager</guilabel
 > section), or directly and <quote
 >on the fly</quote
@@ -66,7 +66,7 @@
 >Of course, the chosen system must be installed, and up and running on your box prior to your selection, or before it takes effect. </para>
 
 <para
->On it's first startup, &kdeprint; will try an autodetection. This only works for:</para>
+>On it's first startup, &tdeprint; will try an autodetection. This only works for:</para>
 
 <itemizedlist>
 <listitem>
@@ -96,16 +96,16 @@ alternatives:
 
 <para
 >Once autodetected, chosen, or changed, the active print subsystem will take effect for all &kde; applications. Different users may have different print subsystems in use, if those do exist on the computer and are compliant with each other. Their settings are stored in the <filename
->kdeprintrc</filename
+>tdeprintrc</filename
 >. This file is unique to every user, and is normally installed in <filename
 >$<envar
 >HOME</envar
->/.kde/share/config/kdeprintrc</filename
+>/.kde/share/config/tdeprintrc</filename
 >.</para>
 
 <warning>
 <para
->This file is not intended to be directly editable, and all available options can be set from the &kdeprint; &GUI;.</para>
+>This file is not intended to be directly editable, and all available options can be set from the &tdeprint; &GUI;.</para>
 </warning>
 
 <para
@@ -118,7 +118,7 @@ alternatives:
 >Working with the Printing Manager</title>
 
 <para
->Once you have chosen your preferred and installed print subsystem, you are ready to investigate, configure administer and work with this system through the &kdeprint; framework.</para>
+>Once you have chosen your preferred and installed print subsystem, you are ready to investigate, configure administer and work with this system through the &tdeprint; framework.</para>
 
 <para
 >Navigate to <menuchoice
@@ -175,10 +175,10 @@ choices at your fingertips than with any other printing
 system. &CUPS; is new to most Linux users (even the senior
 hackers amongst us), and it is quite easy to use. But it
 is at the same time very different from other printing systems.
-Therfor the &CUPS; part in the &kdeprint; Handbook is naturally
+Therfor the &CUPS; part in the &tdeprint; Handbook is naturally
 the most detailed.
 
-Future editions of the &kdeprint; handbook will describe in
+Future editions of the &tdeprint; handbook will describe in
 more detail the other systems.
 -->       
 
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/highlights.docbook b/tde-i18n-en_GB/docs/kdebase/kdeprint/highlights.docbook
index 26466730066..38e6cc497e8 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/highlights.docbook
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/highlights.docbook
@@ -1,9 +1,9 @@
-<chapter id="kdeprint-highlights">
+<chapter id="tdeprint-highlights">
 <title
->&kdeprint;'s Highlights</title>
+>&tdeprint;'s Highlights</title>
 
 <para
->The new &kdeprint; system includes more than one highlight. Having worked in an environment in the past that is not exactly sophisticated, as far as printing is concerned, take a look at some of the benefits that come with &kdeprint;</para>
+>The new &tdeprint; system includes more than one highlight. Having worked in an environment in the past that is not exactly sophisticated, as far as printing is concerned, take a look at some of the benefits that come with &tdeprint;</para>
 
 <sect1 id="add-printer-wizard">
 <title
@@ -12,12 +12,12 @@
 > Wizard</title>
 
 <para
->&kdeprint; has an <quote
+>&tdeprint; has an <quote
 >Add Printer Wizard</quote
 >. The Add Printer Wizard helps you with adding and configuring a new printer. Of course, you may do this manually as well.</para>
 
 <para
->&kdeprint; helps you <quote
+>&tdeprint; helps you <quote
 >discover</quote
 > printers. It is able to scan the environment for available devices and queues. This works for network connections using <acronym
 >TCP</acronym
@@ -89,22 +89,22 @@
 </itemizedlist>
 
 <para
->A screenshot of the &kdeprint; PrintJob Viewer shows the information you get: Job-ID, target printer, job name, job owner, job status and job size. In the next &kdeprint; release you will also see information about the number of pages (as &CUPS; calculates it; see chapter on page accounting for more information about its merits and limitations).</para>
+>A screenshot of the &tdeprint; PrintJob Viewer shows the information you get: Job-ID, target printer, job name, job owner, job status and job size. In the next &tdeprint; release you will also see information about the number of pages (as &CUPS; calculates it; see chapter on page accounting for more information about its merits and limitations).</para>
 
 <screenshot>
 <screeninfo
->A screenshot of the &kdeprint; PrintJob Viewer</screeninfo>
+>A screenshot of the &tdeprint; PrintJob Viewer</screeninfo>
 <mediaobject>
 <imageobject>
-<imagedata fileref="kdeprint-jobviewer.png" format="PNG"/>
+<imagedata fileref="tdeprint-jobviewer.png" format="PNG"/>
 </imageobject>
 <textobject>
 <phrase
->Here's a screenshot of the &kdeprint; PrintJob Viewer.</phrase>
+>Here's a screenshot of the &tdeprint; PrintJob Viewer.</phrase>
 </textobject>
 <caption
 ><para
->A screenshot of the &kdeprint; PrintJob Viewer.</para
+>A screenshot of the &tdeprint; PrintJob Viewer.</para
 ></caption>
 </mediaobject>
 </screenshot>
@@ -139,7 +139,7 @@
 </imageobject>
 <textobject>
 <phrase
->Here's a screenshot of the &kdeprint; PrintJob Viewer.</phrase>
+>Here's a screenshot of the &tdeprint; PrintJob Viewer.</phrase>
 </textobject>
 </mediaobject>
 </screenshot>
@@ -151,7 +151,7 @@
 >Modules for different print subsystems</title>
 
 <para
->&kdeprint; uses different modules to realise the interface to the possible print subsystems. Not all the modules are yet developed fully, but you will have basic printing functionality with:</para>
+>&tdeprint; uses different modules to realise the interface to the possible print subsystems. Not all the modules are yet developed fully, but you will have basic printing functionality with:</para>
 
 <itemizedlist>
 <listitem>
@@ -198,25 +198,25 @@
 > may be available later.</para>
 
 <para
->&kdeprint; makes &kde; much more flexible. It gives freedom of choice to &kde; 2.2 users. To use different available print subsystems, these must, of course, be installed independently from &kde;. In former versions, users were stuck with the old <acronym
+>&tdeprint; makes &kde; much more flexible. It gives freedom of choice to &kde; 2.2 users. To use different available print subsystems, these must, of course, be installed independently from &kde;. In former versions, users were stuck with the old <acronym
 >LPD</acronym
 > style print subsystems. Now they can even use &CUPS;. In the future, there will be easy integration of new subsystems, as they appear on the scene.</para>
 
 </sect1>
 
-<sect1 id="kdeprint-goodies">
+<sect1 id="tdeprint-goodies">
 <title
->More &kdeprint; <quote
+>More &tdeprint; <quote
 >Goodies</quote
 ></title>
 <subtitle
 >Benefitting all Print SubSystems.</subtitle>
 
 <para
->Some specific features of &kdeprint; depend on the chosen print subsystem. This dependency might exist because those features are only implemented there; remember, &kdeprint; is an intermediate layer between &kde; applications, and the print subsystem, but it's no replacement for any print subsystem by itself. Such dependency may exist for another reason: that &kdeprint; has not yet implemented an interface to all the features of all the subsystems.</para>
+>Some specific features of &tdeprint; depend on the chosen print subsystem. This dependency might exist because those features are only implemented there; remember, &tdeprint; is an intermediate layer between &kde; applications, and the print subsystem, but it's no replacement for any print subsystem by itself. Such dependency may exist for another reason: that &tdeprint; has not yet implemented an interface to all the features of all the subsystems.</para>
 
 <para
->Other features include benefits from &kdeprint; that are independent of the chosen print subsystem, and are available with all of them. At present there are <quote
+>Other features include benefits from &tdeprint; that are independent of the chosen print subsystem, and are available with all of them. At present there are <quote
 >special</quote
 > or <quote
 >virtual</quote
@@ -243,7 +243,7 @@
 ></term>
 <listitem>
 <para
->Amongst these additional &kdeprint; features are a few <quote
+>Amongst these additional &tdeprint; features are a few <quote
 >special</quote
 > or <quote
 >virtual</quote
@@ -322,7 +322,7 @@
 ></term>
 <listitem>
 <para
->&kdeprint; provides you with a framework to define and configure your own <quote
+>&tdeprint; provides you with a framework to define and configure your own <quote
 >pre-filters</quote
 >. These pre-filters may take effect <emphasis
 >before</emphasis
@@ -362,7 +362,7 @@
 >XML</acronym
 > files. This makes an extension of the concept very easy for experienced developers, but end-user configuration is also done through an intuitive graphical user interface. So, fear not, you don't need to learn <acronym
 >XML</acronym
-> because of &kdeprint;!</para>
+> because of &tdeprint;!</para>
 
 <variablelist>
 <varlistentry>
@@ -372,7 +372,7 @@
 ></term>
 <listitem>
 <para
->This is a predefined filter that installs with &kdeprint;. It allows you to create a modified &PostScript; output, from &PostScript; input, that prints 1, 2, or 4 logical pages on a single sheet of paper.</para>
+>This is a predefined filter that installs with &tdeprint;. It allows you to create a modified &PostScript; output, from &PostScript; input, that prints 1, 2, or 4 logical pages on a single sheet of paper.</para>
 </listitem>
 </varlistentry>
 
@@ -383,7 +383,7 @@
 ></term>
 <listitem>
 <para
->This is a predefined filter that installs with &kdeprint;. It allows you to create &PostScript; output from any text file input, that includes syntax highlighting for program listings, pretty-printing, and nice configurable page frames and headers.</para>
+>This is a predefined filter that installs with &tdeprint;. It allows you to create &PostScript; output from any text file input, that includes syntax highlighting for program listings, pretty-printing, and nice configurable page frames and headers.</para>
 </listitem>
 </varlistentry>
 
@@ -421,16 +421,16 @@
 </sect1>
 <sect1 id="cups-plugin">
 <title
->&CUPS; Support: the Most Important Module in &kdeprint;</title>
+>&CUPS; Support: the Most Important Module in &tdeprint;</title>
 
 <para
->&kdeprint; contains a module for &CUPS;. &CUPS;, the <quote
+>&tdeprint; contains a module for &CUPS;. &CUPS;, the <quote
 >Common &UNIX; Printing System</quote
 > (<ulink url="http://www.cups.org"
 >http://www.cups.org/</ulink
 >), is the most advanced, powerful and flexible of all print subsystems on &UNIX; and other &UNIX;-like operating systems. It is still quite new on the horizon, but is based on <acronym
 >IPP</acronym
->, the Internet Printing Protocol, the newly emerging standard for the future of network printing. &CUPS; is clearly the print system of choice for Michael Goffioul, the principal &kdeprint; developer.</para>
+>, the Internet Printing Protocol, the newly emerging standard for the future of network printing. &CUPS; is clearly the print system of choice for Michael Goffioul, the principal &tdeprint; developer.</para>
 
 <para
 >Experienced &kde; users may already be familiar with Michael's utilities <application
@@ -472,10 +472,10 @@
 
 <sect2>
 <title
->&kdeprint; &mdash; The Heir</title>
+>&tdeprint; &mdash; The Heir</title>
 
 <para
->The &CUPS; Module in &kdeprint; now contains all (and more) functions that were provided by <application
+>The &CUPS; Module in &tdeprint; now contains all (and more) functions that were provided by <application
 >qtcups</application
 > and <application
 >kups</application
@@ -493,7 +493,7 @@
 > from now on. </para>
 
 <para
->The &kdeprint; module for &CUPS; also lets you fully administer the print subsystem, just like <application
+>The &tdeprint; module for &CUPS; also lets you fully administer the print subsystem, just like <application
 >kups</application
 > did before. It can start, stop and configure your &CUPS; daemon. It can also start, stop, add and delete <quote
 >printers</quote
@@ -508,7 +508,7 @@
 >&kprinter; &mdash; Graphical Print Command</title>
 
 <para
->&kdeprint;'s &CUPS; module gives you access to a <quote
+>&tdeprint;'s &CUPS; module gives you access to a <quote
 >graphical print command</quote
 >, like <application
 >qtcups</application
@@ -636,14 +636,14 @@ format="PNG"/></imageobject>
 >Plans for Future Development</title>
 
 <para
->What you have now is the first, already very feature-rich version of &kdeprint;. This version is, of course, fully usable for printing. You might even think that <quote
+>What you have now is the first, already very feature-rich version of &tdeprint;. This version is, of course, fully usable for printing. You might even think that <quote
 >it was never so easy</quote
 > (not even back in the days when you had to use &Microsoft; &Windows;).</para>
 
 <para
->In the future, &kdeprint; will become even better. It will do a better job of <quote
+>In the future, &tdeprint; will become even better. It will do a better job of <quote
 >detecting</quote
-> your installed print subsystem itself. Already &kdeprint; is doing quite well in automatically sensing if you have &CUPS; on your system. But in many cases you will have to tell &kdeprint; what you are using, if you want to keep a legacy print system.</para>
+> your installed print subsystem itself. Already &tdeprint; is doing quite well in automatically sensing if you have &CUPS; on your system. But in many cases you will have to tell &tdeprint; what you are using, if you want to keep a legacy print system.</para>
 
 <para
 >The most important improvement in the near future will be a completion of the <application
@@ -688,7 +688,7 @@ format="PNG"/></imageobject>
 
 <para
 >Please contact Michael Goffioul at <email
->kdeprint@swing.be</email
+>tdeprint@swing.be</email
 > with any further user or developer suggestions.</para>
 
 </sect1>
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/index.docbook b/tde-i18n-en_GB/docs/kdebase/kdeprint/index.docbook
index 07ace5776b2..a698731bc99 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/index.docbook
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/index.docbook
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" 
 "dtd/kdex.dtd" [
-  <!ENTITY kdeprint "<application
+  <!ENTITY tdeprint "<application
 >KDEPrint</application
 >">
   <!ENTITY kprinter "<command
@@ -34,7 +34,7 @@
   <!ENTITY external-command-doc SYSTEM "external-command.docbook">
   <!ENTITY extensions-doc SYSTEM "extensions.docbook">
   <!ENTITY final-word-doc SYSTEM "final-word.docbook">
-  <!ENTITY kappname "&kdeprint;"
+  <!ENTITY kappname "&tdeprint;"
 ><!-- replace kapp here -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % British-English "INCLUDE"
@@ -45,7 +45,7 @@
   
 <bookinfo>
 <title
->The &kdeprint; Handbook</title>
+>The &tdeprint; Handbook</title>
 
 <authorgroup>
 <author
@@ -69,7 +69,7 @@
 > <affiliation
 > <address
 ><email
->kdeprint@swing.be</email
+>tdeprint@swing.be</email
 ></address>
 </affiliation>
 <contrib
@@ -126,16 +126,16 @@
 
 <abstract>
 <para
->This handbook describes &kdeprint;. &kdeprint; is not a standalone program. It is the new printing framework for &kde; 2.2. &kdeprint; is an intermediate layer between &kde; (or other) applications and the selected (and installed) print subsystem of your OS (&OS;).</para>
+>This handbook describes &tdeprint;. &tdeprint; is not a standalone program. It is the new printing framework for &kde; 2.2. &tdeprint; is an intermediate layer between &kde; (or other) applications and the selected (and installed) print subsystem of your OS (&OS;).</para>
 </abstract>
 
 <keywordset>
 <keyword
 >KDE</keyword>
 <keyword
->kdebase</keyword>
+>tdebase</keyword>
 <keyword
->kdeprint</keyword>
+>tdeprint</keyword>
 <keyword
 >print</keyword>
 <keyword
@@ -153,13 +153,13 @@
 >Introduction</title>
 
 <para
->This handbook describes &kdeprint;. &kdeprint; is not a standalone program. It is the new printing framework for &kde; 2.2. &kdeprint; is an intermediate layer between &kde; (or other) applications and the selected (and installed) print subsystem of your OS (&OS;).</para>
+>This handbook describes &tdeprint;. &tdeprint; is not a standalone program. It is the new printing framework for &kde; 2.2. &tdeprint; is an intermediate layer between &kde; (or other) applications and the selected (and installed) print subsystem of your OS (&OS;).</para>
 
 <para
 >It should be noted that both the developer of this application, and the author of this document are most familiar with &CUPS; as a printing system. At the time of writing, &CUPS; is the best supported printing subsystem, and it is the best documented.</para>
 
 <para
->This handbook is a work in progress, and later versions of the &kdeprint; software and editions of this handbook will support and explore more closely other printing systems.</para>
+>This handbook is a work in progress, and later versions of the &tdeprint; software and editions of this handbook will support and explore more closely other printing systems.</para>
 
 <para
 >In the meantime, even if your printing subsystem is not yet well covered, you are encouraged to explore the <guilabel
@@ -183,7 +183,7 @@
 ><guilabel
 >Printing Manager</guilabel
 ></menuchoice
-> and select your subsystem. Or you can let &kdeprint; try to determine it... </para>
+> and select your subsystem. Or you can let &tdeprint; try to determine it... </para>
 
 <screenshot>
 <screeninfo
@@ -239,8 +239,8 @@ format="PNG"/></imageobject>
 >Credits And Licences</title>
 
 <para
->&kdeprint; copyright 2001, Michael Goffioul <email
->kdeprint@swing.be</email
+>&tdeprint; copyright 2001, Michael Goffioul <email
+>tdeprint@swing.be</email
 ></para>
 &underGPL; <para
 >Documentation copyright 2001, Kurt Pfeifle, <email
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/lprng.docbook b/tde-i18n-en_GB/docs/kdebase/kdeprint/lprng.docbook
index 926cc08a8fe..193747db5f2 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/lprng.docbook
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/lprng.docbook
@@ -7,6 +7,6 @@
 <para
 >An <application
 >LPRng</application
-> module for &kdeprint; is in development, and hopefully available for the &kde; 2.3 release.</para>
+> module for &tdeprint; is in development, and hopefully available for the &kde; 2.3 release.</para>
 
 </chapter>
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/tech-overview.docbook b/tde-i18n-en_GB/docs/kdebase/kdeprint/tech-overview.docbook
index 774f741317e..026acc700ec 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/tech-overview.docbook
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/tech-overview.docbook
@@ -3,30 +3,30 @@
 >Technical Overview</title>
 
 <para
->This chapter aims to give a technical overview of &kdeprint; which non-programmers can comprehend.</para>
+>This chapter aims to give a technical overview of &tdeprint; which non-programmers can comprehend.</para>
 
 <para
->&kdeprint; is a new and revolutionary tool to give easy access to printing services for both &kde; users and &kde; developers.</para>
+>&tdeprint; is a new and revolutionary tool to give easy access to printing services for both &kde; users and &kde; developers.</para>
 
 <sect1 id="brief-description">
 <title
->A Brief Description of &kdeprint;</title>
+>A Brief Description of &tdeprint;</title>
 
 <para
->You can access the functions of &kdeprint; in different ways: through the Printing Manger in the &kcontrol;, through the <command
+>You can access the functions of &tdeprint; in different ways: through the Printing Manger in the &kcontrol;, through the <command
 >kprinter</command
 > command or through the dialogue that pops up if you want to print.</para>
 
-<sect2 id="what-kdeprint-is-not">
+<sect2 id="what-tdeprint-is-not">
 <title
 >What it is <emphasis
 >not</emphasis
 ></title>
 
 <para
->&kdeprint; is <emphasis
+>&tdeprint; is <emphasis
 >not</emphasis
-> a replacement for the printing subsystem itself. &kdeprint; does <emphasis
+> a replacement for the printing subsystem itself. &tdeprint; does <emphasis
 >not</emphasis
 > therefore give provision for spooling, and it does <emphasis
 >not</emphasis
@@ -40,10 +40,10 @@
 >is</emphasis
 ></title>
 <para
->&kdeprint; is an intermediate layer between the spooling and the data processing print subsystem (as installed), and the application that seeks to print. &kdeprint; provides a common interface for &kde; developers and &kde; users, to various supported print subsystems. At the same time, it is customisable, and highly configurable.</para>
+>&tdeprint; is an intermediate layer between the spooling and the data processing print subsystem (as installed), and the application that seeks to print. &tdeprint; provides a common interface for &kde; developers and &kde; users, to various supported print subsystems. At the same time, it is customisable, and highly configurable.</para>
 
 <para
->&kdeprint; is easy to use for both &kde; developers and end-users. Developers can port their applications, with minimal changes, to use &kdeprint; instead of the old &Qt; print <quote
+>&tdeprint; is easy to use for both &kde; developers and end-users. Developers can port their applications, with minimal changes, to use &tdeprint; instead of the old &Qt; print <quote
 >system</quote
 >. Users can easily choose and configure their print subsystem.</para>
 
@@ -56,17 +56,17 @@
 
 <sect1 id="different-users">
 <title
->&kdeprint; -- Different Usage for Different People</title>
+>&tdeprint; -- Different Usage for Different People</title>
 
 <para
->&kdeprint; has different faces for different people.</para>
+>&tdeprint; has different faces for different people.</para>
 
 <sect2 id="what-users-can-do">
 <title
->What users and administrators can do with &kdeprint;</title>
+>What users and administrators can do with &tdeprint;</title>
 
 <para
->&kdeprint; allows users and/or administrators, depending on their rights, access to printing subsystems (&CUPS;, <acronym
+>&tdeprint; allows users and/or administrators, depending on their rights, access to printing subsystems (&CUPS;, <acronym
 >LPD</acronym
 >, <acronym
 >RLPR</acronym
@@ -74,12 +74,12 @@
 >LPRng</application
 >, <application
 >PDQ</application
-> &etc;) through a &kde; graphical user interface (&GUI;). Using &kdeprint;, they can print, administer jobs, printers and the printing daemon, all in a comfortable manner.</para>
+> &etc;) through a &kde; graphical user interface (&GUI;). Using &tdeprint;, they can print, administer jobs, printers and the printing daemon, all in a comfortable manner.</para>
 
 <para
 >Experienced users will like the capability to plug any working filter for the print data between the output of their application and the input, into the chosen print subsystem. Some examples for this already ship with <quote
 >plain vanilla</quote
-> &kdeprint;. Read on.</para>
+> &tdeprint;. Read on.</para>
 
 </sect2>
 
@@ -97,29 +97,29 @@
 >Line Printer Daemon</quote
 > (<acronym
 >LPD</acronym
->). The &kdeprint; library bases itself firmly on the more modern Common &UNIX; Printing System (&CUPS;), while at the same time keeping backward compatibility with <acronym
+>). The &tdeprint; library bases itself firmly on the more modern Common &UNIX; Printing System (&CUPS;), while at the same time keeping backward compatibility with <acronym
 >LPD</acronym
 > and other legacy, or less elaborate, print systems. It also <quote
 >leaves the door open</quote
 > for any new development that might occur.</para>
 
 <para
->For &kde; developers to use the new &kdeprint; class in their applications, they require only minimal changes to their code: for every call of <classname
+>For &kde; developers to use the new &tdeprint; class in their applications, they require only minimal changes to their code: for every call of <classname
 >QPrinter</classname
 >, they just need to change this to <classname
 >KPrinter</classname
->. Replacing one (!) letter in a few spots, and automatically they are done; their application can then use all of the features of the new &kdeprint; library.</para>
+>. Replacing one (!) letter in a few spots, and automatically they are done; their application can then use all of the features of the new &tdeprint; library.</para>
 
 <para
->More ambitious developers, or ones with special requirements, can do more: despite &kdeprint;'s feature-rich framework, they are still able to customise the print dialogue of their application by creating an additional <quote
+>More ambitious developers, or ones with special requirements, can do more: despite &tdeprint;'s feature-rich framework, they are still able to customise the print dialogue of their application by creating an additional <quote
 >Tab</quote
->, where their extensions to the standard &kdeprint; will feel right at home.</para>
+>, where their extensions to the standard &tdeprint; will feel right at home.</para>
 
 
 <para
->This last mentioned feature has not been used widely inside &kde; so far, as developers are not yet fully aware of &kdeprint;'s power. Expect more of this in the near future. One example I discovered is the &kcron; application. It lets you edit the crontab through a &GUI;. The developers have implemented a printing feature that lets you (or <systemitem class="username"
+>This last mentioned feature has not been used widely inside &kde; so far, as developers are not yet fully aware of &tdeprint;'s power. Expect more of this in the near future. One example I discovered is the &kcron; application. It lets you edit the crontab through a &GUI;. The developers have implemented a printing feature that lets you (or <systemitem class="username"
 >root</systemitem
->) choose if you want to print the whole of crontab (for all users) or just the part that is marked. You can see the effects on &kdeprint; in the following screenshots.</para>
+>) choose if you want to print the whole of crontab (for all users) or just the part that is marked. You can see the effects on &tdeprint; in the following screenshots.</para>
 
 <para
 >This shot shows a sample from the &kcron; utility. <screenshot>
@@ -142,23 +142,23 @@ format="PNG"/></imageobject>
 <para
 >The dialogue to configure &kcron;'s printing options: the additional tab titled <guilabel
 >Cron Options</guilabel
-> is from inside &kcron;, not &kdeprint;; it is a special extension added by the &kcron; developers for printing purposes, not originating from, but executed by &kdeprint;. Developers of other applications are free to implement their own goodies, if they feel need for it.</para>
+> is from inside &kcron;, not &tdeprint;; it is a special extension added by the &kcron; developers for printing purposes, not originating from, but executed by &tdeprint;. Developers of other applications are free to implement their own goodies, if they feel need for it.</para>
 
 
 <screenshot>
 <screeninfo
->&kcron;'s addition to the &kdeprint; dialogue.</screeninfo>
+>&kcron;'s addition to the &tdeprint; dialogue.</screeninfo>
 <mediaobject>
 <imageobject>
 <imagedata fileref="kprinter_with_kcron_developer_special.png"
 format="PNG"/></imageobject>
 <textobject>
 <phrase
->&kcron;'s addition to the &kdeprint; dialogue.</phrase
+>&kcron;'s addition to the &tdeprint; dialogue.</phrase
 ></textobject>
 <caption>
 <para
->&kcron;'s addition to the &kdeprint; dialogue.</para>
+>&kcron;'s addition to the &tdeprint; dialogue.</para>
 </caption>
 </mediaobject>
 </screenshot>
@@ -167,10 +167,10 @@ format="PNG"/></imageobject>
 
 <sect2>
 <title
->What &kdeprint; offers to everybody...</title>
+>What &tdeprint; offers to everybody...</title>
 
 <para
->&kdeprint;'s easy-to-use interface for all supported print subsystems of course does not eliminate basic traditional weaknesses of some of those systems. But it smooths some rough edges. Different users may use different printing systems on the same box. A user is free to even switch <quote
+>&tdeprint;'s easy-to-use interface for all supported print subsystems of course does not eliminate basic traditional weaknesses of some of those systems. But it smooths some rough edges. Different users may use different printing systems on the same box. A user is free to even switch <quote
 >on the fly</quote
 >, from the print dialogue, the print subsystem to be used for the next job. (This is possible if different systems are installed in a way that they don't <quote
 >get in each other's way</quote
@@ -186,7 +186,7 @@ format="PNG"/></imageobject>
 > lacks bi-directional communication, authentication, access control and encryption support.</para>
 
 <para
->&kdeprint; can use &CUPS; to support:</para>
+>&tdeprint; can use &CUPS; to support:</para>
 
 <itemizedlist>
 <listitem>
@@ -212,17 +212,17 @@ format="PNG"/></imageobject>
 </itemizedlist>
 
 <para
->This makes &kdeprint; a much more robust and reliable solution than using the venerable <acronym
+>This makes &tdeprint; a much more robust and reliable solution than using the venerable <acronym
 >LPD</acronym
 >.</para>
 
 </sect2>
 <sect2>
 <title
->How to access &kdeprint; </title>
+>How to access &tdeprint; </title>
 
 <para
->You get access to &kdeprint;, or parts of it, in four different ways:</para>
+>You get access to &tdeprint;, or parts of it, in four different ways:</para>
 
 <itemizedlist>
 <listitem
@@ -261,7 +261,7 @@ format="PNG"/></imageobject>
 ><guilabel
 >Printing Manager</guilabel
 ></menuchoice
->. This opens the &kdeprint; administration which is part of the &kcontrolcenter; and also lets you switch to other parts of the &kcontrol;</para
+>. This opens the &tdeprint; administration which is part of the &kcontrolcenter; and also lets you switch to other parts of the &kcontrol;</para
 ></listitem>
 
 <listitem
@@ -274,7 +274,7 @@ format="PNG"/></imageobject>
 > <option
 >printmgr</option
 ></userinput
->. This opens just the &kdeprint; part of &kcontrol; to change your settings </para
+>. This opens just the &tdeprint; part of &kcontrol; to change your settings </para
 ></listitem>
 </itemizedlist>
 <screenshot>
diff --git a/tde-i18n-en_GB/docs/kdebase/kdeprint/theory.docbook b/tde-i18n-en_GB/docs/kdebase/kdeprint/theory.docbook
index 77421885153..d39e0969f85 100644
--- a/tde-i18n-en_GB/docs/kdebase/kdeprint/theory.docbook
+++ b/tde-i18n-en_GB/docs/kdebase/kdeprint/theory.docbook
@@ -319,7 +319,7 @@ format="PNG"/></imageobject>
 >Where to get the &PPD;s for &PostScript; Printers</title>
 
 <para
->&PPD;s originally were not used routinely in &UNIX; and &Linux; systems. The vendors providing those &PPD;s never intended them for anything other than the originally supported &OS;s: &Microsoft; &Windows; and &MacOS;. Through its brilliant move to fully support and utilise the existing &PPD; specification, &CUPS; now gives the power to use all features of modern printers to users of &Linux; and &Linux;-like systems. &kdeprint; makes its usage even more comfortable than the &CUPS; developers ever dreamed of.</para>
+>&PPD;s originally were not used routinely in &UNIX; and &Linux; systems. The vendors providing those &PPD;s never intended them for anything other than the originally supported &OS;s: &Microsoft; &Windows; and &MacOS;. Through its brilliant move to fully support and utilise the existing &PPD; specification, &CUPS; now gives the power to use all features of modern printers to users of &Linux; and &Linux;-like systems. &tdeprint; makes its usage even more comfortable than the &CUPS; developers ever dreamed of.</para>
 
 <para
 >&CUPS; can use original &Windows; &PPD;s, distributed by the vendors in the case of &PostScript; printers. Those normally don't cost any money, and they can be grabbed from any &Windows; computer with an installed &PostScript; driver for the model concerned, or from the disks provided with the printer. There are also several places on the web to download them.</para>
@@ -545,7 +545,7 @@ format="PNG"/></imageobject>
 <para
 >&CUPS; is the most advanced implementation of &IPP; on all &OS;
 platforms.  That makes &CUPS; a crucial ally to help "conquer the
-desktop" for projects like &kde;. &kdeprint; is the best utility to
+desktop" for projects like &kde;. &tdeprint; is the best utility to
 make &CUPS; core functionality available to &kde; Desktop
 users.</para>