diff --git a/digikam/editor-autocrop.png b/digikam/editor-autocrop.png
deleted file mode 100644
index 3f476f6..0000000
Binary files a/digikam/editor-autocrop.png and /dev/null differ
diff --git a/digikam/editor-color-bw.docbook b/digikam/editor-color-bw.docbook
index 504adfc..15c41b4 100644
--- a/digikam/editor-color-bw.docbook
+++ b/digikam/editor-color-bw.docbook
@@ -45,7 +45,7 @@
 
             <row>
                 <entry>
-                <inlinemediaobject><imageobject><imagedata fileref="&path;editorconvert_bwred.png" format="PNG" /> </imageobject></inlinemediaobject>
+                <inlinemediaobject><imageobject><imagedata fileref="&path;editor-convert-bwred.png" format="PNG" /> </imageobject></inlinemediaobject>
                 </entry>
 
                 <entry>
diff --git a/digikam/editor-enhance-distortion.docbook b/digikam/editor-enhance-distortion.docbook
index ebc5449..0194807 100644
--- a/digikam/editor-enhance-distortion.docbook
+++ b/digikam/editor-enhance-distortion.docbook
@@ -101,7 +101,7 @@ The barrel-pincushion correction should be done before any crop or size changes
 </para>
       </note>
       <para>
-To help you finding the best correction the tool provides a vertical and horizontal guide. Move the mouse cursor in the image preview to display the dashed lines guide. Move the cursor to an important place in the image like the sea level or a building border and press the left mouse button for freeze the dashed lines position. Now, adjust the barrel/pincushion correction to align with the guide.
+To help you finding the best correction the tool provides a vertical and horizontal guide. Move the mouse cursor in the image preview to display the dashed lines guide. Move the cursor to an important place in the image like the sea level or a building border and press the &LMB; for freeze the dashed lines position. Now, adjust the barrel/pincushion correction to align with the guide.
 </para>
       <para>
 When using pincushion correction the resulting image will have a black border in the corner. You will need to cut this out with a crop tool available in <menuchoice>
diff --git a/digikam/editor-filters-emboss.docbook b/digikam/editor-filters-emboss.docbook
index e1622bc..4fa400c 100644
--- a/digikam/editor-filters-emboss.docbook
+++ b/digikam/editor-filters-emboss.docbook
@@ -35,7 +35,7 @@
     </para>
 
     <para><inlinemediaobject><imageobject> 
-        <imagedata fileref="&path;emboss-preview.png" format="PNG" /> </imageobject>
+        <imagedata fileref="&path;editor-emboss-preview.png" format="PNG" /> </imageobject>
         <textobject><phrase>The Emboss filter in Action</phrase></textobject></inlinemediaobject>
     </para>
 
diff --git a/digikam/editor-resize-restoration-setting1.png b/digikam/editor-resize-restoration-setting1.png
deleted file mode 100644
index 2e93c9f..0000000
Binary files a/digikam/editor-resize-restoration-setting1.png and /dev/null differ
diff --git a/digikam/editor-resize-restoration-setting2.png b/digikam/editor-resize-restoration-setting2.png
deleted file mode 100644
index 1654a2c..0000000
Binary files a/digikam/editor-resize-restoration-setting2.png and /dev/null differ
diff --git a/digikam/editor-transform-crop.docbook b/digikam/editor-transform-crop.docbook
index 58f6362..ee47204 100644
--- a/digikam/editor-transform-crop.docbook
+++ b/digikam/editor-transform-crop.docbook
@@ -28,7 +28,7 @@
                 <textobject> <phrase>The Image Editor Crop Button</phrase> </textobject>
             </inlinemediaobject>
 
-            button on the toolbar and the photograph will be cropped (&Ctrl;+X). Use the 
+            button on the toolbar and the photograph will be cropped (<keycombo>&Ctrl;<keycap>X</keycap></keycombo>). Use the 
             <menuchoice><guimenu>File</guimenu>
             <guimenuitem>Save</guimenuitem></menuchoice> or 
             <menuchoice><guimenu>File</guimenu>
diff --git a/digikam/editor-transform-freerotation.docbook b/digikam/editor-transform-freerotation.docbook
index 02c6d78..17e86cb 100644
--- a/digikam/editor-transform-freerotation.docbook
+++ b/digikam/editor-transform-freerotation.docbook
@@ -27,7 +27,7 @@
 
     <para>
     For better orientation, the Free Rotation tool provides a vertical and horizontal guide. Move the mouse cursor under image preview to display the dashed line guide. Move the cursor to an supposedly vertical or horizontal feature in the image like the sea or a building border
-    and press the left mouse button for freeze the dashed lines position. Now, adjust the angle accordingly with the guide.
+    and press the &LMB; for freeze the dashed lines position. Now, adjust the angle accordingly with the guide.
     </para>
 
     <warning><para>
diff --git a/digikam/editor-transform-shear.docbook b/digikam/editor-transform-shear.docbook
index ada8476..a782525 100644
--- a/digikam/editor-transform-shear.docbook
+++ b/digikam/editor-transform-shear.docbook
@@ -30,7 +30,7 @@
     </para>
 
     <para>
-    To assist you in aligning, the tool provides a vertical and horizontal guide. Move the mouse cursor under image preview for display the dashed lines guide. Move the cursor to an important place in the image like the sea or a building border and press the left mouse button for freeze the dashed lines position. Now, adjust the shear correction according with the guide.
+    To assist you in aligning, the tool provides a vertical and horizontal guide. Move the mouse cursor under image preview for display the dashed lines guide. Move the cursor to an important place in the image like the sea or a building border and press the &LMB; for freeze the dashed lines position. Now, adjust the shear correction according with the guide.
     </para>
                 
     <warning><para>
diff --git a/digikam/editor-using.docbook b/digikam/editor-using.docbook
index 4cea6bf..6d3f2ec 100644
--- a/digikam/editor-using.docbook
+++ b/digikam/editor-using.docbook
@@ -4,7 +4,7 @@
     <sect2 id="imageeditor-window"> <title>The Image Editor Window</title>
 
         <para>
-        &digikam; incorporates a fast Image Editor with a few basic yet powerful image editing tools. You can use the Image Editor to view your photographs and to make corrections and alterations. The Image Editor can be accessed either by clicking on a thumbnail in the Image Window or by right-clicking on a thumbnail and selecting <guilabel>Edit</guilabel> from the context menu.
+        &digikam; incorporates a fast Image Editor with a few basic yet powerful image editing tools. You can use the Image Editor to view your photographs and to make corrections and alterations. The Image Editor can be accessed either by clicking on a thumbnail in the Image Window or by clicking with the &RMB; over a thumbnail and selecting <guilabel>Edit</guilabel> from the context menu.
         </para>
 
         <para>
@@ -152,7 +152,7 @@
         <para>
         When you want to print the current image from the Image Editor, select
         <menuchoice><guimenu>File</guimenu>
-        <guimenuitem>Print image</guimenuitem></menuchoice> (&Ctrl;+P) and you get the standard Print dialog, where you can adjust the settings before printing your photograph.
+        <guimenuitem>Print image</guimenuitem></menuchoice> (<keycombo>&Ctrl;<keycap>P</keycap></keycombo>) and you get the standard Print dialog, where you can adjust the settings before printing your photograph.
         </para>
 
         <para>
diff --git a/digikam/intro-firstrun.docbook b/digikam/intro-firstrun.docbook
index 2d494ba..7c1fed9 100644
--- a/digikam/intro-firstrun.docbook
+++ b/digikam/intro-firstrun.docbook
@@ -76,7 +76,7 @@
             </para>
 
             <para>
-                Now decide how digiKam will open images on a right click. Previews will load faster but you won't be able to make any corrections.
+                Now decide how digiKam will open images with a click of the &RMB;. Previews will load faster but you won't be able to make any corrections.
             </para>
 
             <para>
diff --git a/digikam/menu-editor.docbook b/digikam/menu-editor.docbook
index 3a4edfb..a41d8ac 100644
--- a/digikam/menu-editor.docbook
+++ b/digikam/menu-editor.docbook
@@ -353,7 +353,7 @@
 
         <varlistentry>
             <term><menuchoice>
-                <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>Left</keycap></keycombo> </shortcut>
+                <shortcut><keycombo action="simul">&Ctrl;&Shift;&Left;</keycombo> </shortcut>
                 <guimenu>Transform</guimenu><guimenuitem>Rotate</guimenuitem><guimenuitem>-90 
                 degrees</guimenuitem>
             </menuchoice></term>
@@ -362,7 +362,7 @@
 
         <varlistentry>
             <term><menuchoice>
-                <shortcut><keycombo action="simul">&Ctrl;&Shift;<keycap>Right</keycap></keycombo> </shortcut>
+                <shortcut><keycombo action="simul">&Ctrl;&Shift;&Right;</keycombo> </shortcut>
                 <guimenu>Transform</guimenu><guimenuitem>Rotate</guimenuitem><guimenuitem>90 
                 degrees</guimenuitem>
             </menuchoice></term>
diff --git a/digikam/tool-acquire-main-window.png b/digikam/tool-acquire-main-window.png
deleted file mode 100644
index ac078f1..0000000
Binary files a/digikam/tool-acquire-main-window.png and /dev/null differ
diff --git a/digikam/tool-dlnaserver.docbook b/digikam/tool-dlnaserver.docbook
index 6c55e56..c647995 100644
--- a/digikam/tool-dlnaserver.docbook
+++ b/digikam/tool-dlnaserver.docbook
@@ -35,7 +35,7 @@ When you click the icon, the mediaserver window will open as follows:
 <sect1><title>The Configuration Panel</title>
 
 <para>
-    Starting the &digikam; configuration panel (<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &digikam;</guimenuitem></menuchoice>), you will find a new option for the &digikam; mediaserver. You actually have two simple options: if you want to start the mediaserver automatically once you start &digikam; and if so, if you want to start the server in background or show the actual mediaserver window. That's all what the two checkboxes here do.
+    Starting the &digikam; configuration panel (<menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &digikam;...</guimenuitem></menuchoice>), you will find a new option for the &digikam; mediaserver. You actually have two simple options: if you want to start the mediaserver automatically once you start &digikam; and if so, if you want to start the server in background or show the actual mediaserver window. That's all what the two checkboxes here do.
 
 </para>
 
diff --git a/digikam/tool-flickrexport.docbook b/digikam/tool-flickrexport.docbook
index d7e011f..2b829c9 100644
--- a/digikam/tool-flickrexport.docbook
+++ b/digikam/tool-flickrexport.docbook
@@ -36,7 +36,7 @@
   <figure id="flickrexport-first-signup-dialog">
       <title>The First Sign Up Dialog Preview</title>
       <mediaobject><imageobject>
-        <imagedata srccredit="The First Sign Up Dialog Preview" fileref="tool-flickrexportsignup.png"/>
+        <imagedata srccredit="The First Sign Up Dialog Preview" fileref="tool-flickrexport-signup.png"/>
       </imageobject></mediaobject>
   </figure>
 
diff --git a/digikam/tool-geolocationeditor.docbook b/digikam/tool-geolocationeditor.docbook
index 29e8a1e..e36ba1f 100644
--- a/digikam/tool-geolocationeditor.docbook
+++ b/digikam/tool-geolocationeditor.docbook
@@ -133,7 +133,7 @@
                         ... the Decrease-the-thumbnail-size-on-the-map button as well.
                     </para></listitem>
                     <listitem><para>
-                        The Pan-mode button lets you move the map by left-click and holding on it and then drag it with the mouse to where you need it. The cursor symbol will change to a hand.
+                        The Pan-mode button lets you move the map by click with the &LMB; and holding on it and then drag it with the mouse to where you need it. The cursor symbol will change to a hand.
                     </para></listitem>
                     <listitem>
                         <para>
@@ -177,7 +177,7 @@
 
         <sect2 id="geolocation-edit-coordinates">       <title>Edit Coordinates</title>
             <para>
-                The coordinates can be set manually in the <guilabel>Details</guilabel> tab (see screenshot above). The location can be found and fixed iteratively with the displayed map. Move the mouse cursor to the region of interest, zoom in, adjust location, zoom in again, and so on until sufficient accuracy is achieved. Note that the zoom center will always be at the cursor position. Eventually you right click at the desired position and choose <guilabel>Copy Coordinates</guilabel>. Now you can go to the list of images below the map, select one or more images, right-click on them and choose <guilabel>Paste Coordinates</guilabel>. The coordinates will then be displayed in the Latitude and Longitude fields to the right of the map. To save your changes you click the <guilabel>Apply</guilabel> button right under the <guilabel>DOP</guilabel> field.
+                The coordinates can be set manually in the <guilabel>Details</guilabel> tab (see screenshot above). The location can be found and fixed iteratively with the displayed map. Move the mouse cursor to the region of interest, zoom in, adjust location, zoom in again, and so on until sufficient accuracy is achieved. Note that the zoom center will always be at the cursor position. Eventually you click with the &RMB; at the desired position and choose <guilabel>Copy Coordinates</guilabel>. Now you can go to the list of images below the map, select one or more images, click with the &RMB; on them and choose <guilabel>Paste Coordinates</guilabel>. The coordinates will then be displayed in the Latitude and Longitude fields to the right of the map. To save your changes you click the <guilabel>Apply</guilabel> button right under the <guilabel>DOP</guilabel> field.
             </para>
             
             <para>
@@ -252,7 +252,7 @@
             </para>
                 
             <para>
-                The last step is highlighted when you enter the tab. The first step is always labeled <quote>empty</quote> and represents the status the images had when they were loaded. You can click on every step and, depending on what kind of changes you did, you might see the images appearing, disappearing or moving on the map or see the differences in the list of images under the map. Note that the list is configurable by right-clicking on the header.
+                The last step is highlighted when you enter the tab. The first step is always labeled <quote>empty</quote> and represents the status the images had when they were loaded. You can click on every step and, depending on what kind of changes you did, you might see the images appearing, disappearing or moving on the map or see the differences in the list of images under the map. Note that the list is configurable by clicking with the &RMB; on the header.
             </para>
             
             <para>
@@ -274,7 +274,7 @@
                 First you should create a root tag in the Tag Manager or in the tag tree of the Left or Right Sidebar. You might name it Location or Places or ...
             </para>
             <para>
-                Then you select the image(s) you want to tag (they need to have GPS data assigned), open the Geolocation Editor and click the <guilabel>Reverse Geocoding</guilabel> tab. You will see your tag tree and if you right-click a tag, preferable the one you created for the geo tags, you will see this context menu:
+                Then you select the image(s) you want to tag (they need to have GPS data assigned), open the Geolocation Editor and click the <guilabel>Reverse Geocoding</guilabel> tab. You will see your tag tree and if you click with the &RMB; over a tag, preferable the one you created for the geo tags, you will see this context menu:
             </para>
             
             <para>
diff --git a/digikam/tool-maintenance.docbook b/digikam/tool-maintenance.docbook
index 6713700..ff309eb 100644
--- a/digikam/tool-maintenance.docbook
+++ b/digikam/tool-maintenance.docbook
@@ -45,11 +45,11 @@
             <para>
                 This process will scan the collections you defined in 
                 <menuchoice>
-                    <guimenu>Settings</guimenu><guisubmenu>Configure &digikam;</guisubmenu><guimenuitem>Collections</guimenuitem>
+                    <guimenu>Settings</guimenu><guisubmenu>Configure &digikam;...</guisubmenu><guimenuitem>Collections</guimenuitem>
                 </menuchoice> 
                 for new items, &ie; image files you added to your collections while &digikam; was not running. You can run this process also automatically on &digikam; startup by checking <guilabel>Scan for new items at startup</guilabel> in 
                 <menuchoice>
-                    <guimenu>Settings</guimenu><guisubmenu>Configure &digikam;</guisubmenu><guimenuitem>Miscellaneous</guimenuitem>
+                    <guimenu>Settings</guimenu><guisubmenu>Configure &digikam;...</guisubmenu><guimenuitem>Miscellaneous</guimenuitem>
                 </menuchoice>.
             </para>
 
@@ -61,7 +61,7 @@
             <para>
                 Rebuilding the thumbnails might be necessary if you worked on your images with other applications or if you changed the thumbnail size in 
                 <menuchoice>
-                    <guimenu>Settings</guimenu><guisubmenu>Configure &digikam;</guisubmenu><guisubmenu>Views</guisubmenu><guimenuitem>Tree-Views</guimenuitem>
+                    <guimenu>Settings</guimenu><guisubmenu>Configure &digikam;...</guisubmenu><guisubmenu>Views</guisubmenu><guimenuitem>Tree-Views</guimenuitem>
                 </menuchoice>. 
                 The <quote> Scan for changed or non-cataloged items</quote> option can speed up the process in the first case or if you just added pictures to your collection.
             </para>
diff --git a/digikam/using-mainwindow-albumsview.docbook b/digikam/using-mainwindow-albumsview.docbook
index 3050da3..76c9f41 100644
--- a/digikam/using-mainwindow-albumsview.docbook
+++ b/digikam/using-mainwindow-albumsview.docbook
@@ -19,7 +19,7 @@
     <title>Creating a New Album</title>
 
         <para>
-            There are a number of ways to create a new Album. You can create a new Album when you upload new photographs from the Camera using <menuchoice><guimenu>Import</guimenu> <guimenuitem>Cameras</guimenuitem></menuchoice>. You can also create a new empty Album with <menuchoice><guimenu>Album</guimenu> <guimenuitem>New...</guimenuitem></menuchoice> (Ctrl+N) in the <quote>Albums</quote> view. As an additional option, you can create a new Album by importing an existing folder of photographs from your computer; just select <menuchoice><guimenu>Import</guimenu> <guimenuitem>Add Folders...</guimenuitem></menuchoice> from the menu bar and select the folder that you want to import. An Album will be created with the same name as the hard disk folder. You can use drag and drop to import a folder. Drag a folder icon, for example from a &konqueror; window. Then drop it on the album list on the left. A menu will appear that gives you the option to move or copy the folder into &digikam;.
+            There are a number of ways to create a new Album. You can create a new Album when you upload new photographs from the Camera using <menuchoice><guimenu>Import</guimenu> <guimenuitem>Cameras</guimenuitem></menuchoice>. You can also create a new empty Album with <menuchoice><guimenu>Album</guimenu> <guimenuitem>New...</guimenuitem></menuchoice> (<keycombo>&Ctrl;<keycap>N</keycap></keycombo>) in the <quote>Albums</quote> view. As an additional option, you can create a new Album by importing an existing folder of photographs from your computer; just select <menuchoice><guimenu>Import</guimenu> <guimenuitem>Add Folders...</guimenuitem></menuchoice> from the menu bar and select the folder that you want to import. An Album will be created with the same name as the hard disk folder. You can use drag and drop to import a folder. Drag a folder icon, for example from a &konqueror; window. Then drop it on the album list on the left. A menu will appear that gives you the option to move or copy the folder into &digikam;.
         </para>
 
     </sect3>
@@ -28,7 +28,7 @@
     <title>Deleting an Album</title>
 
         <para>
-            When you delete an Album from &digikam; it will be moved into the internal Trash Can. As an option you could change this behavior, so that delete really will remove the Album and all of the photographs in it. This can be changed by selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &digikam;</guimenuitem></menuchoice> and selecting the Miscellaneous page. At the top of this page are the settings that control what happens when a photograph is deleted. To delete an Album right-click the Album in the <quote>Albums</quote> tree and select Delete Album from the context menu.
+            When you delete an Album from &digikam; it will be moved into the internal Trash Can. As an option you could change this behavior, so that delete really will remove the Album and all of the photographs in it. This can be changed by selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &digikam;...</guimenuitem></menuchoice> and selecting the Miscellaneous page. At the top of this page are the settings that control what happens when a photograph is deleted. To delete an Album, click with the &RMB; over the Album in the <quote>Albums</quote> tree and select Delete Album from the context menu.
         </para>
 
     </sect3>
@@ -37,7 +37,7 @@
     <title>Adding a Photograph to an Album</title>
 
         <para>
-            Most of the time you will create new Albums and populate them with photographs directly from your camera using the Camera Tool. However, sometimes you may want to add a photograph that you already have on your computer to an existing Album. To add a photograph to an Album select <menuchoice><guimenu>Import</guimenu> <guimenuitem>Add Images...</guimenuitem></menuchoice> (Ctrl+Alt+I) from the menu bar. Select a source folder from the dialog and click OK. An import window will open. Select the photographs that you want to add and choose <guilabel>Download Selected</guilabel> from the <quote>Download</quote> drop down menu. A dialog will open where you can choose the destination album. The photographs will be copied into the Album. <guilabel>Download New</guilabel> (Ctrl+N) from the same menu will copy only those images which are not in the destination folder yet.
+            Most of the time you will create new Albums and populate them with photographs directly from your camera using the Camera Tool. However, sometimes you may want to add a photograph that you already have on your computer to an existing Album. To add a photograph to an Album select <menuchoice><guimenu>Import</guimenu> <guimenuitem>Add Images...</guimenuitem></menuchoice> (<keycombo>&Ctrl;&Alt;<keycap>I</keycap></keycombo>) from the menu bar. Select a source folder from the dialog and click OK. An import window will open. Select the photographs that you want to add and choose <guilabel>Download Selected</guilabel> from the <quote>Download</quote> drop down menu. A dialog will open where you can choose the destination album. The photographs will be copied into the Album. <guilabel>Download New</guilabel> (<keycombo>&Ctrl;<keycap>N</keycap></keycombo>) from the same menu will copy only those images which are not in the destination folder yet.
         </para>
 
         <para>
@@ -67,7 +67,7 @@
         <anchor id="albumpropsedit.anchor"/>
 
         <para>
-            Album Properties can help you remember which kind of photographs are in an Album and can also help you to organize the <quote>Albums</quote> tree. To access the Album Properties right-click on an Album and select <guilabel>Properties</guilabel> (Alt+Return) from the context menu.
+            Album Properties can help you remember which kind of photographs are in an Album and can also help you to organize the <quote>Albums</quote> tree. To access the Album Properties, click with the &RMB; on an Album and select <guilabel>Properties</guilabel> (<keycombo>&Alt;&Return;</keycombo>) from the context menu.
         </para>
 
         <para>
@@ -83,7 +83,7 @@
             <listitem><para>The Album <guilabel>Title</guilabel> : Name of the Album, identical with the name of the folder on your hard disk. If you edit it here, the folder will also be renamed.
             </para></listitem>
 
-            <listitem><para>The Album <guilabel>Category</guilabel> : this is a way of grouping your Albums together by a common label. The Category you set will be used to order your albums when you select <guilabel>By Category</guilabel> from the drop down box in the tool bar or using <menuchoice><guimenu>View</guimenu><guimenuitem>Sort Albums</guimenuitem><guimenuitem>By Category</guimenuitem></menuchoice>. If you want to add and delete Category labels, choose from the menu <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &digikam;</guimenuitem></menuchoice> and here the Album Category section.
+            <listitem><para>The Album <guilabel>Category</guilabel> : this is a way of grouping your Albums together by a common label. The Category you set will be used to order your albums when you select <guilabel>By Category</guilabel> from the drop down box in the tool bar or using <menuchoice><guimenu>View</guimenu><guimenuitem>Sort Albums</guimenuitem><guimenuitem>By Category</guimenuitem></menuchoice>. If you want to add and delete Category labels, choose from the menu <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &digikam;...</guimenuitem></menuchoice> and here the Album Category section.
             </para></listitem>
 
             <listitem><para>The <guilabel>Caption</guilabel> for the Album : Usually a short description of the content, but of course you are free to abuse it in any conceivable way. But beware: this will be shown in the banner at the top of the main Image Window ;-)
@@ -107,7 +107,7 @@
         </para>
 
         <para>
-            To select a photograph as the Album icon, right-click on the photograph that you want to use as the Album icon and select <guimenuitem>Set as Album Thumbnail</guimenuitem> from the context menu. Additionally you can use drag and drop to set the Album icon. Drag the photographs icon from the thumbnail area and drop it on the currently selected Album in the Album list.
+            To select a photograph as the Album icon, click with the &RMB; on the photograph that you want to use as the Album icon and select <guimenuitem>Set as Album Thumbnail</guimenuitem> from the context menu. Additionally you can use drag and drop to set the Album icon. Drag the photographs icon from the thumbnail area and drop it on the currently selected Album in the Album list.
         </para>
 
         <note>
diff --git a/digikam/using-mainwindow-fuzzysearches.docbook b/digikam/using-mainwindow-fuzzysearches.docbook
index 15f79a6..17bfc3b 100644
--- a/digikam/using-mainwindow-fuzzysearches.docbook
+++ b/digikam/using-mainwindow-fuzzysearches.docbook
@@ -24,7 +24,7 @@
             </para>
             
             <para>
-                Individual similarity values for each item can be obtained in the table view of the Image Area (<guilabel>Table</guilabel> button on the Main Toolbar). Right click on one of the column headers and select <guilabel>Similarity</guilabel> from <guilabel>Item properties</guilabel> to display the similarity column. By clicking on the header of this column then the results will be sorted by similarity grouped by reference images. Clicking repeatedly on the header will toggle between ascending and descending order.
+                Individual similarity values for each item can be obtained in the table view of the Image Area (<guilabel>Table</guilabel> button on the Main Toolbar). Click with the &RMB; over one of the column headers and select <guilabel>Similarity</guilabel> from <guilabel>Item properties</guilabel> to display the similarity column. By clicking on the header of this column then the results will be sorted by similarity grouped by reference images. Clicking repeatedly on the header will toggle between ascending and descending order.
             </para>
         </listitem>
 
diff --git a/digikam/using-mainwindow-imageview.docbook b/digikam/using-mainwindow-imageview.docbook
index eed5040..4e7c16e 100644
--- a/digikam/using-mainwindow-imageview.docbook
+++ b/digikam/using-mainwindow-imageview.docbook
@@ -19,7 +19,7 @@
             Information about each photograph is displayed below each thumbnail. You can control what information is displayed from the
             <menuchoice>
                 <guimenu>Settings</guimenu>
-                <guimenuitem>Configure &digikam;</guimenuitem>
+                <guimenuitem>Configure &digikam;...</guimenuitem>
             </menuchoice>
             dialog. Select the <guilabel>Album View</guilabel> page and look for the <guilabel>Icon-View Options</guilabel> section.
         </para>
@@ -37,16 +37,16 @@
 
             <menuchoice>
                 <guimenu>Settings</guimenu>
-                <guimenuitem>Configure &digikam;</guimenuitem>
+                <guimenuitem>Configure &digikam;...</guimenuitem>
             </menuchoice>
         </para>
 
         <para>
-            As an alternative you can display the photographs in a table by hitting the <menuchoice><guimenu>Table</guimenu></menuchoice> button on the Main Toolbar or by selecting <menuchoice><guimenu>View</guimenu><guimenuitem>Table</guimenuitem></menuchoice> menu from the menu bar. This allows to see a lot of photographs at the same time (Tip: leave away the thumbnail column) in a way you can customize the usual way by right-clicking on the headline bar and choose the information you want to see. Left-clicking on a line in the table will open the preview of that photograph.
+            As an alternative you can display the photographs in a table by hitting the <menuchoice><guimenu>Table</guimenu></menuchoice> button on the Main Toolbar or by selecting <menuchoice><guimenu>View</guimenu><guimenuitem>Table</guimenuitem></menuchoice> menu from the menu bar. This allows to see a lot of photographs at the same time (Tip: leave away the thumbnail column) in a way you can customize the usual way by click with the &RMB; on the headline bar and choose the information you want to see. Clicking with the &LMB; on a line in the table will open the preview of that photograph.
         </para>
 
         <para>
-            You can access most of the functions that &digikam; can perform on a photograph by right-clicking the thumbnail or line in the table (context menu) or by selecting from the <menuchoice><guimenu>Item</guimenu></menuchoice> menu in the menu bar.
+            You can access most of the functions that &digikam; can perform on a photograph by click with the &RMB; over the thumbnail or line in the table (context menu) or by selecting from the <menuchoice><guimenu>Item</guimenu></menuchoice> menu in the menu bar.
         </para>
 
     </sect3>
@@ -97,7 +97,7 @@
                     <shortcut><keycap>F4</keycap></shortcut>
                     <guimenu>Item</guimenu><guimenuitem>Open...</guimenuitem>
                 </menuchoice>
-            from the menu bar or by right-clicking and selecting <guilabel>Open...</guilabel> from the context menu. See the <link linkend="editor-using">&digikam; Image Editor</link> section for instructions on how to edit your photographs. The Image Editor offers a wide range of tools to enhance, decorate and/or modify your photographs.
+            from the menu bar or clicking with the &RMB; and selecting <guilabel>Open...</guilabel> from the context menu. See the <link linkend="editor-using">&digikam; Image Editor</link> section for instructions on how to edit your photographs. The Image Editor offers a wide range of tools to enhance, decorate and/or modify your photographs.
         </para>
 
     </sect3>
@@ -106,7 +106,7 @@
     <title>Viewing or Editing a Photograph With Another Application</title>
 
         <para>
-            Sometimes &digikam; may not provide all of the capabilities you need. You can open a photograph in another application by right-clicking on it and selecting from the <guilabel>Open With...</guilabel> sub-menu (At the moment this function is available only under &Linux;). The list of applications that appear in this menu is controlled by the standard desktop file associations for the image format type of this photograph. Consult the desktop manual for instructions on changing these file associations if the application that you need is not listed.
+            Sometimes &digikam; may not provide all of the capabilities you need. You can open a photograph in another application by clicking with the &RMB; on it and selecting from the <guilabel>Open With...</guilabel> sub-menu (At the moment this function is available only under &Linux;). The list of applications that appear in this menu is controlled by the standard desktop file associations for the image format type of this photograph. Consult the desktop manual for instructions on changing these file associations if the application that you need is not listed.
         </para>
 
         <para>
@@ -123,7 +123,7 @@
         </para></note>
 
         <para>
-            &digikam; provides two ways to get your photographs the right way up. The simplest method is to click one of the rotate icons on the thumbnail or the preview or to right-click for the context menu and select <guilabel>Rotate</guilabel> and then pick the direction of rotation needed.
+            &digikam; provides two ways to get your photographs the right way up. The simplest method is to click one of the rotate icons on the thumbnail or the preview or to click with the &RMB; for the context menu and select <guilabel>Rotate</guilabel> and then pick the direction of rotation needed.
         </para>
 
         <para>
@@ -144,7 +144,7 @@
     <title>Renaming a Photograph</title>
 
         <para>
-        You can change the filename for a photograph by right-clicking a thumbnail and selecting
+        You can change the filename for a photograph by click with the &RMB; over a thumbnail and selecting
             <menuchoice>
                 <shortcut><keycap>F2</keycap></shortcut>
                     <guimenu>Rename</guimenu>
diff --git a/digikam/using-mainwindow-intro.docbook b/digikam/using-mainwindow-intro.docbook
index 4b79765..3d82fe1 100644
--- a/digikam/using-mainwindow-intro.docbook
+++ b/digikam/using-mainwindow-intro.docbook
@@ -82,7 +82,7 @@
 
                 <listitem><para>Slideshow drop down menu</para></listitem>
 
-                <listitem><para>Toggle Full Screen (&Ctrl;+&Shift;+<keycap>F</keycap>)</para></listitem>
+                <listitem><para>Toggle Full Screen (<keycombo>&Ctrl;&Shift;<keycap>F</keycap></keycombo>)</para></listitem>
 
                 <listitem><para>Link to digikam.org, also an indicator for ongoing processes</para></listitem>
 
@@ -91,7 +91,7 @@
         </para>
 
         <para>
-            You can customize the Toolbar by choosing <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem></menuchoice> or right click on it and choose <guimenuitem>Configure Toolbars...</guimenuitem> from the context menu.
+            You can customize the Toolbar by choosing <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure Toolbars...</guimenuitem></menuchoice> or click with the &RMB; on it and choose <guimenuitem>Configure Toolbars...</guimenuitem> from the context menu.
         </para>
     </sect3>
 
diff --git a/digikam/using-mainwindow-mapview.docbook b/digikam/using-mainwindow-mapview.docbook
index 129a1b8..561acbe 100644
--- a/digikam/using-mainwindow-mapview.docbook
+++ b/digikam/using-mainwindow-mapview.docbook
@@ -27,7 +27,7 @@
     </para>
 
     <para>
-        Usually you will begin searching for images by defining a region on the map. From the <quote>Search by area:</quote> buttons click the left one, the Select-images-by-drawing-a-rectangle button, then left-click one corner on the map, draw open a rectangle and left-click another corner. All images falling within the coordinates of that rectangle will be shown in the Image Area (provided your images have been geo-coded of course).
+        Usually you will begin searching for images by defining a region on the map. From the <quote>Search by area:</quote> buttons click the left one, the Select-images-by-drawing-a-rectangle button, then click with the &LMB; over one corner on the map, draw open a rectangle and click with the &LMB; over another corner. All images falling within the coordinates of that rectangle will be shown in the Image Area (provided your images have been geo-coded of course).
     </para>
 
     <para>
diff --git a/digikam/using-mainwindow-searchesview.docbook b/digikam/using-mainwindow-searchesview.docbook
index 5f176c3..775006c 100644
--- a/digikam/using-mainwindow-searchesview.docbook
+++ b/digikam/using-mainwindow-searchesview.docbook
@@ -31,7 +31,7 @@
         </para>
 
         <para>
-            If you want to delete or rename a saved search from the list, right-click on it and select from the context menu.
+            If you want to delete or rename a saved search from the list, click with the &RMB; on it and select from the context menu.
         </para>
 
     </sect3>
diff --git a/digikam/using-mainwindow-tagsview.docbook b/digikam/using-mainwindow-tagsview.docbook
index 26d8236..9a103bf 100644
--- a/digikam/using-mainwindow-tagsview.docbook
+++ b/digikam/using-mainwindow-tagsview.docbook
@@ -28,11 +28,11 @@
     <sect3 id="using-managetags"> <title>Managing Tags</title>
 
         <para>
-            You can add new tags by right-clicking on either the <quote>Tags</quote> label or an existing tag and selecting <guilabel>New Tag...</guilabel>. A dialog will open where you can type in the tag name (or even a whole hierarchy branch), assign an icon and/or a shortcut to the tag. If you add a new tag by right-clicking on an existing tag, your new tag will be created as a sub-tag.
+            You can add new tags by clicking with the &RMB; on either the <quote>Tags</quote> label or an existing tag and selecting <guilabel>New Tag...</guilabel>. A dialog will open where you can type in the tag name (or even a whole hierarchy branch), assign an icon and/or a shortcut to the tag. If you add a new tag by clicking with the &RMB; on an existing tag, your new tag will be created as a sub-tag.
         </para>
 
         <para>
-            You can delete a tag by right-clicking on the tag you want to delete and selecting <guilabel>Delete Tag</guilabel>. When you delete a tag, the photographs themselves are not deleted. Simply the tag is removed from those photographs.
+            You can delete a tag by clicking with the &RMB; on the tag you want to delete and selecting <guilabel>Delete Tag</guilabel>. When you delete a tag, the photographs themselves are not deleted. Simply the tag is removed from those photographs.
         </para>
 
         <para>
@@ -41,11 +41,11 @@
         </para>
 
         <para>
-            You can set the Tag Properties by right-clicking on a tag and selecting <guilabel>Properties...</guilabel>. The Tag Properties allow you to change the name of the tag, the icon used in the Tags tree and the shortcut.
+            You can set the Tag Properties by clicking with the &RMB; on a tag and selecting <guilabel>Properties...</guilabel>. The Tag Properties allow you to change the name of the tag, the icon used in the Tags tree and the shortcut.
         </para>
 
         <para>
-            To select a photograph as the tag icon, right-click on the photograph that you want to use as the tag icon and select <guilabel>Set as Tag Thumbnail</guilabel> from the context menu. Additionally you can use drag and drop to set the tag icon. Drag the images icon and drop it on the currently selected tag in the tag list.
+            To select a photograph as the tag icon, click with the &RMB; on the photograph that you want to use as the tag icon and select <guilabel>Set as Tag Thumbnail</guilabel> from the context menu. Additionally you can use drag and drop to set the tag icon. Drag the images icon and drop it on the currently selected tag in the tag list.
         </para>
 
         <para>
@@ -94,7 +94,7 @@
     <sect3 id="using-taggingimages"> <title>Tagging Photographs</title>
 
         <para>
-            Before you can get the most out of &digikam;'s tagging capabilities, you must first tag your photographs. There are a few methods for that task. Once you have identified the photographs that you want to tag you can either drag and drop them onto the tag in the Tags tree or, by right-clicking on the selected photographs in the Image Window, you can use the <guilabel>Assign Tag</guilabel> menu to select the tags you wish to set.
+            Before you can get the most out of &digikam;'s tagging capabilities, you must first tag your photographs. There are a few methods for that task. Once you have identified the photographs that you want to tag you can either drag and drop them onto the tag in the Tags tree or, by clicking with the &RMB; on the selected photographs in the Image Window, you can use the <guilabel>Assign Tag</guilabel> menu to select the tags you wish to set.
         </para>
 
         <para>
@@ -106,7 +106,7 @@
         </para>
 
         <para>
-            Context menu: by right-clicking on the selected photographs and choosing <guilabel>Assign Tag</guilabel> you will see the next menu step offering the ten most recently used tags, <guilabel>Add New Tag...</guilabel>, described at the beginning of the previous <link linkend="using-managetags">article</link>, and <guilabel>More Tags...</guilabel> which leads to what is described in the next paragraph. The context menu method is obviously very useful if you use only a limited number of tags out of your whole tree for a while.
+            Context menu: by clicking with the &RMB; on the selected photographs and choosing <guilabel>Assign Tag</guilabel> you will see the next menu step offering the ten most recently used tags, <guilabel>Add New Tag...</guilabel>, described at the beginning of the previous <link linkend="using-managetags">article</link>, and <guilabel>More Tags...</guilabel> which leads to what is described in the next paragraph. The context menu method is obviously very useful if you use only a limited number of tags out of your whole tree for a while.
         </para>
 
         <example>
@@ -117,7 +117,7 @@
         </example>
 
         <para>
-            You can remove a tag from a photograph by right-clicking on the photograph and using the <guilabel>Remove Tag</guilabel> menu. This menu will only show those tags that have been set on this photograph.
+            You can remove a tag from a photograph by clicking with the &RMB; on the photograph and using the <guilabel>Remove Tag</guilabel> menu. This menu will only show those tags that have been set on this photograph.
         </para>
 
         <para>
diff --git a/digikam/using-setup-database.docbook b/digikam/using-setup-database.docbook
index 1b1af06..d7a3776 100644
--- a/digikam/using-setup-database.docbook
+++ b/digikam/using-setup-database.docbook
@@ -111,7 +111,7 @@
             </para>
 
             <para>
-                To switch from SQLite to MySQL database, go to <guimenuitem>Settings</guimenuitem> / <guimenuitem>Configure &digikam;</guimenuitem> and then under <guilabel>Settings</guilabel> section, select a database from the drop down list.
+                To switch from SQLite to MySQL database, go to <guimenuitem>Settings</guimenuitem> / <guimenuitem>Configure &digikam;...</guimenuitem> and then under <guilabel>Settings</guilabel> section, select a database from the drop down list.
 
                 <orderedlist>
 
@@ -180,7 +180,7 @@
             </para></note>
 
             <para>
-                Now, in &digikam;, go to <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &digikam;</guimenuitem></menuchoice> and then under <guilabel>Settings</guilabel> section, select <guilabel>MySQL Server</guilabel> from the drop down list.
+                Now, in &digikam;, go to <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure &digikam;...</guimenuitem></menuchoice> and then under <guilabel>Settings</guilabel> section, select <guilabel>MySQL Server</guilabel> from the drop down list.
             </para>
 
             <para>
diff --git a/digikam/using-setup-intro.docbook b/digikam/using-setup-intro.docbook
index 50bdf51..d2067f2 100644
--- a/digikam/using-setup-intro.docbook
+++ b/digikam/using-setup-intro.docbook
@@ -6,7 +6,7 @@
     <para>
         &digikam; tries to give you as much control over how it works as possible.
         There are many options that change the behavior of the application. To access these settings select
-        <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &digikam;</guimenuitem></menuchoice> 
+        <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &digikam;...</guimenuitem></menuchoice> 
         from the menubar. The configuration dialog is separated by categories displayed in separated pages.
         You can change between these pages by clicking on the icons on the left-hand side of the dialog.
     </para>
diff --git a/digikam/using-setup-metadata-rotation-ac.docbook b/digikam/using-setup-metadata-rotation-ac.docbook
index bc8bb62..3ae4674 100644
--- a/digikam/using-setup-metadata-rotation-ac.docbook
+++ b/digikam/using-setup-metadata-rotation-ac.docbook
@@ -8,7 +8,7 @@
     </para>
 
     <para>
-        <guilabel>Show images/thumbnails rotated according to orientation tag</guilabel> : this will use any orientation information that your camera has included in the EXIF information to automatically rotate your photographs so that they are the correct way up when displayed. It will not actually rotate the image file, only the display of the image on the screen. If you want to permanently rotate the image on file, you can right-click on the thumbnail and select <guilabel>Auto-rotate/flip according to EXIF orientation</guilabel>. The image will then be rotated on disk and the tag will be reset to "normal". If your camera routinely gets this orientation information wrong you might like to switch this feature off.
+        <guilabel>Show images/thumbnails rotated according to orientation tag</guilabel> : this will use any orientation information that your camera has included in the EXIF information to automatically rotate your photographs so that they are the correct way up when displayed. It will not actually rotate the image file, only the display of the image on the screen. If you want to permanently rotate the image on file, you can click with the &RMB; on the thumbnail and select <guilabel>Auto-rotate/flip according to EXIF orientation</guilabel>. The image will then be rotated on disk and the tag will be reset to "normal". If your camera routinely gets this orientation information wrong you might like to switch this feature off.
     </para>
 
     <para>
diff --git a/digikam/using-setup-templates.docbook b/digikam/using-setup-templates.docbook
index ef6fe7a..c1f1645 100644
--- a/digikam/using-setup-templates.docbook
+++ b/digikam/using-setup-templates.docbook
@@ -84,7 +84,7 @@
         The fields in the <guilabel>Location</guilabel> tab are self explaining by their title and the gray hints in the empty fields. A little bit more elaborate description can be found under 
         <menuchoice>
             <guimenu>Settings</guimenu>
-            <guimenuitem>Configure &digikam;</guimenuitem>
+            <guimenuitem>Configure &digikam;...</guimenuitem>
             <guimenuitem>Metadata</guimenuitem>
             <guimenuitem>Views</guimenuitem>
             <guimenuitem>IPTC viewer</guimenuitem>
diff --git a/digikam/using-sidebar-captions.docbook b/digikam/using-sidebar-captions.docbook
index 0e4b9e2..14b0a02 100644
--- a/digikam/using-sidebar-captions.docbook
+++ b/digikam/using-sidebar-captions.docbook
@@ -55,7 +55,7 @@
     <title>Rating</title>
 
     <para>
-        The Rating section displays a 0...5 star rating scheme that can be used in searches and sort orders. It can be applied by a single mouse click to the 5 stars in the sidebar or with a keyboard short-cut Ctrl+0...5. The rating from the sidebar is always applied to one image at a time. To rate a number of images, select them and pop-up the context menu (right-click) to apply a common rating.
+        The Rating section displays a 0...5 star rating scheme that can be used in searches and sort orders. It can be applied by a single mouse click to the 5 stars in the sidebar or with a keyboard short-cut <keycombo>&Ctrl;<keycap>0...5</keycap></keycombo>. The rating from the sidebar is always applied to one image at a time. To rate a number of images, select them and pop-up the context menu (click with the &RMB;) to apply a common rating.
     </para>
 
     <para>
