diff options
| -rw-r--r-- | FAQ | 10 | ||||
| -rw-r--r-- | INSTALL | 28 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | doc/en/commands.docbook | 2 | ||||
| -rw-r--r-- | doc/en/configuration-files.docbook | 8 | ||||
| -rw-r--r-- | doc/en/faq.docbook | 8 | ||||
| -rw-r--r-- | doc/en/index.docbook | 2 | ||||
| -rw-r--r-- | doc/en/installation.docbook | 24 | ||||
| -rw-r--r-- | doc/en/konfigurator.docbook | 2 | ||||
| -rw-r--r-- | doc/krusader.1 | 2 | ||||
| -rw-r--r-- | doc/ru/commands.docbook | 2 | ||||
| -rw-r--r-- | doc/ru/configuration-files.docbook | 8 | ||||
| -rw-r--r-- | doc/ru/faq.docbook | 8 | ||||
| -rw-r--r-- | doc/ru/index.docbook | 2 | ||||
| -rw-r--r-- | doc/ru/installation.docbook | 20 | ||||
| -rw-r--r-- | doc/ru/konfigurator.docbook | 2 | ||||
| -rw-r--r-- | krusader/Dialogs/krkeydialog.cpp | 2 | ||||
| -rw-r--r-- | krusader/Konfigurator/kgcolors.cpp | 2 |
20 files changed, 85 insertions, 85 deletions
@@ -234,14 +234,14 @@ Installation FAQ e.g. File and Select are missing. This is because some distributions put the krusaderui.rc file in the wrong directory. To solve the problem, just copy the krusaderui.rc file from the package krusader_trinity/krusader/ - krusaderui.rc to $KDEDIR/share/apps/krusader/krusaderui.rc and ~/.kde/ + krusaderui.rc to $TDEDIR/share/apps/krusader/krusaderui.rc and ~/.kde/ share/apps/krusader/krusaderui.rc and re-run Krusader. If you have compiled - Krusader from sources this is often caused if the KDEDIR_-_QTDIR + Krusader from sources this is often caused if the TDEDIR_-_QTDIR environment variables are not correctly set. The result is that the krusaderui.rc file is installed in the wrong directory. Please read the following question, as well. 9. Some new menu items are missing after updating Krusader, what's wrong? - The krusaderui.rc file is stored in $KDEDIR/share/apps/krusader/ + The krusaderui.rc file is stored in $TDEDIR/share/apps/krusader/ krusaderui.rc. When you change the "Toolbar", KDE makes a copy of that file in the home directory at ~/.kde/share/apps/krusader/krusaderui.rc. If Krusader was previously installed on your computer, and you install a newer @@ -468,8 +468,8 @@ Usage FAQ 7. Krusader reports "krarc:... protocol not supported" error at opening an archive file, what to do? Install the krarc slave properly: - Copy the kio_krarc.so, kio_krarc.la files into $KDEDIR/lib/trinity - Copy the krarc.protocol file into $KDEDIR/share/services + Copy the kio_krarc.so, kio_krarc.la files into $TDEDIR/lib/trinity + Copy the krarc.protocol file into $TDEDIR/share/services or the directory where the KIO slaves are placed in your Linux� distribution. 8. I get the error message "Protocol not supported by Krusader: "krarc:/path/ @@ -250,7 +250,7 @@ If you are looking for older releases we recommend the Sourceforge_mirrors, available from our project page. Compiling and Installing Compiling Krusader. What now? -Check the environment variables KDEDIR_-_QTDIR. +Check the environment variables TDEDIR_-_QTDIR. To compile and install Krusader on your system, type the following in the base directory of the Krusader package: $ ./configure @@ -269,8 +269,8 @@ These instructions should work as well on Debian based distributions like: Ubuntu, Kubuntu, Linspire, Kanotix, ... Add the next lines in the ~/.bashrc configuration file export QTDIR=/usr -export KDEDIR=/usr -export export KDEDIRS=/opt/krusader:/usr +export TDEDIR=/usr +export export TDEDIRS=/opt/krusader:/usr Install the build_dependencies for Krusader # apt-get build-dep krusader Download the Krusader sourcecode, unpack and enter the krusader_trinity directory. @@ -347,15 +347,15 @@ the FAQ. If the problem persists, use the help_request to ask for help. $ rm krusader-x.xx.tar.gz 6. Change to the directory containing the sources. $ cd krusader-x.xx - 7. Check the environment variables QTDIRand KDEDIR. Krusader's ./configure + 7. Check the environment variables QTDIRand TDEDIR. Krusader's ./configure script needs to know where the Qt™ and KDE directories are. QTDIR: <path to your Qt installation> e.g. /usr/lib/qt3 or /usr/qt3 - KDEDIR: <path to your KDE installation> e.g. /usr or /opt/trinity + TDEDIR: <path to your KDE installation> e.g. /usr or /opt/trinity Normally your distribution will set them for you, but experience has shown that some do not. You can easily check the values with the echo command. $ echo $QTDIR/usr/lib/qt3 - $ echo $KDEDIR/usr + $ echo $TDEDIR/usr If both commands give an output, the enviroment variables are set (the above example are the settings of Mandriva-Linux). In case you receive empty lines, the variables are not set and you have to set them manually. @@ -366,18 +366,18 @@ the FAQ. If the problem persists, use the help_request to ask for help. /usr/lib/qt3/bin/qtconfig $ find /usr /opt -name tdeinit -type f 2>/dev/null /usr/bin/tdeinit - In this case /usr/lib/qt3 is your QTDIR and /usr is your KDEDIR. The + In this case /usr/lib/qt3 is your QTDIR and /usr is your TDEDIR. The installed binaries will go to /usr/bin. Now we will set the enviroment variables with the export command. $ export QTDIR=<replace with your QTDIR> - $ export KDEDIR=<replace with your KDEDIR> + $ export TDEDIR=<replace with your TDEDIR> **** Note **** These enviroment variables are only set for the lifetime of your current shell. When you close your terminal and open a new one they will be gone. Assuming Krusader is not the only Qt™/KDE program you want to compile, we recommend to make these settings permanent (e.g. append both export commands to your /etc/profile) file. - If you can notdetermine your KDEDIR, kde-config --prefix might help you. + If you can notdetermine your TDEDIR, kde-config --prefix might help you. 8. If you have downloaded a stable version "krusader-x.xx.tar.gz" or a beta version "krusader-x.xx-betax.tar.gz", you can skip this step. In this case the ./configure script is provided. @@ -410,7 +410,7 @@ the FAQ. If the problem persists, use the help_request to ask for help. two nightly builds (snapshots) one with a ./configure script and one without. 9. Your Linux distro Krusader RPM or DEB package will normally install - Krusader in the KDEDIR/bin directory. According to the Filesystem + Krusader in the TDEDIR/bin directory. According to the Filesystem Hierarchy_Standard_(FHS), any user installed files go to the /usr/local directory. If you wish Krusader to be installed in another directory, it can be determed with the prefix option. If you do not have root access, / @@ -433,7 +433,7 @@ the FAQ. If the problem persists, use the help_request to ask for help. kde_locale: /usr/share/locale qt_libraries: /usr/lib/qt3/lib qt_includes: /usr/lib/qt3/include - KDEDIR: /usr + TDEDIR: /usr QTDIR: /usr/lib/qt3 Install path: /usr/local/bin krusader version: 1.80.0 @@ -448,7 +448,7 @@ the FAQ. If the problem persists, use the help_request to ask for help. At the end of the ./configure script you will find a summary of the most important settings, e.g. where the Krusader binary will be installed (after the 'make install' command). This part will also display a warning - if the environment variables KDEDIR_-_QTDIR are empty. + if the environment variables TDEDIR_-_QTDIR are empty. Since Krusader-1.70.0 ./configure has two specific Krusader options: * ./configure --without-konqueror: build Krusader without support Konqueror's servicemenus, default=with. This means that Konqueror's @@ -463,13 +463,13 @@ the FAQ. If the problem persists, use the help_request to ask for help. found, now you have the choice. Use ./configure --helpto see more options or read the INSTALL file in the Krusader sources. - If you used another --prefix= than $KDEDIR or /usr/local, it is + If you used another --prefix= than $TDEDIR or /usr/local, it is recommended to do an extra check: $ kde-config --path exe /home/frank/.kde/bin/:/usr/bin/:/usr/local/bin/ $ If the <prefix_dir/bin> directory is not shown, you need to use e.g. - export KDEDIRS=/usr/local:/usr. To make these settings permanent you can + export TDEDIRS=/usr/local:/usr. To make these settings permanent you can e.g. append this export command to your /etc/profile file. After that you need to restart KDE. **** Note **** @@ -119,7 +119,7 @@ Notice: if you've got bugs to report, please do so using Krusader's Installation ============ -Check the environment variables KDEDIR - QTDIR. +Check the environment variables TDEDIR - QTDIR. Unpack the tarball and go to the Krusader source directory. If you have downloaded from CVS you will have to run the following diff --git a/acinclude.m4 b/acinclude.m4 index c18ad2a..75d1363 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -382,13 +382,13 @@ 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/trinity/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="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/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/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then KDE_XSL_STYLESHEET="" @@ -1794,7 +1794,7 @@ 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/trinity/include /opt/kde/include $x_includes $qt_includes" -test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $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" @@ -1806,7 +1806,7 @@ So, check this please and use another prefix!]) fi 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" +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" @@ -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 @@ -4948,12 +4948,12 @@ AC_DEFUN([KDE_CONF_FILES], 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,7 +4977,7 @@ 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 diff --git a/configure.in b/configure.in index ed07f5e..a55d204 100644 --- a/configure.in +++ b/configure.in @@ -209,7 +209,7 @@ AC_CONFIG_FILES([ tar/Makefile ]) AC_CONFIG_FILES([ virt/Makefile ]) AC_OUTPUT # added manualy, it dumps a summary of the most important settings -# and displays a warning if the KDEDIR or QTDIR is empty +# and displays a warning if the TDEDIR or QTDIR is empty echo " Krusader Project: ----------------- @@ -223,7 +223,7 @@ Krusader Project: kde_locale: ${prefix}/share/locale qt_libraries: ${ac_qt_libraries} qt_includes: ${ac_qt_includes} - KDEDIR: ${KDEDIR} + TDEDIR: ${TDEDIR} QTDIR: ${QTDIR} Install path: ${prefix}/bin krusader version: ${VERSION} @@ -241,7 +241,7 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then 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 @@ -284,8 +284,8 @@ if (test $with_tar != "no"); then echo "NOTICE: Our write-enabled version of KDE's tar KIO-Slave will be build. \"make install\" will may overwrite the KDE-version!" fi -if (test -z "$KDEDIR"); - then echo "WARNING: KDEDIR enviroment variable is empty! Please read Krusader FAQ" +if (test -z "$TDEDIR"); + then echo "WARNING: TDEDIR enviroment variable is empty! Please read Krusader FAQ" fi if (test -z "$QTDIR"); diff --git a/doc/en/commands.docbook b/doc/en/commands.docbook index fc8f6a6..6e113e8 100644 --- a/doc/en/commands.docbook +++ b/doc/en/commands.docbook @@ -1795,7 +1795,7 @@ &krusader; key-bindings can not be changed yet, as well as some features in foo-commander that we either do not have or need. The Key-bindings are stored in - <filename>$KDEDIR/share/apps/krusader</filename>, + <filename>$TDEDIR/share/apps/krusader</filename>, <filename>foo.keymap.info</filename> contains a description, <filename>foo.keymap</filename> is an ini file that holds diff --git a/doc/en/configuration-files.docbook b/doc/en/configuration-files.docbook index 9b94149..c86a5b1 100644 --- a/doc/en/configuration-files.docbook +++ b/doc/en/configuration-files.docbook @@ -33,7 +33,7 @@ <link linkend="faqi_krusaderui_rc">krusaderui.rc &FAQ;</link>.</para> <para>Location: - <filename>$KDEDIR/share/apps/krusader/krusaderui.rc</filename> or + <filename>$TDEDIR/share/apps/krusader/krusaderui.rc</filename> or <filename> ~/.kde/share/apps/krusader/krusaderui.rc</filename></para> <para> @@ -143,7 +143,7 @@ UserActionXML.</para> <para>Location: <filename> - $KDEDIR/share/apps/krusader/useraction-examples.xml</filename></para> + $TDEDIR/share/apps/krusader/useraction-examples.xml</filename></para> <para> <emphasis role="bold">foo.keymap</emphasis> </para> @@ -154,12 +154,12 @@ legacy binary format.</para> <para>Location: <filename> - $KDEDIR/share/apps/krusader/foo.keymap</filename></para> + $TDEDIR/share/apps/krusader/foo.keymap</filename></para> <para> <emphasis role="bold">foo.color</emphasis> </para> <para>This is a binary file that holds the <link linkend="konfig-color">Color Scheme</link>.</para> <para>Location: - <filename>$KDEDIR/share/apps/krusader/foo.color</filename></para> + <filename>$TDEDIR/share/apps/krusader/foo.color</filename></para> </appendix> diff --git a/doc/en/faq.docbook b/doc/en/faq.docbook index 1d05eb7..f21d839 100644 --- a/doc/en/faq.docbook +++ b/doc/en/faq.docbook @@ -385,7 +385,7 @@ <filename> krusader_trinity/krusader/krusaderui.rc</filename> to <filename> - $KDEDIR/share/apps/krusader/krusaderui.rc</filename> and + $TDEDIR/share/apps/krusader/krusaderui.rc</filename> and <filename> ~/.kde/share/apps/krusader/krusaderui.rc</filename> and re-run &krusader;. If you have compiled @@ -408,7 +408,7 @@ <para>The <filename>krusaderui.rc</filename> file is stored in <filename> - $KDEDIR/share/apps/krusader/krusaderui.rc</filename>. + $TDEDIR/share/apps/krusader/krusaderui.rc</filename>. When you change the <guilabel>"Toolbar"</guilabel>, &kde; makes a copy of that file in the home directory at @@ -930,11 +930,11 @@ <filename>kio_krarc.so</filename>, <filename>kio_krarc.la</filename> files into <filename class="directory"> - $KDEDIR/lib/trinity</filename></para> + $TDEDIR/lib/trinity</filename></para> <para>Copy the <filename>krarc.protocol</filename> file into <filename class="directory"> - $KDEDIR/share/services</filename></para> + $TDEDIR/share/services</filename></para> <para>or the directory where the KIO slaves are placed in your &Linux; distribution.</para> <para></para> diff --git a/doc/en/index.docbook b/doc/en/index.docbook index 8bff803..e12ff22 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -226,7 +226,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf <!ENTITY syncdirs-lnk '<link linkend="synchronizer">Synchronize Directories</link>'> <!ENTITY splitfile-lnk '<link linkend="splitter">Split file</link>'> <!ENTITY combinefiles-lnk '<link linkend="splitter">Combine files</link>'> -<!ENTITY kdeqtdir-lnk '<link linkend="kde_qt_dir"><envar>KDEDIR</envar> - <envar>QTDIR</envar></link>'> +<!ENTITY kdeqtdir-lnk '<link linkend="kde_qt_dir"><envar>TDEDIR</envar> - <envar>QTDIR</envar></link>'> <!ENTITY useractions-lnk '<link linkend="useractions">UserActions</link>'> <!ENTITY usermenu-lnk '<link linkend="useractions">User Menu</link>'> <!ENTITY faq-lnk '<link linkend="faq">FAQ</link>'> diff --git a/doc/en/installation.docbook b/doc/en/installation.docbook index 5458a0d..478e8d9 100644 --- a/doc/en/installation.docbook +++ b/doc/en/installation.docbook @@ -431,8 +431,8 @@ <para>Add the next lines in the <filename>~/.bashrc</filename> configuration file <screen> <userinput><command>export</command> <option>QTDIR=/usr</option></userinput> -<userinput><command>export</command> <option>KDEDIR=/usr</option></userinput> -<userinput><command>export</command> <option>export KDEDIRS=/opt/krusader:/usr</option></userinput> +<userinput><command>export</command> <option>TDEDIR=/usr</option></userinput> +<userinput><command>export</command> <option>export TDEDIRS=/opt/krusader:/usr</option></userinput> </screen> </para> @@ -596,7 +596,7 @@ Please don't use the <filename>/usr/local</filename> directory as it simply won' <listitem id="kde_qt_dir"> <para>Check the environment variables <envar>QTDIR</envar>and - <envar>KDEDIR</envar>. &krusader;'s + <envar>TDEDIR</envar>. &krusader;'s <command>./configure</command> script needs to know where the &Qt; and &kde; directories are.</para> @@ -607,7 +607,7 @@ Please don't use the <filename>/usr/local</filename> directory as it simply won' <filename>/usr/lib/qt3</filename> or <filename>/usr/qt3</filename></para> <para> - <envar>KDEDIR</envar>: + <envar>TDEDIR</envar>: <replaceable><path to your KDE installation></replaceable> ⪚ <filename>/usr</filename> or @@ -617,7 +617,7 @@ Please don't use the <filename>/usr/local</filename> directory as it simply won' check the values with the <command>echo</command> command. <screen><prompt>$</prompt> <userinput><command>echo</command> $QTDIR</userinput>/usr/lib/qt3 - <prompt>$</prompt> <userinput><command>echo</command> $KDEDIR</userinput>/usr</screen> + <prompt>$</prompt> <userinput><command>echo</command> $TDEDIR</userinput>/usr</screen> If both commands give an output, the enviroment variables are set (the above example are the settings of @@ -636,12 +636,12 @@ Please don't use the <filename>/usr/local</filename> directory as it simply won' <filename>/usr/lib/qt3</filename> is your <envar>QTDIR</envar> and <filename>/usr</filename> is your - <envar>KDEDIR</envar>. The installed binaries will go to + <envar>TDEDIR</envar>. The installed binaries will go to <filename>/usr/bin</filename>. Now we will set the enviroment variables with the <command>export</command> command. <screen><prompt>$</prompt> <userinput><command>export</command> QTDIR=<replaceable><replace with your QTDIR></replaceable></userinput></screen> - <screen><prompt>$</prompt> <userinput><command>export</command> KDEDIR=<replaceable><replace with your KDEDIR></replaceable></userinput></screen> + <screen><prompt>$</prompt> <userinput><command>export</command> TDEDIR=<replaceable><replace with your TDEDIR></replaceable></userinput></screen> </para> <note> <para>These enviroment variables are only set for the @@ -654,7 +654,7 @@ Please don't use the <filename>/usr/local</filename> directory as it simply won' <filename class="directory">/etc/profile</filename>) file.</para> </note> - <para>If you can notdetermine your KDEDIR, + <para>If you can notdetermine your TDEDIR, <command>kde-config --prefix</command> might help you.</para> <para></para> @@ -721,7 +721,7 @@ If you haven't done so in a while, run ./configure --help <para>Your &Linux; distro &krusader; RPM or DEB package will normally install &krusader; in the - <filename>KDEDIR/bin</filename> directory. According to + <filename>TDEDIR/bin</filename> directory. According to the &fhs-url;, any user installed files go to the <filename>/usr/local</filename> directory. If you wish @@ -747,7 +747,7 @@ kde_includes: /usr/lib kde_locale: /usr/share/locale qt_libraries: /usr/lib/qt3/lib qt_includes: /usr/lib/qt3/include -KDEDIR: /usr +TDEDIR: /usr QTDIR: /usr/lib/qt3 Install path: /usr/local/bin krusader version: 1.80.0 @@ -815,7 +815,7 @@ Good - your configure finished. Start make now <filename>INSTALL</filename> file in the &krusader; sources.</para> <para>If you used another --prefix= than - <filename>$KDEDIR or /usr/local</filename>, it is + <filename>$TDEDIR or /usr/local</filename>, it is recommended to do an extra check: <screen><prompt>$</prompt> <userinput><command>kde-config</command> <option>--path exe</option></userinput> /home/frank/.kde/bin/:/usr/bin/:/usr/local/bin/ @@ -823,7 +823,7 @@ Good - your configure finished. Start make now If the <prefix_dir/bin> directory is not shown, you need to use e.g. - <command>export KDEDIRS=/usr/local:/usr</command>. To + <command>export TDEDIRS=/usr/local:/usr</command>. To make these settings permanent you can ⪚ append this export command to your <filename>/etc/profile</filename> file. After that you diff --git a/doc/en/konfigurator.docbook b/doc/en/konfigurator.docbook index 0cd72f1..ab23a78 100644 --- a/doc/en/konfigurator.docbook +++ b/doc/en/konfigurator.docbook @@ -806,7 +806,7 @@ HTML_PARSING--> &krusader; to use &tcmd;, &mc;, foo-commander or your own custom color profile. The Color Schemes are stored in - <filename>$KDEDIR/share/apps/krusader</filename>, the + <filename>$TDEDIR/share/apps/krusader</filename>, the <filename>foo.color</filename> is a binary file that holds the color scheme.</para> <tip> diff --git a/doc/krusader.1 b/doc/krusader.1 index 4f9945b..cf8633e 100644 --- a/doc/krusader.1 +++ b/doc/krusader.1 @@ -61,7 +61,7 @@ Configuration files: .I ~/.kde/share/apps/krusader/krbookmarks.xml -.I $KDEDIR/share/apps/krusader/krusaderui.rc or +.I $TDEDIR/share/apps/krusader/krusaderui.rc or .I ~/.kde/share/apps/krusader/krusaderui.rc diff --git a/doc/ru/commands.docbook b/doc/ru/commands.docbook index 65f813a..538d2d7 100644 --- a/doc/ru/commands.docbook +++ b/doc/ru/commands.docbook @@ -1517,7 +1517,7 @@ > <guibutton >Export shortcuts</guibutton > buttons you can load and save a Key-binding profile. This allows &krusader; to have the &tcmd;, &mc;, foo-commander, or your custom Key-bindings. The only limitation is that global &kde; key-bindings and some &krusader; key-bindings can't be changed yet, as well as some features in foo-commander that we either don't have or don't need. The Key-bindings are stored in <filename ->$KDEDIR/share/apps/krusader</filename +>$TDEDIR/share/apps/krusader</filename >, <filename >foo.keymap.info</filename > contains a description, <filename diff --git a/doc/ru/configuration-files.docbook b/doc/ru/configuration-files.docbook index 5e53d77..ae42899 100644 --- a/doc/ru/configuration-files.docbook +++ b/doc/ru/configuration-files.docbook @@ -38,7 +38,7 @@ >.</para> <para >Location: <filename ->$KDEDIR/share/apps/krusader/krusaderui.rc</filename +>$TDEDIR/share/apps/krusader/krusaderui.rc</filename > or <filename >~/.kde/share/apps/krusader/krusaderui.rc</filename ></para> @@ -189,7 +189,7 @@ >The default User-Actions provided by us. The file-structure is documented in doxygen-headers of UserActionXML.</para> <para >Location: <filename ->$KDEDIR/share/apps/krusader/useraction_examples.xml</filename +>$TDEDIR/share/apps/krusader/useraction_examples.xml</filename ></para> <para @@ -202,7 +202,7 @@ >. Until &krusader;-1.70.0 this was a binary file, &krusader; is backwards compatible for importing this legacy binary format.</para> <para >Location: <filename ->$KDEDIR/share/apps/krusader/foo.keymap</filename +>$TDEDIR/share/apps/krusader/foo.keymap</filename ></para> @@ -216,7 +216,7 @@ >.</para> <para >Location: <filename ->$KDEDIR/share/apps/krusader/foo.color</filename +>$TDEDIR/share/apps/krusader/foo.color</filename ></para> diff --git a/doc/ru/faq.docbook b/doc/ru/faq.docbook index d9d79c3..98587ce 100644 --- a/doc/ru/faq.docbook +++ b/doc/ru/faq.docbook @@ -402,7 +402,7 @@ > file from the package <filename >krusader_trinity/krusader/krusaderui.rc</filename > to <filename ->$KDEDIR/share/apps/krusader/krusaderui.rc</filename +>$TDEDIR/share/apps/krusader/krusaderui.rc</filename > and <filename >~/.kde/share/apps/krusader/krusaderui.rc</filename > and re-run &krusader;. If you have compiled &krusader; from sources this is often caused when the &kdeqtdir_lnk; environment variables are not correctly set. The result is that the <filename @@ -422,7 +422,7 @@ >Файл <filename >krusaderui.rc</filename > хранится в <filename ->$KDEDIR/share/apps/krusader/krusaderui.rc</filename +>$TDEDIR/share/apps/krusader/krusaderui.rc</filename >. Если вы выбрали новую <guilabel >"Панель"</guilabel > ,&kde; создаст копию файла <filename @@ -909,13 +909,13 @@ >, <filename >kio_krarc.la</filename > в <filename class="directory" ->$KDEDIR/lib/trinity</filename +>$TDEDIR/lib/trinity</filename ></para> <para >Копируйте <filename >krarc.protocol</filename > в <filename class="directory" ->$KDEDIR/share/services</filename +>$TDEDIR/share/services</filename ></para> <para >или директорию , в которой находятся KIO slaves вашего дистрибутива &Linux;. </para> diff --git a/doc/ru/index.docbook b/doc/ru/index.docbook index 8834588..8997d09 100644 --- a/doc/ru/index.docbook +++ b/doc/ru/index.docbook @@ -518,7 +518,7 @@ since the Entity Backspace is not defined in >'> <!ENTITY kdeqtdir_lnk '<link linkend="kde_qt_dir" ><envar ->KDEDIR</envar +>TDEDIR</envar > - <envar >QTDIR</envar ></link diff --git a/doc/ru/installation.docbook b/doc/ru/installation.docbook index cd67f34..064dc04 100644 --- a/doc/ru/installation.docbook +++ b/doc/ru/installation.docbook @@ -496,7 +496,7 @@ >Check the environment variables <envar >QTDIR</envar > and <envar ->KDEDIR</envar +>TDEDIR</envar >. &krusader;'s <command >./configure</command > script needs to know where the &Qt; and &kde; directories are. </para> @@ -514,7 +514,7 @@ <para ><envar ->KDEDIR</envar +>TDEDIR</envar > : <replaceable ><path to your KDE installation></replaceable > ⪚ <filename @@ -529,7 +529,7 @@ > command. <screen ><prompt>$</prompt> <userinput><command>echo</command> $QTDIR</userinput> /usr/lib/qt3 -<prompt>$</prompt> <userinput><command>echo</command> $KDEDIR</userinput> +<prompt>$</prompt> <userinput><command>echo</command> $TDEDIR</userinput> /usr</screen > If both commands give an output, the enviroment variables are set (the above example are the settings of &mandriva;-&Linux;). In case you just receive empty lines, the variables are not set and you have to set them it manually. If you have no idea what to set the variables to, or if you want to check if the variables are correctly set, ask your distributor or use the <command >find</command @@ -545,7 +545,7 @@ > and <filename >/usr</filename > is your <envar ->KDEDIR</envar +>TDEDIR</envar >. The installed binaries will go to <filename >/usr/bin</filename >. Now we will set the enviroment variables with the <command @@ -553,7 +553,7 @@ > command. <screen ><prompt>$</prompt> <userinput><command>export</command> QTDIR=<replaceable><replace with your QTDIR></replaceable></userinput></screen> <screen -><prompt>$</prompt> <userinput><command>export</command> KDEDIR=<replaceable><replace with your KDEDIR></replaceable></userinput></screen> +><prompt>$</prompt> <userinput><command>export</command> TDEDIR=<replaceable><replace with your TDEDIR></replaceable></userinput></screen> </para> <note @@ -564,7 +564,7 @@ ></note> <para ->If you can't determine your KDEDIR than <command +>If you can't determine your TDEDIR than <command >kde-config --prefix</command > might help you.</para> @@ -642,7 +642,7 @@ If you haven't done so in a while, run ./configure --help <listitem> <para >Your &Linux; distro &krusader; RPM or DEB package will usually install &krusader; in the <filename ->KDEDIR/bin</filename +>TDEDIR/bin</filename > directory. According to the &fhs_url;, any user installed files should go to the <filename >/usr/local</filename > directory, but in some cases you might want that &krusader; will be installed in an other directory, this behaviour can be determed with the prefix option. If you don't have root access <filename @@ -673,7 +673,7 @@ kde_includes: /usr/lib kde_locale: /usr/share/locale qt_libraries: /usr/lib/qt3/lib qt_includes: /usr/lib/qt3/include -KDEDIR: /usr +TDEDIR: /usr QTDIR: /usr/lib/qt3 Install path: /usr/local/bin krusader version: 1.51 @@ -737,13 +737,13 @@ Good - your configure finished. Start make now <para >If you dit use the an other --prefix= than <filename ->$KDEDIR or /usr/local</filename +>$TDEDIR or /usr/local</filename > , then it can't hurt to do an extra check: <screen ><prompt>$</prompt> <userinput><command>kde-config</command> <option>--path exe</option></userinput> /home/frank/.kde/bin/:/usr/bin/:/usr/local/bin/ <prompt>$</prompt></screen > If the <prefix_dir/bin> directory is not shown, you need to use e.g. <command ->export KDEDIRS=/usr/local:/usr</command +>export TDEDIRS=/usr/local:/usr</command >. To make these settings permanent you can ⪚ append this export command to your <filename >/etc/profile</filename > file. Than you need to restart &kde;, and check again. </para> diff --git a/doc/ru/konfigurator.docbook b/doc/ru/konfigurator.docbook index 7523a8b..ed5c369 100644 --- a/doc/ru/konfigurator.docbook +++ b/doc/ru/konfigurator.docbook @@ -964,7 +964,7 @@ HTML_PARSING--> > <guibutton >Export Color Scheme</guibutton > buttons you can load and save a Color Scheme profile. This allows that &krusader; can have the &tcmd;, &mc;, foo-commander or your custom colors. The Color Schemes are stored in <filename ->$KDEDIR/share/apps/krusader</filename +>$TDEDIR/share/apps/krusader</filename >, the <filename >foo.color</filename > is a binary file that holds the Color Scheme.</para> diff --git a/krusader/Dialogs/krkeydialog.cpp b/krusader/Dialogs/krkeydialog.cpp index 0adaf7b..24e5e61 100644 --- a/krusader/Dialogs/krkeydialog.cpp +++ b/krusader/Dialogs/krkeydialog.cpp @@ -58,7 +58,7 @@ KrKeyDialog::~KrKeyDialog() { } void KrKeyDialog::slotImportShortcuts() { - // find $KDEDIR/share/apps/krusader + // find $TDEDIR/share/apps/krusader TQString basedir = KGlobal::dirs()->findResourceDir("appdata", "total_commander.keymap"); // let the user select a file to load TQString filename = KFileDialog::getOpenFileName(basedir, i18n(FILE_FILTER), 0, i18n("Select a keymap file")); diff --git a/krusader/Konfigurator/kgcolors.cpp b/krusader/Konfigurator/kgcolors.cpp index 21498a2..01e4a7e 100644 --- a/krusader/Konfigurator/kgcolors.cpp +++ b/krusader/Konfigurator/kgcolors.cpp @@ -498,7 +498,7 @@ bool KgColors::apply() } void KgColors::slotImportColors() { - // find $KDEDIR/share/apps/krusader + // find $TDEDIR/share/apps/krusader TQString basedir = KGlobal::dirs()->findResourceDir("appdata", "total_commander.keymap"); // let the user select a file to load TQString file = KFileDialog::getOpenFileName(basedir, "*.color", 0, i18n("Select a color-scheme file")); |