diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:12 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:12 -0600 |
| commit | 23ccf90b021abe90a84b7a41d40c97ae594210e4 (patch) | |
| tree | 6501889fadcae2a597d85fb7110a5b94c4a40909 | |
| parent | ed814ce3e6da41f277dfee79a4012166af6eacce (diff) | |
| download | k3b-i18n-23ccf90b.tar.gz k3b-i18n-23ccf90b.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | ms/messages/libk3b.po | 2 | ||||
| -rw-r--r-- | nb/messages/k3b.po | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ecb21ff..15ffa89 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$kde32ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$kde33ornewer"; then @@ -1812,7 +1812,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libkdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2118,7 +2118,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2128,7 +2128,7 @@ else AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") fi ]) diff --git a/ms/messages/libk3b.po b/ms/messages/libk3b.po index a6103b8..4e552b7 100644 --- a/ms/messages/libk3b.po +++ b/ms/messages/libk3b.po @@ -1776,7 +1776,7 @@ msgstr "" #: projects/k3bdvdrecordwriter.cpp:106 #, fuzzy msgid "Cdrecord %1 does not support overburning." -msgstr "khidmat %s tidak menyokong chkconfig\n" +msgstr "khidmat %s tidak menyokong chtdeconfig\n" #: projects/k3babstractwriter.cpp:57 #, fuzzy diff --git a/nb/messages/k3b.po b/nb/messages/k3b.po index f5e0d4e..e6a104c 100644 --- a/nb/messages/k3b.po +++ b/nb/messages/k3b.po @@ -1940,7 +1940,7 @@ msgid "" "burn it anyway? (There may exist other valid image types that are not detected " "by K3b but will work fine.)" msgstr "" -"Diskfilen du valgte er ikke en gyldig ISO9660-bilde. Er du sikker på at du vil " +"Distdefilen du valgte er ikke en gyldig ISO9660-bilde. Er du sikker på at du vil " "brenne det likevel? (Det finnes andre gyldige diskfilformater som ikke blir " "oppdaget av K3b, men som vil fungere fint.)" |