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

8 files changed, 32 insertions, 32 deletions

diff --git a/koffice-i18n-et/acinclude.m4 b/koffice-i18n-et/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-et/acinclude.m4
+++ b/koffice-i18n-et/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
    AC_SUBST(LIB_KDEPIM, "-lkdepim")
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-lkfile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
 else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
 
 dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
 dnl if only one is missing, it means a configuration error, but we still
 dnl only warn
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
 AC_SUBST(KDE_PLUGIN)
 
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
 AC_SUBST(KDE_CHECK_PLUGIN)
 
diff --git a/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook
index dba8d71a..faeea048 100644
--- a/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook
@@ -291,7 +291,7 @@ X-KDE-Version=2
 >#ifndef TOOL_STAR_H_
 #define TOOL_STAR_H_
 
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
 
 /**
 * A module that provides a star tool.
diff --git a/koffice-i18n-et/docs/koffice/koffice/index.docbook b/koffice-i18n-et/docs/koffice/koffice/index.docbook
index 0d031167..5a1858ad 100644
--- a/koffice-i18n-et/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-et/docs/koffice/koffice/index.docbook
@@ -151,7 +151,7 @@
 <title
 >Integreeritus</title>
 <para
->&koffice; pakub välja raamistiku, millele toetuvad kõik komponendid. See võimaldab neid väga suurel määral lõimida. Soovi korral võib iga kasutaja luua ka ise komponente, mis raamistikus ilusasti töötavad. Seda kirjeldab põhjalikumalt <link linkend="kparts"
+>&koffice; pakub välja raamistiku, millele toetuvad kõik komponendid. See võimaldab neid väga suurel määral lõimida. Soovi korral võib iga kasutaja luua ka ise komponente, mis raamistikus ilusasti töötavad. Seda kirjeldab põhjalikumalt <link linkend="tdeparts"
 >KPartsile pühendatud peatükk</link
 >. </para>
 </sect2>
@@ -193,11 +193,11 @@
 <title
 >&koffice;'i tehnoloogia</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >KParts - &koffice;'i ehituskivid</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -240,7 +240,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >KPartsi kasutamine dokumentides</title>
 
diff --git a/koffice-i18n-et/docs/koffice/kword/index.docbook b/koffice-i18n-et/docs/koffice/kword/index.docbook
index 58a2ec30..e31b19db 100644
--- a/koffice-i18n-et/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-et/docs/koffice/kword/index.docbook
@@ -25,7 +25,7 @@
   <!ENTITY techstuff SYSTEM "techinfo.docbook">
   <!ENTITY graphics SYSTEM "graphics.docbook">
   <!ENTITY toc SYSTEM "toc.docbook">
-  <!ENTITY parts SYSTEM "kparts.docbook">
+  <!ENTITY parts SYSTEM "tdeparts.docbook">
   <!ENTITY formulas SYSTEM "formulas.docbook">
   <!ENTITY lists SYSTEM "lists.docbook">
   <!ENTITY variables SYSTEM "docvariables.docbook">
diff --git a/koffice-i18n-et/docs/koffice/kword/table.docbook b/koffice-i18n-et/docs/koffice/kword/table.docbook
index 7829e372..3fa7a516 100644
--- a/koffice-i18n-et/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-et/docs/koffice/kword/table.docbook
@@ -44,7 +44,7 @@
 
 <tip
 ><para
->Kui sul aga peaks tekkima vajadus päris arvutustabeli järele, siis on võimalik dokumenti <link linkend="kparts"
+>Kui sul aga peaks tekkima vajadus päris arvutustabeli järele, siis on võimalik dokumenti <link linkend="tdeparts"
 >põimida  &kspread;i tabel</link
 >.</para
 ></tip>
diff --git a/koffice-i18n-et/docs/koffice/kword/kparts.docbook b/koffice-i18n-et/docs/koffice/kword/tdeparts.docbook
index 7aa9284e..b95d0be9 100644
--- a/koffice-i18n-et/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-et/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -45,7 +45,7 @@
 <para
 >Täpsemat infot leiab vastavate rakenduste käsiraamatutest.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Üldised juhised</title>
 <para
@@ -85,7 +85,7 @@
 >&kword;i sees</emphasis
 >. Iga rakenduse korral on toimimine vastavalt rakendusele erinev. Milline täpselt, on võimalik lugeda konkreetse &koffice;'i rakenduse käsiraamatust (teisisõnu tähendab see seda, et näiteks &kspread;i töölehte lisades toimib asi sarnaselt &kspread;ile).</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Lisatud komponendi kasutamine</title>
 <para
diff --git a/koffice-i18n-et/messages/koffice/desktop_koffice.po b/koffice-i18n-et/messages/koffice/desktop_koffice.po
index 0f531c77..58fe6a5c 100644
--- a/koffice-i18n-et/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-et/messages/koffice/desktop_koffice.po
@@ -1637,12 +1637,12 @@ msgstr "Name=Pildi pööramise plugin"
 msgid "Name=Screenshot"
 msgstr "Name=Ekraanipilt"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3
 #: kspread/plugins/scripting/kspreadscripting.desktop:3
 msgid "Name=Scripting plugin"
 msgstr "Name=Skriptiplugin"
 
-#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38
+#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38
 #: kspread/plugins/scripting/kspreadscripting.desktop:38
 msgid "Comment=Allow execution of scripts"
 msgstr "Comment=Võimaldab skriptide käivitamist"
@@ -2174,11 +2174,11 @@ msgstr "GenericName=Sarnased sõnad"
 msgid "Name=Print..."
 msgstr "Name=Trükkimine..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Õigekirja kontroll"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Selle sõna õigekirja kontrollimine"
 
diff --git a/koffice-i18n-et/messages/koffice/kplato.po b/koffice-i18n-et/messages/koffice/kplato.po
index 3df7a79e..e411e755 100644
--- a/koffice-i18n-et/messages/koffice/kplato.po
+++ b/koffice-i18n-et/messages/koffice/kplato.po
@@ -831,31 +831,31 @@ msgstr "Lõpp:"
 msgid "Effort:"
 msgstr "Ajakulu:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 17
+#. i18n: file kpttastderesourcespanelbase.ui line 17
 #: rc.cpp:628
 #, no-c-format
 msgid "TaskResourcesPanelBase"
 msgstr "TaskResourcesPanelBase"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 29
+#. i18n: file kpttastderesourcespanelbase.ui line 29
 #: rc.cpp:631
 #, no-c-format
 msgid "Group"
 msgstr "Grupp"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 40
+#. i18n: file kpttastderesourcespanelbase.ui line 40
 #: rc.cpp:634
 #, no-c-format
 msgid "Max. Units"
 msgstr "Maks. üksusi"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Omistatakse ressursid:"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 81
+#. i18n: file kpttastderesourcespanelbase.ui line 81
 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768
 #, no-c-format
 msgid "Resource"