Additional k => tde renaming and fixes

11 files changed, 21 insertions, 21 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 35aeaff..e4418b3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2094,35 +2094,35 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KDED, $lib_kded)
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEABC, "-ltdeabc")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
-   AC_SUBST(LIB_KUTILS, "-ltdeutils")
+   AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
-   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
+   AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
-   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
-   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
+   AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
+   AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
    AC_SUBST(LIB_TDEFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
-   AC_SUBST(LIB_KIO, "-ltdeio")
-   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
+   AC_SUBST(LIB_TDEIO, "-ltdeio")
+   AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_TDEFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
-   AC_SUBST(LIB_KSPELL, "-ltdespell")
-   AC_SUBST(LIB_KPARTS, "-ltdeparts")
+   AC_SUBST(LIB_TDESPELL, "-ltdespell")
+   AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
diff --git a/admin b/admin
-Subproject b4d585c643d92787bfa17b935ce00b09960ee36
+Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46
diff --git a/libkdcraw/libkdcraw/Makefile.am b/libkdcraw/libkdcraw/Makefile.am
index 9937050..63c47df 100644
--- a/libkdcraw/libkdcraw/Makefile.am
+++ b/libkdcraw/libkdcraw/Makefile.am
@@ -10,7 +10,7 @@ lib_LTLIBRARIES = libkdcraw.la
 
 libkdcraw_la_SOURCES = kdcraw.cpp kdcrawprivate.cpp dcrawsettingswidget.cpp rnuminput.cpp rcombobox.cpp
 libkdcraw_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info $(VERSION_INFO) -no-undefined
-libkdcraw_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_KIO) ../libraw/libraw.la
+libkdcraw_la_LIBADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEIO) ../libraw/libraw.la
 
 libkdcrawinclude_HEADERS = rawdecodingsettings.h kdcraw.h dcrawsettingswidget.h \
                            rnuminput.h rcombobox.h dcrawinfocontainer.h rawfiles.h \
diff --git a/po/ca/libkdcraw.po b/po/ca/libkdcraw.po
index 16788b9..9bf81a8 100644
--- a/po/ca/libkdcraw.po
+++ b/po/ca/libkdcraw.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2008-09-15 08:37+0200\n"
 "PO-Revision-Date: 2008-03-05 21:08+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
-"Language-Team: Catalan <tde-i18n-ca@kde.org>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/de/libkdcraw.po b/po/de/libkdcraw.po
index 6a86df5..bef3d7a 100644
--- a/po/de/libkdcraw.po
+++ b/po/de/libkdcraw.po
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2008-09-15 08:37+0200\n"
 "PO-Revision-Date: 2008-10-11 23:24+0200\n"
 "Last-Translator: Oliver Dörr <kde@doerr-privat.de>\n"
-"Language-Team: german <tde-i18n-de@kde.org>\n"
+"Language-Team: german <kde-i18n-de@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it/libkdcraw.po b/po/it/libkdcraw.po
index 5f9cfeb..4ea856e 100644
--- a/po/it/libkdcraw.po
+++ b/po/it/libkdcraw.po
@@ -11,7 +11,7 @@ msgstr ""
 "POT-Creation-Date: 2008-09-15 08:37+0200\n"
 "PO-Revision-Date: 2008-09-16 21:32+0200\n"
 "Last-Translator: Federico Zenith <federico.zenith@member.fsf.org>\n"
-"Language-Team: Italian <tde-i18n-it@kde.org>\n"
+"Language-Team: Italian <kde-i18n-it@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/nl/libkdcraw.po b/po/nl/libkdcraw.po
index 69125de..0f1930a 100644
--- a/po/nl/libkdcraw.po
+++ b/po/nl/libkdcraw.po
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2008-09-15 08:37+0200\n"
 "PO-Revision-Date: 2009-02-22 00:16+0100\n"
 "Last-Translator: Freek de Kruijf <f.de.kruijf@hetnet.nl>\n"
-"Language-Team: Dutch <tde-i18n-nl@kde.org>\n"
+"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt/libkdcraw.po b/po/pt/libkdcraw.po
index 30bd269..9265d75 100644
--- a/po/pt/libkdcraw.po
+++ b/po/pt/libkdcraw.po
@@ -4,7 +4,7 @@ msgstr ""
 "POT-Creation-Date: 2008-09-15 08:37+0200\n"
 "PO-Revision-Date: 2007-08-24 17:11+0100\n"
 "Last-Translator: José Nuno Coelho Pires <jncp@netcabo.pt>\n"
-"Language-Team: pt <tde-i18n-pt@kde.org>\n"
+"Language-Team: pt <kde-i18n-pt@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt_BR/libkdcraw.po b/po/pt_BR/libkdcraw.po
index abd3566..1b9e369 100644
--- a/po/pt_BR/libkdcraw.po
+++ b/po/pt_BR/libkdcraw.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2008-09-15 08:37+0200\n"
 "PO-Revision-Date: 2008-11-27 21:15-0200\n"
 "Last-Translator: Luiz Fernando Ranghetti <elchevive@opensuse.org>\n"
-"Language-Team: Brazilian Portuguese <tde-i18n-pt_BR@mail.kde.org>\n"
+"Language-Team: Brazilian Portuguese <kde-i18n-pt_BR@mail.kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sr/libkdcraw.po b/po/sr/libkdcraw.po
index e5a262b..fa04bb8 100644
--- a/po/sr/libkdcraw.po
+++ b/po/sr/libkdcraw.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2008-09-15 08:37+0200\n"
 "PO-Revision-Date: 2008-03-04 14:51+0100\n"
 "Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
-"Language-Team: Serbian <tde-i18n-sr@kde.org>\n"
+"Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sr@Latn/libkdcraw.po b/po/sr@Latn/libkdcraw.po
index 2f97ace..ad84731 100644
--- a/po/sr@Latn/libkdcraw.po
+++ b/po/sr@Latn/libkdcraw.po
@@ -7,7 +7,7 @@ msgstr ""
 "POT-Creation-Date: 2008-09-15 08:37+0200\n"
 "PO-Revision-Date: 2007-07-23 14:06+0200\n"
 "Last-Translator: Slobodan Simic <simicsl@verat.net>\n"
-"Language-Team: Serbian <tde-i18n-sr@kde.org>\n"
+"Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"