17 files changed, 81 insertions, 81 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ee0df1..acb6d3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1234,7 +1234,7 @@
     FIXED: don't watch read-only/not-readable directories - this should improve
            performance and avoid a loooong wait time on super-mounted cdroms.
     FIXED: multiple selctions modes are no-more. default mode is Konqueror.
-           the multi-mode become unstable after the kde3 porting and we had to
+           the multi-mode become unstable after the trinity porting and we had to
            disable it.
     FIXED: memory leak when starting konfigurator.
 
diff --git a/FAQ b/FAQ
index 6e61d97..819a141 100644
--- a/FAQ
+++ b/FAQ
@@ -233,7 +233,7 @@ Installation FAQ
     In this case only the Help menu is visible and all other menu items like
     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_kde3/krusader/
+    copy the krusaderui.rc file from the package krusader_trinity/krusader/
     krusaderui.rc to $KDEDIR/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
@@ -468,7 +468,7 @@ 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/kde3
+    Copy the kio_krarc.so, kio_krarc.la files into $KDEDIR/lib/trinity
     Copy the krarc.protocol file into $KDEDIR/share/services
     or the directory where the KIO slaves are placed in your Linuxï¿½
     distribution.
diff --git a/INSTALL b/INSTALL
index 3092c95..5b0cdf8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -215,20 +215,20 @@ the Enter key.
 Currently, there are two module options:
     * krusader_kde2: the KDE2 branch, stable but it is basically v1.01 and
       there are no planned changes
-    * krusader_kde3: the KDE3 branch that we currently use
+    * krusader_trinity: the KDE3 branch that we currently use
 To check out Krusader from CVS:
 $ cvs -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader login
 $ cvs -z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader
-co krusader_kde3
+co krusader_trinity
 (note: updates from within the modules directory do not need the -d parameter)
 If you want to check out a specific version of Krusader from CVS (e.g.
 Krusader-1.60.0) :
 $ cvs -z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader
-co -rversion_1_60_0 krusader_kde3
+co -rversion_1_60_0 krusader_trinity
 If you want to check out a specific date of Krusader from CVS (e.g. Krusader-
 2006-10-29) :
 $ cvs -z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader
-co -D2006-10-29 krusader_kde3
+co -D2006-10-29 krusader_trinity
 Mostly being Gentoo® users, we provide a Gentoo®_Live_Ebuild for all those who
 want to stay on the bleeding edge of file management and do not want to miss
 the advantages of portage. Please take a look at our Krusader's_Cutting_Edge
@@ -238,10 +238,10 @@ Subversion
 Subversion is used for the Krusader 2.x series for KDE4. it is also possible to
 Browse_the_Subversion_Repository.
 To check out the latest Krusader 1.x for KDE 3 from SVN: (NOTE: at moment of
-writing use CVS for krusader_kde3, since krusader_kde3 is developed in CVS and
+writing use CVS for krusader_trinity, since krusader_trinity is developed in CVS and
 NOT in SVN, currently you will get an old version in SVN)
 $ svn co https://krusader.svn.sourceforge.net/svnroot/krusader/trunk/
-krusader_kde3
+krusader_trinity
 To check out the latest Krusader 2.x for KDE 4 from SVN:
 $ svn co https://krusader.svn.sourceforge.net/svnroot/krusader/trunk/
 krusader_kde4
@@ -273,7 +273,7 @@ export KDEDIR=/usr
 export export KDEDIRS=/opt/krusader:/usr
 Install the build_dependencies for Krusader
 # apt-get build-dep krusader
-Download the Krusader sourcecode, unpack and enter the krusader_kde3 directory.
+Download the Krusader sourcecode, unpack and enter the krusader_trinity directory.
 The next command will create ./configure
 $ make -f Makefile.cvs
 NOTE: you might need to upgrade automake and/or autoconf, if an error message
@@ -291,7 +291,7 @@ $ su -c "make install"
 /opt/bin/krusader runs the compiled Krusader version.
 SuSE
 Install the build_dependencies for Krusader
-Download the Krusader sourcecode, unpack and enter the krusader_kde3 directory.
+Download the Krusader sourcecode, unpack and enter the krusader_trinity directory.
 Now you can compile and install Krusader
 $ make -f Makefile.cvs
 $ ./configure --prefix=/opt/krusader --enable-debug=full
@@ -305,7 +305,7 @@ krusader are usually better so that you don't overwrite files that are
 installed by your package managment system. Please don't use the /usr/local
 directory as it simply won't work.
 Install the build_dependencies for Krusader
-Download the Krusader sourcecode, unpack and enter the krusader_kde3 directory.
+Download the Krusader sourcecode, unpack and enter the krusader_trinity directory.
 Now you can compile and install Krusader
 $ make -f Makefile.cvs
 $ ./configure --prefix=/usr
@@ -350,7 +350,7 @@ the FAQ. If the problem persists, use the help_request to ask for help.
    7. Check the environment variables QTDIRand KDEDIR. Krusader's ./configure
       script needs to know where the Qt&#8482; 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/kde3
+      KDEDIR: <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.
@@ -480,10 +480,10 @@ the FAQ. If the problem persists, use the help_request to ask for help.
       runs. If everything goes well, it will e.g. end with the following
       messages:
       foo
-      make[2]: Leaving directory `/home/source/krusader_kde3/tar'
-      make[2]: Entering directory `/home/source/krusader_kde3'
-      make[2]: Leaving directory `/home/source/krusader_kde3'
-      make[1]: Leaving directory `/home/source/krusader_kde3'
+      make[2]: Leaving directory `/home/source/krusader_trinity/tar'
+      make[2]: Entering directory `/home/source/krusader_trinity'
+      make[2]: Leaving directory `/home/source/krusader_trinity'
+      make[1]: Leaving directory `/home/source/krusader_trinity'
       bash$
       If ./configure was successful and make failed for some reason, continue
       to read this page. If you can not find a solution to your problem, feel
diff --git a/README b/README
index 869bfe5..37f48c4 100644
--- a/README
+++ b/README
@@ -154,7 +154,7 @@ To checkout the Krusader KDE3 version from cvs:
 ===============================================
 $ cvs -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader login
 $ cvs -z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader \
-co krusader_kde3
+co krusader_trinity
  
 (Note: updates from within the modules directory do not need the -d
 parameter)
@@ -269,7 +269,7 @@ messages, we want to prevent this, of course.
 Use i18n_status and ViewCVS to see the live translation status of
 Krusader!
 http://krusader.sourceforge.net/i18n.php
-http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/krusader/krusader_kde3/po/
+http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/krusader/krusader_trinity/po/
 The latest news about the Krusader translations will be in the LATEST
 NEWS section of the "Krusader translation howto".
 
diff --git a/acinclude.m4 b/acinclude.m4
index 663a690..377342b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -479,14 +479,14 @@ if test "$1" = "default"; then
     if test "$kde_qtver" = "2"; then
       kde_moduledir='\${libdir}/kde2'
     else
-      kde_moduledir='\${libdir}/kde3'
+      kde_moduledir='\${libdir}/trinity'
     fi
   fi
   if test -z "$kde_styledir"; then
-    kde_styledir='\${libdir}/kde3/plugins/styles'
+    kde_styledir='\${libdir}/trinity/plugins/styles'
   fi
   if test -z "$kde_widgetdir"; then
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
+    kde_widgetdir='\${libdir}/trinity/plugins/designer'
   fi
   if test -z "$xdg_appsdir"; then
     xdg_appsdir='\${datadir}/applications/kde'
@@ -546,7 +546,7 @@ Please check whether you installed aRts correctly or use
 
 AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
 [
-    kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+    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
        kde_save_IFS=$IFS
@@ -580,39 +580,39 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
 
-        kde32ornewer=1
-        kde33ornewer=1
+        trinity2ornewer=1
+        trinity3ornewer=1
         if test -n "$kde_qtver" && test "$kde_qtver" -lt 3; then
-            kde32ornewer=
-            kde33ornewer=
+            trinity2ornewer=
+            trinity3ornewer=
         else
             if test "$kde_qtver" = "3"; then
               if test "$kde_qtsubver" -le 1; then
-                kde32ornewer=
+                trinity2ornewer=
               fi
               if test "$kde_qtsubver" -le 2; then
-                kde33ornewer=
+                trinity3ornewer=
               fi
               if test "$KDECONFIG" != "compiled"; then
                 if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
-                  kde33ornewer=
+                  trinity3ornewer=
                 fi
               fi
             fi
         fi
 
-        if test -n "$kde32ornewer"; then
+        if test -n "$trinity2ornewer"; then
             KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
             KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
         fi
-        if test -n "$kde33ornewer"; then
+        if test -n "$trinity3ornewer"; then
             KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
             AC_SUBST(MAKEKDEWIDGETS)
         fi
         KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
 
         if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
+ 	    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"
             AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
 	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -623,7 +623,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
         fi
 
         DCOP_DEPENDENCIES='$(DCOPIDL)'
-        if test -n "$kde32ornewer"; then
+        if test -n "$trinity2ornewer"; then
             KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
             DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
             AC_SUBST(KCONFIG_COMPILER)
@@ -1793,7 +1793,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/kde3/include /opt/kde/include $x_includes $qt_includes"
+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"
 kde_incdirs="$ac_kde_includes $kde_incdirs"
 AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1805,7 +1805,7 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+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="$ac_kde_libraries $libdir $kde_libdirs"
 AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1813,7 +1813,7 @@ ac_kde_libraries="$kde_libdir"
 
 kde_widgetdir=NO
 dnl this might be somewhere else
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
 
 if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
 AC_MSG_ERROR([
@@ -1821,14 +1821,14 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
 So, check this please and use another prefix!])
 fi
 
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
+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])
 fi
 
 if test -n "$kde_widgetdir"; then
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
+    kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
 fi
 
 
diff --git a/doc/en/faq.docbook b/doc/en/faq.docbook
index 4051f9c..7a9ba25 100644
--- a/doc/en/faq.docbook
+++ b/doc/en/faq.docbook
@@ -383,7 +383,7 @@
           directory. To solve the problem, just copy the 
           <filename>krusaderui.rc</filename> file from the package 
           <filename>
-          krusader_kde3/krusader/krusaderui.rc</filename> to 
+          krusader_trinity/krusader/krusaderui.rc</filename> to 
           <filename>
           $KDEDIR/share/apps/krusader/krusaderui.rc</filename> and 
           <filename>
@@ -930,7 +930,7 @@
           <filename>kio_krarc.so</filename>, 
           <filename>kio_krarc.la</filename> files into 
           <filename class="directory">
-          $KDEDIR/lib/kde3</filename></para>
+          $KDEDIR/lib/trinity</filename></para>
           <para>Copy the 
           <filename>krarc.protocol</filename> file into 
           <filename class="directory">
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 146f1ba..b7bbb1a 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -83,7 +83,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf
 '<ulink url="http://www.krusader.org/text.php?t=cvs.changelog"><filename>ChangeLog</filename></ulink>'>
 <!ENTITY cvsnews-url
 '<ulink url="http://www.krusader.org/text.php?t=cvs.news"><filename>CVSNEWS</filename></ulink>'>
-<!ENTITY docchangelog-url '<ulink url="http://cvs.sourceforge.net/viewcvs.py/krusader/krusader_kde3/doc/ChangeLog?view=markup">Documentation ChangeLog</ulink>'>
+<!ENTITY docchangelog-url '<ulink url="http://cvs.sourceforge.net/viewcvs.py/krusader/krusader_trinity/doc/ChangeLog?view=markup">Documentation ChangeLog</ulink>'>
 <!ENTITY i18n-page-url '<ulink url="http://www.krusader.org/i18n.php">i18n page</ulink>'>
 
 <!ENTITY deb-requirements-url '<ulink url="http://packages.debian.org/unstable/utils/krusader">requirements on &debian;</ulink>'>
@@ -107,7 +107,7 @@ http://groups.google.com/group/krusader-devel/browse_thread/thread/d102adec2edcf
 
 <!ENTITY online-buglist-url '<ulink url="http://sourceforge.net/tracker/?atid=106488&amp;group_id=6488&amp;func=browse">online bug list</ulink>'>
 <!ENTITY patch-tracker-url '<ulink url="http://sourceforge.net/tracker/?group_id=6488&amp;atid=306488">Patch Tracker</ulink>'>
-<!ENTITY i18n-credits-url '<ulink url="http://krusader.cvs.sourceforge.net/krusader/krusader_kde3/po/">more translator credits</ulink>'>
+<!ENTITY i18n-credits-url '<ulink url="http://krusader.cvs.sourceforge.net/krusader/krusader_trinity/po/">more translator credits</ulink>'>
 
 
 <!ENTITY subversion-url '<ulink url="http://sourceforge.net/svn/?group_id=6488">Subversion</ulink>'>
diff --git a/doc/en/installation.docbook b/doc/en/installation.docbook
index 4bd186b..f50888d 100644
--- a/doc/en/installation.docbook
+++ b/doc/en/installation.docbook
@@ -349,24 +349,24 @@
           changes</para>
         </listitem>
         <listitem>
-          <para>krusader_kde3: the &kde;3 branch that we
+          <para>krusader_trinity: the &kde;3 branch that we
           currently use</para>
         </listitem>
       </itemizedlist></para>
       <para>To check out &krusader; from CVS: 
       <screen><prompt>$</prompt> <userinput><command>cvs</command> <option>-d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader login</option></userinput></screen>
-      <screen><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader co krusader_kde3</option></userinput></screen>
+      <screen><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader co krusader_trinity</option></userinput></screen>
       (note: updates from within the modules directory do
       not need the -d parameter)</para>
       <para>If you want to check out a specific version of
       &krusader; from CVS (&eg;
       &krusader;-1.60.0) : 
-      <screen><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader co -rversion_1_60_0 krusader_kde3</option></userinput></screen>
+      <screen><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader co -rversion_1_60_0 krusader_trinity</option></userinput></screen>
       </para>
       <para>If you want to check out a specific date of
       &krusader; from CVS (&eg;
       &krusader;-2006-10-29) : 
-      <screen><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader co -D2006-10-29 krusader_kde3</option></userinput></screen>
+      <screen><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader co -D2006-10-29 krusader_trinity</option></userinput></screen>
       </para>
       <para>Mostly being &gentoo; users, we provide a
       &gentoo-life-ebuild-url; for all those who want to
@@ -384,9 +384,9 @@
       it is also possible to
       &browse-svn-repo-url;.</para>
       <para>To check out the latest &krusader; 1.x for
-      &kde; 3 from SVN: (NOTE: at moment of writing use CVS for krusader_kde3, since krusader_kde3
+      &kde; 3 from SVN: (NOTE: at moment of writing use CVS for krusader_trinity, since krusader_trinity
       is developed in CVS and NOT in SVN, currently you will get an old version in SVN) 
-      <screen><prompt>$</prompt> <userinput><command>svn</command> <option>co https://krusader.svn.sourceforge.net/svnroot/krusader/trunk/krusader_kde3</option></userinput></screen>
+      <screen><prompt>$</prompt> <userinput><command>svn</command> <option>co https://krusader.svn.sourceforge.net/svnroot/krusader/trunk/krusader_trinity</option></userinput></screen>
       To check out the latest &krusader; 2.x
       for &kde; 4 from SVN:
       <screen><prompt>$</prompt> <userinput><command>svn</command> <option>co https://krusader.svn.sourceforge.net/svnroot/krusader/trunk/krusader_kde4</option></userinput></screen>
@@ -443,7 +443,7 @@
 </para>
 
 <para><link linkend="version_scheme">Download</link> the &krusader; sourcecode, unpack and 
-enter the <filename>krusader_kde3</filename> directory.</para>
+enter the <filename>krusader_trinity</filename> directory.</para>
 
 <para> 
 The next command will create <command>./configure</command>
@@ -480,7 +480,7 @@ It's recommended to use enable the full debug, so that you can possible problems
 <title>SuSE</title>
 <para>Install the <link linkend="faqi_missing_libs">build dependencies</link> for &krusader;</para>  
 <para><link linkend="version_scheme">Download</link> the &krusader; sourcecode, unpack and 
-enter the <filename>krusader_kde3</filename> directory. Now you can compile and install &krusader;
+enter the <filename>krusader_trinity</filename> directory. Now you can compile and install &krusader;
 <screen>
 <prompt>$</prompt> <userinput><command>make -f</command> <option>Makefile.cvs</option></userinput>
 <prompt>$</prompt> <userinput><command>./configure</command> <option>--prefix=/opt/krusader --enable-debug=full</option></userinput>
@@ -499,7 +499,7 @@ enter the <filename>krusader_kde3</filename> directory. Now you can compile and
 are installed by your package managment system. 
 Please don't use the <filename>/usr/local</filename> directory as it simply won't work.</para> 
 <para>Install the <link linkend="faqi_missing_libs">build dependencies</link> for &krusader;</para>  
-<para><link linkend="version_scheme">Download</link> the &krusader; sourcecode, unpack and enter the <filename>krusader_kde3</filename> directory. Now you can compile and install &krusader;
+<para><link linkend="version_scheme">Download</link> the &krusader; sourcecode, unpack and enter the <filename>krusader_trinity</filename> directory. Now you can compile and install &krusader;
 <screen>
 <prompt>$</prompt> <userinput><command>make -f</command> <option>Makefile.cvs</option></userinput>
 <prompt>$</prompt> <userinput><command>./configure</command> <option>--prefix=/usr</option></userinput>
@@ -611,7 +611,7 @@ Please don't use the <filename>/usr/local</filename> directory as it simply won'
           <replaceable>&lt;path to your KDE
           installation&gt;</replaceable> &eg; 
           <filename>/usr</filename> or 
-          <filename>/opt/kde3</filename></para>
+          <filename>/opt/trinity</filename></para>
           <para>Normally your distribution will set them for you,
           but experience has shown that some do not. You can easily
           check the values with the 
@@ -845,10 +845,10 @@ Good - your configure finished. Start make now
           the following messages: 
 <screen>
 foo
-make[2]: Leaving directory `/home/source/krusader_kde3/tar'
-make[2]: Entering directory `/home/source/krusader_kde3'
-make[2]: Leaving directory `/home/source/krusader_kde3'
-make[1]: Leaving directory `/home/source/krusader_kde3'
+make[2]: Leaving directory `/home/source/krusader_trinity/tar'
+make[2]: Entering directory `/home/source/krusader_trinity'
+make[2]: Leaving directory `/home/source/krusader_trinity'
+make[1]: Leaving directory `/home/source/krusader_trinity'
 <prompt>bash$</prompt>
 </screen>
           </para>
diff --git a/doc/en/viewer-editor.docbook b/doc/en/viewer-editor.docbook
index b9a845a..70bf28c 100644
--- a/doc/en/viewer-editor.docbook
+++ b/doc/en/viewer-editor.docbook
@@ -621,7 +621,7 @@
           <para></para>
         </listitem>
       </varlistentry>
-      <!-- These entries are gone on my system with kde3.3.2
+      <!-- These entries are gone on my system with trinity.3.2
   
 <varlistentry>
    <term>
diff --git a/doc/ru/faq.docbook b/doc/ru/faq.docbook
index e08ac06..5739d68 100644
--- a/doc/ru/faq.docbook
+++ b/doc/ru/faq.docbook
@@ -400,7 +400,7 @@
 > file in the wrong directory. To solve the problem, just copy the <filename
 >krusaderui.rc</filename
 > file from the package <filename
->krusader_kde3/krusader/krusaderui.rc</filename
+>krusader_trinity/krusader/krusaderui.rc</filename
 > to <filename
 >$KDEDIR/share/apps/krusader/krusaderui.rc</filename
 > and <filename
@@ -909,7 +909,7 @@
 >, <filename
 >kio_krarc.la</filename
 > Ð² <filename class="directory"
->$KDEDIR/lib/kde3</filename
+>$KDEDIR/lib/trinity</filename
 ></para>
         <para
 >ÐšÐ¾Ð¿Ð¸Ñ€ÑƒÐ¹Ñ‚Ðµ <filename
diff --git a/doc/ru/index.docbook b/doc/ru/index.docbook
index 0dfaca9..89cfdad 100644
--- a/doc/ru/index.docbook
+++ b/doc/ru/index.docbook
@@ -126,7 +126,7 @@ since the Entity Backspace is not defined in
 >CVSNEWS</filename
 ></ulink
 >'>
-<!ENTITY docchangelog_url '<ulink url="http://cvs.sourceforge.net/viewcvs.py/krusader/krusader_kde3/doc/ChangeLog?view=markup"
+<!ENTITY docchangelog_url '<ulink url="http://cvs.sourceforge.net/viewcvs.py/krusader/krusader_trinity/doc/ChangeLog?view=markup"
 >Documentation ChangeLog</ulink
 >'>
 <!ENTITY i18n_page_url '<ulink url="http://www.krusader.org/i18n.php"
@@ -187,7 +187,7 @@ since the Entity Backspace is not defined in
 <!ENTITY online_buglist_url '<ulink url="http://sourceforge.net/tracker/?atid=106488&amp;group_id=6488&amp;func=browse"
 >online bug list</ulink
 >'>
-<!ENTITY i18n_credits_url '<ulink url="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/krusader/krusader_kde3/po/"
+<!ENTITY i18n_credits_url '<ulink url="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/krusader/krusader_trinity/po/"
 >more translator credits</ulink
 >'>
 
diff --git a/doc/ru/installation.docbook b/doc/ru/installation.docbook
index 462446c..d7c1b70 100644
--- a/doc/ru/installation.docbook
+++ b/doc/ru/installation.docbook
@@ -330,7 +330,7 @@
 ></listitem>
   <listitem
 ><para
->krusader_kde3: the &kde;3 branch, that we currently use</para
+>krusader_trinity: the &kde;3 branch, that we currently use</para
 ></listitem>
   </itemizedlist
 ></para>
@@ -339,17 +339,17 @@
 >To checkout &krusader; from CVS: <screen
 ><prompt>$</prompt> <userinput><command>cvs</command> <option>-d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader login</option></userinput></screen
 > <screen
-><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader co krusader_kde3</option></userinput></screen
+><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@krusader.cvs.sourceforge.net:/cvsroot/krusader co krusader_trinity</option></userinput></screen
 > (note: updates from within the modules directory do not need the -d parameter)</para>
 
 <para
 >If you want to checkout a specific version of &krusader; from CVS (&eg; &krusader;-1.60.0) : <screen
-><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/krusader co -rversion_1_60_0 krusader_kde3</option></userinput></screen>
+><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/krusader co -rversion_1_60_0 krusader_trinity</option></userinput></screen>
 </para>
 
 <para
 >If you want to checkout a specific date of &krusader; from CVS (&eg; &krusader;-2005-05-23) : <screen
-><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/krusader co -D2005-05-23 krusader_kde3</option></userinput></screen>
+><prompt>$</prompt> <userinput><command>cvs</command> <option>-z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/krusader co -D2005-05-23 krusader_trinity</option></userinput></screen>
 </para>
 
 <para
@@ -368,8 +368,8 @@
 >&subversion_url; will probably used for the &krusader; 2.x series for &kde;4. It's also possible to &browse_svn_repo_url;.</para>
 
 <para
->To checkout the latest &krusader; 1.x for &kde; 3 from SVN: (NOTE: at moment of writing it's recommend to use CVS for krusader_kde3, since krusader_kde3 is developed in CVS and not in SVN) <screen
-><prompt>$</prompt> <userinput><command>svn</command> <option>co https://svn.sourceforge.net/svnroot/krusader/trunk/krusader_kde3</option></userinput></screen
+>To checkout the latest &krusader; 1.x for &kde; 3 from SVN: (NOTE: at moment of writing it's recommend to use CVS for krusader_trinity, since krusader_trinity is developed in CVS and not in SVN) <screen
+><prompt>$</prompt> <userinput><command>svn</command> <option>co https://svn.sourceforge.net/svnroot/krusader/trunk/krusader_trinity</option></userinput></screen
 > To checkout the latest &krusader; 2.x for &kde; 4 from SVN: (NOTE: not yet available at moment of writing) <screen
 ><prompt>$</prompt> <userinput><command>svn</command> <option>co https://svn.sourceforge.net/svnroot/krusader/trunk/krusader_kde4</option></userinput></screen>
   </para>
@@ -520,7 +520,7 @@
 > &eg; <filename
 >/usr</filename
 > or <filename
->/opt/kde3</filename
+>/opt/trinity</filename
 ></para>
 
 <para
@@ -769,10 +769,10 @@ Good - your configure finished. Start make now
 ><prompt>$</prompt> <userinput><command>make</command></userinput></screen
 > This will take about 10 to 40 minutes, if everything goes well it will &eg; end with the following messages: <screen
 >foo
-make[2]: Leaving directory `/home/source/krusader_kde3/tar'
-make[2]: Entering directory `/home/source/krusader_kde3'
-make[2]: Leaving directory `/home/source/krusader_kde3'
-make[1]: Leaving directory `/home/source/krusader_kde3'
+make[2]: Leaving directory `/home/source/krusader_trinity/tar'
+make[2]: Entering directory `/home/source/krusader_trinity'
+make[2]: Leaving directory `/home/source/krusader_trinity'
+make[1]: Leaving directory `/home/source/krusader_trinity'
 <prompt>bash$</prompt>
 </screen>
 </para>
diff --git a/doc/ru/krusader-tools.docbook b/doc/ru/krusader-tools.docbook
index 118c9b8..dcd7f02 100644
--- a/doc/ru/krusader-tools.docbook
+++ b/doc/ru/krusader-tools.docbook
@@ -1989,7 +1989,7 @@
    </listitem>
   </varlistentry>
 
-<!-- These enties are gone on my system with kde3.3.2
+<!-- These enties are gone on my system with trinity.3.2
   
 <varlistentry>
    <term>
diff --git a/doc/update_pot b/doc/update_pot
index 7a8cf41..7a2d513 100755
--- a/doc/update_pot
+++ b/doc/update_pot
@@ -21,7 +21,7 @@
 # * MA 02111-1307, USA.                                                     *
 # ***************************************************************************
 #
-# This script creates *.pot translation template files in the krusader_kde3/doc/i18n folder
+# This script creates *.pot translation template files in the krusader_trinity/doc/i18n folder
 # with xml2pot *.docbook > *.docbook.pot
 
 # Requirements: bash, xml2pot, perl
@@ -49,7 +49,7 @@ for FILENAME in $(ls *.docbook);do
     perl -p -i -e 's/kde-i18n-doc\@kde.org/krusader-i18n\@googlegroups.com/g' ${FILENAME}.pot
 done
 
-# move pot files to folder krusader_kde3/doc/i18n/pot since they don't belong in the english folder
+# move pot files to folder krusader_trinity/doc/i18n/pot since they don't belong in the english folder
 mv *.pot ../i18n/pot
 
 echo NOTE: This script sould only be used by the Documentation i18n coordinator or the Krusader Krew
diff --git a/krusader.spec b/krusader.spec
index 3426d2a..0c2d359 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc doc/actions_tutorial.txt AUTHORS ChangeLog COPYING CVSNEWS FAQ README TODO
 %{_bindir}/krusader
-%{_libdir}/kde3/kio_*.*
+%{_libdir}/trinity/kio_*.*
 %{_datadir}/applications/kde/*krusader*.desktop
 %{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
 %{_datadir}/apps/krusader/
@@ -152,10 +152,10 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Aug 10 2005 Marcin Garski <mgarski[AT]post.pl> 1.60.0-1
 - Updated to version 1.60.0 & clean up for Fedora Extras
 
-* Fri Dec 17 2004 Marcin Garski <mgarski[AT]post.pl> 1.51.fc2kde331
+* Fri Dec 17 2004 Marcin Garski <mgarski[AT]post.pl> 1.51.fc2trinity31
 - Updated to version 1.51
 
-* Sat Nov 11 2004 Marcin Garski <mgarski[AT]post.pl> 1.50.fc2kde331
+* Sat Nov 11 2004 Marcin Garski <mgarski[AT]post.pl> 1.50.fc2trinity31
 - Added Requires:
 
 * Tue Nov 02 2004 Marcin Garski <mgarski[AT]post.pl> 1.50.fc2
diff --git a/krusader/Makefile.am b/krusader/Makefile.am
index bfc36b7..0896fa6 100644
--- a/krusader/Makefile.am
+++ b/krusader/Makefile.am
@@ -114,7 +114,7 @@ krusader_LDFLAGS = $(all_libraries) $(kde_RPATH)
 
 
 # this installes alle the icons in the current dir.
-# see the comment in krusader_kde3/icons/Makefile.am for more info
+# see the comment in krusader_trinity/icons/Makefile.am for more info
 KDE_ICON = AUTO
 
 # How it works (by jonas): 
diff --git a/krusader/UserAction/expander.h b/krusader/UserAction/expander.h
index 3232e16..3ae7f21 100644
--- a/krusader/UserAction/expander.h
+++ b/krusader/UserAction/expander.h
@@ -111,7 +111,7 @@ protected:
 /**
  * The Expander expands the command of an UserAction by replacing all placeholders by thier current values.@n
  * Each placeholder begins with a '%'-sign, followed by one char indicating the panel, followed by a command which may have some paramenter enclosed in brackets and also ends with a '%'-sign.
- * Examples are %aPath% or %rBookmark("/home/jonas/src/krusader_kde3", "yes")%.@n
+ * Examples are %aPath% or %rBookmark("/home/jonas/src/krusader_trinity", "yes")%.@n
  * The panel-indicator has to be either 'a' for the active, 'o' for the other, 'r' for the right, 'l' for the left or '_' for panel-independence.
  * 
  * Currently sopported are these commands can be ordered in three groups (childs are the parameter in the right order):