summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BibleTime.kdevelop4
-rw-r--r--ChangeLog2
-rw-r--r--INSTALL2
-rw-r--r--INSTALL.in2
-rw-r--r--Makefile.am4
-rw-r--r--acinclude.m4118
-rw-r--r--bibletime.spec2
-rw-r--r--bibletime.spec.in2
-rw-r--r--bibletime/Makefile.am2
-rw-r--r--bibletime/backend/btstringmgr.h2
-rw-r--r--bibletime/bibletime.cpp2
-rw-r--r--bibletime/bibletime_init.cpp4
-rw-r--r--bibletime/frontend/cbtconfig.cpp2
-rw-r--r--bibletime/frontend/display/chtmlreaddisplay.cpp2
-rw-r--r--bibletime/frontend/displaywindow/cbookreadwindow.cpp2
-rw-r--r--bibletime/frontend/displaywindow/cdisplaywindow.cpp2
-rw-r--r--bibletime/frontend/displaywindow/clexiconreadwindow.cpp2
-rw-r--r--pot/Makefile.am2
-rw-r--r--pot/extractrc2
-rw-r--r--pot/handbook.pot2
-rw-r--r--pot/howto.pot2
21 files changed, 82 insertions, 82 deletions
diff --git a/BibleTime.kdevelop b/BibleTime.kdevelop
index 7551f4b..360895f 100644
--- a/BibleTime.kdevelop
+++ b/BibleTime.kdevelop
@@ -1,5 +1,5 @@
<?xml version = '1.0'?>
-<kdevelop>
+<tdevelop>
<general>
<author>The BibleTime team</author>
<email>[email protected]</email>
@@ -244,4 +244,4 @@
<graphicFilter>-f0</graphicFilter>
<scaling>-1</scaling>
</kdevvisualadvance>
-</kdevelop>
+</tdevelop>
diff --git a/ChangeLog b/ChangeLog
index 1875636..b127d6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -856,7 +856,7 @@
1999-10-05 Joachim Ansorg <[email protected]>
*Added -lz to bibletime/Makefile.am to avoid compilation problems on RedHat 5.2 systems
*Added some needed icons and changed iconnames in the sourcecode
- *Solved some spelling errors in the CBugReportDlg and changed some kdevelop to bibletime in the class
+ *Solved some spelling errors in the CBugReportDlg and changed some tdevelop to bibletime in the class
*Now you can't print by pressing STRG+P if printing is disabled
1999-10-03 Joachim Ansorg <[email protected]>
diff --git a/INSTALL b/INSTALL
index 18c8db7..abd98bc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -7,7 +7,7 @@ case, please include your system's configuration details.
BibleTime 1.6.5.1 requires:
- - KDE >= 3.0 (at least the libraries (kdelibs) and the base package (kdebase))
+ - KDE >= 3.0 (at least the libraries (tdelibs) and the base package (tdebase))
Although BibleTime should compile and run with KDE 3.0-3.3, we strongly recommend
to use the latest version of KDE available for your Linux installation.
diff --git a/INSTALL.in b/INSTALL.in
index 5704784..ab58c09 100644
--- a/INSTALL.in
+++ b/INSTALL.in
@@ -7,7 +7,7 @@ case, please include your system's configuration details.
BibleTime @VERSION@ requires:
- - KDE >= 3.0 (at least the libraries (kdelibs) and the base package (kdebase))
+ - KDE >= 3.0 (at least the libraries (tdelibs) and the base package (tdebase))
Although BibleTime should compile and run with KDE 3.0-3.3, we strongly recommend
to use the latest version of KDE available for your Linux installation.
diff --git a/Makefile.am b/Makefile.am
index 9f40e2f..05ebb83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ KDE_OPTIONS = noautodist
SUBDIRS = bibletime pot docs .
EXTRA_DIST = \
-BibleTime.kdevelop \
+BibleTime.tdevelop \
LICENSE \
ChangeLog \
bibletime.spec.in bibletime.spec \
@@ -73,7 +73,7 @@ dist-hook:
# $(distdir)/bibletime.start $(distdir)/configure.files \
# $(distdir)/bibletime/pics/gen_am.sh
rm -rf $(distdir)/autom4te.cache
- rm -rf $(distdir)/BibleTime.kdevelop.pcs
+ rm -rf $(distdir)/BibleTime.tdevelop.pcs
rm -rf $(distdir)/docs/handbook/html/*.html
rm -rf $(distdir)/docs/howto/html/*.html
# rm -rf $(distdir)/BibleTime.tag
diff --git a/acinclude.m4 b/acinclude.m4
index f25372f..de13898 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository.
dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
+dnl Single-module modifications are best placed in configure.in for tdelibs
+dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X.
@@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
- /usr/X11/lib${kdelibsuff} \
- /usr/X11R6/lib${kdelibsuff} \
- /usr/X11R5/lib${kdelibsuff} \
- /usr/X11R4/lib${kdelibsuff} \
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
+ /usr/X11/lib${tdelibsuff} \
+ /usr/X11R6/lib${tdelibsuff} \
+ /usr/X11R5/lib${tdelibsuff} \
+ /usr/X11R4/lib${tdelibsuff} \
\
- /usr/lib${kdelibsuff}/X11 \
- /usr/lib${kdelibsuff}/X11R6 \
- /usr/lib${kdelibsuff}/X11R5 \
- /usr/lib${kdelibsuff}/X11R4 \
+ /usr/lib${tdelibsuff}/X11 \
+ /usr/lib${tdelibsuff}/X11R6 \
+ /usr/lib${tdelibsuff}/X11R5 \
+ /usr/lib${tdelibsuff}/X11R4 \
\
- /usr/local/X11/lib${kdelibsuff} \
- /usr/local/X11R6/lib${kdelibsuff} \
- /usr/local/X11R5/lib${kdelibsuff} \
- /usr/local/X11R4/lib${kdelibsuff} \
+ /usr/local/X11/lib${tdelibsuff} \
+ /usr/local/X11R6/lib${tdelibsuff} \
+ /usr/local/X11R5/lib${tdelibsuff} \
+ /usr/local/X11R4/lib${tdelibsuff} \
\
- /usr/local/lib${kdelibsuff}/X11 \
- /usr/local/lib${kdelibsuff}/X11R6 \
- /usr/local/lib${kdelibsuff}/X11R5 \
- /usr/local/lib${kdelibsuff}/X11R4 \
+ /usr/local/lib${tdelibsuff}/X11 \
+ /usr/local/lib${tdelibsuff}/X11R6 \
+ /usr/local/lib${tdelibsuff}/X11R5 \
+ /usr/local/lib${tdelibsuff}/X11R4 \
\
- /usr/X386/lib${kdelibsuff} \
- /usr/x386/lib${kdelibsuff} \
- /usr/XFree86/lib${kdelibsuff}/X11 \
+ /usr/X386/lib${tdelibsuff} \
+ /usr/x386/lib${tdelibsuff} \
+ /usr/XFree86/lib${tdelibsuff}/X11 \
\
- /usr/lib${kdelibsuff} \
- /usr/local/lib${kdelibsuff} \
- /usr/unsupported/lib${kdelibsuff} \
- /usr/athena/lib${kdelibsuff} \
- /usr/local/x11r5/lib${kdelibsuff} \
- /usr/lpp/Xamples/lib${kdelibsuff} \
- /lib/usr/lib${kdelibsuff}/X11 \
+ /usr/lib${tdelibsuff} \
+ /usr/local/lib${tdelibsuff} \
+ /usr/unsupported/lib${tdelibsuff} \
+ /usr/athena/lib${tdelibsuff} \
+ /usr/local/x11r5/lib${tdelibsuff} \
+ /usr/lpp/Xamples/lib${tdelibsuff} \
+ /lib/usr/lib${tdelibsuff}/X11 \
\
- /usr/openwin/lib${kdelibsuff} \
- /usr/openwin/share/lib${kdelibsuff} \
+ /usr/openwin/lib${tdelibsuff} \
+ /usr/openwin/share/lib${tdelibsuff} \
; \
do
dnl Don't even attempt the hair of trying to link an X program!
@@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
else
AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
+same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.])
fi
@@ -931,7 +931,7 @@ mips-sgi-irix6*)
ac_x_includes="."
fi
if test -z "$ac_x_libraries"; then
- ac_x_libraries="/usr/lib${kdelibsuff}"
+ ac_x_libraries="/usr/lib${tdelibsuff}"
fi
esac
#from now on we use our own again
@@ -1419,7 +1419,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include
- ac_qt_libraries="$withval"/lib${kdelibsuff}
+ ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin
])
@@ -1460,7 +1460,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs=""
for dir in $kde_qt_dirs; do
- qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
+ qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then
@@ -1645,11 +1645,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([
-you need to install kdelibs first.
+you need to install tdelibs first.
-If you did install kdelibs, then the Qt version that is picked up by
-this configure is not the same version you used to compile kdelibs.
-The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
+If you did install tdelibs, then the Qt version that is picked up by
+this configure is not the same version you used to compile tdelibs.
+The Qt Plugin installed by tdelibs is *ONLY* loadable if its the
same Qt version, compiled with the same compiler and the same Qt
configuration settings.
])
@@ -1806,8 +1806,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!])
fi
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
+test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir"
@@ -1825,7 +1825,7 @@ fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
+by tdelibs])
fi
if test -n "$kde_widgetdir"; then
@@ -1840,7 +1840,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi
-else dnl test -z $1, e.g. from kdelibs
+else dnl test -z $1, e.g. from tdelibs
ac_cv_have_kde="have_kde=no"
@@ -3291,29 +3291,29 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64],
[
- kdelibsuff="$kde_libs_suffix"
- if test -z "$kdelibsuff"; then
- kdelibsuff=no
+ tdelibsuff="$kde_libs_suffix"
+ if test -z "$tdelibsuff"; then
+ tdelibsuff=no
fi
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none[=default])]),
- kdelibsuff=$enableval)
+ tdelibsuff=$enableval)
# TODO: add an auto case that compiles a little C app to check
# where the glibc is
- if test "$kdelibsuff" = "no"; then
- kdelibsuff=
+ if test "$tdelibsuff" = "no"; then
+ tdelibsuff=
fi
- if test -z "$kdelibsuff"; then
+ if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else
if test "$libdir" = '${exec_prefix}/lib'; then
- libdir="$libdir${kdelibsuff}"
+ libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi
- AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories)
- AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
+ AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
+ AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi
])
@@ -4340,7 +4340,7 @@ fi
PYTHONINC=-I$python_incdir
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
+python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@@ -4728,7 +4728,7 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES)
])dnl
-dnl This sets the prefix, for arts and kdelibs
+dnl This sets the prefix, for arts and tdelibs
dnl Do NOT use in any other module.
dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE],
@@ -4775,9 +4775,9 @@ AC_DEFUN([KDE_SET_PREFIX],
kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
- AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
+ AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it.
- This won't work. Please recompile kdelibs for the new prefix.
+ This won't work. Please recompile tdelibs for the new prefix.
])
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@@ -5443,7 +5443,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include
- ac_ssl_libraries="$withval"/lib$kdelibsuff
+ ac_ssl_libraries="$withval"/lib$tdelibsuff
])
want_ssl=yes
@@ -5463,7 +5463,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
ac_ssl_includes="$ssl_incdir"
- ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
+ ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi
diff --git a/bibletime.spec b/bibletime.spec
index 82b16a6..8731725 100644
--- a/bibletime.spec
+++ b/bibletime.spec
@@ -35,7 +35,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}--rootbibletime
Prefix: /usr
Requires: sword >= 1.5.8
Distribution: %{ostype} %{osversion}
-BuildRequires: kdelibs-devel
+BuildRequires: tdelibs-devel
BuildRequires: sword-devel >= 1.5.8
%description
diff --git a/bibletime.spec.in b/bibletime.spec.in
index 232c275..8131fd8 100644
--- a/bibletime.spec.in
+++ b/bibletime.spec.in
@@ -35,7 +35,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}--rootbibletime
Prefix: @RPM_PREFIX@
Requires: sword >= 1.5.8
Distribution: %{ostype} %{osversion}
-BuildRequires: kdelibs-devel
+BuildRequires: tdelibs-devel
BuildRequires: sword-devel >= 1.5.8
%description
diff --git a/bibletime/Makefile.am b/bibletime/Makefile.am
index cce811d..7c2e7bd 100644
--- a/bibletime/Makefile.am
+++ b/bibletime/Makefile.am
@@ -60,7 +60,7 @@ bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP
DISTCLEANFILES = $(bibletime_METASOURCES)
# make messages.po. Move this one to ../po/ and "make merge" in po
-# the -x is for skipping messages already translated in kdelibs
+# the -x is for skipping messages already translated in tdelibs
#messages:
# $(XGETTEXT) -C -ki18n -x $(KDEDIR)/include/kde.pot `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o ../po/bibletime.pot
diff --git a/bibletime/backend/btstringmgr.h b/bibletime/backend/btstringmgr.h
index cb1033e..cc50e68 100644
--- a/bibletime/backend/btstringmgr.h
+++ b/bibletime/backend/btstringmgr.h
@@ -49,7 +49,7 @@ protected:
* This code was taken from KStringHandler, which is part of the KDE libraries.
*
* This function checks whether a string is utf8 or not.
- * It was taken from kdelibs so we do not depend on KDE 3.2.
+ * It was taken from tdelibs so we do not depend on KDE 3.2.
*/
const bool isUtf8(const char *buf) const;
};
diff --git a/bibletime/bibletime.cpp b/bibletime/bibletime.cpp
index 6333885..fec72fe 100644
--- a/bibletime/bibletime.cpp
+++ b/bibletime/bibletime.cpp
@@ -40,7 +40,7 @@
#include <tqsplitter.h>
//KDE includes
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kaction.h>
#include <kapplication.h>
#include <kconfig.h>
diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp
index 944c7a3..b01b9cd 100644
--- a/bibletime/bibletime_init.cpp
+++ b/bibletime/bibletime_init.cpp
@@ -52,7 +52,7 @@
#include <kaction.h>
#include <kapplication.h>
#include <kconfigbase.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kglobal.h>
#include <khelpmenu.h>
#include <kiconloader.h>
@@ -62,7 +62,7 @@
#include <ktoolbar.h>
#include <klocale.h>
#include <kpopupmenu.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
//Sword includes
#include <swlog.h>
diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp
index 89c30df..2d6d026 100644
--- a/bibletime/frontend/cbtconfig.cpp
+++ b/bibletime/frontend/cbtconfig.cpp
@@ -25,7 +25,7 @@
#include <tqmap.h>
//KDE includes
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kapplication.h>
#if TDE_VERSION >= 0x030200
#include <kactioncollection.h>
diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp
index d7833b1..2e8b126 100644
--- a/bibletime/frontend/display/chtmlreaddisplay.cpp
+++ b/bibletime/frontend/display/chtmlreaddisplay.cpp
@@ -25,7 +25,7 @@
#include "util/scoped_resource.h"
//We will need to reference this in the TQt includes
-#include <kdeversion.h>
+#include <tdeversion.h>
//TQt includes
#include <tqcursor.h>
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
index 666df70..8033ea1 100644
--- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
@@ -29,7 +29,7 @@
//KDE includes
#include <kaction.h>
#include <klocale.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
using namespace Profile;
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
index ae975f0..8a798e5 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
@@ -42,7 +42,7 @@
//TQt includes
//KDE includes
-#include <kdeversion.h>
+#include <tdeversion.h>
#include <kaccel.h>
#include <klocale.h>
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
index 4e1d2f0..01927ff 100644
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
@@ -33,7 +33,7 @@
#include <ktoolbar.h>
#include <klocale.h>
#include <kpopupmenu.h>
-#include <kdeversion.h>
+#include <tdeversion.h>
// #include <kactionclasses.h>
CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name) : CReadWindow(moduleList, parent,name) {
diff --git a/pot/Makefile.am b/pot/Makefile.am
index 95ff7f5..d35f330 100644
--- a/pot/Makefile.am
+++ b/pot/Makefile.am
@@ -1,5 +1,5 @@
# make messages.pot
-# the -x is for skipping messages already translated in kdelibs
+# the -x is for skipping messages already translated in tdelibs
messages:
echo Preparing documentation files handbook.pot and howto.pot...
diff --git a/pot/extractrc b/pot/extractrc
index 368849d..ab9c5ca 100644
--- a/pot/extractrc
+++ b/pot/extractrc
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# NOTE: this script is part of the KDE SDK and added to KDevelop to support KDE 2 application development.
-# The original is located in the KDE CVS module kdesdk/scripts. It gets installed in the same directory as
+# The original is located in the KDE CVS module tdesdk/scripts. It gets installed in the same directory as
# the KDevelop binary to be in your PATH.
#
# What it does is extract the strings in an application�s .rc file, e.g. testappui.rc, and writes into the pot file
diff --git a/pot/handbook.pot b/pot/handbook.pot
index 384c43e..ac4acc7 100644
--- a/pot/handbook.pot
+++ b/pot/handbook.pot
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2007-04-17 19:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: application/x-xml2pot; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/pot/howto.pot b/pot/howto.pot
index 3e8d8a7..8b05997 100644
--- a/pot/howto.pot
+++ b/pot/howto.pot
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2007-04-17 19:46+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: application/x-xml2pot; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"