From 06144b0abeb0cf27a6d7f3a867dd5ebb2e16caf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:56:52 +0200 Subject: [PATCH] Additional k => tde renaming and fixes --- acinclude.m4 | 24 ++++++++++++------------ admin | 2 +- kbiff/Makefile.am | 2 +- po/de.po | 2 +- po/it.po | 2 +- po/pt_BR.po | 2 +- po/tr.po | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 2fc1a46..52170a6 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_KABC, "-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_KFILE, "-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_KFILE, "-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/kbiff/Makefile.am b/kbiff/Makefile.am index e4fa4b6..b3e6891 100644 --- a/kbiff/Makefile.am +++ b/kbiff/Makefile.am @@ -24,7 +24,7 @@ kbiff_la_LDFLAGS = $(all_libraries) -module -avoid-version # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. -kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) +kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) # this option you can leave out. Just, if you use "make dist", you need it noinst_HEADERS = setupdlg.h kbiff.h kbiffmonitor.h notify.h kbiffurl.h \ diff --git a/po/de.po b/po/de.po index 790b59e..386e351 100644 --- a/po/de.po +++ b/po/de.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2001-07-20 12:58-0700\n" "PO-Revision-Date: 2000-08-13 13:37+MET\n" "Last-Translator: Thomas Diehl \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/po/it.po b/po/it.po index ac03039..f730354 100644 --- a/po/it.po +++ b/po/it.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2001-07-20 12:58-0700\n" "PO-Revision-Date: 2000-09-06 09:59GMT+2\n" "Last-Translator: Andrea Rizzi \n" -"Language-Team: Italiano \n" +"Language-Team: Italiano \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 355d5f5..d4c85fc 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2001-07-20 12:58-0700\n" "PO-Revision-Date: 2000-09-26 01:51-0300\n" "Last-Translator: Elvis Pfützenreuter \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/po/tr.po b/po/tr.po index 2d7b4b6..1f81ebc 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "POT-Creation-Date: 2001-07-20 12:58-0700\n" "PO-Revision-Date: 2000-06-14 15:22+0200\n" "Last-Translator: Muhsin Yeþilyýlmaz \n" -"Language-Team: Turkish \n" +"Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8-bit\n"