diff --git a/CMakeLists.txt b/CMakeLists.txt
index 473c37c6e..4ef4a9e86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,7 +171,7 @@ option( BUILD_KAPPFINDER "Build kappfinder" ${BUILD_ALL} )
option( BUILD_KCHECKPASS "Build kcheckpass" ${BUILD_ALL} )
option( BUILD_KHELPCENTER "Build khelpcenter" ${BUILD_ALL} )
option( BUILD_KHOTKEYS "Build khotkeys" ${BUILD_ALL} )
-option( BUILD_KSCREENSAVER "Build kscreensaver" ${BUILD_ALL} )
+option( BUILD_KSCREENSAVER "Build tdescreensaver" ${BUILD_ALL} )
option( BUILD_KSTART "Build kstart" ${BUILD_ALL} )
option( BUILD_KSYSTRAYCMD "Build ksystraycmd" ${BUILD_ALL} )
option( BUILD_NSPLUGINS "Build nsplugins" ${BUILD_ALL} )
@@ -248,7 +248,7 @@ tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder )
tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass )
tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter )
tde_conditional_add_subdirectory( BUILD_KHOTKEYS khotkeys )
-tde_conditional_add_subdirectory( BUILD_KSCREENSAVER kscreensaver )
+tde_conditional_add_subdirectory( BUILD_KSCREENSAVER tdescreensaver )
tde_conditional_add_subdirectory( BUILD_KSTART kstart )
tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd )
tde_conditional_add_subdirectory( BUILD_NSPLUGINS nsplugins )
diff --git a/Makefile.am.in b/Makefile.am.in
index 15164399a..b6b018f2d 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = foreign 1.6.1
bin_SCRIPTS = starttde trinity migratekde3 r14-xdg-update
-EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd kscreensaver.pamd mkpamserv
+EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd tdescreensaver.pamd mkpamserv
dist-hook:
cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin
diff --git a/README b/README
index f6557fffb..8e5b89c7e 100644
--- a/README
+++ b/README
@@ -106,7 +106,7 @@ libraries. Here is an overview of the directories:
* krichtexteditor
A embeddable rich text editor and a wrapper application for it.
-* kscreensaver
+* tdescreensaver
The KDE screensaver environment and some basic screensavers. More
of them are in the tdeartwork package.
diff --git a/README.pam b/README.pam
index c7db9908a..38831e0cf 100644
--- a/README.pam
+++ b/README.pam
@@ -1,6 +1,6 @@
KDE can be configured to support the PAM ("Pluggable Authentication
Modules") system for password checking by the display manager tdm and
-by the screen saver kscreensaver (for unlocking the display).
+by the screen saver tdescreensaver (for unlocking the display).
PAM is a flexible application-transparent configurable user-authentication
system found on FreeBSD, Solaris, and Linux (and maybe other unixes).
@@ -27,26 +27,26 @@ By default, PAM is automatically used, if it is found. Use
If PAM is found, KDE usually uses the PAM service "kde". You may
override it for all KDE programs by using --with-pam= and/or
individually by using --with--pam=, where is
-one of tdm, kcp and kss (for tdm, kcheckpass and kscreensaver).
+one of tdm, kcp and kss (for tdm, kcheckpass and tdescreensaver).
"make install" will attempt to create suitable service definitions; either
by putting files into /etc/pam.d/ or by adding text to /etc/pam.conf. The
services are just copies of the "login" service.
You may want to edit these definitions to meet your needs.
There are also two example service definitions in this directory -
-kde.pamd and kscreensaver.pamd - but don't just copy them!
+kde.pamd and tdescreensaver.pamd - but don't just copy them!
If the services are misconfigured, you will NOT be able to login via TDM
and/or unlock a locked screen!
If there is ever any doubt about which PAM service a program was
compiled with, it can be determined by examining the PAM-generated
-entries in the system log associated with tdm logins or kscreensaver
+entries in the system log associated with tdm logins or tdescreensaver
authentication failures.
PAM configuration files have four types of entries for each service:
-type used by tdm used by kscreensaver
+type used by tdm used by tdescreensaver
---- ----------- --------------------
auth x x
account x
diff --git a/applnk/compat/konqhtml.desktop b/applnk/compat/konqhtml.desktop
index affe9e6a1..9556740b2 100644
--- a/applnk/compat/konqhtml.desktop
+++ b/applnk/compat/konqhtml.desktop
@@ -77,7 +77,7 @@ Name[zh_CN]=Konqueror 浏览器
Name[zh_TW]=Konqueror 網頁瀏覽器
Type=Application
Icon=fonts
-Exec=kcmshell khtml_fonts
+Exec=kcmshell tdehtml_fonts
X-TDE-ModuleType=Library
X-TDE-Library=konqhtml
-X-TDE-FactoryName=khtml_fonts
+X-TDE-FactoryName=tdehtml_fonts
diff --git a/applnk/tde-system-screensavers.directory b/applnk/tde-system-screensavers.directory
index f4c47d881..b6e23a727 100644
--- a/applnk/tde-system-screensavers.directory
+++ b/applnk/tde-system-screensavers.directory
@@ -82,7 +82,7 @@ Name[xh]=Abagcini Bekhusi
Name[zh_CN]=屏幕保护程序
Name[zh_TW]=螢幕保護程式
Name[zu]=Abagcini Besikrini
-Icon=kscreensaver
+Icon=tdescreensaver
X-TDE-BaseGroup=screensavers
Comment=Screen saver demos
diff --git a/config.h.cmake b/config.h.cmake
index b5433283c..f45626f48 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -88,7 +88,7 @@
// kcontrol/energy
#cmakedefine HAVE_DPMS 1
-// kdesktop, kcontrol/screensaver, kscreensaver
+// kdesktop, kcontrol/screensaver, tdescreensaver
#cmakedefine HAVE_GLXCHOOSEVISUAL 1
// kcontrol/crypto
diff --git a/configure.in.in b/configure.in.in
index bdad1ca08..f15f4ad4b 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -7,7 +7,7 @@ KDE_PASSWDLIBS
DEF_PAM_SERVICE(tdm, tdm, TDM)
DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS)
-DEF_PAM_SERVICE(kss, kscreensaver, KSCREENSAVER)
+DEF_PAM_SERVICE(kss, tdescreensaver, KSCREENSAVER)
dnl Checks for header files.
AC_HEADER_DIRENT
diff --git a/doc/faq/webbrowse.docbook b/doc/faq/webbrowse.docbook
index d1ee69240..bfa9b59cd 100644
--- a/doc/faq/webbrowse.docbook
+++ b/doc/faq/webbrowse.docbook
@@ -206,7 +206,7 @@ text->html in the tree view.
Click on the
Embedding tab. Make sure that Left Click
Action is set to Show file in embedded
-viewer, and that KHTML (khtml) is at the top
+viewer, and that KHTML (tdehtml) is at the top
of Services Preference Order.
diff --git a/doc/glossary/index.docbook b/doc/glossary/index.docbook
index 7032e511d..f8b7d46c2 100644
--- a/doc/glossary/index.docbook
+++ b/doc/glossary/index.docbook
@@ -33,7 +33,7 @@ Slave
&tde;
-
+ KPartsKParts is an embedding technology which allows &tde;
applications to embed other &tde; applications. For example, the text
@@ -41,7 +41,7 @@ Slave
&konqueror;
-
+ KSycocaKSycoca (&tde; System
Configuration Cache) is a
@@ -88,7 +88,7 @@ program and regenerates the
or all modules in
&kcontrol; are missing.KSycoca
+otherterm="gloss-tdesycoca">KSycoca
&kcontrol;
diff --git a/doc/glossary/tdeprintingglossary.docbook b/doc/glossary/tdeprintingglossary.docbook
index ac33e1943..2cc77e57f 100644
--- a/doc/glossary/tdeprintingglossary.docbook
+++ b/doc/glossary/tdeprintingglossary.docbook
@@ -1134,7 +1134,7 @@ now.
address gives administrative access to TDEPrint. Konqueror uses &tde;'s
famous "KParts" technology to achieve that.
IO Slave
- KParts
+ KParts
diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook
index a9aa9ab5a..26cc11ac5 100644
--- a/doc/kcontrol/filemanager/index.docbook
+++ b/doc/kcontrol/filemanager/index.docbook
@@ -29,7 +29,7 @@
&konqueror;'s file manager functionality.
&konqueror;'s web browser functionality has its own configuration
+url="help:/kcontrol/tdehtml/index.html">own configuration
modules.
diff --git a/doc/kcontrol/kcmcss/index.docbook b/doc/kcontrol/kcmcss/index.docbook
index 113c2fe19..8560fa8a7 100644
--- a/doc/kcontrol/kcmcss/index.docbook
+++ b/doc/kcontrol/kcmcss/index.docbook
@@ -45,7 +45,7 @@ tuned for accessibility purposes, especially for people with reduced
vision.
Your choices here affect every &tde; application that renders HTML
-with &tde;'s own renderer, which is called khtml. These include
+with &tde;'s own renderer, which is called tdehtml. These include
&kmail;, &khelpcenter; and of course &konqueror;. Choices here do not
affect other browsers such as &Netscape;.
diff --git a/doc/kcontrol/khtml/Makefile.am b/doc/kcontrol/khtml/Makefile.am
deleted file mode 100644
index c54c99e96..000000000
--- a/doc/kcontrol/khtml/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = kcontrol/khtml
diff --git a/doc/kcontrol/spellchecking/index.docbook b/doc/kcontrol/spellchecking/index.docbook
index 813aba96a..2893d750b 100644
--- a/doc/kcontrol/spellchecking/index.docbook
+++ b/doc/kcontrol/spellchecking/index.docbook
@@ -30,7 +30,7 @@
Spell CheckerThe configuration options available here are used by all &tde;
-applications that use &kspell;, which is a front end to
+applications that use &tdespell;, which is a front end to
ispell or aspell.
@@ -57,7 +57,7 @@ error.
Dictionary:Choose from the available dictionaries, which one to use for
-&kspell;.
+&tdespell;.
diff --git a/doc/kcontrol/khtml/CMakeLists.txt b/doc/kcontrol/tdehtml/CMakeLists.txt
similarity index 83%
rename from doc/kcontrol/khtml/CMakeLists.txt
rename to doc/kcontrol/tdehtml/CMakeLists.txt
index dda61f78d..b7e6bb6b7 100644
--- a/doc/kcontrol/khtml/CMakeLists.txt
+++ b/doc/kcontrol/tdehtml/CMakeLists.txt
@@ -9,4 +9,4 @@
#
#################################################
-tde_create_handbook( DESTINATION kcontrol/khtml )
+tde_create_handbook( DESTINATION kcontrol/tdehtml )
diff --git a/doc/kcontrol/tdehtml/Makefile.am b/doc/kcontrol/tdehtml/Makefile.am
new file mode 100644
index 000000000..07d632f49
--- /dev/null
+++ b/doc/kcontrol/tdehtml/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = kcontrol/tdehtml
diff --git a/doc/kcontrol/khtml/index.docbook b/doc/kcontrol/tdehtml/index.docbook
similarity index 99%
rename from doc/kcontrol/khtml/index.docbook
rename to doc/kcontrol/tdehtml/index.docbook
index 386df55fd..b8df24598 100644
--- a/doc/kcontrol/khtml/index.docbook
+++ b/doc/kcontrol/tdehtml/index.docbook
@@ -305,7 +305,7 @@ creates one.
-
+AdBlocK&konqueror; AdBlocK can be configured to replace or remove
diff --git a/doc/kcontrol/khtml/nsplugin.docbook b/doc/kcontrol/tdehtml/nsplugin.docbook
similarity index 100%
rename from doc/kcontrol/khtml/nsplugin.docbook
rename to doc/kcontrol/tdehtml/nsplugin.docbook
diff --git a/doc/konqueror/config.docbook b/doc/konqueror/config.docbook
index a8958166d..90a1a5212 100644
--- a/doc/konqueror/config.docbook
+++ b/doc/konqueror/config.docbook
@@ -48,7 +48,7 @@ position and icon size
Toolbars... option, which brings up the
Configure Toolbars dialog box. The Main and Extra Toolbars
are divided into sections, such as Main Toolbar <&konqueror;>, Main
-Toolbar <khtmlpart> and Extra Toolbar <khtmlsettingsplugin>. The
+Toolbar <tdehtmlpart> and Extra Toolbar <tdehtmlsettingsplugin>. The
number and type of these sections will depend on whether &konqueror; is in Web
Browser or File Manager mode and whether you have &konqueror; plugins
installed.
diff --git a/doc/userguide/groupware-kontact.docbook b/doc/userguide/groupware-kontact.docbook
index 445a26da5..8a1b81c00 100644
--- a/doc/userguide/groupware-kontact.docbook
+++ b/doc/userguide/groupware-kontact.docbook
@@ -242,7 +242,7 @@ class="username">groupware user (already previously
done!)
Create/configure an IMAP account in &kmail;
-for login as that userUse kresources to make
+for login as that userUse tderesources to make
&kontact; components work with data taken from IMAP
source
@@ -336,7 +336,7 @@ slow data updates.
Now we have to tell &kontact; to use IMAP as the
data source for it's various components. From the &kmenu;, choose
Run command, run kcmshell
-kresources. In the combo box select
+tderesources. In the combo box select
Contacts, then press the Add...
button, and choose Addressbook on IMAP Server via KMail. Then select that new line and
press Use as Standard button. Do the same for
diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook
index 6a49a129a..872191714 100644
--- a/doc/userguide/tde-for-admins.docbook
+++ b/doc/userguide/tde-for-admins.docbook
@@ -858,7 +858,7 @@ also unique per X-server display. The processes are:kdedGeneric service daemon.
-Triggers Sycoca database updates when
+Triggers Sycoca database updates when
needed
@@ -1819,14 +1819,14 @@ class="directory">$HOME/.trinity/share/applnk
(user specific). This is observed unless the .desktop file has a Categories= line. In that case the categories determine the location in the menu.
-
+KSycocaKSycoca caches menu structure and
information about all available applications. You can rebuild the
database with
kbuildsycoca. The database
which is built lives in /var/tmp/tdecache-${USER}/ksycoca.
+class="directory">/var/tmp/tdecache-${USER}/tdesycoca.
It is automatically updated by KDED,
checked during &tde; login, and KDED
watches for changes while logged in.
@@ -1839,7 +1839,7 @@ CheckSycoca=false
-To force regeneration, run touch $TDEDIR/share/services/update_ksycoca.
+To force regeneration, run touch $TDEDIR/share/services/update_tdesycoca.
@@ -2031,7 +2031,7 @@ shell_access=false
Since this affects the &tde; menu and the available applications, we
must force an update of the sycoca database:
-touch$TDEDIR/share/services/update_ksycoca
+touch$TDEDIR/share/services/update_tdesycocaNow re-login to &tde; and check the following points:
@@ -2488,7 +2488,7 @@ KDebug
MainApplication-Interface
konsole (default)
konsole-mainwindow#1
-ksycoca
+tdesycoca
session-1
session-2
session-3
diff --git a/doc/userguide/tde-office.docbook b/doc/userguide/tde-office.docbook
index 73e4cc313..28e089b3d 100644
--- a/doc/userguide/tde-office.docbook
+++ b/doc/userguide/tde-office.docbook
@@ -128,7 +128,7 @@ actually use the OASIS OpenDocument file format.
-
+
-
+
-
+
diff --git a/konqueror/kttsplugin/CMakeLists.txt b/konqueror/kttsplugin/CMakeLists.txt
index 80180aa8e..fc3f409fe 100644
--- a/konqueror/kttsplugin/CMakeLists.txt
+++ b/konqueror/kttsplugin/CMakeLists.txt
@@ -24,16 +24,16 @@ link_directories(
##### other data ################################
install( FILES
- khtmlkttsd.rc khtmlkttsd.desktop
- DESTINATION ${DATA_INSTALL_DIR}/khtml/kpartplugins )
+ tdehtmlkttsd.rc tdehtmlkttsd.desktop
+ DESTINATION ${DATA_INSTALL_DIR}/tdehtml/kpartplugins )
-##### libkhtmlkttsdplugin (module) ##############
+##### libtdehtmlkttsdplugin (module) ##############
-set( target libkhtmlkttsdplugin )
+set( target libtdehtmlkttsdplugin )
tde_add_kpart( ${target} AUTOMOC
- SOURCES khtmlkttsd.cpp
- LINK khtml-shared
+ SOURCES tdehtmlkttsd.cpp
+ LINK tdehtml-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/konqueror/kttsplugin/Makefile.am b/konqueror/kttsplugin/Makefile.am
index 580a18dcd..d82a56fc2 100644
--- a/konqueror/kttsplugin/Makefile.am
+++ b/konqueror/kttsplugin/Makefile.am
@@ -2,15 +2,15 @@ INCLUDES = $(all_includes)
METASOURCES = AUTO
# Install this plugin in the KDE modules directory
-kde_module_LTLIBRARIES = libkhtmlkttsdplugin.la
+kde_module_LTLIBRARIES = libtdehtmlkttsdplugin.la
-libkhtmlkttsdplugin_la_SOURCES = khtmlkttsd.cpp
-libkhtmlkttsdplugin_la_LIBADD = $(LIB_KHTML)
-libkhtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+libtdehtmlkttsdplugin_la_SOURCES = tdehtmlkttsd.cpp
+libtdehtmlkttsdplugin_la_LIBADD = $(LIB_KHTML)
+libtdehtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-pluginsdir = $(kde_datadir)/khtml/kpartplugins
-plugins_DATA = khtmlkttsd.rc khtmlkttsd.desktop
+pluginsdir = $(kde_datadir)/tdehtml/kpartplugins
+plugins_DATA = tdehtmlkttsd.rc tdehtmlkttsd.desktop
messages: rc.cpp
$(EXTRACTRC) *.rc > rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/khtmlkttsd.pot
+ $(XGETTEXT) *.cpp -o $(podir)/tdehtmlkttsd.pot
diff --git a/konqueror/kttsplugin/khtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp
similarity index 95%
rename from konqueror/kttsplugin/khtmlkttsd.cpp
rename to konqueror/kttsplugin/tdehtmlkttsd.cpp
index e832bd27a..80b756a8b 100644
--- a/konqueror/kttsplugin/khtmlkttsd.cpp
+++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp
@@ -13,12 +13,12 @@
* *
***************************************************************************/
-#include // this plugin applies to a khtml part
+#include // this plugin applies to a tdehtml part
#include
#include
#include
#include
-#include "khtmlkttsd.h"
+#include "tdehtmlkttsd.h"
#include
#include
#include
@@ -133,6 +133,6 @@ void KHTMLPluginKTTSD::slotReadOut()
}
}
-K_EXPORT_COMPONENT_FACTORY( libkhtmlkttsdplugin, KGenericFactory("khtmlkttsd") )
+K_EXPORT_COMPONENT_FACTORY( libtdehtmlkttsdplugin, KGenericFactory("tdehtmlkttsd") )
-#include "khtmlkttsd.moc"
+#include "tdehtmlkttsd.moc"
diff --git a/konqueror/kttsplugin/khtmlkttsd.desktop b/konqueror/kttsplugin/tdehtmlkttsd.desktop
similarity index 97%
rename from konqueror/kttsplugin/khtmlkttsd.desktop
rename to konqueror/kttsplugin/tdehtmlkttsd.desktop
index 5e8519eb3..35db3445c 100644
--- a/konqueror/kttsplugin/khtmlkttsd.desktop
+++ b/konqueror/kttsplugin/tdehtmlkttsd.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
-X-TDE-Library=libkhtmlkttsdplugin
+X-TDE-Library=libtdehtmlkttsdplugin
X-TDE-PluginInfo-Author=Olaf Schmidt
X-TDE-PluginInfo-Email=ojschmidt@kde.org
-X-TDE-PluginInfo-Name=khtmlkttsdplugin
+X-TDE-PluginInfo-Name=tdehtmlkttsdplugin
X-TDE-PluginInfo-Version=3.4
X-TDE-PluginInfo-Website=
X-TDE-PluginInfo-Category=Tools
diff --git a/konqueror/kttsplugin/khtmlkttsd.h b/konqueror/kttsplugin/tdehtmlkttsd.h
similarity index 97%
rename from konqueror/kttsplugin/khtmlkttsd.h
rename to konqueror/kttsplugin/tdehtmlkttsd.h
index cfe1e7d38..f42c9b03e 100644
--- a/konqueror/kttsplugin/khtmlkttsd.h
+++ b/konqueror/kttsplugin/tdehtmlkttsd.h
@@ -17,7 +17,7 @@
#ifndef KHTMLKTTSD_H
#define KHTMLKTTSD_H
-#include
+#include
class KURL;
class TDEInstance;
diff --git a/konqueror/kttsplugin/khtmlkttsd.rc b/konqueror/kttsplugin/tdehtmlkttsd.rc
similarity index 74%
rename from konqueror/kttsplugin/khtmlkttsd.rc
rename to konqueror/kttsplugin/tdehtmlkttsd.rc
index 388aec9e7..a06a29742 100644
--- a/konqueror/kttsplugin/khtmlkttsd.rc
+++ b/konqueror/kttsplugin/tdehtmlkttsd.rc
@@ -1,5 +1,5 @@
-
+
KWallet can be accessed from kcontrol, TDE's Control Center; from
there, simply go to Security & Privacy->TDE Wallet. For more
information on KWallet and on how to use it, check the handbook.