[utilities/krusader] doc: Change wording of 'directory' to 'folder' in docbooks, following what Frederik Schwarzer did

Toni Asensi Esteve null at kde.org
Sun Sep 19 09:43:10 BST 2021


Git commit 3453c9670dbff64c62e556cab30e12a001a0d790 by Toni Asensi Esteve.
Committed on 19/09/2021 at 08:41.
Pushed by asensi into branch 'master'.

Change wording of 'directory' to 'folder' in docbooks, following what Frederik Schwarzer did

In the documentation, users may search for a string like "Compare Folders"
(https://bugs.kde.org/show_bug.cgi?id=441380#c3 can be seen) but what
it's written is "Compare Directories", so the documentation has to be changed,
applying there what Frederik Schwarzer (@schwarzer) did on [Change wording
of Directory to Folder for user-visible strings](https://invent.kde.org/
utilities/krusader/-/commit/9bf7863618138efe028e94d6d0686176bd865649).

That way, e.g. in the handbook: users will see texts (like "Compare Folders") as
users see those texts in Krusader.

Revision: https://invent.kde.org/utilities/krusader/-/merge_requests/69

M  +5    -5    doc/archives.docbook
M  +17   -17   doc/basic-functions.docbook
M  +3    -3    doc/bookmarks.docbook
M  +5    -5    doc/compare.docbook
M  +3    -3    doc/configuration-files.docbook
M  +1    -1    doc/diskusage.docbook
M  +3    -3    doc/faq.docbook
M  +1    -1    doc/features.docbook
M  +1    -1    doc/glossary.docbook
M  +4    -4    doc/introduction.docbook
M  +18   -18   doc/keyboard-commands.docbook
M  +2    -2    doc/locate.docbook
M  +4    -4    doc/man-krusader.1.docbook
M  +28   -28   doc/menu-commands.docbook
M  +1    -1    doc/mount.docbook
M  +7    -7    doc/occupied-space.docbook
M  +7    -7    doc/remote-connections.docbook
M  +9    -9    doc/search.docbook
M  +2    -2    doc/splitter.docbook
M  +15   -15   doc/synchronizer.docbook
M  +31   -31   doc/user-interface.docbook
M  +2    -2    doc/useraction-xml.docbook
M  +2    -2    doc/useractions.docbook
M  +6    -6    doc/vfs.docbook
M  +1    -1    doc/viewer-editor.docbook

https://invent.kde.org/utilities/krusader/commit/3453c9670dbff64c62e556cab30e12a001a0d790

diff --git a/doc/archives.docbook b/doc/archives.docbook
index 9c808b65..bbaadf59 100644
--- a/doc/archives.docbook
+++ b/doc/archives.docbook
@@ -12,7 +12,7 @@
   <sect2 id="browsing-archives">
     <title>Browsing Archives</title>
     <para>The <link linkend="vfs">Virtual file systems (VFS)</link> allows you to browse archives as
-    if it was a directory. Currently &krusader; supports
+    if it was a folder. Currently &krusader; supports
     the following archives types: ace, arj, bzip2, deb, gzip, iso,
     lha, rar, rpm, tar, xz, zip, and 7-zip and supports the following
     passworded archives: arj, ace, rar and zip. Passwords can be
@@ -48,10 +48,10 @@
       <listitem>
         <para>The command line (if visible) will not follow you
         inside the archive but will point to the archive
-        directory.</para>
+        folder.</para>
       </listitem>
       <listitem>
-        <para>Before any action is performed on files/directories
+        <para>Before any action is performed on files/folders
         inside the archive, they must be extracted. The archive
         will be repacked when you leave it or when
         &krusader; detects that extracted files have
@@ -78,7 +78,7 @@
     <keycombo action="simul">&Alt;&Shift;
     <keycap>U</keycap></keycombo>. &krusader; will ask
     you where to put the extracted files. The default location is
-    the inactive panel directory. If you do not cancel the
+    the inactive panel folder. If you do not cancel the
     operation, &krusader; will try to unpack all the
     selected files in the inactive panel.</para>
     <para>If you only want to extract a part of the archive, then 
@@ -107,7 +107,7 @@
     <para>To add files to an existing archive(s), open the archive
     in one panel and the files to be copied in the other panel,
     then simply copy the files into the archive in exactly the same
-    way you copy files into a <quote>normal</quote> directory.
+    way you copy files into a <quote>normal</quote> folder.
     The pack operation can be put in a <link linkend="queue">queue</link>.</para>
   </sect2>
   <sect2 id="test-archive">
diff --git a/doc/basic-functions.docbook b/doc/basic-functions.docbook
index 3ef383b6..6b757bcf 100644
--- a/doc/basic-functions.docbook
+++ b/doc/basic-functions.docbook
@@ -121,11 +121,11 @@
       </note>
       <para>Selecting is a skill you need to master in order to get
       the most out of &krusader;. Since the Tree Panel allows select 
-      only one directory at a time, this paragraph mainly explains how
+      only one folder at a time, this paragraph mainly explains how
       to select files in the List Panel.</para>
       <para>Moving the cursor is easy. Left-clicking on a file or
-      directory (referred to herein as <quote>elements</quote> meaning files and
-      directories) will select it. Here are some useful pointers
+      folder (referred to herein as <quote>elements</quote> meaning files and
+      folders) will select it. Here are some useful pointers
       that will make &krusader; even easier to use (assuming you are
       using &krusader;'s Mouse Selection Mode): 
       <itemizedlist>
@@ -133,7 +133,7 @@
           <para>The 
           &Space; and &Ins; keys will toggle the selection of
           the file under the cursor without affecting the selection
-          of other files/directories, the cursor will go one
+          of other files/folders, the cursor will go one
           position down.</para>
         </listitem>
         <listitem>
@@ -146,7 +146,7 @@
           <keycombo action="simul">&Ctrl;
           <keycap>Left Clicking</keycap></keycombo> will toggle the
           selection of the file under the cursor without affecting
-          the selection of other files/directories.</para>
+          the selection of other files/folders.</para>
         </listitem>
         <listitem>
           <para>
@@ -180,7 +180,7 @@
       <title>Executing Commands</title>
       <para>There is not a lot to say here, all you need to do is
       select some files (if you do not, &krusader; will
-      operate on the file(s) or directory(s) that have the focus),
+      operate on the file(s) or folder(s) that have the focus),
       choose a 
       <link linkend="menu-commands">Command</link> from the Menu Bar
       or use a Keyboard Shortcut (or the Right Click Menu) and the
@@ -260,7 +260,7 @@
         </listitem>
         <listitem>
           <para><link linkend="list_panel">List Panel</link> on a file or
-          directory</para>
+          folder</para>
         </listitem>
         <listitem>
           <para><link linkend="cmdline">Command Line</link> (undo, paste, text
@@ -341,22 +341,22 @@
           </textobject>
         </mediaobject>
       </figure>
-      <para>To copy or move files/directories just select them and
+      <para>To copy or move files/folders just select them and
       press 
       <keycap>F5</keycap> to 
       copy or
       <keycap>F6</keycap> to 
       move them. &krusader; tries to preserve the time of
-      modification. When copying a directory owner is changed to the user which
-      copies the directory, group is changed to the default group of the user.
+      modification. When copying a folder owner is changed to the user which
+      copies the folder, group is changed to the default group of the user.
       When copying a file owner is changed to the user which copies the file,
       group is changed to default group of the user, and permissions are
       preserved. The owner, the group and the permissions are preserved when
-      moving file or directory. When copying or moving files/directories a dialog
+      moving file or folder. When copying or moving files/folders a dialog
       appears and allows you to choose the operation destination.
-      The default destination is the other-panel browsed directory. If you enter
+      The default destination is the other-panel browsed folder. If you enter
       a partial &URL;, &krusader; will use the current
-      panel directory as the &URL; base.</para>
+      panel folder as the &URL; base.</para>
     </sect2>
     <sect2 id="queue">
       <title>Queue manager</title> 
@@ -378,15 +378,15 @@
     </sect2>
     <sect2 id="deleting">
       <title>Deleting - move to &plasma; Trash</title>
-      <para>Deleting files/directories is done by selecting them and pressing <keycap>F8</keycap> or <keycap>Delete</keycap>.
+      <para>Deleting files/folders is done by selecting them and pressing <keycap>F8</keycap> or <keycap>Delete</keycap>.
       By <link linkend="konfig-general">default</link> it will be moved to &plasma; Trash.
       You can open the &plasma; Trash with the Trash icon in the <link linkend="main_toolbar">Main Toolbar</link> or with 
       the <filename>trash:/</filename> KIO slave.
-      Physically &plasma; Trash is located in <filename>~/.local/share/Trash/</filename> or <filename>Trash</filename> in the subdirectory in user home directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command.
+      Physically &plasma; Trash is located in <filename>~/.local/share/Trash/</filename> or <filename>Trash</filename> in the subfolder in user home folder which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command.
       <keycombo action="simul">&Ctrl;
       <keycap>Delete</keycap></keycombo> will delete the file
       permanently. A dialog will ask for your confirmation and will
-      warn you when deleting non-empty directories. Of course only
+      warn you when deleting non-empty folders. Of course only
       operations that are permitted to do by the Operating
       System will be performed - you will be notified otherwise. If
       you do not wish to see the confirmation dialogs, you can
@@ -419,7 +419,7 @@
       Right-clicking on a regular file will give
 	you the option <menuchoice><guisubmenu>Link Handling</guisubmenu> <guimenuitem>New Symlink...</guimenuitem></menuchoice>. A dialog will prompt
       you to enter a symlink name. That symlink will point to the
-      file/directory you right-clicked on. If the file you
+      file/folder you right-clicked on. If the file you
       right-clicked on is a symlink, you will also be presented
       with the <menuchoice><guisubmenu>Link Handling</guisubmenu> <guimenuitem>Redirect Link</guimenuitem></menuchoice> option that will allow you to change
       the link target.</para>
diff --git a/doc/bookmarks.docbook b/doc/bookmarks.docbook
index 3a2c35e9..9e168195 100644
--- a/doc/bookmarks.docbook
+++ b/doc/bookmarks.docbook
@@ -206,12 +206,12 @@
         <keycap>J</keycap></keycombo> brings you back to your
         starting position when you did create a new tab in the
         panel window. This feature is very handy if you go deep
-        into a directory tree, then you can return with one action
+        into a folder tree, then you can return with one action
         to the starting point. With 
         <guilabel>Set jump back point here</guilabel> or 
         <keycombo action="simul">
         &Ctrl;&Shift;
-        <keycap>J</keycap></keycombo> sets the current directory as
+        <keycap>J</keycap></keycombo> sets the current folder as
         a jump back point.</para>
       </listitem>
     </itemizedlist></para>
@@ -238,7 +238,7 @@
             This local file exists only if you have edited &krusader; bookmarks. It will be created after the first run of <application>KeditBookmarks</application> from &krusader;.
         </para>
         <para>
-            The default system bookmarks are stored in the <filename>kfileplaces/bookmarks.xml</filename> file in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command.
+            The default system bookmarks are stored in the <filename>kfileplaces/bookmarks.xml</filename> file in the folder which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command.
         </para>
     </note>
     <para>
diff --git a/doc/compare.docbook b/doc/compare.docbook
index 9cd8bf95..fe5b7da1 100644
--- a/doc/compare.docbook
+++ b/doc/compare.docbook
@@ -8,7 +8,7 @@
   <title>Compare</title>
   <para>&krusader; contains several compare functions: 
   <guimenuitem>Compare by Content</guimenuitem>, 
-  <guimenuitem>Compare Directories</guimenuitem> and the 
+  <guimenuitem>Compare Folders</guimenuitem> and the 
   <link linkend="synchronizer">Synchronizer</link> compare
   function.</para>
   <sect2 id="compare-content">
@@ -29,15 +29,15 @@
     <ulink url="http://furius.ca/xxdiff/"><application>xxdiff</application></ulink> are supported.</para>
   </sect2>
   <sect2 id="compare-dir">
-    <title>Compare Directories</title>
+    <title>Compare Folders</title>
     <indexterm>
       <primary>Compare</primary>
-      <secondary>Directories</secondary>
+      <secondary>Folders</secondary>
     </indexterm>
     <para>Compare the files of each panel by using 
       <menuchoice>
         <guimenu>Edit</guimenu>
-        <guimenuitem>Compare Directories</guimenuitem>
+        <guimenuitem>Compare Folders</guimenuitem>
       </menuchoice>.
     By default newer and single files will be selected
     in each panel, this behaviour can be changed in the 
@@ -57,7 +57,7 @@
         <listitem>
           <para>Configures the 
           <guimenuitem>Compare
-          Directories</guimenuitem> function.</para>
+          Folders</guimenuitem> function.</para>
           <itemizedlist>
             <listitem>
               <para>
diff --git a/doc/configuration-files.docbook b/doc/configuration-files.docbook
index 7d9cacd6..28346c73 100644
--- a/doc/configuration-files.docbook
+++ b/doc/configuration-files.docbook
@@ -19,7 +19,7 @@
   <para>Location: 
   <filename>/usr/share/kxmlgui5/krusader/krusaderui.rc</filename>, or 
   <filename>
-  ~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename>, or <filename>kxmlgui5/krusader/krusaderui.rc</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
+  ~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename>, or <filename>kxmlgui5/krusader/krusaderui.rc</filename> in the folder which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
   <para>
     <emphasis role="bold">krusaderrc</emphasis>
   </para>
@@ -109,7 +109,7 @@
   uses the <ulink url="http://grail.sourceforge.net/info/xbel.html">XBEL standard</ulink>.</para>
   <para>Location: 
   <filename>
-  ~/.local/share/krusader/krbookmarks.xml</filename> or <filename>krusader/krbookmarks.xml</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
+  ~/.local/share/krusader/krbookmarks.xml</filename> or <filename>krusader/krbookmarks.xml</filename> in the folder which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
   <para>
     <emphasis role="bold">useractions.xml</emphasis>
   </para>
@@ -117,7 +117,7 @@
   configuration.</para>
   <para>Location: 
   <filename>
-  ~/.local/share/krusader/useractions.xml</filename> or <filename>krusader/useractions.xml</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
+  ~/.local/share/krusader/useractions.xml</filename> or <filename>krusader/useractions.xml</filename> in the folder which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
   <para>
     <emphasis role="bold">useraction-examples.xml</emphasis>
   </para>
diff --git a/doc/diskusage.docbook b/doc/diskusage.docbook
index f8c1e050..06ef967a 100644
--- a/doc/diskusage.docbook
+++ b/doc/diskusage.docbook
@@ -49,7 +49,7 @@
     <listitem>
       <para>
       <keycombo action="simul">&Shift;
-      <keycap>Arrow Up</keycap></keycombo>: Up one directory</para>
+      <keycap>Arrow Up</keycap></keycombo>: Up one folder</para>
     </listitem>
     <listitem>
       <para>
diff --git a/doc/faq.docbook b/doc/faq.docbook
index 9dfcb17f..ca9ef148 100644
--- a/doc/faq.docbook
+++ b/doc/faq.docbook
@@ -257,7 +257,7 @@
           <para>
           &Samba; ISO 8859-x codepage /
           What to do if &krusader; does not read shared
-          directories containing special international
+          folders containing special international
           characters?</para>
         </question>
         <answer>
@@ -372,7 +372,7 @@
           <para>I get 
           <errorcode>&FTP; protocol not supported by
           &krusader;</errorcode> error when trying to
-          open a remote &FTP; directory, what to
+          open a remote &FTP; folder, what to
           do?</para>
         </question>
         <answer>
@@ -757,7 +757,7 @@
        Run Krusader, with disabled crashhandler.
        <screen><prompt>$</prompt> <userinput><command>krusader</command> <option>--nocrashhandler</option></userinput></screen>
 
-       On a crash you will get a <filename>.core</filename> file, usually in your home directory.
+       On a crash you will get a <filename>.core</filename> file, usually in your home folder.
 
        Run <ulink url="https://sourceware.org/gdb/">gdb</ulink>, the GNU Project Debugger
        
diff --git a/doc/features.docbook b/doc/features.docbook
index 0093de25..d94e3ccc 100644
--- a/doc/features.docbook
+++ b/doc/features.docbook
@@ -161,7 +161,7 @@
           <listitem>
             <para><keycap>F9</keycap> opens a 
             <link linkend="tools-menu">Terminal Window</link> in the
-            current directory.</para>
+            current folder.</para>
           </listitem>
           <listitem>
             <para>Easy editing of 
diff --git a/doc/glossary.docbook b/doc/glossary.docbook
index dae26e30..52ccb2a5 100644
--- a/doc/glossary.docbook
+++ b/doc/glossary.docbook
@@ -337,7 +337,7 @@
       shares, ISO &CD;/&DVD; images, RPM catalogs, &etc;), which allows
       the user to access all the information in these divergent
       types of file systems transparently - just like entering an
-      ordinary sub-directory! &krusader; supports
+      ordinary sub-folder! &krusader; supports
       several <link linkend="vfs">Virtual file systems (VFS)</link>.</para>
     </glossdef>
   </glossentry>
diff --git a/doc/introduction.docbook b/doc/introduction.docbook
index 0ed5b549..1d6f54fb 100644
--- a/doc/introduction.docbook
+++ b/doc/introduction.docbook
@@ -16,7 +16,7 @@
     you could possibly want.</para>
     <para>Krusader also includes extensive archive handling,
     mounted file system support, &FTP;, advanced search
-    module, viewer/editor, directory synchronization, file content
+    module, viewer/editor, folder synchronization, file content
     comparisons, powerful batch renaming and much, much more.
     &krusader; supports archive formats: ace, arj, bzip2, deb, gzip, iso, lha,
     rar, rpm, tar, zip and 7-zip and handles other
@@ -85,7 +85,7 @@
     &CD;/&DVD; images, RPM catalogs, &etc;), which allow the
     user to access all the information in these divergent types of
     file systems transparently - just like entering an ordinary
-    sub-directory. Files can then be copied or moved around (except
+    sub-folder. Files can then be copied or moved around (except
     ISO, rpm, tar.gz) between these data sources/containers
     effortlessly. &krusader; currently supports VFSs for
     all popular and some specialized types of archives (ace, arj,
@@ -109,8 +109,8 @@
     <para>Advanced users benefit greatly from being able to carry
     out clerical tasks effortlessly, without distraction from the
     real task at hand. Convenient shortcut keys enable the user to
-    navigate directory trees with ease, create multiple tabbed
-    directory views simultaneously, and access fully functional
+    navigate folder trees with ease, create multiple tabbed
+    folder views simultaneously, and access fully functional
     history lists. Due to efficient programming and low system
     overhead, &krusader; is perhaps the most responsive
     all around system management tool used to access the full
diff --git a/doc/keyboard-commands.docbook b/doc/keyboard-commands.docbook
index ca44e1c6..87cd08e2 100644
--- a/doc/keyboard-commands.docbook
+++ b/doc/keyboard-commands.docbook
@@ -23,16 +23,16 @@
     <para>After starting &krusader;, the keyboard action can
     begin. Use <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo> to jump to the
     <link linkend="list_panel">Location Toolbar</link> where you can type the
-    desired directory. After <keycombo action="simul">&Ctrl;&Down;</keycombo>
+    desired folder. After <keycombo action="simul">&Ctrl;&Down;</keycombo>
     you are in the
     <link linkend="termemu">Terminal emulator</link> and you can type any command you
     desire, provided that the <link linkend="konfig-startup">terminal is shown</link>.
     Use <keycombo action="simul">&Ctrl;&Up;</keycombo>
     to jump back to the active panel. If
-    you want to jump to a file or directory that starts with <literal>f</literal>,
+    you want to jump to a file or folder that starts with <literal>f</literal>,
     then simply press <keycap>f</keycap> on the keyboard to use the
     <link linkend="quicksearch">search bar</link>. Use the &Enter; key to execute
-    the file or to open a directory that has the focus. Be sure to
+    the file or to open a folder that has the focus. Be sure to
     remember the Function Keys - <keycap>F3</keycap> to View, <keycap>F4</keycap> to Edit, 
     <keycap>F5</keycap> to Copy, <keycombo action="simul">&Alt;&Shift;<keycap>U</keycap></keycombo> to Unpack, &etc;</para>
     <para>You can also perform several operations with the
@@ -530,7 +530,7 @@
               </para>
             </entry>
             <entry>
-              <para><link linkend="compare-dir">Compare Directories</link></para>
+              <para><link linkend="compare-dir">Compare Folders</link></para>
             </entry>
           </row>		  
            <row>
@@ -786,7 +786,7 @@
               </para>
             </entry>
             <entry>
-              <para>Select directory dialog to open this directory
+              <para>Select folder dialog to open this folder
               in the panel.</para>
             </entry>
           </row>
@@ -981,7 +981,7 @@
               </para>
             </entry>
             <entry>
-              <para>Jump to the Home directory.</para>
+              <para>Jump to the Home folder.</para>
             </entry>
           </row>
           <row>
@@ -994,7 +994,7 @@
               </keycombo></para>
             </entry>
             <entry>
-              <para>Focus a file or directory on the left panel,
+              <para>Focus a file or folder on the left panel,
               press 
               <keycombo action="simul">&Ctrl;
               &Left;</keycombo> and the right
@@ -1006,8 +1006,8 @@
                   <link linkend="panels">panel</link>.</para>
                 </listitem>
                 <listitem>
-                  <para>on a directory: refreshes the right panel
-                  with the contents of the directory.</para>
+                  <para>on a folder: refreshes the right panel
+                  with the contents of the folder.</para>
                 </listitem>
               </itemizedlist>For the right panel: press 
               <keycombo action="simul">&Ctrl;
@@ -1023,7 +1023,7 @@
               </para>
             </entry>
             <entry>
-              <para>Jump to the Root directory.</para>
+              <para>Jump to the Root folder.</para>
             </entry>
           </row>
           <row>
@@ -1034,7 +1034,7 @@
               </para>
             </entry>
             <entry>
-              <para>Up one directory.</para>
+              <para>Up one folder.</para>
             </entry>
           </row>
 	  <row>
@@ -1045,7 +1045,7 @@
               </para>
             </entry>
             <entry>
-              <para>Go to the directory from other panel.</para>
+              <para>Go to the folder from other panel.</para>
             </entry>
           </row>
 	  <row>
@@ -1403,7 +1403,7 @@
             </entry>
             <entry>
               <para>Move to the lower part in the current
-              directory.</para>
+              folder.</para>
             </entry>
           </row>
           <row>
@@ -1473,7 +1473,7 @@
               <para>
               <link linkend="browsing-archives">On an archive
               file:</link> browse the archive as if it was a
-              directory.</para>
+              folder.</para>
             </entry>
           </row>
           <row>
@@ -1524,7 +1524,7 @@
               <link linkend="selecting-files">On a
               file:</link> toggle the selection of the file down one
               position without affecting the selection of other
-              files/directories.</para>
+              files/folders.</para>
             </entry>
           </row>
           <row>
@@ -1532,7 +1532,7 @@
               <para>&Backspace;</para>
             </entry>
             <entry>
-              <para>One directory up.</para>
+              <para>One folder up.</para>
             </entry>
           </row>
           <row>
@@ -1644,7 +1644,7 @@
               </para>
             </entry>
             <entry>
-              <para>Insert current file / directory name without
+              <para>Insert current file / folder name without
               path to current command line position.</para>
             </entry>
           </row>
@@ -1656,7 +1656,7 @@
               </para>
             </entry>
             <entry>
-              <para>Insert current file / directory with full path
+              <para>Insert current file / folder with full path
               name to current command line position.</para>
             </entry>
           </row>
diff --git a/doc/locate.docbook b/doc/locate.docbook
index 37c67c52..9e804ae2 100644
--- a/doc/locate.docbook
+++ b/doc/locate.docbook
@@ -12,7 +12,7 @@
   <para>&krusader; has a &GUI; front end for
   the 
   <command>locate</command> command (findutils). Locate is used for
-  fast file searching not from a directory but a database. The
+  fast file searching not from a folder but a database. The
   package contains among other files, 
   <command>locate</command> and 
   <command>updatedb</command>. <command>updatedb</command> goes through the local
@@ -76,7 +76,7 @@
   <para>Results window 
   <itemizedlist>
     <listitem>
-      <para>Double-click on an item: steps to its directory, makes
+      <para>Double-click on an item: steps to its folder, makes
       the item visible and closes the locate dialog.</para>
     </listitem>
     <listitem>
diff --git a/doc/man-krusader.1.docbook b/doc/man-krusader.1.docbook
index 37a29e70..d8f5918a 100644
--- a/doc/man-krusader.1.docbook
+++ b/doc/man-krusader.1.docbook
@@ -47,7 +47,7 @@ similar to Midnight or Total Commander.
 It provides all the file management features you could possibly want.
 Plus: extensive archive handling,
 mounted filesystem support, &FTP;, advanced search module,
-viewer/editor, directory synchronization (disabled by default), file content comparisons,
+viewer/editor, folder synchronization (disabled by default), file content comparisons,
 powerful batch renaming and much much more.
 It supports the following archive formats: ace, arj, bzip2, deb, 
 gzip, iso, lha, rar, rpm, tar, xz, zip, and 7-zip
@@ -132,13 +132,13 @@ panel</para>
 
 <para><filename>~/.config/krusaderrc</filename></para>
 
-<para><filename>~/.local/share/krusader/krbookmarks.xml</filename> or <filename>krusader/krbookmarks.xml</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
+<para><filename>~/.local/share/krusader/krbookmarks.xml</filename> or <filename>krusader/krbookmarks.xml</filename> in the folder which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
 
-<para><filename>~/.local/share/krusader/useractions.xml</filename> or <filename>krusader/useractions.xml</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
+<para><filename>~/.local/share/krusader/useractions.xml</filename> or <filename>krusader/useractions.xml</filename> in the folder which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
 
 <para><filename>/usr/share/kxmlgui5/krusader/krusaderui.rc</filename></para>
 
-<para><filename>~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename> or <filename>kxmlgui5/krusader/krusaderui.rc</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
+<para><filename>~/.local/share/kxmlgui5/krusader/krusaderui.rc</filename> or <filename>kxmlgui5/krusader/krusaderui.rc</filename> in the folder which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command</para>
 
 </refsect1>
 
diff --git a/doc/menu-commands.docbook b/doc/menu-commands.docbook
index 7450006a..9d2e6415 100644
--- a/doc/menu-commands.docbook
+++ b/doc/menu-commands.docbook
@@ -25,8 +25,8 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Creates a new text file in the current directory,
-          unless another directory is specified. The new file is
+          <para>Creates a new text file in the current folder,
+          unless another folder is specified. The new file is
           opened for editing after it is created.</para>
         </listitem>
       </varlistentry>
@@ -104,7 +104,7 @@
         </term>
         <listitem>
           <para>Copy the currently selected
-          files or directories to the other panel.</para>
+          files or folders to the other panel.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -120,7 +120,7 @@
         <listitem>
           <para>Opens a dialog to 
           <link linkend="copying">move</link> the currently selected
-          files or directories to a specified location.</para>
+          files or folders to a specified location.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -137,7 +137,7 @@
         <listitem>
           <para>Creates a 
           <link linkend="pack-archive">new archive</link> of all the
-          selected files and directories in the active
+          selected files and folders in the active
           panel.</para>
         </listitem>
       </varlistentry>
@@ -213,7 +213,7 @@
             </listitem>
             <listitem>
               <para>Copying/moving a list of files to another
-              directory</para>
+              folder</para>
             </listitem>
             <listitem>
               <para>Convert filenames to upper/lower case</para>
@@ -240,7 +240,7 @@
               KRename's features</para>
             </listitem>
             <listitem>
-              <para>Renaming directories recursively</para>
+              <para>Renaming folders recursively</para>
             </listitem>
             <listitem>
               <para>Support for KFilePlugins</para>
@@ -331,7 +331,7 @@
         </term>
         <listitem>
           <para>Closes &krusader; and cleans up the
-          temporary directory, the same as pressing 
+          temporary folder, the same as pressing 
           <keycap>F10</keycap> key.</para>
         </listitem>
       </varlistentry>
@@ -389,7 +389,7 @@
           <para>
           <link linkend="copying">Pastes</link> previously cut or
           copied items from the clipboard to the current
-          directory.</para>
+          folder.</para>
         </listitem>
       </varlistentry>
 <!--
@@ -491,8 +491,8 @@
         </term>
         <listitem>
           <para>Selects all files in the active panel. You can also
-          select all directories by activating the 
-          <guilabel>Autoselect directories</guilabel> option in the
+          select all folders by activating the 
+          <guilabel>Autoselect folders</guilabel> option in the
           <link linkend="konfig-panel">Konfigurator Panel page</link>.</para>
         </listitem>
       </varlistentry>
@@ -564,12 +564,12 @@
               <keycap>C</keycap></keycombo>
             </shortcut>
             <guimenu>Edit</guimenu>
-            <guimenuitem>Compare Directories</guimenuitem>
+            <guimenuitem>Compare Folders</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
           <para>Toggles &krusader;
-          <link linkend="compare-dir">Compare Directories</link> function.</para>
+          <link linkend="compare-dir">Compare Folders</link> function.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -581,7 +581,7 @@
         </term>
         <listitem>
           <para>Configures the 
-          <guimenuitem>Compare Directories</guimenuitem> function.</para>
+          <guimenuitem>Compare Folders</guimenuitem> function.</para>
           <itemizedlist>
             <listitem>
               <para>
@@ -657,7 +657,7 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Navigates to the parent directory of the active
+          <para>Navigates to the parent folder of the active
           panel.</para>
         </listitem>
       </varlistentry>
@@ -673,7 +673,7 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Navigates to the previously viewed directory in the
+          <para>Navigates to the previously viewed folder in the
           active panel.</para>
         </listitem>
       </varlistentry>
@@ -689,7 +689,7 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Navigates to the next viewed directory in the
+          <para>Navigates to the next viewed folder in the
 	    active panel. Becomes available only if <menuchoice><guimenu>Go</guimenu>
 	    <guimenuitem>Back</guimenuitem></menuchoice> was used beforehand.</para>
         </listitem>
@@ -706,7 +706,7 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Navigates to the home directory of the current
+          <para>Navigates to the home folder of the current
           user.</para>
         </listitem>
       </varlistentry>
@@ -722,7 +722,7 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Navigates to the root directory of the
+          <para>Navigates to the root folder of the
           system.</para>
         </listitem>
       </varlistentry>
@@ -738,7 +738,7 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Displays a listing of frequently viewed directories
+          <para>Displays a listing of frequently viewed folders
           from which you may navigate to one by double-clicking on
           it.</para>
         </listitem>
@@ -756,8 +756,8 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Sets the current directory as a <quote>jump back</quote> point.
-          To navigate to this directory quickly, select the <guimenuitem>Jump
+          <para>Sets the current folder as a <quote>jump back</quote> point.
+          To navigate to this folder quickly, select the <guimenuitem>Jump
           Back</guimenuitem> command from the <guimenu>Go</guimenu> menu.</para>
         </listitem>
       </varlistentry>
@@ -894,7 +894,7 @@
         <listitem>
           <para>Allows you to install a custom filter on the
           &krusader; panel. Only files that match the
-          filter pattern(s) and directories will be displayed. Do
+          filter pattern(s) and folders will be displayed. Do
           not forget to deactivate the custom filter after use, or
           some files may not be visible.</para>
         </listitem>
@@ -1075,7 +1075,7 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Backups current file in current directory and asks the user for a new filename. 
+          <para>Backups current file in current folder and asks the user for a new filename. 
                 By default <literal role="extension">.old</literal> is appended to the original filename.</para>
         </listitem>
       </varlistentry>
@@ -1136,7 +1136,7 @@
           <para>When this action is turned on, the main sorting key
           in the &krusader; panel becomes the file size.
           This is useful for determining the largest files in a
-          particular directory.</para>
+          particular folder.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -1213,7 +1213,7 @@
           <para>The <link linkend="synchronizer">Synchronize Folders</link> function compares the
           left and right panels and shows the differences between
           them. After the compare function, you can move
-          files/directories so that they can be
+          files/folders so that they can be
           synchronized.</para>
         </listitem>
       </varlistentry>
@@ -1299,8 +1299,8 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Opens a terminal window in the default directory
-          (usually your home directory). You can choose your
+          <para>Opens a terminal window in the default folder
+          (usually your home folder). You can choose your
           favorite terminal application in the
           <link linkend="konfig-general">Konfigurator General page</link>.</para>
         </listitem>
diff --git a/doc/mount.docbook b/doc/mount.docbook
index 9fdf1f05..a43d23fd 100644
--- a/doc/mount.docbook
+++ b/doc/mount.docbook
@@ -14,7 +14,7 @@
   MountMan displays its name (which is the actual device name - &ie; <filename
   class="directory">/dev/sda1</filename> for a first partition on first
   <hardware>HDD</hardware>), its type (ext4, ext3, ntfs, vfat, ReiserFS...)
-  and its mount point on your system (the directory on which the file system
+  and its mount point on your system (the folder on which the file system
   is mounted).</para>
   <para>If you want filter out non-removable devices from the list,
   just check the item <guilabel>Show only removable devices</guilabel>
diff --git a/doc/occupied-space.docbook b/doc/occupied-space.docbook
index de21897e..5285eed9 100644
--- a/doc/occupied-space.docbook
+++ b/doc/occupied-space.docbook
@@ -11,27 +11,27 @@
   </indexterm>
   <!-- Thanks to Heiner Eichmann -->
   <para>There are two ways to calculate the occupied space of
-  files/directories.</para>
+  files/folders.</para>
   <itemizedlist>
     <listitem>
       <para>Pressing the 
-      configurable shortcut for the <guilabel>Calculate occupied space</guilabel> on a directory under the cursor
+      configurable shortcut for the <guilabel>Calculate occupied space</guilabel> on a folder under the cursor
       instantly calculates the occupied size.</para>
     </listitem>
     <listitem>
       <para>To calculate how much disk space is occupied by the
-      selected files and directories in the active panel select 
+      selected files and folders in the active panel select 
         <menuchoice>
           <guimenu>Edit</guimenu>
           <guimenuitem>Calculate Occupied Space</guimenuitem>
         </menuchoice>.
       After a small delay, a dialog box will be
       displayed with total occupied space and the number of files
-      and directories you selected. The space occupied by every
-      selected directory will be shown as if the user just pressed 
-      configurable shortcut on those directories. If the active
+      and folders you selected. The space occupied by every
+      selected folder will be shown as if the user just pressed 
+      configurable shortcut on those folders. If the active
       panel is browsing an archive, the numbers will apply to the
-      unpacked size of the selected files and directories, not
+      unpacked size of the selected files and folders, not
       their compressed size. After the calculation the selection
       state will be toggled and the cursor will move one step
       downwards.</para>
diff --git a/doc/remote-connections.docbook b/doc/remote-connections.docbook
index 83cb267b..bb36392a 100644
--- a/doc/remote-connections.docbook
+++ b/doc/remote-connections.docbook
@@ -22,7 +22,7 @@
     <listitem>
       <para>
         <userinput>
-          <command>ftp://</command><replaceable>public.ftpserver.org/directory/</replaceable>
+          <command>ftp://</command><replaceable>public.ftpserver.org/folder/</replaceable>
         </userinput>
       </para>
     </listitem>
@@ -43,7 +43,7 @@
     <listitem>
       <para>
         <userinput>
-          <command>ftp://</command><replaceable>username at my.server.org:21/directory/</replaceable>
+          <command>ftp://</command><replaceable>username at my.server.org:21/folder/</replaceable>
         </userinput>
       </para>
     </listitem>
@@ -57,7 +57,7 @@
     <listitem>
       <para>
         <userinput>
-          <command>ftp://</command><replaceable>username at proxyusername:password at proxipassword@hostname/directory</replaceable>
+          <command>ftp://</command><replaceable>username at proxyusername:password at proxipassword@hostname/folder</replaceable>
         </userinput>
       </para>
     </listitem>
@@ -105,8 +105,8 @@
       window.</para>
     </listitem>
     <listitem>
-      <para>You can bookmark a directory on a remote host and
-      return to this directory from the bookmark button on the top
+      <para>You can bookmark a folder on a remote host and
+      return to this folder from the bookmark button on the top
       corner of your panel just like in a web browser.</para>
     </listitem>
   </itemizedlist>
@@ -191,7 +191,7 @@ Everything is installed, now let's do some configuration. First, we need our ser
 That is why we installed avahi-daemon: it represents your machine on local network and allows other applications 
 to publish services they provide. Avahi-daemon comes with example <filename>ssh.service</filename> configuration 
 file found in <filename class="directory">/usr/share/doc/avahi-daemon/examples</filename>. In order to get the service to be 
-announced on LAN we need to copy this file to <filename class="directory">/etc/avahi/services</filename> directory: 
+announced on LAN we need to copy this file to <filename class="directory">/etc/avahi/services</filename> folder: 
 <screen>
 <prompt>#</prompt> <userinput><command>cp</command> <option>/usr/share/doc/avahi-daemon/examples/ssh.service /etc/avahi/services</option></userinput>
 </screen>
@@ -255,7 +255,7 @@ Do the same on each machine on your LAN, then restart avahi-daemon:
 
 Then open &krusader; and type in location-toolbar-lnk: <filename>zeroconf:/</filename> to open the  
 <link linkend="gloss-zeroconf">zeroconf</link> connection.
-Enter the <guilabel>Fish Protocol</guilabel> directory. Inside you will find the links to each machine that 
+Enter the <guilabel>Fish Protocol</guilabel> folder. Inside you will find the links to each machine that 
 announced <filename>fish:/</filename> on your LAN, the location-toolbar-lnk: will point to 
 <filename>zeroconf:/_fish._tcp</filename> Double clicking on any of these machines,
 them will bring up the password prompt, asking you for your ssh key passphrase (if password was set). 
diff --git a/doc/search.docbook b/doc/search.docbook
index 166dd274..0437ed10 100644
--- a/doc/search.docbook
+++ b/doc/search.docbook
@@ -48,7 +48,7 @@
       <literal role="extension">'*.cpp *.h |
       *.moc.cpp'</literal>). You can use quotation marks for names
             that contain spaces. Filter <quote>Program Files</quote> searches
-            out those files/directories the name of which is <filename>Program
+            out those files/folders the name of which is <filename>Program
             Files</filename>. A drop-down list that is shown after clicking down arrow on the right allows you to pick some of your previously entered criteria.</para>
       <note>
           <para>
@@ -70,7 +70,7 @@
       file not only by its name, but also by its &MIME; type. For
       example, you can search for all the audio files whose name
       begins with B. Usually this option defaults to 'all files',
-      but you can choose to search for archives, directories,
+      but you can choose to search for archives, folders,
       images, text files, videos and audio files.</para>
     </listitem>
   </itemizedlist>
@@ -89,19 +89,19 @@
       <guilabel>Search in</guilabel> box, and write 
       <filename>/mnt</filename> in the 
       <guilabel>Do not search in</guilabel> box. If you want to enter
-      more than one directory in one of the list boxes, just type the
-      first name and press &Enter;. The directory name
+      more than one folder in one of the list boxes, just type the
+      first name and press &Enter;. The folder name
       will be copied to the bigger list box and you will be able to enter
       another name. 
       <note>
         <para>The input line has an auto-completion feature,
         corresponding to &plasma; global settings. If you
         wish, you can click on the 
-        <guiicon>folder icon</guiicon>, and browse to the directory
+        <guiicon>folder icon</guiicon>, and browse to the folder
         you wish to add.</para>
       </note>
       <note>
-          <para>It is possible to define files and directories which will be filtered out from the search results using the <guilabel>Exclude Folder Names</guilabel> input field at the bottom of the <guilabel>Do not search in</guilabel> box.</para>
+          <para>It is possible to define files and folders which will be filtered out from the search results using the <guilabel>Exclude Folder Names</guilabel> input field at the bottom of the <guilabel>Do not search in</guilabel> box.</para>
           <para>Items in the filtering list should be space-separated.</para>
           <para>Spaces in the filtering list items can be escaped or quoted. Example: <userinput>.git "target build" build\ krusader</userinput></para>
       </note></para>
@@ -143,7 +143,7 @@
     <listitem>
       <para>
       <guilabel>Search in sub folders</guilabel>: perform a
-      recursive search and dive into every directory on the
+      recursive search and dive into every folder on the
       way.</para>
     </listitem>
     <listitem>
@@ -311,9 +311,9 @@
   file and use 
   <keycap>F3</keycap>/
   <keycap>F4</keycap> to view/edit or use the right-click menu. When
-  you click on a found item, the directory of the active panel will
+  you click on a found item, the folder of the active panel will
   change if the selected item is not in the current panel
-  directory. The results window supports dragging items to other windows 
+  folder. The results window supports dragging items to other windows 
   and copy to clipboard (<keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>).
   When you close the KruSearcher window, the selected
   item is selected in the active panel.</para>
diff --git a/doc/splitter.docbook b/doc/splitter.docbook
index e960ea20..bfc6e720 100644
--- a/doc/splitter.docbook
+++ b/doc/splitter.docbook
@@ -48,7 +48,7 @@
     </menuchoice>
   or 
   <keycombo action="simul">&Ctrl;
-  <keycap>B</keycap></keycombo>. The target directory is the
+  <keycap>B</keycap></keycombo>. The target folder is the
   inactive panel and can be changed. The file names must be
   numbered in ascending order: 
   <filename>foo.001, foo.002, foo.003</filename> &etc; or
@@ -59,7 +59,7 @@
   </userinput>letter method") 
   <filename>fileaa, fileab, fileac</filename> &etc; If
   the file 
-  <filename>foo.crc</filename> is found in the same directory as the
+  <filename>foo.crc</filename> is found in the same folder as the
   partial files, &krusader; will use this file to check
   the combined file for errors.</para>
 </sect1>
diff --git a/doc/synchronizer.docbook b/doc/synchronizer.docbook
index bbd220a2..e4bf0cfa 100644
--- a/doc/synchronizer.docbook
+++ b/doc/synchronizer.docbook
@@ -50,8 +50,8 @@
     <title>Procedure:</title>
     <listitem>
       <para>Set the 
-      <guilabel>Left directory</guilabel> and the 
-      <guilabel>Right directory</guilabel> that you want to compare.</para>
+      <guilabel>Left folder</guilabel> and the 
+      <guilabel>Right folder</guilabel> that you want to compare.</para>
     </listitem>
     <listitem>
       <para>Configure the optional 
@@ -124,12 +124,12 @@
           <listitem>
             <para>
             <guilabel>Left Directory</guilabel>: The left side base
-            directory.</para>
+            folder.</para>
           </listitem>
           <listitem>
             <para>
             <guilabel>Right Directory</guilabel>: The right side
-            base directory.</para>
+            base folder.</para>
           </listitem>
           <listitem>
             <para>
@@ -138,9 +138,9 @@
             <literal role="extension">*.png</literal> selects only
             files the names of which end with 
             <literal role="extension">.png</literal>. Folders are
-            listed if the directory name ends with 
+            listed if the folder name ends with 
             <literal role="extension">.png</literal> or if the
-            directory contains files which end with 
+            folder contains files which end with 
             <literal role="extension">.png</literal>. Multiple
             include/exclude example: 
             <literal role="extension">'*.cpp *.h |
@@ -257,10 +257,10 @@
             <para>
             <guilabel>Asymmetric</guilabel>: The 
             <guilabel>Left Directory</guilabel> is the target
-            directory, the 
+            folder, the 
             <guilabel>Right Directory</guilabel> is the source
-            directory. This function synchronizes the content of
-            the left directory to the right directory. 
+            folder. This function synchronizes the content of
+            the left folder to the right folder. 
             <itemizedlist>
               <listitem>
                 <para>The files that exist only on the left side
@@ -281,9 +281,9 @@
               </listitem>
             </itemizedlist>This function is useful if the date
             information is unusable, or to synchronize the left
-            directory to the content of a file server (like a
+            folder to the content of a file server (like a
             download). Alternatively, it is useful to make a backup
-            from the right directory to the left directory. NOTE:
+            from the right folder to the left folder. NOTE:
             Do NOT use this option to synchronize a desktop and a
             notebook (⪚ files that exist only on the
             left side will be deleted!).</para>
@@ -297,7 +297,7 @@
             window, if necessary. It is important, if you want to
             know what the Synchronizer is doing. If the
             &FTP; server is slow, the comparison of a
-            directory may take a lot of time. By turning this
+            folder may take a lot of time. By turning this
             option on, you can see that the comparator is <quote>alive</quote>,
             but slow. For fast file systems, it can reduce the
             speed of comparing slightly.</para>
@@ -486,7 +486,7 @@
         <guilabel>Task</guilabel> operations determined by the
         Comparator. Select one or multiple files. The change will
         be applied on the selection and not only on the right
-        clicked item. If the selected item is a directory, the
+        clicked item. If the selected item is a folder, the
         change will be applied on its files/subfolders as
         well.</para>
         <itemizedlist>
@@ -596,7 +596,7 @@
     <varlistentry>
       <term>Synchronize with <application>kget</application></term>
       <listitem>
-        <para>If you want to synchronize a local directory with an
+        <para>If you want to synchronize a local folder with an
         unstable &FTP; server, <application>kget</application> is a much better
         solution than simple file copying. After comparing you may
         right click on the result list and select 
@@ -710,7 +710,7 @@
             synchronization.</para>
           </listitem>
           <listitem>
-            <para>Remote <quote>compare by content</quote> and <quote>directory
+            <para>Remote <quote>compare by content</quote> and <quote>folder
             compare</quote> is done in parallel.</para>
           </listitem>
           <listitem>
diff --git a/doc/user-interface.docbook b/doc/user-interface.docbook
index 1a2a5c3e..376b9d8c 100644
--- a/doc/user-interface.docbook
+++ b/doc/user-interface.docbook
@@ -151,7 +151,7 @@
       shows the path the panel is currently pointing to.
       When entering archives the path will be displayed
       in the following format: <quote>archive
-      type:/directory/archive_filename/the directory inside the
+      type:/folder/archive_filename/the folder inside the
       archive</quote>. This format makes the paths uniform and easy to
       read. The
       <guibutton>Location Toolbar</guibutton> supports also
@@ -204,7 +204,7 @@
       <guibutton>Location Toolbar</guibutton>. A pop-up window shows
       the next &URL; location. Pressing &Ctrl; + &LMB; shows
       the location where the mouse was pointing to. This feature
-      allows faster navigation in a big directory tree.</para>
+      allows faster navigation in a big folder tree.</para>
     </sect2>
     <sect2 id="panel_toolbar">
       <title>Panel Toolbar</title>
@@ -220,32 +220,32 @@
         <listitem>
           <para>
           <guibutton>OpenDir Button</guibutton>: opens the
-          directory browser.</para>
+          folder browser.</para>
         </listitem>
         <listitem>
           <para>
           <guibutton>Equals Button (=)</guibutton>: changes the
-          panel directory to the other panel directory.</para>
+          panel folder to the other panel folder.</para>
         </listitem>
         <listitem>
           <para>
           <guibutton>Up Button (..)</guibutton>: changes the panel
-          directory to the parent directory.</para>
+          folder to the parent folder.</para>
         </listitem>
         <listitem>
           <para>
           <guibutton>Home Button (~)</guibutton>: changes the panel
-          directory to the home directory.</para>
+          folder to the home folder.</para>
         </listitem>
         <listitem>
           <para>
           <guibutton>Root Button (/)</guibutton>: changes the panel
-          directory to the root directory.</para>
+          folder to the root folder.</para>
         </listitem>
         <listitem>
           <para>
           <guibutton>Sync-browsing Button</guibutton>: when active,
-          each directory change in the specific panel is performed
+          each folder change in the specific panel is performed
           in the other panel as well.</para>
         </listitem>
       </itemizedlist>
@@ -258,12 +258,12 @@
     <itemizedlist>
       <listitem>
         <para><link linkend="list_panel">List Panel</link>: shows the files and
-        directories.</para>
+        folders.</para>
       </listitem>
       <listitem>
         <para><link linkend="sidebar">Sidebar</link>: has several display
         modes: Preview, Tree, Quickselect, View and Disk Usage for
-        the file or directory that has the focus. The Sidebar
+        the file or folder that has the focus. The Sidebar
         may be left open or closed, as desired.</para>
       </listitem>
     </itemizedlist>
@@ -275,7 +275,7 @@
     choose a command from the
     <guilabel>Menu-Bar</guilabel> or
     <guilabel>Toolbar</guilabel> the command will act upon the
-    selected files/directories in the active panel. You can switch
+    selected files/folders in the active panel. You can switch
     between panels using the 	 key or by clicking on
     the
     <guilabel>Information or Totals labels</guilabel>, or by
@@ -302,7 +302,7 @@
       </indexterm>
       <para>This is the default panel and the one you will probably
       use most of the time. This panel shows the contents of one
-      directory which can be local (part of your mounted file
+      folder which can be local (part of your mounted file
       systems, either a native file or the files inside an archive)
       or remote files (accessed via &FTP;, &NFS; or Samba).
       There are two modes: <link linkend="view-menu">Detailed View</link> that shows the file names,
@@ -353,7 +353,7 @@
           <emphasis>
             <guilabel>Column Headers</guilabel>
           </emphasis>: here you can change the sort order of the
-          files and directories as desired. The default sort order
+          files and folders as desired. The default sort order
           is by
           <guilabel>Name</guilabel>. The sort order can be
           instantly changed by clicking on one of the
@@ -385,8 +385,8 @@
           <para>
           <emphasis>
             <guilabel>File List</guilabel>
-          </emphasis>: displays the files and directories in the
-          browsed directory. The <link linkend="quicksearch">search bar</link>
+          </emphasis>: displays the files and folders in the
+          browsed folder. The <link linkend="quicksearch">search bar</link>
           allows you to search for files by typing their names, or
           the first few characters of a file name. Pressing
           &Enter; or double clicking on a file will
@@ -406,10 +406,10 @@
           deselecting files will change the <emphasis> <guilabel>Totals Label</guilabel>
           </emphasis>at the bottom of the panel, which displays how many files you have
           selected (and how much total disk space they use) as well as the total file and
-          disk usage of the current directory (as opposed to the information label that
-          displays information for the whole file system). If a directory contains a lot
-          of subdirectories, it may not be possible to drop the &URL; onto the panel (on
-          which only directories are visible), but the &URL; can be dropped onto the
+          disk usage of the current folder (as opposed to the information label that
+          displays information for the whole file system). If a folder contains a lot
+          of subfolders, it may not be possible to drop the &URL; onto the panel (on
+          which only folders are visible), but the &URL; can be dropped onto the
           <quote>Information Label</quote> or <quote>Totals Label</quote> instead. When a <link
           linkend="view-menu">custom filter</link> is set, it will show the setting,
           example: [*.cpp].</para>
@@ -432,7 +432,7 @@
           panel.</para>
         </listitem>
         <listitem>
-          <para>Focus a file or directory on the left panel, press
+          <para>Focus a file or folder on the left panel, press
           <keycombo action="simul">&Ctrl;
           &Right;</keycombo> and the right panel
           changes:
@@ -442,7 +442,7 @@
               as the left panel.</para>
             </listitem>
             <listitem>
-              <para>On a directory: right panel opens the directory focused on the left panel.</para>
+              <para>On a folder: right panel opens the folder focused on the left panel.</para>
             </listitem>
           </itemizedlist></para>
         </listitem>
@@ -481,10 +481,10 @@
           <emphasis>
             <guilabel>Tree Panel</guilabel>
           </emphasis>: is used to quickly browse the local
-          directory tree. This panel behaves like the list panel
-          but only one directory may be selected at a time and
+          folder tree. This panel behaves like the list panel
+          but only one folder may be selected at a time and
           double clicking or pressing &Enter; on a
-          directory will open that directory in the active panel.
+          folder will open that folder in the active panel.
           The panels fully support drag and drop (copy, move, link)
           mouse actions.</para>
         </listitem>
@@ -513,7 +513,7 @@
           <emphasis>
             <guilabel>Disk Usage Panel</guilabel>
           </emphasis>: views the <link linkend="diskusage">Disk Usage</link> of a
-          directory.</para>
+          folder.</para>
         </listitem>
       </itemizedlist>
       <para>
@@ -611,9 +611,9 @@
     <userinput>
       <command>cd</command>
       <replaceable>
-      <directory></replaceable>
+      <folder></replaceable>
     </userinput> in the command line will also cause the active
-    panel to point to this directory.
+    panel to point to this folder.
 
     Click
     <link linkend="cmdline_keybindings">here</link> to view the
@@ -635,12 +635,12 @@
       </mediaobject>
     </figure>
     <para>The terminal emulator mode is in fact a small console and
-    acts like one. You can change the active directory in the
+    acts like one. You can change the active folder in the
     terminal by using the
     <userinput>
       <command>cd</command>
     </userinput> command. The terminal emulator will follow the
-    active panel directory. You can drag a file from the
+    active panel folder. You can drag a file from the
     <interface>List Panel</interface> and name of file will pasted
     into Terminal Emulator. If you drag multiple files, the names will
     pasted into Terminal Emulator. A full-screen terminal emulator can
@@ -686,7 +686,7 @@
     <keycap>F9</keycap> key will open a terminal at the last local
     path that the active panel pointed to.
     <guilabel>Mkdir</guilabel> <keycap>F7</keycap> (translated name of
-    <command>mkdir</command> command) can create whole directory trees
+    <command>mkdir</command> command) can create whole folder trees
     on the fly ⪚ <literal>foo/bar/test</literal>. You can choose to display
     <link linkend="faqu_resize">or not</link> the
     <guilabel>FN keys bar</guilabel> when starting up
@@ -723,7 +723,7 @@
       <listitem>
         <para>To
         <action>open a new tab</action> and keep the current
-        tab opened: <keycap>Right-click</keycap> on a directory and
+        tab opened: <keycap>Right-click</keycap> on a folder and
         select
         <guimenuitem>Open in New Tab</guimenuitem>, or click on 
         the rightmost button on the Tab bar.</para>
diff --git a/doc/useraction-xml.docbook b/doc/useraction-xml.docbook
index 7e4faea6..f9401276 100644
--- a/doc/useraction-xml.docbook
+++ b/doc/useraction-xml.docbook
@@ -112,13 +112,13 @@
 </KrusaderUserActions></programlisting>
       </para></listitem>
 
-      <listitem><para>Make a backup of the current file/folder to <filename>foo.bak</filename> into the current directory:
+      <listitem><para>Make a backup of the current file/folder to <filename>foo.bak</filename> into the current folder:
       <programlisting>
 <!DOCTYPE KrusaderUserActions>
 <KrusaderUserActions>
  <action name="backup current" >
   <title>Backup in Current Directory</title>
-  <tooltip>Backup in current directory</tooltip>
+  <tooltip>Backup in current folder</tooltip>
   <icon>document-save-as</icon>
   <category>System</category>
   <description same_as="tooltip" />
diff --git a/doc/useractions.docbook b/doc/useractions.docbook
index dc07b797..90ca5fa3 100644
--- a/doc/useractions.docbook
+++ b/doc/useractions.docbook
@@ -20,7 +20,7 @@
   standard Edit Toolbar and Edit Shortcut dialogs will show
   UserActions, too. The UserActions are stored in 
   <filename>
-  ~/.local/share/krusader/useractions.xml</filename> or <filename>krusader/useraction.xml</filename> in the directory which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command.
+  ~/.local/share/krusader/useractions.xml</filename> or <filename>krusader/useraction.xml</filename> in the folder which can be determined using the <userinput>qtpaths --paths GenericDataLocation</userinput> command.
   Several 
   <link linkend="useraction-xml">examples</link> are included in the
   documentation. UserActions can be edited / added / imported /
@@ -192,7 +192,7 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
     </listitem>
     <listitem>
       <para>
-      <guimenuitem>Workdir</guimenuitem>: The working directory
+      <guimenuitem>Workdir</guimenuitem>: The working folder
       for the command which will be executed.</para>
     </listitem>
     <listitem>
diff --git a/doc/vfs.docbook b/doc/vfs.docbook
index c91c2938..11eb5a44 100644
--- a/doc/vfs.docbook
+++ b/doc/vfs.docbook
@@ -16,7 +16,7 @@
   ISO &CD;/&DVD; images, RPM catalogs, &etc;), which allows the user to
   access all the information in these divergent types of
   filesystems transparently - just like entering an ordinary
-  sub-directory. &krusader; supports several virtual
+  sub-folder. &krusader; supports several virtual
   file systems:</para>
   <itemizedlist>
     <listitem>
@@ -31,7 +31,7 @@
     <listitem>
       <para>
       <link linkend="archives">Archive VFS</link>: allows to browse
-      archives in VFS as it was a directory (ace, arj, bzip2, deb,
+      archives in VFS as it was a folder (ace, arj, bzip2, deb,
       gzip, iso, lha, rar, rpm, tar, zip and 7-zip).</para>
     </listitem>
     <listitem>
@@ -49,10 +49,10 @@
   <para>Actions you perform on the files in VFS are
   performed on the 'real' files. You do not just delete files from
   the VFS - you delete them from your hard drive. Limitations: you
-  cannot create directories inside a VFS.</para>
-  <para>It is possible to keep the directory structure when doing a
+  cannot create folders inside a VFS.</para>
+  <para>It is possible to keep the folder structure when doing a
   copy from a virtual folder to a non virtual folder, by
-  selecting the <quote>Keep virtual directory structure</quote> check box of the
+  selecting the <quote>Keep virtual folder structure</quote> check box of the
   copy dialog. Imagine the following virtual folder: 
   <screen><prompt>$</prompt> <userinput>file:/home/myhome/mydir1/myfile1</userinput></screen>
   <screen><prompt>$</prompt> <userinput>file:/home/myhome/mydir1/myfile2</userinput></screen>
@@ -72,7 +72,7 @@
     </listitem>
     <listitem>
       <para>Check 
-      <guilabel>Keep virtual directory structure</guilabel></para>
+      <guilabel>Keep virtual folder structure</guilabel></para>
     </listitem>
     <listitem>
       <para>Select 
diff --git a/doc/viewer-editor.docbook b/doc/viewer-editor.docbook
index bd6f9a68..f5d9a34f 100644
--- a/doc/viewer-editor.docbook
+++ b/doc/viewer-editor.docbook
@@ -92,7 +92,7 @@
         <para>
         <userinput>
           <command>file:/</command><replaceable>home/frank</replaceable>
-        </userinput>views the home directory of Frank.</para>
+        </userinput>views Frank's home folder.</para>
       </listitem>
       <listitem>
         <para>


More information about the kde-doc-english mailing list