diff --git a/FAQ b/FAQ index 819a141..5d1ea47 100644 --- a/FAQ +++ b/FAQ @@ -139,7 +139,7 @@ Installation FAQ you only need the C-compliler gcc when you compile Krusader from source (see the next question). Here is a list of the required shared libraries when you run Krusader: - * kdelibs (for the required KDE version see the Installation_procedure) + * tdelibs (for the required KDE version see the Installation_procedure) * libacl1 libart-2.0 libattr1 libaudio2 libc6 libfam0 libfontconfig1 * libfreetype6 libgcc1 libgcc2 libice6 libidn11 libjpeg62 libkjsembed1 * libkonq4 libpcre3 libpng12 libqt3-mt libsm6 libstdc++6 libunwind7 @@ -155,7 +155,7 @@ Installation FAQ been tested) * autoconf automake XFree * libqt3 libqt-devel - * kdelibs kdelibs-devel + * tdelibs tdelibs-devel * libjpeg62 libjpeg-devel libpng3 libmng1 * fam libfam-devel * zlib1 arts libart_lgpl2 libstdc++5 libpcre0 @@ -164,7 +164,7 @@ Installation FAQ right-click menu entries. Most RPM-based distributions separate the headers from the libs. The headers are needed to compile Krusader. Look for packages in the form foo- - devel-*.rpm (e.g. kdelibs-devel-foo.i586.rpm) or foo-dev-*.deb for Debian� + devel-*.rpm (e.g. tdelibs-devel-foo.i586.rpm) or foo-dev-*.deb for Debian� based distributions. These are usually included with your distribution. **** Tip **** If you ca not find the needed package, use rpmfind and click 'missing lib @@ -673,7 +673,7 @@ General FAQ **** Note **** If possible, try to do the same operation with Konqueror or another KDE application. If you encounter the same problem then it is possibly a - KIOSlaves or KDE (kdelibs) bug, and not a Krusader bug. Krusader uses the + KIOSlaves or KDE (tdelibs) bug, and not a Krusader bug. Krusader uses the KDE libraries and the KIOSlaves for many operations. In some cases you can encounter problems if your distribution is incorrectly configured, please test it first as explained above. diff --git a/INSTALL b/INSTALL index 5c4a74f..ab590e7 100644 --- a/INSTALL +++ b/INSTALL @@ -534,7 +534,7 @@ recent version of Krusader: 2. Install the Apple_X11_SDK developer-tools with X11 headers (gcc is included) 3. Install the fink-base - 4. Compile kdelibs 3.4.1 or higher (fink provides the necessary .info files) + 4. Compile tdelibs 3.4.1 or higher (fink provides the necessary .info files) 5. Compile the Krusader-tarball or follow steps 2 and 3 of the previous section if a recent Krusader-package e.g. krusader-1.70.0.fink.darwin- ppc.tar.bz2 is available diff --git a/Krusader.kdevelop b/Krusader.kdevelop index a2ace8d..b546fa1 100644 --- a/Krusader.kdevelop +++ b/Krusader.kdevelop @@ -1,5 +1,5 @@ - + Shie Erlich and Rafi Yanai @@ -210,4 +210,4 @@ - + diff --git a/Makefile.am b/Makefile.am index b73e17d..9cffec7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## # the condition for this is found in configure.in.in if with_tar @@ -13,7 +13,7 @@ SUBDIRS = krusader po pics doc krArc $(ISODIR) virt $(TARDIR) EXTRA_DIST = krusader.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO krusader.lsm krusader.spec -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # not a GNU package. You can remove this line, if # have all needed files, that a GNU package needs AUTOMAKE_OPTIONS = foreign diff --git a/acinclude.m4 b/acinclude.m4 index fcc0ecb..c18ad2a 100644 --- a/acinclude.m4 +++ b/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! @@ -378,7 +378,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then 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 @@ -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. ]) @@ -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}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/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}/trinity /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/trinity/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}" +test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${tdelibsuff} $KDEDIR $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/trinity/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" @@ -3502,9 +3502,9 @@ AC_DEFUN([KDE_CHECK_LIB64], AC_ARG_ENABLE(libsuffix, AC_HELP_STRING([--enable-libsuffix], [/lib directory suffix (64,32,none,auto[=default])]), - kdelibsuff=$enableval, kdelibsuff="auto") + tdelibsuff=$enableval, tdelibsuff="auto") - if test "$kdelibsuff" = "auto"; then + if test "$tdelibsuff" = "auto"; then cat > conftest.c << EOF #include @@ -3512,26 +3512,26 @@ int main() { return 0; } EOF - kdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ + tdelibsuff=`$CC conftest.c -o conftest.out; ldd conftest.out |sed -ne '/libc.so/{ s,.*/lib\([[^\/]]*\)/.*,\1, p }'` rm -rf conftest.* fi - if test "$kdelibsuff" = "no" || test "$kdelibsuff" = "none"; then - kdelibsuff= + if test "$tdelibsuff" = "no" || test "$tdelibsuff" = "none"; then + tdelibsuff= fi - if test -z "$kdelibsuff"; then + if test -z "$tdelibsuff"; then AC_MSG_RESULT([not using lib directory suffix]) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) else if test "$libdir" = '${exec_prefix}/lib'; then - libdir="$libdir${kdelibsuff}" + libdir="$libdir${tdelibsuff}" AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms fi - AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) - AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) + AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories) + AC_MSG_RESULT([using lib directory suffix $tdelibsuff]) fi ]) @@ -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,7 +4946,7 @@ 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 AC_DEFUN([KDE_SET_PREFIX_CORE], @@ -4993,9 +4993,9 @@ AC_DEFUN([KDE_SET_PREFIX], 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` @@ -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/configure.in b/configure.in index ecfda06..ed07f5e 100644 --- a/configure.in +++ b/configure.in @@ -162,12 +162,12 @@ dnl PACKAGE set before # It can be used to add a name to a release. If commented out only VERSION is used, see main.cpp AH_BOTTOM([#define RELEASE_NAME "Power Stone"]) -dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ -dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__ -dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__ +dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__ +dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__ +dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__ -dnl KDE_NEED_FLEX dnl __kdevelop__ -dnl AC_PROG_YACC dnl __kdevelop__ +dnl KDE_NEED_FLEX dnl __tdevelop__ +dnl AC_PROG_YACC dnl __tdevelop__ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -DKDE_NO_COMPAT -DQT_NO_ASCII_CAST" diff --git a/configure.in.in b/configure.in.in index 89c0864..5462d94 100644 --- a/configure.in.in +++ b/configure.in.in @@ -111,12 +111,12 @@ AM_INIT_AUTOMAKE(krusader,1.90.0) # It can be used to add a name to a release. If commented out only VERSION is used, see main.cpp AH_BOTTOM([#define RELEASE_NAME "Power Stone"]) -dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __kdevelop[noopt]__ -dnl CFLAGS="$NOOPT_CFLAGS" dnl __kdevelop[noopt]__ -dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __kdevelop[exc]__ +dnl CXXFLAGS="$NOOPT_CXXFLAGS" dnl __tdevelop[noopt]__ +dnl CFLAGS="$NOOPT_CFLAGS" dnl __tdevelop[noopt]__ +dnl CXXFLAGS="$CXXFLAGS $USE_EXCEPTIONS" dnl __tdevelop[exc]__ -dnl KDE_NEED_FLEX dnl __kdevelop__ -dnl AC_PROG_YACC dnl __kdevelop__ +dnl KDE_NEED_FLEX dnl __tdevelop__ +dnl AC_PROG_YACC dnl __tdevelop__ CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -DKDE_NO_COMPAT -DQT_NO_ASCII_CAST" diff --git a/doc/Makefile.am b/doc/Makefile.am index 4d78d65..a3ef92b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## SUBDIRS = en ru pics @@ -11,5 +11,5 @@ install-data-local: uninstall-local: -rm -f $(DESTDIR)$(mandir)/man1/krusader.1 -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am index dc8b999..156bc57 100644 --- a/doc/en/Makefile.am +++ b/doc/en/Makefile.am @@ -1,9 +1,9 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = archives.docbook editors-note.docbook java.docbook profiles.docbook user-interface.docbook bookmarks.docbook more.docbook faq.docbook keyboard.docbook release-overview.docbook using-krusader.docbook checksum.docbook features.docbook konfigurator.docbook remote-connections.docbook vfs.docbook commands.docbook glossary.docbook krusader-tools.docbook search.docbook viewer-editor.docbook compare.docbook help.docbook locate.docbook splitter.docbook configuration-files.docbook index.docbook mount.docbook synchronizer.docbook credits.docbook installation.docbook mouse.docbook useractions.docbook diskusage.docbook introduction.docbook occupied-space.docbook useraction-xml.docbook -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ KDE_LANG = en KDE_DOCS = krusader diff --git a/doc/en/bookmarks.docbook b/doc/en/bookmarks.docbook index 9817d77..99e8bb7 100644 --- a/doc/en/bookmarks.docbook +++ b/doc/en/bookmarks.docbook @@ -221,7 +221,7 @@ Manage Bookmarks, &keditbookmarks; will be displayed. This is where you can edit/remove and rearrange the bookmarks. - &keditbookmarks; (part of the kdebase package) is a + &keditbookmarks; (part of the tdebase package) is a bookmark editor for &konqueror;, &krusader; and other applications, which use the &xbel-url; standard for the bookmark format. The diff --git a/doc/en/commands.docbook b/doc/en/commands.docbook index 54b6336..fc8f6a6 100644 --- a/doc/en/commands.docbook +++ b/doc/en/commands.docbook @@ -200,7 +200,7 @@ Compares two current files by content - one from each panel via an external graphical diff utility. By - default &kompare; (part of the kdebase + default &kompare; (part of the tdebase package) is used, but you can also use ⪚ &xxdiff-url; or &kdiff3-url; , change it in the diff --git a/doc/en/faq.docbook b/doc/en/faq.docbook index 7a9ba25..1d05eb7 100644 --- a/doc/en/faq.docbook +++ b/doc/en/faq.docbook @@ -54,7 +54,7 @@ Installation &FAQ; - + Does &krusader; need &kde; to run? @@ -91,9 +91,9 @@ &krusader; uses the &kde; &kioslaves1-url; to access remote file systems, and support for only a limited number of file - system types are shipped with &kdelibs-url;, + system types are shipped with &tdelibs-url;, most of the &kioslaves2-url; are bundled with - &kdebase-url; (including fish, sftp and tar). + &tdebase-url; (including fish, sftp and tar). However, if you want the property-dialog to show EXIF-data for .jpeg's, you need &kde;graphics. If you want ID3-infos, you need @@ -129,7 +129,7 @@ - kdelibs (for the required &kde; + tdelibs (for the required &kde; version see the &install-proc-lnk;) @@ -178,7 +178,7 @@ libqt3 libqt-devel - kdelibs kdelibs-devel + tdelibs tdelibs-devel libjpeg62 libjpeg-devel libpng3 @@ -204,7 +204,7 @@ from the libs. The headers are needed to compile &krusader;. Look for packages in the form foo-devel-*.rpm (⪚ - kdelibs-devel-foo.i586.rpm) or + tdelibs-devel-foo.i586.rpm) or foo-dev-*.deb for &debian; based distributions. These are usually included with your distribution. @@ -1478,7 +1478,7 @@ &konqueror; or another &kde; application. If you encounter the same problem then it is possibly a &kioslaves1-url; or - &kde; (kdelibs) bug, and not a + &kde; (tdelibs) bug, and not a &krusader; bug. &krusader; uses the &kde; libraries and the &kioslaves2-url; for many operations. In diff --git a/doc/en/index.docbook b/doc/en/index.docbook index b7bbb1a..8bff803 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -50,7 +50,7 @@ files http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcfb47/e3ca0489310cc12e#e3ca0489310cc12e --> - + @@ -172,11 +172,11 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf KDE-APPS.org'> rpm.org'> RPM Guide'> -KIOSlaves'> +KIOSlaves'> KIOSlaves'> KIOipod-slave'> -&kde;libs'> -&kde;base'> +&kde;libs'> +&kde;base'> GNOME'> AfterStep'> XFce'> @@ -295,7 +295,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf Krename'> kget'> Filelight'> -Kdevelop'> +Kdevelop'> KeditBookmarks'> Kwallet"> diff --git a/doc/en/installation.docbook b/doc/en/installation.docbook index 5e7a809..5458a0d 100644 --- a/doc/en/installation.docbook +++ b/doc/en/installation.docbook @@ -538,12 +538,12 @@ Please don't use the /usr/local directory as it simply won' for the compilation, please read the &faq-lnk;. - If you install &kdevelop;, (almost) + If you install &tdevelop;, (almost) everything that you need to compile &krusader; will be installed on your computer. However, if you are not a developer, please follow the instructions and do not use - &kdevelop; to compile + &tdevelop; to compile &krusader;. @@ -974,7 +974,7 @@ make[1]: Leaving directory `/home/source/krusader_trinity' Install the fink-base - Compile kdelibs 3.4.1 or higher (fink provides the + Compile tdelibs 3.4.1 or higher (fink provides the necessary .info files) diff --git a/doc/en/konfigurator.docbook b/doc/en/konfigurator.docbook index ea5da52..0cd72f1 100644 --- a/doc/en/konfigurator.docbook +++ b/doc/en/konfigurator.docbook @@ -987,7 +987,7 @@ HTML_PARSING--> Media button. Choose this when the media protocol is buggy (in some older &kde; versions) or if you have no - kdebase package installed on your system. + tdebase package installed on your system. @@ -1328,7 +1328,7 @@ HTML_PARSING--> - By default &kompare; (part of the kdebase + By default &kompare; (part of the tdebase package) is used as external diff utility but you can also use your favorite diff utility ⪚ &xxdiff-url; or &kdiff3-url;, just fill diff --git a/doc/pics/Makefile.am b/doc/pics/Makefile.am index c5bd706..d617fcc 100644 --- a/doc/pics/Makefile.am +++ b/doc/pics/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = bookmanadd.png bookmanedit.png cmdline.png fnkeys.png kgstartup.png krusader1.png listpanel.png mainwindow.png mountman.png actionman.png search_advanced.png search_general.png terminalEmu.png toolbar.png tabbed_browsing.png krusader_title.png syncdir.png @@ -57,4 +57,4 @@ uninstall-local: -rm -f $(DESTDIR)$(kde_htmldir)/en/krusader/tabbed_browsing.png -rm -f $(DESTDIR)$(kde_htmldir)/en/krusader/krusader_title.png -rm -f $(DESTDIR)$(kde_htmldir)/en/krusader/syncdir.png -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ diff --git a/doc/ru/Makefile.am b/doc/ru/Makefile.am index 70fdf35..f833fc5 100644 --- a/doc/ru/Makefile.am +++ b/doc/ru/Makefile.am @@ -1,9 +1,9 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## EXTRA_DIST = index.docbook help.docbook editors-note.docbook introduction.docbook features.docbook user-interface.docbook using-krusader.docbook commands.docbook keyboard.docbook mouse.docbook krusader-tools.docbook konfigurator.docbook faq.docbook credits.docbook installation.docbook configuration-files.docbook useraction-xml.docbook release-overview.docbook glossary.docbook -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ KDE_LANG = ru KDE_DOCS = krusader diff --git a/doc/ru/commands.docbook b/doc/ru/commands.docbook index f28af95..65f813a 100644 --- a/doc/ru/commands.docbook +++ b/doc/ru/commands.docbook @@ -251,7 +251,7 @@ Compares two current files by content - one from each panel via an external graphical diff utility. By default &kompare; (part of the kdebase package) is used, but you can also use ⪚ &xxdiff_url; or &kdiff3_url; , change it in the &konfigdependencie_lnk;. +>Compares two current files by content - one from each panel via an external graphical diff utility. By default &kompare; (part of the tdebase package) is used, but you can also use ⪚ &xxdiff_url; or &kdiff3_url; , change it in the &konfigdependencie_lnk;. diff --git a/doc/ru/faq.docbook b/doc/ru/faq.docbook index 5739d68..d9d79c3 100644 --- a/doc/ru/faq.docbook +++ b/doc/ru/faq.docbook @@ -65,7 +65,7 @@ - + Нуждается ли &krusader; в &kde; ? @@ -81,7 +81,7 @@ >. Не волнуйтесь о судьбе зависимостей , если вы выберете &krusader;.Вы узнаете что &krusader; использует &kde; &kioslaves1_url; для получения доступа к удаленным файловым системам и поддерживает все файловые системы , которые доступны в &kdelibs_url; больше в &kioslaves2_url; или связаны с &kdebase_url;(включая fish, sftp и tar).Только... если диалог свойств показывает данные EXIF для .jpeg's, вы нуждаетесь в пакетах графики &kde; , если вы хотите видеть информацию ID3 - пакеты мультимедиа для &kde; и так далее и тому подобное.... +>Не волнуйтесь о судьбе зависимостей , если вы выберете &krusader;.Вы узнаете что &krusader; использует &kde; &kioslaves1_url; для получения доступа к удаленным файловым системам и поддерживает все файловые системы , которые доступны в &tdelibs_url; больше в &kioslaves2_url; или связаны с &tdebase_url;(включая fish, sftp и tar).Только... если диалог свойств показывает данные EXIF для .jpeg's, вы нуждаетесь в пакетах графики &kde; , если вы хотите видеть информацию ID3 - пакеты мультимедиа для &kde; и так далее и тому подобное.... Суммируя , если вы хотите работать в &krusader; - установите библиотеки &kde;.Если нужна полная функциональнось в &krusader; нужно установить дополнительные библиотеки и базовый пакет &kde;.Для полной функциональности необходимы все библиотеки и все пакеты &kde; , оконный менеджер остается опциональным. @@ -155,7 +155,7 @@ > kdelibs kdelibs-develtdelibs tdelibs-devel Большинство дистрибутивов на основе RPM разделяют headers и сами библиотеки.Просто установите их , введя в поиске пакетов foo-devel-*.rpm(⪚ kdelibs-devel-foo.i586.rpmtdelibs-devel-foo.i586.rpm) или oo-dev-*.deb для основанных на &debian; дистрибутивов.Обычно они включены в стандартной поставке. Если вы не нашли необходимый пакет используйте &rpmfind_url; и попробуйте найти там недостающие пакеты.Или используйте - + @@ -362,7 +362,7 @@ since the Entity Backspace is not defined in RPM Guide'> -KIOSlaves'> KIOipod-slave'> -&kde;libs'> -&kde;base'> Filelight'> -Kdevelop'> Install all needed packages and libraries that you need for the compilation, please read the &faq_lnk;. If you install &kdevelop; then (almost) everything that you need to compile &krusader; will be installed on your computer, BUT please don't use &kdevelop; to compile &krusader; if you are not a developer (possible automake hell), just follow the next instructions.If you install &tdevelop; then (almost) everything that you need to compile &krusader; will be installed on your computer, BUT please don't use &tdevelop; to compile &krusader; if you are not a developer (possible automake hell), just follow the next instructions. @@ -912,7 +912,7 @@ make[1]: Leaving directory `/home/source/krusader_trinity' compile kdelibs 3.4.1 or higher (fink provides the necessary compile tdelibs 3.4.1 or higher (fink provides the necessary .info files) diff --git a/doc/ru/konfigurator.docbook b/doc/ru/konfigurator.docbook index 3ea7191..7523a8b 100644 --- a/doc/ru/konfigurator.docbook +++ b/doc/ru/konfigurator.docbook @@ -1174,7 +1174,7 @@ HTML_PARSING--> >Don't use KDE's media protocol for the Media button (if it's buggy or missing): If checked, &krusader; won't use &kde;'s media protocol for the Media button. Use this open when the media protocol is buggy (in some older &kde; versions) or if you have no kdebase package installed on your system. . Use this open when the media protocol is buggy (in some older &kde; versions) or if you have no tdebase package installed on your system. By default &kompare; (part of the kdebase package) is used as external diff utility but you can also use your favorite diff utility ⪚ &xxdiff_url; or &kdiff3_url; , just fill in the full path and enjoy.By default &kompare; (part of the tdebase package) is used as external diff utility but you can also use your favorite diff utility ⪚ &xxdiff_url; or &kdiff3_url; , just fill in the full path and enjoy. /g' ${FILENAME}.pot - perl -p -i -e 's/kde-i18n-doc\@kde.org/krusader-i18n\@googlegroups.com/g' ${FILENAME}.pot + perl -p -i -e 's/tde-i18n-doc\@kde.org/krusader-i18n\@googlegroups.com/g' ${FILENAME}.pot done # move pot files to folder krusader_trinity/doc/i18n/pot since they don't belong in the english folder diff --git a/iso/Makefile.am b/iso/Makefile.am index 1e6411c..f9c0bb7 100644 --- a/iso/Makefile.am +++ b/iso/Makefile.am @@ -58,7 +58,7 @@ uninstall-local: # make messages.po. Move this one to ../po/ and "make merge" in po -# the -x is for skipping messages already translated in kdelibs +# the -x is for skipping messages already translated in tdelibs messages: LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ if test -n "$$LIST"; then \ diff --git a/iso/iso.cpp b/iso/iso.cpp index 309e3c5..24023ca 100644 --- a/iso/iso.cpp +++ b/iso/iso.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ - /* This file is heavily based on tar.cc from kdebase + /* This file is heavily based on tar.cc from tdebase * (c) David Faure */ diff --git a/iso/iso.h b/iso/iso.h index 6b16b63..2a488bd 100644 --- a/iso/iso.h +++ b/iso/iso.h @@ -15,7 +15,7 @@ * * ***************************************************************************/ - /* This file is heavily based on tar.h from kdebase + /* This file is heavily based on tar.h from tdebase * (c) David Faure */ diff --git a/iso/kiso.cpp b/iso/kiso.cpp index 61baaf4..9f87d5f 100644 --- a/iso/kiso.cpp +++ b/iso/kiso.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ - /* This file is heavily based on ktar.cpp from kdelibs (c) David Faure */ + /* This file is heavily based on ktar.cpp from tdelibs (c) David Faure */ #include #include diff --git a/iso/kiso.h b/iso/kiso.h index 546b09a..8eb42b0 100644 --- a/iso/kiso.h +++ b/iso/kiso.h @@ -15,7 +15,7 @@ * * ***************************************************************************/ - /* This file is heavily based on ktar.h from kdelibs + /* This file is heavily based on ktar.h from tdelibs * (c) Torben Weis , David Faure */ diff --git a/krArc/Makefile.am b/krArc/Makefile.am index a931c41..f937598 100644 --- a/krArc/Makefile.am +++ b/krArc/Makefile.am @@ -1,4 +1,4 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## kde_module_LTLIBRARIES = kio_krarc.la @@ -26,7 +26,7 @@ install-data-local: uninstall-local: rm -f $(DESTDIR)$(kde_servicesdir)/krarc.protocol -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ # These paths are KDE specific. Use them: # kde_appsdir Where your application's menu entry (.desktop) should go to. # kde_icondir Where your icon should go to - better use KDE_ICON. @@ -50,7 +50,7 @@ uninstall-local: # make messages.po. Move this one to ../po/ and "make merge" in po -# the -x is for skipping messages already translated in kdelibs +# the -x is for skipping messages already translated in tdelibs messages: LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ if test -n "$$LIST"; then \ diff --git a/krusader-1.40.info b/krusader-1.40.info index 446e90e..5c7949d 100644 --- a/krusader-1.40.info +++ b/krusader-1.40.info @@ -2,8 +2,8 @@ Package: krusader Version: 1.40 Revision: 1 Source: mirror:sourceforge:%n/%n-%v.tar.gz -Depends: kdelibs3-ssl (>= 3.1.4-11) | kdelibs3 (>= 3.1.4-11), qt3-shlibs (>= 3.2.1-11) -BuildDepends: autoconf2.54, automake1.6, cctools (>= 446-1), kdelibs3-ssl-dev (>= 3.1.4-11) | kdelibs3-dev (>= 3.1.4-11), libtool14, qt3 (>= 3.2.1-11) +Depends: tdelibs3-ssl (>= 3.1.4-11) | tdelibs3 (>= 3.1.4-11), qt3-shlibs (>= 3.2.1-11) +BuildDepends: autoconf2.54, automake1.6, cctools (>= 446-1), tdelibs3-ssl-dev (>= 3.1.4-11) | tdelibs3-dev (>= 3.1.4-11), libtool14, qt3 (>= 3.2.1-11) Maintainer: Jonas Bähr Homepage: http://krusader.sourceforge.net/ License: GPL diff --git a/krusader-1.50.info b/krusader-1.50.info index 7f19d6b..dcfcaeb 100644 --- a/krusader-1.50.info +++ b/krusader-1.50.info @@ -2,8 +2,8 @@ Package: krusader Version: 1.50 Revision: 1 Source: mirror:sourceforge:%n/%n-%v.tar.gz -Depends: kdelibs3-ssl (>= 3.2) | kdelibs3 (>= 3.2), qt3-shlibs (>= 3.2) -BuildDepends: autoconf2.54, automake1.6, cctools (>= 446-1), kdelibs3-ssl-dev (>= 3.2) | kdelibs3-dev (>= 3.2), libtool14, qt3 (>= 3.2) +Depends: tdelibs3-ssl (>= 3.2) | tdelibs3 (>= 3.2), qt3-shlibs (>= 3.2) +BuildDepends: autoconf2.54, automake1.6, cctools (>= 446-1), tdelibs3-ssl-dev (>= 3.2) | tdelibs3-dev (>= 3.2), libtool14, qt3 (>= 3.2) Maintainer: Jonas Bähr Homepage: http://krusader.sourceforge.net/ License: GPL diff --git a/krusader-1.60.info b/krusader-1.60.info index ecfe2ea..9f13038 100644 --- a/krusader-1.60.info +++ b/krusader-1.60.info @@ -2,8 +2,8 @@ Package: krusader Version: 1.60.0 Revision: 1 Source: mirror:sourceforge:%n/%n-%v.tar.gz -Depends: kdelibs3-ssl (>= 3.4) | kdelibs3 (>= 3.4), qt3-shlibs (>= 3.2) -BuildDepends: autoconf2.5, automake1.9, cctools (>= 446-1), kdelibs3-ssl-dev (>= 3.2) | kdelibs3-dev (>= 3.2), libtool14, qt3 (>= 3.2) +Depends: tdelibs3-ssl (>= 3.4) | tdelibs3 (>= 3.4), qt3-shlibs (>= 3.2) +BuildDepends: autoconf2.5, automake1.9, cctools (>= 446-1), tdelibs3-ssl-dev (>= 3.2) | tdelibs3-dev (>= 3.2), libtool14, qt3 (>= 3.2) Maintainer: Bodo Tasche Homepage: http://krusader.sourceforge.net/ License: GPL diff --git a/krusader-1.70.info b/krusader-1.70.info index b61d973..f4a1cd9 100644 --- a/krusader-1.70.info +++ b/krusader-1.70.info @@ -2,8 +2,8 @@ Package: krusader Version: 1.70.0 Revision: 1 Source: mirror:sourceforge:%n/%n-%v.tar.gz -Depends: kdelibs3-ssl (>= 3.4) | kdelibs3 (>= 3.4), qt3-shlibs (>= 3.2) -BuildDepends: autoconf2.5, automake1.9, cctools (>= 446-1), kdelibs3-ssl-dev (>= 3.2) | kdelibs3-dev (>= 3.2), libtool14, qt3 (>= 3.2) +Depends: tdelibs3-ssl (>= 3.4) | tdelibs3 (>= 3.4), qt3-shlibs (>= 3.2) +BuildDepends: autoconf2.5, automake1.9, cctools (>= 446-1), tdelibs3-ssl-dev (>= 3.2) | tdelibs3-dev (>= 3.2), libtool14, qt3 (>= 3.2) Maintainer: Jonas Baehr Homepage: http://krusader.sourceforge.net/ License: GPL diff --git a/krusader-1.80.info b/krusader-1.80.info index 9d783a9..02b3f62 100644 --- a/krusader-1.80.info +++ b/krusader-1.80.info @@ -6,8 +6,8 @@ PatchFile: %n.patch PatchScript: patch -p0 < %{PatchFile} PatchFile-MD5: d02c7d2fd46873e5130ccb074824c7ff GCC: 4.0 -Depends: kdelibs3-unified, qt3-shlibs (>= 3.2), kdebase3-unified-shlibs, x11 -BuildDepends: autoconf2.5, automake1.9, cctools (>= 446-1), kdelibs3-unified-dev, libtool14, qt3 (>= 3.2), fink ( >= 0.24.12), libjpeg, pcre, libart2, libidn, libgettext3-dev, libiconv-dev, libpng3, kdebase3-unified-dev, kjsembed-dev, freetype219 +Depends: tdelibs3-unified, qt3-shlibs (>= 3.2), tdebase3-unified-shlibs, x11 +BuildDepends: autoconf2.5, automake1.9, cctools (>= 446-1), tdelibs3-unified-dev, libtool14, qt3 (>= 3.2), fink ( >= 0.24.12), libjpeg, pcre, libart2, libidn, libgettext3-dev, libiconv-dev, libpng3, tdebase3-unified-dev, kjsembed-dev, freetype219 Maintainer: Jonas Baehr Homepage: http://krusader.sourceforge.net/ License: GPL diff --git a/krusader.spec b/krusader.spec index 0c2d359..dc80983 100644 --- a/krusader.spec +++ b/krusader.spec @@ -15,7 +15,7 @@ URL: http://krusader.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdelibs-devel kdebase-devel kdebindings-devel +BuildRequires: tdelibs-devel tdebase-devel tdebindings-devel BuildRequires: libpng-devel gamin-devel libacl-devel BuildRequires: desktop-file-utils automake gettext diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp index 6aba681..b6e7a99 100644 --- a/krusader/BookMan/krbookmarkhandler.cpp +++ b/krusader/BookMan/krbookmarkhandler.cpp @@ -143,7 +143,7 @@ void KrBookmarkHandler::exportToFileFolder(TQDomDocument &doc, TQDomElement &par // My own bookmarks // KOffice Web Site // -// KDevelop Web Site +// KDevelop Web Site // // // diff --git a/krusader/Dialogs/krdialogs.cpp b/krusader/Dialogs/krdialogs.cpp index 037b354..ad003ec 100644 --- a/krusader/Dialogs/krdialogs.cpp +++ b/krusader/Dialogs/krdialogs.cpp @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/krusader/GUI/mediabutton.cpp b/krusader/GUI/mediabutton.cpp index 52daed3..9a97f3f 100644 --- a/krusader/GUI/mediabutton.cpp +++ b/krusader/GUI/mediabutton.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include #include diff --git a/krusader/Konfigurator/kgadvanced.cpp b/krusader/Konfigurator/kgadvanced.cpp index e930248..9fc62f0 100644 --- a/krusader/Konfigurator/kgadvanced.cpp +++ b/krusader/Konfigurator/kgadvanced.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include KgAdvanced::KgAdvanced( bool first, TQWidget* parent, const char* name ) : @@ -62,7 +62,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent, const char* name ) : // cfg_class cfg_name default text restart tooltip {{"Advanced","PreserveAttributes", _PreserveAttributes, i18n( "Preserve attributes for local copy/move (slower)" ), false, i18n( "Krusader will try to preserve all attributes (time, owner, group) of the local files according to the source depending on your permissions:
  • User preserving if you are root
  • Group preserving if you are root or member of the group
  • Preserving the timestamp
Note: This can slow down the copy process." ) }, {"Advanced","AutoMount", _AutoMount, i18n( "Automount filesystems" ), false, i18n( "When stepping into a directory which is defined as a mount point in the fstab, try mounting it with the defined parameters." )}, - {"Advanced","DontUseMediaProt", dontUseMedia, i18n( "Don't use KDE's media protocol for media button (if it's buggy or missing)" ), false, i18n( "Select if your media protocol is buggy (in some older KDE versions), or not present (no kdebase package installed)." )}}; + {"Advanced","DontUseMediaProt", dontUseMedia, i18n( "Don't use KDE's media protocol for media button (if it's buggy or missing)" ), false, i18n( "Select if your media protocol is buggy (in some older KDE versions), or not present (no tdebase package installed)." )}}; KonfiguratorCheckBoxGroup *generals = createCheckBoxGroup( 1, 0, generalSettings, 3, generalGrp ); diff --git a/krusader/KrJS/krjs.cpp b/krusader/KrJS/krjs.cpp index cfb2326..efff3f8 100644 --- a/krusader/KrJS/krjs.cpp +++ b/krusader/KrJS/krjs.cpp @@ -33,7 +33,7 @@ bool KrJS::runFile(const TQString & filename) { KJS::Completion jsres = completion(); - // this is based on this example-code http://webcvs.kde.org/kdebindings/kjsembed/kjscmd.cpp?rev=1.28&view=auto + // this is based on this example-code http://webcvs.kde.org/tdebindings/kjsembed/kjscmd.cpp?rev=1.28&view=auto if ( jsres.complType() != KJS::Normal) { switch ( jsres.complType() ) { case KJS::Break: diff --git a/krusader/MountMan/kmountman.h b/krusader/MountMan/kmountman.h index 67216a7..2cc4934 100644 --- a/krusader/MountMan/kmountman.h +++ b/krusader/MountMan/kmountman.h @@ -35,7 +35,7 @@ A #include // KDE includes -#include +#include #include #include #include diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp index 75faf64..f5b8709 100644 --- a/krusader/Panel/listpanel.cpp +++ b/krusader/Panel/listpanel.cpp @@ -56,7 +56,7 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD #include #include #include -#include +#include #include #include #include diff --git a/krusader/Synchronizer/synchronizerdirlist.cpp b/krusader/Synchronizer/synchronizerdirlist.cpp index ee7690c..8feb61a 100644 --- a/krusader/Synchronizer/synchronizerdirlist.cpp +++ b/krusader/Synchronizer/synchronizerdirlist.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #if KDE_IS_VERSION(3,5,0) && defined( HAVE_POSIX_ACL ) diff --git a/krusader/VFS/krpermhandler.cpp b/krusader/VFS/krpermhandler.cpp index 0b56a5e..0bef7ea 100644 --- a/krusader/VFS/krpermhandler.cpp +++ b/krusader/VFS/krpermhandler.cpp @@ -45,7 +45,7 @@ #include #include // krusader includes -#include +#include #include "krpermhandler.h" #include "../resources.h" diff --git a/krusader/VFS/vfile.cpp b/krusader/VFS/vfile.cpp index 3a0681b..438a667 100644 --- a/krusader/VFS/vfile.cpp +++ b/krusader/VFS/vfile.cpp @@ -37,7 +37,7 @@ #include // KDE includes #include -#include +#include // Krusader includes #include "vfile.h" #include "krpermhandler.h" diff --git a/krusader/krslots.cpp b/krusader/krslots.cpp index afd323a..706a9dd 100644 --- a/krusader/krslots.cpp +++ b/krusader/krslots.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/krusader/krusader.cpp b/krusader/krusader.cpp index 81da535..b98edd4 100644 --- a/krusader/krusader.cpp +++ b/krusader/krusader.cpp @@ -51,7 +51,7 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD #include #endif -#include +#include // QT includes #include #include diff --git a/po/Makefile.am b/po/Makefile.am index 50aeed8..630dedf 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -1,6 +1,6 @@ -####### kdevelop will overwrite this part!!! (begin)########## +####### tdevelop will overwrite this part!!! (begin)########## -####### kdevelop will overwrite this part!!! (end)############ +####### tdevelop will overwrite this part!!! (end)############ POFILES = AUTO diff --git a/po/bg.po b/po/bg.po index ab46e62..5ebaa17 100644 --- a/po/bg.po +++ b/po/bg.po @@ -5525,10 +5525,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Изберете, ако вашия медиен протокол е бъгав (в някои стари версии на KDE) " -"или липсва (нямате инсталиран пакета kdebase)." +"или липсва (нямате инсталиран пакета tdebase)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/bs.po b/po/bs.po index f6e0b92..9ae556f 100644 --- a/po/bs.po +++ b/po/bs.po @@ -5702,7 +5702,7 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" #: Konfigurator/kgadvanced.cpp:74 diff --git a/po/ca.po b/po/ca.po index 4882783..7bc0b98 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5574,10 +5574,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Selecciona si el protocol de suport és defectuós (en algunes versions de KDE " -"antigues), o bé no existeixen (no teniu instal·lat el paquet kdebase)." +"antigues), o bé no existeixen (no teniu instal·lat el paquet tdebase)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/cs.po b/po/cs.po index 27c9a96..4bda957 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5553,10 +5553,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Vyberte, jestli je u vás protokol media chybový (v některých starších " -"verzích KDE), nebo vůbec není nainstalovaný (bývá v balíčku kdebase)" +"verzích KDE), nebo vůbec není nainstalovaný (bývá v balíčku tdebase)" #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/da.po b/po/da.po index a55d668..4340db2 100644 --- a/po/da.po +++ b/po/da.po @@ -5700,7 +5700,7 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" #: Konfigurator/kgadvanced.cpp:74 diff --git a/po/de.po b/po/de.po index 010b20a..c09441e 100644 --- a/po/de.po +++ b/po/de.po @@ -5600,11 +5600,11 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Dieses Feld ankreuzen, falls das Geräte-Protokoll fehlerhaft ist (betrifft " "einige ältere KDE-Versionen), oder nicht verfügbar ist (für den Fall, dass " -"das Paket kdebase nicht installiert ist)." +"das Paket tdebase nicht installiert ist)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" @@ -6389,7 +6389,7 @@ msgstr "" msgid "Can't find \"KsysCtrl\". Please install KDE admin package" msgstr "" "\"KsysCtrl\" konnte nicht gefunden werden. Bitte installieren Sie das Paket " -"\"kdeadmin\"." +"\"tdeadmin\"." #: krslots.cpp:517 msgid "" diff --git a/po/el.po b/po/el.po index a634d9e..f3e4e59 100644 --- a/po/el.po +++ b/po/el.po @@ -5611,11 +5611,11 @@ msgstr "Να μη χρησιμοποιηθεί το πρωτόκολλο media #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Ενεργοποιήστε το αν το πρωτόκολλο media δεν είναι σταθερό (σε κάποιες " "παλαιότερες εκδόσεις του KDE), ή αν δεν υπάρχει καθόλου (δεν έχει " -"εγκατασταθεί το πακέτο kdebase)." +"εγκατασταθεί το πακέτο tdebase)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/es.po b/po/es.po index 5fa6f9d..3f19623 100644 --- a/po/es.po +++ b/po/es.po @@ -5622,10 +5622,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Seleccione si se protocolo media presenta falles (como en algunas versiones " -"anteriores de KDE), o si no se encuentra presente (si no se instaló kdebase)." +"anteriores de KDE), o si no se encuentra presente (si no se instaló tdebase)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/fr.po b/po/fr.po index dc6814c..e122d43 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5591,10 +5591,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Sélectionner si le protocole media est bogué (dans certaines vieilles " -"versions de KDE), ou manquant (le paquet kdebase n'est pas installé)." +"versions de KDE), ou manquant (le paquet tdebase n'est pas installé)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/hu.po b/po/hu.po index 833e1d3..83b5fc3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -5496,10 +5496,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Válassza ki, ha a media protokoll hibás (néhány régi KDE verzióban), vagy " -"nincs telepítve (a kdebase csomag hiányzik)." +"nincs telepítve (a tdebase csomag hiányzik)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/it.po b/po/it.po index 9aa56bb..6ff0958 100644 --- a/po/it.po +++ b/po/it.po @@ -5526,10 +5526,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Seleziona se il tuo protocollo per i dispositivi è difettoso (in alcune " -"vecchie versioni di KDE) o mancante (non è installato il pacchetto kdebase)." +"vecchie versioni di KDE) o mancante (non è installato il pacchetto tdebase)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/ja.po b/po/ja.po index 58699b3..eb9d8a0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6137,8 +6137,8 @@ msgstr "KDE 秒 メディア for メディア 秒 もしくは" #, fuzzy msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." -msgstr "選択 メディア in 同じ KDE もしくは いいえ kdebase パッケージ." +"present (no tdebase package installed)." +msgstr "選択 メディア in 同じ KDE もしくは いいえ tdebase パッケージ." #: Konfigurator/kgadvanced.cpp:74 #, fuzzy diff --git a/po/lt.po b/po/lt.po index a582ed4..ef716cf 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5583,10 +5583,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Įjunkite šią parinktį jei laikmenų protokolas yra klaidingas (kai kuriose " -"senose KDE versijose) arba jo išvis nėra (neįdiegtas kdebase paketas)." +"senose KDE versijose) arba jo išvis nėra (neįdiegtas tdebase paketas)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/nl.po b/po/nl.po index a941c47..a874a2e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5552,10 +5552,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Dit selecteren als uw media protocol fouten vertoond (in sommige oudere KDE " -"versies, of als het niet aanwezig is (als geen kdebase pakket geïnstalleerd " +"versies, of als het niet aanwezig is (als geen tdebase pakket geïnstalleerd " "is)." #: Konfigurator/kgadvanced.cpp:74 diff --git a/po/pl.po b/po/pl.po index 7ee3ab9..16a58d0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -5592,10 +5592,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Wybierz jeśli Twój protokół \"media\" ma błędy (niektóre starsze wersje KDE) " -"lub nie jest dostępny (pakiet kdebase nie jest zainstalowany)." +"lub nie jest dostępny (pakiet tdebase nie jest zainstalowany)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/pt.po b/po/pt.po index 3acd41f..32a77db 100644 --- a/po/pt.po +++ b/po/pt.po @@ -5571,10 +5571,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Seleccione se o protocolo de média tem erros ( em algumas versões antigas do " -"KDE), ou não está presente (nenhum pacote kdebase instalado)." +"KDE), ou não está presente (nenhum pacote tdebase instalado)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/pt_BR.po b/po/pt_BR.po index 62f46ac..9a4a8e3 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5578,10 +5578,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Selecione caso seu protocolo de mídia esteja com problemas (em algumas " -"versões mais antigas do KDE), ou não estiver presente (caso o pacote kdebase " +"versões mais antigas do KDE), ou não estiver presente (caso o pacote tdebase " "não esteja instalado)." #: Konfigurator/kgadvanced.cpp:74 diff --git a/po/ru.po b/po/ru.po index 9aaa4c0..e097c44 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5606,9 +5606,9 @@ msgstr "Не использовать протокол поиска носите #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" -"Выберите, если у вас старая версия KDE или не установлен пакет kdebase." +"Выберите, если у вас старая версия KDE или не установлен пакет tdebase." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/sk.po b/po/sk.po index dd29945..460ce0b 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5550,7 +5550,7 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" #: Konfigurator/kgadvanced.cpp:74 diff --git a/po/sl.po b/po/sl.po index 5c7a519..5b2d606 100644 --- a/po/sl.po +++ b/po/sl.po @@ -5439,8 +5439,8 @@ msgid "Don't use KDE's media protocol for media button (if it's buggy or missing msgstr "Ne uporabljaj KDE media protokola za media gumb." #: Konfigurator/kgadvanced.cpp:65 -msgid "Select if your media protocol is buggy (in some older KDE versions), or not present (no kdebase package installed)." -msgstr "Izberite, če media protokol ne deluje (starejše različice KDE), ali pa ni dostopen (brez naloženega kdebase paketa)." +msgid "Select if your media protocol is buggy (in some older KDE versions), or not present (no tdebase package installed)." +msgstr "Izberite, če media protokol ne deluje (starejše različice KDE), ali pa ni dostopen (brez naloženega tdebase paketa)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/sr.po b/po/sr.po index 6f01d22..d1e1cf0 100644 --- a/po/sr.po +++ b/po/sr.po @@ -5547,10 +5547,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Изаберите ако је протокол медија баговит (у неким старијим верзијама KDE-а), " -"или ако није присутан (није инсталиран пакет kdebase)." +"или ако није присутан (није инсталиран пакет tdebase)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/sr@Latn.po b/po/sr@Latn.po index 6d03cdf..d224f54 100644 --- a/po/sr@Latn.po +++ b/po/sr@Latn.po @@ -5555,10 +5555,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Izaberite ako je protokol medija bagovit (u nekim starijim verzijama KDE-a), " -"ili ako nije prisutan (nije instaliran paket kdebase)." +"ili ako nije prisutan (nije instaliran paket tdebase)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/sv.po b/po/sv.po index a907eda..0643eea 100644 --- a/po/sv.po +++ b/po/sv.po @@ -5536,10 +5536,10 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" "Välj om ditt mediaprotokoll är felaktigt (i vissa äldre KDE-versioner), " -"eller inte närvarande (inget kdebase-paket installerat)." +"eller inte närvarande (inget tdebase-paket installerat)." #: Konfigurator/kgadvanced.cpp:74 msgid "MountMan won't (un)mount the following mount-points:" diff --git a/po/tr.po b/po/tr.po index 0468746..c67fcdc 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5716,9 +5716,9 @@ msgstr "" #, fuzzy msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" -"Eğer ortam yordamı eski KDE sürümlerindeki gibi hatalı veya eksik ( kdebase " +"Eğer ortam yordamı eski KDE sürümlerindeki gibi hatalı veya eksik ( tdebase " "paketleri kurulmamış ) ise seçin." #: Konfigurator/kgadvanced.cpp:74 diff --git a/po/uk.po b/po/uk.po index 945cf65..27b790f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5692,7 +5692,7 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" #: Konfigurator/kgadvanced.cpp:74 diff --git a/po/zh_CN.po b/po/zh_CN.po index 79524d5..49d012c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5521,7 +5521,7 @@ msgstr "" #: Konfigurator/kgadvanced.cpp:65 msgid "" "Select if your media protocol is buggy (in some older KDE versions), or not " -"present (no kdebase package installed)." +"present (no tdebase package installed)." msgstr "" #: Konfigurator/kgadvanced.cpp:74 diff --git a/tar/Makefile.am b/tar/Makefile.am index d360dba..dd47932 100644 --- a/tar/Makefile.am +++ b/tar/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/tar +## Makefile.am of tdebase/kioslave/tar INCLUDES = $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/tar/tar.cc b/tar/tar.cc index 9bf043f..cc0e804 100644 --- a/tar/tar.cc +++ b/tar/tar.cc @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include // to be removed diff --git a/virt/Makefile.am b/virt/Makefile.am index cab3bbb..726b134 100644 --- a/virt/Makefile.am +++ b/virt/Makefile.am @@ -1,4 +1,4 @@ -## Makefile.am of kdebase/kioslave/tar +## Makefile.am of tdebase/kioslave/tar INCLUDES = $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/virt/virt.cc b/virt/virt.cc index 5fdd32c..2e98f88 100644 --- a/virt/virt.cc +++ b/virt/virt.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include