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

3 files changed, 13 insertions, 13 deletions

diff --git a/koffice-i18n-lv/acinclude.m4 b/koffice-i18n-lv/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-lv/acinclude.m4
+++ b/koffice-i18n-lv/acinclude.m4
@@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
+            KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
         if test -n "$kde33ornewer"; then
@@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then
   kde_check_lib="libkdecore.la"
 else
   kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
+  kde_check_lib="libtdeio.la"
 fi
 
 if test -z "$1"; then
@@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
+   AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2104,7 +2104,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/koffice-i18n-lv/messages/koffice/desktop_koffice.po b/koffice-i18n-lv/messages/koffice/desktop_koffice.po
index e199776a..e71a83ef 100644
--- a/koffice-i18n-lv/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-lv/messages/koffice/desktop_koffice.po
@@ -2364,21 +2364,21 @@ msgstr "Name=Teksta Dokuments"
 msgid "Comment=New KWord document:"
 msgstr "Comment=Jauns KWord dokuments:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 #, fuzzy
 msgid "Name=Abiword Info"
 msgstr "Name=KOfisa Info"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 #, fuzzy
 msgid "Name=Gnumeric Info"
 msgstr "Name=KOfisa Info"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOfisa Info"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 #, fuzzy
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=KOfisa Info"
diff --git a/koffice-i18n-lv/messages/koffice/kfile_koffice.po b/koffice-i18n-lv/messages/koffice/tdefile_koffice.po
index 5d834990..59c09ba4 100644
--- a/koffice-i18n-lv/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-lv/messages/koffice/tdefile_koffice.po
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Dokumenta Informācija"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Autors"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Nosaukums"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Referējums"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Nezināms*"