[krusader] /: Documentation and GUI fixes

Antoni Bella Pérez null at kde.org
Wed Dec 18 19:08:35 GMT 2019


Git commit 6586969ac85e916bbfbd76bcfad7623a49248d90 by Antoni Bella Pérez.
Committed on 18/12/2019 at 19:08.
Pushed by bellaperez into branch 'master'.

Documentation and GUI fixes

Summary:
  I edited it to resolve some issues following the KDE Documentation style.
  - Important: change directory(ies) -> folder(s) (now is consistent)
    * Eight GUI messages where this change was still missing
  - GUI & Doc messages sync

Reviewers: yurchor, #documentation

Reviewed By: yurchor, #documentation

Subscribers: ognarb, kde-doc-english

Tags: #documentation

Differential Revision: https://phabricator.kde.org/D26084

M  +1    -1    doc/advanced-functions.docbook
M  +9    -10   doc/archives.docbook
M  +35   -38   doc/basic-functions.docbook
M  +9    -9    doc/bookmarks.docbook
M  +2    -2    doc/checksum.docbook
M  +1    -1    doc/compare.docbook
M  +1    -1    doc/configuration-files.docbook
M  +2    -2    doc/diskusage.docbook
M  +1    -1    doc/editors-note.docbook
M  +26   -26   doc/faq.docbook
M  +11   -11   doc/features.docbook
M  +6    -6    doc/glossary.docbook
M  +3    -3    doc/help.docbook
M  +1    -1    doc/index.docbook
M  +5    -5    doc/introduction.docbook
M  +56   -56   doc/keyboard-commands.docbook
M  +71   -82   doc/konfigurator.docbook
M  +1    -1    doc/locate.docbook
M  +39   -39   doc/menu-commands.docbook
M  +2    -2    doc/mount.docbook
M  +20   -20   doc/release-overview.docbook
M  +2    -2    doc/remote-connections.docbook
M  +4    -4    doc/search.docbook
M  +1    -1    doc/splitter.docbook
M  +32   -32   doc/synchronizer.docbook
M  +29   -33   doc/user-interface.docbook
M  +24   -25   doc/useractions.docbook
M  +5    -5    doc/vfs.docbook
M  +27   -28   doc/viewer-editor.docbook
M  +2    -2    krArc/krarc.cpp
M  +1    -1    krusader/Dialogs/checksumdlg.cpp
M  +1    -1    krusader/DiskUsage/diskusage.cpp
M  +1    -1    krusader/Filter/generalfilter.cpp
M  +1    -1    krusader/Konfigurator/kgpanel.cpp
M  +1    -1    krusader/Panel/listpanel.cpp

https://commits.kde.org/krusader/6586969ac85e916bbfbd76bcfad7623a49248d90

diff --git a/doc/advanced-functions.docbook b/doc/advanced-functions.docbook
index fda54577..6f4c9870 100644
--- a/doc/advanced-functions.docbook
+++ b/doc/advanced-functions.docbook
@@ -50,7 +50,7 @@
   synchronizer. To view/modify the ACL permissions, select a file
   and use the <link linkend="context-menu">Context Menu</link>: 
     <menuchoice>
-      <guimenu>Properties</guimenu>
+      <guimenu>Properties...</guimenu>
       <guimenuitem>Permissions</guimenuitem>
       <guimenuitem>Advanced permissions</guimenuitem>
     </menuchoice>.
diff --git a/doc/archives.docbook b/doc/archives.docbook
index a7a4dad6..b1643aa1 100644
--- a/doc/archives.docbook
+++ b/doc/archives.docbook
@@ -28,12 +28,11 @@
     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
-    stored in <application>Kwallet</application>. Please note that the archive
+    stored in <application>KWallet</application>. Please note that the archive
     support first needs to be properly 
     <link linkend="konfig-archives">configured</link> in
-    Konfigurator. To open the archive, use &Enter;,
-    (double-)click or the 
-    <keycap>Right Arrow</keycap>. &krusader; supports
+    Konfigurator. To open the archive, use &Enter; key,
+    (double-)click or the &Right; key. &krusader; supports
     also 
     <emphasis role="bold">hidden archives</emphasis>, these are
     renamed archives with a *wrong* extension, ⪚
@@ -42,11 +41,11 @@
     <literal role="extension">.sxw</literal> and <literal role="extension">.odw</literal>.
     &Enter; will open the
     <trademark class="registered">OpenOffice</trademark> document and the 
-    <keycap>Right Arrow</keycap> will open the archive. Another
+    &Right; key will open the archive. Another
     example is J2EE, where the <literal role="extension">.jar</literal> extension means a zip archive.
     Since &krusader; auto-detects the supported archive
     types, it will open with 
-    <keycap>Right Arrow</keycap> even if it has another MIME type.
+    &Right; key even if it has another &MIME; type.
     Please note that browsing archives has a few limitations: 
     <itemizedlist>
       <listitem>
@@ -71,7 +70,7 @@
         changed.</para>
       </listitem>
       <listitem>
-        <para>Packing and un-packing are "blocking operations" that
+        <para>Packing and un-packing are <quote>blocking operations</quote> that
         display a progress dialog. However, this might change in
         the future since we are planning to create more background
         operations.</para>
@@ -97,7 +96,7 @@
     <para>If you only want to extract a part of the archive, then 
     <link linkend="browsing-archives">browse</link> the archive and
     copy the files you want to extract to their new location just
-    as you would copy "normal" files. Note that unpacking from a
+    as you would copy <quote>normal</quote> files. Note that unpacking from a
     browsed archive takes more time (file by file unpack) compared
     to unpacking a whole archive with the first method.
     The unpack operation can be put in a <link linkend="queue">queue</link>.</para>
@@ -108,7 +107,7 @@
     the elements you want to pack in the active panel and select 
       <menuchoice>
         <guimenu>File</guimenu>
-        <guimenuitem>Pack</guimenuitem>
+        <guimenuitem>Pack...</guimenuitem>
       </menuchoice>
     or 
     <keycombo action="simul">&Alt;&Shift;
@@ -120,7 +119,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 "normal" directory.
+    way you copy files into a <quote>normal</quote> directory.
     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 2ce42d1e..58d75941 100644
--- a/doc/basic-functions.docbook
+++ b/doc/basic-functions.docbook
@@ -96,11 +96,11 @@
         <listitem>
           <para>The 
           <keycombo action="simul">&Ctrl;
-          <keycap>Down Arrow</keycap></keycombo> will take you from
+          &Down;</keycombo> will take you from
           the Active Panel to the Command Line or Terminal
           Emulator, and the 
           <keycombo action="simul">&Ctrl;
-          <keycap>Up Arrow</keycap></keycombo> will take you back
+          &Up;</keycombo> will take you back
           from the Command Line to the Active Panel.</para>
         </listitem>
         <listitem>
@@ -118,7 +118,7 @@
           <keycombo action="simul">&Alt;
           <keycap>Underlined Letter</keycap></keycombo> from the
           Menu Bar will open that menu (unless this key combination
-          is a "Reserved Key", used by one of
+          is a <quote>Reserved Key</quote>, used by one of
           &krusader;'s actions).</para>
         </listitem>
       </itemizedlist></para>
@@ -136,15 +136,14 @@
       only one directory 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 "elements" meaning files and
+      directory (referred to herein as <quote>elements</quote> meaning files and
       directories) 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>
         <listitem>
           <para>The 
-          <keycap>Space</keycap> and 
-          <keycap>Insert</keycap> keys will toggle the selection of
+          &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
           position down.</para>
@@ -170,20 +169,18 @@
         </listitem>
         <listitem>
           <para>
-          <keycombo action="simul">&Shift;
-          <keycap>Home</keycap></keycombo> selects everything above
-          the cursor (and deselects everything below the cursor, if
-          selected).</para>
+          <keycombo action="simul">&Shift;&Home;</keycombo> selects
+          everything above the cursor (and deselects everything
+          below the cursor, if selected).</para>
         </listitem>
         <listitem>
           <para>
-          <keycombo action="simul">&Shift;
-          <keycap>End</keycap></keycombo> selects everything below
-          the cursor (and unselects everything above the cursor, if
-          selected).</para>
+          <keycombo action="simul">&Shift;&End;</keycombo> selects
+          everything below the cursor (and unselects everything
+          above the cursor, if selected).</para>
         </listitem>
         <listitem>
-          <para>The ".." entry is not selectable.</para>
+          <para>The <quote>..</quote> entry is not selectable.</para>
         </listitem>
         <listitem>
           <para>The <link linkend="edit-menu">Edit menu</link> can offer more ways
@@ -210,13 +207,13 @@
       in the Active List Panel.</para>
       <para>Type 
       <keycap>foo</keycap>(one character) to do a quick search in
-      the Active List Panel for a file beginning with "foo". A
+      the Active List Panel for a file beginning with <quote>foo</quote>. A
       small quick search dialog box will open below the Active List
       Panel. Type the first few characters of the desired file name
       (more than one character allowed), the cursor will jump to
-      that filename (if it exists), ⪚ type "ab" to
-      search for a file which begins with "ab". The 
-      <keycap>Up/Down Arrow</keycap> will jump to the next or
+      that filename (if it exists), ⪚ type <quote>ab</quote> to
+      search for a file which begins with <quote>ab</quote>. The
+      &Up;/&Down; keys will jump to the next or
       previous match. &Esc; will close the quick search
       line. The cursor will stay on the last file
       found. The Quicksearch supports <ulink url="https://en.wikipedia.org/wiki/Regular_expression">regular expressions</ulink> for searching files.</para>
@@ -238,8 +235,8 @@
       in the Active Panel.</para>
       <para>Press <keycombo>&Ctrl;<keycap>I</keycap></keycombo> to open Quickfilter bar.
       Type <keycap>foo</keycap> (one character) to filter out from the Active Panel all the files
-      that do not have "foo" in names. You can use wildcards for the filtering. ⪚ use "a*b" to
-      filter files which have "a" and "b" in their names. The Quickfilter follows the
+      that do not have <quote>foo</quote> in names. You can use wildcards for the filtering. ⪚ use <quote>a*b</quote> to
+      filter files which have <quote>a</quote> and <quote>b</quote> in their names. The Quickfilter follows the
       <link linkend="konfig-panel-general">case-sensitivity setting</link> of Quicksearch.</para>
       <para>Pressing &Enter; in Quickfilter mode sets focus to panel, when panel or Quickfilter is focused, &Esc; closes Quickfilter.
       </para>
@@ -252,8 +249,8 @@
       in the Active Panel.</para>
       <para>Press <keycombo>&Ctrl;&Shift;<keycap>S</keycap></keycombo> to open Quickselect bar.
       Type <keycap>foo</keycap> (one character) to filter out from the Active Panel all the files
-      that do not have "foo" in names. You can use wildcards for the filtering. ⪚ use "a*b" to
-      filter files which have "a" and "b" in their names. The Quickselect follows the
+      that do not have <quote>foo</quote> in names. You can use wildcards for the filtering. ⪚ use <quote>a*b</quote> to
+      filter files which have <quote>a</quote> and <quote>b</quote> in their names. The Quickselect follows the
       <link linkend="konfig-panel-general">case-sensitivity setting</link> of Quicksearch.</para>
       <para>Pressing &Enter; in Quickselect mode sets focus to panel, when panel or Quickselect is focused, &Esc; closes Quickselect.
       </para>
@@ -299,7 +296,7 @@
           format...)</para>
         </listitem>
         <listitem>
-          <para><link linkend="synchronizer">Synchronize Directories</link> File List</para>
+          <para><link linkend="synchronizer">Synchronize Folders</link> File List</para>
         </listitem>
         <listitem>
           <para><link linkend="useractions">UserActions</link></para>
@@ -345,6 +342,17 @@
     </sect2>
     <sect2 id="copying">
       <title>Copying and Moving</title>
+      <figure id="screenshot-copyjob" float="1">
+        <title>Copy dialog</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="copyjob.png"></imagedata>
+          </imageobject>
+          <textobject>
+            <phrase>Copy dialog</phrase>
+          </textobject>
+        </mediaobject>
+      </figure>
       <para>To copy or move files/directories just select them and
       press 
       <keycap>F5</keycap> to 
@@ -361,17 +369,6 @@
       The default destination is the other-panel browsed directory. If you enter
       a partial &URL;, &krusader; will use the current
       panel directory as the &URL; base.</para>
-      <figure id="screenshot-copyjob" float="1">
-        <title>Copy dialog</title>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="copyjob.png"></imagedata>
-          </imageobject>
-          <textobject>
-            <phrase>Copy dialog</phrase>
-          </textobject>
-        </mediaobject>
-      </figure>
     </sect2>
     <sect2 id="queue">
       <title>Queue manager</title> 
@@ -413,7 +410,7 @@
       <title>Shred Files</title>
       <para>Shred was removed from &kde; 4 (and as consequence &krusader;-2 for &kde; 4).
            The main reason is probably that shredding is filesystem dependent and even if you overwrite the file 100 times, it is not sure, that it will be deleted from the disk finally.
-           Quote from the <application>kgpg</application> posts: <quote>The shred feature has been removed from the KDE library. Kgpg will not support this feature anymore. Moderns file systems use journalisation. So the shred feature should be implemented in the file system. Not in kgpg.</quote>
+           Quote from the &kgpg; posts: <quote>The shred feature has been removed from the &kde; library. &kgpg; will not support this feature anymore. Moderns file systems use journalisation. So the shred feature should be implemented in the file system. Not in &kgpg;.</quote>
            But you might use a proper shred <link linkend="useractions">UserAction</link> for your filesystem.
 	   But keep in mind that if you want to be 100% sure that it is impossible that someone can read a deleted file, you need to destroy your harddrive hardware...
 	   </para>
@@ -427,10 +424,10 @@
       only the file name needs to be renamed and not the extension,
       you can configure this in the
       <link linkend="konfig-general-atomic">Konfigurator General page</link>. 
-      <guilabel>Create a new directory</guilabel> with the 
+      <guilabel>Create a new folder</guilabel> with the
       <keycap>F7</keycap> key. 
       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 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
       right-clicked on is a symlink, you will also be presented
diff --git a/doc/bookmarks.docbook b/doc/bookmarks.docbook
index 85b5a24c..8ca9cabf 100644
--- a/doc/bookmarks.docbook
+++ b/doc/bookmarks.docbook
@@ -23,7 +23,7 @@
   </indexterm>
   <para>BookMan is &krusader;'s Bookmark tool for
   bookmarking folders, local and 
-  <link linkend="remote-connections">remote URLs</link>, and later
+  <link linkend="remote-connections">remote &URL;s</link>, and later
   returning to them in a click of a button. The Bookman menu is
   divided into four sections: 
   <itemizedlist>
@@ -82,7 +82,7 @@
     <keycap>foo</keycap></keycombo>. If you add the bookmark
     without entering a name, the bookmarks name will be the same as
     its target. 
-    <guilabel>URL</guilabel>
+    <guilabel>&URL;</guilabel>
     is where the bookmark points to. 
     <guilabel>Create in</guilabel> creates bookmark folders for
     organizing your bookmarks.</para>
@@ -148,25 +148,25 @@
     be lost.</para>
   </sect2>
   <sect2 id="popular-urls">
-    <title>Popular URLs</title>
+    <title>Popular &URL;s</title>
     <indexterm>
-      <primary>Popular URLs</primary>
+      <primary>Popular &URL;s</primary>
     </indexterm>
     <para>The submenu 
-    <guilabel>Popular URLs</guilabel>
+    <guilabel>Popular &URL;s</guilabel>
     holds persistent the most popular visited &URL;s
     (local or remote). This submenu displays the top 15 popular
-    URLs, sorted by ranking, so that the top &URL; is
+    &URL;s, sorted by ranking, so that the top &URL; is
     the most popular. This is easy for when you need to visit
     &URL;s often, but do not want to create
     <link linkend="bookman">Bookmarks</link>, it serves as a temporary bookmark
     list for the most visited links. 
-    Quicksearch in <guilabel>Popular URLs</guilabel> is a fast way to
+    Quicksearch in <guilabel>Popular &URL;s</guilabel> is a fast way to
     browse/select the popular &URL;s: 
     <itemizedlist>
       <listitem>
         <para>Open the 
-        <guilabel>Popular URLs</guilabel>
+        <guilabel>Popular &URL;s</guilabel>
         or use 
         <keycombo action="simul">&Ctrl;
         <keycap>Z</keycap></keycombo></para>
@@ -289,7 +289,7 @@
         <para>Add your bookmarks as action buttons on the
         <link linkend="mainwindow">Main Toolbar</link> or the
         <link linkend="actions_toolbar">Actions Toolbar</link> with the 
-        <guilabel>Configure Toolbars</guilabel> window 
+        <guilabel>Configure Toolbars...</guilabel> window 
         (<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem></menuchoice>).</para>
       </listitem>
     </itemizedlist></para>
diff --git a/doc/checksum.docbook b/doc/checksum.docbook
index e0b1798e..10667e2a 100644
--- a/doc/checksum.docbook
+++ b/doc/checksum.docbook
@@ -24,7 +24,7 @@
   <para>
     <menuchoice>
       <guimenu>File</guimenu>
-      <guimenuitem>Create Checksum</guimenuitem>
+      <guimenuitem>Create Checksum...</guimenuitem>
     </menuchoice>:
   &krusader; checks which tools you have
   and if those tools allow recursive operation (in case you
@@ -36,7 +36,7 @@
   <para>
     <menuchoice>
       <guimenu>File</guimenu>
-      <guimenuitem>Verify Checksum</guimenuitem>
+      <guimenuitem>Verify Checksum...</guimenuitem>
     </menuchoice>:
   &krusader; checks if you have a tool that
   supports the type of checksum you need (from your specified
diff --git a/doc/compare.docbook b/doc/compare.docbook
index e2665837..e822615c 100644
--- a/doc/compare.docbook
+++ b/doc/compare.docbook
@@ -32,7 +32,7 @@
     <para>Select one file in each panel and use 
       <menuchoice>
         <guimenu>File</guimenu>
-        <guimenuitem>Compare by content</guimenuitem>
+        <guimenuitem>Compare by content...</guimenuitem>
       </menuchoice>.
     &krusader; will open an external
     graphical difference tool that is 
diff --git a/doc/configuration-files.docbook b/doc/configuration-files.docbook
index 1fd23440..5ff6844a 100644
--- a/doc/configuration-files.docbook
+++ b/doc/configuration-files.docbook
@@ -63,7 +63,7 @@
       <para>General</para>
     </listitem>
     <listitem>
-      <para>HTML Settings</para>
+      <para>&HTML; Settings</para>
     </listitem>
     <listitem>
       <para>KFileDialog</para>
diff --git a/doc/diskusage.docbook b/doc/diskusage.docbook
index 44e40ca6..d42a9509 100644
--- a/doc/diskusage.docbook
+++ b/doc/diskusage.docbook
@@ -22,7 +22,7 @@
     <primary>Disk Usage</primary>
   </indexterm>
   <para>The Disk Usage is based on the code of
-  <application>Filelight</application>. The Disk Usage shows you how your disk
+  &filelight;. The Disk Usage shows you how your disk
   space is being used by a graphical representation of your
   file system. The following presentations are possible:</para> 
   <itemizedlist>
@@ -40,7 +40,7 @@
   <para>Choose 
     <menuchoice>
       <guimenu>Tools</guimenu>
-      <guimenuitem>Disk Usage</guimenuitem>
+      <guimenuitem>Disk Usage...</guimenuitem>
     </menuchoice>
   or 
   <keycombo action="simul">&Alt;&Shift;
diff --git a/doc/editors-note.docbook b/doc/editors-note.docbook
index 917e4b1c..8fe8c064 100644
--- a/doc/editors-note.docbook
+++ b/doc/editors-note.docbook
@@ -54,7 +54,7 @@
 
 <note><para>
                  If you are using a development or &git; version, it is possible that the latest
-                 new features are not yet in the "The &krusader; Handbook".
+                 new features are not yet in the <quote>The &krusader; Handbook</quote>.
                  Please read the
 		 <ulink url="https://commits.kde.org/krusader?path=ChangeLog">Changelog</ulink>
 		 file online or in the &krusader;
diff --git a/doc/faq.docbook b/doc/faq.docbook
index 331fcf84..21e43d22 100644
--- a/doc/faq.docbook
+++ b/doc/faq.docbook
@@ -211,14 +211,14 @@
         </question>
         <answer>
           <para>When &krusader; is ⪚
-          browsing an NFS share and the NFS server goes down,
+          browsing an &NFS; share and the &NFS; server goes down,
           &krusader; will freeze. This
           &krusader; (and all other open internal
           viewers/editors) freeze is fatal, and can only be
           corrected with the 
           <command>kill -9</command>. We have no solution for this.
           This is an issue not confined to file managers, or even
-          the &Linux; OS! The problem is that you "hang"
+          the &Linux; OS! The problem is that you <quote>hang</quote>
           on the first access to the dead share - so there is no
           way around it, no check to avoid it, even 
           <command>ls</command> will freeze. Just trying to read
@@ -267,14 +267,14 @@
       <qandaentry>
         <question id="faqu_samba_codepage">
           <para>
-          <application>Samba</application> ISO 8859-x codepage /
+          &Samba; ISO 8859-x codepage /
           What to do if &krusader; does not read shared
           directories containing special international
           characters?</para>
         </question>
         <answer>
           <para>&krusader; does not handle (yet) 
-          <application>Samba</application> ISO 8859-x codepages, if
+          &Samba; ISO 8859-x codepages, if
           you use a codepage different than 8859-1 you will have to
           do a manual configuration. Create or modify the file: 
           <filename>~/.smb/smb.conf</filename>
@@ -292,8 +292,8 @@
       <!-- Thanks to Karai Csaba -->
       <qandaentry>
         <question id="faqu_krarc_protocol">
-          <para>&krusader; reports "krarc:... protocol
-          not supported" error at opening an archive file, what to
+          <para>&krusader; reports <quote>krarc:... protocol
+          not supported</quote> error at opening an archive file, what to
           do?</para>
         </question>
         <answer>
@@ -315,8 +315,8 @@
       </qandaentry>
       <qandaentry>
         <question id="faqu_krarc_support">
-          <para>I get the error message "Protocol not supported by
-          Krusader: "krarc:/path/to/foo-archive", when I try to
+          <para>I get the error message <quote>Protocol not supported by
+          Krusader: "krarc:/path/to/foo-archive"</quote>, when I try to
           open foo-Archive, what to do?</para>
         </question>
         <answer>
@@ -418,7 +418,7 @@
           works. Also, make sure you have no other &FTP;
           sessions open (using web browsers, &etc;), they can cause
           complications. More information can be found in
-          <ulink url="http://slacksite.com/other/ftp.html">Active &FTP; vs. Passive &FTP;, a Definitive Explanation</ulink>.</para>
+          <ulink url="https://slacksite.com/other/ftp.html">Active &FTP; vs. Passive &FTP;, a Definitive Explanation</ulink>.</para>
           <para></para>
           <!-- Empty line to make it more readable -->
         </answer>
@@ -427,7 +427,7 @@
       <qandaentry>
         <question id="faqu_ftp_http_proxy">
           <para>I get 
-          <errorcode>FTP protocol not supported by
+          <errorcode>&FTP; protocol not supported by
           &krusader;</errorcode> error when trying to
           open a remote &FTP; directory, what to
           do?</para>
@@ -507,7 +507,7 @@
               <guisubmenu>Notifications</guisubmenu>
               <guimenuitem>Manage Notifications</guimenuitem>
             </menuchoice>, 
-          <guilabel>Event Source: "Plasma Workspace"
+          <guilabel>Event Source: <quote>Plasma Workspace</quote>
           </guilabel> and uncheck sound items you
           do not like.</para>
           <para></para>
@@ -528,7 +528,7 @@
       </qandaentry>
       <qandaentry>
         <question id="faqu_mimetypemagic_archives">
-          <para>Why does not MIME type magic sometimes work inside
+          <para>Why does not &MIME; type magic sometimes work inside
           archives?</para>
         </question>
         <answer>
@@ -539,7 +539,7 @@
           if the viewer opens in hex-mode instead of the usual
           mode, than you need to configure:
             <menuchoice>
-              <guimenu>KDE System Settings</guimenu>
+              <guimenu>&kde; System Settings</guimenu>
               <guimenuitem>File Associations</guimenuitem>
               <guimenuitem>Application</guimenuitem>
               <guimenuitem>octet-stream</guimenuitem>
@@ -563,7 +563,7 @@
                 When running &krusader;, use 
                 <menuchoice>
                  <guimenu>Settings</guimenu>
-                 <guimenuitem>Configure &krusader;</guimenuitem>
+                 <guimenuitem>Configure &krusader;...</guimenuitem>
                 </menuchoice>, and it will start 
                 <link linkend="konfigurator">Konfigurator</link>. 
                 Please read the manual, &krusader; has many many configuration options, 
@@ -605,7 +605,7 @@
         <answer>
           <para>An open source project's greatest strength is
           derived from getting user feedback. That is why we love
-          to hear what you have to say. Your "gripes" are our
+          to hear what you have to say. Your <quote>gripes</quote> are our
           instructions. After about 6 months, programmers can no
           longer see their own mistakes. It is natural. We want the
           ideas, qritiques, and feedback because we all want to
@@ -642,8 +642,8 @@
               with the developers on the krusader-devel
               <ulink url="https://krusader.org/get-involved/mailing-lists/index.html">mailing lists</ulink> or on the
               <ulink url="https://phabricator.kde.org/tag/krusader/">&krusader; Phabricator page</ulink>. Unfortunately, we cannot apply
-              a patch if the patch is in conflict with the "general
-              design" of the &krusader; code (read for more
+              a patch if the patch is in conflict with the <quote>general
+              design</quote> of the &krusader; code (read for more
               instructions in this FAQ).
               Please send only one change request per mail, so
               that the discussion is easier to follow. The
@@ -677,7 +677,7 @@
                 <listitem>
                   <para>&kde; 3.3- &kde;
                   3.5 and even on GNOME with
-                  &kde;libs (for &krusader;-2.x) .</para>
+                  kdelibs (for &krusader;-2.x) .</para>
                 </listitem>
                 <listitem>
                   <para>GCC 2.95 - GCC 5.4</para>
@@ -763,7 +763,7 @@
         Since we usually only develop and fix &krusader;-git, compile &krusader;-git in debugmode and install it, than check if the bug still exist.
         <screen><prompt>$</prompt> <userinput><command>cmake</command> <option>-DCMAKE_BUILD_TYPE=debugfull</option></userinput></screen>  
 
-        Install <ulink url="http://valgrind.org">valgrind</ulink>, a suite of tools for debugging and profiling &Linux; programs.
+        Install <ulink url="https://valgrind.org">valgrind</ulink>, a suite of tools for debugging and profiling &Linux; programs.
 
         Run Valgrind/&krusader;
         <screen><prompt>$</prompt> <userinput><command>valgrind</command> <option>--tool=memcheck</option> <replaceable>{foo_path}/krusader</replaceable></userinput></screen>
@@ -853,7 +853,7 @@
         <answer>
           <para>Yes, we do. Feel free to talk to the
           &krusader; Krew and fellow-users via
-          <ulink url="http://freenode.net">freenode.org</ulink> servers. The server is 
+          <ulink url="https://freenode.net">freenode.org</ulink> servers. The server is
           <emphasis>irc.freenode.org</emphasis>, the channel is 
           <emphasis>#krusader</emphasis>. Everyone is
           welcome.</para>
@@ -959,7 +959,7 @@
           native language?</para>
         </question>
         <answer>
-          <para>If you are interested in translating the &krusader; GUI or documentation, please contact the
+          <para>If you are interested in translating the &krusader; &GUI; or documentation, please contact the
                <ulink url="https://l10n.kde.org/teams-list.php">KDE translation team</ulink> of your language.</para>
           <para></para>
           <!-- Empty line to make it more readable -->
@@ -984,8 +984,8 @@
       </qandaentry>
       <qandaentry>
         <question id="faqg_mcstyle">
-          <para>Why is &konqueror; in "midnight
-          commander style" not an 
+          <para>Why is &konqueror; in <quote>Midnight
+          Commander style</quote> not an
           <link linkend="gloss-ofm">OFM</link>?</para>
         </question>
         <answer>
@@ -1004,10 +1004,10 @@
           <link linkend="gloss-ofm">OFM</link>?</para>
         </question>
         <answer>
-          <para>An <ulink url="http://www.softpanorama.org/OFM/index.shtml">Orthodox File Manager (OFM)</ulink> is much faster than a one
+          <para>An <ulink url="https://www.softpanorama.org/OFM/index.shtml">Orthodox File Manager (OFM)</ulink> is much faster than a one
           panel filemanager and faster than the command line. If
           you would like to know 
-          <ulink url="http://www.softpedia.com/reviews/linux/Krusader-Review-18193.shtml">
+          <ulink url="https://www.softpedia.com/reviews/linux/Krusader-18193.shtml">
           how &krusader; feels</ulink>, there is only
           one way to discover: install it on your computer and use
           it for a while. If you prefer to waste time and lose
@@ -1015,7 +1015,7 @@
           which are based on &Windows; Explorer. Matej
           Urbančič has written
           a 
-          <ulink url="http://murban.blogspot.com/2006/01/krusader-and-konqueror-twin-versus-one.html">
+          <ulink url="https://murban.blogspot.com/2006/01/krusader-and-konqueror-twin-versus-one.html">
           blog</ulink> on why 
           <link linkend="gloss-ofm">OFM</link> is better than a one
           panel filemanager.</para>
diff --git a/doc/features.docbook b/doc/features.docbook
index 17f230e2..658126ae 100644
--- a/doc/features.docbook
+++ b/doc/features.docbook
@@ -102,7 +102,7 @@
             <para><link linkend="locate">Locate</link> &GUI; frontend</para>
           </listitem>
           <listitem>
-            <para><link linkend="synchronizer">Synchronize Directories</link></para>
+            <para><link linkend="synchronizer">Synchronize Folders</link></para>
           </listitem>
           <listitem>
             <para>
@@ -196,7 +196,7 @@
           <listitem>
             <para>
             <link linkend="konfig-general">
-            MIME type-aware</link>.</para>
+            &MIME; type-aware</link>.</para>
           </listitem>
           <listitem>
             <para>
@@ -297,7 +297,7 @@
 </para>
 <para>
   <itemizedlist>
-    <title>New features in the &krusader;-1.80.0 "Final 3rd Stone"
+    <title>New features in the &krusader;-1.80.0 <quote>Final 3rd Stone</quote>
     release</title>
     <listitem>
       <para>Archive improvements 
@@ -317,7 +317,7 @@
         <listitem>
           <para>
           <link linkend="archives">Auto-detection support</link>,
-          allowing you to open "hidden archives" (⪚
+          allowing you to open <quote>hidden archives</quote> (⪚
           <trademark class="registered">OpenOffice</trademark> documents).</para>
         </listitem>
         <listitem>
@@ -329,7 +329,7 @@
       <para><link linkend="list_panel">Brief View</link></para>
     </listitem>
     <listitem>
-      <para>Many improvements of the <link linkend="useractions">UserAction</link> system.</para>
+      <para>Many improvements of the <link linkend="useractions">UserActions</link> system.</para>
     </listitem>
     <listitem>
       <para>Countless usability enhancements, especially in Konfigurator and the heavily reordered menubar.</para>
@@ -402,7 +402,7 @@
 
 <para>
   <itemizedlist>
-    <title>New features in the &krusader;-1.90.0 "Power Stone"
+    <title>New features in the &krusader;-1.90.0 <quote>Power Stone</quote>
     release</title>
     <listitem>
       <para>Last release for &kde; 3.x with a big collection of Useractions.
@@ -413,7 +413,7 @@
 
 <para>
   <itemizedlist>
-    <title>New features in the &krusader;-2.0.0 "Mars Pathfinder"
+    <title>New features in the &krusader;-2.0.0 <quote>Mars Pathfinder</quote>
     release</title>
     <listitem>
       <para>The first release for the &kde; 4.x series
@@ -436,7 +436,7 @@
 
 <para>
   <itemizedlist>
-    <title>New features in the &krusader;-2.1.0-beta1 "Rusty Clutch"
+    <title>New features in the &krusader;-2.1.0-beta1 <quote>Rusty Clutch</quote>
     release</title>
     <listitem>
       <para>Fast text/hex viewer for huge filesizes.
@@ -463,7 +463,7 @@
 
 <para>
   <itemizedlist>
-    <title>New features in the &krusader;-2.5.0 "Clear Skies"
+    <title>New features in the &krusader;-2.5.0 <quote>Clear Skies</quote>
     release</title>
     <listitem>
       <para>Ported to &kf5-full;.
@@ -482,7 +482,7 @@
 
 <para>
   <itemizedlist>
-    <title>New features in the &krusader;-2.7.0 "Peace of Mind"
+    <title>New features in the &krusader;-2.7.0 <quote>Peace of Mind</quote>
     release</title>
     <listitem>
       <para>Quick Search in Bookmark menu.
@@ -505,7 +505,7 @@
 
 <para><note><para>
   If you are using a development or &git; version, it is possible that the latest
-  new features are not yet in the "The &krusader; Handbook".
+  new features are not yet in the <quote>The &krusader; Handbook</quote>.
   Please read the
   <ulink url="https://commits.kde.org/krusader?path=ChangeLog">Changelog</ulink>
   file online or in the &krusader; sources to find out more about the new features.
diff --git a/doc/glossary.docbook b/doc/glossary.docbook
index 0e116e69..a502f317 100644
--- a/doc/glossary.docbook
+++ b/doc/glossary.docbook
@@ -74,7 +74,7 @@
     <glossdef>
       <para>This is a binary file format that is used by
       <ulink url="https://en.wikipedia.org/wiki/Debian">
-      <trademark class="registered">Debian</trademark></ulink> and <trademark class="registered">Debian</trademark>-based
+      &Debian;</ulink> and &Debian;-based
       distributions. It is a suffix of a installation file
       specifically built for these distributions; ⪚
       <filename>krusader_1.70.1-1_amd64.deb</filename>. Simply
@@ -198,7 +198,7 @@
       that using the
       <link linkend="keyboard-commands">keyboard</link> is remarkably
       faster than using the menubar or
-      <link linkend="gloss-gui">GUI</link>.
+      <link linkend="gloss-gui">&GUI;</link>.
       <link linkend="keyboard-commands">Keyboard usage</link> is an
       important tool for
       <link linkend="gloss-ofm">Orthodox File Managers</link>.
@@ -216,7 +216,7 @@
       analogous to Bonobo components in <ulink url="https://www.gnome.org"><application>GNOME</application></ulink>,
       both of which are based on the same concepts as
       &Microsoft;'s Object Linking and Embedding. ⪚
-      if you use &krusader;'s viewer to view a PDF file,
+      if you use &krusader;'s viewer to view a &PDF; file,
       &okular; will be launched inside &krusader;'s
       viewer.</para>
     </glossdef>
@@ -254,7 +254,7 @@
     <glossdef>
       <para>
       <ulink url="http://www.softpanorama.org/OFM/index.shtml">
-      Orthodox File Manager</ulink>; also known as "Commanders".
+      Orthodox File Manager</ulink>; also known as <quote>Commanders</quote>.
       Members of this family of file managers use simple yet very
       powerful interface that is a direct derivative of the
       <ulink url="https://en.wikipedia.org/wiki/Norton_Commander">
@@ -345,8 +345,8 @@
       <para><link linkend="vfs">Virtual file systems (VFS)</link> is a basic
       <link linkend="features">OFM feature</link>, this an
       abstracted layer over all kinds of archived information (ZIP
-      files, &FTP; servers, TAR archives, NFS filesystems, SAMBA
-      shares, ISO CD/DVD images, RPM catalogs, &etc;), which allows
+      files, &FTP; servers, TAR archives, &NFS; filesystems, SAMBA
+      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
diff --git a/doc/help.docbook b/doc/help.docbook
index a1f48cb2..86dc497e 100644
--- a/doc/help.docbook
+++ b/doc/help.docbook
@@ -57,12 +57,12 @@
   &krusader; a try. Participate in forums to help others
   in the community.</para>
   <para>
-    <emphasis role="bold">GUI Translations</emphasis>
+    <emphasis role="bold">&GUI; Translations</emphasis>
   </para>
   <para>&krusader; is available in many languages, but
   sometimes translations do need an update or
   translations to new languages are always welcome.
-  If you are interested in translating the &krusader; GUI, please contact the
+  If you are interested in translating the &krusader; &GUI;, please contact the
    <ulink url="https://l10n.kde.org/teams-list.php">&kde; translation team</ulink> of your language.</para>
   <para>
     <emphasis role="bold">Documentation Translations</emphasis>
@@ -80,7 +80,7 @@
     <emphasis role="bold">Packagers</emphasis>
   </para>
   <para>We are always in need of packagers for different distro
-  rpm's, deb's, etc. All help is welcome.</para>
+  rpm's, deb's, &etc; All help is welcome.</para>
   <para>
     <emphasis role="bold">FAQ</emphasis>
   </para>
diff --git a/doc/index.docbook b/doc/index.docbook
index 59c2b352..a43dc434 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -311,7 +311,7 @@
     <legalnotice>
       <para>Permission is granted to copy, distribute and/or modify
       this document under the terms of the 
-      <ulink url="https://www.gnu.org/copyleft/fdl.html">GNU Free
+      <ulink url="https://www.gnu.org/copyleft/fdl.html">&GNU; Free
       Documentation License</ulink>, Version 1.1 or any later
       version published by the Free Software Foundation; with no
       Invariant Sections, with no Front-Cover Texts, and with no
diff --git a/doc/introduction.docbook b/doc/introduction.docbook
index 2002764c..a6f016a4 100644
--- a/doc/introduction.docbook
+++ b/doc/introduction.docbook
@@ -63,7 +63,7 @@
     command line syntax. This is especially helpful if you are new
     to xxNIX operating systems. To do just that,
     &krusader; uses a good-looking &GUI; and
-    supports drag and drop as well as MIME types, making it easy to
+    supports drag and drop as well as &MIME; types, making it easy to
     use.</para>
     <para>&krusader; has many useful features. It is fast, and
     handles <link linkend="archives">archives</link> transparently. In addition,
@@ -83,7 +83,7 @@
     copyright for the project and its name, and manage the
     project's continuing evolution.</para>
     <para>The &krusader; Project mission is to create
-    an "all-in-one" file manager, which will do all the ordinary
+    an <quote>all-in-one</quote> file manager, which will do all the ordinary
     things you would expect of it, and more. Since the principle
     behind &krusader; is based on the
     <ulink url="http://www.softpanorama.org/OFM/index.shtml">Orthodox File Manager (OFM)</ulink>, dual-pane filemanagers (<application>Midnight Commander</application>,
@@ -93,8 +93,8 @@
     <para>From the start, virtual file systems became the main
     focus. <link linkend="vfs">Virtual file systems (VFS)</link> are an abstracted layer over all
     kinds of archived information (ZIP files, &FTP;
-    servers, TAR archives, NFS filesystems, SAMBA shares, ISO
-    CD/DVD images, RPM catalogs, &etc;), which allow the
+    servers, TAR archives, &NFS; filesystems, SAMBA shares, ISO
+    &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
@@ -103,7 +103,7 @@
     all popular and some specialized types of archives (ace, arj,
     bzip2, gzip, iso, lha, rar, tar, zip and 7-zip), configuration
     packages (rpm, deb), and traditional remote file system types
-    (&FTP;, NFS, Samba, FISH, SFTP).</para>
+    (&FTP;, &NFS;, Samba, FISH, SFTP).</para>
     <para>&krusader; also includes a built-in
     Mount-Manager <link linkend="mount-man">MountMan</link>, which enables you to
     mount or unmount file systems of all types with a click of a
diff --git a/doc/keyboard-commands.docbook b/doc/keyboard-commands.docbook
index beaaf49a..46c7af53 100644
--- a/doc/keyboard-commands.docbook
+++ b/doc/keyboard-commands.docbook
@@ -35,10 +35,10 @@
     <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;<keycap>Down arrow</keycap></keycombo> 
+    desired directory. 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. Use <keycombo action="simul">&Ctrl;<keycap>Up arrow</keycap></keycombo> 
+    desire. 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>,
     then simply press <keycap>f</keycap> on the keyboard to use the
@@ -64,7 +64,7 @@
     the
         <menuchoice>
           <guimenu>Settings</guimenu>
-          <guimenuitem>Configure Shortcuts</guimenuitem>
+          <guimenuitem>Configure Shortcuts...</guimenuitem>
         </menuchoice>
       menu, if you like to use other key-bindings then the
       default ones. You can even configure 
@@ -162,7 +162,7 @@
             <entry>
               <para>
                 <link linkend="basic">Create a new
-                directory.</link>
+                folder.</link>
               </para>
             </entry>
           </row>
@@ -326,7 +326,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Shift;
-                <keycap>Left Arrow</keycap></keycombo>
+                &Left;</keycombo>
               </para>
             </entry>
             <entry>
@@ -340,7 +340,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Shift;
-                <keycap>Right Arrow</keycap></keycombo>
+                &Right;</keycombo>
               </para>
             </entry>
             <entry>
@@ -441,11 +441,11 @@
             <entry>
               <para>
                 <keycombo action="simul">&Alt;
-                <keycap>Home</keycap></keycombo>
+                &Home;</keycombo>
               </para>
             </entry>
             <entry>
-              <para>Home</para>
+              <para>Home.</para>
             </entry>
           </row>
           <row>
@@ -465,7 +465,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Alt;
-                <keycap>Left Arrow</keycap></keycombo>
+                &Left;</keycombo>
               </para>
             </entry>
             <entry>
@@ -478,7 +478,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Alt;
-                <keycap>Right Arrow</keycap></keycombo>
+                &Right;</keycombo>
               </para>
             </entry>
             <entry>
@@ -491,7 +491,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Alt;
-                <keycap>Down Arrow</keycap></keycombo>
+                &Down;</keycombo>
               </para>
             </entry>
             <entry>
@@ -601,7 +601,7 @@
             </entry>
             <entry>
               <para>
-                <link linkend="panel_toolbar">Sync panels aka "Equals Button (=)".</link>
+                <link linkend="panel_toolbar">Sync panels aka <quote>Equals Button (=)</quote>.</link>
               </para>
             </entry>
           </row>
@@ -888,7 +888,7 @@
               </para>
             </entry>
             <entry>
-              <para><link linkend="synchronizer">Synchronize Directories</link>.</para>
+              <para><link linkend="synchronizer">Synchronize Folders</link>.</para>
             </entry>
           </row>
           <row>
@@ -900,7 +900,7 @@
             </entry>
             <entry>
               <para>
-                <link linkend="bookman">Popular URLs.</link>
+                <link linkend="bookman">Popular &URL;s.</link>
               </para>
             </entry>
           </row>
@@ -948,7 +948,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Ctrl;
-                <keycap>Down arrow</keycap></keycombo>
+                &Down;</keycombo>
               </para>
             </entry>
             <entry>
@@ -962,7 +962,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Ctrl;
-                <keycap>Up arrow</keycap></keycombo>
+                &Up;</keycombo>
               </para>
             </entry>
             <entry>
@@ -976,7 +976,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Ctrl;
-                <keycap>Up arrow</keycap></keycombo>
+                &Up;</keycombo>
               </para>
             </entry>
             <entry>
@@ -988,7 +988,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Ctrl;
-                <keycap>Home</keycap></keycombo>
+                &Home;</keycombo>
               </para>
             </entry>
             <entry>
@@ -999,16 +999,16 @@
             <entry>
               <para>
               <keycombo action="simul">&Ctrl;
-              <keycap>Left</keycap></keycombo> or 
+              &Left;</keycombo> or
               <keycombo>
-                <keycap>Right arrow</keycap>
+                &Right;
               </keycombo></para>
             </entry>
             <entry>
               <para>Focus a file or directory on the left panel,
               press 
               <keycombo action="simul">&Ctrl;
-              <keycap>Left arrow</keycap></keycombo> and the right 
+              &Left;</keycombo> and the right
               <link linkend="panels">panel</link> changes: 
               <itemizedlist>
                 <listitem>
@@ -1022,7 +1022,7 @@
                 </listitem>
               </itemizedlist>For the right panel: press 
               <keycombo action="simul">&Ctrl;
-              <keycap>Right arrow</keycap></keycombo> and the left
+              &Right;</keycombo> and the left
               panel will change.</para>
             </entry>
           </row>
@@ -1041,7 +1041,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Ctrl;
-                <keycap>PageUp</keycap></keycombo>
+                &PgUp;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1177,7 +1177,7 @@
               <para>
                 <keycombo action="simul">
                 &Ctrl;&Shift;
-                <keycap>Left arrow</keycap></keycombo>
+                &Left;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1191,7 +1191,7 @@
               <para>
                 <keycombo action="simul">
                 &Ctrl;&Shift;
-                <keycap>Right arrow</keycap></keycombo>
+                &Right;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1205,7 +1205,7 @@
               <para>
                 <keycombo action="simul">
                 &Ctrl;&Shift;
-                <keycap>Up arrow</keycap></keycombo>
+                &Up;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1220,7 +1220,7 @@
               <para>
                 <keycombo action="simul">
                 &Ctrl;&Shift;
-                <keycap>Down arrow</keycap></keycombo>
+                &Down;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1235,7 +1235,7 @@
               <para>
                 <keycombo action="simul">
                 &Ctrl;&Shift;
-                <keycap>PageUp</keycap></keycombo>
+                &PgUp;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1248,7 +1248,7 @@
               <para>
                 <keycombo action="simul">
                 &Ctrl;&Shift;
-                <keycap>PageDown</keycap></keycombo>
+                &PgDn;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1347,7 +1347,7 @@
               <para>
                 <keycombo action="simul">
                 &Ctrl;&Alt;
-                <keycap>Left Arrow</keycap></keycombo>
+                &Left;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1362,7 +1362,7 @@
               <para>
                 <keycombo action="simul">
                 &Ctrl;&Alt;
-                <keycap>Right Arrow</keycap></keycombo>
+                &Right;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1435,7 +1435,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Ctrl;
-                <keycap>PageDown</keycap></keycombo>
+                &PgDn;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1553,7 +1553,7 @@
           <row>
             <entry>
               <para>
-                <keycap>Space</keycap>
+                &Space;
               </para>
             </entry>
             <entry>
@@ -1575,11 +1575,11 @@
           <row>
             <entry>
               <para>
-                <keycap>Insert</keycap>
+                &Ins;
               </para>
             </entry>
             <entry>
-              <para>Does the same as the <keycap>Space</keycap> key 
+              <para>Does the same as the &Space; key
               <link linkend="selecting-files">and goes down one
               position to toggle the next file.</link></para>
             </entry>
@@ -1597,7 +1597,7 @@
           <row>
             <entry>
               <para>
-                <keycap>Home</keycap>
+                &Home;
               </para>
             </entry>
             <entry>
@@ -1607,7 +1607,7 @@
           <row>
             <entry>
               <para>
-                <keycap>End</keycap>
+                &End;
               </para>
             </entry>
             <entry>
@@ -1630,8 +1630,8 @@
           <row>
             <entry>
               <para>
-              <keycap>Up arrow</keycap> and 
-              <keycap>Down arrow</keycap></para>
+              &Up; arrow and
+              &Down; arrow</para>
             </entry>
             <entry>
               <para>Scroll through previously typed
@@ -1653,7 +1653,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Ctrl;
-                <keycap>Up arrow</keycap></keycombo>
+                &Up;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1665,7 +1665,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Ctrl;
-                <keycap>Down arrow</keycap></keycombo>
+                &Down;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1736,7 +1736,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Ctrl;
-                <keycap>Up arrow</keycap></keycombo>
+                &Up;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1748,7 +1748,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Ctrl;
-                <keycap>Down arrow</keycap></keycombo>
+                &Down;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1772,7 +1772,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Shift;
-                <keycap>Insert</keycap></keycombo>
+                &Ins;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1806,7 +1806,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Alt;
-                <keycap>Down arrow</keycap></keycombo>
+                &Down;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1817,7 +1817,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Alt;
-                <keycap>Up arrow</keycap></keycombo>
+                &Up;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1828,7 +1828,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Alt;
-                <keycap>Left arrow</keycap></keycombo>
+                &Left;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1839,7 +1839,7 @@
             <entry>
               <para>
                 <keycombo action="simul">&Alt;
-                <keycap>Right arrow</keycap></keycombo>
+                &Right;</keycombo>
               </para>
             </entry>
             <entry>
@@ -1921,7 +1921,7 @@
             <entry>
               <para>
                 <keycombo action="simul">
-                  <keycap>Meta</keycap>
+                  &Meta;
                   <keycap>A</keycap>
                 </keycombo>
               </para>
@@ -1934,7 +1934,7 @@
             <entry>
               <para>
                 <keycombo action="simul">
-                  <keycap>Meta</keycap>
+                  &Meta;
                   <keycap>1</keycap>
                 </keycombo>
               </para>
@@ -1947,7 +1947,7 @@
             <entry>
               <para>
                 <keycombo action="simul">
-                  <keycap>Meta</keycap>
+                  &Meta;
                   <keycap>2</keycap>
                 </keycombo>
               </para>
@@ -1960,7 +1960,7 @@
             <entry>
               <para>
                 <keycombo action="simul">
-                  <keycap>Meta</keycap>
+                  &Meta;
                   <keycap>3</keycap>
                 </keycombo>
               </para>
@@ -1973,7 +1973,7 @@
             <entry>
               <para>
                 <keycombo action="simul">
-                  <keycap>Meta</keycap>
+                  &Meta;
                   <keycap>4</keycap>
                 </keycombo>
               </para>
@@ -1986,7 +1986,7 @@
             <entry>
               <para>
                 <keycombo action="simul">
-		<keycap>Meta</keycap>
+		&Meta;
                 <keycap>F5</keycap></keycombo>
               </para>
             </entry>
@@ -2019,8 +2019,8 @@
         <para><link linkend="locate">Locate</link> &GUI; frontend</para>
       </listitem>
       <listitem>
-        <para>&systemsettings; ->
-        <guilabel>Common Appearance and Behavior</guilabel> -> <guilabel>Shortcuts and Gestures</guilabel></para>
+        <para><menuchoice><guimenu>Common Appearance and Behavior</guimenu><guisubmenu>Shortcuts
+        and Gestures</guisubmenu></menuchoice> module in the &plasma; &systemsettings;.</para>
       </listitem>
       <listitem>
         <para><link linkend="useractions">UserActions</link> configurable
diff --git a/doc/konfigurator.docbook b/doc/konfigurator.docbook
index a38fbbfc..ae00ca72 100644
--- a/doc/konfigurator.docbook
+++ b/doc/konfigurator.docbook
@@ -27,14 +27,14 @@
   center. When running &krusader;, use
                 <menuchoice>
                  <guimenu>Settings</guimenu>
-                 <guimenuitem>Configure &krusader;</guimenuitem>
+                 <guimenuitem>Configure &krusader;...</guimenuitem>
                 </menuchoice>, and it will start Konfigurator.
   There you can modify the way &krusader; works
   and customize it to your own needs. At any time, pressing the
   <guibutton>Apply</guibutton> button applies the changes, pressing
   <guibutton>Close</guibutton> closes Konfigurator, and pressing
   <guibutton>Defaults</guibutton> re-applies &krusader;'s
-  "factory" settings. Konfigurator is divided into pages, each
+  <quote>factory</quote> settings. Konfigurator is divided into pages, each
   containing items related to that page. For some changes to the
   &GUI;, you have to close and restart
   &krusader;.</para>
@@ -135,7 +135,7 @@
             </listitem>
             <listitem>
               <para>
-              <guilabel>Start to tray</guilabel>: if checked,
+              <guilabel>Start to system tray</guilabel>: if checked,
               &krusader; starts to tray (if minimize to
               tray is set), without showing the main window.</para>
             </listitem>
@@ -207,20 +207,19 @@
         </title>
         <listitem>
           <para>
-          <guilabel>Autoselect Directories</guilabel>: When
+          <guilabel>Autoselect Folders</guilabel>: When
           <link linkend="edit-menu">you select a group of
           files</link> (either by using <guilabel>Select Group</guilabel> or by using
           <guilabel>Select All</guilabel>), &krusader; checks this option. If
-          checked, the directories matching the select criteria are
+          checked, the folders matching the select criteria are
           also selected. Otherwise, only files are selected.</para>
         </listitem>
         <listitem>
           <para>
           <guilabel>Rename selects extension</guilabel>: When
-          <link linkend="renaming">you rename a file</link>, the
-          whole text is selected. If you want total commanderlike
-          renaming of just the name, without extension, deselect
-          this item.</para>
+          <link linkend="renaming">you rename a file</link>, the whole text is selected.
+          If you want <trademark class="copyright">Total Commander</trademark> like
+          renaming of just the name, without extension, deselect this item.</para>
         </listitem>
         <listitem>
           <para>
@@ -286,11 +285,11 @@
         </listitem>
         <listitem>
           <para>
-          <guilabel>Up/Down cancels search</guilabel>: Pressing <keycap>Arrow Up</keycap> or <keycap>Arrow Down</keycap> cancels <link linkend="quicksearch">search</link> bar.</para>
+          <guilabel>Up/Down cancels search</guilabel>: Pressing &Up; or &Down; key cancels <link linkend="quicksearch">search</link> bar.</para>
         </listitem>
         <listitem>
           <para>
-              <guilabel>Directory navigation with Right Arrow</guilabel>: If checked, pressing the <keycap>Right arrow</keycap> key enters directory if no search text editing intention is captured.
+              <guilabel>Folder navigation with Right Arrow</guilabel>: If checked, pressing the &Right; key enters folder if no search text editing intention is captured.
           </para>
         </listitem>
         <listitem>
@@ -310,13 +309,11 @@
         </title>
         <listitem>
           <para>
-          <guilabel>Always show search bar</guilabel>:  If checked,
-          make <link linkend="bookman">bookmark search bar</link> always visible.</para>
+          <guilabel>Always show search bar</guilabel>: If checked, make <link linkend="bookman">bookmark search bar</link> always visible.</para>
         </listitem>
         <listitem>
           <para>
-          <guilabel>Search in special items</guilabel>:  If checked,
-          <link linkend="bookman">bookmark search</link> is also applied to special items in bookmark menu like <guimenuitem>Trash</guimenuitem>, <guimenuitem>Popular URLs</guimenuitem>, <guimenuitem>Jump Back</guimenuitem>, &etc;</para>
+          <guilabel>Search in special items</guilabel>: If checked, <link linkend="bookman">bookmark search</link> is also applied to special items in bookmark menu like <guimenuitem>Trash</guimenuitem>, <guimenuitem>Popular &URL;s</guimenuitem>, <guimenuitem>Jump Back</guimenuitem>, &etc;</para>
         </listitem>
       </itemizedlist>
       <itemizedlist>
@@ -325,13 +322,13 @@
         </title>
         <listitem>
           <para>
-          <guilabel>Show size in bytes too</guilabel>:  If checked,
+          <guilabel>Show size in bytes too</guilabel>: If checked,
           &krusader; displays size in bytes on statusbar or totalsbar.</para>
         </listitem>
         <listitem>
           <para>
-          <guilabel>Show space information</guilabel>:  If checked,
-	  &krusader; displays free/total disk space in the Status-/Totalsbar.</para>
+          <guilabel>Show space information</guilabel>: If checked,
+	      &krusader; displays free/total disk space in the Status-/Totalsbar.</para>
         </listitem>
       </itemizedlist>
     </sect2>
@@ -359,14 +356,13 @@
         </listitem>
         <listitem>
           <para>
-          <guilabel>Numeric permissions</guilabel>: Permission
-          column (<guilabel>Panel</guilabel> <guilabel>View</guilabel> tab) shows octal numbers '0755'
-          instead of 'rwxr-xr-x'.</para>
+          <guilabel>Numeric permissions</guilabel>: <guilabel>Permission</guilabel>
+          column shows octal numbers '<literal>0755</literal>' instead of '<literal>rwxr-xr-x</literal>'.</para>
         </listitem>
         <listitem>
           <para>
           <guilabel>Show hidden files</guilabel>: If checked,
-          &krusader; displays the "dot-files" which are
+          &krusader; displays the <quote>dot-files</quote> which are
           otherwise hidden.</para>
         </listitem>
         <listitem>
@@ -431,18 +427,18 @@
         <listitem>
           <para>
           <guilabel>Always sort dirs by name</guilabel>: Sorts
-          directories by name, regardless of the sort
+          folders by name, regardless of the sort
           column.</para>
         </listitem>
         <listitem>
           <para>
-          <guilabel>Show directories first</guilabel>: If checked
-          directories have precedence in folder lists.</para>
+          <guilabel>Show folders first</guilabel>: If checked
+          folders have precedence in folder lists.</para>
         </listitem>
         <listitem>
           <para>
           <guilabel>Locale aware sorting</guilabel>: Sorts
-          files and directories according to the current locale settings.</para>
+          files and folders according to the current locale settings.</para>
         </listitem>
       </itemizedlist>
       <itemizedlist>
@@ -458,7 +454,7 @@
           <para>
           <guilabel>Default icon size</guilabel>: Allows you to
           change the size of the icons in the file lists. The
-          available sizes are 16x16, 22x22, 32x32 and 48x48
+          available sizes are 12x12, 16x16, 22x22, 32x32, 48x48, 64x64, 128x128 and 256x256
           pixels.</para>
         </listitem>
         <listitem>
@@ -493,7 +489,7 @@
             </listitem>
             <listitem>
               <para>
-              <guilabel>Type</guilabel>: Shows the MIME type
+              <guilabel>Type</guilabel>: Shows the &MIME; type
               field.</para>
             </listitem>
             <listitem>
@@ -508,17 +504,16 @@
             </listitem>
             <listitem>
               <para>
-              <guilabel>Perms</guilabel>: Shows the full permissions
-              ⪚ "rwxr-xr-x" or as octal numbers
-              '0755' instead with enable/disable
+              <guilabel>Perms</guilabel>: Shows the full permissions,
+              ⪚, '<literal>rwxr-xr-x</literal>' or as octal numbers
+              '<literal>0755</literal>' instead with enable/disable
               <guilabel>Numeric Permissions</guilabel> in 
-              <guilabel>Panel</guilabel>
-              <guilabel>View</guilabel> Tab.</para>
+              <guilabel>Panel View</guilabel> Tab.</para>
             </listitem>
             <listitem>
               <para>
               <guilabel>rwx</guilabel>: Shows only the rights of
-              the current user ⪚ "-rw".</para>
+              the current user, ⪚, <quote>-rw</quote>.</para>
             </listitem>
             <listitem>
               <para>
@@ -614,7 +609,7 @@
         </listitem>
         <listitem>
           <para>
-          <guilabel>Konqueror Mode</guilabel>: pressing the
+          <guilabel>&konqueror; Mode</guilabel>: pressing the
           &LMB; selects files --
           <!-- Openjade does not like an application element for "Konqueror" here -->
           you can click and select multiple files. Right-click menu
@@ -628,7 +623,7 @@
           <!-- Openjade does not like an trademark element for "Total commander" here -->
           and the right-click menu appears with
           <guilabel>pressing and holding</guilabel> the
-          &RMB;. The Left Mouse Button does not select,
+          &RMB;. The &LMB; does not select,
           but sets the current file without affecting the current
           selection.</para>
         </listitem>
@@ -652,15 +647,14 @@
           <para>
           <guilabel>Double-click selects (classic)</guilabel>: A
           single click on a file will select and focus, a double
-          click opens the file or steps into the directory.</para>
+          click opens the file or steps into the folder.</para>
         </listitem>
         <listitem>
           <para>
           <guilabel>Obey global selection policy</guilabel>:
           Pressing the &LMB; selects files -- Use
-          global setting: &plasma;
-          System Settings -> Input Devices
-          -> Mouse.</para>
+          global setting: <menuchoice><guimenu>Input Devices</guimenu> <guimenuitem>Mouse
+          </guimenuitem></menuchoice> module in the &plasma; &systemsettings;.</para>
         </listitem>
         <listitem>
           <para>Custom Selection Mode items:
@@ -672,36 +666,32 @@
             </listitem>
             <listitem>
               <para>
-                <guilabel>Left mouse button selects</guilabel>
+                <guilabel>&LMB; selects</guilabel>
               </para>
             </listitem>
             <listitem>
               <para>
-                <guilabel>Left mouse button preserves
-                selection</guilabel>
+                <guilabel>&LMB; preserves selection</guilabel>
               </para>
             </listitem>
             <listitem>
               <para>
-                <guilabel>&Shift;/&Ctrl;-Left mouse button
-                selects</guilabel>
+                  <guilabel>&Shift;/<keycombo>&Ctrl;<keycap>left clicking</keycap></keycombo> selects</guilabel>
               </para>
             </listitem>
             <listitem>
               <para>
-                <guilabel>Right mouse button selects</guilabel>
+                <guilabel>&RMB; selects</guilabel>
               </para>
             </listitem>
             <listitem>
               <para>
-                <guilabel>Right mouse button preserves
-                selection</guilabel>
+                <guilabel>&RMB; preserves selection</guilabel>
               </para>
             </listitem>
             <listitem>
               <para>
-                <guilabel>&Shift;/&Ctrl;-Right mouse button
-                selects</guilabel>
+                  <guilabel>&Shift;/<keycombo>&Ctrl;<keycap>right clicking</keycap></keycombo> selects</guilabel>
               </para>
             </listitem>
             <listitem>
@@ -756,11 +746,11 @@
         </listitem>
         <listitem>
           <para>
-          <guilabel>Frame Shape:</guilabel> defines frame color. Can be <guimenuitem>Defined by Layout</guimenuitem>, <guimenuitem>None</guimenuitem>, or <guimenuitem>Statusbar</guimenuitem>.</para>
+          <guilabel>Frame Shape:</guilabel> defines frame color. Can be <guimenuitem>Defined by Layout</guimenuitem>, <guimenuitem>None</guimenuitem>, <guimenuitem>Box</guimenuitem>, or <guimenuitem>Panel</guimenuitem>.</para>
         </listitem>
         <listitem>
           <para>
-          <guilabel>Frame Shadow:</guilabel> defines frame color. Can be <guimenuitem>Defined by Layout</guimenuitem>, <guimenuitem>None</guimenuitem>, or <guimenuitem>Statusbar</guimenuitem>.</para>
+          <guilabel>Frame Shadow:</guilabel> defines frame color. Can be <guimenuitem>Defined by Layout</guimenuitem>, <guimenuitem>None</guimenuitem>, <guimenuitem>Raised</guimenuitem>, or <guimenuitem>Sunken</guimenuitem>.</para>
         </listitem>
       </itemizedlist></para>
     </sect2>
@@ -770,7 +760,7 @@
     <para>This page configures the colors of the
     <link linkend="list_panel">List Panel</link> and the
     <link linkend="synchronizer">Synchronizer</link>. The
-    <guilabel>KDE default colors</guilabel> is the default color
+    <guilabel>&kde; default colors</guilabel> is the default color
     configuration.</para>
 
     <variablelist>
@@ -782,7 +772,7 @@
           <itemizedlist>
             <listitem>
               <para>
-              <guilabel>Use the default KDE colors</guilabel>: this
+              <guilabel>Use the default &kde; colors</guilabel>: this
               is the default, it uses &plasma; color
               defined in the &systemsettings;.</para>
             </listitem>
@@ -837,7 +827,7 @@
             </listitem>
             <listitem>
               <para>
-                <guilabel>Directory foreground</guilabel>
+                <guilabel>Folder foreground</guilabel>
               </para>
             </listitem>
             <listitem>
@@ -1005,17 +995,17 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    <guilabel>Minimize to tray</guilabel>: If checked, the &krusader;
+	    <guilabel>Show and close to tray</guilabel>: If checked, the &krusader;
         icon will appear in the system tray.
         When you minimize &krusader;, it will not appear in the taskbar.
         It also will not exit if you close the main window.
-        Instead you can quit &krusader; by selecting <guimenuitem>Quit</guimenuitem> from the <guimenu>File</guimenu> menu
-        or the context menu of the tray icon.
+        Instead you can quit &krusader; by selecting <menuchoice><guimenu>File</guimenu>
+        <guimenuitem>Quit</guimenuitem></menuchoice> menu item or the context menu of the tray icon.
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    <guilabel>Use MIME type magic</guilabel>: MIME type magic is
+	    <guilabel>Use &MIME; type magic</guilabel>: &MIME; type magic is
 	    a mechanism which allows &krusader; to inspect
 	    the files in the panels and determine their type even if
 	    the file has no identifying extension. For example, if you
@@ -1023,20 +1013,20 @@
 	    <filename>image1</filename>, &krusader; will still know it is an
 	    image file and work with it accordingly. However, this mode
 	    of operation is slower (while refreshing the panel, or
-	    changing directories), so try &krusader; with
-	    and without MIME type magic and decide what is best for
+	    changing folders), so try &krusader; with
+	    and without &MIME; type magic and decide what is best for
 	    you.</para>
 	 </listitem>
 	 <listitem>
 	   <para>
-	     <guilabel>Temp Directory</guilabel>: this option selects
-	     the base directory for &krusader;'s temporary
+	     <guilabel>Temp Folder</guilabel>: this option selects
+	     the base folder for &krusader;'s temporary
 	     files. The actual files will be created in separate
-	     directories under the 'Temp directory', so that each user
+	     folders under the 'Temp folder', so that each user
 	     running &krusader; will have their own temporary
-	     subdirectories under the chosen directory.
+	     subfolders under the chosen folder.
 	     <note>
-	       <para>You must choose a temporary directory to which all
+	       <para>You must choose a temporary folder to which all
 		 users running &krusader; have full
 		 permissions!</para>
 	     </note>
@@ -1168,7 +1158,7 @@
               mount point), &krusader; will check if it
               is mounted. If not, it will try and mount it for you
               and then enter, so that you would see the contents of
-              your cdrom. Note, however, that &krusader;
+              your &CD-ROM;. Note, however, that &krusader;
               will NOT unmount when exiting
               <filename class="directory">
               /mnt/cdrom</filename>.</para>
@@ -1209,16 +1199,16 @@
           will be done without warning:</para>
           <itemizedlist>
             <listitem>
-              <para>deleting non empty directories</para>
+              <para>Deleting non-empty folders</para>
             </listitem>
             <listitem>
-              <para>deleting file(s)</para>
+              <para>Deleting files</para>
             </listitem>
             <listitem>
-              <para>copying file(s)</para>
+              <para>Copying files</para>
             </listitem>
             <listitem>
-              <para>moving file(s)</para>
+              <para>Moving files</para>
             </listitem>
           </itemizedlist>
         </listitem>
@@ -1231,7 +1221,7 @@
           <itemizedlist>
             <listitem>
               <para>
-              <guilabel>Icon Cache Size</guilabel>:
+              <guilabel>Icon cache size (KB)</guilabel>:
               &krusader; uses an icon cache, so it will not
               have to reload icons that have been used before. Of
               course, as the cache grows bigger, it can store more
@@ -1281,10 +1271,9 @@
 	</term>
 	<listitem>
 	  <para>
-	    <guilabel>Browse Archives As Directories</guilabel>: if checked,
-            &krusader; will handle the archives transparently and let you open them as
-    folders; otherwise, &krusader; will attempt to
-    invoke an application which opens archives of that type.
+	    <guilabel>Browse Archives As Folders</guilabel>: if checked, &krusader;
+        will handle the archives transparently and let you open them as folders;
+        otherwise, &krusader; will attempt to invoke an application which opens archives of that type.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -1306,14 +1295,14 @@
             <para>If such a thing happens, the file(s) are NOT
             LOST. They were actually moved into a subfolder in
             &krusader;'s
-            <link linkend="konfig-general">temp directory</link>.
-            You can search the directory and recover your
+            <link linkend="konfig-general">temp folder</link>.
+            You can search the folder and recover your
             files.</para>
           </note></para>
 	</listitem> -->
         <listitem>
           <para>
-          <guilabel>Test archives after packing</guilabel>:
+          <guilabel>Test archive after packing</guilabel>:
           this option automatically runs a test on a newly packed
           archive. It is safer, but takes longer.</para>
         </listitem>
@@ -1499,7 +1488,7 @@
     ones that are available (filled) are supported by
     &krusader;. For them, &krusader;
     will handle the archives transparently and let you open them as
-    folders (provided you have checked the <guilabel>Browse Archives As Directories</guilabel>
+    folders (provided you have checked the <guilabel>Browse Archives As Folders</guilabel>
     item in the <link linkend="konfig-archives">Archives</link> section); otherwise, &krusader; will attempt to
     invoke an application which opens archives of that type. If a
     certain archive item is empty, it means that
@@ -1986,8 +1975,8 @@
   </sect1>
   <sect1 id="konfig-protocols">
     <title>Protocols</title>
-    <para>This page links the MIMEs to protocols. ⪚
-    protocol "tar" is linked to MIME "application/x-tar".</para>
+    <para>This page links the &MIME;s to protocols. ⪚
+    protocol <quote>tar</quote> is linked to &MIME; <quote>application/x-tar</quote>.</para>
 
     <para>In the
     <guilabel>Links</guilabel> you will see ⪚
diff --git a/doc/locate.docbook b/doc/locate.docbook
index d61ecba4..6016125d 100644
--- a/doc/locate.docbook
+++ b/doc/locate.docbook
@@ -33,7 +33,7 @@
   <command>updatedb</command> every night (set with <application>KCron</application>). Choose 
     <menuchoice>
       <guimenu>Tools</guimenu>
-      <guimenuitem>Locate</guimenuitem>
+      <guimenuitem>Locate...</guimenuitem>
     </menuchoice>
   or 
   <keycombo action="simul">&Ctrl;&Shift;
diff --git a/doc/menu-commands.docbook b/doc/menu-commands.docbook
index 02543dcc..116b868d 100644
--- a/doc/menu-commands.docbook
+++ b/doc/menu-commands.docbook
@@ -33,7 +33,7 @@
               <keycap>F4</keycap></keycombo>
             </shortcut>
             <guimenu>File</guimenu>
-            <guimenuitem>New Text File</guimenuitem>
+            <guimenuitem>New Text File...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -49,12 +49,12 @@
               <keycap>F7</keycap>
             </shortcut>
             <guimenu>File</guimenu>
-            <guimenuitem>New Directory</guimenuitem>
+            <guimenuitem>New Folder</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
-          <para>Creates a new directory in the current
-          directory.</para>
+          <para>Creates a new folder in the current
+          folder.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
@@ -66,7 +66,7 @@
               <keycap>S</keycap></keycombo>
             </shortcut>
             <guimenu>File</guimenu>
-            <guimenuitem>New Symlink</guimenuitem>
+            <guimenuitem>New Symlink...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -143,7 +143,7 @@
               <keycap>P</keycap></keycombo>
             </shortcut>
             <guimenu>File</guimenu>
-            <guimenuitem>Pack</guimenuitem>
+            <guimenuitem>Pack...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -161,7 +161,7 @@
               <keycap>U</keycap></keycombo>
             </shortcut>
             <guimenu>File</guimenu>
-            <guimenuitem>Unpack</guimenuitem>
+            <guimenuitem>Unpack...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -191,7 +191,7 @@
         <term>
           <menuchoice>
             <guimenu>File</guimenu>
-            <guimenuitem>Compare by Content</guimenuitem>
+            <guimenuitem>Compare by Content...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -211,7 +211,7 @@
               <keycap>F2</keycap></keycombo>
             </shortcut>
             <guimenu>File</guimenu>
-            <guimenuitem>Multi Rename</guimenuitem>
+            <guimenuitem>Multi Rename...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -270,7 +270,7 @@
         <term>
           <menuchoice>
             <guimenu>File</guimenu>
-            <guimenuitem>Create Checksum</guimenuitem>
+            <guimenuitem>Create Checksum...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -283,7 +283,7 @@
         <term>
           <menuchoice>
             <guimenu>File</guimenu>
-            <guimenuitem>Verify Checksum</guimenuitem>
+            <guimenuitem>Verify Checksum...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -301,7 +301,7 @@
               <keycap>P</keycap></keycombo>
             </shortcut>
             <guimenu>File</guimenu>
-            <guimenuitem>Split File</guimenuitem>
+            <guimenuitem>Split File...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -320,7 +320,7 @@
               <keycap>B</keycap></keycombo>
             </shortcut>
             <guimenu>File</guimenu>
-            <guimenuitem>Combine Files</guimenuitem>
+            <guimenuitem>Combine Files...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -445,7 +445,7 @@
               <keycap>+</keycap></keycombo>
             </shortcut>
             <guimenu>Edit</guimenu>
-            <guimenuitem>Select Group</guimenuitem>
+            <guimenuitem>Select Group...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -480,7 +480,7 @@
               <keycap>-</keycap></keycombo>
             </shortcut>
             <guimenu>Edit</guimenu>
-            <guimenuitem>Unselect Group</guimenuitem>
+            <guimenuitem>Unselect Group...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -560,7 +560,7 @@
               <keycap>F</keycap></keycombo>
             </shortcut>
             <guimenu>Edit</guimenu>
-            <guimenuitem>Find in folder</guimenuitem>
+            <guimenuitem>Find in folder...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -644,7 +644,7 @@
               <keysym>Return</keysym></keycombo>
             </shortcut>
             <guimenu>Edit</guimenu>
-            <guimenuitem>Properties</guimenuitem>
+            <guimenuitem>Properties...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -662,7 +662,7 @@
           <menuchoice>
             <shortcut>
               <keycombo action="simul">&Alt;
-              <keysym>Up</keysym></keycombo>
+              &Up;</keycombo>
             </shortcut>
             <guimenu>Go</guimenu>
             <guimenuitem>Up</guimenuitem>
@@ -678,7 +678,7 @@
           <menuchoice>
             <shortcut>
               <keycombo action="simul">&Alt;
-              <keysym>Left</keysym></keycombo>
+              &Left;</keycombo>
             </shortcut>
             <guimenu>Go</guimenu>
             <guimenuitem>Back</guimenuitem>
@@ -694,7 +694,7 @@
           <menuchoice>
             <shortcut>
               <keycombo action="simul">&Alt;
-              <keysym>Right</keysym></keycombo>
+              &Right;</keycombo>
             </shortcut>
             <guimenu>Go</guimenu>
             <guimenuitem>Forward</guimenuitem>
@@ -711,7 +711,7 @@
           <menuchoice>
             <shortcut>
               <keycombo action="simul">&Alt;
-              <keysym>Home</keysym></keycombo>
+              &Home;</keycombo>
             </shortcut>
             <guimenu>Go</guimenu>
             <guimenuitem>Home</guimenuitem>
@@ -746,7 +746,7 @@
               <keycap>Z</keycap></keycombo>
             </shortcut>
             <guimenu>Go</guimenu>
-            <guimenuitem>Popular URLs</guimenuitem>
+            <guimenuitem>Popular &URL;s...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -768,7 +768,7 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Sets the current directory as a "jump back" point.
+          <para>Sets the current directory as a <quote>jump back</quote> point.
           To navigate to this directory quickly, select the <guimenuitem>Jump
           Back</guimenuitem> command from the <guimenu>Go</guimenu> menu.</para>
         </listitem>
@@ -785,7 +785,7 @@
           </menuchoice>
         </term>
         <listitem>
-          <para>Returns to a previous "jump back" point.</para>
+          <para>Returns to a previous <quote>jump back</quote> point.</para>
         </listitem>
       </varlistentry>
     </variablelist>
@@ -995,7 +995,7 @@
           <menuchoice>
             <shortcut>
               <keycombo action="simul">
-                <keycap>Meta</keycap>
+                &Meta;
                 <keycap>A</keycap>
               </keycombo>
             </shortcut>
@@ -1079,7 +1079,7 @@
           <menuchoice>
             <shortcut>
               <keycombo action="simul">
-                <keycap>Meta</keycap><keycap>F5</keycap>
+                &Meta;<keycap>F5</keycap>
               </keycombo>
             </shortcut>
             <guimenu>Useractions</guimenu><guisubmenu>System</guisubmenu>
@@ -1096,7 +1096,7 @@
           <menuchoice>
             <shortcut>
               <keycombo action="simul">
-                <keycap>Meta</keycap>
+                &Meta;
                 <keycap>1</keycap>
               </keycombo>
             </shortcut>
@@ -1115,7 +1115,7 @@
           <menuchoice>
             <shortcut>
               <keycombo action="simul">
-                <keycap>Meta</keycap>
+                &Meta;
                 <keycap>2</keycap>
               </keycombo>
             </shortcut>
@@ -1136,7 +1136,7 @@
           <menuchoice>
             <shortcut>
               <keycombo action="simul">
-                <keycap>Meta</keycap>
+                &Meta;
                 <keycap>3</keycap>
               </keycombo>
             </shortcut>
@@ -1156,7 +1156,7 @@
           <menuchoice>
             <shortcut>
               <keycombo action="simul">
-                <keycap>Meta</keycap>
+                &Meta;
                 <keycap>4</keycap>
               </keycombo>
             </shortcut>
@@ -1184,7 +1184,7 @@
               <keycap>S</keycap></keycombo>
             </shortcut>
             <guimenu>Tools</guimenu>
-            <guimenuitem>Search</guimenuitem>
+            <guimenuitem>Search...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -1202,7 +1202,7 @@
               <keycap>L</keycap></keycombo>
             </shortcut>
             <guimenu>Tools</guimenu>
-            <guimenuitem>Locate</guimenuitem>
+            <guimenuitem>Locate...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -1218,11 +1218,11 @@
               <keycap>Y</keycap></keycombo>
             </shortcut>
             <guimenu>Tools</guimenu>
-            <guimenuitem>Synchronize Directories</guimenuitem>
+            <guimenuitem>Synchronize Folders</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
-          <para>The <link linkend="synchronizer">Synchronize Directories</link> function compares the
+          <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
@@ -1237,7 +1237,7 @@
               <keycap>/</keycap></keycombo>
             </shortcut>
             <guimenu>Tools</guimenu>
-            <guimenuitem>MountMan</guimenuitem>
+            <guimenuitem>MountMan...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -1254,7 +1254,7 @@
               <keycap>S</keycap></keycombo>
             </shortcut>
             <guimenu>Tools</guimenu>
-            <guimenuitem>Disk Usage</guimenuitem>
+            <guimenuitem>Disk Usage...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -1765,7 +1765,7 @@
         <term>
           <menuchoice>
             <guimenu>Settings</guimenu>
-            <guimenuitem>Configure Shortcuts</guimenuitem>
+            <guimenuitem>Configure Shortcuts...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -1812,7 +1812,7 @@
         <term>
           <menuchoice>
             <guimenu>Settings</guimenu>
-            <guimenuitem>Configure Toolbars</guimenuitem>
+            <guimenuitem>Configure Toolbars...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -1828,7 +1828,7 @@
           <menuchoice>
             <guimenu>Settings</guimenu>
             <guimenuitem>Configure
-            &krusader;</guimenuitem>
+            &krusader;...</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
diff --git a/doc/mount.docbook b/doc/mount.docbook
index c607e280..6ff28f27 100644
--- a/doc/mount.docbook
+++ b/doc/mount.docbook
@@ -72,7 +72,7 @@
     <para>We plan to expand MountMan in the next evolution of &krusader;. It will be able
     to format partitions, edit <filename>/etc/fstab</filename>,
     create new file systems and more.... By the way, we have started working on it,
-    see "Quickmode for MountMan".</para>
+    see <quote>Quickmode for MountMan</quote>.</para>
   </note>
   <para>
     <emphasis role="bold">Quickmode for MountMan</emphasis>
@@ -85,5 +85,5 @@
   umount). This offers a quick interface to MountMan. It is
   working, and currently uses KMountMan::mount and unmount. It uses
   the new &kf5-full; services for fstab-reading and this will
-  enable us to remove a lot of code from the "old" MountMan.</para>
+  enable us to remove a lot of code from the <quote>old</quote> MountMan.</para>
 </sect1>
diff --git a/doc/release-overview.docbook b/doc/release-overview.docbook
index 36e04a9b..98f9aa2d 100644
--- a/doc/release-overview.docbook
+++ b/doc/release-overview.docbook
@@ -42,7 +42,7 @@
       <tbody>
         <row>
           <entry>
-            <para>2.7.2 "Peace of Mind"</para>
+            <para>2.7.2 <quote>Peace of Mind</quote></para>
           </entry>
           <entry>
             <para>2019-08-25</para>
@@ -53,7 +53,7 @@
         </row>
         <row>
           <entry>
-            <para>2.7.1 "Peace of Mind"</para>
+            <para>2.7.1 <quote>Peace of Mind</quote></para>
           </entry>
           <entry>
             <para>2018-08-12</para>
@@ -64,7 +64,7 @@
         </row>
         <row>
           <entry>
-            <para>2.7.0 "Peace of Mind"</para>
+            <para>2.7.0 <quote>Peace of Mind</quote></para>
           </entry>
           <entry>
             <para>2018-05-13</para>
@@ -75,7 +75,7 @@
         </row>
         <row>
           <entry>
-            <para>2.6.0 "Stiff Challenges"</para>
+            <para>2.6.0 <quote>Stiff Challenges</quote></para>
           </entry>
           <entry>
             <para>2017-04-12</para>
@@ -86,7 +86,7 @@
         </row>
         <row>
           <entry>
-            <para>2.5.0 "Clear Skies"</para>
+            <para>2.5.0 <quote>Clear Skies</quote></para>
           </entry>
           <entry>
             <para>2016-10-22</para>
@@ -97,7 +97,7 @@
         </row>
         <row>
           <entry>
-	    <para>2.4.0-beta1 "Migration"</para>
+	    <para>2.4.0-beta1 <quote>Migration</quote></para>
           </entry>
           <entry>
             <para>2011-06-26</para>
@@ -108,7 +108,7 @@
         </row>
         <row>
           <entry>
-	    <para>2.3.0-beta1 "New Horizons"</para>
+	    <para>2.3.0-beta1 <quote>New Horizons</quote></para>
           </entry>
           <entry>
             <para>2010-12-25</para>
@@ -119,7 +119,7 @@
         </row>
         <row>
           <entry>
-	  <para>2.2.0-beta1 "DeKade"</para>
+	  <para>2.2.0-beta1 <quote>DeKade</quote></para>
           </entry>
           <entry>
             <para>2010-04-30</para>
@@ -130,7 +130,7 @@
         </row>
         <row>
           <entry>
-	  <para>2.1.0-beta1 "Rusty Clutch"</para>
+	  <para>2.1.0-beta1 <quote>Rusty Clutch</quote></para>
           </entry>
           <entry>
             <para>2009-10-31</para>
@@ -141,7 +141,7 @@
         </row>
         <row>
           <entry>
-	  <para>2.0.0 "Mars Pathfinder"</para>
+	  <para>2.0.0 <quote>Mars Pathfinder</quote></para>
           </entry>
           <entry>
             <para>2009-04-11</para>
@@ -152,7 +152,7 @@
         </row>
         <row>
           <entry>
-            <para>2.0.0-beta2 "Space Odyssey"</para>
+            <para>2.0.0-beta2 <quote>Space Odyssey</quote></para>
           </entry>
           <entry>
             <para>2008-12-27</para>
@@ -163,7 +163,7 @@
         </row>
         <row>
           <entry>
-            <para>2.0.0-beta1 "Phoenix Egg"</para>
+            <para>2.0.0-beta1 <quote>Phoenix Egg</quote></para>
           </entry>
           <entry>
             <para>2008-06-07</para>
@@ -174,7 +174,7 @@
         </row>
         <row>
           <entry>
-            <para>1.90.0 "Power Stone"</para>
+            <para>1.90.0 <quote>Power Stone</quote></para>
           </entry>
           <entry>
             <para>2008-03-15</para>
@@ -185,7 +185,7 @@
         </row>
         <row>
           <entry>
-            <para>1.80.0 "Final 3rd Stone"</para>
+            <para>1.80.0 <quote>Final 3rd Stone</quote></para>
           </entry>
           <entry>
             <para>2007-07-21</para>
@@ -196,7 +196,7 @@
         </row>
         <row>
           <entry>
-            <para>1.80.0-beta2 "Last Unstable Stone"</para>
+            <para>1.80.0-beta2 <quote>Last Unstable Stone</quote></para>
           </entry>
           <entry>
             <para>2007-03-31</para>
@@ -207,7 +207,7 @@
         </row>
         <row>
           <entry>
-            <para>1.80.0-beta1 "The Last Krusade"</para>
+            <para>1.80.0-beta1 <quote>The Last Krusade</quote></para>
           </entry>
           <entry>
             <para>2007-01-07</para>
@@ -218,7 +218,7 @@
         </row>
         <row>
           <entry>
-            <para>1.70.1 "Round Robin"</para>
+            <para>1.70.1 <quote>Round Robin</quote></para>
           </entry>
           <entry>
             <para>2006-07-17</para>
@@ -229,7 +229,7 @@
         </row>
         <row>
           <entry>
-            <para>1.70.0 "Round Robin"</para>
+            <para>1.70.0 <quote>Round Robin</quote></para>
           </entry>
           <entry>
             <para>2006-02-12</para>
@@ -240,7 +240,7 @@
         </row>
         <row>
           <entry>
-            <para>1.70.0-beta2 "Afterburner"</para>
+            <para>1.70.0-beta2 <quote>Afterburner</quote></para>
           </entry>
           <entry>
             <para>2005-11-05</para>
@@ -251,7 +251,7 @@
         </row>
         <row>
           <entry>
-            <para>1.70.0-beta1 "Hellfire"</para>
+            <para>1.70.0-beta1 <quote>Hellfire</quote></para>
           </entry>
           <entry>
             <para>2005-10-02</para>
diff --git a/doc/remote-connections.docbook b/doc/remote-connections.docbook
index 3a91a2f6..b6b1fdb4 100644
--- a/doc/remote-connections.docbook
+++ b/doc/remote-connections.docbook
@@ -182,7 +182,7 @@
       feedback about this chapter is appreciated. Thanks!</para>
 
  <note>
-   <para>This works on a <trademark class="registered">Debian</trademark> system, so it will work on <trademark class="registered">Debian</trademark> and derivatives (<trademark class="registered">Kubuntu</trademark> &etc;), though
+   <para>This works on a &Debian; system, so it will work on &Debian; and derivatives (&kubuntu;, &etc;), though
    it should work on other Linuxes as well. 
    We assume that you have <link linkend="gloss-ssh">SSH</link> installed, configured and working on 
    every machine on LAN you want to connect to/from.
@@ -214,7 +214,7 @@ Now we need fish:/ protocol to be announced too, so we use an ssh.service file a
 </screen>
 
 This file is just a copy of ssh.service. Edit the <filename>fish.service</filename> file and replace 
-"Remote Terminal on %h" with "Fish to %h" and "_ssh._tcp" with "_fish._tcp". 
+<quote>Remote Terminal on %h</quote> with <quote>Fish to %h</quote> and <quote>_ssh._tcp</quote> with <quote>_fish._tcp</quote>.
 
 Here is how it looks after edit:
 <programlisting> 
diff --git a/doc/search.docbook b/doc/search.docbook
index ddda6ca3..a8d8b6f0 100644
--- a/doc/search.docbook
+++ b/doc/search.docbook
@@ -59,7 +59,7 @@
       search with '|' (⪚ 
       <literal role="extension">'*.cpp *.h |
       *.moc.cpp'</literal>). You can use quotation marks for names
-            that contain spaces. Filter "Program Files" searches
+            that contain spaces. Filter <quote>Program Files</quote> searches
             out those files/directories 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>
@@ -79,7 +79,7 @@
     <listitem>
       <para>
       <guilabel>Of type</guilabel>: this box lets you search for a
-      file not only by its name, but also by its MIME type. For
+      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,
@@ -212,7 +212,7 @@
   panel point to the found files - but will not close the search
   window, so you will be able to click on a different result.</para>
   <para>Sometimes, you need to narrow your search even more.
-  Krusearcher allows a much finer search, and for that, let's look
+  KruSearcher allows a much finer search, and for that, let's look
   at the 
   <guilabel>Advanced Page</guilabel>...</para>
   <figure id="screenshot-search-advanced" float="1">
@@ -327,7 +327,7 @@
   change if the selected item is not in the current panel
   directory. 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
+  When you close the KruSearcher window, the selected
   item is selected in the active panel.</para>
   <para>
     <emphasis role="bold">Feed to listbox</emphasis>
diff --git a/doc/splitter.docbook b/doc/splitter.docbook
index bbc532b5..e024f6aa 100644
--- a/doc/splitter.docbook
+++ b/doc/splitter.docbook
@@ -56,7 +56,7 @@
   <filename>foo.xxx</filename> and choose 
     <menuchoice>
       <guimenu>File</guimenu>
-      <guimenuitem>Combine files</guimenuitem>
+      <guimenuitem>Combine files...</guimenuitem>
     </menuchoice>
   or 
   <keycombo action="simul">&Ctrl;
diff --git a/doc/synchronizer.docbook b/doc/synchronizer.docbook
index 9fd8f66f..490952c2 100644
--- a/doc/synchronizer.docbook
+++ b/doc/synchronizer.docbook
@@ -24,16 +24,16 @@
   
 <sect2 id="synchronizer_introduction">
   <title>Introduction</title>
-  <para>This function compares two directories with all subdirectories and shows the differences between them.
+  <para>This function compares two folders with all subfolders and shows the differences between them.
   After selecting some options and the 
   <guilabel>Compare</guilabel> function you can synchronize the
-  files and directories. One panel could be an &FTP;
+  files and folders. One panel could be an &FTP;
   server. Do not forget the 
   <guilabel>Compare by content</guilabel> option if the file size
   stays equal. Choose 
     <menuchoice>
       <guimenu>Tools</guimenu>
-      <guimenuitem>Synchronize Directories</guimenuitem>
+      <guimenuitem>Synchronize Folders</guimenuitem>
     </menuchoice>
   or 
   <keycombo action="simul">&Ctrl;
@@ -72,13 +72,13 @@
       <guilabel>Advanced filters</guilabel>. The 
       <guilabel>General Filters</guilabel> includes a 
       <guilabel>Do not search in</guilabel> option which lets you
-      exclude directories from comparison.</para>
+      exclude folders from comparison.</para>
     </listitem>
     <listitem>
       <para>Set the 
       <link linkend="synccomp_checkb_options">Checkbox
       options</link>: 
-      <guilabel>Recurse subdirectories</guilabel>, 
+      <guilabel>Recurse subfolders</guilabel>,
       <guilabel>Follow symlinks</guilabel>, 
       <guilabel>Compare by content</guilabel>, 
       <guilabel>Ignore Date</guilabel>, 
@@ -89,7 +89,7 @@
     <listitem>
       <para>Click on the 
       <guibutton>Compare</guibutton> button to compare the
-      directories.</para>
+      folders.</para>
     </listitem>
     <listitem>
       <para>By using
@@ -149,7 +149,7 @@
             at synchronizing. ⪚ 
             <literal role="extension">*.png</literal> selects only
             files the names of which end with 
-            <literal role="extension">.png</literal>. Directories are
+            <literal role="extension">.png</literal>. Folders are
             listed if the directory name ends with 
             <literal role="extension">.png</literal> or if the
             directory contains files which end with 
@@ -186,23 +186,23 @@
             are excluded from the search using the pipe symbol. If
             the pattern is ended with a slash (*pattern*/), it
             means that pattern relates to recursive search of
-            directories.</para>
+            folders.</para>
           </listitem>
           <listitem>
-            <para>pattern - means to search those files/directories
+            <para>pattern - means to search those files/folders
             whose name is a pattern, recursive search goes through
-            all subdirectories independently of the value of the
+            all subfolders independently of the value of the
             pattern.</para>
           </listitem>
           <listitem>
-            <para>pattern/ - means to search all files/directories,
+            <para>pattern/ - means to search all files/folders,
             but recursive search goes through/excludes the
-            directories whose name is a pattern.</para>
+            folders whose name is a pattern.</para>
           </listitem>
           <listitem>
             <para>You can use quotation marks for names
-            that contain spaces. Filter "Program Files" searches
-            out those files/directories the name of which is <filename>Program
+            that contain spaces. Filter <quote>Program Files</quote> searches
+            out those files/folders the name of which is <filename>Program
             Files</filename>.</para>
           </listitem>
           <listitem>
@@ -242,14 +242,14 @@
         <itemizedlist>
           <listitem>
             <para>
-            <guilabel>Recurse subdirectories</guilabel>: The
-            Synchronizer walks through subdirectories when
+            <guilabel>Recurse subfolders</guilabel>: The
+            Synchronizer walks through subfolders when
             comparing.</para>
           </listitem>
           <listitem>
             <para>
             <guilabel>Follow symlinks</guilabel>: The Synchronizer
-            follows the symbolic links to directories (not the
+            follows the symbolic links to folders (not the
             files!).</para>
           </listitem>
           <listitem>
@@ -310,7 +310,7 @@
             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
-            option on, you can see that the comparator is "alive",
+            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>
           </listitem>
@@ -328,7 +328,7 @@
     </varlistentry>
   </variablelist>
   <para>When everything mentioned above is done, click on the 
-  <guibutton>Compare</guibutton> button to compare the directories,
+  <guibutton>Compare</guibutton> button to compare the folders,
   the results are displayed in the <guilabel>File List</guilabel>.</para>
   <variablelist>
     <varlistentry>
@@ -336,8 +336,8 @@
       <listitem>
         <para>The 
         <guilabel>File List</guilabel> has the following columns:
-        "Left name | Left size | Left time | Task | Right time |
-        Right size | Right name".
+        <quote>Left name | Left size | Left time | Task | Right time |
+        Right size | Right name</quote>.
         Here you can check the compare results and modify the synchronization actions if desired.
         The text color defines the default copy direction determined by the comparator.
         <itemizedlist>
@@ -371,7 +371,7 @@
           <listitem>
             <para>
             <guibutton>-></guibutton>: Copy from the
-            left side to the right side. For directories: 
+            left side to the right side. For folders:
             <command>mkdir</command> in the right side.</para>
           </listitem>
           <listitem>
@@ -387,7 +387,7 @@
           <listitem>
             <para>
             <guibutton><-</guibutton>: copy from the
-            right side to the left side. For directories: 
+            right side to the left side. For folders:
             <command>mkdir</command> in the left side</para>
           </listitem>
           <listitem>
@@ -418,7 +418,7 @@
           <listitem>
             <para>
             <guibutton>!=</guibutton>: Enable/Disable listing the
-            excluded / "do not know what to do" files.</para>
+            excluded / <quote>do not know what to do</quote> files.</para>
           </listitem>
           <listitem>
             <para>
@@ -450,7 +450,7 @@
           <listitem>
             <para>
             <guibutton>Compare</guibutton>: Compares the
-            directories, the results are displayed on the 
+            folders, the results are displayed on the
             <guilabel>File List</guilabel>.</para>
           </listitem>
           <listitem>
@@ -475,7 +475,7 @@
       <listitem>
         <itemizedlist>
           <listitem>
-            <para>The number of scanned directories while
+            <para>The number of scanned folders while
             comparing.</para>
           </listitem>
           <listitem>
@@ -499,12 +499,12 @@
         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
-        change will be applied on its files/subdirectories as
+        change will be applied on its files/subfolders as
         well.</para>
         <itemizedlist>
           <listitem>
             <para>
-            <guibutton>Synchronize Directories</guibutton>: Starts
+            <guibutton>Synchronize Folders...</guibutton>: Starts
             synchronization.</para>
           </listitem>
           <listitem>
@@ -590,7 +590,7 @@
           <listitem>
             <para>
             <guibutton>Profiles</guibutton>: If you have to
-            synchronize the same directories often, you can save the
+            synchronize the same folders often, you can save the
             settings ⪚ include files, exclude files,
             ... Press the 
             <guibutton>Profile</guibutton> button, and you will be
@@ -722,12 +722,12 @@
             synchronization.</para>
           </listitem>
           <listitem>
-            <para>Remote "compare by content" and "directory
-            compare" is done in parallel.</para>
+            <para>Remote <quote>compare by content</quote> and <quote>directory
+            compare</quote> is done in parallel.</para>
           </listitem>
           <listitem>
             <para>Remote synchronization is also done in parallel,
-            except the mkdir tasks (mkdir must be before
+            except the <command>mkdir</command> tasks (<command>mkdir</command> must be before
             copy).</para>
           </listitem>
         </itemizedlist>
diff --git a/doc/user-interface.docbook b/doc/user-interface.docbook
index 699aa2a3..5e6ccbf5 100644
--- a/doc/user-interface.docbook
+++ b/doc/user-interface.docbook
@@ -109,14 +109,14 @@
       and you can toggle its use in the current session in the
       <link linkend="settings-menu">Settings menu</link>. The Main Toolbar contents can be
       configured from the
-      <guimenuitem>Configure Toolbars</guimenuitem> in the
+      <guimenuitem>Configure Toolbars...</guimenuitem> in the
       <link linkend="settings-menu">Settings menu</link>. Since various commands
       and options in &krusader; are context-dependent,
       some commands are not always available. The icon of an
       inappropriate or inactive action will be deactivated
       (grayed-out) disabling its use. <link linkend="bookman">Bookmarks</link>
       can be placed into the Main Toolbar and the Actions Toolbar
-      with the mouse using "drag and drop".</para>
+      with the mouse using <quote>drag and drop</quote>.</para>
     </sect2>
     <sect2 id="job_toolbar">
       <title>Job Toolbar</title>
@@ -136,7 +136,7 @@
         <secondary>Actions Toolbar</secondary>
       </indexterm>
       <para><link linkend="useractions">UserActions</link> and
-      <link linkend="bookman">Bookmarks</link> can be "plugged" into the
+      <link linkend="bookman">Bookmarks</link> can be <quote>plugged</quote> into the
       <guilabel>Actions Toolbar</guilabel>. To show it, use
         <menuchoice>
           <guimenu>Settings</guimenu>
@@ -145,7 +145,7 @@
       . To add user actions, use
         <menuchoice>
           <guimenu>Settings</guimenu>
-          <guimenuitem>Configure Toolbars</guimenuitem>
+          <guimenuitem>Configure Toolbars...</guimenuitem>
         </menuchoice>
       and select Actions Toolbar. You can, for example,
       drag the Actions Toolbar to the right side using the
@@ -162,9 +162,9 @@
       <guibutton>Location Toolbar</guibutton> for each panel. It
       shows the path the panel is currently pointing to.
       When entering archives the path will be displayed
-      in the following format: "archive
+      in the following format: <quote>archive
       type:/directory/archive_filename/the directory inside the
-      archive". This format makes the paths uniform and easy to
+      archive</quote>. This format makes the paths uniform and easy to
       read. The
       <guibutton>Location Toolbar</guibutton> supports also
       KIO Slaves but not all of them, some can
@@ -212,11 +212,9 @@
       <guilabel>Clear Location Toolbar</guilabel> button is also
       available.</para>
       <para>Quick Navigation:
-      &Ctrl; point with mouse in the
-      middle of &URL; of the
+      &Ctrl; point with mouse in the middle of &URL; of the
       <guibutton>Location Toolbar</guibutton>. A pop-up window shows
-      the next &URL; location. Pressing
-      &Ctrl; + Left Mouse Button 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>
     </sect2>
@@ -281,9 +279,9 @@
         may be left open or closed, as desired.</para>
       </listitem>
     </itemizedlist>
-    <para>&krusader; is a "twin-panel" file
-    manager so there are two panels: the "Left" panel and the
-    "Right" panel, or a more important logical distinction, the
+    <para>&krusader; is a <quote>twin-panel</quote> file
+    manager so there are two panels: the <quote>Left</quote> panel and the
+    <quote>Right</quote> panel, or a more important logical distinction, the
     *Active* panel and the *Inactive* panel. The active panel is
     the one that will accept your mouse and keyboard input. If you
     choose a command from the
@@ -318,7 +316,7 @@
       use most of the time. This panel shows the contents of one
       directory 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).
+      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,
       file size, creation date and time and their attributes.
       And <link linkend="view-menu">Brief View</link> that shows only the file names,
@@ -351,7 +349,7 @@
           <guibutton>Media button</guibutton> on the left of the
           <guilabel>Information Label</guilabel> displays a list of
           all available media, where you can select the desired
-          media (HDD partition, DVD, USB stick, &etc;).
+          media (HDD partition, &DVD;, &USB; stick, &etc;).
           Pressing <keycombo>&Ctrl;<keycap>Return</keycap></keycombo> when the
           <guibutton>Media menu</guibutton>
           is opened mounts the highlighted media when it is unmounted,
@@ -405,8 +403,7 @@
           the first few characters of a file name. Pressing
           &Enter; or double clicking on a file will
           open/execute that file. You can select/unselect files
-          using the mouse, with the
-          <keycap>Insert</keycap> key or the
+          using the mouse, with the &Ins; key or the
           <link linkend="edit-menu">Edit menu</link>.</para>
         </listitem>
         <listitem>
@@ -425,13 +422,13 @@
           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
-          "Information Label" or "Totals Label" instead. When a <link
+          <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>
         </listitem>
       </itemizedlist>
-      <para>When using the "&kde; default
-      <link linkend="konfig-color">colors</link>", then the
+      <para>When using the <quote>&kde; default
+      <link linkend="konfig-color">colors</link></quote>, then the
       selected files are shown in blue and the current file is
       surrounded by a fine-lined rectangle. By default an icon is
       shown according to the file type. Use
@@ -449,7 +446,7 @@
         <listitem>
           <para>Focus a file or directory on the left panel, press
           <keycombo action="simul">&Ctrl;
-          <keycap>Right arrow</keycap></keycombo> and the right panel
+          &Right;</keycombo> and the right panel
           changes:
           <itemizedlist>
             <listitem>
@@ -464,7 +461,7 @@
         <listitem>
           <para>For the right panel: press
           <keycombo action="simul">&Ctrl;
-          <keycap>Left arrow</keycap></keycombo> and the left panel
+          &Left;</keycombo> and the left panel
           will change.</para>
         </listitem>
       </itemizedlist>
@@ -475,11 +472,11 @@
         <primary>Sidebar</primary>
         <secondary>Sidebar (3rd Panel)</secondary>
       </indexterm>
-      <para>This is "&krusader; is 3rd Hand" or the 3rd
+      <para>This is <quote>&krusader; is 3rd Hand</quote> or the 3rd
       Panel, click on the arrow-up button on the right of the
       <guilabel>Totals Label</guilabel> or
       <keycombo action="simul">&Alt;
-      <keycap>Down-Arrow</keycap></keycombo> to open the
+      &Down;</keycombo> to open the
       <guilabel>Sidebar</guilabel>. This panel has several
       display modes which can be activated by clicking on the
       appropriate button.</para>
@@ -510,8 +507,8 @@
           </emphasis>: is used to quickly select files,
           ⪚ enter
           <literal role="extension">*.png</literal> and click on the
-          <guibutton>Go</guibutton> button. The "floppy" button
-          stores the current selection. The "select group dialog"
+          <guibutton>Go</guibutton> button. The <quote>floppy</quote> button
+          stores the current selection. The <quote>select group dialog</quote>
           is also available.</para>
         </listitem>
         <listitem>
@@ -534,7 +531,7 @@
       <para>
       It is possible to change the sidebar placement using the rotation button
       which is located to the left of the arrow down button at the bottom part of the &krusader; tab.
-      Each click on this button moves the sidebar on one position in the loop "bottom-left-top-right".
+      Each click on this button moves the sidebar on one position in the loop <quote>bottom-left-top-right</quote>.
       </para>
       <para>If needed you can resize the window
       ⪚ to better display a picture or view a file contents. Click
@@ -554,7 +551,7 @@
   </sect1>
   <sect1 id="cmdline_termemu">
     <title>Command Line / Terminal Emulator</title>
-    <para>This part of the <link linkend="gloss-gui">GUI</link>
+    <para>This part of the <link linkend="gloss-gui">&GUI;</link>
     can have four modes: Command Line, Terminal Emulator, show both and show none.
     You can choose your mode of operation either on start-up with the
     <link linkend="konfigurator">Konfigurator Startup page</link>, or for the current session with the <link linkend="settings-menu">Settings menu</link> .
@@ -700,10 +697,9 @@
     <keycap>F2</keycap> key is used to rename files and the
     <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> can create whole directory trees on the fly
-    ⪚
-    <literal>foo/bar/test</literal>. You can choose to display
+    <guilabel>Mkdir</guilabel> <keycap>F7</keycap> (translated name of
+    <command>mkdir</command> command) can create whole directory 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
     &krusader; via the <link linkend="konfigurator">Konfigurator Startup page</link>,
@@ -772,7 +768,7 @@
       </listitem>
       <listitem>
         <para>To
-        <action>create a "home" tab</action>: click on the
+        <action>create a <quote>home</quote> tab</action>: click on the
         <guibutton>Home</guibutton> button.</para>
       </listitem>
       <listitem>
diff --git a/doc/useractions.docbook b/doc/useractions.docbook
index de3de487..9965b6e4 100644
--- a/doc/useractions.docbook
+++ b/doc/useractions.docbook
@@ -40,7 +40,7 @@
   in 
   <filename>
   /usr/share/krusader/useraction-examples.xml</filename>.
-  UserActions can appear nearly everywhere where "normal" KActions
+  UserActions can appear nearly everywhere where <quote>normal</quote> KActions
   can be placed. The actions can even be placed in the menu bar, but for that the 
   <filename>krusaderui.rc</filename> file must be edited. A few
   examples:</para> 
@@ -202,9 +202,8 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
     <listitem>
       <para>
       <guimenuitem>Command</guimenuitem>: The command which
-      will be executed. You can add placeholder using a GUI with
-      the 
-      <guibutton>add</guibutton> button.</para>
+      will be executed. You can add placeholder using a &GUI; with
+      the <guibutton>add</guibutton> button.</para>
     </listitem>
     <listitem>
       <para>
@@ -239,7 +238,7 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
         <listitem>
           <para>
           <guimenuitem>Separate standard error</guimenuitem>:
-          When "Collect output" is used the stdout and stderr are
+          When <quote>Collect output</quote> is used the stdout and stderr are
           separately collected.</para>
         </listitem>
       </itemizedlist>
@@ -250,12 +249,12 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
       <itemizedlist>
         <listitem>
           <para>
-          <guimenuitem>Local files (no URLs)</guimenuitem>: Tells
+          <guimenuitem>Local files only (no &URL;s)</guimenuitem>: Tells
           the placeholder it should return local addresses.</para>
         </listitem>
         <listitem>
           <para>
-          <guimenuitem>URLs (remote and local)</guimenuitem>:
+          <guimenuitem>&URL;s (remote and local)</guimenuitem>:
           Tells the placeholder it should return
           &URL;s.</para>
         </listitem>
@@ -283,7 +282,7 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
     <emphasis role="bold">Command-line syntax</emphasis>
   </para>
   <para>Basically, everything you type in the command line will get
-  executed (if you type "ls -l", "ls -l" gets executed). You have
+  executed (if you type <quote>ls -l</quote>, <quote>ls -l</quote> gets executed). You have
   the possibility to get a character string from
   &krusader; which represents the current state of the
   panel. This is done using placeholders. A placeholder begins with
@@ -321,7 +320,7 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
       <orderedlist>
         <listitem>
           <para>Parameter: Which items;
-          either "All", "Selected", "Files" or "Dirs"</para>
+          either <quote>All</quote>, <quote>Selected</quote>, <quote>Files</quote> or <quote>Dirs</quote></para>
         </listitem>
       </orderedlist>
     </listitem>
@@ -353,13 +352,13 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
       <orderedlist>
         <listitem>
           <para>Parameter: Which items;
-          either "All", "Selected", "Files" or "Dirs"</para>
+          either <quote>All</quote>, <quote>Selected</quote>, <quote>Files</quote> or <quote>Dirs</quote></para>
         </listitem>
         <listitem>
           <para>Parameter (optional):
           Separator between the items.
           Default:
-          " "</para>
+          <quote> </quote></para>
         </listitem>
         <listitem>
           <para>Parameter (optional): Omit the
@@ -367,7 +366,7 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
         </listitem>
         <listitem>
           <para>Parameter (optional):
-          Filtermask (for all but "Selected").
+          Filtermask (for all but <quote>Selected</quote>).
           Default: *</para>
         </listitem>
         <listitem>
@@ -387,8 +386,8 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
         </listitem>
         <listitem>
           <para>Parameter (optional):
-          manipulate in which way; either "Set", "Add" or "Remove".
-          Default: "Set"</para>
+          manipulate in which way; either <quote>Set</quote>, <quote>Add</quote> or <quote>Remove</quote>.
+          Default: <quote>Set</quote></para>
         </listitem>
       </orderedlist>
     </listitem>
@@ -399,7 +398,7 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
       <orderedlist>
         <listitem>
           <para>Parameter: A relative or
-          absolute path, or an URL</para>
+          absolute path, or an &URL;</para>
         </listitem>
         <listitem>
           <para>Parameter (optional): Open the
@@ -435,7 +434,7 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
         <listitem>
           <para>Parameter: The text that
           should go to the clipboard (you may want to use
-          "%aCurrent%" here)</para>
+          <quote>%aCurrent%</quote> here)</para>
         </listitem>
         <listitem>
           <para>Parameter (optional): Append
@@ -566,8 +565,8 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
         </listitem>
         <listitem>
           <para>Parameter (optional): a list
-          of variables which should be set, like "return=cmd;
-          a=lalala; b='%_Ask(..)'" so that the placeholder is
+          of variables which should be set, like <quote>return=cmd;
+          a=lalala; b='%_Ask(..)'</quote> so that the placeholder is
           replaced be the content of the variable cmd and the other
           two have already these values when the script
           starts.</para>
@@ -593,12 +592,12 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
       <orderedlist>
         <listitem>
           <para>Parameter: Column: Either
-          "Name", "Ext", "Type", "Size", "Modified", "Perms",
-          "rwx", "Owner" and "Group"</para>
+          <quote>Name</quote>, <quote>Ext</quote>, <quote>Type</quote>, <quote>Size</quote>, <quote>Modified</quote>, <quote>Perms</quote>,
+          <quote>rwx</quote>, <quote>Owner</quote> and <quote>Group</quote></para>
         </listitem>
         <listitem>
           <para>Parameter: Sort sequence:
-          Either "Toggle", "Asc", "Desc"</para>
+          Either <quote>Toggle</quote>, <quote>Asc</quote>, <quote>Desc</quote></para>
         </listitem>
       </orderedlist>
     </listitem>
@@ -608,16 +607,16 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
       <orderedlist>
         <listitem>
           <para>Parameter: View mode: Either
-          "generic", "text", "hex"</para>
+          <quote>generic</quote>, <quote>text</quote>, <quote>hex</quote></para>
         </listitem>
         <listitem>
           <para>Parameter: Window Mode:
-          Either "tab", "window"</para>
+          Either <quote>tab</quote>, <quote>window</quote></para>
         </listitem>
       </orderedlist>
     </listitem>
   </itemizedlist>
-  <para>A GUI-based helper for placeholder adding is
+  <para>A &GUI;-based helper for placeholder adding is
   provided. Spaces in Path, Current and List are by default,
   automatically escaped. There is one more important thing to know:
   All placeholders that interact with &krusader;
@@ -635,7 +634,7 @@ format="PNG"/> </imageobject> </inlinemediaobject>button.</para>
   <itemizedlist>
     <listitem>
       <para>Configures if the action is valid for a Protocol, Path,
-      MIME type or File name.</para>
+      &MIME; type or File name.</para>
     </listitem>
     <listitem>
       <para>Tweaking the command line before being executed.</para>
diff --git a/doc/vfs.docbook b/doc/vfs.docbook
index abb3a1a8..918ab93b 100644
--- a/doc/vfs.docbook
+++ b/doc/vfs.docbook
@@ -24,8 +24,8 @@
   <para>A basic 
   <link linkend="features">OFM feature</link> is VFS, this an
   abstracted layer over all kinds of archived information (ZIP
-  files, &FTP; servers, TAR archives, NFS filesystems, SAMBA shares,
-  ISO CD/DVD images, RPM catalogs, &etc;), which allows the user to
+  files, &FTP; servers, TAR archives, &NFS; filesystems, SAMBA shares,
+  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
@@ -35,9 +35,9 @@
       <para>
       <link linkend="remote-connections">Remote connections
       VFS</link>: provides the capability of working with a remote
-      connection session (&FTP;, NFS, Samba, FISH, SFTP) like with
+      connection session (&FTP;, &NFS;, Samba, FISH, SFTP) like with
       local filesystems. It is perfect for complex remote operations
-      and almost as powerful as most standalone GUI remote
+      and almost as powerful as most standalone &GUI; remote
       clients.</para>
     </listitem>
     <listitem>
@@ -64,7 +64,7 @@
   cannot create directories inside a VFS.</para>
   <para>It is possible to keep the directory structure when doing a
   copy from a virtual folder to a non virtual folder, by
-  selecting the "Keep virtual directory structure" check box of the
+  selecting the <quote>Keep virtual directory 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>
diff --git a/doc/viewer-editor.docbook b/doc/viewer-editor.docbook
index 01625cf1..b8b5e1c4 100644
--- a/doc/viewer-editor.docbook
+++ b/doc/viewer-editor.docbook
@@ -36,7 +36,7 @@
     view every file type viewable by &konqueror;
     (⪚ display pictures, play music, show the content
     of an archive). This is called the 'Generic viewer', for which
-    you need to configure the MIME types.</para>
+    you need to configure the &MIME; types.</para>
     <para>The viewer works as follows:
     <itemizedlist>
       <listitem>
@@ -44,7 +44,7 @@
         <emphasis>'Generic viewer'.</emphasis></para>
       </listitem>
       <listitem>
-        <para>When the file type (MIME type) cannot be determined or
+        <para>When the file type (&MIME; type) cannot be determined or
         when a file (⪚ a binary) does not have an
         associated action, it disables the 'generic viewer'. The
         file is treated as a text file, which is the
@@ -244,7 +244,7 @@ and how to print.
 <term id="katepart-menu-export-as-html">
 <menuchoice>
 <guimenu>File</guimenu>
-<guimenuitem>Export as HTML</guimenuitem>
+<guimenuitem>Export as &HTML;</guimenuitem>
 </menuchoice>
 </term>
 <listitem>
@@ -294,7 +294,7 @@ action="simul">&Ctrl;<keycap>X</keycap></keycombo></shortcut>
 <listitem>
 <para>This command deletes the current selection and places it on the
 clipboard.
-The  clipboard is a feature that works invisibly to provide a way to
+The clipboard is a feature that works invisibly to provide a way to
 transfer data between applications.</para>
 </listitem>
 </varlistentry>
@@ -306,7 +306,7 @@ action="simul">&Ctrl;<keycap>C</keycap></keycombo></shortcut>
 <guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem></menuchoice></term>
 <listitem>
 <para>This copies the currently selected text to the clipboard so that it may
-be pasted elsewhere.  The clipboard is a feature that works invisibly
+be pasted elsewhere. The clipboard is a feature that works invisibly
 to provide a way to transfer data between applications.</para>
 </listitem>
 </varlistentry>
@@ -317,14 +317,14 @@ action="simul">&Ctrl;<keycap>V</keycap></keycombo></shortcut>
 <guimenu>Edit</guimenu><guimenuitem>Paste</guimenuitem></menuchoice></term>
 <listitem>
 <para>This will insert the contents of the clipboard at the cursor position.
-The clipboard is feature that works invisibly to provide a way to
+The clipboard is a feature that works invisibly to provide a way to
 transfer data between applications.</para>
 </listitem>
 </varlistentry>
 <varlistentry><!-- from plugin Exporter -->
 <term><anchor id="katepart-menu-copy-as-html"/><menuchoice>
 <guimenu>Edit</guimenu><guimenuitem>Copy as
-HTML</guimenuitem></menuchoice></term>
+&HTML;</guimenuitem></menuchoice></term>
 <listitem>
 <para>This copies the currently selected text to the clipboard as &HTML;.
 This item is only displayed when the plugin <guilabel>Exporter</guilabel> is loaded.
@@ -370,7 +370,7 @@ The status bar shows the current state of the Selection Mode, either <guilabel>B
 <varlistentry>
 <term><anchor id="katepart-menu-vi-input-mode"/><menuchoice>
 <shortcut>
-<keycombo action="simul"><keysym>Meta</keysym>&Ctrl;<keycap>V</keycap></keycombo>
+<keycombo action="simul">&Meta;&Ctrl;<keycap>V</keycap></keycombo>
 </shortcut>
 <guimenu>Edit</guimenu><guimenuitem>VI input
 Mode</guimenuitem></menuchoice></term>
@@ -386,7 +386,7 @@ the current mode.The behavior of this mode can be configured in the
 <varlistentry>
 <term><anchor id="katepart-menu-overwrite-mode"/><menuchoice>
 <shortcut>
-<keycombo action="simul"><keycap>Ins</keycap></keycombo>
+<keycombo action="simul">&Ins;</keycombo>
 </shortcut>
 <guimenu>Edit</guimenu><guimenuitem>Overwrite
 Mode</guimenuitem></menuchoice></term>
@@ -818,7 +818,7 @@ the list of markers which is appended at the bottom of this menu item.
 
 <varlistentry id="katepart-menu-bookmarks-previous">
 <term><menuchoice><shortcut><keycombo action="simul">&Alt;
-<keycap>PgUp</keycap></keycombo></shortcut>
+&PgUp;</keycombo></shortcut>
 <guimenu>Bookmarks</guimenu><guimenuitem>Previous</guimenuitem></menuchoice>
 </term>
 <listitem><para>This will move the cursor to beginning of the first above line
@@ -944,7 +944,7 @@ the endianness (byte order) of a text file or stream, for more information see
 <varlistentry>
 <term><menuchoice>
 <shortcut>
-<keycombo action="simul">&Ctrl;<keycap>Space</keycap></keycombo>
+<keycombo action="simul">&Ctrl;&Space;</keycombo>
 </shortcut>
 <guimenu>Tools</guimenu>
 <guimenuitem>Invoke Code Completion</guimenuitem>
@@ -1787,8 +1787,7 @@ skip white space and go to the start of a line's text.</para>
 <varlistentry>
 <term><guilabel>Wrap cursor</guilabel></term>
 <listitem>
-<para>When on, moving the insertion cursor using the <emphasis
-role="bold">Left</emphasis> and <emphasis role="bold">Right</emphasis> keys will
+<para>When on, moving the insertion cursor using the &Left; and &Right; keys will
 go on to previous/next line at beginning/end of the line, similar to most
 editors.</para><para>When off, the insertion cursor cannot be moved left of the
 line start, but it can be moved off the line end, which can be very handy for
@@ -1805,7 +1804,7 @@ beginning does nothing.</para>
 <term><guilabel>PageUp/PageDown moves cursor</guilabel></term>
 <listitem>
 <para>This option changes the behavior of the cursor when the user presses
-the <keycap>Page Up</keycap> or <keycap>Page Down</keycap> key. If unselected
+the &PgUp; or &PgDn; key. If unselected
 the text cursor will maintain its relative position within the visible text in
 &kappname; as new text becomes visible as a result of the operation.  So if the
 cursor is in the middle of the visible text when the operation occurs it will
@@ -2262,8 +2261,8 @@ but this can lead to more data loss.</para>
 <sect4 id="katepart-pref-open-save-modes-filetypes">
 <title>Modes & Filetypes</title>
 <para>This page allows you to override the default configuration for documents
-of specified MIME types. When the editor loads a document, it will try if it
-matches the file masks or MIME types for one of the defined filetypes, and if so
+of specified &MIME; types. When the editor loads a document, it will try if it
+matches the file masks or &MIME; types for one of the defined filetypes, and if so
 apply the variables defined. If more filetypes match, the one with the highest
 priority will be used.
 </para>
@@ -2311,9 +2310,9 @@ menus. This is also used in the
 <varlistentry>
 <term><guilabel>Variables:</guilabel></term>
 <listitem><para>This string allows you to configure &kappname;'s settings for the
-files selected by this MIME type using &kappname; variables. You can set almost any
+files selected by this &MIME; type using &kappname; variables. You can set almost any
 configuration option, such as highlight, indent-mode,
-etc.</para>
+&etc;</para>
 <para>Press <guibutton>Edit</guibutton> to see a list of all available variables
 and their descriptions.  Select the checkbox on the left to enable a particular
 variable and then set the value of the variable on the right.  Some variables
@@ -2344,9 +2343,9 @@ typical mask uses an asterisk and the file extension, for example
 masks.</para></listitem>
 </varlistentry>
 <varlistentry>
-<term><guilabel>MIME types:</guilabel></term>
+<term><guilabel>&MIME; types:</guilabel></term>
 <listitem><para>Displays a wizard that helps you easily select
-MIME types.</para></listitem>
+&MIME; types.</para></listitem>
 </varlistentry>
 <varlistentry>
 <term><guilabel>Priority:</guilabel></term>
@@ -2397,15 +2396,15 @@ of the next line after ending a line with an opening one <keycap>{</keycap>
 and pressing the &Enter; key.</para></listitem>
 </varlistentry>
 <!--http://jakob.petsovits.at/topic/kate-->
-<!--Right, it's the automatic insertion of a closing brace ("}") after you ended a line with an opening one ("{"). Kate's standard insertion of parentheses, brackets and braces is simply too obtrusive for me, so even if I tried it several times I always had to disable it again because I can't stand it. So here's how AutoBrace works.
+<!--Right, it's the automatic insertion of a closing brace (<quote>}</quote>) after you ended a line with an opening one (<quote>{</quote>). Kate's standard insertion of parentheses, brackets and braces is simply too obtrusive for me, so even if I tried it several times I always had to disable it again because I can't stand it. So here's how AutoBrace works.
 You, the developer, are writing a line of code, and want to open a new block delimited by braces. Looks like this:
 If you press Enter and AutoBrace is enabled, it will insert your favorite new brace where it belongs. Looks like this:
 -->
 <varlistentry>
 <term><guilabel>Data Tools</guilabel></term>
 <listitem><para>Enables data tools like thesaurus and spell check (if installed).
-Data tools are only available when text is selected, or when the right mouse
-button is clicked over a word. If no data tools are offered even when text
+Data tools are only available when text is selected, or when the &RMB;
+is clicked over a word. If no data tools are offered even when text
 is selected, you need to install them.
 If this plugin is enabled and data tools are installed, additional items
 appear at the end of the context menu.</para></listitem>
@@ -2413,10 +2412,10 @@ appear at the end of the context menu.</para></listitem>
 <varlistentry>
 <term><guilabel>Exporter</guilabel></term>
 <listitem><para>This command allows you to export the current document with all highlighting
-information into a HTML document using <menuchoice><guimenu>File</guimenu><guimenuitem>Export
-as HTML</guimenuitem></menuchoice>. Additionally you can use <menuchoice><guimenu>Edit</guimenu>
-<guimenuitem>Copy as HTML</guimenuitem></menuchoice> to copy the currently selected text
-as HTML to the system clipboard.</para></listitem>
+information into a &HTML; document using <menuchoice><guimenu>File</guimenu><guimenuitem>Export
+as &HTML;</guimenuitem></menuchoice>. Additionally you can use <menuchoice><guimenu>Edit</guimenu>
+<guimenuitem>Copy as &HTML;</guimenuitem></menuchoice> to copy the currently selected text
+as &HTML; to the system clipboard.</para></listitem>
 </varlistentry>
 <!-- not in 4.7
 <varlistentry>
@@ -2434,7 +2433,7 @@ text. Useful only for setting icons via &kf5; through the KIcon() class.
 </para></listitem>
 </varlistentry>
 <varlistentry>
-<term><guilabel>Insane (not ZEN) HTML coding (light edition)</guilabel></term>
+<term><guilabel>Insane (not ZEN) &HTML; coding (light edition)</guilabel></term>
 <listitem><para>A plugin, which does zen-coding like selector completion.
 For more information see <ulink url="https://en.wikipedia.org/wiki/Zen_Coding">
 Zen Coding</ulink>.</para></listitem>
diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp
index 331a4aea..7b49f2da 100644
--- a/krArc/krarc.cpp
+++ b/krArc/krarc.cpp
@@ -234,7 +234,7 @@ void kio_krarcProtocol::mkdir(const QUrl &url, int permissions)
 
     if (putCmd.isEmpty()) {
         error(ERR_UNSUPPORTED_ACTION,
-              i18n("Creating directories is not supported with %1 archives", arcType));
+              i18n("Creating folders is not supported with %1 archives", arcType));
         return;
     }
 
@@ -839,7 +839,7 @@ void kio_krarcProtocol::listDir(const QUrl &url)
     }
     if (listCmd.isEmpty()) {
         error(ERR_UNSUPPORTED_ACTION,
-              i18n("Listing directories is not supported for %1 archives", arcType));
+              i18n("Listing folders is not supported for %1 archives", arcType));
         return;
     }
     QString path = getPath(url);
diff --git a/krusader/Dialogs/checksumdlg.cpp b/krusader/Dialogs/checksumdlg.cpp
index f7733b5e..010880cc 100644
--- a/krusader/Dialogs/checksumdlg.cpp
+++ b/krusader/Dialogs/checksumdlg.cpp
@@ -266,7 +266,7 @@ QWizardPage *CreateWizard::createIntroPage()
     page->setTitle(i18n("Create Checksums"));
     page->setPixmap(QWizard::LogoPixmap,
                     Icon("document-edit-sign").pixmap(32));
-    page->setSubTitle(i18n("About to calculate checksum for the following files or directories:"));
+    page->setSubTitle(i18n("About to calculate checksum for the following files or folders:"));
 
     auto *mainLayout = new QVBoxLayout;
     page->setLayout(mainLayout);
diff --git a/krusader/DiskUsage/diskusage.cpp b/krusader/DiskUsage/diskusage.cpp
index 7269d0cc..50c4b03f 100644
--- a/krusader/DiskUsage/diskusage.cpp
+++ b/krusader/DiskUsage/diskusage.cpp
@@ -115,7 +115,7 @@ LoaderWidget::LoaderWidget(QWidget *parent) : QScrollArea(parent), cancelled(fal
     filesLabel->setFrameShadow(QLabel::Sunken);
     synchGrid->addWidget(filesLabel, 1, 0);
 
-    QLabel *directoriesLabel = new QLabel(i18n("Directories:"), loaderBox);
+    QLabel *directoriesLabel = new QLabel(i18n("Folders:"), loaderBox);
     directoriesLabel->setFrameShape(QLabel::StyledPanel);
     directoriesLabel->setFrameShadow(QLabel::Sunken);
     synchGrid->addWidget(directoriesLabel, 2, 0);
diff --git a/krusader/Filter/generalfilter.cpp b/krusader/Filter/generalfilter.cpp
index d15199b7..0bb3131d 100644
--- a/krusader/Filter/generalfilter.cpp
+++ b/krusader/Filter/generalfilter.cpp
@@ -477,7 +477,7 @@ QCheckBox *GeneralFilter::createExcludeCheckBox(const KConfigGroup &group)
 {
     auto *excludeCheckBox = new QCheckBox(this);
     excludeCheckBox->setText(i18n("Exclude Folder Names"));
-    excludeCheckBox->setToolTip(i18n("Filters out specified directory names from the results."));
+    excludeCheckBox->setToolTip(i18n("Filters out specified folder names from the results."));
     excludeCheckBox->setChecked(static_cast<Qt::CheckState>(group.readEntry("ExcludeFolderNamesUse", 0)));
     return excludeCheckBox;
 }
diff --git a/krusader/Konfigurator/kgpanel.cpp b/krusader/Konfigurator/kgpanel.cpp
index a5738dcf..12d90382 100644
--- a/krusader/Konfigurator/kgpanel.cpp
+++ b/krusader/Konfigurator/kgpanel.cpp
@@ -162,7 +162,7 @@ void KgPanel::setupGeneralTab()
         {"Look&Feel", "New Style Quicksearch",  _NewStyleQuicksearch, i18n("Start by typing"), false,  i18n("Open search bar and start searching by typing in panel.") },
         {"Look&Feel", "Case Sensitive Quicksearch",  _CaseSensitiveQuicksearch, i18n("Case sensitive"), false,  i18n("Search must match case.") },
         {"Look&Feel", "Up/Down Cancels Quicksearch",  false, i18n("Up/Down cancels search"), false,  i18n("Pressing the Up/Down buttons closes the search bar (only in search mode).") },
-        {"Look&Feel", "Navigation with Right Arrow Quicksearch", _NavigationWithRightArrowQuicksearch, i18n("Directory navigation with Right Arrow"), false, i18n("Pressing the Right button enters directory if no search text editing intention is captured.") },
+        {"Look&Feel", "Navigation with Right Arrow Quicksearch", _NavigationWithRightArrowQuicksearch, i18n("Folder navigation with Right Arrow"), false, i18n("Pressing the Right button enters folder if no search text editing intention is captured.") },
     };
 
     cbs = createCheckBoxGroup(2, 0, quicksearch, 4 /*count*/, groupBox, PAGE_GENERAL);
diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp
index 515a6f71..b3b92f74 100644
--- a/krusader/Panel/listpanel.cpp
+++ b/krusader/Panel/listpanel.cpp
@@ -239,7 +239,7 @@ ListPanel::ListPanel(QWidget *parent, AbstractPanelManager *manager, const KConf
     cancelQuickSizeCalcButton = new QToolButton(this);
     cancelQuickSizeCalcButton->hide();
     cancelQuickSizeCalcButton->setIcon(Icon("dialog-cancel"));
-    cancelQuickSizeCalcButton->setToolTip(i18n("Cancel directory space calculation"));
+    cancelQuickSizeCalcButton->setToolTip(i18n("Cancel folder space calculation"));
     ADD_WIDGET(cancelQuickSizeCalcButton);
 
     // progress indicator for the preview job


More information about the kde-doc-english mailing list