From 64346aa68f31083efe54a57ca980c603aaed7900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:57:30 +0200 Subject: [PATCH] Additional k => tde renaming and fixes --- acinclude.m4 | 18 +++++++++--------- aclocal.m4 | 18 +++++++++--------- admin | 2 +- knetload/Makefile.am | 2 +- po/ca/knetload.po | 2 +- po/de/knetload.po | 2 +- po/it/knetload.po | 2 +- po/nl/knetload.po | 2 +- po/pt/knetload.po | 2 +- po/pt_BR/knetload.po | 2 +- po/tr/knetload.po | 2 +- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 660fe79..b2a5520 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2018,30 +2018,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") 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") # 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/aclocal.m4 b/aclocal.m4 index 9575145..bb88299 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2030,30 +2030,30 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDEIO, "-ltdeio") 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") # 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/knetload/Makefile.am b/knetload/Makefile.am index fd7bf16..e006677 100644 --- a/knetload/Makefile.am +++ b/knetload/Makefile.am @@ -17,7 +17,7 @@ INCLUDES = $(all_includes) bin_PROGRAMS = knetload -knetload_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +knetload_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor knetload_LDADD = $(LIB_TDEUI) diff --git a/po/ca/knetload.po b/po/ca/knetload.po index ec8f135..518d59a 100644 --- a/po/ca/knetload.po +++ b/po/ca/knetload.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2004-07-02 01:27+0200\n" "PO-Revision-Date: 2004-07-04 18:07+0200\n" "Last-Translator: Albert Astals Cid \n" -"Language-Team: Catalan \n" +"Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/de/knetload.po b/po/de/knetload.po index cea887a..f34b037 100644 --- a/po/de/knetload.po +++ b/po/de/knetload.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2004-07-02 01:27+0200\n" "PO-Revision-Date: 2003-12-03 17:58+0100\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/knetload.po b/po/it/knetload.po index 0b2665b..ffd17a1 100644 --- a/po/it/knetload.po +++ b/po/it/knetload.po @@ -9,7 +9,7 @@ msgstr "" "POT-Creation-Date: 2004-07-02 01:27+0200\n" "PO-Revision-Date: 2004-07-03 02:15+0200\n" "Last-Translator: Federico Zenith \n" -"Language-Team: Italian \n" +"Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/nl/knetload.po b/po/nl/knetload.po index c98233e..d344dc7 100644 --- a/po/nl/knetload.po +++ b/po/nl/knetload.po @@ -7,7 +7,7 @@ msgstr "" "POT-Creation-Date: 2004-07-02 01:27+0200\n" "PO-Revision-Date: 2004-07-07 13:28+0200\n" "Last-Translator: Rinse de Vries \n" -"Language-Team: Nederlands \n" +"Language-Team: Nederlands \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/pt/knetload.po b/po/pt/knetload.po index 8edb302..2bf2bb7 100644 --- a/po/pt/knetload.po +++ b/po/pt/knetload.po @@ -4,7 +4,7 @@ msgstr "" "POT-Creation-Date: 2004-07-02 01:27+0200\n" "PO-Revision-Date: 2004-07-05 13:36+0100\n" "Last-Translator: Pedro Morais \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/po/pt_BR/knetload.po b/po/pt_BR/knetload.po index 94cc12c..6038d51 100644 --- a/po/pt_BR/knetload.po +++ b/po/pt_BR/knetload.po @@ -11,7 +11,7 @@ msgstr "" "POT-Creation-Date: 2004-07-02 01:27+0200\n" "PO-Revision-Date: 2004-07-15 13:58-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" diff --git a/po/tr/knetload.po b/po/tr/knetload.po index ae7794d..7a62fc9 100644 --- a/po/tr/knetload.po +++ b/po/tr/knetload.po @@ -8,7 +8,7 @@ msgstr "" "POT-Creation-Date: 2004-07-02 01:27+0200\n" "PO-Revision-Date: 2003-11-21 19:28+0200\n" "Last-Translator: YILDIZ KARDEŞLER \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: 8bit\n"