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

4 files changed, 47 insertions, 47 deletions

diff --git a/koffice-i18n-cy/acinclude.m4 b/koffice-i18n-cy/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-cy/acinclude.m4
+++ b/koffice-i18n-cy/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-cy/messages/koffice/desktop_koffice.po b/koffice-i18n-cy/messages/koffice/desktop_koffice.po
index 9da5ade2..020f33d3 100644
--- a/koffice-i18n-cy/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-cy/messages/koffice/desktop_koffice.po
@@ -2228,19 +2228,19 @@ msgstr "Name=Dogfen Destun..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=Dogfen newydd KWord:"
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Gwybodaeth Abiword"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gwybodaeth Gnumeric"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=Gwybodaeth KOffice"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=Gwybodaeth OpenOffice.org"
 
diff --git a/koffice-i18n-cy/messages/koffice/kfile_koffice.po b/koffice-i18n-cy/messages/koffice/tdefile_koffice.po
index 4394ad5f..555b23a8 100644
--- a/koffice-i18n-cy/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-cy/messages/koffice/tdefile_koffice.po
@@ -1,8 +1,8 @@
-# translation of kfile_koffice.po to Cymraeg
+# translation of tdefile_koffice.po to Cymraeg
 # KD at KGyfieithu <kyfieithu@dotmon.com>, 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-06-26 12:24+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -12,22 +12,22 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "Gwybodaeth Ddogfen"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "Awdur"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "Crynodeb"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*Anhysbys*"
diff --git a/koffice-i18n-cy/messages/koffice/kfile_ooo.po b/koffice-i18n-cy/messages/koffice/tdefile_ooo.po
index 5a042a2a..7412fb4a 100644
--- a/koffice-i18n-cy/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-cy/messages/koffice/tdefile_ooo.po
@@ -1,4 +1,4 @@
-# translation of kfile_ooo.po to Cymraeg
+# translation of tdefile_ooo.po to Cymraeg
 # Penbwrdd yn Gymraeg.
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
@@ -7,7 +7,7 @@
 #
 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-07-05 14:22+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
@@ -19,122 +19,122 @@ msgstr ""
 "X-Generator: KBabel 1.2\n"
 "\n"
 
-#: kfile_ooo.cpp:82
+#: tdefile_ooo.cpp:82
 msgid "Printed By"
 msgstr "Argraffwyd Gan"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "Dyddiad Argraffu"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "Dyddiad"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "Dyddiad Creu"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "Creuwr"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "Cynhyrchydd"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "Cylchredau Golygu"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "Cyfnod Golygu"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "Teitl"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "Awdur"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "Pwnc"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "Iaith"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "Darluniadau"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "Tablau"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "Delweddau"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "Gwrthrychau"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "Gwrthrychau OLE"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "Tudalennau"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "Paragraffau"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "Geiriau"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "Celloedd"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "Nodau"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "Rhesi"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "Diffiniedig gan y Defnyddiwr "
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "Gwybodaeth Ddogfen"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "Allweddeiriau"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "Dogfen Uwch"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "Ystadegau Dogfen"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"