diff --git a/acinclude.m4 b/acinclude.m4 index fdcde67..28504f3 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 index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/src/knemod/Makefile.am b/src/knemod/Makefile.am index a9496bc..39b783d 100644 --- a/src/knemod/Makefile.am +++ b/src/knemod/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = -I$(srcdir)/../common -I$(srcdir)/backends $(all_includes) kded_knemod_la_LDFLAGS = -module -avoid-version $(all_libraries) # the libraries to link against. -kded_knemod_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) backends/libknemo_backends.la +kded_knemod_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS) backends/libknemo_backends.la # which sources should be compiled for knemo kded_knemod_la_SOURCES = knemodaemon.cpp knemodaemon.skel interface.cpp \ diff --git a/src/knemod/backends/Makefile.am b/src/knemod/backends/Makefile.am index aab0fd0..ccf8785 100644 --- a/src/knemod/backends/Makefile.am +++ b/src/knemod/backends/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../common $(all_includes) libknemo_backends_la_LDFLAGS = -module -avoid-version $(all_libraries) # the libraries to link against. -libknemo_backends_la_LIBADD = $(LIB_KIO) $(LIB_KUTILS) +libknemo_backends_la_LIBADD = $(LIB_TDEIO) $(LIB_TDEUTILS) # which sources should be compiled as backends libknemo_backends_la_SOURCES = backendbase.cpp nettoolsbackend.cpp sysbackend.cpp diff --git a/translations/de/messages/kcm_knemo.po b/translations/de/messages/kcm_knemo.po index 5019e03..535a70a 100644 --- a/translations/de/messages/kcm_knemo.po +++ b/translations/de/messages/kcm_knemo.po @@ -13,7 +13,7 @@ msgstr "" "POT-Creation-Date: 2006-09-11 08:34+0200\n" "PO-Revision-Date: 2006-09-24 22:49+0200\n" "Last-Translator: Jannick Kuhr \n" -"Language-Team: Deutsch \n" +"Language-Team: Deutsch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/de/messages/knemod.po b/translations/de/messages/knemod.po index af696e1..6d9f333 100644 --- a/translations/de/messages/knemod.po +++ b/translations/de/messages/knemod.po @@ -13,7 +13,7 @@ msgstr "" "POT-Creation-Date: 2007-03-30 07:28+0200\n" "PO-Revision-Date: 2007-03-30 17:01+0200\n" "Last-Translator: Jannick Kuhr \n" -"Language-Team: Deutsch \n" +"Language-Team: Deutsch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/lt/messages/kcm_knemo.po b/translations/lt/messages/kcm_knemo.po index 6978f7f..2f4164d 100644 --- a/translations/lt/messages/kcm_knemo.po +++ b/translations/lt/messages/kcm_knemo.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2006-09-11 08:34+0200\n" "PO-Revision-Date: 2005-09-10 19:40+0300\n" "Last-Translator: Donatas Glodenis \n" -"Language-Team: Lithuanian \n" +"Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/lt/messages/knemod.po b/translations/lt/messages/knemod.po index f53d5a7..5d371bd 100644 --- a/translations/lt/messages/knemod.po +++ b/translations/lt/messages/knemod.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2007-03-30 07:28+0200\n" "PO-Revision-Date: 2005-09-10 19:40+0300\n" "Last-Translator: Donatas Glodenis \n" -"Language-Team: Lithuanian \n" +"Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/nl/messages/kcm_knemo.po b/translations/nl/messages/kcm_knemo.po index dd49841..c2e3f16 100644 --- a/translations/nl/messages/kcm_knemo.po +++ b/translations/nl/messages/kcm_knemo.po @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2006-09-11 08:34+0200\n" "PO-Revision-Date: 2006-09-17 12:48+0200\n" "Last-Translator: Rinse de Vries \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/nl/messages/knemod.po b/translations/nl/messages/knemod.po index 9431c7d..e58460d 100644 --- a/translations/nl/messages/knemod.po +++ b/translations/nl/messages/knemod.po @@ -10,7 +10,7 @@ msgstr "" "POT-Creation-Date: 2007-03-30 07:28+0200\n" "PO-Revision-Date: 2007-04-01 12:23+0200\n" "Last-Translator: Rinse de Vries \n" -"Language-Team: \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/pt/messages/kcm_knemo.po b/translations/pt/messages/kcm_knemo.po index 168daa7..250157a 100644 --- a/translations/pt/messages/kcm_knemo.po +++ b/translations/pt/messages/kcm_knemo.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2006-09-11 08:34+0200\n" "PO-Revision-Date: 2006-09-12 14:43+0100\n" "Last-Translator: José Nuno Coelho Pires \n" -"Language-Team: pt \n" +"Language-Team: pt \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/pt/messages/knemod.po b/translations/pt/messages/knemod.po index cdc7031..5ab15b7 100644 --- a/translations/pt/messages/knemod.po +++ b/translations/pt/messages/knemod.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2007-03-30 07:28+0200\n" "PO-Revision-Date: 2007-03-30 10:53+0100\n" "Last-Translator: José Nuno Coelho Pires \n" -"Language-Team: Portuguese \n" +"Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/pt_BR/messages/kcm_knemo.po b/translations/pt_BR/messages/kcm_knemo.po index 1c51cb8..26aa9e9 100644 --- a/translations/pt_BR/messages/kcm_knemo.po +++ b/translations/pt_BR/messages/kcm_knemo.po @@ -12,7 +12,7 @@ msgstr "" "POT-Creation-Date: 2006-09-11 08:34+0200\n" "PO-Revision-Date: 2007-01-16 21:23-0200\n" "Last-Translator: Jose Monteiro \n" -"Language-Team: Brazilian Portuguese \n" +"Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/translations/pt_BR/messages/knemod.po b/translations/pt_BR/messages/knemod.po index bc6e532..9e10def 100644 --- a/translations/pt_BR/messages/knemod.po +++ b/translations/pt_BR/messages/knemod.po @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2007-03-30 07:28+0200\n" "PO-Revision-Date: 2006-07-28 21:39-0300\n" "Last-Translator: Lisiane Sztoltz Teixeira \n" -"Language-Team: Brazilian Portuguese \n" +"Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"