Additional k => tde renaming and fixes

13 files changed, 31 insertions, 31 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index a8b37fd..622fd7b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2070,35 +2070,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/po/ca.po b/po/ca.po
index 8992e68..5437b9d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-02-26 12:53+0100\n"
 "Last-Translator: Antoni Bella Pérez <bella5@teleline.es>\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.po b/po/de.po
index 879d511..1ad0459 100644
--- a/po/de.po
+++ b/po/de.po
@@ -14,7 +14,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-03-27 13:52+0200\n"
 "Last-Translator: Thomas Ohms <t.ohms@freenet.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/fi.po b/po/fi.po
index f1b6758..8f81eaa 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2006-04-14 22:25+0300\n"
 "Last-Translator: Niklas Laxström <niklas.laxstrom+kdetrans@gmail.com>\n"
-"Language-Team: Finnish <tde-i18n-fi-discussion@lists.sourceforge.net>\n"
+"Language-Team: Finnish <kde-i18n-fi-discussion@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it.po b/po/it.po
index d53f518..30581d8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-06-12 20:45+0200\n"
 "Last-Translator: Federico Zenith <zenith@chemeng.ntnu.no>\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/lt.po b/po/lt.po
index ab0373e..13ac2f3 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -991,7 +991,7 @@ msgstr ""
 "Nežinomas\n"
 "#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Nežinoma\n"
-"#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio.po (tdeio)  #-#-#-#-#\n"
 "Nežinoma\n"
 "#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Nežinoma\n"
@@ -1211,7 +1211,7 @@ msgstr ""
 "Vardas:\n"
 "#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Vardas:\n"
-"#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio.po (tdeio)  #-#-#-#-#\n"
 "Vardas:\n"
 "#-#-#-#-#  tdelibs.po (tdelibs)  #-#-#-#-#\n"
 "Vardas:\n"
@@ -1874,15 +1874,15 @@ msgid "Location:"
 msgstr ""
 "#-#-#-#-#  konqueror.po (konqueror)  #-#-#-#-#\n"
 "Adresas:\n"
-"#-#-#-#-#  kabc_net.po (kabc_net)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeabc_net.po (tdeabc_net)  #-#-#-#-#\n"
 "Vieta:\n"
 "#-#-#-#-#  tdeprint.po (tdeprint)  #-#-#-#-#\n"
 "Vieta:\n"
-"#-#-#-#-#  kio.po (kio)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeio.po (tdeio)  #-#-#-#-#\n"
 "Vieta:\n"
-"#-#-#-#-#  kabc_file.po (kabc_file)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeabc_file.po (tdeabc_file)  #-#-#-#-#\n"
 "Vieta:\n"
-"#-#-#-#-#  kabc_dir.po (kabc_dir)  #-#-#-#-#\n"
+"#-#-#-#-#  tdeabc_dir.po (tdeabc_dir)  #-#-#-#-#\n"
 "Vieta:\n"
 "#-#-#-#-#  amarok.po (amarok)  #-#-#-#-#\n"
 "Vieta:\n"
diff --git a/po/nl.po b/po/nl.po
index e5d4246..4d5c649 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-06-12 18:13+0200\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.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/pl.po b/po/pl.po
index 092a303..27f9b70 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,7 +4,7 @@
 # translation of kmplayer.po to
 #
 # Krzysztof Pawlak <jmnemonic@gazeta.pl>, 2004, 2005, 2006.
-# Michal Rudolf <mrudolf@tdewebdev.org>, 2004.
+# Michal Rudolf <mrudolf@kdewebdev.org>, 2004.
 # Krzysztof Lichota <lichota@mimuw.edu.pl>, 2005.
 # Copyright (C) 2003,2004, 2005, 2006 Free Software Foundation, Inc.
 msgid ""
diff --git a/po/pt.po b/po/pt.po
index 75c785a..b9b67b5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,7 +4,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-06-14 14:51+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\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.po b/po/pt_BR.po
index 55b78fd..c6db951 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-01-13 10:53-0200\n"
 "Last-Translator: Jose Monteiro <jf.monteiro@yahoo.com>\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/xx.po b/po/xx.po
index 4f79595..48a6478 100644
--- a/po/xx.po
+++ b/po/xx.po
@@ -4,7 +4,7 @@ msgstr ""
 "POT-Creation-Date: 2007-09-22 09:34+0200\n"
 "PO-Revision-Date: 2007-06-11 15:59+0000\n"
 "Last-Translator: transxx program <null@kde.org>\n"
-"Language-Team: Test Language <tde-i18n-doc@kde.org>\n"
+"Language-Team: Test Language <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ac67d1..6db915f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ lib_LTLIBRARIES= libkmplayercommon.la
 
 libkmplayercommon_la_SOURCES = viewarea.cpp kmplayerview.cpp playlistview.cpp kmplayercontrolpanel.cpp kmplayerconfig.cpp pref.cpp kmplayerprocess.cpp kmplayer_callback.skel kmplayer_backend.stub kmplayerpartbase.cpp kmplayerplaylist.cpp kmplayer_asx.cpp kmplayer_smil.cpp kmplayer_rp.cpp kmplayer_rss.cpp kmplayer_atom.cpp kmplayer_xspf.cpp triestring.cpp kmplayerpartbase.skel
 libkmplayercommon_la_LDFLAGS = -avoid-version $(all_libraries) $(CFLAGS_XTEST)
-libkmplayercommon_la_LIBADD = -ltdemediaplayer $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) $(LIB_QT) -lDCOP $(LIB_TDECORE) -ltdefx $(LIB_TDEUI) $(LIB_KIO) $(LIB_XTEST)
+libkmplayercommon_la_LIBADD = -ltdemediaplayer $(LIB_TDEPARTS) $(LIB_TDEUTILS) $(LIB_EXPAT) -lm $(LIBCAIRO_LIBS) $(LIBQTDBUS) $(LIB_QT) -lDCOP $(LIB_TDECORE) -ltdefx $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_XTEST)
 
 if include_koffice_support
 kofficeplugin_lib= libkmplayerkofficepart.la
@@ -46,15 +46,15 @@ libkmplayerbackend_la_SOURCES = kmplayer_backend.skel kmplayer_callback.stub
 
 kxineplayer_LDADD= libkmplayerbackend.la $(LIB_XINE) -lDCOP
 kxineplayer_CFLAGS= $(CFLAGS_XINE)
-kxineplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kxineplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kxineplayer_SOURCES= xineplayer.cpp
 
 kxvplayer_LDADD= libkmplayerbackend.la -lDCOP -lXv
-kxvplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kxvplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kxvplayer_SOURCES= xvplayer.cpp
 
 kgstplayer_LDADD= libkmplayerbackend.la $(LIB_GST) $(LIB_GST_PLUGINS) -lgstinterfaces-0.10 -lDCOP
-kgstplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kgstplayer_LDFLAGS= $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 kgstplayer_SOURCES= gstplayer.cpp
 
 knpplayer_LDADD= $(LIBNSPR_LIBS)