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

6 files changed, 62 insertions, 62 deletions

diff --git a/koffice-i18n-fr/acinclude.m4 b/koffice-i18n-fr/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-fr/acinclude.m4
+++ b/koffice-i18n-fr/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-fr/messages/koffice/desktop_koffice.po b/koffice-i18n-fr/messages/koffice/desktop_koffice.po
index d9382222..6013b498 100644
--- a/koffice-i18n-fr/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-fr/messages/koffice/desktop_koffice.po
@@ -2170,19 +2170,19 @@ msgstr "Name=Document texte..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Nouveau document KWord :"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Informations sur Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Informations sur Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Informations sur KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Informations sur OpenOffice.org"
 
diff --git a/koffice-i18n-fr/messages/koffice/kfile_abiword.po b/koffice-i18n-fr/messages/koffice/tdefile_abiword.po
index 16cdcc86..fece5574 100644
--- a/koffice-i18n-fr/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-fr/messages/koffice/tdefile_abiword.po
@@ -1,9 +1,9 @@
-# translation of kfile_abiword.po to French
+# translation of tdefile_abiword.po to French
 #
 # Matthieu Robin <[email protected]>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_abiword\n"
+"Project-Id-Version: tdefile_abiword\n"
 "POT-Creation-Date: 2005-06-13 01:29+0200\n"
 "PO-Revision-Date: 2006-03-29 20:42+0200\n"
 "Last-Translator: Matthieu Robin <[email protected]>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "Informations sur le document"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "Titre"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "Résumé"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*Inconnu*"
diff --git a/koffice-i18n-fr/messages/koffice/kfile_gnumeric.po b/koffice-i18n-fr/messages/koffice/tdefile_gnumeric.po
index b0dcf152..5feef29a 100644
--- a/koffice-i18n-fr/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-fr/messages/koffice/tdefile_gnumeric.po
@@ -1,9 +1,9 @@
-# translation of kfile_gnumeric.po to French
+# translation of tdefile_gnumeric.po to French
 #
 # Matthieu Robin <[email protected]>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_gnumeric\n"
+"Project-Id-Version: tdefile_gnumeric\n"
 "POT-Creation-Date: 2005-06-02 01:25+0200\n"
 "PO-Revision-Date: 2006-03-29 20:42+0200\n"
 "Last-Translator: Matthieu Robin <[email protected]>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "Informations sur le document"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "Titre"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "Résumé"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*Inconnu*"
diff --git a/koffice-i18n-fr/messages/koffice/kfile_koffice.po b/koffice-i18n-fr/messages/koffice/tdefile_koffice.po
index 91c86d3b..64a40bc8 100644
--- a/koffice-i18n-fr/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-fr/messages/koffice/tdefile_koffice.po
@@ -1,11 +1,11 @@
-# translation of kfile_koffice.po to Français
+# translation of tdefile_koffice.po to Français
 # Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 # Gérard Delafond <[email protected]>, 2002.
 # Joëlle Conavin <[email protected]>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_koffice\n"
+"Project-Id-Version: tdefile_koffice\n"
 "POT-Creation-Date: 2005-10-02 02:40+0200\n"
 "PO-Revision-Date: 2004-05-19 01:29+0200\n"
 "Last-Translator: Joëlle Conavin <[email protected]>\n"
@@ -15,22 +15,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Informations sur le document"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Titre"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Résumé"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Inconnu*"
diff --git a/koffice-i18n-fr/messages/koffice/kfile_ooo.po b/koffice-i18n-fr/messages/koffice/tdefile_ooo.po
index 272d5c31..d491783d 100644
--- a/koffice-i18n-fr/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-fr/messages/koffice/tdefile_ooo.po
@@ -1,12 +1,12 @@
-# translation of kfile_ooo.po to Français
-# translation of kfile_ooo.po to français
+# translation of tdefile_ooo.po to Français
+# translation of tdefile_ooo.po to français
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Ludovic Grossard <[email protected]>, 2003.
 # Joëlle Conavin <[email protected]>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: kfile_ooo\n"
+"Project-Id-Version: tdefile_ooo\n"
 "POT-Creation-Date: 2005-05-18 21:25+0200\n"
 "PO-Revision-Date: 2004-09-05 14:07+0100\n"
 "Last-Translator: Simon DEPIETS <[email protected]>\n"
@@ -15,122 +15,122 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Imprimé par"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Date d'impression"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Date"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Date de création"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Créateur"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Générateur"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Cycles d'édition"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Edition de la durée"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Titre"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Auteur"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Description"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Sujet"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Langue"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Dessins"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tableaux"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Images"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Objets"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Objets OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Pages"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Paragraphes"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Mots"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Cellules"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Caractères"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Lignes"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Défini par l'utilisateur"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Informations sur le document"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Mots-clés"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Autres paramètres du document"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Statistiques du document"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"