diff options
267 files changed, 6049 insertions, 6049 deletions
diff --git a/admin b/admin -Subproject b4d585c643d92787bfa17b935ce00b09960ee36 +Subproject 6b7f7225eff4c49b2dd71804d5fdacb03efcf46 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 <stdio.h> @@ -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 <stdio.h> @@ -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 </programlisting> </para ><para @@ -412,7 +412,7 @@ ToolStar::~ToolStar() <para >El &chalk; 1.5 carrega els endollables amb <literal ->X-KDE-Version=2</literal +>X-TDE-Version=2</literal > al fitxer <literal role="extension" >.desktop</literal >. 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. </para> @@ -1407,10 +1407,10 @@ METASOURCES = AUTO >Importa: </para> <programlisting ->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 </programlisting> @@ -1418,12 +1418,12 @@ ServiceTypes=KOfficeFilter >Exporta: </para> <programlisting ->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 </programlisting> <para diff --git a/koffice-i18n-ca/docs/koffice/chalk/installation.docbook b/koffice-i18n-ca/docs/koffice/chalk/installation.docbook index 98025127..feb696ca 100644 --- a/koffice-i18n-ca/docs/koffice/chalk/installation.docbook +++ b/koffice-i18n-ca/docs/koffice/chalk/installation.docbook @@ -13,8 +13,8 @@ <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/koffice-i18n-ca/docs/koffice/chalk/tutorial-select-layer.docbook b/koffice-i18n-ca/docs/koffice/chalk/tutorial-select-layer.docbook index 9546d015..2edd11ff 100644 --- a/koffice-i18n-ca/docs/koffice/chalk/tutorial-select-layer.docbook +++ b/koffice-i18n-ca/docs/koffice/chalk/tutorial-select-layer.docbook @@ -24,7 +24,7 @@ <para >La imatge de dalt és la imatge amb la qual treballarem. Inicieu el chalk amb aquesta imatge (a la carpeta de documentació <filename >$<envar ->KDEDIR</envar +>TDEDIR</envar >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename >) i deseu-la a la vostra carpeta d'inici (escollint <guilabel >Desa imatge com a...</guilabel diff --git a/koffice-i18n-ca/docs/koffice/kchart/index.docbook b/koffice-i18n-ca/docs/koffice/kchart/index.docbook index d6ef93c9..b55104e2 100644 --- a/koffice-i18n-ca/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-ca/docs/koffice/kchart/index.docbook @@ -64,7 +64,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-ca/docs/koffice/kpresenter/a11y.docbook b/koffice-i18n-ca/docs/koffice/kpresenter/a11y.docbook index d908b1cb..c4debe14 100644 --- a/koffice-i18n-ca/docs/koffice/kpresenter/a11y.docbook +++ b/koffice-i18n-ca/docs/koffice/kpresenter/a11y.docbook @@ -21,21 +21,21 @@ <sect1 id="a11y-install"> <title >Instal·lar el mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >La majoria de les característiques que es descriuen en aquest capítol s'habiliten en instal·lar el mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command >. El mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > forma part del projecte &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. El paquet <command ->kdeaccessibility</command +>tdeaccessibility</command > es pot obtenir des de &kde-ftp;, el lloc ftp principal del projecte &kde;. </para> <para @@ -118,7 +118,7 @@ ></indexterm> <para >El mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > inclou una aplicació de lupa per a la pantalla anomenada <ulink url="help:kmag" >&kmagnifier;</ulink >. Si està instal·lada, la podeu fer funcionar des de <menuchoice @@ -147,7 +147,7 @@ ></indexterm> <para >El mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > 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 <ulink url="help:kttsd" >Manual de KTTS</ulink >. Per activar la característica TTS en &kspread;, seleccioneu <menuchoice diff --git a/koffice-i18n-ca/docs/koffice/kspread/a11y.docbook b/koffice-i18n-ca/docs/koffice/kspread/a11y.docbook index 2aa72103..162fa0bd 100644 --- a/koffice-i18n-ca/docs/koffice/kspread/a11y.docbook +++ b/koffice-i18n-ca/docs/koffice/kspread/a11y.docbook @@ -21,21 +21,21 @@ <sect1 id="a11y-install"> <title >Instal·lar el mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >La majoria de les característiques que es descriuen en aquest capítol s'habiliten en instal·lar el mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command >. El mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > forma part del projecte &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. El paquet <command ->kdeaccessibility</command +>tdeaccessibility</command > es pot obtenir des de &kde-ftp;, el lloc ftp principal del projecte &kde;. </para> <para @@ -112,7 +112,7 @@ ></indexterm> <para >El mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > inclou una aplicació de lupa per a la pantalla anomenada <ulink url="help:kmag" >&kmagnifier;</ulink >. Si està instal·lada, la podeu fer funcionar des de <menuchoice @@ -141,7 +141,7 @@ ></indexterm> <para >El mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > 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 <ulink url="help:kttsd" >Manual de KTTS</ulink >. Per activar la característica TTS en &kspread;, seleccioneu <menuchoice diff --git a/koffice-i18n-ca/docs/koffice/kugar/index.docbook b/koffice-i18n-ca/docs/koffice/kugar/index.docbook index cce98fcd..c0afbfbe 100644 --- a/koffice-i18n-ca/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-ca/docs/koffice/kugar/index.docbook @@ -98,7 +98,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-ca/docs/koffice/kword/a11y.docbook b/koffice-i18n-ca/docs/koffice/kword/a11y.docbook index e1a79970..68c21651 100644 --- a/koffice-i18n-ca/docs/koffice/kword/a11y.docbook +++ b/koffice-i18n-ca/docs/koffice/kword/a11y.docbook @@ -21,21 +21,21 @@ <sect1 id="a11y-install"> <title >Instal·lar el mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >La majoria de les característiques que es descriuen en aquest capítol s'habiliten en instal·lar el mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command >. El mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > forma part del projecte &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. El paquet <command ->kdeaccessibility</command +>tdeaccessibility</command > es pot obtenir des de &kde-ftp;, el lloc ftp principal del projecte &kde;. </para> <para @@ -112,7 +112,7 @@ ></indexterm> <para >El mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > inclou una aplicació de lupa per a la pantalla anomenada <ulink url="help:kmag" >&kmagnifier;</ulink >. Si està instal·lada, la podeu fer funcionar des de <menuchoice @@ -141,7 +141,7 @@ ></indexterm> <para >El mòdul <command ->kdeaccessibility</command +>tdeaccessibility</command > 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 <ulink url="help:kttsd" >Manual de KTTS</ulink >. Per activar la característica TTS en &kword;, seleccioneu <menuchoice diff --git a/koffice-i18n-ca/docs/koffice/kword/index.docbook b/koffice-i18n-ca/docs/koffice/kword/index.docbook index f15843d8..1751bb75 100644 --- a/koffice-i18n-ca/docs/koffice/kword/index.docbook +++ b/koffice-i18n-ca/docs/koffice/kword/index.docbook @@ -1494,7 +1494,7 @@ <listitem> <para ->Les biblioteques de &kde; 3.3.0 (kdelibs) i el paquet base de &kde; 3.3.0 (kdebase). Es poden obtenir des de la <ulink url="http://www.kde.org" +>Les biblioteques de &kde; 3.3.0 (tdelibs) i el paquet base de &kde; 3.3.0 (tdebase). Es poden obtenir des de la <ulink url="http://www.kde.org" >pàgina web de &kde;</ulink >.</para> <tip diff --git a/koffice-i18n-ca/messages/koffice/desktop_koffice.po b/koffice-i18n-ca/messages/koffice/desktop_koffice.po index af3f6e89..31c21975 100644 --- a/koffice-i18n-ca/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-ca/messages/koffice/desktop_koffice.po @@ -579,7 +579,7 @@ msgstr "Name=Estris contenidors" msgid "Name=Basic Widgets" msgstr "Name=Estris estàndard" -#: 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=Endollat de disseny de formulari de KDevelop" @@ -1908,11 +1908,11 @@ msgstr "Name=Component de processament de text de KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Documents de text" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Connector de llibreta d'adreces 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-ca/messages/koffice/kformdesigner.po b/koffice-i18n-ca/messages/koffice/kformdesigner.po index 555514fa..4859ed80 100644 --- a/koffice-i18n-ca/messages/koffice/kformdesigner.po +++ b/koffice-i18n-ca/messages/koffice/kformdesigner.po @@ -24,36 +24,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Document a obrir" -#: 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 del dissenyador de formularis" -#: 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 "Objectes" -#: 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 "Esborra el continguts dels estris" -#: 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 "Esborra estri" -#: 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 "Previsualitza el formulari" -#: 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 "Edita l'ordre de tabulació" -#: 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 "Edita la col·lecció de mapes de píxels" -#: 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 "Edita les connexions de formulari" @@ -94,75 +94,75 @@ msgstr "verticalment en &divisors" msgid "&Ungroup Widgets" msgstr "&desagrupa estris" -#: 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 "Porta l'estri a davant" -#: 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 "Envia l'estri a darrera" -#: 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 "Alinia les posicions dels estris" -#: 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 "A l'esquerra" -#: 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 "A la dreta" -#: 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 "A dalt" -#: 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 "A baix" -#: 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 "A la graella" -#: 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 "Ajusta les mides dels estris" -#: 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 "Per a encaixar" -#: 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 "Al més curt" -#: 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 "Al més llarg" -#: 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 "Al més estret" -#: 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 "Al més ample" #: 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 "Formulari" -#: 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|Fitxers UI del 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 "" "El formulari \"%1\" s'ha modificat.\n" "Voleu desar els vostres canvis o descartar-los?" -#: 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 "Tanca formulari" @@ -1131,19 +1131,19 @@ msgstr "Nou ítem" msgid "Sub Item" msgstr "Sub ítem" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Ordena els estris &horitzontalment" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Ordena els estris &verticalment" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Ordena els estris en &graella" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Trenca la disposició" diff --git a/koffice-i18n-cs/acinclude.m4 b/koffice-i18n-cs/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-cs/acinclude.m4 +++ b/koffice-i18n-cs/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 <stdio.h> @@ -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 <stdio.h> @@ -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 <stdio.h> @@ -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 </programlisting> </para ><para @@ -412,7 +412,7 @@ ToolStar::~ToolStar() <para >&chalk; 1.5 indlæser plugin med <literal ->X-KDE-Version=2</literal +>X-TDE-Version=2</literal > angivet i <literal role="extension" >.desktop</literal >-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. </para> @@ -1407,10 +1407,10 @@ METASOURCES = AUTO >Import: </para> <programlisting ->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 </programlisting> @@ -1418,12 +1418,12 @@ ServiceTypes=KOfficeFilter >Eksport: </para> <programlisting ->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 </programlisting> <para diff --git a/koffice-i18n-da/docs/koffice/chalk/installation.docbook b/koffice-i18n-da/docs/koffice/chalk/installation.docbook index ab85d72d..5e8333f9 100644 --- a/koffice-i18n-da/docs/koffice/chalk/installation.docbook +++ b/koffice-i18n-da/docs/koffice/chalk/installation.docbook @@ -13,8 +13,8 @@ <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/koffice-i18n-da/docs/koffice/chalk/tutorial-select-layer.docbook b/koffice-i18n-da/docs/koffice/chalk/tutorial-select-layer.docbook index c2fbfe0c..78b1dd78 100644 --- a/koffice-i18n-da/docs/koffice/chalk/tutorial-select-layer.docbook +++ b/koffice-i18n-da/docs/koffice/chalk/tutorial-select-layer.docbook @@ -24,7 +24,7 @@ <para >Billedet ovenfor er det vi vil arbejde med. Start &chalk; med billedet (i dokumentationsmappe <filename >$<envar ->KDEDIR</envar +>TDEDIR</envar >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename >) og gem det i din hjemmemappe (ved at vælge <guilabel >Gem billede som...</guilabel diff --git a/koffice-i18n-da/docs/koffice/kchart/index.docbook b/koffice-i18n-da/docs/koffice/kchart/index.docbook index aac71cb2..d05bcf40 100644 --- a/koffice-i18n-da/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-da/docs/koffice/kchart/index.docbook @@ -56,7 +56,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-da/docs/koffice/kpresenter/a11y.docbook b/koffice-i18n-da/docs/koffice/kpresenter/a11y.docbook index 33fca74c..20dc150e 100644 --- a/koffice-i18n-da/docs/koffice/kpresenter/a11y.docbook +++ b/koffice-i18n-da/docs/koffice/kpresenter/a11y.docbook @@ -21,21 +21,21 @@ <sect1 id="a11y-install"> <title >Installér modulet <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >De fleste funktioner som beskrives i dette kapitel aktiveres ved at installere modulet <command ->kdeaccessibility</command +>tdeaccessibility</command >. Modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > er en del af &kde;-projektet <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Pakken <command ->kdeaccessibility</command +>tdeaccessibility</command > kan hentes fra &kde-ftp;, &kde;-projektets hoved-FTP-sted. </para> <para @@ -116,7 +116,7 @@ ></indexterm> <para >Modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > indeholder et skærmforstørrelsesglas som hedder <ulink url="help:kmag" >Kmagnifier</ulink >. Hvis det er installeret kan du køre det fra <menuchoice @@ -145,7 +145,7 @@ ></indexterm> <para >Modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > 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 <ulink url="help:kttsd" >KTTS-håndbogen</ulink > for detaljer. For at slå TTT-funktionen til i &kpresenter;, vælges <menuchoice diff --git a/koffice-i18n-da/docs/koffice/kpresenter/menus.docbook b/koffice-i18n-da/docs/koffice/kpresenter/menus.docbook index 662e5e38..3c603d24 100644 --- a/koffice-i18n-da/docs/koffice/kpresenter/menus.docbook +++ b/koffice-i18n-da/docs/koffice/kpresenter/menus.docbook @@ -1650,7 +1650,7 @@ charting in this doc wouldn't go astray either.</para <para >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å <guimenuitem >Gruppér objekter</guimenuitem -> og derefter opfører delene sig som om de kun er et objekt. Det tdelistrer tingene sammen.</para> +> og derefter opfører delene sig som om de kun er et objekt. Det klistrer tingene sammen.</para> </listitem> </varlistentry> 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 @@ <sect1 id="a11y-install"> <title >Installér modulet <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >De fleste funktioner som beskrives i dette kapitel aktiveres ved at installere modulet <command ->kdeaccessibility</command +>tdeaccessibility</command >. Modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > er en del af &kde;-projektet <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Pakken <command ->kdeaccessibility</command +>tdeaccessibility</command > kan hentes fra &kde-ftp;, &kde;-projektets hoved-FTP-sted. </para> <para @@ -110,7 +110,7 @@ ></indexterm> <para >Modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > indeholder et skærmforstørrelsesglas som hedder <ulink url="help:kmag" >&kmagnifier;</ulink >. Hvis det er installeret kan du køre det fra <menuchoice @@ -137,7 +137,7 @@ ></indexterm> <para >Modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > 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 <ulink url="help:kttsd" >KTTS-håndbogen</ulink > for detaljer. For at slå TTT-funktionen til i &kspread;, vælges <menuchoice diff --git a/koffice-i18n-da/docs/koffice/kugar/index.docbook b/koffice-i18n-da/docs/koffice/kugar/index.docbook index 1a63984f..c7e518f3 100644 --- a/koffice-i18n-da/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-da/docs/koffice/kugar/index.docbook @@ -84,7 +84,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-da/docs/koffice/kword/a11y.docbook b/koffice-i18n-da/docs/koffice/kword/a11y.docbook index b925d88d..e26a0a29 100644 --- a/koffice-i18n-da/docs/koffice/kword/a11y.docbook +++ b/koffice-i18n-da/docs/koffice/kword/a11y.docbook @@ -21,21 +21,21 @@ <sect1 id="a11y-install"> <title >Installér modulet <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >De fleste funktioner som beskrives i dette kapitel aktiveres ved at installere modulet <command ->kdeaccessibility</command +>tdeaccessibility</command >. Modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > er en del af &kde;-projektet <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Pakken <command ->kdeaccessibility</command +>tdeaccessibility</command > kan hentes fra &kde-ftp;, &kde;-projektets hoved-FTP-sted. </para> <para @@ -110,7 +110,7 @@ ></indexterm> <para >Modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > indeholder et skærmforstørrelsesglas som hedder <ulink url="help:kmag" >&kmagnifier;</ulink >. Hvis det er installeret kan du køre det fra <menuchoice @@ -137,7 +137,7 @@ ></indexterm> <para >Modulet <command ->kdeaccessibility</command +>tdeaccessibility</command > 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 <ulink url="help:kttsd" >KTTS-håndbogen</ulink > for detaljer. For at slå TTT-funktionen til i &kword;, vælges <menuchoice diff --git a/koffice-i18n-da/docs/koffice/kword/index.docbook b/koffice-i18n-da/docs/koffice/kword/index.docbook index 2ad93d82..c2e8e69f 100644 --- a/koffice-i18n-da/docs/koffice/kword/index.docbook +++ b/koffice-i18n-da/docs/koffice/kword/index.docbook @@ -1470,7 +1470,7 @@ <listitem> <para ->&kde; 3.3.0-bibliotekerne (kdelibs) og &kde; 3.3.0 basispakken (kdebase). Disse kan fås fra <ulink url="http://www.kde.org" +>&kde; 3.3.0-bibliotekerne (tdelibs) og &kde; 3.3.0 basispakken (tdebase). Disse kan fås fra <ulink url="http://www.kde.org" >&kde;'s netside.</ulink ></para> <tip diff --git a/koffice-i18n-da/messages/koffice/desktop_koffice.po b/koffice-i18n-da/messages/koffice/desktop_koffice.po index 681c2153..71434b52 100644 --- a/koffice-i18n-da/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-da/messages/koffice/desktop_koffice.po @@ -577,7 +577,7 @@ msgstr "Name=Container-kontroller" msgid "Name=Basic Widgets" msgstr "Name=Basale kontroller" -#: 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=Form Designer KDEvelop-plugin" @@ -1904,11 +1904,11 @@ msgstr "Name=KOffice tekstbehandlingskomponent" msgid "GenericName=Text Documents" msgstr "GenericName=Tekstdokument" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=KDE's adressebog Plugin" -#: 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-da/messages/koffice/kformdesigner.po b/koffice-i18n-da/messages/koffice/kformdesigner.po index 4d896344..45bf83f2 100644 --- a/koffice-i18n-da/messages/koffice/kformdesigner.po +++ b/koffice-i18n-da/messages/koffice/kformdesigner.po @@ -23,36 +23,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Dokument at åbne" -#: 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 "Form-Designer-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 "Objekter" -#: 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 "Ryd kontrollens indhold" -#: 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 "Slet kontrol" -#: 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 "Forhåndsvisningsformular" -#: 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 "Redigér fanebladsrækkefølge" -#: 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 "Redigér billedsamling" -#: 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 "Redigér formular-forbindelse" @@ -93,75 +93,75 @@ msgstr "&Lodret i opdeler" msgid "&Ungroup Widgets" msgstr "&Opdel grafiske kontroller" -#: 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 "Placér kontrol forrest" -#: 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 "Send kontrol tilbage" -#: 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 "Justér kontrollens placering" -#: 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 "Til venstre" -#: 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 "Til højre" -#: 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 "Til øverst" -#: 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 "Til underst" -#: 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 "Til gitter" -#: 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 "Justér kontrolstørrelse" -#: 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 "Tilpasning" -#: 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 "Til korteste" -#: 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 "Til højeste" -#: 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 "Til snævreste" -#: 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 "Til bredeste" #: 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 "Formular" -#: 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-filer" -#: 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?" @@ -169,7 +169,7 @@ msgstr "" "Formularen \"%1\" er blevet ændret.\n" "Ønsker du at gemme eller kassere dine ændringer?" -#: 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 "Luk formular" @@ -1130,19 +1130,19 @@ msgstr "Nyt punkt" msgid "Sub Item" msgstr "Underpunkt" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Udlæg kontroller &vandret" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Udlæg kontroller &lodret" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Udlæg kontroller i et &gitter" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Bryd layout" diff --git a/koffice-i18n-de/acinclude.m4 b/koffice-i18n-de/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-de/acinclude.m4 +++ b/koffice-i18n-de/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 <stdio.h> @@ -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 </programlisting> </para ><para @@ -412,7 +412,7 @@ ToolStar::~ToolStar() <para >&chalk; 1.5 lädt Module mit der Einstellung <literal ->X-KDE-Version=2</literal +>X-TDE-Version=2</literal > in der <literal role="extension" >.desktop</literal >-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. </para> @@ -1405,10 +1405,10 @@ METASOURCES = AUTO >Importieren: </para> <programlisting ->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 </programlisting> @@ -1416,12 +1416,12 @@ ServiceTypes=KOfficeFilter >Exportieren: </para> <programlisting ->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 </programlisting> <para diff --git a/koffice-i18n-de/docs/koffice/chalk/faq.docbook b/koffice-i18n-de/docs/koffice/chalk/faq.docbook index 8c5e65c5..a58f3306 100644 --- a/koffice-i18n-de/docs/koffice/chalk/faq.docbook +++ b/koffice-i18n-de/docs/koffice/chalk/faq.docbook @@ -17,6 +17,6 @@ >boud@valdyas.org</email > oder der Dokumentation <email >sanderkoning@kde.nl</email ->. (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.) </para> +>. (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.) </para> &reporting.bugs; &updating.documentation; </chapter> 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 @@ <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/koffice-i18n-de/docs/koffice/chalk/introduction.docbook b/koffice-i18n-de/docs/koffice/chalk/introduction.docbook index 650f4829..ccadee24 100644 --- a/koffice-i18n-de/docs/koffice/chalk/introduction.docbook +++ b/koffice-i18n-de/docs/koffice/chalk/introduction.docbook @@ -111,7 +111,7 @@ <para >Hi, Ich bin Boudewijn Rempt — der derzeitige Betreuer von &chalk;. Ich habe Sprachwissenschaften studiert, eine Umschulung zum Datenbankprogrammierer gemacht, als Java-Hacker gearbeitet, studiere Theologie, und ich habe immer gerne ein bisschen gemalt und entworfen. Auffällig abwesend in meinem Leben waren immer zwei wichtige Aspekte für den Entwickler einer Grafiksoftware: Mathematik und Erfahrung mit Grafikdesign. Das bedeutet, dass ich möglicherweise nicht die geeignete Person bin, um die Feinheiten zur Benutzung einer Grafikbearbeitung oder eines Malprogramms zu erklären. Sollten Sie mich bei einem Fehler erwischen, zögern Sie nicht, mir eine E-Mail zu schreiben: <email >boud@valdyas.org</email ->. (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.) </para> +>. (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.) </para> </sect1> </chapter> diff --git a/koffice-i18n-de/docs/koffice/chalk/tutorial-select-layer.docbook b/koffice-i18n-de/docs/koffice/chalk/tutorial-select-layer.docbook index 66fd4dd9..2ed06112 100644 --- a/koffice-i18n-de/docs/koffice/chalk/tutorial-select-layer.docbook +++ b/koffice-i18n-de/docs/koffice/chalk/tutorial-select-layer.docbook @@ -24,7 +24,7 @@ <para >Das obige Bild ist das, mit dem Sie arbeiten werden. Starten Sie Chalk mit diesem Bild (aus dem Dokumentationsordner <filename >$<envar ->KDEDIR</envar +>TDEDIR</envar >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename >) und speichern Sie es in Ihr Home-Verzeichnis, indem Sie <guilabel >Bild speichern unter ...</guilabel diff --git a/koffice-i18n-de/docs/koffice/kchart/index.docbook b/koffice-i18n-de/docs/koffice/kchart/index.docbook index 73f2d4bf..8e0f840e 100644 --- a/koffice-i18n-de/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-de/docs/koffice/kchart/index.docbook @@ -70,7 +70,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >KChart</keyword> <keyword diff --git a/koffice-i18n-de/docs/koffice/kpresenter/a11y.docbook b/koffice-i18n-de/docs/koffice/kpresenter/a11y.docbook index 19fad546..90b12203 100644 --- a/koffice-i18n-de/docs/koffice/kpresenter/a11y.docbook +++ b/koffice-i18n-de/docs/koffice/kpresenter/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Installation der <command ->kdeaccessibility</command +>tdeaccessibility</command > Module</title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >Die meisten der in diesem Abschnitt beschriebenen Eigenschaften erfordern die Installation des Moduls <command ->kdeaccessibility</command +>tdeaccessibility</command >. Diese Modul <command ->kdeaccessibility</command +>tdeaccessibility</command > ist ein Teil des &kde;-Projekts <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Das Paket <command ->kdeaccessibility</command +>tdeaccessibility</command > finden Sie auf &kde-ftp;, der wichtigsten ftp-Seite des &kde;-Projekts. </para> <para @@ -120,7 +120,7 @@ ></indexterm> <para >Das Modul <command ->kdeaccessibility</command +>tdeaccessibility</command > enthält das Programm <ulink url="help:kmag" >&kmagnifier;</ulink >, eine Bildschirmlupe. Wenn das Programm installiert ist, können Sie es mit <menuchoice @@ -147,7 +147,7 @@ ></indexterm> <para >Das Modul <command ->kdeaccessibility</command +>tdeaccessibility</command > enthält die Sprachausgabe-Komponente KTTS. Wenn KTTS installiert ist, können Sie &kpresenter; so einstellen, das der Text unter dem Mauszeiger oder der Text jedes aktivierten Bedienelementes auf dem Bildschirm vorgelesen wird. Ehe Sie diese Eigenschaft nutzen können, müssen Sie zuerst KTTS einrichten. Hinweise dazu finden Sie im <ulink url="help:kttsd" >Handbuch zu KTTS</ulink >. Um die Sprachausgabe in &kpresenter; einzuschalten, wählen Sie <menuchoice diff --git a/koffice-i18n-de/docs/koffice/kspread/a11y.docbook b/koffice-i18n-de/docs/koffice/kspread/a11y.docbook index 105ba36e..a54b62ee 100644 --- a/koffice-i18n-de/docs/koffice/kspread/a11y.docbook +++ b/koffice-i18n-de/docs/koffice/kspread/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Installation der <command ->kdeaccessibility</command +>tdeaccessibility</command > Module</title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >Die meisten der in diesem Abschnitt beschriebenen Eigenschaften erfordern die Installation des Moduls <command ->kdeaccessibility</command +>tdeaccessibility</command >. Diese Modul <command ->kdeaccessibility</command +>tdeaccessibility</command > ist ein Teil des &kde;-Projekts <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Das Paket <command ->kdeaccessibility</command +>tdeaccessibility</command > finden Sie auf &kde-ftp;, der wichtigsten ftp-Seite des &kde;-Projekts. </para> <para @@ -126,7 +126,7 @@ ></indexterm> <para >Das Modul <command ->kdeaccessibility</command +>tdeaccessibility</command > enthält das Programm <ulink url="help:kmag" >&kmagnifier;</ulink >, eine Bildschirmlupe. Wenn das Programm installiert ist, können Sie es mit <menuchoice @@ -153,7 +153,7 @@ ></indexterm> <para >Das Modul <command ->kdeaccessibility</command +>tdeaccessibility</command > enthält die Sprachausgabe-Komponente KTTS. Wenn KTTS installiert ist, können Sie &kword; so einstellen, das der Text unter dem Mauszeiger oder der Text jedes aktivierten Bedienelementes auf dem Bildschirm vorgelesen wird. Ehe Sie diese Eigenschaft nutzen können, müssen Sie zuerst KTTS einrichten. Hinweise dazu finden Sie im <ulink url="help:kttsd" >Handbuch zu KTTS</ulink >. Um die Sprachausgabe in &kword; einzuschalten, wählen Sie <menuchoice diff --git a/koffice-i18n-de/docs/koffice/kugar/index.docbook b/koffice-i18n-de/docs/koffice/kugar/index.docbook index 5d2d2ac1..1e5e9dd5 100644 --- a/koffice-i18n-de/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-de/docs/koffice/kugar/index.docbook @@ -112,7 +112,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-de/docs/koffice/kword/a11y.docbook b/koffice-i18n-de/docs/koffice/kword/a11y.docbook index 9c11ae47..d7b86260 100644 --- a/koffice-i18n-de/docs/koffice/kword/a11y.docbook +++ b/koffice-i18n-de/docs/koffice/kword/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Installation der <command ->kdeaccessibility</command +>tdeaccessibility</command >-Module</title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >Die meisten der in diesem Abschnitt beschriebenen Eigenschaften erfordern die Installation des Moduls <command ->kdeaccessibility</command +>tdeaccessibility</command >. Diese Modul <command ->kdeaccessibility</command +>tdeaccessibility</command > ist ein Teil des &kde;-Projekts <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Das Paket <command ->kdeaccessibility</command +>tdeaccessibility</command > finden Sie auf &kde-ftp;, der ftp-Seite des &kde;-Projekts. </para> <para @@ -126,7 +126,7 @@ ></indexterm> <para >Das Modul <command ->kdeaccessibility</command +>tdeaccessibility</command > enthält das Programm <ulink url="help:kmag" >&kmagnifier;</ulink >, eine Bildschirmlupe. Wenn das Programm installiert ist, können Sie es mit <menuchoice @@ -153,7 +153,7 @@ ></indexterm> <para >Das Modul <command ->kdeaccessibility</command +>tdeaccessibility</command > enthält die Sprachausgabe-Komponente KTTS. Wenn KTTS installiert ist, können Sie &kword; so einstellen, dass der Text unter dem Mauszeiger oder der Text jedes aktivierten Bedienelementes auf dem Bildschirm vorgelesen wird. Ehe Sie diese Eigenschaft nutzen können, müssen Sie zuerst KTTS einrichten. Hinweise dazu finden Sie im <ulink url="help:kttsd" >Handbuch zu KTTS</ulink >. Um die Sprachausgabe in &kword; einzuschalten, wählen Sie <menuchoice diff --git a/koffice-i18n-de/docs/koffice/kword/index.docbook b/koffice-i18n-de/docs/koffice/kword/index.docbook index 15a5f161..45f09940 100644 --- a/koffice-i18n-de/docs/koffice/kword/index.docbook +++ b/koffice-i18n-de/docs/koffice/kword/index.docbook @@ -1538,7 +1538,7 @@ <listitem> <para ->&kde; 3.3.0-Bibliotheken (kdelibs) und das &kde; 3.3.0-Basispaket (kdebase). Diese erhalten Sie über die <ulink url="http://www.kde.org" +>&kde; 3.3.0-Bibliotheken (tdelibs) und das &kde; 3.3.0-Basispaket (tdebase). Diese erhalten Sie über die <ulink url="http://www.kde.org" >&kde;-Webseite.</ulink ></para> <tip diff --git a/koffice-i18n-de/messages/koffice/desktop_koffice.po b/koffice-i18n-de/messages/koffice/desktop_koffice.po index 3097374e..d554ccea 100644 --- a/koffice-i18n-de/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-de/messages/koffice/desktop_koffice.po @@ -580,7 +580,7 @@ msgstr "Name=Container-Elemente" msgid "Name=Basic Widgets" msgstr "Name=Basis-Elemente" -#: 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-Plugin zum Formularentwurf" @@ -1907,11 +1907,11 @@ msgstr "Name=KOffice-Komponente für Textverarbeitung" 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=KDE Adressbuch-Plugin" -#: 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-de/messages/koffice/kformdesigner.po b/koffice-i18n-de/messages/koffice/kformdesigner.po index 0c036419..959ec44c 100644 --- a/koffice-i18n-de/messages/koffice/kformdesigner.po +++ b/koffice-i18n-de/messages/koffice/kformdesigner.po @@ -30,36 +30,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Zu öffnendes Dokument" -#: 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 "KFormDesigner 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 "Objekte" -#: 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 "Inhalt der Oberflächenelemente löschen" -#: 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 "Oberflächenelement löschen" -#: 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 "Formular-Vorschau" -#: 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 "Reihenfolge der Aktivierung bearbeiten" -#: 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 "Pixmap-Sammlung bearbeiten" -#: 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 "Formularverbindungen bearbeiten" @@ -100,75 +100,75 @@ msgstr "Senkrecht &in einem Trenner" msgid "&Ungroup Widgets" msgstr "Gruppierung &aufheben" -#: 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 "Oberflächenelement nach vorne holen" -#: 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 "Oberflächenelement nach hinten stellen" -#: 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 "Position der Oberflächenelemente ausrichten" -#: 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 "Nach links" -#: 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 "Nach rechts" -#: 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 "Nach oben" -#: 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 "Nach unten" -#: 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 "An Gitter" -#: 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 "Größe der Oberflächenelemente anpassen" -#: 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 "Passend" -#: 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 "Am Kürzesten" -#: 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 "Am Längsten" -#: 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 "Am Schmalsten" -#: 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 "Am Breitesten" #: 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 "Formular" -#: 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 Dateien" -#: 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?" @@ -176,7 +176,7 @@ msgstr "" "Das Formular \"%1\" wurde geändert.\n" "Wollen Sie Ihre Änderungen speichern oder verwerfen?" -#: 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 "Formular schließen" @@ -1140,19 +1140,19 @@ msgstr "Neues Element" msgid "Sub Item" msgstr "Unterelement" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Oberflächenelemente &waagrecht anordnen" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Oberflächenelemente &senkrecht anordnen" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Oberflächenelemente an &Gitter anordnen" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "Anordnung &auflösen" diff --git a/koffice-i18n-el/acinclude.m4 b/koffice-i18n-el/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-el/acinclude.m4 +++ b/koffice-i18n-el/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 <stdio.h> @@ -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-el/configure.in b/koffice-i18n-el/configure.in index 7cc1e48a..693b6b7a 100644 --- a/koffice-i18n-el/configure.in +++ b/koffice-i18n-el/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-el, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-el, "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-el/messages/koffice/desktop_koffice.po b/koffice-i18n-el/messages/koffice/desktop_koffice.po index 7ecfae25..f80291ca 100644 --- a/koffice-i18n-el/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-el/messages/koffice/desktop_koffice.po @@ -573,7 +573,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" @@ -1918,11 +1918,11 @@ msgstr "Name=Συστατικό επεξεργασίας κειμένου του 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-el/messages/koffice/kformdesigner.po b/koffice-i18n-el/messages/koffice/kformdesigner.po index 57b9b9a1..2ba2245d 100644 --- a/koffice-i18n-el/messages/koffice/kformdesigner.po +++ b/koffice-i18n-el/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 "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 "Επεξεργασία σειράς καρτελών" -#: 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" -#: 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 "Κλείσιμο φόρμας" @@ -1139,19 +1139,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-en_GB/acinclude.m4 b/koffice-i18n-en_GB/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-en_GB/acinclude.m4 +++ b/koffice-i18n-en_GB/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 <stdio.h> @@ -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-en_GB/configure.in b/koffice-i18n-en_GB/configure.in index 5e441158..3f8b1016 100644 --- a/koffice-i18n-en_GB/configure.in +++ b/koffice-i18n-en_GB/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-en_GB, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-en_GB, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -27,13 +27,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-en_GB/messages/koffice/desktop_koffice.po b/koffice-i18n-en_GB/messages/koffice/desktop_koffice.po index 6f83e7cb..be99daeb 100644 --- a/koffice-i18n-en_GB/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-en_GB/messages/koffice/desktop_koffice.po @@ -580,7 +580,7 @@ msgstr "Name=Container Widgets" msgid "Name=Basic Widgets" msgstr "Name=Basic Widgets" -#: 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=Form Designer KDevelop Plugin" @@ -1936,11 +1936,11 @@ msgstr "Name=KOffice Word Processing Component" msgid "GenericName=Text Documents" msgstr "GenericName=Text Documents" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=KDE Addressbook Plugin" -#: 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-en_GB/messages/koffice/kformdesigner.po b/koffice-i18n-en_GB/messages/koffice/kformdesigner.po index d2127557..918c479b 100644 --- a/koffice-i18n-en_GB/messages/koffice/kformdesigner.po +++ b/koffice-i18n-en_GB/messages/koffice/kformdesigner.po @@ -24,36 +24,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Document to open" -#: 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 "Form Designer 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 "Objects" -#: 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 "Clear Widget Contents" -#: 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 "Delete 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 "Preview Form" -#: 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 "Edit Tab Order" -#: 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 "Edit Pixmap Collection" -#: 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 "Edit Form Connections" @@ -94,75 +94,75 @@ msgstr "Verti&cally in Splitter" msgid "&Ungroup Widgets" msgstr "&Ungroup Widgets" -#: 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 "Bring Widget to Front" -#: 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 "Send Widget to Back" -#: 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 "Align Widgets' Positions" -#: 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 "To Left" -#: 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 "To Right" -#: 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 "To Top" -#: 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 "To Bottom" -#: 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 "To 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 msgid "Adjust Widgets' Sizes" msgstr "Adjust Widgets' Sizes" -#: 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 "To Fit" -#: 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 "To Shortest" -#: 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 "To Tallest" -#: 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 "To Narrowest" -#: 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 "To Widest" #: 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 "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: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?" @@ -170,7 +170,7 @@ msgstr "" "The form \"%1\" has been modified.\n" "Do you want to save your changes or discard them?" -#: 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 "Close Form" @@ -1130,19 +1130,19 @@ msgstr "New Item" msgid "Sub Item" msgstr "Sub Item" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Lay Out Widgets &Horizontally" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Lay Out Widgets &Vertically" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Lay Out Widgets in &Grid" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Break Layout" diff --git a/koffice-i18n-es/acinclude.m4 b/koffice-i18n-es/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-es/acinclude.m4 +++ b/koffice-i18n-es/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 <stdio.h> @@ -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-es/configure.in b/koffice-i18n-es/configure.in index d4b8085c..e584cb23 100644 --- a/koffice-i18n-es/configure.in +++ b/koffice-i18n-es/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-es, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-es, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -42,13 +42,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-es/docs/koffice/chalk/installation.docbook b/koffice-i18n-es/docs/koffice/chalk/installation.docbook index 26d20454..5bce2de9 100644 --- a/koffice-i18n-es/docs/koffice/chalk/installation.docbook +++ b/koffice-i18n-es/docs/koffice/chalk/installation.docbook @@ -13,8 +13,8 @@ <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/koffice-i18n-es/docs/koffice/chalk/tutorial-select-layer.docbook b/koffice-i18n-es/docs/koffice/chalk/tutorial-select-layer.docbook index f31f6e83..634493c9 100644 --- a/koffice-i18n-es/docs/koffice/chalk/tutorial-select-layer.docbook +++ b/koffice-i18n-es/docs/koffice/chalk/tutorial-select-layer.docbook @@ -24,7 +24,7 @@ <para >La imagen de arriba es la imagen sobre la que trabajaremos. Inicie chalk con esta imagen (en la carpeta de documentación <filename >$<envar ->KDEDIR</envar +>TDEDIR</envar >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename >), y guárdelo en su carpeta de inicio (eligiendo <guilabel >Guardar imagen como...</guilabel diff --git a/koffice-i18n-es/docs/koffice/kchart/index.docbook b/koffice-i18n-es/docs/koffice/kchart/index.docbook index 2638f2af..eebc4852 100644 --- a/koffice-i18n-es/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-es/docs/koffice/kchart/index.docbook @@ -70,7 +70,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-es/docs/koffice/kpresenter/a11y.docbook b/koffice-i18n-es/docs/koffice/kpresenter/a11y.docbook index 9ccae0e2..a1d3d512 100644 --- a/koffice-i18n-es/docs/koffice/kpresenter/a11y.docbook +++ b/koffice-i18n-es/docs/koffice/kpresenter/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Instalar el módulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >La mayor parte de las características que se describen en este capítulo se activan al instalar el módulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. El módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > es parte del proyecto &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. El paquete <command ->kdeaccessibility</command +>tdeaccessibility</command > se puede obtener en &kde-ftp;, la sede ftp principal del proyecto &kde;. </para> <para @@ -132,7 +132,7 @@ ></indexterm> <para >El módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > incluye una aplicación de lupa para la pantalla llamada <ulink url="help:kmag" >KMagnifier</ulink >. Si está instalada, puede hacerla funcionar desde <menuchoice @@ -161,7 +161,7 @@ ></indexterm> <para >El módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > incluye un componente de texto a voz llamado KTTS. Si KTTS está instalado, puede configurar para q&kpresenter;ue lea el texto que hay bajo el puntero del ratón, o que lea el texto de cada componente de la pantalla cuando reciba el foco. Antes de usar esta característica, debe configurar KTTS.Tiene más detalles en el <ulink url="help:kttsd" >Manual de KTTS</ulink >. Para activar la característica TTS en &kpresenter;, seleccione <menuchoice diff --git a/koffice-i18n-es/docs/koffice/kspread/a11y.docbook b/koffice-i18n-es/docs/koffice/kspread/a11y.docbook index 04e97a86..a29ab83a 100644 --- a/koffice-i18n-es/docs/koffice/kspread/a11y.docbook +++ b/koffice-i18n-es/docs/koffice/kspread/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Instalar el módulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >La mayor parte de las características que se describen en este capítulo se activan al instalar el módulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. El módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > es parte del proyecto &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. El paquete <command ->kdeaccessibility</command +>tdeaccessibility</command > se puede obtener en &kde-ftp;, la sede ftp principal del proyecto &kde;. </para> <para @@ -124,7 +124,7 @@ ></indexterm> <para >El módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > incluye una aplicación de lupa para la pantalla llamada <ulink url="help:kmag" >&kmagnifier;</ulink >. Si está instalada, puede hacerla funcionar desde <menuchoice @@ -151,7 +151,7 @@ ></indexterm> <para >El módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > incluye un componente de texto a voz llamado KTTS. Si KTTS está instalado, puede configurar para q&kspread;ue lea el texto que hay bajo el puntero del ratón, o que lea el texto de cada componente de la pantalla cuando reciba el foco. Antes de usar esta característica, debe configurar KTTS.Tiene más detalles en el <ulink url="help:kttsd" >Manual de KTTS</ulink >. Para activar la característica TTS en &kspread;, seleccione <menuchoice diff --git a/koffice-i18n-es/docs/koffice/kugar/index.docbook b/koffice-i18n-es/docs/koffice/kugar/index.docbook index 77890c9f..e480fc87 100644 --- a/koffice-i18n-es/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-es/docs/koffice/kugar/index.docbook @@ -98,7 +98,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-es/docs/koffice/kword/a11y.docbook b/koffice-i18n-es/docs/koffice/kword/a11y.docbook index 0ebe0760..a7811851 100644 --- a/koffice-i18n-es/docs/koffice/kword/a11y.docbook +++ b/koffice-i18n-es/docs/koffice/kword/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Instalar el módulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >La mayor parte de las características que se describen en este capítulo se activan al instalar el módulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. El módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > es parte del proyecto &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. El paquete <command ->kdeaccessibility</command +>tdeaccessibility</command > se puede obtener en &kde-ftp;, la sede ftp principal del proyecto &kde;. </para> <para @@ -124,7 +124,7 @@ ></indexterm> <para >El módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > incluye una aplicación de lupa para la pantalla llamada <ulink url="help:kmag" >&kmagnifier;</ulink >. Si está instalada, puede hacerla funcionar desde <menuchoice @@ -151,7 +151,7 @@ ></indexterm> <para >El módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > incluye un componente de texto a voz llamado KTTS. Si KTTS está instalado, puede configurar &kword; para que lea el texto que hay bajo el puntero del ratón, o que lea el texto de cada componente de la pantalla cuando reciba el foco. Antes de usar esta característica, debe configurar KTTS.Tiene más detalles en el <ulink url="help:kttsd" >Manual de KTTS</ulink >. Para activar la característica TTS en &kword;, seleccione <menuchoice diff --git a/koffice-i18n-es/docs/koffice/kword/index.docbook b/koffice-i18n-es/docs/koffice/kword/index.docbook index a2efc94b..b77754b0 100644 --- a/koffice-i18n-es/docs/koffice/kword/index.docbook +++ b/koffice-i18n-es/docs/koffice/kword/index.docbook @@ -1516,7 +1516,7 @@ <listitem> <para ->Las bibliotecas de &kde; 3.3.0 (kdelibs) y el paquete base de &kde; 3.3.0 (kdebase). Se pueden obtener de la <ulink url="http://www.kde.org" +>Las bibliotecas de &kde; 3.3.0 (tdelibs) y el paquete base de &kde; 3.3.0 (tdebase). Se pueden obtener de la <ulink url="http://www.kde.org" >página web de &kde;</ulink >.</para> <tip diff --git a/koffice-i18n-es/messages/koffice/desktop_koffice.po b/koffice-i18n-es/messages/koffice/desktop_koffice.po index c44d80a6..0a7170bc 100644 --- a/koffice-i18n-es/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-es/messages/koffice/desktop_koffice.po @@ -580,7 +580,7 @@ msgstr "Name=Widgets contenedores" msgid "Name=Basic Widgets" msgstr "Name=Widgets básicos" -#: 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=Extensión de diseñador de formularios de KDevelop" @@ -1914,11 +1914,11 @@ msgstr "Name=Componente de procesamiento de textos de KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Documentos de texto" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Accesorio de la libreta de direcciones de 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-es/messages/koffice/kformdesigner.po b/koffice-i18n-es/messages/koffice/kformdesigner.po index 1490a21b..f2a15334 100644 --- a/koffice-i18n-es/messages/koffice/kformdesigner.po +++ b/koffice-i18n-es/messages/koffice/kformdesigner.po @@ -24,36 +24,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Documento para abrir" -#: 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 "Parte del diseñador de formularios" -#: 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 "Objetos" -#: 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 "Limpiar el contenido del widget" -#: 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 "Eliminar 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 "Vista preliminar del formulario" -#: 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 "Editar orden de tabuladores" -#: 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 "Editar colección de pixmaps" -#: 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 "Editar las conexiones del formulario" @@ -94,75 +94,75 @@ msgstr "Verti&calmente en un divisor" msgid "&Ungroup Widgets" msgstr "Desagr&upar widgets" -#: 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 "Traer el widget al primer plano" -#: 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 "Enviar el widget hacia atrás" -#: 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 "Alinear las posiciones de los widgets" -#: 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 "A la izquierda" -#: 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 "A la derecha" -#: 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 "Arriba" -#: 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 "Abajo" -#: 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 "A la cuadrícula" -#: 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 "Ajustar los tamaños de los widgets" -#: 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 "Hasta que ajusten" -#: 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 "Al más bajo" -#: 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 "Al más alto" -#: 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 "Al más estrecho" -#: 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 "Al más ancho" #: 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 "Formulario" -#: 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|Archivos UI de 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 "" "Se ha modificado el formulario «%1».\n" "¿Quiere guardar los cambios o descartarlos?" -#: 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 "Cerrar formulario" @@ -1133,19 +1133,19 @@ msgstr "Nuevo elemento" msgid "Sub Item" msgstr "Subelemento" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Disponer los widgets &horizontalmente" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Disponer los widgets &verticalmente" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Disponer los widgets en una &cuadrícula" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "Romper &disposición" diff --git a/koffice-i18n-et/acinclude.m4 b/koffice-i18n-et/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-et/acinclude.m4 +++ b/koffice-i18n-et/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 <stdio.h> @@ -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-et/configure.in b/koffice-i18n-et/configure.in index 764f0b2b..de1d9279 100644 --- a/koffice-i18n-et/configure.in +++ b/koffice-i18n-et/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-et, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-et, "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-et/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook index c2cd346c..406642dd 100644 --- a/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook +++ b/koffice-i18n-et/docs/koffice/chalk/developers-plugins.docbook @@ -246,8 +246,8 @@ Icon= Name=Kasutajale nähtav nimi ServiceTypes=Chalk/Filter Type=Service -X-KDE-Library=chalkLIBRARYNAME -X-KDE-Version=2 +X-TDE-Library=chalkLIBRARYNAME +X-TDE-Version=2 </programlisting> </para ><para @@ -412,7 +412,7 @@ ToolStar::~ToolStar() <para >&chalk; laadib pluginad versiooniga <literal ->X-KDE-Version=2</literal +>X-TDE-Version=2</literal >, mille määrab <literal role="extension" >.desktop</literal >-fail. &chalk; 1.6 pluginad on arvatavasti binaarselt ühildumatud 1.5 pluginatega ja vajavad versiooni 3. &chalk; 2.0 pluginad vajavad versiooni 3. Jah, see pole just täiesti loogiline. </para> @@ -1407,10 +1407,10 @@ METASOURCES = AUTO >Import: </para> <programlisting ->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 </programlisting> @@ -1418,12 +1418,12 @@ ServiceTypes=KOfficeFilter >Eksport: </para> <programlisting ->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 </programlisting> <para diff --git a/koffice-i18n-et/docs/koffice/chalk/installation.docbook b/koffice-i18n-et/docs/koffice/chalk/installation.docbook index fb135f57..bd3bd33d 100644 --- a/koffice-i18n-et/docs/koffice/chalk/installation.docbook +++ b/koffice-i18n-et/docs/koffice/chalk/installation.docbook @@ -13,8 +13,8 @@ <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/koffice-i18n-et/docs/koffice/chalk/tutorial-select-layer.docbook b/koffice-i18n-et/docs/koffice/chalk/tutorial-select-layer.docbook index 9af48421..6b30bb9d 100644 --- a/koffice-i18n-et/docs/koffice/chalk/tutorial-select-layer.docbook +++ b/koffice-i18n-et/docs/koffice/chalk/tutorial-select-layer.docbook @@ -24,7 +24,7 @@ <para >Toodud pildiga hakkamegi töötama. Käivita Chalk selle pildiga (see asub kataloogis <filename >$<envar ->KDEDIR</envar +>TDEDIR</envar >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename >) ja salvesta see oma kodukataloogi (valides <guilabel >Salvesta pilt kui...</guilabel diff --git a/koffice-i18n-et/docs/koffice/kchart/index.docbook b/koffice-i18n-et/docs/koffice/kchart/index.docbook index 1ff28244..9d7e280e 100644 --- a/koffice-i18n-et/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-et/docs/koffice/kchart/index.docbook @@ -70,7 +70,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-et/docs/koffice/kpresenter/a11y.docbook b/koffice-i18n-et/docs/koffice/kpresenter/a11y.docbook index 70be1f38..36f7cf6c 100644 --- a/koffice-i18n-et/docs/koffice/kpresenter/a11y.docbook +++ b/koffice-i18n-et/docs/koffice/kpresenter/a11y.docbook @@ -37,21 +37,21 @@ <sect1 id="a11y-install"> <title >Mooduli <command ->kdeaccessibility</command +>tdeaccessibility</command > paigaldamine</title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >Enamikku edaspidi kirjeldatavatest võimalustest saab kasutada mooduli <command ->kdeaccessibility</command +>tdeaccessibility</command > paigaldamisel. Moodul <command ->kdeaccessibility</command +>tdeaccessibility</command > kuulub &kde; projekti <ulink url="http://www.kde.org" >http://www.kde.org</ulink > koosseisu. Paketi <command ->kdeaccessibility</command +>tdeaccessibility</command > saab hankida &kde; projekti peamisest FTP-saidist &kde-ftp;. </para> <para @@ -134,7 +134,7 @@ ></indexterm> <para >Moodul <command ->kdeaccessibility</command +>tdeaccessibility</command > sisaldab ekraani suurendamise rakendust <ulink url="help:kmag" >KMagnifier</ulink >. Kui see on paigaldatud, saab selle käivitada menüüst <menuchoice @@ -163,7 +163,7 @@ ></indexterm> <para >Moodul <command ->kdeaccessibility</command +>tdeaccessibility</command > sisaldab teksti kõnelemise komponenti KTTS. Kui KTTS on paigaldatud, võib seadistada &kpresenter;i kõnelema teksti, mis asub hiirekursori all või mis tahes aknas, kui see saab fookuse. Enne selle võimaluse kasutamist tuleb seadistada KTTS. Täpsemalt räägib sellest <ulink url="help:kttsd" >KTTS käsiraamat</ulink >. &kpresenter;i teksti kõnelemise võimaluse sisselülitamiseks vali menüükäsk <menuchoice diff --git a/koffice-i18n-et/docs/koffice/kspread/a11y.docbook b/koffice-i18n-et/docs/koffice/kspread/a11y.docbook index a531dad1..70ee4b4a 100644 --- a/koffice-i18n-et/docs/koffice/kspread/a11y.docbook +++ b/koffice-i18n-et/docs/koffice/kspread/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Mooduli <command ->kdeaccessibility</command +>tdeaccessibility</command > paigaldamine</title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >Enamikku edaspidi kirjeldatavatest võimalustest saab kasutada mooduli <command ->kdeaccessibility</command +>tdeaccessibility</command > paigaldamisel. Moodul <command ->kdeaccessibility</command +>tdeaccessibility</command > kuulub &kde; projekti <ulink url="http://www.kde.org" >http://www.kde.org</ulink > koosseisu. Paketi <command ->kdeaccessibility</command +>tdeaccessibility</command > saab hankida &kde; projekti peamisest FTP-saidist &kde-ftp;. </para> <para @@ -124,7 +124,7 @@ ></indexterm> <para >Moodul <command ->kdeaccessibility</command +>tdeaccessibility</command > sisaldab ekraani suurendamise rakendust <ulink url="help:kmag" >&kmagnifier;</ulink >. Kui see on paigaldatud, saab selle käivitada menüüst <menuchoice @@ -153,7 +153,7 @@ ></indexterm> <para >Moodul <command ->kdeaccessibility</command +>tdeaccessibility</command > sisaldab teksti kõnelemise komponenti KTTS. Kui KTTS on paigaldatud, võib seadistada &kspread;i kõnelema teksti, mis asub hiirekursori all või mis tahes aknas, kui see saab fookuse. Enne selle võimaluse kasutamist tuleb seadistada KTTS. Täpsemalt räägib sellest <ulink url="help:kttsd" >KTTS käsiraamat</ulink >. &kspread;i teksti kõnelemise võimaluse sisselülitamiseks vali menüükäsk <menuchoice diff --git a/koffice-i18n-et/docs/koffice/kugar/index.docbook b/koffice-i18n-et/docs/koffice/kugar/index.docbook index 7908f929..d614ac89 100644 --- a/koffice-i18n-et/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-et/docs/koffice/kugar/index.docbook @@ -98,7 +98,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-et/docs/koffice/kword/a11y.docbook b/koffice-i18n-et/docs/koffice/kword/a11y.docbook index 465a7d15..33034c7a 100644 --- a/koffice-i18n-et/docs/koffice/kword/a11y.docbook +++ b/koffice-i18n-et/docs/koffice/kword/a11y.docbook @@ -37,21 +37,21 @@ <sect1 id="a11y-install"> <title >Mooduli <command ->kdeaccessibility</command +>tdeaccessibility</command > paigaldamine</title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >Enamikku edaspidi kirjeldatavatest võimalustest saab kasutada mooduli <command ->kdeaccessibility</command +>tdeaccessibility</command > paigaldamisel. Moodul <command ->kdeaccessibility</command +>tdeaccessibility</command > kuulub &kde; projekti <ulink url="http://www.kde.org" >http://www.kde.org</ulink > koosseisu. Paketi <command ->kdeaccessibility</command +>tdeaccessibility</command > saab hankida &kde; projekti peamisest FTP-saidist &kde-ftp;. </para> <para @@ -126,7 +126,7 @@ ></indexterm> <para >Moodul <command ->kdeaccessibility</command +>tdeaccessibility</command > sisaldab ekraani suurendamise rakendust <ulink url="help:kmag" >&kmagnifier;</ulink >. Kui see on paigaldatud, saab selle käivitada menüüst <menuchoice @@ -155,7 +155,7 @@ ></indexterm> <para >Moodul <command ->kdeaccessibility</command +>tdeaccessibility</command > sisaldab teksti kõnelemise komponenti KTTS. Kui KTTS on paigaldatud, võib seadistada &kword;i kõnelema teksti, mis asub hiirekursori all või mis tahes aknas, kui see saab fookuse. Enne selle võimaluse kasutamist tuleb seadistada KTTS. Täpsemalt räägib sellest <ulink url="help:kttsd" >KTTS käsiraamat</ulink >. &kword;i teksti kõnelemise võimaluse sisselülitamiseks vali menüükäsk <menuchoice diff --git a/koffice-i18n-et/docs/koffice/kword/index.docbook b/koffice-i18n-et/docs/koffice/kword/index.docbook index e31b19db..9d123d79 100644 --- a/koffice-i18n-et/docs/koffice/kword/index.docbook +++ b/koffice-i18n-et/docs/koffice/kword/index.docbook @@ -1518,7 +1518,7 @@ <listitem> <para ->&kde; 3.3.0 teegid (kdelibs) ja &kde; 3.3.0 baaspakett (kdebase). Neid saab hankida <ulink url="http://www.kde.org" +>&kde; 3.3.0 teegid (tdelibs) ja &kde; 3.3.0 baaspakett (tdebase). Neid saab hankida <ulink url="http://www.kde.org" >&kde; veebileheküljelt</ulink >.</para> <tip diff --git a/koffice-i18n-et/messages/koffice/desktop_koffice.po b/koffice-i18n-et/messages/koffice/desktop_koffice.po index cbbe8c55..015780af 100644 --- a/koffice-i18n-et/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-et/messages/koffice/desktop_koffice.po @@ -574,7 +574,7 @@ msgstr "Name=Konteinervidinad" msgid "Name=Basic Widgets" msgstr "Name=Standardvidinad" -#: 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=Vormikujundaja KDevelopi plugin" @@ -1892,11 +1892,11 @@ msgstr "Name=KOffice'i tekstitöötluse komponent" msgid "GenericName=Text Documents" msgstr "GenericName=Tekstidokumendid" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=KDE aadressiraamatu plugin" -#: 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-et/messages/koffice/kformdesigner.po b/koffice-i18n-et/messages/koffice/kformdesigner.po index f86c1899..a9530463 100644 --- a/koffice-i18n-et/messages/koffice/kformdesigner.po +++ b/koffice-i18n-et/messages/koffice/kformdesigner.po @@ -23,36 +23,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Avatav dokument" -#: 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 "Vormikujundaja komponent" -#: 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 "Objektid" -#: 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 "Puhasta vidinate sisu" -#: 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 "Kustuta vidin" -#: 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 "Vormi eelvaatlus" -#: 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 "Muuda kaartide järjekorda" -#: 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 "Muuda pildikogu" -#: 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 "Muuda vormi ühendusi" @@ -93,75 +93,75 @@ msgstr "Püstiselt eralda&jas" msgid "&Ungroup Widgets" msgstr "Lõh&u vidinate rühm" -#: 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 "Too vidin ette" -#: 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 "Saada vidin taha" -#: 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 "Joonda vidinate asukohad" -#: 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 "Vasakule" -#: 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 "Paremale" -#: 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 "Üles" -#: 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 "Alla" -#: 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 "Alusvõrgule" -#: 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 "Kohanda vidinate suurust" -#: 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 "Sobivaks" -#: 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 "Lühimaks" -#: 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 "Pikimaks" -#: 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 "Kitsaimaks" -#: 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õige laiemaks" #: 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 "Vorm" -#: 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 Disaineri UI-failid" -#: 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?" @@ -169,7 +169,7 @@ msgstr "" "Vormi \"%1\" on muudetud.\n" "Kas soovid muudatused salvestada või unustada?" -#: 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 "Vormi sulgemine" @@ -1127,19 +1127,19 @@ msgstr "Uus element" msgid "Sub Item" msgstr "Alamelement" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Pai&guta vidinad rõhtsalt" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Paiguta vidinad &püstiselt" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Paiguta vidinad alus&võrgule" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Katkesta paigutus" diff --git a/koffice-i18n-eu/acinclude.m4 b/koffice-i18n-eu/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-eu/acinclude.m4 +++ b/koffice-i18n-eu/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 <stdio.h> @@ -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-eu/configure.in b/koffice-i18n-eu/configure.in index 34f0dba5..5f5cd199 100644 --- a/koffice-i18n-eu/configure.in +++ b/koffice-i18n-eu/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-eu, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-eu, "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-eu/messages/koffice/desktop_koffice.po b/koffice-i18n-eu/messages/koffice/desktop_koffice.po index 1b3f275d..3ffc3f6a 100644 --- a/koffice-i18n-eu/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-eu/messages/koffice/desktop_koffice.po @@ -610,7 +610,7 @@ msgstr "Name=Trepeta edukitzaileak" msgid "Name=Basic Widgets" msgstr "Name=Oinarrizko trepetak" -#: 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=Formularioak diseinatzeko KDevelop-en plugina" @@ -2028,11 +2028,11 @@ msgstr "Name=KOffice-en testu-prozesadore osagaia" msgid "GenericName=Text Documents" msgstr "Name=Testu-dokumentua..." -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=KDE-ren helbide-liburuaren plugina" -#: 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-eu/messages/koffice/kformdesigner.po b/koffice-i18n-eu/messages/koffice/kformdesigner.po index 71ef9722..4c821883 100644 --- a/koffice-i18n-eu/messages/koffice/kformdesigner.po +++ b/koffice-i18n-eu/messages/koffice/kformdesigner.po @@ -21,36 +21,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Irekitzeko dokumentua" -#: 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 "Formularioen diseinatzailearen zatia" -#: 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 "Objektuak" -#: 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 "Garbitu trepetaren edukinak" -#: 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 "Ezabatu trepeta" -#: 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 "Aurreikusi formularioa" -#: 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 "Editatu tabuladoreen ordena" -#: 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 "Editatu pixmapa bilduma" -#: 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 "Editatu formularioen konexioak" @@ -96,75 +96,75 @@ msgstr "Berti&kalki bereizlean" msgid "&Ungroup Widgets" msgstr "&Trepetak" -#: 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 "Ekarri trepeta aurrera" -#: 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 "Bidali trepeta atzera" -#: 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 "Lerrokatu trepeten posizioak" -#: 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 "Ezkerrera" -#: 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 "Eskuinera" -#: 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 "Goiera" -#: 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 "Behera" -#: 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 "Saretara" -#: 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 "Doitu trepeten tamainak" -#: 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 "Doitu" -#: 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 "Baxuenera" -#: 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 "Altuenera" -#: 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 "Estuenera" -#: 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 "Zabalenera" #: 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 "Formulazioa" -#: 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-en interfaze-fitxategiak" -#: 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\" formularioa aldatu da.\n" "Zure aldaketak gorde edo baztertu nahi dituzu?" -#: 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 "Itxi formularioa" @@ -1195,19 +1195,19 @@ msgstr "Elementu berria" msgid "Sub Item" msgstr "Azpi-elementua" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Kokatu trepetak &horizontalki" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Kokatu trepetak &bertikalki" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Kokatu trepetak &saretan" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Hautsi diseinua" diff --git a/koffice-i18n-fa/acinclude.m4 b/koffice-i18n-fa/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-fa/acinclude.m4 +++ b/koffice-i18n-fa/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 <stdio.h> @@ -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-fa/configure.in b/koffice-i18n-fa/configure.in index 6dd1385f..a6c54301 100644 --- a/koffice-i18n-fa/configure.in +++ b/koffice-i18n-fa/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-fa, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-fa, "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-fa/messages/koffice/desktop_koffice.po b/koffice-i18n-fa/messages/koffice/desktop_koffice.po index fa9edcc9..669619bd 100644 --- a/koffice-i18n-fa/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-fa/messages/koffice/desktop_koffice.po @@ -578,7 +578,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 طراح برگه" @@ -1892,11 +1892,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-fa/messages/koffice/kformdesigner.po b/koffice-i18n-fa/messages/koffice/kformdesigner.po index 378c5a0e..d1e5368c 100644 --- a/koffice-i18n-fa/messages/koffice/kformdesigner.po +++ b/koffice-i18n-fa/messages/koffice/kformdesigner.po @@ -23,36 +23,36 @@ msgstr "" 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 "ویرایش اتصالات برگه" @@ -93,75 +93,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 طراح *.ui|Qt" -#: 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?" @@ -169,7 +169,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 "بستن برگه" @@ -1126,19 +1126,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-fi/acinclude.m4 b/koffice-i18n-fi/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-fi/acinclude.m4 +++ b/koffice-i18n-fi/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 <stdio.h> @@ -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-fi/configure.in b/koffice-i18n-fi/configure.in index e718345c..ecc075db 100644 --- a/koffice-i18n-fi/configure.in +++ b/koffice-i18n-fi/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-fi, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-fi, "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-fi/messages/koffice/desktop_koffice.po b/koffice-i18n-fi/messages/koffice/desktop_koffice.po index 07a6d8e9..e9b2b8a7 100644 --- a/koffice-i18n-fi/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-fi/messages/koffice/desktop_koffice.po @@ -583,7 +583,7 @@ msgstr "Name=Säiliön osat" msgid "Name=Basic Widgets" msgstr "Name=yleiset elementit" -#: 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=KDevelopin lomakkeen suunnittelija -liitännäinen" @@ -1963,11 +1963,11 @@ msgstr "Name=KOfficen tekstinkäsittelyohjelma" msgid "GenericName=Text Documents" msgstr "GenericName=Tekstiasiakirjat" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=KDE:n osoitekirjan liitännäinen" -#: 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-fi/messages/koffice/kformdesigner.po b/koffice-i18n-fi/messages/koffice/kformdesigner.po index ab2a3ad7..6565cb3d 100644 --- a/koffice-i18n-fi/messages/koffice/kformdesigner.po +++ b/koffice-i18n-fi/messages/koffice/kformdesigner.po @@ -27,36 +27,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Avattava asiakirja" -#: 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 "KFormDesignerin osa" -#: 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 "Oliot" -#: 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 "Tyhjennä elementin sisällöt" -#: 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 "Poista elementti" -#: 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 "Esikatselulomake" -#: 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 "Muokkaa välilehtien järjestystä" -#: 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 "Muokkaa kuvakokoelmaa" -#: 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 "Muokkaa lomakkeen yhteyksiä" @@ -102,75 +102,75 @@ msgstr "Pystysuorassa jakaj&assa" msgid "&Ungroup Widgets" msgstr "&Käyttöliittymäelementit" -#: 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 "Tuo elementti edustalle" -#: 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ähetä elementti taustalle" -#: 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 "Asettele elementtien sijainnit" -#: 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 "Vasemmalle" -#: 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 "Oikealle" -#: 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 "Ylös" -#: 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 "Alas" -#: 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 "Ruudukkoon" -#: 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 "Säädä elementtien kokoa" -#: 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 "Sovita" -#: 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 "Lyhyimmälle" -#: 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 "Pisimmälle" -#: 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 "Kapeimmalle" -#: 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 "Laajimmalle" #: 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 "Lomake" -#: 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 -tiedostot" -#: 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?" @@ -178,7 +178,7 @@ msgstr "" "Lomaketta \"%1\" on muutettu.\n" "Haluatko tallettaa muutokset vai hylätä ne?" -#: 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 "Sulje lomake" @@ -1199,19 +1199,19 @@ msgstr "Uusi osa" msgid "Sub Item" msgstr "Aliosa" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Asettele elementit &vaakatasoon" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Asettele elementit &pystysuoraan" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Asettele elementit &ruudukkoon" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Sivunvaihdon asettelu" diff --git a/koffice-i18n-fr/acinclude.m4 b/koffice-i18n-fr/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-fr/acinclude.m4 +++ b/koffice-i18n-fr/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 <stdio.h> @@ -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-fr/configure.in b/koffice-i18n-fr/configure.in index ecfdc171..7dd2193f 100644 --- a/koffice-i18n-fr/configure.in +++ b/koffice-i18n-fr/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-fr, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-fr, "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-fr/docs/koffice/kchart/index.docbook b/koffice-i18n-fr/docs/koffice/kchart/index.docbook index cf2ec4d6..8aa5be78 100644 --- a/koffice-i18n-fr/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-fr/docs/koffice/kchart/index.docbook @@ -56,7 +56,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-fr/docs/koffice/kformula/index.docbook b/koffice-i18n-fr/docs/koffice/kformula/index.docbook index c10265d8..e4a84293 100644 --- a/koffice-i18n-fr/docs/koffice/kformula/index.docbook +++ b/koffice-i18n-fr/docs/koffice/kformula/index.docbook @@ -1823,7 +1823,7 @@ >http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/</ulink> </para> <para ->Vous avez besoin de ces polices, en particulier : cmbx10, cmex10, cmmi10, cmr10, cmsy10, msam10 et msbm10. Installez-les dans votre système et assurez-vous que vous avez le chemin d'installation dans votre FontPath dans votre configuration de X11, puis redémarrez votre serveur X. Si vous utilisez un gestionnaire de connexion graphique comme kdm, vous devez aussi redémarrer kdm. Une actio n sur <keycombo action="simul" +>Vous avez besoin de ces polices, en particulier : cmbx10, cmex10, cmmi10, cmr10, cmsy10, msam10 et msbm10. Installez-les dans votre système et assurez-vous que vous avez le chemin d'installation dans votre FontPath dans votre configuration de X11, puis redémarrez votre serveur X. Si vous utilisez un gestionnaire de connexion graphique comme tdm, vous devez aussi redémarrer tdm. Une actio n sur <keycombo action="simul" >&Ctrl;&Alt;<keycap >Effacement arrière</keycap ></keycombo diff --git a/koffice-i18n-fr/docs/koffice/kugar/index.docbook b/koffice-i18n-fr/docs/koffice/kugar/index.docbook index 55924121..3cdea397 100644 --- a/koffice-i18n-fr/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-fr/docs/koffice/kugar/index.docbook @@ -84,7 +84,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-fr/messages/koffice/desktop_koffice.po b/koffice-i18n-fr/messages/koffice/desktop_koffice.po index 89c36734..a5203480 100644 --- a/koffice-i18n-fr/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-fr/messages/koffice/desktop_koffice.po @@ -581,7 +581,7 @@ msgstr "Name=Conteneur d'éléments graphiques" msgid "Name=Basic Widgets" msgstr "Name=Éléments graphiques basiques" -#: 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=Module externe KDevelop de composition d'interfaces graphiques" @@ -1918,11 +1918,11 @@ msgstr "Name=Composant traitement de texte de KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Documents texte" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Module externe de carnet d'adresses de 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-fr/messages/koffice/kformdesigner.po b/koffice-i18n-fr/messages/koffice/kformdesigner.po index a27e1984..425531a0 100644 --- a/koffice-i18n-fr/messages/koffice/kformdesigner.po +++ b/koffice-i18n-fr/messages/koffice/kformdesigner.po @@ -29,36 +29,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Document à ouvrir" -#: 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 "Module de conception de formulaire" -#: 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 "Objets" -#: 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 "Effacer le contenu de l'élément" -#: 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 "Supprimer l'élément" -#: 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 "Aperçu du formulaire" -#: 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 "Modifier l'ordre des tabulations" -#: 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 "Modifier la collection d'images" -#: 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 "Modifier les connexions du formulaire" @@ -99,75 +99,75 @@ msgstr "Verti&calement dans un séparateur" msgid "&Ungroup Widgets" msgstr "Dégro&uper les éléments" -#: 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 "Placer l'élément au premier plan" -#: 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 "Placer l'élément à l'arrière-plan" -#: 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 "Aligner la position des éléments" -#: 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 "Vers la gauche" -#: 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 "Vers la droite" -#: 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 "Vers le haut" -#: 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 "Vers le bas" -#: 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 "Sur la grille" -#: 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 "Ajuster la taille des éléments" -#: 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 "Adaptée" -#: 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 "Au plus petit" -#: 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 "Au plus grand" -#: 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 "Au plus étroit" -#: 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 "Au plus large" #: 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 "Formulaire" -#: 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|Fichiers d'interfaces 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?" @@ -175,7 +175,7 @@ msgstr "" "Le formulaire « %1 » a été modifié.\n" "Voulez-vous enregistrer les modifications ou les annuler ?" -#: 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 "Fermer le formulaire" @@ -1138,19 +1138,19 @@ msgstr "Nouvel élément" msgid "Sub Item" msgstr "Sous-élément" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Disposer les éléments &horizontalement" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Disposer les éléments &verticalement" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Disposer les éléments dans la &grille" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "Casser la &disposition" diff --git a/koffice-i18n-ga/acinclude.m4 b/koffice-i18n-ga/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-ga/acinclude.m4 +++ b/koffice-i18n-ga/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 <stdio.h> @@ -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-ga/configure.in b/koffice-i18n-ga/configure.in index 3ae58829..72a064a0 100644 --- a/koffice-i18n-ga/configure.in +++ b/koffice-i18n-ga/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-ga, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-ga, "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-ga/messages/koffice/desktop_koffice.po b/koffice-i18n-ga/messages/koffice/desktop_koffice.po index fed72a3d..1a31d721 100644 --- a/koffice-i18n-ga/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-ga/messages/koffice/desktop_koffice.po @@ -569,7 +569,7 @@ msgstr "" msgid "Name=Basic Widgets" msgstr "" -#: 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 "" @@ -1882,11 +1882,11 @@ msgstr "" msgid "GenericName=Text Documents" msgstr "GenericName=Cáipéisí Téacs" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "" -#: 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-ga/messages/koffice/kformdesigner.po b/koffice-i18n-ga/messages/koffice/kformdesigner.po index 3f33a642..d4d29781 100644 --- a/koffice-i18n-ga/messages/koffice/kformdesigner.po +++ b/koffice-i18n-ga/messages/koffice/kformdesigner.po @@ -17,36 +17,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Cáipéis le hoscailt" -#: 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 "Réada" -#: 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 "Scrios Giuirléid" -#: 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 "Réamhamharc ar Fhoirm" -#: 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 "Cuir Ord na dTáb in Eagar" -#: 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 "" @@ -87,81 +87,81 @@ msgstr "Go hIngeara&ch i Scoilteoir" msgid "&Ungroup Widgets" msgstr "&Díghrúpáil Giuirléidí" -#: 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 "Tabhair Giuirléid chun Tosaigh" -#: 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 "Cuir Giuirléid go dtí an Cúl" -#: 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 "Ar Chlé" -#: 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 "Ar Dheis" -#: 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 "Go dtí an Barr" -#: 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 "Go dtí an Bun" -#: 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 "Foirm" -#: 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|Comhaid 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 "Dún Foirm" @@ -1119,19 +1119,19 @@ msgstr "Mír Nua" msgid "Sub Item" msgstr "Fomhír" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Leag na Giuirléidí Amach go Cot&hrómanach" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Leag na &Giuirléidí Amach go hIngearach i Scoilteoir" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Leag Giuirléidí Amach i n&Greille" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Bris an Leagan Amach" diff --git a/koffice-i18n-gl/acinclude.m4 b/koffice-i18n-gl/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-gl/acinclude.m4 +++ b/koffice-i18n-gl/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 <stdio.h> @@ -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-gl/configure.in b/koffice-i18n-gl/configure.in index d0884dbd..7859c1a9 100644 --- a/koffice-i18n-gl/configure.in +++ b/koffice-i18n-gl/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-gl, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-gl, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -29,13 +29,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-gl/docs/koffice/kchart/index.docbook b/koffice-i18n-gl/docs/koffice/kchart/index.docbook index 8faead93..fefafd36 100644 --- a/koffice-i18n-gl/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-gl/docs/koffice/kchart/index.docbook @@ -70,7 +70,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-gl/messages/koffice/desktop_koffice.po b/koffice-i18n-gl/messages/koffice/desktop_koffice.po index e108b330..2ce48a91 100644 --- a/koffice-i18n-gl/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-gl/messages/koffice/desktop_koffice.po @@ -575,7 +575,7 @@ msgstr "Name=Elementos Contedores" msgid "Name=Basic Widgets" msgstr "Name=Elementos Básicos" -#: 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=Plugin de Deseño de Formularios para Kdevelop" @@ -1910,11 +1910,11 @@ msgstr "Name=Componente de Procesamento de Texto de KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Documentos de Texto" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Plugin do Libro de Enderezos de 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-gl/messages/koffice/kformdesigner.po b/koffice-i18n-gl/messages/koffice/kformdesigner.po index 6f562ad6..ac6caa2d 100644 --- a/koffice-i18n-gl/messages/koffice/kformdesigner.po +++ b/koffice-i18n-gl/messages/koffice/kformdesigner.po @@ -22,36 +22,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "O documento a abrir" -#: 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 "Componente de Deseño de Formularios" -#: 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 "Obxectos" -#: 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 "Limpar o Contido do Elemento" -#: 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 "Borrar o Elemento" -#: 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 "Antever o Formulario" -#: 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 "Editar a Orde das Pestanas" -#: 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 "Editar a Colección de Imaxes" -#: 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 "Editar as Conexóns do Formulario" @@ -92,75 +92,75 @@ msgstr "Verti&calmente nun Separador" msgid "&Ungroup Widgets" msgstr "Desagr&upar os Elementos" -#: 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 "Traer Elementos para o Frente" -#: 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 "Enviar Elementos para Tras" -#: 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 "Aliñar os Elementos" -#: 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 "Á Esquerda" -#: 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 "Á Direita" -#: 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 "Á Cima" -#: 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 "Ao Fondo" -#: 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 "Á Grella" -#: 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 "Axustar o Tamaño dos Elementos" -#: 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 "Para Couber" -#: 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 "Ao Máis Baixo" -#: 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 "Ao Máis Alto" -#: 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 "Ao Máis Estreito" -#: 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 "Ao Máis Ancho" #: 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 "Formulario" -#: 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|Ficheiros UI de 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?" @@ -168,7 +168,7 @@ msgstr "" "O formulario \"%1\" foi modificado.\n" "Desexa guardar os seus cambios ou ignoralos?" -#: 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 "Pechar o Formulario" @@ -1131,19 +1131,19 @@ msgstr "Novo Elemento" msgid "Sub Item" msgstr "Sub-Elemento" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Dispor os Elementos &Horizontalmente" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Dispor os Elementos &Verticalmente" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Dispor os Elementos en &Grella" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "Que&brar Disposición" diff --git a/koffice-i18n-hu/acinclude.m4 b/koffice-i18n-hu/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-hu/acinclude.m4 +++ b/koffice-i18n-hu/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 <stdio.h> @@ -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-hu/configure.in b/koffice-i18n-hu/configure.in index bb0b3805..4d96943a 100644 --- a/koffice-i18n-hu/configure.in +++ b/koffice-i18n-hu/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-hu, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-hu, "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-hu/messages/koffice/desktop_koffice.po b/koffice-i18n-hu/messages/koffice/desktop_koffice.po index cbe02e4a..0816b7ba 100644 --- a/koffice-i18n-hu/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-hu/messages/koffice/desktop_koffice.po @@ -569,7 +569,7 @@ msgstr "Name=Tartóelemek" msgid "Name=Basic Widgets" msgstr "Name=Alapelemek" -#: 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=Űrlaptervező modul a KDevelophoz" @@ -1887,11 +1887,11 @@ msgstr "Name=KOffice szövegszerkesztő komponens" msgid "GenericName=Text Documents" msgstr "GenericName=Szöveges fájlok" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Illesztőmodul a KDE címjegyzékhez" -#: 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-hu/messages/koffice/kformdesigner.po b/koffice-i18n-hu/messages/koffice/kformdesigner.po index 9ec1438d..b2562f40 100644 --- a/koffice-i18n-hu/messages/koffice/kformdesigner.po +++ b/koffice-i18n-hu/messages/koffice/kformdesigner.po @@ -19,36 +19,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "A megnyitandó dokumentum" -#: 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 "Űrlaptervező komponens" -#: 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 "Objektumok" -#: 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 "Az elem tartalmának törlése" -#: 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 "Az elem törlése" -#: 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 "Az űrlap előnézete" -#: 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 "A bejárási sorrend szerkesztése" -#: 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 "A képgyűjtemény szerkesztése" -#: 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 "Az űrlapkapcsolatok szerkesztése" @@ -89,75 +89,75 @@ msgstr "Fü&ggőlegesen, osztva" msgid "&Ungroup Widgets" msgstr "A csoport felb&ontása" -#: 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 "Az elem előre hozása" -#: 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 "Az elem hátratevése" -#: 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 "Az elemek igazítása" -#: 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 "Balra" -#: 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 "Jobbra" -#: 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 "Felülre" -#: 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 "Alulra" -#: 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 "Rácshoz" -#: 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 "Az elemek méretének igazítása" -#: 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 "Illesztés" -#: 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 "A legalacsonyabbhoz" -#: 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 "A legmagasabbhoz" -#: 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 "A legkeskenyebbhez" -#: 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 "A legszélesebbhez" #: 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 "Űrlap" -#: 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-fájlok" -#: 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?" @@ -165,7 +165,7 @@ msgstr "" "A(z) \"%1\" űrlap megváltozott.\n" "Elmenti a módosításokat vagy inkább eldobja őket?" -#: 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 "Az űrlap bezárása" @@ -1127,19 +1127,19 @@ msgstr "Új elem" msgid "Sub Item" msgstr "Alárendelt elem" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Az elemek elrendezése &vízszintesen" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Az elemek elrendezése &függőlegesen" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Az elemek elrendezése rá&csban" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "Az elrendezés megb&ontása" diff --git a/koffice-i18n-it/acinclude.m4 b/koffice-i18n-it/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-it/acinclude.m4 +++ b/koffice-i18n-it/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 <stdio.h> @@ -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-it/configure.in b/koffice-i18n-it/configure.in index 6b638a18..439a8deb 100644 --- a/koffice-i18n-it/configure.in +++ b/koffice-i18n-it/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-it, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-it, "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-it/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-it/docs/koffice/chalk/developers-plugins.docbook index 6496f3dd..c6222e60 100644 --- a/koffice-i18n-it/docs/koffice/chalk/developers-plugins.docbook +++ b/koffice-i18n-it/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 </programlisting> </para ><para @@ -411,7 +411,7 @@ ToolStar::~ToolStar() <para >&chalk; 1.5 carica i plugin con l'impostazione <literal ->X-KDE-Version=2</literal +>X-TDE-Version=2</literal > nel file <literal role="extension" >.desktop</literal >. I file binari dei plugin di &chalk; 1.6 probabilmente saranno incompatibili con i plugin 1.5 e richiederanno il numero di versione 3. I plugin di &chalk; 2.0 richiederanno il numero di versione 3. Sì, effettivamente non è del tutto logico. </para> @@ -1410,10 +1410,10 @@ METASOURCES = AUTO >Importazione: </para> <programlisting ->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 </programlisting> @@ -1421,12 +1421,12 @@ ServiceTypes=KOfficeFilter >Esportazione: </para> <programlisting ->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 </programlisting> <para diff --git a/koffice-i18n-it/docs/koffice/chalk/installation.docbook b/koffice-i18n-it/docs/koffice/chalk/installation.docbook index 0e53811a..67dfe83a 100644 --- a/koffice-i18n-it/docs/koffice/chalk/installation.docbook +++ b/koffice-i18n-it/docs/koffice/chalk/installation.docbook @@ -13,8 +13,8 @@ <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/koffice-i18n-it/docs/koffice/chalk/tutorial-select-layer.docbook b/koffice-i18n-it/docs/koffice/chalk/tutorial-select-layer.docbook index d8418fbc..713c8732 100644 --- a/koffice-i18n-it/docs/koffice/chalk/tutorial-select-layer.docbook +++ b/koffice-i18n-it/docs/koffice/chalk/tutorial-select-layer.docbook @@ -24,7 +24,7 @@ <para >L'immagine sopra è l'immagine con cui lavoreremo. Avvia &chalk; con questa immagine (nella cartella della documentazione <filename >$<envar ->KDEDIR</envar +>TDEDIR</envar >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename >) e salvala sul disco (scegliendo <guilabel >Salva l'immagine con nome...</guilabel diff --git a/koffice-i18n-it/docs/koffice/kchart/index.docbook b/koffice-i18n-it/docs/koffice/kchart/index.docbook index 271b9c06..e34163f8 100644 --- a/koffice-i18n-it/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-it/docs/koffice/kchart/index.docbook @@ -78,7 +78,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-it/docs/koffice/kpresenter/a11y.docbook b/koffice-i18n-it/docs/koffice/kpresenter/a11y.docbook index adcb306f..8f81b442 100644 --- a/koffice-i18n-it/docs/koffice/kpresenter/a11y.docbook +++ b/koffice-i18n-it/docs/koffice/kpresenter/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Installare il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >La maggior parte delle funzionalità descritte in questo capitolo sono abilitate installando il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. Il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command > fa parte del progetto &kde; (<ulink url="http://www.kde.org" >http://www.kde.org</ulink >). Il pacchetto <command ->kdeaccessibility</command +>tdeaccessibility</command > può essere ottenuto da &kde-ftp;, il sito FTP principale del progetto &kde;. </para> <para @@ -132,7 +132,7 @@ ></indexterm> <para >Il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command > include un'applicazione che fa da lente d'ingrandimento per lo schermo chiamata <ulink url="help:kmag" >KMagnifier</ulink >. Se è installata, puoi avviarla da <menuchoice @@ -161,7 +161,7 @@ ></indexterm> <para >Il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command > include un componente di pronuncia chiamato KTTS. Se KTTS è installato, puoi configurare &kpresenter; per pronunciare il testo sotto il puntatore del mouse o pronunciare il testo di ogni oggetto sullo schermo che viene attivato. Prima di usare questa funzionalità, configura KTTS. Vedi il <ulink url="help:kttsd" >manuale di KTTS</ulink > per i dettagli. Per attivare la funzionalità di pronuncia di &kpresenter;, seleziona <menuchoice diff --git a/koffice-i18n-it/docs/koffice/kspread/a11y.docbook b/koffice-i18n-it/docs/koffice/kspread/a11y.docbook index 14d2b93a..36d8b134 100644 --- a/koffice-i18n-it/docs/koffice/kspread/a11y.docbook +++ b/koffice-i18n-it/docs/koffice/kspread/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Installare il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >La maggior parte delle funzionalità descritte in questo capitolo vengono abilitate installando il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. Il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command > fa parte del progetto &kde; (<ulink url="http://www.kde.org" >http://www.kde.org</ulink >). Il pacchetto <command ->kdeaccessibility</command +>tdeaccessibility</command > può essere ottenuto da &kde-ftp;, il sito FTP principale del progetto &kde;. </para> <para @@ -124,7 +124,7 @@ ></indexterm> <para >Il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command > include un programma per l'ingrandimento dello schermo chiamato <ulink url="help:kmag" >&kmagnifier;</ulink >. Se è installato puoi eseguirlo con <menuchoice @@ -153,7 +153,7 @@ ></indexterm> <para >Il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command > include un componente di pronuncia chiamato KTTS. Se KTTS è installato, puoi configurare &kspread; per pronunciare il testo sotto il puntatore del mouse o pronunciare il testo di ogni oggetto sullo schermo che viene attivato. Prima di usare questa funzionalità, configura KTTS. Vedi il <ulink url="help:kttsd" >manuale di KTTS</ulink > per i dettagli. Per attivare la funzionalità di pronuncia di &kspread;, seleziona <menuchoice diff --git a/koffice-i18n-it/docs/koffice/kugar/index.docbook b/koffice-i18n-it/docs/koffice/kugar/index.docbook index f6ddd55d..40f8c4ac 100644 --- a/koffice-i18n-it/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-it/docs/koffice/kugar/index.docbook @@ -98,7 +98,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-it/docs/koffice/kword/a11y.docbook b/koffice-i18n-it/docs/koffice/kword/a11y.docbook index 16ae41fc..a7e08a32 100644 --- a/koffice-i18n-it/docs/koffice/kword/a11y.docbook +++ b/koffice-i18n-it/docs/koffice/kword/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Installazione del modulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >La maggior parte delle funzioni descritte in questo capitolo sono abilitabili installando il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. Il modulo<command ->kdeaccessibility</command +>tdeaccessibility</command > fa parte del progetto &kde;<ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Il pacchetto <command ->kdeaccessibility</command +>tdeaccessibility</command > è reperibile su &kde-ftp;, il sito <acronym >FTP</acronym > del progetto &kde;. </para> @@ -126,7 +126,7 @@ ></indexterm> <para >Il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command > include un programma per l'ingrandimento dello schermo chiamato <ulink url="help:kmag" >&kmagnifier;</ulink >. Se è installato puoi eseguirlo con <menuchoice @@ -155,7 +155,7 @@ ></indexterm> <para >Il modulo <command ->kdeaccessibility</command +>tdeaccessibility</command > include un componente di pronuncia testo chiamata KTTS. Se KTTS è installato, puoi configurare &kword; in modo che pronunci il testo sotto il cursore o che pronunci il testo dei controlli dello schermo quando ricevono il fuoco. Prima di usare questa funzione è necessario configurare KTTS. Vedi il <ulink url="help:kttsd" >Manuale di KTTS</ulink > per i dettagli. Per attivare le funzioni di pronuncia del testo di &kword;, scegli <menuchoice diff --git a/koffice-i18n-it/docs/koffice/kword/index.docbook b/koffice-i18n-it/docs/koffice/kword/index.docbook index 7a683aa3..4638171a 100644 --- a/koffice-i18n-it/docs/koffice/kword/index.docbook +++ b/koffice-i18n-it/docs/koffice/kword/index.docbook @@ -1530,7 +1530,7 @@ <listitem> <para ->Le librerie di &kde; 3.3.0 (kdelibs) e il pacchetto &kde; 3.3.0 base (kdebase). Questi si possono scaricare dalla <ulink url="http://www.kde.org" +>Le librerie di &kde; 3.3.0 (tdelibs) e il pacchetto &kde; 3.3.0 base (tdebase). Questi si possono scaricare dalla <ulink url="http://www.kde.org" >pagina Web di &kde;</ulink >.</para> <tip diff --git a/koffice-i18n-it/messages/koffice/desktop_koffice.po b/koffice-i18n-it/messages/koffice/desktop_koffice.po index a6b024a9..914cdb97 100644 --- a/koffice-i18n-it/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-it/messages/koffice/desktop_koffice.po @@ -573,7 +573,7 @@ msgstr "Name=Oggetti contenitori" msgid "Name=Basic Widgets" msgstr "Name=Oggetti di base" -#: 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=Plugin di KDevelop per il progetto dei moduli" @@ -1906,11 +1906,11 @@ msgstr "Name=Componente per la videoscrittura di KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Documenti di testo" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Plugin per la rubrica degli indirizzi 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 "" @@ -5313,11 +5313,11 @@ msgstr "Name=File di altri programmi Office" #~ msgstr "Name=Gestione degli accessi" #, fuzzy -#~ msgid "Comment=All KDM settings" +#~ msgid "Comment=All TDM settings" #~ msgstr "GenericName=Impostazioni dei colori" -#~ msgid "Keywords=kdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart" -#~ msgstr "Keywords=kdm,display manager,gestione degli utenti,xdm,utenti,login,accesso,benvenuto,logo,stile,lingua,paese,tipi di carattere,sfondo,immagine di sfondo,sessioni,riavvio,spegnimento,gestione degli accessi" +#~ msgid "Keywords=tdm,display manager,xdm,users,login,greeting,Logo,styles,language,country,fonts,background,wallpapers,sessions,shutdown,restart" +#~ msgstr "Keywords=tdm,display manager,gestione degli utenti,xdm,utenti,login,accesso,benvenuto,logo,stile,lingua,paese,tipi di carattere,sfondo,immagine di sfondo,sessioni,riavvio,spegnimento,gestione degli accessi" #~ msgid "Name=KDE Default for 3 Modifier Keys" #~ msgstr "Name=Predefinito di KDE con 3 tasti modificatori" @@ -5711,8 +5711,8 @@ msgstr "Name=File di altri programmi Office" #~ msgid "Comment=Password settings" #~ msgstr "GenericName=Impostazioni delle password" -#~ msgid "Keywords=Passwords,kdesu,Echo characters,Remember passwords,Timeout" -#~ msgstr "Keywords=Password,kdesu,caratteri password,ricorda password,tempo massimo" +#~ msgid "Keywords=Passwords,tdesu,Echo characters,Remember passwords,Timeout" +#~ msgstr "Keywords=Password,tdesu,caratteri password,ricorda password,tempo massimo" #~ msgid "Name=Samba Status" #~ msgstr "Name=Stato di Samba" @@ -6197,11 +6197,11 @@ msgstr "Name=File di altri programmi Office" #~ msgstr "Name=Pannello di KDE" #, fuzzy -#~ msgid "Name=CGI KIO Slave" +#~ msgid "Name=CGI TDEIO Slave" #~ msgstr "Name=IOSlave per i DVD" #, fuzzy -#~ msgid "Comment=Configuring the CGI KIO slave" +#~ msgid "Comment=Configuring the CGI TDEIO slave" #~ msgstr "GenericName=Configura Kamera" #, fuzzy @@ -6799,8 +6799,8 @@ msgstr "Name=File di altri programmi Office" #~ msgid "Comment=Window border theme" #~ msgstr "GenericName=Tema bordo finestre" -#~ msgid "Keywords=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration" -#~ msgstr "Keywords=kwin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione" +#~ msgid "Keywords=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration" +#~ msgstr "Keywords=twin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione" #, fuzzy #~ msgid "Name=Actions" @@ -7808,8 +7808,8 @@ msgstr "Name=File di altri programmi Office" #~ msgid "Name=tdeab2tdeabc" #~ msgstr "Name=KAB2KABC" -#~ msgid "Comment=libkab to libkabc conversion tool." -#~ msgstr "Comment=Strumento di conversione da libkab a libkabc." +#~ msgid "Comment=libkab to libtdeabc conversion tool." +#~ msgstr "Comment=Strumento di conversione da libkab a libtdeabc." #, fuzzy #~ msgid "Name=Address Book Configuration" diff --git a/koffice-i18n-it/messages/koffice/kformdesigner.po b/koffice-i18n-it/messages/koffice/kformdesigner.po index 6aca71e3..95b55e93 100644 --- a/koffice-i18n-it/messages/koffice/kformdesigner.po +++ b/koffice-i18n-it/messages/koffice/kformdesigner.po @@ -24,36 +24,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Documento da aprire" -#: 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 "Componente del progettatore di moduli" -#: 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 "Oggetti" -#: 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 "Pulisci i contenuti dell'oggetto" -#: 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 "Elimina oggetto" -#: 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 "Anteprima del modulo" -#: 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 "Modifica l'ordine delle schede" -#: 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 "Modifica la raccolta di pixmap" -#: 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 "Modifica le connessioni dei moduli" @@ -94,75 +94,75 @@ msgstr "Verti&calmente in un divisore" msgid "&Ungroup Widgets" msgstr "&Separa oggetti" -#: 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 "Porta l'oggetto in primo piano" -#: 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 "Manda l'oggetto sullo sfondo" -#: 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 "Allinea le posizioni degli oggetti" -#: 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 "A sinistra" -#: 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 "A destra" -#: 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 "In alto" -#: 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 "In basso" -#: 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 "Alla griglia" -#: 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 "Regola le dimensioni degli oggetti" -#: 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 "Adattativamente" -#: 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 "Al più corto" -#: 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 "Al più alto" -#: 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 "Al più stretto" -#: 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 "Al più largo" #: 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 "Modulo" -#: 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|File dell'interfaccia di 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 "" "Il modulo \"%1\" è stato modificato.\n" "Vuoi salvare o perdere i tuoi cambiamenti?" -#: 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 "Chiudi modulo" @@ -1131,19 +1131,19 @@ msgstr "Nuovo elemento" msgid "Sub Item" msgstr "Sottoelemento" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Disponi gli oggetti &orizzontalmente" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Disponi gli oggetti &verticalmente" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Disponi gli oggetti in una &griglia" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "Spe&zza lo schema" diff --git a/koffice-i18n-ja/acinclude.m4 b/koffice-i18n-ja/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-ja/acinclude.m4 +++ b/koffice-i18n-ja/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 <stdio.h> @@ -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-ja/configure.in b/koffice-i18n-ja/configure.in index e03119f2..26a94360 100644 --- a/koffice-i18n-ja/configure.in +++ b/koffice-i18n-ja/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-ja, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-ja, "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-ja/messages/koffice/desktop_koffice.po b/koffice-i18n-ja/messages/koffice/desktop_koffice.po index bd0d924f..401c5d1e 100644 --- a/koffice-i18n-ja/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-ja/messages/koffice/desktop_koffice.po @@ -572,7 +572,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 プラグイン" @@ -1886,11 +1886,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-ja/messages/koffice/kformdesigner.po b/koffice-i18n-ja/messages/koffice/kformdesigner.po index 268e54ad..0a865773 100644 --- a/koffice-i18n-ja/messages/koffice/kformdesigner.po +++ b/koffice-i18n-ja/messages/koffice/kformdesigner.po @@ -19,36 +19,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 "フォーム接続を編集" @@ -89,75 +89,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?" @@ -165,7 +165,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 "フォームを閉じる" @@ -1122,19 +1122,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-km/acinclude.m4 b/koffice-i18n-km/acinclude.m4 index e71d7e65..ab250321 100644 --- a/koffice-i18n-km/acinclude.m4 +++ b/koffice-i18n-km/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 <stdio.h> @@ -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 @@ -5660,7 +5660,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 @@ -5680,7 +5680,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 @@ -5917,9 +5917,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-km/configure.in b/koffice-i18n-km/configure.in index 8c009052..b60c3d15 100644 --- a/koffice-i18n-km/configure.in +++ b/koffice-i18n-km/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-km, "3.5.6") +AM_INIT_AUTOMAKE(koffice-i18n-km, "3.5.6") 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-km/messages/koffice/desktop_koffice.po b/koffice-i18n-km/messages/koffice/desktop_koffice.po index 4dda3b9d..12ccbf7f 100644 --- a/koffice-i18n-km/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-km/messages/koffice/desktop_koffice.po @@ -569,7 +569,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" @@ -1887,11 +1887,11 @@ msgstr "Name=សមាសភាគកម្មវិធីវាយអ 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:54 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:54 msgid "" "Comment=This datasource type lets you use your KDE Address Book entries." msgstr "" diff --git a/koffice-i18n-lv/acinclude.m4 b/koffice-i18n-lv/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-lv/acinclude.m4 +++ b/koffice-i18n-lv/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 <stdio.h> @@ -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-lv/configure.in b/koffice-i18n-lv/configure.in index 34d2aed5..92ffa884 100644 --- a/koffice-i18n-lv/configure.in +++ b/koffice-i18n-lv/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-lv, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-lv, "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-lv/messages/koffice/desktop_koffice.po b/koffice-i18n-lv/messages/koffice/desktop_koffice.po index f2e2fd5d..14ed0fcd 100644 --- a/koffice-i18n-lv/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-lv/messages/koffice/desktop_koffice.po @@ -620,7 +620,7 @@ msgstr "Name=Savienojumi" msgid "Name=Basic Widgets" msgstr "Name=Bizness" -#: 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=Kugar Dizainers" @@ -2083,11 +2083,11 @@ msgstr "Comment=KOffice Komponente" msgid "GenericName=Text Documents" msgstr "Name=Teksta Dokuments" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:49 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:49 #, fuzzy msgid "" "Comment=This datasource type lets you use your KDE Address Book entries." diff --git a/koffice-i18n-ms/acinclude.m4 b/koffice-i18n-ms/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-ms/acinclude.m4 +++ b/koffice-i18n-ms/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 <stdio.h> @@ -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-ms/configure.in b/koffice-i18n-ms/configure.in index 16623048..b4b2f022 100644 --- a/koffice-i18n-ms/configure.in +++ b/koffice-i18n-ms/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-ms, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-ms, "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-ms/messages/koffice/desktop_koffice.po b/koffice-i18n-ms/messages/koffice/desktop_koffice.po index 9607ce79..69c75532 100644 --- a/koffice-i18n-ms/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-ms/messages/koffice/desktop_koffice.po @@ -607,7 +607,7 @@ msgstr "Name=Widget Bekas" msgid "Name=Basic Widgets" msgstr "Name=Widget Asas" -#: 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=Plugin KDevelop Pereka Bentuk Borang" @@ -2021,11 +2021,11 @@ msgstr "Name=Komponen Pemproses Kata KOffice" msgid "GenericName=Text Documents" msgstr "Name=Dokumen Teks..." -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Plugin Buku Alamat 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-ms/messages/koffice/kformdesigner.po b/koffice-i18n-ms/messages/koffice/kformdesigner.po index d7461553..60139668 100644 --- a/koffice-i18n-ms/messages/koffice/kformdesigner.po +++ b/koffice-i18n-ms/messages/koffice/kformdesigner.po @@ -20,36 +20,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Dokumen hendak dibuka" -#: 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 "Bahagian Pereka Bentuk Borang" -#: 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 "Objek" -#: 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 "Kosongkan Kandungan Widget" -#: 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 "Hapuskan 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 "Borang Prapapar" -#: 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 "Edit Tertib 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 "Edit Koleksi Pixmap" -#: 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 "Edit Sambungan Borang" @@ -95,75 +95,75 @@ msgstr "Menegak dalam Pencerai" msgid "&Ungroup Widgets" msgstr "&Widget" -#: 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 "Bawa Widget ke Depan" -#: 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 "Hantar Widget ke Belakang" -#: 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 "Jajarkan Posisi 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 "Ke Kiri" -#: 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 "Ke Kanan" -#: 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 "Ke Atas" -#: 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 "Ke Bawah" -#: 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 "Ke 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 msgid "Adjust Widgets' Sizes" msgstr "Selaraskan Saiz 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 "Ke Suaikan" -#: 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 "Ke Terpendek" -#: 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 "Ke Tertinggi" -#: 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 "Ke Terkecil" -#: 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 "Ke Terlebar" #: 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 "Borang" -#: 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 "Fail UI Pereka Bentuk *.uilQt " -#: 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?" @@ -171,7 +171,7 @@ msgstr "" "Borang \"%1\" telah diubah suai.\n" "Anda hendak simpan atau buang perubahan?" -#: 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 "Tutup Borang" @@ -1192,19 +1192,19 @@ msgstr "Butiran Baru" msgid "Sub Item" msgstr "Subbutiran" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Letak Widget &Mendatar" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Letak Widget &Menegak" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Letak Widget dalam &Grid" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Pisahkan Bentangan" diff --git a/koffice-i18n-nb/acinclude.m4 b/koffice-i18n-nb/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-nb/acinclude.m4 +++ b/koffice-i18n-nb/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 <stdio.h> @@ -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-nb/configure.in b/koffice-i18n-nb/configure.in index f798a791..e03794ee 100644 --- a/koffice-i18n-nb/configure.in +++ b/koffice-i18n-nb/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-nb, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-nb, "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-nb/messages/koffice/desktop_koffice.po b/koffice-i18n-nb/messages/koffice/desktop_koffice.po index efe8d8ee..9ce5b118 100644 --- a/koffice-i18n-nb/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-nb/messages/koffice/desktop_koffice.po @@ -579,7 +579,7 @@ msgstr "Name=Beholder-elementer" msgid "Name=Basic Widgets" msgstr "Name=Elementære elementer" -#: 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-tillegg for skjemautforming" @@ -1901,11 +1901,11 @@ msgstr "Name=KOffice-komponent for tekstbehandling" msgid "GenericName=Text Documents" msgstr "GenericName=Tekstdokumenter" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Programtillegg for KDE-adresseboka" -#: 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-nb/messages/koffice/kformdesigner.po b/koffice-i18n-nb/messages/koffice/kformdesigner.po index 21e4cdae..b8aedb0a 100644 --- a/koffice-i18n-nb/messages/koffice/kformdesigner.po +++ b/koffice-i18n-nb/messages/koffice/kformdesigner.po @@ -28,36 +28,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Dokumentet du vil åpne" -#: 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 "Skjema utformingsdel" -#: 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 "Objekter" -#: 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 "Tøm innholdet av elementene" -#: 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 "Slett element" -#: 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 "Skjema for forhåndsvisning" -#: 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 "Endre tabulator-rekkefølgen" -#: 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 "Endre bildelageret" -#: 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 "Endre skjemaforbindelsene" @@ -103,75 +103,75 @@ msgstr "Loddrett i en s&plitter" msgid "&Ungroup Widgets" msgstr "&Elementer" -#: 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 "Flytt elementet forrest" -#: 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 "Flytt elementet bakerst" -#: 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 "Rydd elementene" -#: 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 "Til venstre" -#: 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 "Til høyre" -#: 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 "Til toppen" -#: 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 "Til bunnen" -#: 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 "Til rutenettet" -#: 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 "Juster størrelsen på elementene" -#: 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 "Tilpasset" -#: 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 "Til det korteste" -#: 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 "Til det høyeste" -#: 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 "Til det smaleste" -#: 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 "Til det bredeste" #: 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 "SKjema" -#: 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 utforming UI-filer" -#: 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?" @@ -179,7 +179,7 @@ msgstr "" "Skjemaet «%1» har blitt endret.\n" "Vil du lagre endringene, eller slette 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 "Lukk skjemaet" @@ -1199,19 +1199,19 @@ msgstr "Nytt element" msgid "Sub Item" msgstr "Underelement" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Fordel elementene &vannrett" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Fordel elementene &loddrett" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Fordel elementene i &rutenettet" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Bryt oppsettet" diff --git a/koffice-i18n-nds/acinclude.m4 b/koffice-i18n-nds/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-nds/acinclude.m4 +++ b/koffice-i18n-nds/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 <stdio.h> @@ -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-nds/configure.in b/koffice-i18n-nds/configure.in index 5f7eca62..130ccf27 100644 --- a/koffice-i18n-nds/configure.in +++ b/koffice-i18n-nds/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-nds, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-nds, "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-nds/messages/koffice/desktop_koffice.po b/koffice-i18n-nds/messages/koffice/desktop_koffice.po index 82e8c298..6f60a13f 100644 --- a/koffice-i18n-nds/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-nds/messages/koffice/desktop_koffice.po @@ -571,7 +571,7 @@ msgstr "Name=Gelaatselementen" msgid "Name=Basic Widgets" msgstr "Name=Grundelementen" -#: 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-Moduul för't Opstellen vun Kiekwarken" @@ -1893,11 +1893,11 @@ msgstr "Name=Textverarbeiden-Komponent för KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Textdokmenten" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Adressbook-Moduul för 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=Mit dissen Datenborntyp laat sik KDE-Adressbookindrääg bruken." diff --git a/koffice-i18n-nds/messages/koffice/kformdesigner.po b/koffice-i18n-nds/messages/koffice/kformdesigner.po index 6e8e48ce..f7b7f5cd 100644 --- a/koffice-i18n-nds/messages/koffice/kformdesigner.po +++ b/koffice-i18n-nds/messages/koffice/kformdesigner.po @@ -21,36 +21,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Dokment, dat opmaakt warrn schall" -#: 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 "KFormDesigner-Komponent" -#: 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 "Objekten" -#: 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 "Stüerelementinholt leddig maken" -#: 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 "Stüerelement wegdoon" -#: 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 "Kiekwark-Vöransicht" -#: 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 "Paneelreeg bewerken" -#: 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 "Kachelbild-Sammeln bewerken" -#: 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 "Kiekwark-Verbinnen bewerken" @@ -91,75 +91,75 @@ msgstr "&Pielliek in Trenner" msgid "&Ungroup Widgets" msgstr "Stüerelementenkoppel &opheven" -#: 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 "Stüerelement na vörn" -#: 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 "Stüerelement na achtern" -#: 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 "Stüerelementen utrichten" -#: 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 "Na links" -#: 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 "Na rechts" -#: 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 "Na baven" -#: 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 "Na nerrn" -#: 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 "An't Gadder" -#: 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 "Stüerelementgrött topassen" -#: 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 "Topassen" -#: 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 "Na't Körtst" -#: 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 "Na't Langst" -#: 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 "Na't Drangst" -#: 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 "Na't Breedst" #: 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 "Kiekwark" -#: 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|Koppelsteed-Dateien vun 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?" @@ -167,7 +167,7 @@ msgstr "" "Dat Kiekwark \"%1\" wöör ännert.\n" "Wullt Du Dien Ännern sekern, oder ehr wegdoon?" -#: 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 "Kiekwark tomaken" @@ -1130,19 +1130,19 @@ msgstr "Nieg Indrag" msgid "Sub Item" msgstr "Ünnerindrag" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Stüerelementen &waagrecht utrichten" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Stüerelementen &pielliek utrichten" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Stüerelementen an't &Gadder utrichten" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "Anornen op&breken" diff --git a/koffice-i18n-ne/acinclude.m4 b/koffice-i18n-ne/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-ne/acinclude.m4 +++ b/koffice-i18n-ne/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 <stdio.h> @@ -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-ne/configure.in b/koffice-i18n-ne/configure.in index bcdeca08..c32b49d3 100644 --- a/koffice-i18n-ne/configure.in +++ b/koffice-i18n-ne/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-ne, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-ne, "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-ne/messages/koffice/desktop_koffice.po b/koffice-i18n-ne/messages/koffice/desktop_koffice.po index b63cfd48..900ad7ba 100644 --- a/koffice-i18n-ne/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-ne/messages/koffice/desktop_koffice.po @@ -577,7 +577,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=फारम डिजाइनकर्ता केडीई विकास प्लगइन" @@ -1903,11 +1903,11 @@ msgstr "Name=केडीई कार्यालय शब्द प्रो 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-ne/messages/koffice/kformdesigner.po b/koffice-i18n-ne/messages/koffice/kformdesigner.po index 54b3e97d..f7a39d5a 100644 --- a/koffice-i18n-ne/messages/koffice/kformdesigner.po +++ b/koffice-i18n-ne/messages/koffice/kformdesigner.po @@ -25,36 +25,36 @@ msgstr "केडीई फाराम डिजाइनर" 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 "फारम जडानहरू सम्पादन गर्नुहोस्" @@ -95,75 +95,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 डिजाइनर यूआई फाइल" -#: 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?" @@ -171,7 +171,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-nl/acinclude.m4 b/koffice-i18n-nl/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-nl/acinclude.m4 +++ b/koffice-i18n-nl/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 <stdio.h> @@ -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-nl/configure.in b/koffice-i18n-nl/configure.in index f8db42b8..d1bbd1e1 100644 --- a/koffice-i18n-nl/configure.in +++ b/koffice-i18n-nl/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-nl, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-nl, "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-nl/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-nl/docs/koffice/chalk/developers-plugins.docbook index 8abb8b77..8f75dff9 100644 --- a/koffice-i18n-nl/docs/koffice/chalk/developers-plugins.docbook +++ b/koffice-i18n-nl/docs/koffice/chalk/developers-plugins.docbook @@ -247,8 +247,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 </programlisting> </para ><para @@ -413,7 +413,7 @@ ToolStar::~ToolStar() <para >&chalk; 1.5 loads plugins with <literal ->X-KDE-Version=2</literal +>X-TDE-Version=2</literal > set in the <literal role="extension" >.desktop</literal > file. &chalk; 1.6 plugins will probably be binary incompatible with 1.5 plugins and will need the version number 3. &chalk; 2.0 plugins will need the version number 3. Yes, this is not entirely logical. </para> @@ -1408,10 +1408,10 @@ METASOURCES = AUTO >Import: </para> <programlisting ->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 </programlisting> @@ -1419,12 +1419,12 @@ ServiceTypes=KOfficeFilter >Export: </para> <programlisting ->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 </programlisting> <para diff --git a/koffice-i18n-nl/docs/koffice/chalk/installation.docbook b/koffice-i18n-nl/docs/koffice/chalk/installation.docbook index 1f0ebcb9..c2a6033d 100644 --- a/koffice-i18n-nl/docs/koffice/chalk/installation.docbook +++ b/koffice-i18n-nl/docs/koffice/chalk/installation.docbook @@ -13,8 +13,8 @@ <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/koffice-i18n-nl/docs/koffice/chalk/tutorial-select-layer.docbook b/koffice-i18n-nl/docs/koffice/chalk/tutorial-select-layer.docbook index 27a7cbf4..399b23ef 100644 --- a/koffice-i18n-nl/docs/koffice/chalk/tutorial-select-layer.docbook +++ b/koffice-i18n-nl/docs/koffice/chalk/tutorial-select-layer.docbook @@ -24,7 +24,7 @@ <para >We gaan met de afbeelding hierboven werken. U kunt deze afbeelding vinden in <filename >$<envar ->KDEDIR</envar +>TDEDIR</envar >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename >. U kunt ook op de afbeelding rechtsklikken, <guilabel >Afbeelding opslaan als...</guilabel diff --git a/koffice-i18n-nl/docs/koffice/kchart/index.docbook b/koffice-i18n-nl/docs/koffice/kchart/index.docbook index 2ca78c19..b70c989e 100644 --- a/koffice-i18n-nl/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-nl/docs/koffice/kchart/index.docbook @@ -70,7 +70,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-nl/docs/koffice/kpresenter/a11y.docbook b/koffice-i18n-nl/docs/koffice/kpresenter/a11y.docbook index e5eec1a5..57596c97 100644 --- a/koffice-i18n-nl/docs/koffice/kpresenter/a11y.docbook +++ b/koffice-i18n-nl/docs/koffice/kpresenter/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module installeren</title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >Het merendeel van de functies die in dit hoofdstuk beschreven worden, komen beschikbaar wanneer de <command ->kdeaccessibility</command +>tdeaccessibility</command >-module geïnstalleerd wordt. De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module maakt deel uit van het &kde;-project <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Het <command ->kdeaccessibility</command +>tdeaccessibility</command >-pakket is verkrijgbaar op &kde-ftp;, de ftp-site van het &kde;-project. </para> <para @@ -132,7 +132,7 @@ ></indexterm> <para >De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module bevat een toepassing om (gedeelten van) het scherm te vergroten: <ulink url="help:kmag" >KMagnifier</ulink >. Als deze toepassing geïnstalleerd is, kunt u deze opstarten via <menuchoice @@ -161,7 +161,7 @@ ></indexterm> <para >De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module bevat een Tekst-naar-Spraak-component, KTTS. Als KTTS geïnstalleerd is, kunt u &kpresenter; instellen om de tekst onder de muiswijzer of de tekst van elk beeldelement dat de focus krijgt uit te spreken. Voordat u deze functie kunt gebruiken, moet u KTTS instellen. Zie <ulink url="help:kttsd" >Het handboek van KTTS</ulink > voor details. Om de TNS-functie in &kpresenter; in te schakelen, kiest u het menu <menuchoice diff --git a/koffice-i18n-nl/docs/koffice/kspread/a11y.docbook b/koffice-i18n-nl/docs/koffice/kspread/a11y.docbook index 4cae7901..7f3670cd 100644 --- a/koffice-i18n-nl/docs/koffice/kspread/a11y.docbook +++ b/koffice-i18n-nl/docs/koffice/kspread/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module installeren</title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >Het merendeel van de functies die in dit hoofdstuk beschreven worden, komen beschikbaar wanneer de <command ->kdeaccessibility</command +>tdeaccessibility</command >-module geïnstalleerd wordt. De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module maakt deel uit van het &kde;-project <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Het <command ->kdeaccessibility</command +>tdeaccessibility</command >-pakket is verkrijgbaar op &kde-ftp;, de ftp-site van het &kde;-project. </para> <para @@ -126,7 +126,7 @@ ></indexterm> <para >De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module bevat een toepassing om (gedeelten van) het scherm te vergroten: <ulink url="help:kmag" >&kmagnifier;</ulink >. Als deze toepassing geïnstalleerd is, kunt u deze opstarten via <menuchoice @@ -153,7 +153,7 @@ ></indexterm> <para >De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module bevat een Tekst-naar-Spraak-component, KTTS. Als KTTS geïnstalleerd is, kunt u &kspread; instellen om de tekst onder de muiswijzer of de tekst van elk beeldelement dat de focus krijgt uit te spreken. Voordat u deze functie kunt gebruiken, moet u KTTS instellen. Zie <ulink url="help:kttsd" >Het handboek van KTTS</ulink > voor details. Om de TNS-functie in &kspread; in te schakelen, kiest u het menu <menuchoice diff --git a/koffice-i18n-nl/docs/koffice/kugar/index.docbook b/koffice-i18n-nl/docs/koffice/kugar/index.docbook index 7a214626..e67d155e 100644 --- a/koffice-i18n-nl/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-nl/docs/koffice/kugar/index.docbook @@ -98,7 +98,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-nl/docs/koffice/kword/a11y.docbook b/koffice-i18n-nl/docs/koffice/kword/a11y.docbook index f5e3054d..6d9cdf49 100644 --- a/koffice-i18n-nl/docs/koffice/kword/a11y.docbook +++ b/koffice-i18n-nl/docs/koffice/kword/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module installeren</title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >Het merendeel van de functies die in dit hoofdstuk beschreven worden, komen beschikbaar wanneer de <command ->kdeaccessibility</command +>tdeaccessibility</command >-module geïnstalleerd wordt. De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module maakt deel uit van het &kde;-project <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Het <command ->kdeaccessibility</command +>tdeaccessibility</command >-pakket is verkrijgbaar op &kde-ftp;, de ftp-site van het &kde;-project. </para> <para @@ -124,7 +124,7 @@ ></indexterm> <para >De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module bevat een toepassing om (gedeelten van) het scherm te vergroten: <ulink url="help:kmag" >&kmagnifier;</ulink >. Als deze toepassing geïnstalleerd is, kunt u deze opstarten via <menuchoice @@ -151,7 +151,7 @@ ></indexterm> <para >De <command ->kdeaccessibility</command +>tdeaccessibility</command >-module bevat een Tekst-naar-Spraak-component, KTTS. Als KTTS geïnstalleerd is, kunt u &kword; instellen om de tekst onder de muiswijzer of de tekst van elk beeldelement dat de focus krijgt uit te spreken. Voordat u deze functie kunt gebruiken, moet u KTTS instellen. Zie <ulink url="help:kttsd" >Het handboek van KTTS</ulink > voor details. Om de TNS-functie in &kword; in te schakelen, kiest u het menu <menuchoice diff --git a/koffice-i18n-nl/docs/koffice/kword/index.docbook b/koffice-i18n-nl/docs/koffice/kword/index.docbook index e46cd8b5..dfd402b8 100644 --- a/koffice-i18n-nl/docs/koffice/kword/index.docbook +++ b/koffice-i18n-nl/docs/koffice/kword/index.docbook @@ -1526,7 +1526,7 @@ <listitem> <para ->Bibliotheken van &kde; 3.3.0 (kdelibs) en het &kde; 3.3.0-basispakket (kdebase). Deze kunnen van de website van <ulink url="http://www.kde.org" +>Bibliotheken van &kde; 3.3.0 (tdelibs) en het &kde; 3.3.0-basispakket (tdebase). Deze kunnen van de website van <ulink url="http://www.kde.org" >&kde;</ulink > gedownload worden.</para> <tip diff --git a/koffice-i18n-nl/messages/koffice/desktop_koffice.po b/koffice-i18n-nl/messages/koffice/desktop_koffice.po index ad870ddd..c7926b8e 100644 --- a/koffice-i18n-nl/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-nl/messages/koffice/desktop_koffice.po @@ -583,7 +583,7 @@ msgstr "Name=Containerwidgets" msgid "Name=Basic Widgets" msgstr "Name=Basiswidgets" -#: 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-plugin FormDesigner" @@ -1915,11 +1915,11 @@ msgstr "Name=KOffice Tekstverwerkingscomponent" msgid "GenericName=Text Documents" msgstr "GenericName=Tekstdocumenten" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Adresboekplugin voor 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=Via deze plugin hebt u toegang tot uw KDE-adresboek." diff --git a/koffice-i18n-nl/messages/koffice/kformdesigner.po b/koffice-i18n-nl/messages/koffice/kformdesigner.po index 4871b742..12c79565 100644 --- a/koffice-i18n-nl/messages/koffice/kformdesigner.po +++ b/koffice-i18n-nl/messages/koffice/kformdesigner.po @@ -32,36 +32,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Te openen document" -#: 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 "Formulierdesigner 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 "Objecten" -#: 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 "Componentinhoud wissen" -#: 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 "Component verwijderen" -#: 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 "Voorbeeldformulier" -#: 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 "Tabvolgorde bewerken" -#: 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 "Afbeeldingverzameling bewerken" -#: 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 "Formulierverbindingen bewerken" @@ -102,75 +102,75 @@ msgstr "Verti&caal in splitter" msgid "&Ungroup Widgets" msgstr "Groeperin&g componenten opheffen" -#: 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 "Component op voorgrond plaatsen" -#: 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 "Component op achtergrond plaatsen" -#: 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 "Positie van componenten uitlijnen" -#: 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 "Naar links" -#: 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 "Naar rechts" -#: 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 "Naar boven" -#: 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 "Naar beneden" -#: 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 "Op raster" -#: 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 "Grootte van componenten aanpassen" -#: 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 "Passend" -#: 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 "Kortste" -#: 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 "Langste" -#: 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 "Smalste" -#: 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 "Breedste" #: 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 "Formulier" -#: 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-bestanden" -#: 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?" @@ -178,7 +178,7 @@ msgstr "" "Het formulier \"%1\" is gewijzigd.\n" "Wilt u de wijzigingen opslaan of verwerpen?" -#: 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 "Formulier sluiten" @@ -1141,19 +1141,19 @@ msgstr "Nieuw item" msgid "Sub Item" msgstr "Subitem" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Componenten &horizontaal ordenen" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Componenten &verticaal ordenen" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Wid&gets in een raster ordenen" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Indeling splitsen" diff --git a/koffice-i18n-pl/acinclude.m4 b/koffice-i18n-pl/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-pl/acinclude.m4 +++ b/koffice-i18n-pl/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 <stdio.h> @@ -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-pl/configure.in b/koffice-i18n-pl/configure.in index de4482ef..163af945 100644 --- a/koffice-i18n-pl/configure.in +++ b/koffice-i18n-pl/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-pl, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-pl, "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-pl/messages/koffice/desktop_koffice.po b/koffice-i18n-pl/messages/koffice/desktop_koffice.po index a4bca2bf..aec01392 100644 --- a/koffice-i18n-pl/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-pl/messages/koffice/desktop_koffice.po @@ -575,7 +575,7 @@ msgstr "Name=Kontrolki pojemników" msgid "Name=Basic Widgets" msgstr "Name=Proste kontrolki" -#: 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=Wtyczka projektanta formularzy dla KDevelop" @@ -1916,11 +1916,11 @@ msgstr "Name=Komponent przetwarzania tekstu dla KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Dokumenty tekstowe" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Wtyczka Książki adresowej 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-pl/messages/koffice/kformdesigner.po b/koffice-i18n-pl/messages/koffice/kformdesigner.po index da020cb6..1a6e3ed5 100644 --- a/koffice-i18n-pl/messages/koffice/kformdesigner.po +++ b/koffice-i18n-pl/messages/koffice/kformdesigner.po @@ -29,36 +29,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Dokument do otwarcia" -#: 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 "Wtyczka edytora formularzy" -#: 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 "Obiekty" -#: 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 "Wyczyść zawartość widżetu" -#: 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 "Usuń widżet" -#: 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 "Podgląd formularza" -#: 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 "Edytuj kolejność tabulacji" -#: 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 "Edytuj kolekcję obrazków" -#: 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 "Edytuj połączenia formularza" @@ -99,75 +99,75 @@ msgstr "Pionowo z linią &rozdzielającą" msgid "&Ungroup Widgets" msgstr "Rozgrupuj widżety" -#: 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 "Przesuń widżet na wierzch" -#: 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 "Przesuń widżet pod spód" -#: 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 "Wyrównaj pozycje widżetów" -#: 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 "Do lewej" -#: 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 "Do prawej" -#: 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 "Do góry" -#: 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 "Do dołu" -#: 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 "Do siatki" -#: 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 "Dopasuj rozmiar widżetów" -#: 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 "Do zawartości" -#: 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 "Do najniższego" -#: 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 "Do najwyższego" -#: 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 "Do najwyższego" -#: 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 "Do najszerszego" #: 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 "Formularz" -#: 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|Pliki interfejsu użytkownika Qt Designera" -#: 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?" @@ -175,7 +175,7 @@ msgstr "" "Formularz \"%1\" został zmodyfikowany\n" "Czy chcesz go zapisać czy porzucić zmiany?" -#: 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 "Zamknij formularz" @@ -1135,19 +1135,19 @@ msgstr "Nowy element" msgid "Sub Item" msgstr "Podelement" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Rozmieść kontrolki &poziomo" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Rozmieść kontrolki p&ionowo" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Rozmieść kontrolki według &siatki" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "Przerwij ułożenie" diff --git a/koffice-i18n-pt/acinclude.m4 b/koffice-i18n-pt/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-pt/acinclude.m4 +++ b/koffice-i18n-pt/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 <stdio.h> @@ -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-pt/configure.in b/koffice-i18n-pt/configure.in index e1955a40..a008c2b8 100644 --- a/koffice-i18n-pt/configure.in +++ b/koffice-i18n-pt/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-pt, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-pt, "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-pt/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-pt/docs/koffice/chalk/developers-plugins.docbook index 961e7175..da942bcc 100644 --- a/koffice-i18n-pt/docs/koffice/chalk/developers-plugins.docbook +++ b/koffice-i18n-pt/docs/koffice/chalk/developers-plugins.docbook @@ -246,8 +246,8 @@ Icon= Name=Nome Visível ServiceTypes=Chalk/Filter Type=Service -X-KDE-Library=chalkNOMEBIBLIOTECA -X-KDE-Version=2 +X-TDE-Library=chalkNOMEBIBLIOTECA +X-TDE-Version=2 </programlisting> </para ><para @@ -412,7 +412,7 @@ FerramentaEstrela::~FerramentaEstrela() <para >O &chalk; 1.5 carrega os 'plugins' com o <literal ->X-KDE-Version=2</literal +>X-TDE-Version=2</literal > definido no ficheiro <literal role="extension" >.desktop</literal >. Os 'plugins' do &chalk; 1.6 serão provavelmente incompatíveis a nível binário com os do 1.5 e irão necessitar da versão 3. Os 'plugins' do &chalk; 2.0 irão necessitar do número de versão 3. Sim, isto não de todo lógico. </para> @@ -1407,10 +1407,10 @@ METASOURCES = AUTO >Importar: </para> <programlisting ->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 </programlisting> @@ -1418,12 +1418,12 @@ ServiceTypes=KOfficeFilter >Exportar: </para> <programlisting ->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 </programlisting> <para diff --git a/koffice-i18n-pt/docs/koffice/chalk/installation.docbook b/koffice-i18n-pt/docs/koffice/chalk/installation.docbook index ade18f15..edf1c746 100644 --- a/koffice-i18n-pt/docs/koffice/chalk/installation.docbook +++ b/koffice-i18n-pt/docs/koffice/chalk/installation.docbook @@ -13,8 +13,8 @@ <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/koffice-i18n-pt/docs/koffice/chalk/tutorial-select-layer.docbook b/koffice-i18n-pt/docs/koffice/chalk/tutorial-select-layer.docbook index ddbcf569..c0546c61 100644 --- a/koffice-i18n-pt/docs/koffice/chalk/tutorial-select-layer.docbook +++ b/koffice-i18n-pt/docs/koffice/chalk/tutorial-select-layer.docbook @@ -24,7 +24,7 @@ <para >A imagem acima é a que será tratada agora. Inicie o 'chalk' com esta imagem (na pasta de documentação <filename >$<envar ->KDEDIR</envar +>TDEDIR</envar >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename > e grave-a na sua pasta pessoal (se carregar com o botão direito nela e escolher <guilabel >Gravar a Imagem Como...</guilabel diff --git a/koffice-i18n-pt/docs/koffice/kchart/index.docbook b/koffice-i18n-pt/docs/koffice/kchart/index.docbook index 92471697..56c6d47d 100644 --- a/koffice-i18n-pt/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-pt/docs/koffice/kchart/index.docbook @@ -70,7 +70,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-pt/docs/koffice/kpresenter/a11y.docbook b/koffice-i18n-pt/docs/koffice/kpresenter/a11y.docbook index c099f340..01999b44 100644 --- a/koffice-i18n-pt/docs/koffice/kpresenter/a11y.docbook +++ b/koffice-i18n-pt/docs/koffice/kpresenter/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Instalar o Módulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >A maioria das funcionalidades descritas neste capítulo ficam activas se instalar o módulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > faz parte do projecto do &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. O pacote do <command ->kdeaccessibility</command +>tdeaccessibility</command > pode ser obtido no &kde-ftp;, o servidor de FTP principal do projecto &kde;. </para> <para @@ -132,7 +132,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui uma aplicação de ampliação do ecrã chamada <ulink url="help:kmag" >KMagnifier</ulink >. Se estiver instalada, poderá executá-la em <menuchoice @@ -161,7 +161,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui um componente de Texto-para-Fala chamado KTTS. Se o KTTS estiver instalado, poderá configurar o &kpresenter; para falar o texto que se encontra sob o cursor do rato ou falar o texto de cada elemento do ecrã, quando este ficar em primeiro plano. Antes de usar esta funcionalidade, configure primeiro o KTTS. Veja o <ulink url="help:kttsd" >Manual do KTTS</ulink > para mais detalhes. Para activar a funcionalidade de TTS do &kpresenter;, seleccione a opção <menuchoice diff --git a/koffice-i18n-pt/docs/koffice/kspread/a11y.docbook b/koffice-i18n-pt/docs/koffice/kspread/a11y.docbook index ddd0feda..d5dbfaa6 100644 --- a/koffice-i18n-pt/docs/koffice/kspread/a11y.docbook +++ b/koffice-i18n-pt/docs/koffice/kspread/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Instalar o Módulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >A maioria das funcionalidades descritas neste capítulo ficam activas se instalar o módulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > faz parte do projecto do &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. O pacote do <command ->kdeaccessibility</command +>tdeaccessibility</command > pode ser obtido no &kde-ftp;, o servidor de FTP principal do projecto &kde;. </para> <para @@ -130,7 +130,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui uma aplicação de ampliação do ecrã chamada <ulink url="help:kmag" >&kmagnifier;</ulink >. Se estiver instalada, poderá executá-la em <menuchoice @@ -159,7 +159,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui um componente de Texto-para-Fala chamado KTTS. Se o KTTS estiver instalado, poderá configurar o &kspread; para falar o texto que se encontra sob o cursor do rato ou falar o texto de cada elemento do ecrã, quando este ficar em primeiro plano. Antes de usar esta funcionalidade, configure primeiro o KTTS. Veja o <ulink url="help:kttsd" >Manual do KTTS</ulink > para mais detalhes. Para activar a funcionalidade de TTS do &kspread;, seleccione a opção <menuchoice diff --git a/koffice-i18n-pt/docs/koffice/kugar/index.docbook b/koffice-i18n-pt/docs/koffice/kugar/index.docbook index 065781f5..48510f8f 100644 --- a/koffice-i18n-pt/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-pt/docs/koffice/kugar/index.docbook @@ -98,7 +98,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-pt/docs/koffice/kword/a11y.docbook b/koffice-i18n-pt/docs/koffice/kword/a11y.docbook index 81b27bb8..d9e50f5f 100644 --- a/koffice-i18n-pt/docs/koffice/kword/a11y.docbook +++ b/koffice-i18n-pt/docs/koffice/kword/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Instalar o Módulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >A maioria das funcionalidades descritas neste capítulo ficam activas se instalar o módulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > faz parte do projecto do &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. O pacote do <command ->kdeaccessibility</command +>tdeaccessibility</command > pode ser obtido no &kde-ftp;, o servidor de FTP principal do projecto &kde;. </para> <para @@ -130,7 +130,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui uma aplicação de ampliação do ecrã chamada <ulink url="help:kmag" >&kmagnifier;</ulink >. Se estiver instalada, poderá executá-la em <menuchoice @@ -159,7 +159,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui um componente de Texto-para-Fala chamado KTTS. Se o KTTS estiver instalado, poderá configurar o &kword; para falar o texto que se encontra sob o cursor do rato ou falar o texto de cada elemento do ecrã, quando este ficar em primeiro plano. Antes de usar esta funcionalidade, configure primeiro o KTTS. Veja o <ulink url="help:kttsd" >Manual do KTTS</ulink > para mais detalhes. Para activar a funcionalidade de TTS do &kword;, seleccione a opção <menuchoice diff --git a/koffice-i18n-pt/docs/koffice/kword/index.docbook b/koffice-i18n-pt/docs/koffice/kword/index.docbook index e9beec79..01c52417 100644 --- a/koffice-i18n-pt/docs/koffice/kword/index.docbook +++ b/koffice-i18n-pt/docs/koffice/kword/index.docbook @@ -1516,7 +1516,7 @@ <listitem> <para ->As bibliotecas do &kde; 3.3.0 (kdelibs) e o pacote de base do &kde; 3.3.0 (kdebase). Estes poderão ser obtidos na <ulink url="http://www.kde.org" +>As bibliotecas do &kde; 3.3.0 (tdelibs) e o pacote de base do &kde; 3.3.0 (tdebase). Estes poderão ser obtidos na <ulink url="http://www.kde.org" >página Web do &kde;.</ulink ></para> <tip diff --git a/koffice-i18n-pt/messages/koffice/desktop_koffice.po b/koffice-i18n-pt/messages/koffice/desktop_koffice.po index 2a1925e2..a77be716 100644 --- a/koffice-i18n-pt/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-pt/messages/koffice/desktop_koffice.po @@ -584,7 +584,7 @@ msgstr "Name=Elementos Contentores" msgid "Name=Basic Widgets" msgstr "Name=Elementos Básicos" -#: 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='Plugin' para o KDevelop de Desenho de Formulários" @@ -1917,11 +1917,11 @@ msgstr "Name=Componente de Processamento de Texto do KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Documentos de Texto" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name='Plugin' do Livro de Endereços do 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-pt/messages/koffice/kformdesigner.po b/koffice-i18n-pt/messages/koffice/kformdesigner.po index eaae7bbd..7777eb21 100644 --- a/koffice-i18n-pt/messages/koffice/kformdesigner.po +++ b/koffice-i18n-pt/messages/koffice/kformdesigner.po @@ -29,36 +29,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "O documento a abrir" -#: 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 "Componente de Desenho de Formulários" -#: 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 "Objectos" -#: 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 "Limpar o Conteúdo do Elemento" -#: 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 "Remover o Elemento" -#: 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 "Antever o Formulário" -#: 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 "Editar a Ordem de Tabulação" -#: 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 "Editar a Colecção de Imagens" -#: 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 "Editar as Ligações do Formulário" @@ -99,75 +99,75 @@ msgstr "Verti&calmente num Separador" msgid "&Ungroup Widgets" msgstr "Desagr&upar os Elementos" -#: 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 "Trazer Elementos para a Frente" -#: 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 "Enviar Elementos para Trás" -#: 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 "Alinhar a Posição dos Elementos" -#: 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 "À Esquerda" -#: 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 "À Direita" -#: 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 "Ao Topo" -#: 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 "Ao Fundo" -#: 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 "À Grelha" -#: 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 "Ajustar o Tamanho dos Elementos" -#: 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 "Para Caber" -#: 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 "Ao Menor" -#: 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 "Ao Mais Alto" -#: 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 "Ao Mais Estreito" -#: 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 "Ao Mais Largo" #: 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ário" -#: 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|Ficheiros UI do 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?" @@ -175,7 +175,7 @@ msgstr "" "O formulário \"%1\" foi modificado.\n" "Deseja gravar as suas alterações ou ignorá-las?" -#: 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 "Fechar o Formulário" @@ -1137,19 +1137,19 @@ msgstr "Novo Item" msgid "Sub Item" msgstr "Sub Item" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Dispor os Elementos &Horizontalmente" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Dispor os Elementos &Verticalmente" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Dispor os Elementos em &Grelha" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "Que&brar a Disposição" diff --git a/koffice-i18n-pt_BR/acinclude.m4 b/koffice-i18n-pt_BR/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-pt_BR/acinclude.m4 +++ b/koffice-i18n-pt_BR/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 <stdio.h> @@ -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-pt_BR/configure.in b/koffice-i18n-pt_BR/configure.in index 6550e804..49ee345a 100644 --- a/koffice-i18n-pt_BR/configure.in +++ b/koffice-i18n-pt_BR/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-pt_BR, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-pt_BR, "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-pt_BR/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-pt_BR/docs/koffice/chalk/developers-plugins.docbook index 150e45b3..0447021a 100644 --- a/koffice-i18n-pt_BR/docs/koffice/chalk/developers-plugins.docbook +++ b/koffice-i18n-pt_BR/docs/koffice/chalk/developers-plugins.docbook @@ -246,8 +246,8 @@ Icon= Name=Nome Visível ServiceTypes=Chalk/Filter Type=Service -X-KDE-Library=chalkNOMEBIBLIOTECA -X-KDE-Version=2 +X-TDE-Library=chalkNOMEBIBLIOTECA +X-TDE-Version=2 </programlisting> </para ><para @@ -412,7 +412,7 @@ FerramentaEstrela::~FerramentaEstrela() <para >O &chalk; 1.5 carrega os plugins com o <literal ->X-KDE-Version=2</literal +>X-TDE-Version=2</literal > definido no arquivo <literal role="extension" >.desktop</literal >. Os plugins do &chalk; 1.6 serão provavelmente incompatíveis a nível binário com os do 1.5 e irão necessitar da versão 3. Os plugins do &chalk; 2.0 irão necessitar do número de versão 3. Sim, isto não totalmente lógico. </para> @@ -1407,10 +1407,10 @@ METASOURCES = AUTO >Importar: </para> <programlisting ->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 </programlisting> @@ -1418,12 +1418,12 @@ ServiceTypes=KOfficeFilter >Exportar: </para> <programlisting ->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 </programlisting> <para diff --git a/koffice-i18n-pt_BR/docs/koffice/chalk/installation.docbook b/koffice-i18n-pt_BR/docs/koffice/chalk/installation.docbook index 8f13181d..220e3570 100644 --- a/koffice-i18n-pt_BR/docs/koffice/chalk/installation.docbook +++ b/koffice-i18n-pt_BR/docs/koffice/chalk/installation.docbook @@ -13,8 +13,8 @@ <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/koffice-i18n-pt_BR/docs/koffice/chalk/tutorial-select-layer.docbook b/koffice-i18n-pt_BR/docs/koffice/chalk/tutorial-select-layer.docbook index 04a0518f..192c11c5 100644 --- a/koffice-i18n-pt_BR/docs/koffice/chalk/tutorial-select-layer.docbook +++ b/koffice-i18n-pt_BR/docs/koffice/chalk/tutorial-select-layer.docbook @@ -24,7 +24,7 @@ <para >A imagem acima é a que nós usaremos. Inicie o Chalk com esta imagem (encontrada na pasta de documentacão como <filename >$<envar ->KDEDIR</envar +>TDEDIR</envar >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename >) e salve-a em sua pasta pessoal (selecionando <guilabel >Salvar Imagem Como...</guilabel diff --git a/koffice-i18n-pt_BR/docs/koffice/kchart/index.docbook b/koffice-i18n-pt_BR/docs/koffice/kchart/index.docbook index ee913a7c..6a0380a6 100644 --- a/koffice-i18n-pt_BR/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-pt_BR/docs/koffice/kchart/index.docbook @@ -70,7 +70,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-pt_BR/docs/koffice/kpresenter/a11y.docbook b/koffice-i18n-pt_BR/docs/koffice/kpresenter/a11y.docbook index af633394..344e8f33 100644 --- a/koffice-i18n-pt_BR/docs/koffice/kpresenter/a11y.docbook +++ b/koffice-i18n-pt_BR/docs/koffice/kpresenter/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Instalando o Módulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >A maioria das funcionalidades descritas neste capítulo ficam ativas instalando-se o módulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > faz parte do projeto do &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. O pacote do <command ->kdeaccessibility</command +>tdeaccessibility</command > pode ser obtido no &kde-ftp;, o servidor FTP principal do projeto &kde;. </para> <para @@ -126,7 +126,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui uma aplicação de ampliação de tela chamada <ulink url="help:kmag" >&kmagnifier;</ulink >. Se ela estiver instalada, você poderá executá-la em <menuchoice @@ -153,7 +153,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui um componente de Texto-para-Fala chamado KTTS. Se o KTTS estiver instalado, você poderá configurar o &kpresenter; para falar o texto que se encontra sob o cursor do mouse ou falar o texto de cada elemento da tela quando ele ficar em primeiro plano. Antes de usar esta funcionalidade, configure primeiro o KTTS. Veja o <ulink url="help:kttsd" >Manual do KTTS</ulink > para mais detalhes. Para ativar a funcionalidade de TTS do &kpresenter;, selecione a opção <menuchoice diff --git a/koffice-i18n-pt_BR/docs/koffice/kspread/a11y.docbook b/koffice-i18n-pt_BR/docs/koffice/kspread/a11y.docbook index 8c391c13..5b700b6f 100644 --- a/koffice-i18n-pt_BR/docs/koffice/kspread/a11y.docbook +++ b/koffice-i18n-pt_BR/docs/koffice/kspread/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Instalando o Módulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >A maioria das funcionalidades descritas neste capítulo ficam ativas instalando-se o módulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > faz parte do projeto do &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. O pacote do <command ->kdeaccessibility</command +>tdeaccessibility</command > pode ser obtido no &kde-ftp;, o servidor de FTP principal do projeto &kde;. </para> <para @@ -124,7 +124,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui uma aplicação de ampliação de tela chamada <ulink url="help:kmag" >&kmagnifier;</ulink >. Se ela estiver instalada, você poderá executá-la em <menuchoice @@ -151,7 +151,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui um componente de Texto-para-Fala chamado KTTS. Se o KTTS estiver instalado, você poderá configurar o &kspread; para falar o texto que se encontra sob o cursor do mouse ou falar o texto de cada elemento da tela, quando este ficar em primeiro plano. Antes de usar esta funcionalidade, configure primeiro o KTTS. Veja o <ulink url="help:kttsd" >Manual do KTTS</ulink > para mais detalhes. Para ativar a funcionalidade de TPF do &kspread;, selecione a opção <menuchoice diff --git a/koffice-i18n-pt_BR/docs/koffice/kugar/index.docbook b/koffice-i18n-pt_BR/docs/koffice/kugar/index.docbook index 389caa35..b2e3cdb5 100644 --- a/koffice-i18n-pt_BR/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-pt_BR/docs/koffice/kugar/index.docbook @@ -98,7 +98,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-pt_BR/docs/koffice/kword/a11y.docbook b/koffice-i18n-pt_BR/docs/koffice/kword/a11y.docbook index 2c79913a..654b0fd6 100644 --- a/koffice-i18n-pt_BR/docs/koffice/kword/a11y.docbook +++ b/koffice-i18n-pt_BR/docs/koffice/kword/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Instalando o Módulo <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >A maioria das funcionalidades descritas neste capítulo ficam ativas instalando-se o módulo <command ->kdeaccessibility</command +>tdeaccessibility</command >. O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > faz parte do projeto do &kde; <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. O pacote do <command ->kdeaccessibility</command +>tdeaccessibility</command > pode ser obtido no &kde-ftp;, o servidor FTP principal do projeto &kde;. </para> <para @@ -124,7 +124,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui uma aplicação de ampliação de tela chamada <ulink url="help:kmag" >&kmagnifier;</ulink >. Se ela estiver instalada, você poderá executá-la em <menuchoice @@ -151,7 +151,7 @@ ></indexterm> <para >O módulo <command ->kdeaccessibility</command +>tdeaccessibility</command > inclui um componente de Texto-para-Fala chamado KTTS. Se o KTTS estiver instalado, você poderá configurar o &kword; para falar o texto que se encontra sob o cursor do mouse ou falar o texto de cada elemento da tela quando ele ficar em primeiro plano. Antes de usar esta funcionalidade, configure primeiro o KTTS. Veja o <ulink url="help:kttsd" >Manual do KTTS</ulink > para mais detalhes. Para ativar a funcionalidade de TTS do &kword;, selecione a opção <menuchoice diff --git a/koffice-i18n-pt_BR/docs/koffice/kword/index.docbook b/koffice-i18n-pt_BR/docs/koffice/kword/index.docbook index 54ccd094..5bcce8a5 100644 --- a/koffice-i18n-pt_BR/docs/koffice/kword/index.docbook +++ b/koffice-i18n-pt_BR/docs/koffice/kword/index.docbook @@ -1532,7 +1532,7 @@ <listitem> <para ->As bibliotecas do &kde; 3.3.0 (kdelibs) e o pacote base do &kde; 3.3.0 (kdebase). Eles poderão ser obtidos na <ulink url="http://www.kde.org" +>As bibliotecas do &kde; 3.3.0 (tdelibs) e o pacote base do &kde; 3.3.0 (tdebase). Eles poderão ser obtidos na <ulink url="http://www.kde.org" >página Web do &kde;.</ulink ></para> <tip diff --git a/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po b/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po index 7b5e3521..9dc70143 100644 --- a/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-pt_BR/messages/koffice/desktop_koffice.po @@ -577,7 +577,7 @@ msgstr "Name=Widgets Recipientes" msgid "Name=Basic Widgets" msgstr "Name=Widgets Básicos" -#: 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=Plugin do Desenhista de Formulário do KDevelop" @@ -1907,11 +1907,11 @@ msgstr "Name=Componente de Processamento de Texto do KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Documento de Texto" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Livro de Endereços do 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-pt_BR/messages/koffice/kformdesigner.po b/koffice-i18n-pt_BR/messages/koffice/kformdesigner.po index e4bf2341..bc46cc31 100644 --- a/koffice-i18n-pt_BR/messages/koffice/kformdesigner.po +++ b/koffice-i18n-pt_BR/messages/koffice/kformdesigner.po @@ -26,36 +26,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Documento para abrir" -#: 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 "Parte do Desenhador de Formulário" -#: 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 "Objetos" -#: 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 "Limpar Conteúdo do Elemento" -#: 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 "Excluir 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 "Pré-visualização do Formulário" -#: 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 "Editar Ordem de Tabulação" -#: 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 "Editar Coleção de Mapa de Pixel" -#: 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 "Editar Conexões do Formulário" @@ -96,75 +96,75 @@ msgstr "Verti&calmente num Separador" msgid "&Ungroup Widgets" msgstr "Desagr&upar Elementos" -#: 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 "Trazer Widget para Frente" -#: 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 "Enviar Widget para Trás" -#: 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 "Alinhar Posição dos Widgets" -#: 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 "Para Esquerda" -#: 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 "Para Direita" -#: 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 "Acima" -#: 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 "Abaixo" -#: 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 "Para Grade" -#: 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 "Ajustar Tamanho dos Widgets" -#: 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 "Para Caber" -#: 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 "Para o Mais Curto" -#: 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 "Para o Mais Alto" -#: 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 "Para o Mais Baixo" -#: 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 "Para o Mais Amplo" #: 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ário" -#: 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|Arquivos de UI do 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?" @@ -172,7 +172,7 @@ msgstr "" "O formulário \"%1\" foi modificado.\n" "Você deseja salvar suas mudanças ou descartá-las?" -#: 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 "Fechar Formulário" @@ -1134,19 +1134,19 @@ msgstr "Novo Ítem" msgid "Sub Item" msgstr "Sub Ítem" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Dispor Widgets &Horizontalmente" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Dispor Widgets &Verticalmente" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Dispor Widgets na &Grade" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "Que&brar Disposição" diff --git a/koffice-i18n-ru/acinclude.m4 b/koffice-i18n-ru/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-ru/acinclude.m4 +++ b/koffice-i18n-ru/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 <stdio.h> @@ -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-ru/configure.in b/koffice-i18n-ru/configure.in index c07bf2f1..84cf01ea 100644 --- a/koffice-i18n-ru/configure.in +++ b/koffice-i18n-ru/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-ru, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-ru, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -35,13 +35,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-ru/docs/koffice/kchart/index.docbook b/koffice-i18n-ru/docs/koffice/kchart/index.docbook index 7942298d..14e2f0e7 100644 --- a/koffice-i18n-ru/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-ru/docs/koffice/kchart/index.docbook @@ -84,7 +84,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-ru/docs/koffice/kformula/index.docbook b/koffice-i18n-ru/docs/koffice/kformula/index.docbook index cbb69ddc..b63a56ea 100644 --- a/koffice-i18n-ru/docs/koffice/kformula/index.docbook +++ b/koffice-i18n-ru/docs/koffice/kformula/index.docbook @@ -1837,7 +1837,7 @@ >http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/</ulink> </para> <para ->Вам нужны cmbx10, cmex10, cmmi10, cmr10, cmsy10, msam10 и msbm10. Установите их, убедитесь, что они попали в FontPath в конфигурации X11, потом перезагрузите X-сервер, если вы используете kdm, перезагрузите и его. Нажмите <keycombo action="simul" +>Вам нужны cmbx10, cmex10, cmmi10, cmr10, cmsy10, msam10 и msbm10. Установите их, убедитесь, что они попали в FontPath в конфигурации X11, потом перезагрузите X-сервер, если вы используете tdm, перезагрузите и его. Нажмите <keycombo action="simul" >&Ctrl; &Alt; <keycap >Backspace</keycap > </keycombo diff --git a/koffice-i18n-ru/docs/koffice/kugar/index.docbook b/koffice-i18n-ru/docs/koffice/kugar/index.docbook index 5c180c38..887f24e1 100644 --- a/koffice-i18n-ru/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-ru/docs/koffice/kugar/index.docbook @@ -98,7 +98,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-ru/docs/koffice/kword/index.docbook b/koffice-i18n-ru/docs/koffice/kword/index.docbook index 85ccd536..b06ab5b3 100644 --- a/koffice-i18n-ru/docs/koffice/kword/index.docbook +++ b/koffice-i18n-ru/docs/koffice/kword/index.docbook @@ -1481,7 +1481,7 @@ TODO: <listitem> <para ->Библиотеки &kde; 3.3.0 (kdelibs) и базовый пакет &kde; 3.3.0 (kdebase). Их можно найти на <ulink url="http://www.kde.org" +>Библиотеки &kde; 3.3.0 (tdelibs) и базовый пакет &kde; 3.3.0 (tdebase). Их можно найти на <ulink url="http://www.kde.org" >сайте &kde;</ulink >.</para> <tip diff --git a/koffice-i18n-ru/messages/koffice/desktop_koffice.po b/koffice-i18n-ru/messages/koffice/desktop_koffice.po index 44f6044c..21922267 100644 --- a/koffice-i18n-ru/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-ru/messages/koffice/desktop_koffice.po @@ -578,7 +578,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" @@ -1895,11 +1895,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-ru/messages/koffice/kformdesigner.po b/koffice-i18n-ru/messages/koffice/kformdesigner.po index 32de0373..1f65dafa 100644 --- a/koffice-i18n-ru/messages/koffice/kformdesigner.po +++ b/koffice-i18n-ru/messages/koffice/kformdesigner.po @@ -27,36 +27,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 "Изменить связи формы" @@ -97,75 +97,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?" @@ -173,7 +173,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 "Закрыть форму" @@ -1131,19 +1131,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-sk/acinclude.m4 b/koffice-i18n-sk/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-sk/acinclude.m4 +++ b/koffice-i18n-sk/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 <stdio.h> @@ -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-sk/configure.in b/koffice-i18n-sk/configure.in index 63426eb1..81dd0f14 100644 --- a/koffice-i18n-sk/configure.in +++ b/koffice-i18n-sk/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-sk, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-sk, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -28,13 +28,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-sk/messages/koffice/desktop_koffice.po b/koffice-i18n-sk/messages/koffice/desktop_koffice.po index 70431d66..9b31f284 100644 --- a/koffice-i18n-sk/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-sk/messages/koffice/desktop_koffice.po @@ -577,7 +577,7 @@ msgstr "Name=Kontajnerové komponenty" msgid "Name=Basic Widgets" msgstr "Name=Základné komponenty" -#: 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 modul na vytváranie formulárov (Form Designer)" @@ -1906,11 +1906,11 @@ msgstr "Name=Komponent KOffice textový procesor" msgid "GenericName=Text Documents" msgstr "GenericName=Textové dokumenty" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Modul pre KDE adresár" -#: 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 typ zdroja dát umožňuje používať záznamy z KDE adresára." diff --git a/koffice-i18n-sk/messages/koffice/kformdesigner.po b/koffice-i18n-sk/messages/koffice/kformdesigner.po index f60cd5cb..8b233522 100644 --- a/koffice-i18n-sk/messages/koffice/kformdesigner.po +++ b/koffice-i18n-sk/messages/koffice/kformdesigner.po @@ -25,36 +25,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Otvoriť dokument" -#: 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 "Modul Form Designer" -#: 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 "Vymazať obsah komponentu" -#: 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 "Odstrániť 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 "Náhľad formulára" -#: 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 "Editovať poradie záložiek" -#: 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 "Editovať kolekciu pixmáp" -#: 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 "Editovať prepojenia formulárov" @@ -95,75 +95,75 @@ msgstr "Zvisle v o&ddeľovači" msgid "&Ungroup Widgets" msgstr "Z&rušiť zoskupenie komponentov" -#: 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 "Presunúť komponent dopredu" -#: 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 "Presunúť komponent dozadu" -#: 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 "Zarovnať pozície komponentov" -#: 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 "Doľava" -#: 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 "Nahor" -#: 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 "Nadol" -#: 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 "Do mriežky" -#: 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 "Zrovnať veľkosti komponentov" -#: 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 "Prispôsobiť" -#: 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 najmenšiemu" -#: 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 najvyššiemu" -#: 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 najužšiemu" -#: 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 najširšiemu" #: 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 UI Súbory" -#: 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?" @@ -171,7 +171,7 @@ msgstr "" "Formulár \"%1\" bol zmenený.\n" "Chcete uložiť alebo zahodiť zmeny?" -#: 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 "Zavrieť formulár" @@ -1129,19 +1129,19 @@ msgstr "Nová položka" msgid "Sub Item" msgstr "Podriadená položka" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Rozložiť komponenty &vodorovne" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Rozložiť komponenty &zvisle" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Rozložiť komponenty v mriežke" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "Zr&ušiť rozloženie" diff --git a/koffice-i18n-sl/acinclude.m4 b/koffice-i18n-sl/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-sl/acinclude.m4 +++ b/koffice-i18n-sl/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 <stdio.h> @@ -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-sl/configure.in b/koffice-i18n-sl/configure.in index 94eb5170..523e70d1 100644 --- a/koffice-i18n-sl/configure.in +++ b/koffice-i18n-sl/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-sl, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-sl, "3.5.7") AM_CONFIG_HEADER(config.h) AC_SUBST(AUTODIRS) AM_KDE_WITH_NLS @@ -27,13 +27,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-sl/messages/koffice/desktop_koffice.po b/koffice-i18n-sl/messages/koffice/desktop_koffice.po index 319efcd9..cf979ba4 100644 --- a/koffice-i18n-sl/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-sl/messages/koffice/desktop_koffice.po @@ -582,7 +582,7 @@ msgstr "Name=Vsebovalni gradniki" msgid "Name=Basic Widgets" msgstr "Name=Osnovni gradniki" -#: 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=Vstavek za oblikovanje obrazcev za KDevelop" @@ -1907,11 +1907,11 @@ msgstr "Name=Komponenta za obdelovanje besedil za KOffice" msgid "GenericName=Text Documents" msgstr "GenericName=Besedilni dokumenti" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Vstavek Adresar 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-sl/messages/koffice/kformdesigner.po b/koffice-i18n-sl/messages/koffice/kformdesigner.po index 8a15b095..13975248 100644 --- a/koffice-i18n-sl/messages/koffice/kformdesigner.po +++ b/koffice-i18n-sl/messages/koffice/kformdesigner.po @@ -24,37 +24,37 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Dokument za odprtje" -#: kdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 +#: tdevelop_plugin/kfd_kdev_part.cpp:91 test/kfd_part.cpp:120 #, fuzzy msgid "Form Designer Part" msgstr "KFormDesigner" -#: 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 "Predmeti" -#: 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 "Počisti vsebino gradnika" -#: 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 "Izbriši gradnik" -#: 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 "Ogled obrazca" -#: 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 "Uredi vrstni red zavihkov" -#: 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 "Uredi povezave obrazcev" @@ -96,81 +96,81 @@ msgstr "" msgid "&Ungroup Widgets" msgstr "Ra&združi gradnike" -#: 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 "Spravi gradnik v ospredje" -#: 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 "Pošlji gradnik v ozadje" -#: 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 "Poravnaj položaje gradnikov" -#: 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 "Na levo" -#: 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 "Na desno" -#: 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 "Na vrh" -#: 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 "Na dno" -#: 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 mrežo" -#: 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 "Prilagodi velikost gradnikov" -#: 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 "Po meri" -#: 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 "Do najnižjega" -#: 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 "Do najvišjega" -#: 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 "Do najožjega" -#: 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 "Do najširšega" #: 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 "Obrazec" -#: 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|Datoteke uporabniškega vmesnika (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 "Zapri obrazec" @@ -1135,19 +1135,19 @@ msgstr "Nov predmet" msgid "Sub Item" msgstr "" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Razporedi gradnike &vodoravno" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Razporedi gradnike &navpično" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Razporedi gradnike v &mrežo" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Zlomi razporeditev" diff --git a/koffice-i18n-sr/acinclude.m4 b/koffice-i18n-sr/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-sr/acinclude.m4 +++ b/koffice-i18n-sr/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 <stdio.h> @@ -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-sr/configure.in b/koffice-i18n-sr/configure.in index d5d12e6e..396b0acb 100644 --- a/koffice-i18n-sr/configure.in +++ b/koffice-i18n-sr/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-sr, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-sr, "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-sr/messages/koffice/desktop_koffice.po b/koffice-i18n-sr/messages/koffice/desktop_koffice.po index efbd98aa..3f084474 100644 --- a/koffice-i18n-sr/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-sr/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" @@ -1900,11 +1900,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-sr/messages/koffice/kformdesigner.po b/koffice-i18n-sr/messages/koffice/kformdesigner.po index 5565fe06..b8107a8e 100644 --- a/koffice-i18n-sr/messages/koffice/kformdesigner.po +++ b/koffice-i18n-sr/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|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 "Затвори образац" @@ -1129,19 +1129,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-sr@Latn/acinclude.m4 b/koffice-i18n-sr@Latn/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-sr@Latn/acinclude.m4 +++ b/koffice-i18n-sr@Latn/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 <stdio.h> @@ -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-sr@Latn/configure.in b/koffice-i18n-sr@Latn/configure.in index 0b47dff7..1c0789b3 100644 --- a/koffice-i18n-sr@Latn/configure.in +++ b/koffice-i18n-sr@Latn/configure.in @@ -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-sr@Latn/messages/koffice/desktop_koffice.po b/koffice-i18n-sr@Latn/messages/koffice/desktop_koffice.po index 27a4540a..fb5e10a7 100644 --- a/koffice-i18n-sr@Latn/messages/koffice/desktop_koffice.po +++ b/koffice-i18n-sr@Latn/messages/koffice/desktop_koffice.po @@ -575,7 +575,7 @@ msgstr "Name=Kontejnerske kontrole" msgid "Name=Basic Widgets" msgstr "Name=Osnovne kontrole" -#: 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=Priključak dizajnera formi za KDevelop" @@ -1901,11 +1901,11 @@ msgstr "Name=KOffice-ova komponenta za obradu teksta" msgid "GenericName=Text Documents" msgstr "GenericName=Tekstualni dokumenti" -#: kword/mailmerge/tdeabc/kwmailmerge_kabc.desktop:6 +#: kword/mailmerge/tdeabc/kwmailmerge_tdeabc.desktop:6 msgid "Name=KDE Addressbook Plugin" msgstr "Name=Priključak za KDE-ov adresar" -#: 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-sr@Latn/messages/koffice/kformdesigner.po b/koffice-i18n-sr@Latn/messages/koffice/kformdesigner.po index 203748c7..b2098a0f 100644 --- a/koffice-i18n-sr@Latn/messages/koffice/kformdesigner.po +++ b/koffice-i18n-sr@Latn/messages/koffice/kformdesigner.po @@ -24,36 +24,36 @@ msgstr "KFormDesigner" msgid "Document to open" msgstr "Dokument za otvaranje" -#: 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 "Deo za dizajniranje obrazaca" -#: 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 "Objekti" -#: 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 "Očisti sadržaj kontrole" -#: 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 "Obriši kontrolu" -#: 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 "Pregled obrasca" -#: 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 "Uredi redosled jezičaka" -#: 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 "Uredi kolekciju piksmapa" -#: 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 "Uredi veze obrasca" @@ -94,75 +94,75 @@ msgstr "Uspravno u r&azdvajaču" msgid "&Ungroup Widgets" msgstr "&Rasturi grupisanje kontrola" -#: 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 "Dovedi kontrolu ispred svega" -#: 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 "Pošalji kontrolu iza svega" -#: 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 "Poravnaj položaje kontrola" -#: 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 "Levo" -#: 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 "Desno" -#: 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 "Na vrhu" -#: 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 "Na dnu" -#: 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 "U mreži" -#: 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 "Podesi veličinu kontrola" -#: 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 "Da se uklapaju" -#: 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 "Prema najnižoj" -#: 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 "Prema najvišoj" -#: 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 "Prema najužoj" -#: 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 "Prema najširoj" #: 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 "Obrazac" -#: 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 fajlovi Qt Designer-a" -#: 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 "" "Obrazac „%1“ je izmenjen.\n" "Želite li da snimite ili odbacite izmene?" -#: 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 "Zatvori obrazac" @@ -1129,19 +1129,19 @@ msgstr "Nova stavka" msgid "Sub Item" msgstr "Podstavka" -#: kdevelop_plugin/kfd_kdev_part.cpp:218 +#: tdevelop_plugin/kfd_kdev_part.cpp:218 msgid "Lay Out Widgets &Horizontally" msgstr "Rasporedi kontrole &vodoravno" -#: kdevelop_plugin/kfd_kdev_part.cpp:219 +#: tdevelop_plugin/kfd_kdev_part.cpp:219 msgid "Lay Out Widgets &Vertically" msgstr "Rasporedi kontrole &uspravno" -#: kdevelop_plugin/kfd_kdev_part.cpp:220 +#: tdevelop_plugin/kfd_kdev_part.cpp:220 msgid "Lay Out Widgets in &Grid" msgstr "Rasporedi kontrole u &mreži" -#: kdevelop_plugin/kfd_kdev_part.cpp:221 +#: tdevelop_plugin/kfd_kdev_part.cpp:221 msgid "&Break Layout" msgstr "&Rasturi raspored" diff --git a/koffice-i18n-sv/acinclude.m4 b/koffice-i18n-sv/acinclude.m4 index 14866eb3..547b39f6 100644 --- a/koffice-i18n-sv/acinclude.m4 +++ b/koffice-i18n-sv/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 <stdio.h> @@ -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-sv/configure.in b/koffice-i18n-sv/configure.in index f4e64d0c..4cb6c89b 100644 --- a/koffice-i18n-sv/configure.in +++ b/koffice-i18n-sv/configure.in @@ -3,7 +3,7 @@ dnl FILE: configure.in.in dnl ======================================================= AC_INIT(messages/Makefile.am) -AM_INIT_AUTOMAKE(kde-i18n-sv, "3.5.7") +AM_INIT_AUTOMAKE(koffice-i18n-sv, "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-sv/docs/koffice/chalk/developers-plugins.docbook b/koffice-i18n-sv/docs/koffice/chalk/developers-plugins.docbook index 5344bbf7..2100ccac 100644 --- a/koffice-i18n-sv/docs/koffice/chalk/developers-plugins.docbook +++ b/koffice-i18n-sv/docs/koffice/chalk/developers-plugins.docbook @@ -246,8 +246,8 @@ Icon= Name=User-visible Name ServiceTypes=Chalk/Filter Type=Service -X-KDE-Library=chalkBIBLIOTEKSNAMN -X-KDE-Version=2 +X-TDE-Library=chalkBIBLIOTEKSNAMN +X-TDE-Version=2 </programlisting> </para ><para @@ -412,7 +412,7 @@ ToolStar::~ToolStar() <para >&chalk; 1.5 laddar insticksprogram med <literal ->X-KDE-Version=2</literal +>X-TDE-Version=2</literal > angivet i <literal role="extension" >.desktop</literal >-filen. &chalk; 1.6 kommer troligen inte vara binärt kompatibla med 1.5 insticksprogram och kommer att behöva versionsnumret 3. &chalk; 2.0 insticksprogram kommer att behöva versionsnumret 3. Ja, det är inte helt logiskt. </para> @@ -1407,10 +1407,10 @@ METASOURCES = AUTO >Import: </para> <programlisting ->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 </programlisting> @@ -1418,12 +1418,12 @@ ServiceTypes=KOfficeFilter >Export: </para> <programlisting ->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 </programlisting> <para diff --git a/koffice-i18n-sv/docs/koffice/chalk/installation.docbook b/koffice-i18n-sv/docs/koffice/chalk/installation.docbook index 55661b69..77628ab0 100644 --- a/koffice-i18n-sv/docs/koffice/chalk/installation.docbook +++ b/koffice-i18n-sv/docs/koffice/chalk/installation.docbook @@ -13,8 +13,8 @@ <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, -kdelibs, or kdebase. +.Libraries or other software that is not included in tdesupport, +tdelibs, or tdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. .Operating systems the app will run on. If your app is designed only for a diff --git a/koffice-i18n-sv/docs/koffice/chalk/introduction.docbook b/koffice-i18n-sv/docs/koffice/chalk/introduction.docbook index 9a9ca4d0..008e8274 100644 --- a/koffice-i18n-sv/docs/koffice/chalk/introduction.docbook +++ b/koffice-i18n-sv/docs/koffice/chalk/introduction.docbook @@ -31,12 +31,12 @@ <listitem ><para ->Färgmodeller: &chalk; använder lcms för ett pålitligt arbetsmetodik med färg, som använder ICC-profiler för att importera, exportera, välja målarfärger, skriva ut, klippa ut och tdelistra in. Färgrymder med 8-, 16- och 32-bitar är tillgängliga (RGB, CMYK, L*a*b*, ...) och färger kan väljas i ett färghjul, med skjutreglage för RGB eller gråskala, eller med en palett.</para +>Färgmodeller: &chalk; använder lcms för ett pålitligt arbetsmetodik med färg, som använder ICC-profiler för att importera, exportera, välja målarfärger, skriva ut, klippa ut och klistra in. Färgrymder med 8-, 16- och 32-bitar är tillgängliga (RGB, CMYK, L*a*b*, ...) och färger kan väljas i ett färghjul, med skjutreglage för RGB eller gråskala, eller med en palett.</para ></listitem> <listitem ><para ->Redigering och visning: Obegränsat antal steg att ångra eller göra om är tillgängliga. Man kan klippa ut, kopiera och tdelistra in mellan lager och bilder, med konvertering via ICC-profiler, om det behövs. OpenGL stöds för visning. Vyn kan göras om till fullskärm och kan delas. Linjaler är tillgängliga, bilden kan zoomas och alla palettfönster kan döljas på en gång för att maximera arbetsytan. Dessutom är en histogrampalett tillgänglig.</para +>Redigering och visning: Obegränsat antal steg att ångra eller göra om är tillgängliga. Man kan klippa ut, kopiera och klistra in mellan lager och bilder, med konvertering via ICC-profiler, om det behövs. OpenGL stöds för visning. Vyn kan göras om till fullskärm och kan delas. Linjaler är tillgängliga, bilden kan zoomas och alla palettfönster kan döljas på en gång för att maximera arbetsytan. Dessutom är en histogrampalett tillgänglig.</para ></listitem> <listitem diff --git a/koffice-i18n-sv/docs/koffice/chalk/settings.docbook b/koffice-i18n-sv/docs/koffice/chalk/settings.docbook index d9d04a05..d2bea0fe 100644 --- a/koffice-i18n-sv/docs/koffice/chalk/settings.docbook +++ b/koffice-i18n-sv/docs/koffice/chalk/settings.docbook @@ -166,7 +166,7 @@ >Skärm</guilabel > för att tala om för &chalk; vilken färgprofil din bildskärm använder, och hur uppritning ska gå till. Med <guilabel >Utskrift</guilabel -> kan du ställa in färgmodell och profil för din skrivare. Följande alternativ avgör vad &chalk; ska göra när du tdelistrar in en bild som kopierats från ett annat program. Om <guilabel +> kan du ställa in färgmodell och profil för din skrivare. Följande alternativ avgör vad &chalk; ska göra när du klistrar in en bild som kopierats från ett annat program. Om <guilabel >Använd svartpunktskompensering</guilabel > är markerat, så fort en konvertering av färgrymden är nödvändig, passas svartpunkterna hos källans och målets färgrymder ihop. </para> diff --git a/koffice-i18n-sv/docs/koffice/chalk/tutorial-select-layer.docbook b/koffice-i18n-sv/docs/koffice/chalk/tutorial-select-layer.docbook index 2777f006..1b4241da 100644 --- a/koffice-i18n-sv/docs/koffice/chalk/tutorial-select-layer.docbook +++ b/koffice-i18n-sv/docs/koffice/chalk/tutorial-select-layer.docbook @@ -24,7 +24,7 @@ <para >Bilden ovan är den vi kommer att arbeta med. Starta &chalk; med bilden (i dokumentationskatalog <filename >$<envar ->KDEDIR</envar +>TDEDIR</envar >/share/doc/HTML/en/chalk/tutorial-select-layer-sample.png</filename >) och spara den i din hemkatalog (genom att välja <guilabel >Spara bild som...</guilabel diff --git a/koffice-i18n-sv/docs/koffice/kchart/index.docbook b/koffice-i18n-sv/docs/koffice/kchart/index.docbook index f4689838..f5f553eb 100644 --- a/koffice-i18n-sv/docs/koffice/kchart/index.docbook +++ b/koffice-i18n-sv/docs/koffice/kchart/index.docbook @@ -70,7 +70,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >Kchart</keyword> <keyword diff --git a/koffice-i18n-sv/docs/koffice/kexi/database.docbook b/koffice-i18n-sv/docs/koffice/kexi/database.docbook index d9063414..5e2c91d9 100644 --- a/koffice-i18n-sv/docs/koffice/kexi/database.docbook +++ b/koffice-i18n-sv/docs/koffice/kexi/database.docbook @@ -488,7 +488,7 @@ <para >Kalkylblad visar alla rader och kolumner i tabellen, vilket är besvärligt i fallet med mycket stora datamängder. Du kan förstås filtrera och sortera rader i kalkylblad, men du måste vara extra försiktig när du gör det. Användare av kalkylblad löper risk att glömma att datavyn har filtrerats, vilket kan orsaka misstag. När du beräknar summor, kanske du tror att du har 100 rader med data, medan det i själva verket finns ytterligare 20 dolda rader. </para> <para ->Om du vill arbeta med en liten delmängd av data, t.ex. för att skicka den till andra för redigering, kan du kopiera och tdelistra in i ett annat kalkylblad och efter redigering tdelistra in ändrad data tillbaka i huvudkalkylbladet. Sådan "manuell" redigering kan orsaka dataförlust eller felaktiga beräkningar. </para> +>Om du vill arbeta med en liten delmängd av data, t.ex. för att skicka den till andra för redigering, kan du kopiera och klistra in i ett annat kalkylblad och efter redigering klistra in ändrad data tillbaka i huvudkalkylbladet. Sådan "manuell" redigering kan orsaka dataförlust eller felaktiga beräkningar. </para> <para >För att begränsa <emphasis >datavyn</emphasis diff --git a/koffice-i18n-sv/docs/koffice/kformula/index.docbook b/koffice-i18n-sv/docs/koffice/kformula/index.docbook index dd6cc0e6..5b704240 100644 --- a/koffice-i18n-sv/docs/koffice/kformula/index.docbook +++ b/koffice-i18n-sv/docs/koffice/kformula/index.docbook @@ -1373,7 +1373,7 @@ <listitem ><para ><action ->Visar eller döljer verktygsraden för redigering. Här finns klickbara ikoner för klipp ut och tdelistra in, samt ångra och gör om.</action +>Visar eller döljer verktygsraden för redigering. Här finns klickbara ikoner för klipp ut och klistra in, samt ångra och gör om.</action ></para ></listitem> </varlistentry> @@ -1817,7 +1817,7 @@ </mediaobject> </screenshot> <para ->Kopiera och tdelistra in texten som börjar med <literal +>Kopiera och klistra in texten som börjar med <literal >x*sin(30*x)</literal > till formeleditorn som visas nedan:</para> @@ -1864,7 +1864,7 @@ >dydx[1]</literal > första ordningens derivata och <literal >dydx[2]</literal -> är andra ordningens derivata. Efter formeln har kopierats, måste du redigera derivatorna med &kformula;. Här visas hur det görs. Kopiera och tdelistra först in det nedre uttrycket i formeleditorn.</para> +> är andra ordningens derivata. Efter formeln har kopierats, måste du redigera derivatorna med &kformula;. Här visas hur det görs. Kopiera och klistra först in det nedre uttrycket i formeleditorn.</para> <screenshot> <screeninfo diff --git a/koffice-i18n-sv/docs/koffice/kpresenter/a11y.docbook b/koffice-i18n-sv/docs/koffice/kpresenter/a11y.docbook index cbd1a2e2..8caebb71 100644 --- a/koffice-i18n-sv/docs/koffice/kpresenter/a11y.docbook +++ b/koffice-i18n-sv/docs/koffice/kpresenter/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Installera modulen <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >De flesta funktioner som beskrivs i det här kapitlet aktiveras genom att installera modulen <command ->kdeaccessibility</command +>tdeaccessibility</command >. Modulen <command ->kdeaccessibility</command +>tdeaccessibility</command > är en del av &kde;-projektet <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Paketet <command ->kdeaccessibility</command +>tdeaccessibility</command > kan erhållas från &kde-ftp;, &kde;-projektets huvudsakliga FTP-plats. </para> <para @@ -130,7 +130,7 @@ ></indexterm> <para >Modulen <command ->kdeaccessibility</command +>tdeaccessibility</command > innehåller ett skärmförstoringsglas som heter <ulink url="help:kmag" >Kmagnifier</ulink >. Om det är installerat kan du köra det från <menuchoice @@ -159,7 +159,7 @@ ></indexterm> <para >Modulen <command ->kdeaccessibility</command +>tdeaccessibility</command > innehåller en text-till-tal komponent som kallas KTTS. Om KTTS är installerad, kan du ställa in &kpresenter; 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 <ulink url="help:kttsd" >Handbok KTTS</ulink > för detaljinformation. För att sätta på TTT-funktionen i &kpresenter;, välj <menuchoice @@ -335,7 +335,7 @@ >Klistriga tangenter</term> <listitem ><para ->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 <menuchoice +>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 <menuchoice ><guimenu >K-menyn</guimenu > <guimenuitem diff --git a/koffice-i18n-sv/docs/koffice/kpresenter/menus.docbook b/koffice-i18n-sv/docs/koffice/kpresenter/menus.docbook index ab39a05a..a1f08f9c 100644 --- a/koffice-i18n-sv/docs/koffice/kpresenter/menus.docbook +++ b/koffice-i18n-sv/docs/koffice/kpresenter/menus.docbook @@ -1664,7 +1664,7 @@ charting in this doc wouldn't go astray either.</para <para >Om du ritar, kanske du vill skapa någonting med flera objekt. Arrangera de olika delarna där du vill ha dem, markera en och håll sedan nere &Ctrl;-tangenten medan du klickar på de övriga som du vill gruppera ihop. Klicka på <guimenuitem >Gruppera objekt</guimenuitem -> och därefter beter sig delarna som om de bara är ett objekt. Det tdelistrar ihop saker.</para> +> och därefter beter sig delarna som om de bara är ett objekt. Det klistrar ihop saker.</para> </listitem> </varlistentry> @@ -2153,7 +2153,7 @@ charting in this doc wouldn't go astray either.</para >Utöka innehåll till objekthöjd</guimenuitem > och <guimenuitem >Utöka objekt till att passa innehållet</guimenuitem -> hjälper till att ändra storlek på text i textrutan eller få textrutan att passa texten som du har skrivit eller tdelistrat in i den.</para> +> hjälper till att ändra storlek på text i textrutan eller få textrutan att passa texten som du har skrivit eller klistrat in i den.</para> </listitem> </varlistentry> diff --git a/koffice-i18n-sv/docs/koffice/kpresenter/options.docbook b/koffice-i18n-sv/docs/koffice/kpresenter/options.docbook index b514ead9..913d99c2 100644 --- a/koffice-i18n-sv/docs/koffice/kpresenter/options.docbook +++ b/koffice-i18n-sv/docs/koffice/kpresenter/options.docbook @@ -1584,9 +1584,9 @@ two names? --> <listitem ><para ->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.</para> +>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.</para> <para ->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. </para +>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. </para ></listitem> </varlistentry> </variablelist> 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 @@ <sect1 id="a11y-install"> <title >Installera modulen <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >De flesta funktioner som beskrivs i det här kapitlet aktiveras genom att installera modulen <command ->kdeaccessibility</command +>tdeaccessibility</command >. Modulen <command ->kdeaccessibility</command +>tdeaccessibility</command > är en del av &kde;-projektet <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Paketet <command ->kdeaccessibility</command +>tdeaccessibility</command > kan erhållas från &kde-ftp;, &kde;-projektets huvudsakliga FTP-plats. </para> <para @@ -124,7 +124,7 @@ ></indexterm> <para >Modulen <command ->kdeaccessibility</command +>tdeaccessibility</command > innehåller ett skärmförstoringsglas som heter <ulink url="help:kmag" >&kmagnifier;</ulink >. Om det är installerat kan du köra det från <menuchoice @@ -151,7 +151,7 @@ ></indexterm> <para >Modulen <command ->kdeaccessibility</command +>tdeaccessibility</command > 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 <ulink url="help:kttsd" >Handbok KTTS</ulink > för detaljinformation. För att sätta på TTT-funktionen i &kspread;, välj <menuchoice @@ -325,7 +325,7 @@ >Klistriga tangenter</term> <listitem ><para ->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 <menuchoice +>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 <menuchoice ><guimenu >K-menyn</guimenu > <guimenuitem diff --git a/koffice-i18n-sv/docs/koffice/kspread/advanced.docbook b/koffice-i18n-sv/docs/koffice/kspread/advanced.docbook index 220b1145..f6cf2021 100644 --- a/koffice-i18n-sv/docs/koffice/kspread/advanced.docbook +++ b/koffice-i18n-sv/docs/koffice/kspread/advanced.docbook @@ -116,7 +116,7 @@ <para >Markera funktionen du vill använda i listrutan till vänster i dialogrutan. Fliksidan <guilabel >Hjälp</guilabel -> 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.</para> +> 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.</para> <para >Fliken <guilabel >Parametrar</guilabel @@ -340,7 +340,7 @@ <sect1 id="sumspecialpaste"> <title ->Aritmetik med tdelistra in special</title> +>Aritmetik med klistra in special</title> <para >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 <guimenuitem >Klistra in special...</guimenuitem @@ -1135,7 +1135,7 @@ ></menuchoice > låter dig välja mellan att dela horisontellt och vertikalt.</para> <para ->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 <mousebutton +>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 <mousebutton >vänster</mousebutton > musknapp.</para> <para diff --git a/koffice-i18n-sv/docs/koffice/kugar/index.docbook b/koffice-i18n-sv/docs/koffice/kugar/index.docbook index 2b8b37fb..ffb0b989 100644 --- a/koffice-i18n-sv/docs/koffice/kugar/index.docbook +++ b/koffice-i18n-sv/docs/koffice/kugar/index.docbook @@ -98,7 +98,7 @@ <keyword >KDE</keyword> <keyword ->kdeutils</keyword> +>tdeutils</keyword> <keyword >kugar</keyword> <keyword diff --git a/koffice-i18n-sv/docs/koffice/kword/a11y.docbook b/koffice-i18n-sv/docs/koffice/kword/a11y.docbook index 03190767..c1dbf361 100644 --- a/koffice-i18n-sv/docs/koffice/kword/a11y.docbook +++ b/koffice-i18n-sv/docs/koffice/kword/a11y.docbook @@ -35,21 +35,21 @@ <sect1 id="a11y-install"> <title >Installera modulen <command ->kdeaccessibility</command +>tdeaccessibility</command ></title> <indexterm ><primary ->kdeaccessibility</primary +>tdeaccessibility</primary ></indexterm> <para >De flesta funktioner som beskrivs i det här kapitlet aktiveras genom att installera modulen <command ->kdeaccessibility</command +>tdeaccessibility</command >. Modulen <command ->kdeaccessibility</command +>tdeaccessibility</command > är en del av &kde;-projektet <ulink url="http://www.kde.org" >http://www.kde.org</ulink >. Paketet <command ->kdeaccessibility</command +>tdeaccessibility</command > kan erhållas från &kde-ftp;, &kde;-projektets huvudsakliga FTP-plats. </para> <para @@ -124,7 +124,7 @@ ></indexterm> <para >Modulen <command ->kdeaccessibility</command +>tdeaccessibility</command > innehåller ett skärmförstoringsglas som heter <ulink url="help:kmag" >&kmagnifier;</ulink >. Om det är installerat kan du köra det från <menuchoice @@ -151,7 +151,7 @@ ></indexterm> <para >Modulen <command ->kdeaccessibility</command +>tdeaccessibility</command > 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 <ulink url="help:kttsd" >Handbok KTTS</ulink > för detaljinformation. För att sätta på TTT-funktionen i &kword;, välj <menuchoice @@ -327,7 +327,7 @@ ></term> <listitem ><para ->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 <menuchoice +>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 <menuchoice ><guimenu >K-menyn</guimenu > <guimenuitem diff --git a/koffice-i18n-sv/docs/koffice/kword/basics.docbook b/koffice-i18n-sv/docs/koffice/kword/basics.docbook index 0c39a2dc..d541b8ff 100644 --- a/koffice-i18n-sv/docs/koffice/kword/basics.docbook +++ b/koffice-i18n-sv/docs/koffice/kword/basics.docbook @@ -199,7 +199,7 @@ ><para ><emphasis >Dokumentvyn</emphasis -> - 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. </para> +> - 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. </para> </listitem> </itemizedlist ></listitem> 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</guilabel >.</para> <para ->Länkadressen har nu lagts på klippbordet. Du kan tdelistra in klippbordets innehåll i vilket annat program som helst.</para> +>Länkadressen har nu lagts på klippbordet. Du kan klistra in klippbordets innehåll i vilket annat program som helst.</para> </sect2> <sect2 id="links-edit" ><title diff --git a/koffice-i18n-sv/docs/koffice/kword/editing.docbook b/koffice-i18n-sv/docs/koffice/kword/editing.docbook index 515959b2..1fa2dfbb 100644 --- a/koffice-i18n-sv/docs/koffice/kword/editing.docbook +++ b/koffice-i18n-sv/docs/koffice/kword/editing.docbook @@ -647,7 +647,7 @@ action="simul" <sect1 id="clipboard"> <title ->Klippa ut/kopiera/tdelistra in och klippbordet</title> +>Klippa ut/kopiera/klistra in och klippbordet</title> <indexterm ><primary >klippbordet</primary diff --git a/koffice-i18n-sv/docs/koffice/kword/index.docbook b/koffice-i18n-sv/docs/koffice/kword/index.docbook index a046c692..bb5a27ff 100644 --- a/koffice-i18n-sv/docs/koffice/kword/index.docbook +++ b/koffice-i18n-sv/docs/koffice/kword/index.docbook @@ -1514,7 +1514,7 @@ <listitem> <para ->&kde; 3.3.0 bibliotek (kdelibs) och &kde; 3.3.0 baspaketet (kdebase). Dessa kan skaffas från <ulink url="http://www.kde.org" +>&kde; 3.3.0 bibliotek (tdelibs) och &kde; 3.3.0 baspaketet (tdebase). Dessa kan skaffas från <ulink url="http://www.kde.org" >&kde;:s webbsida.</ulink ></para> <tip @@ -2972,7 +2972,7 @@ action="simul" >, så placerar du det markerade objektet i det här lagringsutrymmet. När du sedan använder kommandot <guimenuitem >Klistra in</guimenuitem >, infogar du informationen från klippbordet i dokumentet. För mer information, se avsnittet om <link linkend="clipboard" ->Klipp ut, kopiera, tdelistra in</link +>Klipp ut, kopiera, klistra in</link >.</para> </glossdef> </glossentry> 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"/></imageobject <para >Genom att klicka på menyn <guimenu >Redigera</guimenu -> kan du klippa ut, kopiera eller tdelistra in text, ångra eller göra om redigering, och utföra sökning och textersättning.</para> +> kan du klippa ut, kopiera eller klistra in text, ångra eller göra om redigering, och utföra sökning och textersättning.</para> <variablelist> <varlistentry> @@ -846,7 +846,7 @@ format="PNG"/></imageobject <para ><action >Tar bort den markerade texten från dokumentet och placerar en kopia på klippbordet.</action -> För mer fullständiga anvisningar om klippa ut och tdelistra in, och en fullständig beskrivning av klippbordet, <link linkend="clipboard" +> För mer fullständiga anvisningar om klippa ut och klistra in, och en fullständig beskrivning av klippbordet, <link linkend="clipboard" >klicka här</link >.</para> @@ -882,7 +882,7 @@ format="PNG"/></imageobject <para ><action >Placerar en kopia av den markerade texten på klippbordet, utan att ändra texten i dokumentet.</action -> För mer fullständiga anvisningar om klippa ut och tdelistra in, och en fullständig beskrivning av klippbordet, <link linkend="clipboard" +> För mer fullständiga anvisningar om klippa ut och klistra in, och en fullständig beskrivning av klippbordet, <link linkend="clipboard" >klicka här</link >.</para> @@ -918,7 +918,7 @@ format="PNG"/></imageobject <para ><action >Infogar en kopia av klippbordet vid markörens nuvarande plats.</action -> 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, <link linkend="clipboard" +> 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, <link linkend="clipboard" >klicka här</link >.</para> 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 <stdio.h> @@ -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 <stdio.h> @@ -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 <stdio.h> @@ -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 <stdio.h> @@ -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)" |