From 00f56a6858b6a4b6dfb6e36a91f9e498641275ba Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:11:36 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- koffice-i18n-zh_TW/acinclude.m4 | 26 +++++++++++----------- .../messages/koffice/desktop_koffice.po | 8 +++---- koffice-i18n-zh_TW/messages/koffice/kplato.po | 10 ++++----- 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'koffice-i18n-zh_TW') diff --git a/koffice-i18n-zh_TW/acinclude.m4 b/koffice-i18n-zh_TW/acinclude.m4 index 4fbab9a1..fed43974 100644 --- a/koffice-i18n-zh_TW/acinclude.m4 +++ b/koffice-i18n-zh_TW/acinclude.m4 @@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") + AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-lkimproxy") + AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_KDNSSD, "-ltdednssd") + AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") @@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") else AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") @@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" AC_SUBST(KDE_PLUGIN) -# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" AC_SUBST(KDE_CHECK_PLUGIN) diff --git a/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po b/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po index 577d8ed4..6169729b 100644 --- a/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po @@ -1643,12 +1643,12 @@ msgstr "Name=旋轉圖片外掛程式" msgid "Name=Screenshot" msgstr "Name=螢幕快照" -#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:3 +#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:3 #: kspread/plugins/scripting/kspreadscripting.desktop:3 msgid "Name=Scripting plugin" msgstr "Name=命令稿外掛程式" -#: chalk/plugins/viewplugins/scripting/chalkscripting.desktop:38 +#: chalk/plugins/viewplugins/scripting/chaltdescripting.desktop:38 #: kspread/plugins/scripting/kspreadscripting.desktop:38 msgid "Comment=Allow execution of scripts" msgstr "Comment=允許執行命令稿" @@ -2174,11 +2174,11 @@ msgstr "GenericName=相關單字" msgid "Name=Print..." msgstr "Name=列印..." -#: tools/spell/kspelltool.desktop:3 +#: tools/spell/tdespelltool.desktop:3 msgid "Name=Spell Checker Tool" msgstr "Name=拼字檢查工具" -#: tools/spell/kspelltool.desktop:71 +#: tools/spell/tdespelltool.desktop:71 msgid "Comment=Check this Word's Spelling" msgstr "Comment=拼字檢查" diff --git a/koffice-i18n-zh_TW/messages/koffice/kplato.po b/koffice-i18n-zh_TW/messages/koffice/kplato.po index fc21fe53..be4e1994 100644 --- a/koffice-i18n-zh_TW/messages/koffice/kplato.po +++ b/koffice-i18n-zh_TW/messages/koffice/kplato.po @@ -818,31 +818,31 @@ msgstr "完成：" msgid "Effort:" msgstr "花費時間：" -#. i18n: file kpttaskresourcespanelbase.ui line 17 +#. i18n: file kpttastderesourcespanelbase.ui line 17 #: rc.cpp:628 #, no-c-format msgid "TaskResourcesPanelBase" msgstr "TaskResourcesPanelBase" -#. i18n: file kpttaskresourcespanelbase.ui line 29 +#. i18n: file kpttastderesourcespanelbase.ui line 29 #: rc.cpp:631 #, no-c-format msgid "Group" msgstr "群組" -#. i18n: file kpttaskresourcespanelbase.ui line 40 +#. i18n: file kpttastderesourcespanelbase.ui line 40 #: rc.cpp:634 #, no-c-format msgid "Max. Units" msgstr "最大單位" -#. i18n: file kpttaskresourcespanelbase.ui line 72 +#. i18n: file kpttastderesourcespanelbase.ui line 72 #: rc.cpp:637 #, no-c-format msgid "Assign resources:" msgstr "指定資源：" -#. i18n: file kpttaskresourcespanelbase.ui line 81 +#. i18n: file kpttastderesourcespanelbase.ui line 81 #: kpttaskappointmentsview.cc:63 rc.cpp:640 rc.cpp:768 #, no-c-format msgid "Resource" -- cgit v1.2.1