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

6 files changed, 57 insertions, 57 deletions

diff --git a/koffice-i18n-zh_CN/acinclude.m4 b/koffice-i18n-zh_CN/acinclude.m4
index fed43974..5a22f868 100644
--- a/koffice-i18n-zh_CN/acinclude.m4
+++ b/koffice-i18n-zh_CN/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-zh_CN/messages/koffice/desktop_koffice.po b/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po
index a84ee475..e0f5e655 100644
--- a/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po
+++ b/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po
@@ -2191,19 +2191,19 @@ msgstr "Name=文本文档..."
 msgid "Comment=New KWord document:"
 msgstr "Comment=新建 KWord 文档："
 
-#: tools/kfile-plugins/abiword/kfile_abiword.desktop:4
+#: tools/tdefile-plugins/abiword/tdefile_abiword.desktop:4
 msgid "Name=Abiword Info"
 msgstr "Name=Abiword 信息"
 
-#: tools/kfile-plugins/gnumeric/kfile_gnumeric.desktop:4
+#: tools/tdefile-plugins/gnumeric/tdefile_gnumeric.desktop:4
 msgid "Name=Gnumeric Info"
 msgstr "Name=Gnumeric 信息"
 
-#: tools/kfile-plugins/koffice/kfile_koffice.desktop:4
+#: tools/tdefile-plugins/koffice/tdefile_koffice.desktop:4
 msgid "Name=KOffice Info"
 msgstr "Name=KOffice 信息"
 
-#: tools/kfile-plugins/ooo/kfile_ooo.desktop:4
+#: tools/tdefile-plugins/ooo/tdefile_ooo.desktop:4
 msgid "Name=OpenOffice.org Info"
 msgstr "Name=OpenOffice.org 信息"
 
diff --git a/koffice-i18n-zh_CN/messages/koffice/kfile_abiword.po b/koffice-i18n-zh_CN/messages/koffice/tdefile_abiword.po
index 47c68de9..3233fbb7 100644
--- a/koffice-i18n-zh_CN/messages/koffice/kfile_abiword.po
+++ b/koffice-i18n-zh_CN/messages/koffice/tdefile_abiword.po
@@ -4,7 +4,7 @@
 #
 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: 2005-03-14 00:40+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_abiword.cpp:50
+#: tdefile_abiword.cpp:50
 msgid "Document Information"
 msgstr "文档信息"
 
-#: kfile_abiword.cpp:54
+#: tdefile_abiword.cpp:54
 msgid "Author"
 msgstr "作者"
 
-#: kfile_abiword.cpp:56
+#: tdefile_abiword.cpp:56
 msgid "Title"
 msgstr "头衔"
 
-#: kfile_abiword.cpp:58
+#: tdefile_abiword.cpp:58
 msgid "Abstract"
 msgstr "摘要"
 
-#: kfile_abiword.cpp:141
+#: tdefile_abiword.cpp:141
 msgid "*Unknown*"
 msgstr "*未知*"
diff --git a/koffice-i18n-zh_CN/messages/koffice/kfile_gnumeric.po b/koffice-i18n-zh_CN/messages/koffice/tdefile_gnumeric.po
index 405b3ae1..f191c09f 100644
--- a/koffice-i18n-zh_CN/messages/koffice/kfile_gnumeric.po
+++ b/koffice-i18n-zh_CN/messages/koffice/tdefile_gnumeric.po
@@ -4,7 +4,7 @@
 #
 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: 2005-12-09 22:57+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_gnumeric.cpp:50
+#: tdefile_gnumeric.cpp:50
 msgid "Document Information"
 msgstr "文档信息"
 
-#: kfile_gnumeric.cpp:54
+#: tdefile_gnumeric.cpp:54
 msgid "Author"
 msgstr "作者"
 
-#: kfile_gnumeric.cpp:56
+#: tdefile_gnumeric.cpp:56
 msgid "Title"
 msgstr "头衔"
 
-#: kfile_gnumeric.cpp:58
+#: tdefile_gnumeric.cpp:58
 msgid "Abstract"
 msgstr "摘要"
 
-#: kfile_gnumeric.cpp:119
+#: tdefile_gnumeric.cpp:119
 msgid "*Unknown*"
 msgstr "*未知*"
diff --git a/koffice-i18n-zh_CN/messages/koffice/kfile_koffice.po b/koffice-i18n-zh_CN/messages/koffice/tdefile_koffice.po
index 1d8699a7..6e94e569 100644
--- a/koffice-i18n-zh_CN/messages/koffice/kfile_koffice.po
+++ b/koffice-i18n-zh_CN/messages/koffice/tdefile_koffice.po
@@ -4,7 +4,7 @@
 #
 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: 2002-09-17 22:19+0800\n"
 "Last-Translator: Funda Wang<fundawang@en2china.com>\n"
@@ -13,22 +13,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kfile_koffice.cpp:64
+#: tdefile_koffice.cpp:64
 msgid "Document Information"
 msgstr "文档信息"
 
-#: kfile_koffice.cpp:68
+#: tdefile_koffice.cpp:68
 msgid "Author"
 msgstr "作者"
 
-#: kfile_koffice.cpp:70
+#: tdefile_koffice.cpp:70
 msgid "Title"
 msgstr "标题"
 
-#: kfile_koffice.cpp:72
+#: tdefile_koffice.cpp:72
 msgid "Abstract"
 msgstr "摘要"
 
-#: kfile_koffice.cpp:112
+#: tdefile_koffice.cpp:112
 msgid "*Unknown*"
 msgstr "*未知*"
diff --git a/koffice-i18n-zh_CN/messages/koffice/kfile_ooo.po b/koffice-i18n-zh_CN/messages/koffice/tdefile_ooo.po
index 6f26a9b0..066ee1e0 100644
--- a/koffice-i18n-zh_CN/messages/koffice/kfile_ooo.po
+++ b/koffice-i18n-zh_CN/messages/koffice/tdefile_ooo.po
@@ -4,7 +4,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: 2005-03-14 00:40+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
@@ -13,122 +13,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 "打印者"
 
-#: kfile_ooo.cpp:83
+#: tdefile_ooo.cpp:83
 msgid "Print Date"
 msgstr "打印日期"
 
-#: kfile_ooo.cpp:84
+#: tdefile_ooo.cpp:84
 msgid "Date"
 msgstr "日期"
 
-#: kfile_ooo.cpp:85
+#: tdefile_ooo.cpp:85
 msgid "Creation Date"
 msgstr "创建日期"
 
-#: kfile_ooo.cpp:86
+#: tdefile_ooo.cpp:86
 msgid "Creator"
 msgstr "创建器"
 
-#: kfile_ooo.cpp:87
+#: tdefile_ooo.cpp:87
 msgid "Generator"
 msgstr "生成器"
 
-#: kfile_ooo.cpp:88
+#: tdefile_ooo.cpp:88
 msgid "Editing Cycles"
 msgstr "编辑周期"
 
-#: kfile_ooo.cpp:89
+#: tdefile_ooo.cpp:89
 msgid "Editing Duration"
 msgstr "编辑时长"
 
-#: kfile_ooo.cpp:95
+#: tdefile_ooo.cpp:95
 msgid "Title"
 msgstr "头衔"
 
-#: kfile_ooo.cpp:96
+#: tdefile_ooo.cpp:96
 msgid "Author"
 msgstr "作者"
 
-#: kfile_ooo.cpp:97
+#: tdefile_ooo.cpp:97
 msgid "Description"
 msgstr "描述"
 
-#: kfile_ooo.cpp:98
+#: tdefile_ooo.cpp:98
 msgid "Subject"
 msgstr "标题"
 
-#: kfile_ooo.cpp:99
+#: tdefile_ooo.cpp:99
 msgid "Language"
 msgstr "语言"
 
-#: kfile_ooo.cpp:103
+#: tdefile_ooo.cpp:103
 msgid "Draws"
 msgstr "绘图数"
 
-#: kfile_ooo.cpp:104
+#: tdefile_ooo.cpp:104
 msgid "Tables"
 msgstr "表格数"
 
-#: kfile_ooo.cpp:105
+#: tdefile_ooo.cpp:105
 msgid "Images"
 msgstr "图像数"
 
-#: kfile_ooo.cpp:106
+#: tdefile_ooo.cpp:106
 msgid "Objects"
 msgstr "对象数"
 
-#: kfile_ooo.cpp:107
+#: tdefile_ooo.cpp:107
 msgid "OLE Objects"
 msgstr "OLE 对象数"
 
-#: kfile_ooo.cpp:108
+#: tdefile_ooo.cpp:108
 msgid "Pages"
 msgstr "页数"
 
-#: kfile_ooo.cpp:109
+#: tdefile_ooo.cpp:109
 msgid "Paragraphs"
 msgstr "段落数"
 
-#: kfile_ooo.cpp:110
+#: tdefile_ooo.cpp:110
 msgid "Words"
 msgstr "单词数"
 
-#: kfile_ooo.cpp:111
+#: tdefile_ooo.cpp:111
 msgid "Cells"
 msgstr "单元格数"
 
-#: kfile_ooo.cpp:112
+#: tdefile_ooo.cpp:112
 msgid "Characters"
 msgstr "字符数"
 
-#: kfile_ooo.cpp:113
+#: tdefile_ooo.cpp:113
 msgid "Rows"
 msgstr "行数"
 
-#: kfile_ooo.cpp:140
+#: tdefile_ooo.cpp:140
 msgid "User Defined"
 msgstr "用户定义的"
 
-#: kfile_ooo.cpp:147
+#: tdefile_ooo.cpp:147
 msgid "Document Information"
 msgstr "文档信息"
 
-#: kfile_ooo.cpp:167
+#: tdefile_ooo.cpp:167
 msgid "Keywords"
 msgstr "关键字"
 
-#: kfile_ooo.cpp:172
+#: tdefile_ooo.cpp:172
 msgid "Document Advanced"
 msgstr "文档高级"
 
-#: kfile_ooo.cpp:184
+#: tdefile_ooo.cpp:184
 msgid "Document Statistics"
 msgstr "文档统计"
 
-#: kfile_ooo.cpp:262
+#: tdefile_ooo.cpp:262
 msgid "%1:%2.%3"
 msgstr "%1:%2.%3"