From 58131a740107dc50765579628527647c98c9de4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:57:41 +0200 Subject: [PATCH] Additional k => tde renaming and fixes --- admin | 2 +- koffice-i18n-bg/acinclude.m4 | 218 +++++++++--------- koffice-i18n-bg/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-ca/acinclude.m4 | 218 +++++++++--------- koffice-i18n-ca/configure.in | 6 +- .../koffice/chalk/developers-plugins.docbook | 22 +- .../docs/koffice/chalk/installation.docbook | 4 +- .../chalk/tutorial-select-layer.docbook | 2 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kpresenter/a11y.docbook | 14 +- .../docs/koffice/kspread/a11y.docbook | 14 +- .../docs/koffice/kugar/index.docbook | 2 +- .../docs/koffice/kword/a11y.docbook | 14 +- .../docs/koffice/kword/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-cs/acinclude.m4 | 218 +++++++++--------- koffice-i18n-cs/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-cy/acinclude.m4 | 218 +++++++++--------- koffice-i18n-cy/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-da/acinclude.m4 | 218 +++++++++--------- koffice-i18n-da/configure.in | 6 +- .../koffice/chalk/developers-plugins.docbook | 22 +- .../docs/koffice/chalk/installation.docbook | 4 +- .../chalk/tutorial-select-layer.docbook | 2 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kpresenter/a11y.docbook | 14 +- .../docs/koffice/kpresenter/menus.docbook | 2 +- .../docs/koffice/kspread/a11y.docbook | 14 +- .../docs/koffice/kugar/index.docbook | 2 +- .../docs/koffice/kword/a11y.docbook | 14 +- .../docs/koffice/kword/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-de/acinclude.m4 | 218 +++++++++--------- koffice-i18n-de/configure.in | 6 +- .../koffice/chalk/developers-plugins.docbook | 22 +- .../docs/koffice/chalk/faq.docbook | 2 +- .../docs/koffice/chalk/installation.docbook | 4 +- .../docs/koffice/chalk/introduction.docbook | 2 +- .../chalk/tutorial-select-layer.docbook | 2 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kpresenter/a11y.docbook | 14 +- .../docs/koffice/kspread/a11y.docbook | 14 +- .../docs/koffice/kugar/index.docbook | 2 +- .../docs/koffice/kword/a11y.docbook | 14 +- .../docs/koffice/kword/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-el/acinclude.m4 | 218 +++++++++--------- koffice-i18n-el/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-en_GB/acinclude.m4 | 218 +++++++++--------- koffice-i18n-en_GB/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-es/acinclude.m4 | 218 +++++++++--------- koffice-i18n-es/configure.in | 6 +- .../docs/koffice/chalk/installation.docbook | 4 +- .../chalk/tutorial-select-layer.docbook | 2 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kpresenter/a11y.docbook | 14 +- .../docs/koffice/kspread/a11y.docbook | 14 +- .../docs/koffice/kugar/index.docbook | 2 +- .../docs/koffice/kword/a11y.docbook | 14 +- .../docs/koffice/kword/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-et/acinclude.m4 | 218 +++++++++--------- koffice-i18n-et/configure.in | 6 +- .../koffice/chalk/developers-plugins.docbook | 22 +- .../docs/koffice/chalk/installation.docbook | 4 +- .../chalk/tutorial-select-layer.docbook | 2 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kpresenter/a11y.docbook | 14 +- .../docs/koffice/kspread/a11y.docbook | 14 +- .../docs/koffice/kugar/index.docbook | 2 +- .../docs/koffice/kword/a11y.docbook | 14 +- .../docs/koffice/kword/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-eu/acinclude.m4 | 218 +++++++++--------- koffice-i18n-eu/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-fa/acinclude.m4 | 218 +++++++++--------- koffice-i18n-fa/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-fi/acinclude.m4 | 218 +++++++++--------- koffice-i18n-fi/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-fr/acinclude.m4 | 218 +++++++++--------- koffice-i18n-fr/configure.in | 6 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kformula/index.docbook | 2 +- .../docs/koffice/kugar/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-ga/acinclude.m4 | 218 +++++++++--------- koffice-i18n-ga/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-gl/acinclude.m4 | 218 +++++++++--------- koffice-i18n-gl/configure.in | 6 +- .../docs/koffice/kchart/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-hu/acinclude.m4 | 218 +++++++++--------- koffice-i18n-hu/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-it/acinclude.m4 | 218 +++++++++--------- koffice-i18n-it/configure.in | 6 +- .../koffice/chalk/developers-plugins.docbook | 22 +- .../docs/koffice/chalk/installation.docbook | 4 +- .../chalk/tutorial-select-layer.docbook | 2 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kpresenter/a11y.docbook | 14 +- .../docs/koffice/kspread/a11y.docbook | 14 +- .../docs/koffice/kugar/index.docbook | 2 +- .../docs/koffice/kword/a11y.docbook | 14 +- .../docs/koffice/kword/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 28 +-- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-ja/acinclude.m4 | 218 +++++++++--------- koffice-i18n-ja/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-km/acinclude.m4 | 218 +++++++++--------- koffice-i18n-km/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- koffice-i18n-lv/acinclude.m4 | 218 +++++++++--------- koffice-i18n-lv/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- koffice-i18n-ms/acinclude.m4 | 218 +++++++++--------- koffice-i18n-ms/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-nb/acinclude.m4 | 218 +++++++++--------- koffice-i18n-nb/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-nds/acinclude.m4 | 218 +++++++++--------- koffice-i18n-nds/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-ne/acinclude.m4 | 218 +++++++++--------- koffice-i18n-ne/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-nl/acinclude.m4 | 218 +++++++++--------- koffice-i18n-nl/configure.in | 6 +- .../koffice/chalk/developers-plugins.docbook | 22 +- .../docs/koffice/chalk/installation.docbook | 4 +- .../chalk/tutorial-select-layer.docbook | 2 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kpresenter/a11y.docbook | 14 +- .../docs/koffice/kspread/a11y.docbook | 14 +- .../docs/koffice/kugar/index.docbook | 2 +- .../docs/koffice/kword/a11y.docbook | 14 +- .../docs/koffice/kword/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-pl/acinclude.m4 | 218 +++++++++--------- koffice-i18n-pl/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-pt/acinclude.m4 | 218 +++++++++--------- koffice-i18n-pt/configure.in | 6 +- .../koffice/chalk/developers-plugins.docbook | 22 +- .../docs/koffice/chalk/installation.docbook | 4 +- .../chalk/tutorial-select-layer.docbook | 2 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kpresenter/a11y.docbook | 14 +- .../docs/koffice/kspread/a11y.docbook | 14 +- .../docs/koffice/kugar/index.docbook | 2 +- .../docs/koffice/kword/a11y.docbook | 14 +- .../docs/koffice/kword/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-pt_BR/acinclude.m4 | 218 +++++++++--------- koffice-i18n-pt_BR/configure.in | 6 +- .../koffice/chalk/developers-plugins.docbook | 22 +- .../docs/koffice/chalk/installation.docbook | 4 +- .../chalk/tutorial-select-layer.docbook | 2 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kpresenter/a11y.docbook | 14 +- .../docs/koffice/kspread/a11y.docbook | 14 +- .../docs/koffice/kugar/index.docbook | 2 +- .../docs/koffice/kword/a11y.docbook | 14 +- .../docs/koffice/kword/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-ru/acinclude.m4 | 218 +++++++++--------- koffice-i18n-ru/configure.in | 6 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kformula/index.docbook | 2 +- .../docs/koffice/kugar/index.docbook | 2 +- .../docs/koffice/kword/index.docbook | 2 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-sk/acinclude.m4 | 218 +++++++++--------- koffice-i18n-sk/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-sl/acinclude.m4 | 218 +++++++++--------- koffice-i18n-sl/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-sr/acinclude.m4 | 218 +++++++++--------- koffice-i18n-sr/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-sr@Latn/acinclude.m4 | 218 +++++++++--------- koffice-i18n-sr@Latn/configure.in | 4 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-sv/acinclude.m4 | 218 +++++++++--------- koffice-i18n-sv/configure.in | 6 +- .../koffice/chalk/developers-plugins.docbook | 22 +- .../docs/koffice/chalk/installation.docbook | 4 +- .../docs/koffice/chalk/introduction.docbook | 4 +- .../docs/koffice/chalk/settings.docbook | 2 +- .../chalk/tutorial-select-layer.docbook | 2 +- .../docs/koffice/kchart/index.docbook | 2 +- .../docs/koffice/kexi/database.docbook | 2 +- .../docs/koffice/kformula/index.docbook | 6 +- .../docs/koffice/kpresenter/a11y.docbook | 16 +- .../docs/koffice/kpresenter/menus.docbook | 4 +- .../docs/koffice/kpresenter/options.docbook | 4 +- .../docs/koffice/kspread/a11y.docbook | 16 +- .../docs/koffice/kspread/advanced.docbook | 6 +- .../docs/koffice/kugar/index.docbook | 2 +- .../docs/koffice/kword/a11y.docbook | 16 +- .../docs/koffice/kword/basics.docbook | 2 +- .../docs/koffice/kword/doclinks.docbook | 2 +- .../docs/koffice/kword/editing.docbook | 2 +- .../docs/koffice/kword/index.docbook | 4 +- .../docs/koffice/kword/mbtb.docbook | 8 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- .../messages/koffice/kpresenter.po | 4 +- koffice-i18n-tr/acinclude.m4 | 218 +++++++++--------- koffice-i18n-tr/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-uk/acinclude.m4 | 218 +++++++++--------- koffice-i18n-uk/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-zh_CN/acinclude.m4 | 218 +++++++++--------- koffice-i18n-zh_CN/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- koffice-i18n-zh_TW/acinclude.m4 | 218 +++++++++--------- koffice-i18n-zh_TW/configure.in | 6 +- .../messages/koffice/desktop_koffice.po | 6 +- .../messages/koffice/kformdesigner.po | 62 ++--- 267 files changed, 6050 insertions(+), 6050 deletions(-) diff --git a/admin b/admin index b4d585c6..6b7f7225 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/koffice-i18n-bg/acinclude.m4 b/koffice-i18n-bg/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-bg/acinclude.m4 +++ b/koffice-i18n-bg/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" kde_check_lib="libtdeio.la" @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + 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_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4556,7 +4556,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5661,7 +5661,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/koffice-i18n-bg/configure.in b/koffice-i18n-bg/configure.in index e41718cc..cd2ddd52 100644 --- a/koffice-i18n-bg/configure.in +++ b/koffice-i18n-bg/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-bg, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-bg, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -23,13 +23,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/koffice-i18n-bg/messages/koffice/desktop_koffice.po b/koffice-i18n-bg/messages/koffice/desktop_koffice.po index d35d3d4a..612c91bc 100644 --- a/koffice-i18n-bg/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-bg/messages/koffice/desktop_koffice.po @@ -576,7 +576,7 @@ msgstr "Name=Контейнери" msgid "Name=Basic Widgets" msgstr "Name=Основни графични обекти" -#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3 +#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3 msgid "Name=Form Designer KDevelop Plugin" msgstr "Name=Приставка на KDevelop за проектиране на форми" @@ -1899,11 +1899,11 @@ msgstr "Name=Компонент за текстообработка в KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Текстови документи" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Приставка за адресника на KDE" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:55 msgid "" "Comment=This datasource type lets you use your KDE Address Book entries." msgstr "" diff --git a/koffice-i18n-bg/messages/koffice/kformdesigner.po b/koffice-i18n-bg/messages/koffice/kformdesigner.po index 6457a5e5..bcdc5659 100644 --- a/koffice-i18n-bg/messages/koffice/kformdesigner.po +++ b/koffice-i18n-bg/messages/koffice/kformdesigner.po @@ -26,36 +26,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Документ за отваряне" -#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 +#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 msgid "Form Designer Part" msgstr "Част за проектиране на форми" -#: kdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 +#: tdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 msgid "Objects" msgstr "Обекти" -#: kdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 +#: tdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 msgid "Clear Widget Contents" msgstr "Изчистване съдържанието на управляващ елемент" -#: kdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 +#: tdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 msgid "Delete Widget" msgstr "Изтриване на графичен елемент" -#: kdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 +#: tdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 msgid "Preview Form" msgstr "Форма за преглед" -#: kdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 +#: tdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 #: test/kfd_part.cpp:218 msgid "Edit Tab Order" msgstr "Редактиране на реда на страниците" -#: kdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 msgid "Edit Pixmap Collection" msgstr "Редактиране на колекция с пикселни карти" -#: connectiondialog.cpp:49 kdevelop_plugin/kfd_kdev_part.cpp:216 +#: connectiondialog.cpp:49 tdevelop_plugin/kfd_kdev_part.cpp:216 #: test/kfd_part.cpp:220 msgid "Edit Form Connections" msgstr "Редактиране на колекция с форми" @@ -96,75 +96,75 @@ msgstr "Вер&тикално в разделител" msgid "&Ungroup Widgets" msgstr "&Разгрупиране на управляващи елементи" -#: kdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 +#: tdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 msgid "Bring Widget to Front" msgstr "Преместване на преден план" -#: kdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 +#: tdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 msgid "Send Widget to Back" msgstr "Преместване на заден план" -#: kdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 +#: tdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 msgid "Align Widgets' Positions" msgstr "Подравняване позицията на графичните елементи" -#: kdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 +#: tdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 msgid "To Left" msgstr "В ляво" -#: kdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 +#: tdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 msgid "To Right" msgstr "В дясно" -#: kdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 +#: tdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 msgid "To Top" msgstr "Горе" -#: kdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 +#: tdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 msgid "To Bottom" msgstr "Долу" -#: kdevelop_plugin/kfd_kdev_part.cpp:231 kdevelop_plugin/kfd_kdev_part.cpp:235 +#: tdevelop_plugin/kfd_kdev_part.cpp:231 tdevelop_plugin/kfd_kdev_part.cpp:235 #: test/kfd_part.cpp:248 test/kfd_part.cpp:252 msgid "To Grid" msgstr "Спрямо мрежата" -#: kdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 +#: tdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 msgid "Adjust Widgets' Sizes" msgstr "Регулиране размера на графичните елементи" -#: kdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 +#: tdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 msgid "To Fit" msgstr "Оптимален размер" -#: kdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 +#: tdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 msgid "To Shortest" msgstr "Спрямо най-късия" -#: kdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 +#: tdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 msgid "To Tallest" msgstr "Спрямо най-високия" -#: kdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 +#: tdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 msgid "To Narrowest" msgstr "Спрямо най-ниския" -#: kdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 +#: tdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 msgid "To Widest" msgstr "Спрямо най-широкия" #: factories/stdwidgetfactory.cpp:111 form.cpp:134 -#: kdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 +#: tdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 msgid "Form" msgstr "Форма" -#: formIO.cpp:110 formIO.cpp:281 kdevelop_plugin/kfd_kdev_part.cpp:279 -#: kdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 +#: formIO.cpp:110 formIO.cpp:281 tdevelop_plugin/kfd_kdev_part.cpp:279 +#: tdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 #: test/kfd_part.cpp:334 msgid "*.ui|Qt Designer UI Files" msgstr "*.ui|Qt Designer UI Files" -#: kdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 +#: tdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 msgid "" "The form \"%1\" has been modified.\n" "Do you want to save your changes or discard them?" @@ -172,7 +172,7 @@ msgstr "" "Форма \"%1\" е променена.\n" "Искате ли промените да бъдат записани?" -#: kdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 +#: tdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 msgid "Close Form" msgstr "Затваряне на форма" @@ -1132,19 +1132,19 @@ msgstr "Нов елемент" msgid "Sub Item" msgstr "Под елемент" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "&Хоризонтално подравняване" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "&Вертикално подравняване" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Подравняване &спрямо мрежата" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Прекъсване на подредба" diff --git a/koffice-i18n-ca/acinclude.m4 b/koffice-i18n-ca/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-ca/acinclude.m4 +++ b/koffice-i18n-ca/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" kde_check_lib="libtdeio.la" @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + 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_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4556,7 +4556,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5661,7 +5661,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/koffice-i18n-ca/configure.in b/koffice-i18n-ca/configure.in index fdb0e0db..7b87b1e3 100644 --- a/koffice-i18n-ca/configure.in +++ b/koffice-i18n-ca/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-ca, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-ca, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -41,13 +41,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/koffice-i18n-ca/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-ca/docs/koffice/chalk/developers-plugins.docbook index b492279a..930c6df3 100644 --- a/koffice-i18n-ca/docs/koffice/chalk/developers-plugins.docbook +++ b/koffice-i18n-ca/docs/koffice/chalk/developers-plugins.docbook @@ -246,8 +246,8 @@ Icon= Name=User-visible Name ServiceTypes=Chalk/Filter Type=Service -X-KDE-Library=chalkLIBRARYNAME -X-KDE-Version=2 +X-TDE-Library=chalkLIBRARYNAME +X-TDE-Version=2 El &chalk; 1.5 carrega els endollables amb X-KDE-Version=2X-TDE-Version=2 al fitxer .desktop. Els endollables del &chalk; 1.6 seran probablement binàriament incompatibles amb els de l'1.5 i necessitaran la versió número 3. Els endollables del &chalk; 2.0 plugins necessitaran la versió número 3. Sí, això no és completament lògic. @@ -1407,10 +1407,10 @@ METASOURCES = AUTO >Importa: X-KDE-Export=application/x-chalk -X-KDE-Import=image/x-xcf-gimp -X-KDE-Weight=1 -X-KDE-Library=libchalkXXXimport +>X-TDE-Export=application/x-chalk +X-TDE-Import=image/x-xcf-gimp +X-TDE-Weight=1 +X-TDE-Library=libchalkXXXimport ServiceTypes=KOfficeFilter @@ -1418,12 +1418,12 @@ ServiceTypes=KOfficeFilter >Exporta: X-KDE-Export=image/x-xcf-gimp -X-KDE-Import=application/x-chalk +>X-TDE-Export=image/x-xcf-gimp +X-TDE-Import=application/x-chalk ServiceTypes=KOfficeFilter Type=Service -X-KDE-Weight=1 -X-KDE-Library=libchalkXXXexport +X-TDE-Weight=1 +X-TDE-Library=libchalkXXXexport La imatge de dalt és la imatge amb la qual treballarem. Inicieu el chalk amb aquesta imatge (a la carpeta de documentació $KDEDIRTDEDIR/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png) i deseu-la a la vostra carpeta d'inici (escollint Desa imatge com a...KDE kdeutils +>tdeutils Kchart Instal·lar el mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > kdeaccessibilitytdeaccessibility La majoria de les característiques que es descriuen en aquest capítol s'habiliten en instal·lar el mòdul kdeaccessibilitytdeaccessibility. El mòdul kdeaccessibilitytdeaccessibility forma part del projecte &kde; http://www.kde.org. El paquet kdeaccessibilitytdeaccessibility es pot obtenir des de &kde-ftp;, el lloc ftp principal del projecte &kde;. El mòdul kdeaccessibilitytdeaccessibility inclou una aplicació de lupa per a la pantalla anomenada &kmagnifier;. Si està instal·lada, la podeu fer funcionar des de El mòdul kdeaccessibilitytdeaccessibility inclou un component de text a veu anomenat KTTS. Si KTTS està instal·lat, podeu configurar &kpresenter; per a que pronunciï el text que hi ha sota el punter del ratolí, o que pronunciï el text de cada component de la pantalla quan rebi el focus. Abans d'usar aquesta característica, heu de configurar KTTS. Teniu més detalls en el Manual de KTTS. Per activar la característica TTS en &kspread;, seleccioneu Instal·lar el mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > kdeaccessibilitytdeaccessibility La majoria de les característiques que es descriuen en aquest capítol s'habiliten en instal·lar el mòdul kdeaccessibilitytdeaccessibility. El mòdul kdeaccessibilitytdeaccessibility forma part del projecte &kde; http://www.kde.org. El paquet kdeaccessibilitytdeaccessibility es pot obtenir des de &kde-ftp;, el lloc ftp principal del projecte &kde;. El mòdul kdeaccessibilitytdeaccessibility inclou una aplicació de lupa per a la pantalla anomenada &kmagnifier;. Si està instal·lada, la podeu fer funcionar des de El mòdul kdeaccessibilitytdeaccessibility inclou un component de text a veu anomenat KTTS. Si KTTS està instal·lat, podeu configurar &kspread; per a que pronunciï el text que hi ha sota el punter del ratolí, o que pronunciï el text de cada component de la pantalla quan rebi el focus. Abans d'usar aquesta característica, heu de configurar KTTS. Teniu més detalls en el Manual de KTTS. Per activar la característica TTS en &kspread;, seleccioneu KDE kdeutils +>tdeutils kugar Instal·lar el mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > kdeaccessibilitytdeaccessibility La majoria de les característiques que es descriuen en aquest capítol s'habiliten en instal·lar el mòdul kdeaccessibilitytdeaccessibility. El mòdul kdeaccessibilitytdeaccessibility forma part del projecte &kde; http://www.kde.org. El paquet kdeaccessibilitytdeaccessibility es pot obtenir des de &kde-ftp;, el lloc ftp principal del projecte &kde;. El mòdul kdeaccessibilitytdeaccessibility inclou una aplicació de lupa per a la pantalla anomenada &kmagnifier;. Si està instal·lada, la podeu fer funcionar des de El mòdul kdeaccessibilitytdeaccessibility inclou un component de text a veu anomenat KTTS. Si KTTS està instal·lat, podeu configurar &kword; per a que pronunciï el text que hi ha sota el punter del ratolí, o que pronunciï el text de cada component de la pantalla quan rebi el focus. Abans d'usar aquesta característica, heu de configurar KTTS. Teniu més detalls en el Manual de KTTS. Per activar la característica TTS en &kword;, seleccioneu Les biblioteques de &kde; 3.3.0 (kdelibs) i el paquet base de &kde; 3.3.0 (kdebase). Es poden obtenir des de la Les biblioteques de &kde; 3.3.0 (tdelibs) i el paquet base de &kde; 3.3.0 (tdebase). Es poden obtenir des de la pàgina web de &kde;. &5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" kde_check_lib="libtdeio.la" @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + 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_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4556,7 +4556,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5661,7 +5661,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/koffice-i18n-cs/configure.in b/koffice-i18n-cs/configure.in index 82bd5ca2..52b3b9a9 100644 --- a/koffice-i18n-cs/configure.in +++ b/koffice-i18n-cs/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-cs, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-cs, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -25,13 +25,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/koffice-i18n-cs/messages/koffice/desktop_koffice.po b/koffice-i18n-cs/messages/koffice/desktop_koffice.po index 04312100..0a69db9b 100644 --- a/koffice-i18n-cs/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-cs/messages/koffice/desktop_koffice.po @@ -621,7 +621,7 @@ msgstr "Name=Kontejnery" msgid "Name=Basic Widgets" msgstr "Name=stdwidgets" -#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3 +#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3 #, fuzzy msgid "Name=Form Designer KDevelop Plugin" msgstr "Name=Návrhář formulářů" @@ -2096,11 +2096,11 @@ msgstr "Name=Textové procesory" msgid "GenericName=Text Documents" msgstr "Name=Textový dokument" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Modul Knihy adres KDE" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:55 msgid "" "Comment=This datasource type lets you use your KDE Address Book entries." msgstr "Comment=Tento zdroj dat umožňuje využít položky z Knihy adres." diff --git a/koffice-i18n-cs/messages/koffice/kformdesigner.po b/koffice-i18n-cs/messages/koffice/kformdesigner.po index c022e6e9..d6efc78a 100644 --- a/koffice-i18n-cs/messages/koffice/kformdesigner.po +++ b/koffice-i18n-cs/messages/koffice/kformdesigner.po @@ -24,36 +24,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Dokument k otevření" -#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 +#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 msgid "Form Designer Part" msgstr "" -#: kdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 +#: tdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 msgid "Objects" msgstr "Objekty" -#: kdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 +#: tdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 msgid "Clear Widget Contents" msgstr "Vyčistit obsah widgetu" -#: kdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 +#: tdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 msgid "Delete Widget" msgstr "Smazat widget" -#: kdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 +#: tdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 msgid "Preview Form" msgstr "Náhled formuláře" -#: kdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 +#: tdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 #: test/kfd_part.cpp:218 msgid "Edit Tab Order" msgstr "Upravit pořadí tabulátoru" -#: kdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 msgid "Edit Pixmap Collection" msgstr "" -#: connectiondialog.cpp:49 kdevelop_plugin/kfd_kdev_part.cpp:216 +#: connectiondialog.cpp:49 tdevelop_plugin/kfd_kdev_part.cpp:216 #: test/kfd_part.cpp:220 msgid "Edit Form Connections" msgstr "Upravit spojení formuláře" @@ -94,75 +94,75 @@ msgstr "" msgid "&Ungroup Widgets" msgstr "" -#: kdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 +#: tdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 msgid "Bring Widget to Front" msgstr "Vynést widget do popředí" -#: kdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 +#: tdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 msgid "Send Widget to Back" msgstr "Poslat widget do pozadí" -#: kdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 +#: tdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 msgid "Align Widgets' Positions" msgstr "Vyrovnat pozice widgetů" -#: kdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 +#: tdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 msgid "To Left" msgstr "Doleva" -#: kdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 +#: tdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 msgid "To Right" msgstr "Doprava" -#: kdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 +#: tdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 msgid "To Top" msgstr "Nahoru" -#: kdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 +#: tdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 msgid "To Bottom" msgstr "Dolů" -#: kdevelop_plugin/kfd_kdev_part.cpp:231 kdevelop_plugin/kfd_kdev_part.cpp:235 +#: tdevelop_plugin/kfd_kdev_part.cpp:231 tdevelop_plugin/kfd_kdev_part.cpp:235 #: test/kfd_part.cpp:248 test/kfd_part.cpp:252 msgid "To Grid" msgstr "Na mřížku" -#: kdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 +#: tdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 msgid "Adjust Widgets' Sizes" msgstr "Přizpůsobit velikosti widgetů" -#: kdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 +#: tdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 msgid "To Fit" msgstr "" -#: kdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 +#: tdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 msgid "To Shortest" msgstr "K nejkratšímu" -#: kdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 +#: tdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 msgid "To Tallest" msgstr "K nejvyššímu" -#: kdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 +#: tdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 msgid "To Narrowest" msgstr "K nejužšímu" -#: kdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 +#: tdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 msgid "To Widest" msgstr "K nejširšímu" #: factories/stdwidgetfactory.cpp:111 form.cpp:134 -#: kdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 +#: tdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 msgid "Form" msgstr "Formulář" -#: formIO.cpp:110 formIO.cpp:281 kdevelop_plugin/kfd_kdev_part.cpp:279 -#: kdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 +#: formIO.cpp:110 formIO.cpp:281 tdevelop_plugin/kfd_kdev_part.cpp:279 +#: tdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 #: test/kfd_part.cpp:334 msgid "*.ui|Qt Designer UI Files" msgstr "*.ui|UI soubory progtamu Qt Designer" -#: kdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 +#: tdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 msgid "" "The form \"%1\" has been modified.\n" "Do you want to save your changes or discard them?" @@ -170,7 +170,7 @@ msgstr "" "Formulář \"%1\" byl změněn.\n" "Chcete změny uložit, nebo zahodit?" -#: kdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 +#: tdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 msgid "Close Form" msgstr "Zavřít formulář" @@ -1128,19 +1128,19 @@ msgstr "Nová položka" msgid "Sub Item" msgstr "Podpoložka" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Uspořádat widgety &vodorovně" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Uspořádat widgety &svisle" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Uspořádat widgety v &mřížce" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Rozbít rozvržení" diff --git a/koffice-i18n-cy/acinclude.m4 b/koffice-i18n-cy/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-cy/acinclude.m4 +++ b/koffice-i18n-cy/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" kde_check_lib="libtdeio.la" @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + 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_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4556,7 +4556,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5661,7 +5661,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/koffice-i18n-cy/configure.in b/koffice-i18n-cy/configure.in index 669f4875..9da3df47 100644 --- a/koffice-i18n-cy/configure.in +++ b/koffice-i18n-cy/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-cy, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-cy, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -22,13 +22,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/koffice-i18n-cy/messages/koffice/desktop_koffice.po b/koffice-i18n-cy/messages/koffice/desktop_koffice.po index c16bac96..53a86279 100644 --- a/koffice-i18n-cy/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-cy/messages/koffice/desktop_koffice.po @@ -599,7 +599,7 @@ msgstr "Name=Celfigion Cynhwysydd" msgid "Name=Basic Widgets" msgstr "Name=Celfigion Sylfaenol" -#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3 +#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3 msgid "Name=Form Designer KDevelop Plugin" msgstr "Name=Ategyn KDevelop: Dylunydd Ffurflenni" @@ -1967,11 +1967,11 @@ msgstr "Name=Cydran Brosesu Geiriau KOffice " msgid "GenericName=Text Documents" msgstr "GenericName=Dogfennau Testun" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Ategyn Llyfr Cyfeiriadau KDE" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:55 msgid "" "Comment=This datasource type lets you use your KDE Address Book entries." msgstr "" diff --git a/koffice-i18n-cy/messages/koffice/kformdesigner.po b/koffice-i18n-cy/messages/koffice/kformdesigner.po index 3491d5a1..0942ea8f 100644 --- a/koffice-i18n-cy/messages/koffice/kformdesigner.po +++ b/koffice-i18n-cy/messages/koffice/kformdesigner.po @@ -27,37 +27,37 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Dogfen i'w hagor" -#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 +#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 msgid "Form Designer Part" msgstr "Rhan Dylunio Ffurflenni" -#: kdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 +#: tdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 msgid "Objects" msgstr "Gwrthrychau" -#: kdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 +#: tdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 #, fuzzy msgid "Clear Widget Contents" msgstr "Newid Maint y Celfigion i Ffitio'r Cynnwys" -#: kdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 +#: tdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 msgid "Delete Widget" msgstr "Dileu celfigyn" -#: kdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 +#: tdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 msgid "Preview Form" msgstr "Rhagolygu Ffurflen" -#: kdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 +#: tdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 #: test/kfd_part.cpp:218 msgid "Edit Tab Order" msgstr "Golygu Trefn Tabiau" -#: kdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 msgid "Edit Pixmap Collection" msgstr "Golygu Casgliad Picsfap" -#: connectiondialog.cpp:49 kdevelop_plugin/kfd_kdev_part.cpp:216 +#: connectiondialog.cpp:49 tdevelop_plugin/kfd_kdev_part.cpp:216 #: test/kfd_part.cpp:220 msgid "Edit Form Connections" msgstr "Golygu Cysylltiadau Ffurflen" @@ -106,83 +106,83 @@ msgstr "Haenlunio Celfigion yn &Fertigol" msgid "&Ungroup Widgets" msgstr "&Celfigion" -#: kdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 +#: tdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 msgid "Bring Widget to Front" msgstr "Anfon Celfigyn i'r Blaen" -#: kdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 +#: tdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 msgid "Send Widget to Back" msgstr "Anfon Celfigyn i'r Cefn" -#: kdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 +#: tdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 #, fuzzy msgid "Align Widgets' Positions" msgstr "Alinio Lleoliadau'r celfigion" -#: kdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 +#: tdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 msgid "To Left" msgstr "I'r Chwith" -#: kdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 +#: tdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 msgid "To Right" msgstr "I'r Dde" -#: kdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 +#: tdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 msgid "To Top" msgstr "I'r Pen" -#: kdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 +#: tdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 msgid "To Bottom" msgstr "I'r Gwaelod" -#: kdevelop_plugin/kfd_kdev_part.cpp:231 kdevelop_plugin/kfd_kdev_part.cpp:235 +#: tdevelop_plugin/kfd_kdev_part.cpp:231 tdevelop_plugin/kfd_kdev_part.cpp:235 #: test/kfd_part.cpp:248 test/kfd_part.cpp:252 msgid "To Grid" msgstr "I'r Grid" -#: kdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 +#: tdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 #, fuzzy msgid "Adjust Widgets' Sizes" msgstr "Addasu Maint y Celfigion" -#: kdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 +#: tdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 msgid "To Fit" msgstr "I Ffitio" -#: kdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 +#: tdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 msgid "To Shortest" msgstr "I'r Byrraf" -#: kdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 +#: tdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 msgid "To Tallest" msgstr "I'r Talaf" -#: kdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 +#: tdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 msgid "To Narrowest" msgstr "I'r Culaf" -#: kdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 +#: tdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 msgid "To Widest" msgstr "I'r Lletaf" #: factories/stdwidgetfactory.cpp:111 form.cpp:134 -#: kdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 +#: tdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 msgid "Form" msgstr "Ffurflen" -#: formIO.cpp:110 formIO.cpp:281 kdevelop_plugin/kfd_kdev_part.cpp:279 -#: kdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 +#: formIO.cpp:110 formIO.cpp:281 tdevelop_plugin/kfd_kdev_part.cpp:279 +#: tdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 #: test/kfd_part.cpp:334 msgid "*.ui|Qt Designer UI Files" msgstr "*.ui|Ffeiliau UI Qt Designer" -#: kdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 +#: tdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 msgid "" "The form \"%1\" has been modified.\n" "Do you want to save your changes or discard them?" msgstr "" -#: kdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 +#: tdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 msgid "Close Form" msgstr "Cau'r Ffurflen" @@ -1186,19 +1186,19 @@ msgstr "Eitem Newydd" msgid "Sub Item" msgstr "Is-Eitem" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Haenlunio Celfigion yn &Llorweddol" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Haenlunio Celfigion yn &Fertigol" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Haenlunio Celfigion mewn &Grid" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Torri'r Haenlun" diff --git a/koffice-i18n-da/acinclude.m4 b/koffice-i18n-da/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-da/acinclude.m4 +++ b/koffice-i18n-da/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" kde_check_lib="libtdeio.la" @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + 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_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4556,7 +4556,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5661,7 +5661,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/koffice-i18n-da/configure.in b/koffice-i18n-da/configure.in index 93e3923c..331d9635 100644 --- a/koffice-i18n-da/configure.in +++ b/koffice-i18n-da/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-da, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-da, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -39,13 +39,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/koffice-i18n-da/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-da/docs/koffice/chalk/developers-plugins.docbook index 36cddd96..d9415961 100644 --- a/koffice-i18n-da/docs/koffice/chalk/developers-plugins.docbook +++ b/koffice-i18n-da/docs/koffice/chalk/developers-plugins.docbook @@ -246,8 +246,8 @@ Icon= Name=User-visible Name ServiceTypes=Chalk/Filter Type=Service -X-KDE-Library=chalkBIBLIOTEKSNAVN -X-KDE-Version=2 +X-TDE-Library=chalkBIBLIOTEKSNAVN +X-TDE-Version=2 &chalk; 1.5 indlæser plugin med X-KDE-Version=2X-TDE-Version=2 angivet i .desktop-filen. &chalk; 1.6 kommer formodentlig ikke til at være binært kompatibel med 1.5 plugin og vil behøve versionsnumret 3. &chalk; 2.0 plugin kommer til at behøve versionsnumret 3. Ja, det er ikke helt logisk. @@ -1407,10 +1407,10 @@ METASOURCES = AUTO >Import: X-KDE-Export=application/x-chalk -X-KDE-Import=image/x-xcf-gimp -X-KDE-Weight=1 -X-KDE-Library=libchalkXXXimport +>X-TDE-Export=application/x-chalk +X-TDE-Import=image/x-xcf-gimp +X-TDE-Weight=1 +X-TDE-Library=libchalkXXXimport ServiceTypes=KOfficeFilter @@ -1418,12 +1418,12 @@ ServiceTypes=KOfficeFilter >Eksport: X-KDE-Export=image/x-xcf-gimp -X-KDE-Import=application/x-chalk +>X-TDE-Export=image/x-xcf-gimp +X-TDE-Import=application/x-chalk ServiceTypes=KOfficeFilter Type=Service -X-KDE-Weight=1 -X-KDE-Library=libchalkXXXexport +X-TDE-Weight=1 +X-TDE-Library=libchalkXXXexport Billedet ovenfor er det vi vil arbejde med. Start &chalk; med billedet (i dokumentationsmappe $KDEDIRTDEDIR/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png) og gem det i din hjemmemappe (ved at vælge Gem billede som...KDE kdeutils +>tdeutils Kchart Installér modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > kdeaccessibilitytdeaccessibility De fleste funktioner som beskrives i dette kapitel aktiveres ved at installere modulet kdeaccessibilitytdeaccessibility. Modulet kdeaccessibilitytdeaccessibility er en del af &kde;-projektet http://www.kde.org. Pakken kdeaccessibilitytdeaccessibility kan hentes fra &kde-ftp;, &kde;-projektets hoved-FTP-sted. Modulet kdeaccessibilitytdeaccessibility indeholder et skærmforstørrelsesglas som hedder Kmagnifier. Hvis det er installeret kan du køre det fra Modulet kdeaccessibilitytdeaccessibility indeholder en tekst-til-tale komponent som hedder KTTS. Hvis KTTS er installeret, kan du indstille &kpresenter; til at læse den tekst op som er under musemarkøren eller læse teksten op på hver grafisk skærmkontrol som får fokus. Inden du bruger denne funktion, skal KTTS først indstilles. Se KTTS-håndbogen for detaljer. For at slå TTT-funktionen til i &kpresenter;, vælges Hvis du tegner, vil du måske lave noget med flere objekter. Arrangér de forskellige dele hvor du vil have dem, vælg en og hold derefter &Ctrl;-tasten nede mens du klikker på de øvrige som du vil gruppere sammen. Klik på Gruppér objekter og derefter opfører delene sig som om de kun er et objekt. Det tdelistrer tingene sammen. +> og derefter opfører delene sig som om de kun er et objekt. Det klistrer tingene sammen. diff --git a/koffice-i18n-da/docs/koffice/kspread/a11y.docbook b/koffice-i18n-da/docs/koffice/kspread/a11y.docbook index 2c5c5a50..fa2a6d36 100644 --- a/koffice-i18n-da/docs/koffice/kspread/a11y.docbook +++ b/koffice-i18n-da/docs/koffice/kspread/a11y.docbook @@ -21,21 +21,21 @@ Installér modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > kdeaccessibilitytdeaccessibility De fleste funktioner som beskrives i dette kapitel aktiveres ved at installere modulet kdeaccessibilitytdeaccessibility. Modulet kdeaccessibilitytdeaccessibility er en del af &kde;-projektet http://www.kde.org. Pakken kdeaccessibilitytdeaccessibility kan hentes fra &kde-ftp;, &kde;-projektets hoved-FTP-sted. Modulet kdeaccessibilitytdeaccessibility indeholder et skærmforstørrelsesglas som hedder &kmagnifier;. Hvis det er installeret kan du køre det fra Modulet kdeaccessibilitytdeaccessibility indeholder en tekst-til-tale komponent som hedder KTTS. Hvis KTTS er installeret, kan du indstille &kspread; til at læse den tekst op som er under musemarkøren eller læse teksten op på hver grafisk skærmkontrol som får fokus. Inden du bruger denne funktion, skal KTTS først indstilles. Se KTTS-håndbogen for detaljer. For at slå TTT-funktionen til i &kspread;, vælges KDE kdeutils +>tdeutils kugar Installér modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > kdeaccessibilitytdeaccessibility De fleste funktioner som beskrives i dette kapitel aktiveres ved at installere modulet kdeaccessibilitytdeaccessibility. Modulet kdeaccessibilitytdeaccessibility er en del af &kde;-projektet http://www.kde.org. Pakken kdeaccessibilitytdeaccessibility kan hentes fra &kde-ftp;, &kde;-projektets hoved-FTP-sted. Modulet kdeaccessibilitytdeaccessibility indeholder et skærmforstørrelsesglas som hedder &kmagnifier;. Hvis det er installeret kan du køre det fra Modulet kdeaccessibilitytdeaccessibility indeholder en tekst-til-tale komponent som hedder KTTS. Hvis KTTS er installeret, kan du indstille &kword; til at læse den tekst op som er under musemarkøren eller læse teksten op på hver grafisk skærmkontrol som får fokus. Inden du bruger denne funktion, skal KTTS først indstilles. Se KTTS-håndbogen for detaljer. For at slå TTT-funktionen til i &kword;, vælges &kde; 3.3.0-bibliotekerne (kdelibs) og &kde; 3.3.0 basispakken (kdebase). Disse kan fås fra &kde; 3.3.0-bibliotekerne (tdelibs) og &kde; 3.3.0 basispakken (tdebase). Disse kan fås fra &kde;'s netside. &5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" kde_check_lib="libtdeio.la" @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + 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_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4556,7 +4556,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5661,7 +5661,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/koffice-i18n-de/configure.in b/koffice-i18n-de/configure.in index 075b0329..f1ae0af5 100644 --- a/koffice-i18n-de/configure.in +++ b/koffice-i18n-de/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-de, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-de, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -41,13 +41,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/koffice-i18n-de/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-de/docs/koffice/chalk/developers-plugins.docbook index a7c9028f..9d8d8066 100644 --- a/koffice-i18n-de/docs/koffice/chalk/developers-plugins.docbook +++ b/koffice-i18n-de/docs/koffice/chalk/developers-plugins.docbook @@ -246,8 +246,8 @@ Icon= Name=User-visible Name ServiceTypes=Chalk/Filter Type=Service -X-KDE-Library=chalkLIBRARYNAME -X-KDE-Version=2 +X-TDE-Library=chalkLIBRARYNAME +X-TDE-Version=2 &chalk; 1.5 lädt Module mit der Einstellung X-KDE-Version=2X-TDE-Version=2 in der .desktop-Datei. &chalk;-1.6-Module sind inkompatibel zu 1.5-Modulen und benötigen die Versionsnummer 3. &chalk;-2.0-Module werden die Versionnummer 3 benötigen. @@ -1405,10 +1405,10 @@ METASOURCES = AUTO >Importieren: X-KDE-Export=application/x-chalk -X-KDE-Import=image/x-xcf-gimp -X-KDE-Weight=1 -X-KDE-Library=libchalkXXXimport +>X-TDE-Export=application/x-chalk +X-TDE-Import=image/x-xcf-gimp +X-TDE-Weight=1 +X-TDE-Library=libchalkXXXimport ServiceTypes=KOfficeFilter @@ -1416,12 +1416,12 @@ ServiceTypes=KOfficeFilter >Exportieren: X-KDE-Export=image/x-xcf-gimp -X-KDE-Import=application/x-chalk +>X-TDE-Export=image/x-xcf-gimp +X-TDE-Import=application/x-chalk ServiceTypes=KOfficeFilter Type=Service -X-KDE-Weight=1 -X-KDE-Library=libchalkXXXexport +X-TDE-Weight=1 +X-TDE-Library=libchalkXXXexport boud@valdyas.org oder der Dokumentation sanderkoning@kde.nl. (Anm. d. Ü.: Für Fragen und Anmerkungen zur deutschen Übersetzung in Programm und Dokumentation schicken Sie bitte eine E-Mail an die Mailingliste: kde-i18n-de AT kde.org.) +>. (Anm. d. Ü.: Für Fragen und Anmerkungen zur deutschen Übersetzung in Programm und Dokumentation schicken Sie bitte eine E-Mail an die Mailingliste: tde-i18n-de AT kde.org.) &reporting.bugs; &updating.documentation; diff --git a/koffice-i18n-de/docs/koffice/chalk/installation.docbook b/koffice-i18n-de/docs/koffice/chalk/installation.docbook index bc0b17cd..fd67c1e9 100644 --- a/koffice-i18n-de/docs/koffice/chalk/installation.docbook +++ b/koffice-i18n-de/docs/koffice/chalk/installation.docbook @@ -13,8 +13,8 @@ När rutan är vald kan du markera ett textstycke med musen. Flytta musen till ett nytt ställe i dokumentet och klicka en gång med musens mittenknapp så kopieras en kopia av den markerade texten och tdelistras in på den nya platsen i dokumentet. +>När rutan är vald kan du markera ett textstycke med musen. Flytta musen till ett nytt ställe i dokumentet och klicka en gång med musens mittenknapp så kopieras en kopia av den markerade texten och klistras in på den nya platsen i dokumentet. För att kopiera text från ett stycke till ett annat när kryssrutan inte är vald, måste du markera texten, kopiera texten manuellt till klippbordet, och därefter manuellt tdelistra in texten på den nya platsen. För att kopiera text från ett stycke till ett annat när kryssrutan inte är vald, måste du markera texten, kopiera texten manuellt till klippbordet, och därefter manuellt klistra in texten på den nya platsen. diff --git a/koffice-i18n-sv/docs/koffice/kspread/a11y.docbook b/koffice-i18n-sv/docs/koffice/kspread/a11y.docbook index 1264bc08..d40a85bc 100644 --- a/koffice-i18n-sv/docs/koffice/kspread/a11y.docbook +++ b/koffice-i18n-sv/docs/koffice/kspread/a11y.docbook @@ -35,21 +35,21 @@ Installera modulen <command ->kdeaccessibility</command +>tdeaccessibility</command > kdeaccessibilitytdeaccessibility De flesta funktioner som beskrivs i det här kapitlet aktiveras genom att installera modulen kdeaccessibilitytdeaccessibility. Modulen kdeaccessibilitytdeaccessibility är en del av &kde;-projektet http://www.kde.org. Paketet kdeaccessibilitytdeaccessibility kan erhållas från &kde-ftp;, &kde;-projektets huvudsakliga FTP-plats. Modulen kdeaccessibilitytdeaccessibility innehåller ett skärmförstoringsglas som heter &kmagnifier;. Om det är installerat kan du köra det från Modulen kdeaccessibilitytdeaccessibility innehåller en text-till-tal komponent som kallas KTTS. Om KTTS är installerad, kan du ställa in &kspread; att läsa upp text som är under muspekaren eller läsa upp texten på varje grafisk skärmkomponent som får fokus. Innan du använder funktionen, ställ först in KTTS. Se Handbok KTTS för detaljinformation. För att sätta på TTT-funktionen i &kspread;, välj Klistriga tangenter Funktionen tillåter att väljartangenter som &Alt;, &Ctrl; och &Shift; hanteras utan att behöva hålla nere tangenterna.Det är användbart om du bara kan använda ett finger eller en hand för att hantera tangentbordet. När tdelistriga tangenter är aktiverade, tryck ner och släpp en &Alt;-,&Ctrl;- eller &Shift;-tangent, och tryck därefter på en annan tangent. Resultatet är som om du tryckte på båda tangenterna samtidigt. Tryck på &Alt;-,&Ctrl;- eller &Shift;-tangenten igen för att stänga av den tdelistriga tangenten. Aktivera funktionen med Funktionen tillåter att väljartangenter som &Alt;, &Ctrl; och &Shift; hanteras utan att behöva hålla nere tangenterna.Det är användbart om du bara kan använda ett finger eller en hand för att hantera tangentbordet. När klistriga tangenter är aktiverade, tryck ner och släpp en &Alt;-,&Ctrl;- eller &Shift;-tangent, och tryck därefter på en annan tangent. Resultatet är som om du tryckte på båda tangenterna samtidigt. Tryck på &Alt;-,&Ctrl;- eller &Shift;-tangenten igen för att stänga av den klistriga tangenten. Aktivera funktionen med K-menyn Markera funktionen du vill använda i listrutan till vänster i dialogrutan. Fliksidan Hjälp visar då en beskrivning, returtypen, syntax, parametrar och exempel för funktionen. Dessutom tillhandahåller sidan ofta länkar till liknande funktioner. Tryck sedan på knappen med den nedåtriktade pilen för att tdelistra in den i textredigeringsrutan längst ner i dialogrutan. +> visar då en beskrivning, returtypen, syntax, parametrar och exempel för funktionen. Dessutom tillhandahåller sidan ofta länkar till liknande funktioner. Tryck sedan på knappen med den nedåtriktade pilen för att klistra in den i textredigeringsrutan längst ner i dialogrutan. Fliken Parametrar Aritmetik med tdelistra in special +>Aritmetik med klistra in special Ibland kan du vilja lägga till ett enda värde till ett antal celler, eller subtrahera ett värde från dem, eller multiplicera eller dividera dem alla med ett enda värde. Alternativet Klistra in special... låter dig välja mellan att dela horisontellt och vertikalt. Den här tekniken är särskilt användbar om du vill välja ett område som är större än vad som kan visas i en vy, för att till exempel tdelistra in en kopierad cell i det. Använd rullningslisterna för att positionera vyerna så att övre vänstra och neder högra cellerna av det önskade området, markera övre vänstra cellen i en vy, och håll nere &Shift;-tangenten medan du markerar nedre högra cellen med Den här tekniken är särskilt användbar om du vill välja ett område som är större än vad som kan visas i en vy, för att till exempel klistra in en kopierad cell i det. Använd rullningslisterna för att positionera vyerna så att övre vänstra och neder högra cellerna av det önskade området, markera övre vänstra cellen i en vy, och håll nere &Shift;-tangenten medan du markerar nedre högra cellen med vänster musknapp. KDE kdeutils +>tdeutils kugar Installera modulen <command ->kdeaccessibility</command +>tdeaccessibility</command > kdeaccessibilitytdeaccessibility De flesta funktioner som beskrivs i det här kapitlet aktiveras genom att installera modulen kdeaccessibilitytdeaccessibility. Modulen kdeaccessibilitytdeaccessibility är en del av &kde;-projektet http://www.kde.org. Paketet kdeaccessibilitytdeaccessibility kan erhållas från &kde-ftp;, &kde;-projektets huvudsakliga FTP-plats. Modulen kdeaccessibilitytdeaccessibility innehåller ett skärmförstoringsglas som heter &kmagnifier;. Om det är installerat kan du köra det från Modulen kdeaccessibilitytdeaccessibility innehåller en text-till-tal komponent som kallas KTTS. Om KTTS är installerad, kan du ställa in &kword; att läsa upp text som är under muspekaren eller läsa upp texten på varje grafisk skärmkomponent som får fokus. Innan du använder funktionen, ställ först in KTTS. Se Handbok KTTS för detaljinformation. För att sätta på TTT-funktionen i &kword;, välj Funktionen tillåter att väljartangenter som &Alt;, &Ctrl; och &Shift; hanteras utan att behöva hålla nere tangenterna.Det är användbart om du bara kan använda ett finger eller en hand för att hantera tangentbordet. När tdelistriga tangenter är aktiverade, tryck ner och släpp en &Alt;-,&Ctrl;- eller &Shift;-tangent, och tryck därefter på en annan tangent. Resultatet är som om du tryckte på båda tangenterna samtidigt. Tryck på &Alt;-,&Ctrl;- eller &Shift;-tangenten igen för att stänga av den tdelistriga tangenten. Aktivera funktionen med Funktionen tillåter att väljartangenter som &Alt;, &Ctrl; och &Shift; hanteras utan att behöva hålla nere tangenterna.Det är användbart om du bara kan använda ett finger eller en hand för att hantera tangentbordet. När klistriga tangenter är aktiverade, tryck ner och släpp en &Alt;-,&Ctrl;- eller &Shift;-tangent, och tryck därefter på en annan tangent. Resultatet är som om du tryckte på båda tangenterna samtidigt. Tryck på &Alt;-,&Ctrl;- eller &Shift;-tangenten igen för att stänga av den klistriga tangenten. Aktivera funktionen med K-menyn Dokumentvyn - Det här är området på skärmen som används för att skriva in text. Det visar nuvarande status för dokumentet, och låter dig justerar ramar, välja text, och klippa ut eller tdelistra in text. +> - Det här är området på skärmen som används för att skriva in text. Det visar nuvarande status för dokumentet, och låter dig justerar ramar, välja text, och klippa ut eller klistra in text. diff --git a/koffice-i18n-sv/docs/koffice/kword/doclinks.docbook b/koffice-i18n-sv/docs/koffice/kword/doclinks.docbook index c5194585..389e6e31 100644 --- a/koffice-i18n-sv/docs/koffice/kword/doclinks.docbook +++ b/koffice-i18n-sv/docs/koffice/kword/doclinks.docbook @@ -104,7 +104,7 @@ >Kopiera länk. Länkadressen har nu lagts på klippbordet. Du kan tdelistra in klippbordets innehåll i vilket annat program som helst. +>Länkadressen har nu lagts på klippbordet. Du kan klistra in klippbordets innehåll i vilket annat program som helst. <title ->Klippa ut/kopiera/tdelistra in och klippbordet +>Klippa ut/kopiera/klistra in och klippbordet klippbordet &kde; 3.3.0 bibliotek (kdelibs) och &kde; 3.3.0 baspaketet (kdebase). Dessa kan skaffas från &kde; 3.3.0 bibliotek (tdelibs) och &kde; 3.3.0 baspaketet (tdebase). Dessa kan skaffas från &kde;:s webbsida. , så placerar du det markerade objektet i det här lagringsutrymmet. När du sedan använder kommandot Klistra in, infogar du informationen från klippbordet i dokumentet. För mer information, se avsnittet om Klipp ut, kopiera, tdelistra inKlipp ut, kopiera, klistra in. diff --git a/koffice-i18n-sv/docs/koffice/kword/mbtb.docbook b/koffice-i18n-sv/docs/koffice/kword/mbtb.docbook index 6dc47b12..08649f88 100644 --- a/koffice-i18n-sv/docs/koffice/kword/mbtb.docbook +++ b/koffice-i18n-sv/docs/koffice/kword/mbtb.docbook @@ -746,7 +746,7 @@ format="PNG"/>Genom att klicka på menyn Redigera kan du klippa ut, kopiera eller tdelistra in text, ångra eller göra om redigering, och utföra sökning och textersättning. +> kan du klippa ut, kopiera eller klistra in text, ångra eller göra om redigering, och utföra sökning och textersättning. @@ -846,7 +846,7 @@ format="PNG"/>Tar bort den markerade texten från dokumentet och placerar en kopia på klippbordet. För mer fullständiga anvisningar om klippa ut och tdelistra in, och en fullständig beskrivning av klippbordet, För mer fullständiga anvisningar om klippa ut och klistra in, och en fullständig beskrivning av klippbordet, klicka här. @@ -882,7 +882,7 @@ format="PNG"/>Placerar en kopia av den markerade texten på klippbordet, utan att ändra texten i dokumentet. För mer fullständiga anvisningar om klippa ut och tdelistra in, och en fullständig beskrivning av klippbordet, För mer fullständiga anvisningar om klippa ut och klistra in, och en fullständig beskrivning av klippbordet, klicka här. @@ -918,7 +918,7 @@ format="PNG"/>Infogar en kopia av klippbordet vid markörens nuvarande plats. Om det finns markerad text, ersätter &kword; all markerad text med innehållet på klippbordet. Klippbordet ändras inte. För mer fullständiga anvisningar om klippa ut och tdelistra in, och en fullständig beskrivning av klippbordet, Om det finns markerad text, ersätter &kword; all markerad text med innehållet på klippbordet. Klippbordet ändras inte. För mer fullständiga anvisningar om klippa ut och klistra in, och en fullständig beskrivning av klippbordet, klicka här. diff --git a/koffice-i18n-sv/messages/koffice/desktop_koffice.po b/koffice-i18n-sv/messages/koffice/desktop_koffice.po index b2c33a68..22ab710e 100644 --- a/koffice-i18n-sv/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-sv/messages/koffice/desktop_koffice.po @@ -581,7 +581,7 @@ msgstr "Name=Omgivande komponenter" msgid "Name=Basic Widgets" msgstr "Name=Standardkomponenter" -#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3 +#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3 msgid "Name=Form Designer KDevelop Plugin" msgstr "Name=KDevelop insticksprogram för formulärkonstruktion" @@ -1894,11 +1894,11 @@ msgstr "Name=Koffice-ordbehandlingskomponent" msgid "GenericName=Text Documents" msgstr "GenericName=Textdokument" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Insticksprogram för KDE:s adressbok" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:55 msgid "Comment=This datasource type lets you use your KDE Address Book entries." msgstr "" "Comment=Den här typen av datakälla låter dig använda information från KDE:s " diff --git a/koffice-i18n-sv/messages/koffice/kformdesigner.po b/koffice-i18n-sv/messages/koffice/kformdesigner.po index 288d23f7..458c3b62 100644 --- a/koffice-i18n-sv/messages/koffice/kformdesigner.po +++ b/koffice-i18n-sv/messages/koffice/kformdesigner.po @@ -24,36 +24,36 @@ msgstr "Kform-designer" msgid "Document to open" msgstr "Dokument att öppna" -#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 +#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 msgid "Form Designer Part" msgstr "Formulärkonstruktionsdel" -#: kdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 +#: tdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 msgid "Objects" msgstr "Objekt" -#: kdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 +#: tdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 msgid "Clear Widget Contents" msgstr "Rensa innehåll i grafisk komponent" -#: kdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 +#: tdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 msgid "Delete Widget" msgstr "Ta bort grafisk komponent" -#: kdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 +#: tdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 msgid "Preview Form" msgstr "Förhandsgranska formulär" -#: kdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 +#: tdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 #: test/kfd_part.cpp:218 msgid "Edit Tab Order" msgstr "Redigera tabulatorordning" -#: kdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 msgid "Edit Pixmap Collection" msgstr "Redigera bildsamling" -#: connectiondialog.cpp:49 kdevelop_plugin/kfd_kdev_part.cpp:216 +#: connectiondialog.cpp:49 tdevelop_plugin/kfd_kdev_part.cpp:216 #: test/kfd_part.cpp:220 msgid "Edit Form Connections" msgstr "Redigera formulärkopplingar" @@ -94,75 +94,75 @@ msgstr "Verti&kalt med avdelare" msgid "&Ungroup Widgets" msgstr "&Dela upp grafiska komponenter" -#: kdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 +#: tdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 msgid "Bring Widget to Front" msgstr "Lägg grafisk komponent överst" -#: kdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 +#: tdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 msgid "Send Widget to Back" msgstr "Lägg grafisk komponent underst" -#: kdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 +#: tdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 msgid "Align Widgets' Positions" msgstr "Justera komponenternas position" -#: kdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 +#: tdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 msgid "To Left" msgstr "Åt vänster" -#: kdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 +#: tdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 msgid "To Right" msgstr "Åt höger" -#: kdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 +#: tdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 msgid "To Top" msgstr "Uppåt" -#: kdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 +#: tdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 msgid "To Bottom" msgstr "Neråt" -#: kdevelop_plugin/kfd_kdev_part.cpp:231 kdevelop_plugin/kfd_kdev_part.cpp:235 +#: tdevelop_plugin/kfd_kdev_part.cpp:231 tdevelop_plugin/kfd_kdev_part.cpp:235 #: test/kfd_part.cpp:248 test/kfd_part.cpp:252 msgid "To Grid" msgstr "Till rutnät" -#: kdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 +#: tdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 msgid "Adjust Widgets' Sizes" msgstr "Justera komponenternas storlek" -#: kdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 +#: tdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 msgid "To Fit" msgstr "Passa in" -#: kdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 +#: tdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 msgid "To Shortest" msgstr "Till kortaste" -#: kdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 +#: tdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 msgid "To Tallest" msgstr "Till längsta" -#: kdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 +#: tdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 msgid "To Narrowest" msgstr "Till smalaste" -#: kdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 +#: tdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 msgid "To Widest" msgstr "Till bredaste" #: factories/stdwidgetfactory.cpp:111 form.cpp:134 -#: kdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 +#: tdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 msgid "Form" msgstr "Formulär" -#: formIO.cpp:110 formIO.cpp:281 kdevelop_plugin/kfd_kdev_part.cpp:279 -#: kdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 +#: formIO.cpp:110 formIO.cpp:281 tdevelop_plugin/kfd_kdev_part.cpp:279 +#: tdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 #: test/kfd_part.cpp:334 msgid "*.ui|Qt Designer UI Files" msgstr "*.ui|Qt Designer användargränssnittsfiler" -#: kdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 +#: tdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 msgid "" "The form \"%1\" has been modified.\n" "Do you want to save your changes or discard them?" @@ -170,7 +170,7 @@ msgstr "" "Formuläret \"%1\" har ändrats.\n" "Vill du spara dina ändringar eller kasta dem?" -#: kdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 +#: tdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 msgid "Close Form" msgstr "Stäng formulär" @@ -1131,19 +1131,19 @@ msgstr "Nytt objekt" msgid "Sub Item" msgstr "Delobjekt" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "&Horisontell layout av grafiska komponenter" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "&Vertikal layout av grafiska komponenter" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "&Layout av grafiska komponenter i ett rutnät" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Bryt layout" diff --git a/koffice-i18n-sv/messages/koffice/kpresenter.po b/koffice-i18n-sv/messages/koffice/kpresenter.po index 6eee9642..c49d3fd5 100644 --- a/koffice-i18n-sv/messages/koffice/kpresenter.po +++ b/koffice-i18n-sv/messages/koffice/kpresenter.po @@ -1861,11 +1861,11 @@ msgid "" msgstr "" "När rutan är vald kan du markera ett textstycke med musen. Flytta musen till " "ett nytt ställe i dokumentet och klicka en gång med musens mittenknapp så " -"kopieras en kopia av den markerade texten och tdelistras in på den nya platsen i " +"kopieras en kopia av den markerade texten och klistras in på den nya platsen i " "dokumentet.\n" "För att kopiera text från ett stycke till ett annat när kryssrutan inte är " "vald, måste du markera texten, kopiera texten manuellt till klippbordet, och " -"därefter manuellt tdelistra in texten på den nya platsen." +"därefter manuellt klistra in texten på den nya platsen." #: KPrConfig.cpp:768 KPrConfig.cpp:769 msgid "Change Starting Page Number" diff --git a/koffice-i18n-tr/acinclude.m4 b/koffice-i18n-tr/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-tr/acinclude.m4 +++ b/koffice-i18n-tr/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" kde_check_lib="libtdeio.la" @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + 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_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4556,7 +4556,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5661,7 +5661,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/koffice-i18n-tr/configure.in b/koffice-i18n-tr/configure.in index 0de77584..717d4af6 100644 --- a/koffice-i18n-tr/configure.in +++ b/koffice-i18n-tr/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-tr, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-tr, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -23,13 +23,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/koffice-i18n-tr/messages/koffice/desktop_koffice.po b/koffice-i18n-tr/messages/koffice/desktop_koffice.po index 654d0f32..bd86b63f 100644 --- a/koffice-i18n-tr/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-tr/messages/koffice/desktop_koffice.po @@ -586,7 +586,7 @@ msgstr "Name= Taşıyıcı Parçacıklar" msgid "Name=Basic Widgets" msgstr "Name=Temel Parçacıklar" -#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3 +#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3 msgid "Name=Form Designer KDevelop Plugin" msgstr "Name=FormTasarımcısı KDevelop Eklentisi" @@ -1950,11 +1950,11 @@ msgstr "Name=KOffice Kelime İşlem Bileşeni" msgid "GenericName=Text Documents" msgstr "Name=Metin Belgesi..." -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=KDE Adres Defteri Eklentisi" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:49 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:49 msgid "" "Comment=This datasource type lets you use your KDE Address Book entries." msgstr "" diff --git a/koffice-i18n-tr/messages/koffice/kformdesigner.po b/koffice-i18n-tr/messages/koffice/kformdesigner.po index 9546450d..2b083273 100644 --- a/koffice-i18n-tr/messages/koffice/kformdesigner.po +++ b/koffice-i18n-tr/messages/koffice/kformdesigner.po @@ -66,36 +66,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Açılacak belge" -#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:119 +#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:119 msgid "Form Designer Part" msgstr "Form Tasarımcı Parçası" -#: kdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:157 +#: tdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:157 msgid "Objects" msgstr "Nesneler" -#: kdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:211 +#: tdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:211 msgid "Clear Widget Contents" msgstr "Parçacık İçeriğini Sil" -#: kdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:212 +#: tdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:212 msgid "Delete Widget" msgstr "Parçacık sil" -#: kdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:213 +#: tdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:213 msgid "Preview Form" msgstr "Formu Önizle" -#: kdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 +#: tdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 #: test/kfd_part.cpp:214 msgid "Edit Tab Order" msgstr "Sekme Sırasını Düzenle" -#: kdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:215 +#: tdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:215 msgid "Edit Pixmap Collection" msgstr "Pixmap Koleksiyonunu Düzenle" -#: connectiondialog.cpp:49 kdevelop_plugin/kfd_kdev_part.cpp:216 +#: connectiondialog.cpp:49 tdevelop_plugin/kfd_kdev_part.cpp:216 #: test/kfd_part.cpp:216 msgid "Edit Form Connections" msgstr "Form Bağlantılarını Düzenle" @@ -140,75 +140,75 @@ msgstr "Ayraca &Dikey Olarak" msgid "&Ungroup Widgets" msgstr "Parçacıkları gruplandırmayı &kaldır" -#: kdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:236 +#: tdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:236 msgid "Bring Widget to Front" msgstr "Parçacığı Öne Getir" -#: kdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:237 +#: tdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:237 msgid "Send Widget to Back" msgstr "Parçacığı Geri Gönder" -#: kdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:239 +#: tdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:239 msgid "Align Widgets' Positions" msgstr "Parçacık Konumlarını Hizala" -#: kdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:240 +#: tdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:240 msgid "To Left" msgstr "Sola" -#: kdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:241 +#: tdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:241 msgid "To Right" msgstr "Sağa" -#: kdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:242 +#: tdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:242 msgid "To Top" msgstr "Üste" -#: kdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:243 +#: tdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:243 msgid "To Bottom" msgstr "Alta" -#: kdevelop_plugin/kfd_kdev_part.cpp:231 kdevelop_plugin/kfd_kdev_part.cpp:235 +#: tdevelop_plugin/kfd_kdev_part.cpp:231 tdevelop_plugin/kfd_kdev_part.cpp:235 #: test/kfd_part.cpp:244 test/kfd_part.cpp:248 msgid "To Grid" msgstr "Kılavuza" -#: kdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:246 +#: tdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:246 msgid "Adjust Widgets' Sizes" msgstr "Parçacık Boyutlarını Ayarla" -#: kdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:247 +#: tdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:247 msgid "To Fit" msgstr "Tam Sığacak şekilde" -#: kdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:249 +#: tdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:249 msgid "To Shortest" msgstr "En Kısaya" -#: kdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:250 +#: tdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:250 msgid "To Tallest" msgstr "En Uzuna" -#: kdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:251 +#: tdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:251 msgid "To Narrowest" msgstr "En Dara" -#: kdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:252 +#: tdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:252 msgid "To Widest" msgstr "En Genişe" #: factories/stdwidgetfactory.cpp:111 form.cpp:133 -#: kdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:276 +#: tdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:276 msgid "Form" msgstr "Form" -#: formIO.cpp:110 formIO.cpp:281 kdevelop_plugin/kfd_kdev_part.cpp:279 -#: kdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:295 +#: formIO.cpp:110 formIO.cpp:281 tdevelop_plugin/kfd_kdev_part.cpp:279 +#: tdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:295 #: test/kfd_part.cpp:330 msgid "*.ui|Qt Designer UI Files" msgstr "*.ui|Qt Tasarımcı UI Dosyaları" -#: kdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:342 +#: tdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:342 msgid "" "The form \"%1\" has been modified.\n" "Do you want to save your changes or discard them?" @@ -216,7 +216,7 @@ msgstr "" "\"%1\" formu değiştirildi.\n" "Değişiklikleri kaydedilsin mi yoksa, iptal mi edilsin?" -#: kdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:344 +#: tdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:344 msgid "Close Form" msgstr "Formu Kapat" @@ -1179,19 +1179,19 @@ msgstr "Yeni Öğe" msgid "Sub Item" msgstr "Alt Öğe" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Parçacıkları &Yatay Olarak Diz" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Parçacıkları &Dikey Olarak Diz" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Parçacıkları I&zgaraya Diz" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Düzeni Kır" diff --git a/koffice-i18n-uk/acinclude.m4 b/koffice-i18n-uk/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-uk/acinclude.m4 +++ b/koffice-i18n-uk/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" kde_check_lib="libtdeio.la" @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + 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_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4556,7 +4556,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5661,7 +5661,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/koffice-i18n-uk/configure.in b/koffice-i18n-uk/configure.in index 0e7c60ee..c6d810b2 100644 --- a/koffice-i18n-uk/configure.in +++ b/koffice-i18n-uk/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-uk, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-uk, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -22,13 +22,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/koffice-i18n-uk/messages/koffice/desktop_koffice.po b/koffice-i18n-uk/messages/koffice/desktop_koffice.po index 209524e8..a379c68b 100644 --- a/koffice-i18n-uk/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-uk/messages/koffice/desktop_koffice.po @@ -575,7 +575,7 @@ msgstr "Name=Віджети контейнера" msgid "Name=Basic Widgets" msgstr "Name=Основні віджети" -#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3 +#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3 msgid "Name=Form Designer KDevelop Plugin" msgstr "Name=Втулок дизайнера форм KDevelop" @@ -1904,11 +1904,11 @@ msgstr "Name=Компонент текстового редактора KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Текстові документи" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Втулок адресної книги KDE" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:55 msgid "" "Comment=This datasource type lets you use your KDE Address Book entries." msgstr "" diff --git a/koffice-i18n-uk/messages/koffice/kformdesigner.po b/koffice-i18n-uk/messages/koffice/kformdesigner.po index 82a343e7..1f7e1933 100644 --- a/koffice-i18n-uk/messages/koffice/kformdesigner.po +++ b/koffice-i18n-uk/messages/koffice/kformdesigner.po @@ -24,36 +24,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Відкрити документ" -#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 +#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 msgid "Form Designer Part" msgstr "Компонент редактора форм" -#: kdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 +#: tdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 msgid "Objects" msgstr "Об'єкти" -#: kdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 +#: tdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 msgid "Clear Widget Contents" msgstr "Очистити вміст віджета" -#: kdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 +#: tdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 msgid "Delete Widget" msgstr "Видалити віджет" -#: kdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 +#: tdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 msgid "Preview Form" msgstr "Перегляд форми" -#: kdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 +#: tdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 #: test/kfd_part.cpp:218 msgid "Edit Tab Order" msgstr "Зміна порядку табуляції" -#: kdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 msgid "Edit Pixmap Collection" msgstr "Змінити набір зображень" -#: connectiondialog.cpp:49 kdevelop_plugin/kfd_kdev_part.cpp:216 +#: connectiondialog.cpp:49 tdevelop_plugin/kfd_kdev_part.cpp:216 #: test/kfd_part.cpp:220 msgid "Edit Form Connections" msgstr "Змінити набір з'єднань" @@ -94,75 +94,75 @@ msgstr "Верти&кально в роздільнику" msgid "&Ungroup Widgets" msgstr "&Розгрупувати віджети" -#: kdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 +#: tdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 msgid "Bring Widget to Front" msgstr "Перемістити віджет на передній план" -#: kdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 +#: tdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 msgid "Send Widget to Back" msgstr "Перемістити віджет на задній план" -#: kdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 +#: tdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 msgid "Align Widgets' Positions" msgstr "Вирівняти віджети" -#: kdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 +#: tdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 msgid "To Left" msgstr "Наліво" -#: kdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 +#: tdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 msgid "To Right" msgstr "Направо" -#: kdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 +#: tdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 msgid "To Top" msgstr "Наверх" -#: kdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 +#: tdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 msgid "To Bottom" msgstr "Вниз" -#: kdevelop_plugin/kfd_kdev_part.cpp:231 kdevelop_plugin/kfd_kdev_part.cpp:235 +#: tdevelop_plugin/kfd_kdev_part.cpp:231 tdevelop_plugin/kfd_kdev_part.cpp:235 #: test/kfd_part.cpp:248 test/kfd_part.cpp:252 msgid "To Grid" msgstr "До ґратки" -#: kdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 +#: tdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 msgid "Adjust Widgets' Sizes" msgstr "Вирівняти розміри віджетів" -#: kdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 +#: tdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 msgid "To Fit" msgstr "Підігнати" -#: kdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 +#: tdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 msgid "To Shortest" msgstr "До найкоротшого" -#: kdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 +#: tdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 msgid "To Tallest" msgstr "До найвищого" -#: kdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 +#: tdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 msgid "To Narrowest" msgstr "До найвужчого" -#: kdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 +#: tdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 msgid "To Widest" msgstr "До найширшого" #: factories/stdwidgetfactory.cpp:111 form.cpp:134 -#: kdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 +#: tdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 msgid "Form" msgstr "Форма" -#: formIO.cpp:110 formIO.cpp:281 kdevelop_plugin/kfd_kdev_part.cpp:279 -#: kdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 +#: formIO.cpp:110 formIO.cpp:281 tdevelop_plugin/kfd_kdev_part.cpp:279 +#: tdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 #: test/kfd_part.cpp:334 msgid "*.ui|Qt Designer UI Files" msgstr "*.ui|Файли форм Qt Designer" -#: kdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 +#: tdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 msgid "" "The form \"%1\" has been modified.\n" "Do you want to save your changes or discard them?" @@ -170,7 +170,7 @@ msgstr "" "Форму \"%1\" було змінено.\n" "Хочете зберегти зміни чи відкинути їх?" -#: kdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 +#: tdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 msgid "Close Form" msgstr "Закрити форму" @@ -1130,19 +1130,19 @@ msgstr "Новий елемент" msgid "Sub Item" msgstr "Піделемент" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Розмістити віджети &горизонтально" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Розмістити віджети &вертикально" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Розмістити віджети в &ґратці" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Забрати розкладку" diff --git a/koffice-i18n-zh_CN/acinclude.m4 b/koffice-i18n-zh_CN/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-zh_CN/acinclude.m4 +++ b/koffice-i18n-zh_CN/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" kde_check_lib="libtdeio.la" @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + 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_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4556,7 +4556,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5661,7 +5661,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/koffice-i18n-zh_CN/configure.in b/koffice-i18n-zh_CN/configure.in index 3e8df4da..76b108fa 100644 --- a/koffice-i18n-zh_CN/configure.in +++ b/koffice-i18n-zh_CN/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-zh_CN, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-zh_CN, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -22,13 +22,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po b/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po index ee240bfb..734af11a 100644 --- a/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-zh_CN/messages/koffice/desktop_koffice.po @@ -582,7 +582,7 @@ msgstr "Name=容器部件" msgid "Name=Basic Widgets" msgstr "Name=基本部件" -#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3 +#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3 msgid "Name=Form Designer KDevelop Plugin" msgstr "Name=表单设计器 KDevelop 插件" @@ -1951,11 +1951,11 @@ msgstr "Name=KOffice 字处理组件" msgid "GenericName=Text Documents" msgstr "GenericName=文本文档" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=KDE 地址簿插件" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:55 msgid "" "Comment=This datasource type lets you use your KDE Address Book entries." msgstr "Comment=该数据源类型允许您使用您的 KDE 地址簿条目。" diff --git a/koffice-i18n-zh_CN/messages/koffice/kformdesigner.po b/koffice-i18n-zh_CN/messages/koffice/kformdesigner.po index d2003b37..3575217a 100644 --- a/koffice-i18n-zh_CN/messages/koffice/kformdesigner.po +++ b/koffice-i18n-zh_CN/messages/koffice/kformdesigner.po @@ -21,36 +21,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "要打开的文档" -#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 +#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 msgid "Form Designer Part" msgstr "表单设计器部件" -#: kdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 +#: tdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 msgid "Objects" msgstr "对象" -#: kdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 +#: tdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 msgid "Clear Widget Contents" msgstr "清除部件内容" -#: kdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 +#: tdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 msgid "Delete Widget" msgstr "删除部件" -#: kdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 +#: tdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 msgid "Preview Form" msgstr "预览表单" -#: kdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 +#: tdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 #: test/kfd_part.cpp:218 msgid "Edit Tab Order" msgstr "编辑标签顺序" -#: kdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 msgid "Edit Pixmap Collection" msgstr "编辑像素图收藏" -#: connectiondialog.cpp:49 kdevelop_plugin/kfd_kdev_part.cpp:216 +#: connectiondialog.cpp:49 tdevelop_plugin/kfd_kdev_part.cpp:216 #: test/kfd_part.cpp:220 msgid "Edit Form Connections" msgstr "编辑表单连接" @@ -91,75 +91,75 @@ msgstr "分隔条内垂直(&C)" msgid "&Ungroup Widgets" msgstr "取消部件组合(&U)" -#: kdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 +#: tdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 msgid "Bring Widget to Front" msgstr "部件提到最前" -#: kdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 +#: tdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 msgid "Send Widget to Back" msgstr "部件推到最后" -#: kdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 +#: tdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 msgid "Align Widgets' Positions" msgstr "对齐部件的位置" -#: kdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 +#: tdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 msgid "To Left" msgstr "左对齐" -#: kdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 +#: tdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 msgid "To Right" msgstr "右对齐" -#: kdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 +#: tdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 msgid "To Top" msgstr "上对齐" -#: kdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 +#: tdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 msgid "To Bottom" msgstr "下对齐" -#: kdevelop_plugin/kfd_kdev_part.cpp:231 kdevelop_plugin/kfd_kdev_part.cpp:235 +#: tdevelop_plugin/kfd_kdev_part.cpp:231 tdevelop_plugin/kfd_kdev_part.cpp:235 #: test/kfd_part.cpp:248 test/kfd_part.cpp:252 msgid "To Grid" msgstr "网格对齐" -#: kdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 +#: tdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 msgid "Adjust Widgets' Sizes" msgstr "调整部件的大小" -#: kdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 +#: tdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 msgid "To Fit" msgstr "适合" -#: kdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 +#: tdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 msgid "To Shortest" msgstr "到垂直最短" -#: kdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 +#: tdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 msgid "To Tallest" msgstr "到垂直最长" -#: kdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 +#: tdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 msgid "To Narrowest" msgstr "到水平最短" -#: kdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 +#: tdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 msgid "To Widest" msgstr "到水平最长" #: factories/stdwidgetfactory.cpp:111 form.cpp:134 -#: kdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 +#: tdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 msgid "Form" msgstr "表单" -#: formIO.cpp:110 formIO.cpp:281 kdevelop_plugin/kfd_kdev_part.cpp:279 -#: kdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 +#: formIO.cpp:110 formIO.cpp:281 tdevelop_plugin/kfd_kdev_part.cpp:279 +#: tdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 #: test/kfd_part.cpp:334 msgid "*.ui|Qt Designer UI Files" msgstr ".ui|Qt 设计师 UI 文件" -#: kdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 +#: tdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 msgid "" "The form \"%1\" has been modified.\n" "Do you want to save your changes or discard them?" @@ -167,7 +167,7 @@ msgstr "" "表单“%1”已被修改。\n" "您是想要保存您的更改还是丢弃更改？" -#: kdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 +#: tdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 msgid "Close Form" msgstr "关闭表单" @@ -1125,19 +1125,19 @@ msgstr "新建项目" msgid "Sub Item" msgstr "子项目" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "水平排列部件(&H)" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "垂直排列部件(&V)" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "按网格排列部件(&G)" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "打乱布局(&B)" diff --git a/koffice-i18n-zh_TW/acinclude.m4 b/koffice-i18n-zh_TW/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-zh_TW/acinclude.m4 +++ b/koffice-i18n-zh_TW/acinclude.m4 @@ -23,8 +23,8 @@ dnl IMPORTANT NOTE: dnl Please do not modify this file unless you expect your modifications to be dnl carried into every other module in the repository. dnl -dnl Single-module modifications are best placed in configure.in for kdelibs -dnl and kdebase or configure.in.in if present. +dnl Single-module modifications are best placed in configure.in for tdelibs +dnl and tdebase or configure.in.in if present. # KDE_PATH_X_DIRECT dnl Internal subroutine of AC_PATH_X. @@ -103,41 +103,41 @@ ac_x_libraries=], [LIBS="$ac_save_LIBS" # First see if replacing the include by lib works. # Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ - /usr/X11/lib${kdelibsuff} \ - /usr/X11R6/lib${kdelibsuff} \ - /usr/X11R5/lib${kdelibsuff} \ - /usr/X11R4/lib${kdelibsuff} \ +for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \ + /usr/X11/lib${tdelibsuff} \ + /usr/X11R6/lib${tdelibsuff} \ + /usr/X11R5/lib${tdelibsuff} \ + /usr/X11R4/lib${tdelibsuff} \ \ - /usr/lib${kdelibsuff}/X11 \ - /usr/lib${kdelibsuff}/X11R6 \ - /usr/lib${kdelibsuff}/X11R5 \ - /usr/lib${kdelibsuff}/X11R4 \ + /usr/lib${tdelibsuff}/X11 \ + /usr/lib${tdelibsuff}/X11R6 \ + /usr/lib${tdelibsuff}/X11R5 \ + /usr/lib${tdelibsuff}/X11R4 \ \ - /usr/local/X11/lib${kdelibsuff} \ - /usr/local/X11R6/lib${kdelibsuff} \ - /usr/local/X11R5/lib${kdelibsuff} \ - /usr/local/X11R4/lib${kdelibsuff} \ + /usr/local/X11/lib${tdelibsuff} \ + /usr/local/X11R6/lib${tdelibsuff} \ + /usr/local/X11R5/lib${tdelibsuff} \ + /usr/local/X11R4/lib${tdelibsuff} \ \ - /usr/local/lib${kdelibsuff}/X11 \ - /usr/local/lib${kdelibsuff}/X11R6 \ - /usr/local/lib${kdelibsuff}/X11R5 \ - /usr/local/lib${kdelibsuff}/X11R4 \ + /usr/local/lib${tdelibsuff}/X11 \ + /usr/local/lib${tdelibsuff}/X11R6 \ + /usr/local/lib${tdelibsuff}/X11R5 \ + /usr/local/lib${tdelibsuff}/X11R4 \ \ - /usr/X386/lib${kdelibsuff} \ - /usr/x386/lib${kdelibsuff} \ - /usr/XFree86/lib${kdelibsuff}/X11 \ + /usr/X386/lib${tdelibsuff} \ + /usr/x386/lib${tdelibsuff} \ + /usr/XFree86/lib${tdelibsuff}/X11 \ \ - /usr/lib${kdelibsuff} \ - /usr/local/lib${kdelibsuff} \ - /usr/unsupported/lib${kdelibsuff} \ - /usr/athena/lib${kdelibsuff} \ - /usr/local/x11r5/lib${kdelibsuff} \ - /usr/lpp/Xamples/lib${kdelibsuff} \ - /lib/usr/lib${kdelibsuff}/X11 \ + /usr/lib${tdelibsuff} \ + /usr/local/lib${tdelibsuff} \ + /usr/unsupported/lib${tdelibsuff} \ + /usr/athena/lib${tdelibsuff} \ + /usr/local/x11r5/lib${tdelibsuff} \ + /usr/lpp/Xamples/lib${tdelibsuff} \ + /lib/usr/lib${tdelibsuff}/X11 \ \ - /usr/openwin/lib${kdelibsuff} \ - /usr/openwin/share/lib${kdelibsuff} \ + /usr/openwin/lib${tdelibsuff} \ + /usr/openwin/share/lib${tdelibsuff} \ ; \ do dnl Don't even attempt the hair of trying to link an X program! @@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) else AC_MSG_ERROR([your system fails at linking a small KDE application! Check, if your compiler is installed correctly and if you have used the -same compiler to compile Qt and kdelibs as you did use now. +same compiler to compile Qt and tdelibs as you did use now. For more details about this problem, look at the end of config.log.]) fi -if eval `KDEDIR= ./conftest 2>&5`; then +if eval `TDEDIR= ./conftest 2>&5`; then kde_result=done else kde_result=problems fi -KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log +TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log kde_have_all_paths=yes KDE_SET_PATHS($kde_result) @@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], [ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" - test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" - if test -n "$KDEDIRS"; then + test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs" + if test -n "$TDEDIRS"; then kde_save_IFS=$IFS IFS=: - for dir in $KDEDIRS; do + for dir in $TDEDIRS; do kde_default_bindirs="$dir/bin $kde_default_bindirs " done IFS=$kde_save_IFS @@ -613,7 +613,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then kde_sharedirs="$prefix/share /opt/trinity/share /opt/trinity/share /opt/kde/share /usr/share/kde /usr/local/share /usr/share" - test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" + test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/tde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -937,7 +937,7 @@ mips-sgi-irix6*) ac_x_includes="." fi if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" + ac_x_libraries="/usr/lib${tdelibsuff}" fi esac #from now on we use our own again @@ -1418,7 +1418,7 @@ qt_includes="" AC_ARG_WITH(qt-dir, AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), [ ac_qt_includes="$withval"/include - ac_qt_libraries="$withval"/lib${kdelibsuff} + ac_qt_libraries="$withval"/lib${tdelibsuff} ac_qt_bindir="$withval"/bin ]) @@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir" qt_libdirs="" for dir in $kde_qt_dirs; do - qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" + qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir" done qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" if test ! "$ac_qt_libraries" = "NO"; then @@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp AC_MSG_RESULT([$kde_cv_uic_plugins]) if test "$kde_cv_uic_plugins" != yes; then AC_MSG_ERROR([ -you need to install kdelibs first. +you need to install tdelibs first. -If you did install kdelibs, then the Qt version that is picked up by -this configure is not the same version you used to compile kdelibs. -The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the +If you did install tdelibs, then the Qt version that is picked up by +this configure is not the same version you used to compile tdelibs. +The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the _same Qt version_, compiled with the _same compiler_ and the same Qt configuration settings. ]) @@ -1785,7 +1785,7 @@ AC_CACHE_VAL(ac_cv_have_kde, if test "$kde_qtver" = 1; then kde_check_header="ksock.h" - kde_check_lib="libkdecore.la" + kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" kde_check_lib="libtdeio.la" @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail. So, check this please and use another prefix!]) fi -kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" -test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" +kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) ac_kde_libraries="$kde_libdir" @@ -1824,7 +1824,7 @@ fi if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed -by kdelibs]) +by tdelibs]) fi if test -n "$kde_widgetdir"; then @@ -1839,7 +1839,7 @@ else ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" fi -else dnl test -z $1, e.g. from kdelibs +else dnl test -z $1, e.g. from tdelibs ac_cv_have_kde="have_kde=no" @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") - AC_SUBST(LIB_KUTILS, "-ltdeutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") - AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") + AC_SUBST(LIB_TDEUTILS, "-ltdeutils") + AC_SUBST(LIB_TDEPIM, "-ltdepim") + 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_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") - AC_SUBST(LIB_KIO, "-ltdeio") - AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") + 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_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_TDESPELL, "-ltdespell") + AC_SUBST(LIB_TDEPARTS, "-ltdeparts") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") 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_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)") - AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then else case "$1" in setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) - kde_cv_proto_$1="yes - in libkdefakes" + kde_cv_proto_$1="yes - in libtdefakes" ;; *) kde_cv_proto_$1=unknown @@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -3549,7 +3549,7 @@ AC_CANONICAL_SYSTEM AC_ARG_PROGRAM AM_INIT_AUTOMAKE($1, $2) AM_DISABLE_LIBRARIES -AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) +AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) AC_CHECK_COMPILERS KDE_PROG_LIBTOOL AM_KDE_WITH_NLS @@ -4556,7 +4556,7 @@ fi PYTHONINC=-I$python_incdir -python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" +python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) if test ! -r $python_libdir/libpython$version.so; then AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) @@ -4946,14 +4946,14 @@ AC_DEFUN([KDE_CONF_FILES], AC_SUBST(CONF_FILES) ])dnl -dnl This sets the prefix, for arts and kdelibs +dnl This sets the prefix, for arts and tdelibs dnl Do NOT use in any other module. -dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde +dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde AC_DEFUN([KDE_SET_PREFIX_CORE], [ unset CDPATH - dnl make $KDEDIR the default for the installation - AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) + dnl make $TDEDIR the default for the installation + AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde}) if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix @@ -4977,25 +4977,25 @@ AC_DEFUN([KDE_SET_PREFIX], unset CDPATH dnl We can't give real code to that macro, only a value. dnl It only matters for --help, since we set the prefix in this function anyway. - AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) + AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix}) KDE_SET_DEFAULT_BINDIRS if test "x$prefix" = "xNONE"; then - dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) else - dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH + dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH kde_save_PATH="$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH" - KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) + KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend) PATH="$kde_save_PATH" fi kde_libs_prefix=`$KDECONFIG --prefix` if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then - AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. + AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs. This means it has been moved since you installed it. - This won't work. Please recompile kdelibs for the new prefix. + This won't work. Please recompile tdelibs for the new prefix. ]) fi kde_libs_htmldir=`$KDECONFIG --install html --expandvars` @@ -5003,7 +5003,7 @@ AC_DEFUN([KDE_SET_PREFIX], AC_MSG_CHECKING([where to install]) if test "x$prefix" = "xNONE"; then prefix=$kde_libs_prefix - AC_MSG_RESULT([$prefix (as returned by kde-config)]) + AC_MSG_RESULT([$prefix (as returned by tde-config)]) else dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different given_prefix=$prefix @@ -5661,7 +5661,7 @@ ssl_includes="" AC_ARG_WITH(ssl-dir, AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), [ ac_ssl_includes="$withval"/include - ac_ssl_libraries="$withval"/lib$kdelibsuff + ac_ssl_libraries="$withval"/lib$tdelibsuff ]) want_ssl=yes @@ -5681,7 +5681,7 @@ AC_CACHE_VAL(ac_cv_have_ssl, AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) ac_ssl_includes="$ssl_incdir" - ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" + ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs" if test ! "$ac_ssl_libraries" = "NO"; then ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" fi @@ -5918,9 +5918,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page dnl also defines KSTUFF_PKG_ERRORS on error AC_DEFUN([KDE_PKG_CHECK_MODULES], [ - PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" if test "$prefix" != "$kde_libs_prefix"; then - PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" + PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" fi export PKG_CONFIG_PATH PKG_CHECK_MODULES([$1],[$2],[$3],[$4]) diff --git a/koffice-i18n-zh_TW/configure.in b/koffice-i18n-zh_TW/configure.in index 0c1ec764..b9f87ef7 100644 --- a/koffice-i18n-zh_TW/configure.in +++ b/koffice-i18n-zh_TW/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-zh_TW, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-zh_TW, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -22,13 +22,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then # And if so, warn when they don't match if test "$kde_libs_prefix" != "$given_prefix"; then # And if kde doesn't know about the prefix yet - echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null + echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null if test $? -ne 0; then echo "" echo "Warning: you chose to install this package in $given_prefix," echo "but KDE was found in $kde_libs_prefix." echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" - echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" + echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix" echo "Then restart KDE." echo "" fi diff --git a/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po b/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po index 364df2b4..d4051b97 100644 --- a/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-zh_TW/messages/koffice/desktop_koffice.po @@ -585,7 +585,7 @@ msgstr "Name=容器視窗元件" msgid "Name=Basic Widgets" msgstr "Name=基本視窗元件" -#: kexi/formeditor/kdevelop_plugin/kformdesigner_kdev_part.desktop:3 +#: kexi/formeditor/tdevelop_plugin/kformdesigner_kdev_part.desktop:3 msgid "Name=Form Designer KDevelop Plugin" msgstr "Name=表單設計師 KDevelop 外掛程式" @@ -1898,11 +1898,11 @@ msgstr "Name=KOffice 文書處理文件" msgid "GenericName=Text Documents" msgstr "GenericName=文字文件" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=KDE 通訊錄外掛程式" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:55 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:55 msgid "" "Comment=This datasource type lets you use your KDE Address Book entries." msgstr "Comment=這個資料來源類別讓您使用您的 KDE 通訊錄項目。" diff --git a/koffice-i18n-zh_TW/messages/koffice/kformdesigner.po b/koffice-i18n-zh_TW/messages/koffice/kformdesigner.po index 2a6886ed..09b14c7f 100644 --- a/koffice-i18n-zh_TW/messages/koffice/kformdesigner.po +++ b/koffice-i18n-zh_TW/messages/koffice/kformdesigner.po @@ -22,36 +22,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "要開啟的文件" -#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 +#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 msgid "Form Designer Part" msgstr "表單設計 Part" -#: kdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 +#: tdevelop_plugin/kfd_kdev_part.cpp:158 test/kfd_part.cpp:158 msgid "Objects" msgstr "物件" -#: kdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 +#: tdevelop_plugin/kfd_kdev_part.cpp:211 test/kfd_part.cpp:215 msgid "Clear Widget Contents" msgstr "清除元件內容" -#: kdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 +#: tdevelop_plugin/kfd_kdev_part.cpp:212 test/kfd_part.cpp:216 msgid "Delete Widget" msgstr "刪除元件" -#: kdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 +#: tdevelop_plugin/kfd_kdev_part.cpp:213 test/kfd_part.cpp:217 msgid "Preview Form" msgstr "預覽表格" -#: kdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 +#: tdevelop_plugin/kfd_kdev_part.cpp:214 tabstopdialog.cpp:41 #: test/kfd_part.cpp:218 msgid "Edit Tab Order" msgstr "編輯 Tab 順序" -#: kdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:215 test/kfd_part.cpp:219 msgid "Edit Pixmap Collection" msgstr "編輯圖片集" -#: connectiondialog.cpp:49 kdevelop_plugin/kfd_kdev_part.cpp:216 +#: connectiondialog.cpp:49 tdevelop_plugin/kfd_kdev_part.cpp:216 #: test/kfd_part.cpp:220 msgid "Edit Form Connections" msgstr "編輯表單連線" @@ -92,75 +92,75 @@ msgstr "垂直分離(&C)" msgid "&Ungroup Widgets" msgstr "取消群組元件(&U)" -#: kdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 +#: tdevelop_plugin/kfd_kdev_part.cpp:223 test/kfd_part.cpp:240 msgid "Bring Widget to Front" msgstr "將元件帶到前端" -#: kdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 +#: tdevelop_plugin/kfd_kdev_part.cpp:224 test/kfd_part.cpp:241 msgid "Send Widget to Back" msgstr "將元件送回後端" -#: kdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 +#: tdevelop_plugin/kfd_kdev_part.cpp:226 test/kfd_part.cpp:243 msgid "Align Widgets' Positions" msgstr "排列元件位置" -#: kdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 +#: tdevelop_plugin/kfd_kdev_part.cpp:227 test/kfd_part.cpp:244 msgid "To Left" msgstr "到左" -#: kdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 +#: tdevelop_plugin/kfd_kdev_part.cpp:228 test/kfd_part.cpp:245 msgid "To Right" msgstr "到右" -#: kdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 +#: tdevelop_plugin/kfd_kdev_part.cpp:229 test/kfd_part.cpp:246 msgid "To Top" msgstr "到頂端" -#: kdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 +#: tdevelop_plugin/kfd_kdev_part.cpp:230 test/kfd_part.cpp:247 msgid "To Bottom" msgstr "到底端" -#: kdevelop_plugin/kfd_kdev_part.cpp:231 kdevelop_plugin/kfd_kdev_part.cpp:235 +#: tdevelop_plugin/kfd_kdev_part.cpp:231 tdevelop_plugin/kfd_kdev_part.cpp:235 #: test/kfd_part.cpp:248 test/kfd_part.cpp:252 msgid "To Grid" msgstr "到格子" -#: kdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 +#: tdevelop_plugin/kfd_kdev_part.cpp:233 test/kfd_part.cpp:250 msgid "Adjust Widgets' Sizes" msgstr "調整元件大小" -#: kdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 +#: tdevelop_plugin/kfd_kdev_part.cpp:234 test/kfd_part.cpp:251 msgid "To Fit" msgstr "最適合" -#: kdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 +#: tdevelop_plugin/kfd_kdev_part.cpp:236 test/kfd_part.cpp:253 msgid "To Shortest" msgstr "最短" -#: kdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 +#: tdevelop_plugin/kfd_kdev_part.cpp:237 test/kfd_part.cpp:254 msgid "To Tallest" msgstr "最高" -#: kdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 +#: tdevelop_plugin/kfd_kdev_part.cpp:238 test/kfd_part.cpp:255 msgid "To Narrowest" msgstr "最窄" -#: kdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 +#: tdevelop_plugin/kfd_kdev_part.cpp:239 test/kfd_part.cpp:256 msgid "To Widest" msgstr "最寬" #: factories/stdwidgetfactory.cpp:111 form.cpp:134 -#: kdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 +#: tdevelop_plugin/kfd_kdev_part.cpp:261 test/kfd_part.cpp:280 msgid "Form" msgstr "表單" -#: formIO.cpp:110 formIO.cpp:281 kdevelop_plugin/kfd_kdev_part.cpp:279 -#: kdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 +#: formIO.cpp:110 formIO.cpp:281 tdevelop_plugin/kfd_kdev_part.cpp:279 +#: tdevelop_plugin/kfd_kdev_part.cpp:314 test/kfd_part.cpp:299 #: test/kfd_part.cpp:334 msgid "*.ui|Qt Designer UI Files" msgstr "*.ui|Qt Designer UI 檔案" -#: kdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 +#: tdevelop_plugin/kfd_kdev_part.cpp:325 test/kfd_part.cpp:346 msgid "" "The form \"%1\" has been modified.\n" "Do you want to save your changes or discard them?" @@ -168,7 +168,7 @@ msgstr "" "表單 %1 已變更。\n" "您要儲存這些變更還是要丟棄？" -#: kdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 +#: tdevelop_plugin/kfd_kdev_part.cpp:327 test/kfd_part.cpp:348 msgid "Close Form" msgstr "關閉表單" @@ -1125,19 +1125,19 @@ msgstr "新增項目" msgid "Sub Item" msgstr "子項目" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "水平佈局元件(&H)" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "垂直佈局元件(&H)" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "以格子佈局元件" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "取消佈局(&B)"