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

8 files changed, 32 insertions, 32 deletions

diff --git a/koffice-i18n-sv/acinclude.m4 b/koffice-i18n-sv/acinclude.m4
index 4fbab9a1..fed43974 100644
--- a/koffice-i18n-sv/acinclude.m4
+++ b/koffice-i18n-sv/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-sv/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-sv/docs/koffice/chalk/developers-plugins.docbook
index 2c3c039b..7d7acde7 100644
--- a/koffice-i18n-sv/docs/koffice/chalk/developers-plugins.docbook
+++ b/koffice-i18n-sv/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>
 
 /**
 * En modul som tillhandahåller ett stjärnverktyg.
diff --git a/koffice-i18n-sv/docs/koffice/koffice/index.docbook b/koffice-i18n-sv/docs/koffice/koffice/index.docbook
index a6fe9e19..3d006f9f 100644
--- a/koffice-i18n-sv/docs/koffice/koffice/index.docbook
+++ b/koffice-i18n-sv/docs/koffice/koffice/index.docbook
@@ -151,7 +151,7 @@
 <title
 >Integrerat</title>
 <para
->&koffice; tillhandahåller en stomme som alla komponenter bygger på. Via denna stomme uppnås hög integration. Det är möjligt att utveckla egna komponenter som också kan integreras. Denna teknologi beskrivs djupare i <link linkend="kparts"
+>&koffice; tillhandahåller en stomme som alla komponenter bygger på. Via denna stomme uppnås hög integration. Det är möjligt att utveckla egna komponenter som också kan integreras. Denna teknologi beskrivs djupare i <link linkend="tdeparts"
 >kapitlet om Kparts</link
 >. </para>
 </sect2>
@@ -193,11 +193,11 @@
 <title
 >Teknologi i &koffice;</title>
 
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <title
 >Kparts - byggblocken i &koffice;</title>
 
-<!-- <sect2 id="kpartsintro"
+<!-- <sect2 id="tdepartsintro"
 > -->
 <!-- <title
 >KParts Introduction</title
@@ -242,7 +242,7 @@
 </sect2>
 
 
-<sect2 id="kparts-try-it">
+<sect2 id="tdeparts-try-it">
 <title
 >Att använda Kparts i dina dokument</title>
 
diff --git a/koffice-i18n-sv/docs/koffice/kword/index.docbook b/koffice-i18n-sv/docs/koffice/kword/index.docbook
index 73c3890d..8adb34d5 100644
--- a/koffice-i18n-sv/docs/koffice/kword/index.docbook
+++ b/koffice-i18n-sv/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-sv/docs/koffice/kword/table.docbook b/koffice-i18n-sv/docs/koffice/kword/table.docbook
index 04a4e44b..a7777918 100644
--- a/koffice-i18n-sv/docs/koffice/kword/table.docbook
+++ b/koffice-i18n-sv/docs/koffice/kword/table.docbook
@@ -44,7 +44,7 @@
 
 <tip
 ><para
->Kom ihåg, om du behöver funktionen i ett kalkylprogram, kan du <link linkend="kparts"
+>Kom ihåg, om du behöver funktionen i ett kalkylprogram, kan du <link linkend="tdeparts"
 >infoga en &kspread;-tabell</link
 > i dokumentet.</para
 ></tip>
diff --git a/koffice-i18n-sv/docs/koffice/kword/kparts.docbook b/koffice-i18n-sv/docs/koffice/kword/tdeparts.docbook
index ab578689..41054180 100644
--- a/koffice-i18n-sv/docs/koffice/kword/kparts.docbook
+++ b/koffice-i18n-sv/docs/koffice/kword/tdeparts.docbook
@@ -1,4 +1,4 @@
-<sect1 id="kparts">
+<sect1 id="tdeparts">
 <sect1info>
 <authorgroup>
 <author
@@ -45,7 +45,7 @@
 <para
 >Titta i hjälpfilerna för övriga program för mer specifik information.</para
 ></note>
-<sect2 id="kparts-insert"
+<sect2 id="tdeparts-insert"
 ><title
 >Allmänna instruktioner</title>
 <para
@@ -85,7 +85,7 @@
 >inne i &kword;</emphasis
 >. Detaljerna skiljer sig åt för varje program. Se handboken för det specifika &koffice;-programmet för information om hur det programmet används. (Med andra ord, hädanefter, om du infogat ett kalkylblad från &kspread;, så fungerar fönstren på samma sätt som i &kspread;.)</para>
 </sect2>
-<sect2 id="kparts-edit"
+<sect2 id="tdeparts-edit"
 ><title
 >Arbeta med den infogade komponenten</title>
 <para
diff --git a/koffice-i18n-sv/messages/koffice/desktop_koffice.po b/koffice-i18n-sv/messages/koffice/desktop_koffice.po
index f08cf901..d02a071f 100644
--- a/koffice-i18n-sv/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-sv/messages/koffice/desktop_koffice.po
@@ -1639,12 +1639,12 @@ msgstr "Name=Insticksprogram för rotera bild"
 msgid "Name=Screenshot"
 msgstr "Name=Skärmdump"
 
-#: 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=Skriptinsticksprogram"
 
-#: 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=Tillåt körning av skript"
@@ -2176,11 +2176,11 @@ msgstr "GenericName=Relaterade ord"
 msgid "Name=Print..."
 msgstr "Name=Skriv ut..."
 
-#: tools/spell/kspelltool.desktop:3
+#: tools/spell/tdespelltool.desktop:3
 msgid "Name=Spell Checker Tool"
 msgstr "Name=Rättstavningsverktyg"
 
-#: tools/spell/kspelltool.desktop:71
+#: tools/spell/tdespelltool.desktop:71
 msgid "Comment=Check this Word's Spelling"
 msgstr "Comment=Kontrollera det här ordets stavning"
 
diff --git a/koffice-i18n-sv/messages/koffice/kplato.po b/koffice-i18n-sv/messages/koffice/kplato.po
index bc5914f7..72ae92b4 100644
--- a/koffice-i18n-sv/messages/koffice/kplato.po
+++ b/koffice-i18n-sv/messages/koffice/kplato.po
@@ -834,31 +834,31 @@ msgstr "Avslutning:"
 msgid "Effort:"
 msgstr "Insats:"
 
-#. 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 "Maximalt antal enheter"
 
-#. i18n: file kpttaskresourcespanelbase.ui line 72
+#. i18n: file kpttastderesourcespanelbase.ui line 72
 #: rc.cpp:637
 #, no-c-format
 msgid "Assign resources:"
 msgstr "Tilldela resurser:"
 
-#. 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"