[gimp-help-2] More trivial changes to menu files



commit 782032270e63043669c5543a48a3a417893fdd7b
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Mon Aug 17 20:53:03 2009 +0200

    More trivial changes to menu files

 src/menus/colors/auto/autostretch-hsv.xml     |   42 ++++------
 src/menus/colors/auto/c-astretch.xml          |   43 ++++------
 src/menus/colors/auto/color-enhance.xml       |   46 ++++------
 src/menus/colors/auto/equalize.xml            |    7 +-
 src/menus/colors/auto/normalize.xml           |   46 ++++-------
 src/menus/colors/auto/white-balance.xml       |   52 +++++-------
 src/menus/colors/colorify.xml                 |   49 ++++--------
 src/menus/colors/colortoalpha.xml             |   52 ++++--------
 src/menus/colors/components.xml               |   29 ++-----
 src/menus/colors/components/channel-mixer.xml |  102 +++++++++--------------
 src/menus/colors/components/compose.xml       |   83 ++++++++-----------
 src/menus/colors/components/decompose.xml     |   70 ++++++----------
 src/menus/colors/components/recompose.xml     |   50 ++++-------
 src/menus/colors/filterpack.xml               |  110 +++++++++++--------------
 src/menus/colors/filters.xml                  |   44 +++--------
 src/menus/colors/hot.xml                      |   43 ++++------
 src/menus/colors/info.xml                     |   24 ++----
 src/menus/colors/invert.xml                   |   33 ++------
 src/menus/colors/max_rgb.xml                  |   55 +++++--------
 src/menus/colors/retinex.xml                  |   69 ++++++----------
 src/menus/colors/tools.xml                    |   19 +---
 src/menus/edit/buffer-dialog.xml              |   49 +++--------
 src/menus/edit/clear.xml                      |   24 ++----
 src/menus/edit/copy-visible.xml               |   29 +++----
 src/menus/edit/copy.xml                       |   29 +++----
 src/menus/edit/cut.xml                        |   29 +++----
 src/menus/edit/fade.xml                       |   41 ++++------
 src/menus/edit/fill-bg.xml                    |   24 ++----
 src/menus/edit/fill-fg.xml                    |   28 ++----
 src/menus/edit/fill-pattern.xml               |   24 ++----
 src/menus/edit/paste-as-brush.xml             |   60 ++++++--------
 src/menus/edit/paste-as-layer.xml             |   23 ++----
 src/menus/edit/paste-as-pattern.xml           |   50 ++++-------
 src/menus/edit/paste-into.xml                 |   24 ++----
 src/menus/edit/paste.xml                      |   29 +++----
 src/menus/edit/preferences.xml                |   23 ++----
 src/menus/edit/redo.xml                       |   32 +++----
 src/menus/edit/shortcuts.xml                  |   23 ++----
 src/menus/edit/stroke-path.xml                |   79 ++++++++----------
 src/menus/edit/stroke-selection.xml           |   31 ++-----
 src/menus/edit/undo-history.xml               |   29 +++----
 src/menus/edit/undo.xml                       |   29 +++----
 src/menus/edit/units.xml                      |   72 +++++++----------
 src/toolbox/tool-brush.xml                    |    2 +-
 44 files changed, 670 insertions(+), 1181 deletions(-)
---
diff --git a/src/menus/colors/auto/autostretch-hsv.xml b/src/menus/colors/auto/autostretch-hsv.xml
index e2064aa..352790d 100644
--- a/src/menus/colors/auto/autostretch-hsv.xml
+++ b/src/menus/colors/auto/autostretch-hsv.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-29 j.h: rev v2.6. no change
   2007-10-17 ude: moved here from menus/plug-in-autostretch-hsv.xml ('en','de')
@@ -8,20 +9,9 @@
   2006-09-05 text rewritten by scb;  example added by j.h
   2005-11-11 split of from layer-colors.xml by axel.wernicke
 -->
-<!--TODO ru: translate-->
 <sect2 id="plug-in-autostretch-hsv">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-29</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Stretch HSV</phrase>
-  </title>
+  <title>Stretch HSV</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Stretch colors in HSV space</secondary>
@@ -29,6 +19,7 @@
   <indexterm>
     <primary>Stretch HSV</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Stretch HSV</guimenuitem> command does the same thing
     as the <link linkend="plug-in-c-astretch">Stretch Contrast</link> command,
@@ -41,26 +32,25 @@
   </para>
 
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Colors</guimenu><guisubmenu>Auto</guisubmenu><guimenuitem>Stretch HSV</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guisubmenu>Auto</guisubmenu>
+            <guimenuitem>Stretch HSV</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase><quote>Stretch HSV</quote> example</phrase>
-    </title>
+    <title><quote>Stretch HSV</quote> example</title>
     <figure>
-      <title>
-        <phrase>Original image</phrase>
-      </title>
+      <title>Original image</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/alice.png" format="PNG"/>
@@ -74,9 +64,7 @@
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        <phrase>Image after the command</phrase>
-      </title>
+      <title>Image after the command</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/stretch-hsv.png" format="PNG"/>
diff --git a/src/menus/colors/auto/c-astretch.xml b/src/menus/colors/auto/c-astretch.xml
index 3f1d3ba..61c26c8 100644
--- a/src/menus/colors/auto/c-astretch.xml
+++ b/src/menus/colors/auto/c-astretch.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-29 j.h: rev. 2.6. No change
   2007-10-17 ude: moved here from menus/plug-in-c-astretch.xml ('en','de')
@@ -8,20 +9,9 @@
   2006-09-05 Example added by j.h; text revised by scb
   2005-11-11 split of from layer-colors.xml by axel.wernicke
 -->
-<!--TODO ru: translate-->
 <sect2 id="plug-in-c-astretch">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-29</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Stretch Contrast</phrase>
-  </title>
+  <title>Stretch Contrast</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Stretch contrast</secondary>
@@ -32,6 +22,7 @@
   <indexterm>
     <primary>Contrast</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Stretch Contrast</guimenuitem> command automatically
     stretches the histogram values in the active layer. For each channel
@@ -54,27 +45,27 @@
     command, but it does not reject any of the very dark or very bright
     pixels, so the white might be impure.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           This command can be accessed from an image menubar as
-          <menuchoice><guimenu>Colors</guimenu><guisubmenu>Auto</guisubmenu><guimenuitem>Stretch Contrast</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guisubmenu>Auto</guisubmenu>
+            <guimenuitem>Stretch Contrast</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase><quote>Stretch Contrast</quote> Example</phrase>
-    </title>
+    <title><quote>Stretch Contrast</quote> Example</title>
     <figure>
-      <title>
-        <phrase>Original image</phrase>
-      </title>
+      <title>Original image</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/alice.png" format="PNG"/>
@@ -88,9 +79,7 @@
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        <phrase>Image after the command</phrase>
-      </title>
+      <title>Image after the command</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/c-stretch.png" format="PNG"/>
diff --git a/src/menus/colors/auto/color-enhance.xml b/src/menus/colors/auto/color-enhance.xml
index fdae4cf..b87c333 100644
--- a/src/menus/colors/auto/color-enhance.xml
+++ b/src/menus/colors/auto/color-enhance.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-29 j.h: rev. v2.6. No change
   2007-10-17 ude: moved here from menus/plug-in-color-enhance.xml ('en','de')
@@ -8,20 +9,9 @@
   2006-09-05 text rewritten by scb;  example added by j.h
   2005-11-11 split of from layer-colors.xml by axel.wernicke
 -->
-<!--TODO ru: translate-->
 <sect2 id="plug-in-color-enhance">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-29</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Color Enhance</phrase>
-  </title>
+  <title>Color Enhance</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Color enhance</secondary>
@@ -29,39 +19,40 @@
   <indexterm>
     <primary>Color Enhance</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Color Enhance</guimenuitem> command increases the
     saturation range of the colors in the layer, without altering
     brightness or hue. It does this by converting the colors to HSV space,
     measuring the range of saturation values across the image, then
     stretching this range to be as large as possible, and finally
-    converting the colors back to RGB. It is similar to <link linkend="plug-in-c-astretch">Stretch Contrast</link>, except that it
+    converting the colors back to RGB. It is similar to
+    <link linkend="plug-in-c-astretch">Stretch Contrast</link>, except that it
     works in the HSV color space, so it preserves the hue.  It works on
     layers from RGB and Indexed images. If the image is Grayscale, the menu
     entry is insensitive and grayed out.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the command</phrase>
-    </title>
+    <title>Activate the command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Colors</guimenu><guisubmenu>Auto</guisubmenu><guimenuitem>Color Enhance</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guisubmenu>Auto</guisubmenu>
+            <guimenuitem>Color Enhance</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase><quote>Color Enhance</quote> example</phrase>
-    </title>
+    <title><quote>Color Enhance</quote> example</title>
     <figure>
-      <title>
-        <phrase><quote>Color Enhance</quote> example (Original image)
-        </phrase>
-      </title>
+      <title><quote>Color Enhance</quote> example (Original image)</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/alice.png" format="PNG"/>
@@ -76,8 +67,7 @@
     </figure>
     <figure>
       <title>
-        <phrase><quote>Color Enhance</quote> example (Image after the command)
-        </phrase>
+        <quote>Color Enhance</quote> example (Image after the command)
       </title>
       <mediaobject>
         <imageobject>
diff --git a/src/menus/colors/auto/equalize.xml b/src/menus/colors/auto/equalize.xml
index df9aa29..4c77410 100644
--- a/src/menus/colors/auto/equalize.xml
+++ b/src/menus/colors/auto/equalize.xml
@@ -12,6 +12,7 @@
 <!-- id is still used by GIMP, do not change! -->
 <sect2 id="gimp-layer-equalize">
   <title>Equalize</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Equalize</secondary>
@@ -35,6 +36,7 @@
     improve your image. It works on layers from RGB and Grayscale images. If
     the image is Indexed, the menu entry is insensitive and grayed out.
   </para>
+
   <sect3>
     <title>Activate the Command</title>
     <itemizedlist>
@@ -58,12 +60,11 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title><quote>Equalize</quote> example</title>
     <figure>
-      <title>
-        <phrase>Original image</phrase>
-      </title>
+      <title>Original image</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/alice.png" format="PNG"/>
diff --git a/src/menus/colors/auto/normalize.xml b/src/menus/colors/auto/normalize.xml
index 594af76..fa457b1 100644
--- a/src/menus/colors/auto/normalize.xml
+++ b/src/menus/colors/auto/normalize.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-29 j.h: rev. v2.6
   2007-10-17 ude: moved here from menus/plug-in-normalize.xml ('en','de')
@@ -8,21 +9,9 @@
   2006-09-05 example added by j.h ; text revised by scb
   2005-11-11 split of from layer-colors.xml by axel.wernicke
 -->
-<!--TODO ru: translate-->
-<!--TODO es: check/review-->
 <sect2 id="plug-in-normalize">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-29</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Normalize</phrase>
-  </title>
+  <title>Normalize</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Normalize</secondary>
@@ -30,6 +19,7 @@
   <indexterm>
     <primary>Normalize</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Normalize</guimenuitem> command scales the brightness
     values of the active layer so that the darkest point becomes black
@@ -38,27 +28,27 @@
     dim or washed out. <quote>Normalize</quote> works on layers from RGB,
     Grayscale, and Indexed images.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menu bar through
-          <menuchoice><guimenu>Colors</guimenu><guisubmenu>Auto</guisubmenu><guimenuitem>Normalize</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guisubmenu>Auto</guisubmenu>
+            <guimenuitem>Normalize</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase><quote>Normalize</quote>Example</phrase>
-    </title>
+    <title><quote>Normalize</quote>Example</title>
     <figure>
-      <title>
-        <phrase>Original image</phrase>
-      </title>
+      <title>Original image</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/alice.png" format="PNG"/>
@@ -72,11 +62,7 @@
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        <phrase>
-          Image after the command
-        </phrase>
-      </title>
+      <title>Image after the command</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/normalize.png" format="PNG"/>
diff --git a/src/menus/colors/auto/white-balance.xml b/src/menus/colors/auto/white-balance.xml
index feb41eb..1e41d67 100644
--- a/src/menus/colors/auto/white-balance.xml
+++ b/src/menus/colors/auto/white-balance.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-29 j.h: rev. v2.6
   2007-10-17 ude: moved here from menus/layer-white-balance.xml ('en','de')
@@ -8,21 +9,10 @@
   2006-09-21 lexa: added de translation
   2006-08-08: created by scb; example by j.h
 -->
-<!--TODO ru: translate-->
 <!-- id is still used by GIMP, do not change! -->
 <sect2 id="gimp-layer-white-balance">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-17</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>White Balance</phrase>
-  </title>
+  <title>White Balance</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>White balance</secondary>
@@ -30,6 +20,7 @@
   <indexterm>
     <primary>White Balance</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>White Balance</guimenuitem> command automatically
     adjusts the colors of the active layer by stretching the Red, Green and
@@ -39,41 +30,42 @@
     possible. The result is that pixel colors which occur very infrequently
     at the outer edges of the histograms (perhaps bits of dust, etc.) do
     not negatively influence the minimum and maximum values used for
-    stretching the histograms, in comparison with <link linkend="plug-in-c-astretch">Stretch Contrast</link>.  Like
+    stretching the histograms, in comparison with
+    <link linkend="plug-in-c-astretch">Stretch Contrast</link>. Like
     <quote>Stretch Contrast</quote>, however, there may be hue shifts in
     the resulting image.
   </para>
-  <para><!--2007-04-21-->
+  <para>
     This command suits images with poor white or black. Since it tends to
     create pure white (and black), it may be useful e.g. to enhance
     photographs.
   </para>
-  <para><guimenuitem>White Balance</guimenuitem> operates on layers from RGB
+  <para>
+    <guimenuitem>White Balance</guimenuitem> operates on layers from RGB
     images. If the image is Indexed or Grayscale, the menu item is insensitive
     and grayed out.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Colors</guimenu><guisubmenu>Auto</guisubmenu><guimenuitem>White Balance</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guisubmenu>Auto</guisubmenu>
+            <guimenuitem>White Balance</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase><quote>White Balance</quote> example
-      </phrase>
-    </title>
+    <title><quote>White Balance</quote> example</title>
     <figure>
-      <title>
-        <phrase>Original image</phrase>
-      </title>
+      <title>Original image</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/alice.png" format="PNG"/>
@@ -87,9 +79,7 @@
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        <phrase>Image after the command</phrase>
-      </title>
+      <title>Image after the command</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/white-balance.png" format="PNG"/>
diff --git a/src/menus/colors/colorify.xml b/src/menus/colors/colorify.xml
index d2688fc..2edf9e2 100644
--- a/src/menus/colors/colorify.xml
+++ b/src/menus/colors/colorify.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-12-15 j.h: updated to v2.4 en;fr
   2007-10-21 ude: moved here from filters/color/colorify.xml ('en','de')
@@ -10,21 +11,10 @@
   2005-09-30 de replaced informalfigure by axel.wernicke
   2005-08-25 de added by axel.wernicke
 -->
-<!--TODO es ru: update/review-->
 <!-- TODO all: Needs rewriting for v2.4? The options are different from those described. At last in my version of v2.4.6 (kost)-->
 <sect2 id="plug-in-colorify">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-21</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Colorify</phrase>
-  </title>
+  <title>Colorify</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Colorify</secondary>
@@ -32,19 +22,15 @@
   <indexterm>
     <primary>Colorify</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Colorify</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Colorify</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -52,7 +38,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/color-taj-colorify.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/color-taj-colorify.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Colorify</quote> applied</para>
@@ -64,10 +51,9 @@
       This filter works only on images in RGB mode.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
       <menuchoice>
@@ -76,14 +62,11 @@
       </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Colorify</quote> filter options</phrase>
-      </title>
+      <title><quote>Colorify</quote> filter options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/colors-colorify.png" format="PNG"/>
diff --git a/src/menus/colors/colortoalpha.xml b/src/menus/colors/colortoalpha.xml
index 9305df7..5f28a17 100644
--- a/src/menus/colors/colortoalpha.xml
+++ b/src/menus/colors/colortoalpha.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--This command is the same as gimp-layer-color-to-alpha.
     The F1 context help only refers to plug-in-color-to-alpha-->
 <!-- section history:
@@ -11,33 +12,17 @@
   2005-09-30 de replaced informalfigure by axel.wernicke
   2005-08-25 de added by axel.wernicke
 -->
-<!--TODO es ru: update/review-->
 <sect2 id="plug-in-colortoalpha">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-09-27</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Color to Alpha</phrase>
-  </title>
+  <title>Color to Alpha</title>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for <quote>Color to Alpha</quote>
-        </phrase>
-      </title>
+      <title>Example for <quote>Color to Alpha</quote></title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -45,7 +30,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/color-taj-colortoalpha.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/color-taj-colortoalpha.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Color to Alpha</quote> applied on blue areas
@@ -63,10 +49,9 @@
       with their surrounding pixels.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
       <menuchoice>
@@ -75,18 +60,15 @@
       </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Color to Alfa</quote> command options
-        </phrase>
-      </title>
+      <title><quote>Color to Alfa</quote> command options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/colors-colortoalpha.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/colors-colortoalpha.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/menus/colors/components.xml b/src/menus/colors/components.xml
index 797571d..362b381 100644
--- a/src/menus/colors/components.xml
+++ b/src/menus/colors/components.xml
@@ -1,28 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-17 KoSt: added 'no'
   2007-10-20 ude: created ('en','de')
 -->
-<!--TODO ru: translate new content-->
-<sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-imagewindow-menus-colors-components">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-20</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>The <quote>Components</quote> Submenu</phrase>
-  </title>
+<sect2 id="gimp-imagewindow-menus-colors-components">
+  <title>The <quote>Components</quote> Submenu</title>
+
   <para>This command leads to the following submenu</para>
   <figure>
-    <title>
-      <phrase>The <quote>Components</quote> submenu</phrase>
-    </title>
+    <title>The <quote>Components</quote> submenu</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/menus/colors-components.png" format="PNG"/>
@@ -53,10 +41,9 @@
       </listitem>
     </itemizedlist>
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the command</phrase>
-    </title>
+    <title>Activating the command</title>
     <para>
       This command is found in the image window menu under
       <menuchoice>
diff --git a/src/menus/colors/components/channel-mixer.xml b/src/menus/colors/components/channel-mixer.xml
index 18eb6a5..6f847cf 100644
--- a/src/menus/colors/components/channel-mixer.xml
+++ b/src/menus/colors/components/channel-mixer.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-29 j.h: rev. v2.6. No change
   2008-08-25 ciampix: fixed (it) content
@@ -13,24 +14,9 @@
   2005-09-30 de replaced informalfigure by axel.wernicke
   2005-08-26 de added by axel.wernicke
 -->
-<!--
-  TODO ru: translate
-  FIXME de;es;lt: this is not a filter, but a command, please fix
-  -->
 <sect2 id="plug-in-colors-channel-mixer">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-29</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Channel Mixer</phrase>
-  </title>
+  <title>Channel Mixer</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Components</secondary>
@@ -39,19 +25,15 @@
   <indexterm>
     <primary>Channel Mixer</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Channel Mixer</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Channel Mixer</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -59,7 +41,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/color-taj-channelmixer.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/color-taj-channelmixer.jpg"/>
         </imageobject>
         <caption>
           <para><quote>Channel Mixer</quote> applied</para>
@@ -71,27 +54,27 @@
       with or without an alpha channel. It has monochrome mode and a preview.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the command</phrase>
-    </title>
+    <title>Activate the command</title>
     <para>
       You can find this command through
-      <menuchoice><guimenu>Colors</guimenu><guisubmenu>Components</guisubmenu><guimenuitem>Channel Mixer</guimenuitem></menuchoice>.
+      <menuchoice>
+        <guimenu>Colors</guimenu>
+        <guisubmenu>Components</guisubmenu>
+        <guimenuitem>Channel Mixer</guimenuitem>
+      </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Channel Mixer</quote> command options
-        </phrase>
-      </title>
+      <title><quote>Channel Mixer</quote> command options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/colors-components-channelmixer.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/colors-components-channelmixer.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -178,10 +161,9 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>How does Channel Mixer work?</phrase>
-    </title>
+    <title>How does Channel Mixer work? </title>
     <variablelist>
       <varlistentry>
         <term>In RGB mode</term>
@@ -200,12 +182,11 @@
             Channel. Here is an example:
           </para>
           <figure>
-            <title>
-              <phrase>The original image and its channels</phrase>
-            </title>
+            <title>The original image and its channels</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/channel-mixer-ex1.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/menus/channel-mixer-ex1.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -219,14 +200,11 @@
             </mediaobject>
           </figure>
           <figure>
-            <title>
-              <phrase>
-                Output channel is red. Green Channel +50
-              </phrase>
-            </title>
+            <title>Output channel is red. Green Channel +50</title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/channel-mixer-ex2.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/menus/channel-mixer-ex2.png"/>
               </imageobject>
               <caption>
                 <para><!-- en improved: "relative values" instead
@@ -246,14 +224,13 @@
           </figure>
           <figure>
             <title>
-              <phrase>
-                Output channel is red. Green Channel +50%. The Preserve
-                Luminosity option is checked.
-              </phrase>
+              Output channel is red. Green Channel +50%. The Preserve
+              Luminosity option is checked.
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/channel-mixer-ex3.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/menus/channel-mixer-ex3.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -275,14 +252,13 @@
           </para>
           <figure>
             <title>
-              <phrase>
-                Monochrome option checked. Red: 100% Green: 50% Blue: 0%.
-                Preserve Luminosity unchecked.
-              </phrase>
+              Monochrome option checked. Red: 100% Green: 50% Blue: 0%.
+              Preserve Luminosity unchecked.
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/channel-mixer-ex4.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/menus/channel-mixer-ex4.png"/>
               </imageobject>
               <caption>
                 <para>
diff --git a/src/menus/colors/components/compose.xml b/src/menus/colors/components/compose.xml
index b240a0d..c3cc90d 100644
--- a/src/menus/colors/components/compose.xml
+++ b/src/menus/colors/components/compose.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-29 j.h: rev. v2.6. No change
   2008-03-08 ude: added channel representation example
@@ -14,24 +15,9 @@
   2005-09-30 de replaced informalfigure by axel.wernicke
   2005-08-25 de added by axel.wernicke
 -->
-<!--
-  TODO ru: update/review
-  FIXME es;it;lt;ru: this is not a filter, but a command, please fix
--->
 <sect2 id="plug-in-compose">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-29</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Compose</phrase>
-  </title>
+  <title>Compose</title>
+
   <indexterm>
     <primary>CMYK</primary>
   </indexterm>
@@ -55,19 +41,15 @@
   <indexterm>
     <primary>Compose</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Compose</quote> command
-        </phrase>
-      </title>
+      <title>Example for the <quote>Compose</quote> command</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/cosmos-decomposed.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/cosmos-decomposed.png"/>
         </imageobject>
         <caption>
           <para>Decomposed image (RGB decomposition)</para>
@@ -75,7 +57,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/cosmos-1.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/cosmos-1.png"/>
         </imageobject>
         <caption>
           <para><quote>Compose</quote> applied</para>
@@ -88,31 +71,32 @@
       build an image from grayscale images or layers created independently.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the command</phrase>
-    </title>
+    <title>Activate the command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can find this command in the image window menu under
-          <menuchoice><guimenu>Colors</guimenu><guisubmenu>Components</guisubmenu><guimenuitem>Composeâ?¦</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guisubmenu>Components</guisubmenu>
+            <guimenuitem>Composeâ?¦</guimenuitem>
+          </menuchoice>.
           It is enabled if your image is grayscale.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Compose</quote> command options</phrase>
-      </title>
+      <title><quote>Compose</quote> command options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/colors-components-compose.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/colors-components-compose.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -131,20 +115,19 @@
       <varlistentry>
         <term>Channel Representation</term>
         <listitem>
-          <para><!--changed 2008-03-08-->
+          <para>
             Allows you to select which channel will be affected to each image
             channel. You may use this option, for example, to exchange color
             channels:
           </para>
           <figure>
             <title>
-              <phrase>
-                Channel Representation example: exchange two channels
-              </phrase>
+              Channel Representation example: exchange two channels
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/compose-channels-ex1.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/menus/compose-channels-ex1.jpg"/>
               </imageobject>
               <caption>
                 <para>Original image</para>
@@ -152,7 +135,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/compose-channels-ex2.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/menus/compose-channels-ex2.png"/>
               </imageobject>
               <caption>
                 <para>Decomposed to layers</para>
@@ -160,7 +144,8 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/compose-channels-ex3.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/menus/compose-channels-ex3.png"/>
               </imageobject>
               <caption>
                 <para>Applied Channel Representation</para>
@@ -168,14 +153,16 @@
             </mediaobject>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/compose-channels-ex4.jpg" format="JPG"/>
+                <imagedata format="JPG"
+                  fileref="images/menus/compose-channels-ex4.jpg"/>
               </imageobject>
               <caption>
                 <para>Composed image</para>
               </caption>
             </mediaobject>
           </figure>
-          <para><!--changed 2008-03-08--><guilabel>Mask Value</guilabel>: Instead of selecting a layer or
+          <para>
+            <guilabel>Mask Value</guilabel>: Instead of selecting a layer or
             an image to build the channel, you can give the channel a value
             from 0 to 255. But note that at least one channel must be formed
             from a layer or image.
diff --git a/src/menus/colors/components/decompose.xml b/src/menus/colors/components/decompose.xml
index ecdaadf..7b285f5 100644
--- a/src/menus/colors/components/decompose.xml
+++ b/src/menus/colors/components/decompose.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-29 j.h: rev. v2.6. No change
   2008-02-29 lexa: fixed help-id and switched from filter to command
@@ -13,25 +14,12 @@
   2005-09-30 de replaced informalfigure by axel.wernicke
   2005-08-25 de added by axel.wernicke
 -->
-<!--
-  TODO ru: update/review
-  TODO es;it;lt;ru: this is not a filter but a command -> update!
- -->
 <sect2 id="plug-in-decompose-registered">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-29</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>
     <anchor id="plug-in-decompose"/>
     <phrase>Decompose</phrase>
   </title>
+
   <indexterm>
     <primary>CMYK</primary>
   </indexterm>
@@ -64,14 +52,11 @@
   <indexterm>
     <primary>Layer</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>Decomposition to images (RGB)</phrase>
-      </title>
+      <title>Decomposition to images (RGB)</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/taj_orig_2.png" format="PNG"/>
@@ -93,9 +78,7 @@
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        <phrase>Decomposition to layers (RGB)</phrase>
-      </title>
+      <title>Decomposition to layers (RGB)</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/taj_orig_2.png" format="PNG"/>
@@ -121,47 +104,43 @@
       into separated images or layers.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the command</phrase>
-    </title>
+    <title>Activate the command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can find this command in the image window menu under
-          <menuchoice><guimenu>Colors</guimenu><guisubmenu>Components</guisubmenu><guimenuitem>Decomposeâ?¦</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guisubmenu>Components</guisubmenu>
+            <guimenuitem>Decomposeâ?¦</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Decompose</quote> command options
-        </phrase>
-      </title>
+      <title><quote>Decompose</quote> command options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/colors-components-decompose.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/colors-components-decompose.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
-      <title>
-        <phrase>Extract Channels</phrase>
-      </title>
+      <title>Extract Channels</title>
       <para>
         Following options are described with
         <link linkend="plug-in-decompose-to-layers">Decompose to
         layers</link> checked.
       </para>
       <varlistentry>
-        <term>
-          <phrase>Color model</phrase>
-        </term>
+        <term>Color model</term>
         <listitem>
           <variablelist>
             <varlistentry>
@@ -257,7 +236,8 @@
               <listitem>
                 <para>
                   This option extracts the image transparency stored in the
-                  Alpha channel in <link linkend="gimp-channel-dialog">Channel dialog</link>
+                  Alpha channel in
+                  <link linkend="gimp-channel-dialog">Channel dialog</link>
                   in a separate image. The full transparent pixels are Black
                   the full opaque pixels are white. The graytones are smooth
                   transitions of the transparency in the source image.
@@ -319,9 +299,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Foreground as registration color</phrase>
-        </term>
+        <term>Foreground as registration color</term>
         <listitem>
           <para>
             This option is for specialists. It is related to CMYK printing.
diff --git a/src/menus/colors/components/recompose.xml b/src/menus/colors/components/recompose.xml
index 423fc22..9f6a777 100644
--- a/src/menus/colors/components/recompose.xml
+++ b/src/menus/colors/components/recompose.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-12-29 j.h: rev. v2.6. no change
   2008-03-01 lexA: changed from filter description to command description
@@ -11,24 +12,9 @@
   2005-09-30 de replaced informalfigure by axel.wernicke
   2005-08-25 de added by axel.wernicke
 -->
-<!--
-  TODO ru: update/review
-  FIXME es;it;lt;ru: this is not a filter, but a command, please fix
--->
 <sect2 id="plug-in-recompose">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-12-29</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Recompose</phrase>
-  </title>
+  <title>Recompose</title>
+
   <indexterm>
     <primary>CMYK</primary>
   </indexterm>
@@ -52,19 +38,15 @@
   <indexterm>
     <primary>Recompose</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Recompose</quote> command
-        </phrase>
-      </title>
+      <title>Example for the <quote>Recompose</quote> command</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/color-taj-decompose.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/color-taj-decompose.jpg"/>
         </imageobject>
         <caption>
           <para>Original image (decomposed to RGB)</para>
@@ -72,7 +54,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Command <quote>Recompose</quote> applied</para>
@@ -85,15 +68,18 @@
       command which uses a dialog.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the command</phrase>
-    </title>
+    <title>Activate the command</title>
     <itemizedlist>
       <listitem>
         <para>
           This command is found in the image window menu under
-          <menuchoice><guimenu>Colors</guimenu><guisubmenu>Components</guisubmenu><guimenuitem>Recompose</guimenuitem></menuchoice>:
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guisubmenu>Components</guisubmenu>
+            <guimenuitem>Recompose</guimenuitem>
+          </menuchoice>:
           This command is active after using Decompose.
         </para>
       </listitem>
diff --git a/src/menus/colors/filterpack.xml b/src/menus/colors/filterpack.xml
index db9e16f..9ed087e 100644
--- a/src/menus/colors/filterpack.xml
+++ b/src/menus/colors/filterpack.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-12-19 j.h: updated to v2.4 en;fr
   2007-10-21 ude: moved here from filters/color/filterpack.xml ('en','de')
@@ -10,20 +11,9 @@
   2005-09-30 de replaced informalfigure by axel.wernicke
   2005-08-26 de added by axel.wernicke
 -->
-<!--TODO es ru: update/review-->
 <sect2 id="plug-in-filter-pack">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-21</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Filter Pack</phrase>
-  </title>
+  <title>Filter Pack</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Filter Pack</secondary>
@@ -31,19 +21,16 @@
   <indexterm>
     <primary>Filter Pack</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
+
     <figure>
-      <title>
-        <phrase>
-          Example for the <quote>Filter Pack</quote> filter
-        </phrase>
-      </title>
+      <title>Example for the <quote>Filter Pack</quote> filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -51,7 +38,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/color-taj-filterpack.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/color-taj-filterpack.jpg"/>
         </imageobject>
         <caption>
           <para>
@@ -67,10 +55,9 @@
       you have here an interesting, intuitive, overview.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image window menu under
       <menuchoice>
@@ -79,19 +66,15 @@
       </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>
-          All the options for filter <quote>Filter Pack</quote>
-        </phrase>
-      </title>
+      <title>All the options for filter <quote>Filter Pack</quote></title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-color-filterpack.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-color-filterpack.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -118,13 +101,15 @@
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Selection only</guilabel>
-                : if a selection exists (default is the whole image).
+              <para>
+                <guilabel>Selection only</guilabel>:
+                if a selection exists (default is the whole image).
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Selection in context</guilabel>
-                : the selection within the image.
+              <para>
+                <guilabel>Selection in context</guilabel>
+                the selection within the image.
               </para>
             </listitem>
           </itemizedlist>
@@ -136,7 +121,8 @@
           <para>You can choose between:</para>
           <itemizedlist>
             <listitem>
-              <para><guilabel>Hue</guilabel>
+              <para>
+                <guilabel>Hue</guilabel>
                 makes one preview for each of the three primary colors and the
                 three complementary colors of the RGB color model. By clicking
                 successively on a color, you add to this color into the
@@ -145,54 +131,54 @@
               </para>
               <figure>
                 <title>
-                  <phrase>
-                    Hue option of the <quote>Filterpack</quote> filter
-                  </phrase>
+                  Hue option of the <quote>Filterpack</quote> filter
                 </title>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/filters/filterpack-hue-options.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/filters/filterpack-hue-options.png"/>
                   </imageobject>
                 </mediaobject>
               </figure>
             </listitem>
             <listitem>
-              <para><guilabel>Saturation</guilabel>: Three previews for more or
+              <para>
+                <guilabel>Saturation</guilabel>: Three previews for more or
                 less saturation.
               </para>
               <figure>
                 <title>
-                  <phrase>
-                    The saturation option of the <quote>Filterpack</quote>
-                    filter
-                  </phrase>
+                  The saturation option of the <quote>Filterpack</quote>
+                  filter
                 </title>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/filters/filterpack-saturation-options.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/filters/filterpack-saturation-options.png"/>
                   </imageobject>
                 </mediaobject>
               </figure>
             </listitem>
             <listitem>
-              <para><guilabel>Value</guilabel>: Three previews for more or less
+              <para>
+                <guilabel>Value</guilabel>: Three previews for more or less
                 luminosity.
               </para>
               <figure>
                 <title>
-                  <phrase>
-                    Value option of the <quote>Filterpack</quote> filter
-                  </phrase>
+                  Value option of the <quote>Filterpack</quote> filter
                 </title>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/filters/filterpack-value-options.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/filters/filterpack-value-options.png"/>
                   </imageobject>
                 </mediaobject>
               </figure>
             </listitem>
             <listitem>
-              <para><guilabel>Advanced</guilabel>: developed later.
+              <para>
+                <guilabel>Advanced</guilabel>: developed later.
               </para>
             </listitem>
           </itemizedlist>
@@ -206,7 +192,8 @@
           </para>
           <itemizedlist>
             <listitem>
-              <para><guilabel>Shadows</guilabel>: dark tones.</para>
+              <para>
+                <guilabel>Shadows</guilabel>: dark tones.</para>
             </listitem>
             <listitem>
               <para>
@@ -260,13 +247,12 @@
         <listitem>
           <figure>
             <title>
-              <phrase>
-                Advanced options of the <quote>Filterpack</quote> filter
-              </phrase>
+              Advanced options of the <quote>Filterpack</quote> filter
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/colors-filterpack-advanced.png" format="PNG"/>
+                <imagedata format="PNG"
+                  fileref="images/menus/colors-filterpack-advanced.png"/>
               </imageobject>
             </mediaobject>
           </figure>
diff --git a/src/menus/colors/filters.xml b/src/menus/colors/filters.xml
index 6dc7ee9..99cf0ec 100644
--- a/src/menus/colors/filters.xml
+++ b/src/menus/colors/filters.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2008-07-31 alex falappa: added 'it'
   2007-10-21 ude: created ('en','de')
 -->
-<!--TODO es ru: translate-->
-<sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-imagewindow-menus-colors-filters">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-21</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>The Color Filters</phrase>
-  </title>
+<sect2 id="gimp-imagewindow-menus-colors-filters">
+  <title>The Color Filters</title>
+
   <para>
     The following color filters group contains miscellaneous filters to modify
     colors in an image, a layer or a selection. You can find some nice effects
@@ -26,34 +16,22 @@
   <para>
     <itemizedlist>
       <listitem>
-        <para>
-          <xref linkend="plug-in-colorify"/>
-        </para>
+        <para><xref linkend="plug-in-colorify"/></para>
       </listitem>
       <listitem>
-        <para>
-          <xref linkend="plug-in-colortoalpha"/>
-        </para>
+        <para><xref linkend="plug-in-colortoalpha"/></para>
       </listitem>
       <listitem>
-        <para>
-          <xref linkend="plug-in-filter-pack"/>
-        </para>
+        <para><xref linkend="plug-in-filter-pack"/></para>
       </listitem>
       <listitem>
-        <para>
-          <xref linkend="plug-in-hot"/>
-        </para>
+        <para><xref linkend="plug-in-hot"/></para>
       </listitem>
       <listitem>
-        <para>
-          <xref linkend="plug-in-max-rgb"/>
-        </para>
+        <para><xref linkend="plug-in-max-rgb"/></para>
       </listitem>
       <listitem>
-        <para>
-          <xref linkend="plug-in-retinex"/>
-        </para>
+        <para><xref linkend="plug-in-retinex"/></para>
       </listitem>
     </itemizedlist>
   </para>
diff --git a/src/menus/colors/hot.xml b/src/menus/colors/hot.xml
index d4cac0b..be88bda 100644
--- a/src/menus/colors/hot.xml
+++ b/src/menus/colors/hot.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-21 ude: moved here from filters/color/hot.xml ('en','de')
   2007-07-07 Added Spanish translation by AntI
@@ -8,20 +9,9 @@
   2005-09-30 de replaced informalfigure by axel.wernicke
   2005-08-26 de added by axel.wernicke
 -->
-<!--TODO es ru: update/review-->
 <sect2 id="plug-in-hot">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-21</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Hot</phrase>
-  </title>
+  <title>Hot</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Hot</secondary>
@@ -29,19 +19,17 @@
   <indexterm>
     <primary>Hot</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <para>
       It identifies and modifies pixels which might cause problem when
       displayed onto PAL or NTSC TV screen.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       You can find this filter in the image window menu under
       <menuchoice>
@@ -50,17 +38,15 @@
       </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Hot</quote> filter options</phrase>
-      </title>
+      <title><quote>Hot</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/filters-color-hot.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/filters-color-hot.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -91,7 +77,8 @@
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Blacken</guilabel>: this will turn hot pixels to
+              <para>
+                <guilabel>Blacken</guilabel>: this will turn hot pixels to
                 black.
               </para>
             </listitem>
diff --git a/src/menus/colors/info.xml b/src/menus/colors/info.xml
index 19d0c25..2dcb0e7 100644
--- a/src/menus/colors/info.xml
+++ b/src/menus/colors/info.xml
@@ -1,28 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-12-22 alex falappa: added 'it'
   2007-10-22 ude: created ('en','de')
 -->
-<!--TODO ru: translate-->
-<sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-imagewindow-menus-colors-info">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-11-25</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>The <quote>Info</quote> Submenu</phrase>
-  </title>
+<sect2 id="gimp-imagewindow-menus-colors-info">
+  <title>The <quote>Info</quote> Submenu</title>
+
   <para>This command leads to the following submenu</para>
   <figure>
-    <title>
-      <phrase>The <quote>Info</quote> submenu</phrase>
-    </title>
+    <title>The <quote>Info</quote> submenu</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/menus/colors-info.png" format="PNG"/>
diff --git a/src/menus/colors/invert.xml b/src/menus/colors/invert.xml
index aee0f3a..8abd13b 100644
--- a/src/menus/colors/invert.xml
+++ b/src/menus/colors/invert.xml
@@ -1,26 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-16 ude: copied here from "menus/layer-invert.xml"
   2007-06-07 Added Spanish translation by AntI
   2007-03-12 Kolbjørn: added no translation
   2005-11-12 split of from layer-colors.xml by axel.wernicke
 -->
-<!--TODO ru: translate-->
 <!-- id is still used by GIMP, do not change! -->
 <sect2 id="gimp-layer-invert">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-16</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Invert</phrase>
-  </title>
+  <title>Invert</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Invert</secondary>
@@ -28,6 +18,7 @@
   <indexterm>
     <primary>Invert colors</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Invert</guimenuitem> command inverts all the pixel
     colors and brightness values in the current layer, as if the image were
@@ -51,9 +42,7 @@
   </warning>
 
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <para>
       You can access this command from the image menubar through
       <menuchoice>
@@ -64,15 +53,9 @@
   </sect3>
 
   <sect3>
-    <title>
-      <phrase>Example</phrase>
-    </title>
+    <title>Example</title>
     <figure>
-      <title>
-        <phrase>
-          Applying <quote>Invert colors</quote>
-        </phrase>
-      </title>
+      <title>Applying <quote>Invert colors</quote></title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/invert-1.png" format="PNG"/>
diff --git a/src/menus/colors/max_rgb.xml b/src/menus/colors/max_rgb.xml
index 47c72b9..0afb6d0 100644
--- a/src/menus/colors/max_rgb.xml
+++ b/src/menus/colors/max_rgb.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-21 ude: moved here from filters/color/max_rgb.xml ('en','de')
   2007-07-09 Added Spanish translation by AntI
@@ -8,20 +9,9 @@
   2005-09-30 de replaced informalfigure by axel.wernicke
   2005-08-25 de added by axel.wernicke
 -->
-<!--TODO es ru: update/review-->
 <sect2 id="plug-in-max-rgb">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-21</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Max RGB</phrase>
-  </title>
+  <title>Max RGB</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Max RGB</secondary>
@@ -29,19 +19,15 @@
   <indexterm>
     <primary>Max RGB</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase>
-          Example for the filter <quote>Max RGB</quote>
-        </phrase>
-      </title>
+      <title>Example for the filter <quote>Max RGB</quote></title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/taj_orig.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/taj_orig.jpg"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -49,7 +35,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/color-taj-maxrgb.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/color-taj-maxrgb.jpg"/>
         </imageobject>
         <caption>
           <para>Filter <quote>Max RGB</quote> applied</para>
@@ -62,10 +49,9 @@
       colors, red, green and blue, and possibly pure gray.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
       <menuchoice>
@@ -74,14 +60,11 @@
       </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Max RGB</quote> options</phrase>
-      </title>
+      <title><quote>Max RGB</quote> options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/colors-maxRGB.png" format="PNG"/>
@@ -101,13 +84,15 @@
       <varlistentry>
         <term>Parameter Settings</term>
         <listitem>
-          <para><guilabel>Hold the maximal channels</guilabel>: For every pixel,
+          <para>
+            <guilabel>Hold the maximal channels</guilabel>: For every pixel,
             the filter keeps intensity of the RGB color channel which has
             the maximal intensity and reduces other both to zero. For
             example: 220, 158, 175  max--&gt; 220, 0, 0. If two channels have
             same intensity, both are held: 210, 54, 210 max--&gt; 210, 0, 210.
           </para>
-          <para><guilabel>Hold the minimal channels</guilabel>: For every pixel,
+          <para>
+            <guilabel>Hold the minimal channels</guilabel>: For every pixel,
             the filter keeps intensity of the RGB color channel which has
             the minimal intensity and reduce both others to zero. For
             example: 220, 158, 175  min--&gt; 0, 158, 0. If two minimal
diff --git a/src/menus/colors/retinex.xml b/src/menus/colors/retinex.xml
index d087518..4b0fe84 100644
--- a/src/menus/colors/retinex.xml
+++ b/src/menus/colors/retinex.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-21 ude: moved here from filters/color/retinex.xml ('en','de')
   2007-10-09: updated italian by ciampix
@@ -9,37 +10,24 @@
   2006-12-23 ude: added de translation
   2005-11-26: created by julien hardelin.
 -->
-<!--TODO es it ru: update/review-->
 <sect2 id="plug-in-retinex">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-21</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Retinex</phrase>
-  </title>
+  <title>Retinex</title>
+
   <indexterm>
     <primary>Colors</primary>
   </indexterm>
   <indexterm>
     <primary>Retinex</primary>
   </indexterm>
+
   <sect3>
-    <title>
-      <phrase>Overview</phrase>
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        <phrase><quote>Retinex</quote> example</phrase>
-      </title>
+      <title><quote>Retinex</quote> example</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/colors-retinex1.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/colors-retinex1.png"/>
         </imageobject>
         <caption>
           <para>Original image</para>
@@ -47,10 +35,12 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/colors-retinex2.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/examples/colors-retinex2.png"/>
         </imageobject>
         <caption>
-          <para><quote>Retinex</quote> filter applied.
+          <para>
+            <quote>Retinex</quote> filter applied.
             Note new details in the upper right corner.
           </para>
         </caption>
@@ -70,10 +60,9 @@
       poorly visible structures in X-rays or scanners.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Activate the filter</phrase>
-    </title>
+    <title>Activate the filter</title>
     <para>
       This filter is found in the image window menu under
       <menuchoice>
@@ -82,17 +71,15 @@
       </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase><quote>Retinex</quote> filter options</phrase>
-      </title>
+      <title><quote>Retinex</quote> filter options</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/options-colors-retinex.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/filters/options-colors-retinex.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -104,9 +91,7 @@
     </para>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Level</phrase>
-        </term>
+        <term>Level</term>
         <listitem>
           <para>
             Here is what the plug-in author writes on his site
@@ -150,9 +135,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Scale</phrase>
-        </term>
+        <term>Scale</term>
         <listitem>
           <para>
             Determines the depth of the Retinex scale. Minimum value is 16, a
@@ -162,9 +145,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Scale division</phrase>
-        </term>
+        <term>Scale division</term>
         <listitem>
           <para>
             Determines the number of iterations in the multiscale Retinex
@@ -176,9 +157,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Dynamic</phrase>
-        </term>
+        <term>Dynamic</term>
         <listitem>
           <para>
             As the MSR algorithm tends to make the image lighter, this slider
diff --git a/src/menus/colors/tools.xml b/src/menus/colors/tools.xml
index fd3ba0e..4bfb904 100644
--- a/src/menus/colors/tools.xml
+++ b/src/menus/colors/tools.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-16 ude: created 'en','de' (copied from
              "menus/tools-introduction.xml" and "toolbox/tools-color.xml")
 -->
-<!--TODO es ru: translate new content-->
 <sect2 id="gimp-imagewindow-menus-colors-tools">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-10-16</date>
-        <authorinitials>ude</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Colors Tools</phrase>
-  </title>
+  <title>Colors Tools</title>
+
   <indexterm>
     <primary>Colors</primary>
     <secondary>Tools</secondary>
@@ -26,6 +16,7 @@
     <primary>Tools</primary>
     <secondary>Colors</secondary>
   </indexterm>
+
   <para>
      All of the <guimenu>Colors</guimenu> tools are extensively described in
      the toolbox chapter, <xref linkend="gimp-tools-color"/>:
diff --git a/src/menus/edit/buffer-dialog.xml b/src/menus/edit/buffer-dialog.xml
index 0dbb48c..0ae2b93 100644
--- a/src/menus/edit/buffer-dialog.xml
+++ b/src/menus/edit/buffer-dialog.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-22 AntI Updated es to 2.4
   2007-10-09 j.h rearranged en;fr options according to ude's suggestion
@@ -8,28 +9,16 @@
   2007-05-16 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-buffer-dialog">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-07</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Buffers</phrase>
-  </title>
+  <title>Buffers</title>
+
   <indexterm>
     <primary>Buffers</primary>
     <secondary>Named Buffers: Cut/Copy/Paste</secondary>
   </indexterm>
+
   <figure>
     <title>
-      <phrase>
-        The <quote>Buffer</quote> submenu of the <quote>Edit</quote>
-        menu</phrase>
+      The <quote>Buffer</quote> submenu of the <quote>Edit</quote> menu
     </title>
     <mediaobject>
       <imageobject>
@@ -43,10 +32,9 @@
     <link linkend="gimp-buffer-dialog">Buffers dialog</link>
     to view and manage any named buffers you have created.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Submenu</phrase>
-    </title>
+    <title>Activate the Submenu</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -59,15 +47,12 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Sub-menu entries</phrase>
-    </title>
+    <title>Sub-menu entries</title>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Cut Named</phrase>
-        </term>
+        <term>Cut Named</term>
         <listitem>
           <para>
             The <guimenuitem>Cut Named</guimenuitem> command cuts the
@@ -79,9 +64,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Copy Named</phrase>
-        </term>
+        <term>Copy Named</term>
         <listitem>
           <para>
             The <guimenuitem>Copy Named</guimenuitem> command copies the
@@ -93,9 +76,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Copy Visible Named</phrase>
-        </term>
+        <term>Copy Visible Named</term>
         <listitem>
           <para>
             The <guimenuitem>Copy Visible Named</guimenuitem> command copies
@@ -107,9 +88,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Paste Named</phrase>
-        </term>
+        <term>Paste Named</term>
         <listitem>
           <para>
             The <guimenuitem>Paste Named</guimenuitem>
diff --git a/src/menus/edit/clear.xml b/src/menus/edit/clear.xml
index 2ec53da..411889c 100644
--- a/src/menus/edit/clear.xml
+++ b/src/menus/edit/clear.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-09 j.h: no change needed for v2.4
   2007-05-16 Added Spanish translation by AntI
@@ -8,19 +9,8 @@
   2005-09-09 de added; reviewed by axel.wernicke
 -->
 <sect2 id="gimp-edit-clear">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-07</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Clear</phrase>
-  </title>
+  <title>Clear</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Clear</secondary>
@@ -33,6 +23,7 @@
   <indexterm>
     <primary>Clear</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Clear</guimenuitem> command deletes everything
     in the current selection. If there is no current selection,
@@ -49,10 +40,9 @@
     contents in the Clipboard and the contents of the clipboard are
     unaffected.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/edit/copy-visible.xml b/src/menus/edit/copy-visible.xml
index 6feca0b..fcadb50 100644
--- a/src/menus/edit/copy-visible.xml
+++ b/src/menus/edit/copy-visible.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-09 j.h : no change needed for v2.4
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-copy-visible">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Copy Visible</phrase>
-  </title>
+  <title>Copy Visible</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Copy</secondary>
@@ -29,6 +19,7 @@
   <indexterm>
     <primary>Copy Visible (Layers)</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Copy Visible</guimenuitem> command is similar to the
     <link linkend="gimp-edit-copy">Copy</link> command.  However, it does
@@ -44,15 +35,17 @@
       all the marked layers.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy Visible</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Copy Visible</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/menus/edit/copy.xml b/src/menus/edit/copy.xml
index 8581957..5784fe1 100644
--- a/src/menus/edit/copy.xml
+++ b/src/menus/edit/copy.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-09 j.h : no change needed for v2.4
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-copy">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Copy</phrase>
-  </title>
+  <title>Copy</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Copy</secondary>
@@ -26,18 +16,21 @@
     <primary>Selection</primary>
     <secondary>Copy</secondary>
   </indexterm>
+
   <para>
     The <guimenuitem>Copy</guimenuitem> command makes
     a copy of the current selection and stores it in the Clipboard.  The
-    information can be recalled using the <link linkend="gimp-edit-paste">Paste</link>, <link linkend="gimp-edit-paste-into">Paste Into</link>, or <link linkend="gimp-edit-paste-as-new">Paste As New</link> commands. If
+    information can be recalled using the
+    <link linkend="gimp-edit-paste">Paste</link>,
+    <link linkend="gimp-edit-paste-into">Paste Into</link>, or
+    <link linkend="gimp-edit-paste-as-new">Paste As New</link> commands. If
     there is no selection, the entire current layer is
     copied.  <quote>Copy</quote> only works on the current active
     layer. Any layers above or below it are ignored.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/edit/cut.xml b/src/menus/edit/cut.xml
index 9eb0883..3443ca9 100644
--- a/src/menus/edit/cut.xml
+++ b/src/menus/edit/cut.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-09 j.h : no change needed for v2.4
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-cut">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-05</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Cut</phrase>
-  </title>
+  <title>Cut</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Cut (/Paste)</secondary>
@@ -30,6 +20,7 @@
   <indexterm>
     <primary>Cut</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Cut</guimenuitem> command deletes the contents of the
     image's selections, and saves them in a clipboard so that they can
@@ -45,15 +36,17 @@
       active layer. Any layers above or below the active layer are ignored.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Edit</guimenu><guimenuitem>Cut</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Cut</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
diff --git a/src/menus/edit/fade.xml b/src/menus/edit/fade.xml
index 5983810..c418556 100644
--- a/src/menus/edit/fade.xml
+++ b/src/menus/edit/fade.xml
@@ -1,27 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-23 ciampix: added Italian translation
   2007-10-26 ude: added German translation
   2007-10-15 j.h : created (inspired from the GIMP Developers site)
 -->
 <sect2 id="gimp-edit-fade">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-05</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Fade...</phrase>
-  </title>
+  <title>Fade... </title>
+
   <indexterm>
     <primary>Fade</primary>
   </indexterm>
+
   <para>
     This command is usually grayed out. It becomes active if you use the Fill
     function or the Blend tool, or if you apply some filters.
@@ -35,29 +26,29 @@
     <quote>Opacity</quote>, and merge both new layer and previously active
     drawable.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the command</phrase>
-    </title>
+    <title>Activate the command</title>
     <para>
       You can get to this command from the image Menu bar through:
-      <menuchoice><guimenu>Edit</guimenu><guimenuitem>Fade...</guimenuitem></menuchoice>
+      <menuchoice>
+        <guimenu>Edit</guimenu>
+        <guimenuitem>Fade...</guimenuitem>
+      </menuchoice>
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <para>
       This command brings up a dialog window:
     </para>
     <figure>
-      <title>
-        <phrase>The <quote>Fade</quote> dialog</phrase>
-      </title>
+      <title>The <quote>Fade</quote> dialog</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/edit-fade-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/edit-fade-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
diff --git a/src/menus/edit/fill-bg.xml b/src/menus/edit/fill-bg.xml
index 1882966..8706883 100644
--- a/src/menus/edit/fill-bg.xml
+++ b/src/menus/edit/fill-bg.xml
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- News history:
   2007-10-09 j.h no change needed for v2.4
   2007-05-14 Added Spanish translation by AntI
   2006-06-28 note added en;fr for click-and-drag by j.h
 -->
 <sect2 id="gimp-edit-fill-bg">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-07-27</date>
-        <authorinitials>sally</authorinitials>
-        <revremark>v2.6 revised by j.h</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Fill with BG Color</phrase>
-  </title>
+  <title>Fill with BG Color</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Fill</secondary>
@@ -32,6 +22,7 @@
   <indexterm>
     <primary>Fill with Background color</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Fill with BG Color</guimenuitem> command fills the
     active layer selection with the solid color shown in the Background
@@ -46,10 +37,9 @@
       is filled.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/edit/fill-fg.xml b/src/menus/edit/fill-fg.xml
index 41259fa..9e819e2 100644
--- a/src/menus/edit/fill-fg.xml
+++ b/src/menus/edit/fill-fg.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- News history:
   2007-05-14 Added Spanish translation by AntI
   2006-06-28 note added en;fr for click-and-drag by j.h
 -->
 <sect2 id="gimp-edit-fill-fg">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-07-27</date>
-        <authorinitials>sally</authorinitials>
-        <revremark>v2.6 revised by j.h</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Fill with FG Color</phrase>
-  </title>
+  <title>Fill with FG Color</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Fill</secondary>
@@ -31,6 +21,7 @@
   <indexterm>
     <primary>Fill with Foreground Color</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Fill with FG Color</guimenuitem> command fills the
     image's selection with the solid color shown in the foreground part
@@ -46,16 +37,17 @@
       is filled.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
           <menuchoice>
-            <guimenu>Edit</guimenu><guimenuitem>Fill with FG Color</guimenuitem></menuchoice>,
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Fill with FG Color</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
diff --git a/src/menus/edit/fill-pattern.xml b/src/menus/edit/fill-pattern.xml
index 5f5f5b5..a1aaf0c 100644
--- a/src/menus/edit/fill-pattern.xml
+++ b/src/menus/edit/fill-pattern.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- Section history:
   2007-10-10 j.h : v2.4: no change
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-fill-pattern">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-07-27</date>
-        <authorinitials>sally</authorinitials>
-        <revremark>v2.6 revised by j.h</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Fill with Pattern</phrase>
-  </title>
+  <title>Fill with Pattern</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Fill</secondary>
@@ -31,6 +21,7 @@
   <indexterm>
     <primary>Fill with Pattern</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Fill with Pattern</guimenuitem> command fills the
     image's selection with the pattern shown in the Brush/Pattern/Gradient
@@ -49,10 +40,9 @@
       is filled.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/edit/paste-as-brush.xml b/src/menus/edit/paste-as-brush.xml
index 3fe7b68..3bde797 100644
--- a/src/menus/edit/paste-as-brush.xml
+++ b/src/menus/edit/paste-as-brush.xml
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-10 ciampix: added italian translation
   2007-10-15 ude: German translation
   2007-10-10 j.h : created
 -->
 <sect3 id="script-fu-paste-as-brush">
-  <!--<sect3info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect3info>-->
-  <title>
-    <phrase>Paste as New Brush</phrase>
-  </title>
+  <title>Paste as New Brush</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Paste</secondary>
@@ -30,40 +20,36 @@
   <indexterm>
     <primary>Paste as new brush</primary>
   </indexterm>
+
   <para>
     This command opens a dialog window which lets you name the new brush.
     The brush appears in the <link linkend="gimp-brush-dialog">Brushes
     dialog</link>.
   </para>
+
   <sect4>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>The <quote>New Brush</quote>dialog</phrase>
-      </title>
+      <title>The <quote>New Brush</quote>dialog</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/edit-paste-new-brush.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/edit-paste-new-brush.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Brush name</phrase>
-        </term>
+        <term>Brush name</term>
         <listitem>
-          <para><guilabel>Brush name</guilabel> is the name as it will be in
+          <para>
+            <guilabel>Brush name</guilabel> is the name as it will be in
             the <quote>Brushes</quote> Dialog.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>File name</phrase>
-        </term>
+        <term>File name</term>
         <listitem>
           <para>
             The new brush is saved as <guilabel>File name</guilabel> (with
@@ -73,11 +59,10 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>Spacing</phrase>
-        </term>
+        <term>Spacing</term>
         <listitem>
-          <para><guilabel>Spacing</guilabel>: When the brush draws a line, it
+          <para>
+            <guilabel>Spacing</guilabel>: When the brush draws a line, it
             actually stamps the brush icon repeatedly. If brush stamps are
             very close, you get the impression of a solid line.
           </para>
@@ -85,15 +70,18 @@
       </varlistentry>
     </variablelist>
   </sect4>
+
   <sect4>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Edit</guimenu><guisubmenu>Paste as </guisubmenu><guimenuitem>New Brush</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guisubmenu>Paste as </guisubmenu>
+            <guimenuitem>New Brush</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/menus/edit/paste-as-layer.xml b/src/menus/edit/paste-as-layer.xml
index a2a6713..dc74002 100644
--- a/src/menus/edit/paste-as-layer.xml
+++ b/src/menus/edit/paste-as-layer.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-01-06 j.h : Created
 -->
 <sect3 id="gimp-edit-paste-as-new-layer">
-  <!--<sect3info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-06</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Created for v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect3info>-->
-  <title>
-    <phrase>Paste as New Layer</phrase>
-  </title>
+  <title>Paste as New Layer</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Paste</secondary>
@@ -37,10 +27,9 @@
     Alpha channel is automatically created). Of course, you have to Copy your
     selection before you use this command.
   </para>
+
   <sect4>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/edit/paste-as-pattern.xml b/src/menus/edit/paste-as-pattern.xml
index a334169..34c9f94 100644
--- a/src/menus/edit/paste-as-pattern.xml
+++ b/src/menus/edit/paste-as-pattern.xml
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect3 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-11-10 ciampix: added italian translation
   2007-10-15 ude: German translation
   2007-10-10 j.h : created
 -->
 <sect3 id="script-fu-paste-as-pattern">
-  <!--<sect3info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect3info>-->
-  <title>
-    <phrase>Paste as New Pattern</phrase>
-  </title>
+  <title>Paste as New Pattern</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Paste</secondary>
@@ -30,30 +20,27 @@
   <indexterm>
     <primary>Paste as new pattern</primary>
   </indexterm>
+
   <para>
     This command opens a dialog window which allows you to name your new
     pattern. The pattern appears in the
     <link linkend="gimp-pattern-dialog">Patterns dialog</link>.
   </para>
+
   <sect4>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>The <quote>New Pattern</quote>dialog</phrase>
-      </title>
+      <title>The <quote>New Pattern</quote>dialog</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/edit-paste-new-pattern.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/edit-paste-new-pattern.png"/>
         </imageobject>
       </mediaobject>
     </figure>
     <variablelist>
       <varlistentry>
-        <term>
-          <phrase>Pattern name</phrase>
-        </term>
+        <term>Pattern name</term>
         <listitem>
           <para>
             <guilabel>Pattern name</guilabel> is the name as it will be in the
@@ -62,9 +49,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          <phrase>File name</phrase>
-        </term>
+        <term>File name</term>
         <listitem>
           <para>
             The new pattern is saved as <guilabel>File name</guilabel> (with
@@ -75,15 +60,18 @@
       </varlistentry>
     </variablelist>
   </sect4>
+
   <sect4>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Edit</guimenu><guisubmenu>Paste as </guisubmenu><guimenuitem>New Pattern</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guisubmenu>Paste as </guisubmenu>
+            <guimenuitem>New Pattern</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/src/menus/edit/paste-into.xml b/src/menus/edit/paste-into.xml
index 943ac75..057d497 100644
--- a/src/menus/edit/paste-into.xml
+++ b/src/menus/edit/paste-into.xml
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-10-10 j.h: no change for v2.4
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-paste-into">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-07</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Paste Into</phrase>
-  </title>
+  <title>Paste Into</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Paste</secondary>
@@ -29,6 +19,7 @@
   <indexterm>
     <primary>Paste Into</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Paste Into</guimenuitem> command acts in a similar way
     to the <guimenuitem>Paste</guimenuitem> command. The primary difference
@@ -44,10 +35,9 @@
     the data from the Clipboard into the center of the canvas, as the
     <quote>Paste</quote> command does.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/edit/paste.xml b/src/menus/edit/paste.xml
index fd464ee..ebfdf9f 100644
--- a/src/menus/edit/paste.xml
+++ b/src/menus/edit/paste.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- Section history:
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-paste">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-02</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Paste</phrase>
-  </title>
+  <title>Paste</title>
+
   <indexterm>
     <primary>Layer</primary>
     <secondary>Paste</secondary>
@@ -28,6 +18,7 @@
   <indexterm>
     <primary>Paste</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Paste</guimenuitem> command puts whatever is in
     the Clipboard from the last <quote>Copy</quote> or <quote>Cut</quote>
@@ -49,15 +40,17 @@
       floating selection; you have to either anchor it or remove it.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenuitem>Edit</guimenuitem><guimenuitem>Paste</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenuitem>Edit</guimenuitem>
+            <guimenuitem>Paste</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
       <listitem>
diff --git a/src/menus/edit/preferences.xml b/src/menus/edit/preferences.xml
index 1980ad3..dc1f00d 100644
--- a/src/menus/edit/preferences.xml
+++ b/src/menus/edit/preferences.xml
@@ -1,36 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-09-23 AntI: Added 'es'
   2006-07-29 lexa: patch from julien that includes suggestions by Sally
   2005-11-25 extracted from menus-toolbox-file by axel.wernicke
 -->
 <sect2 id="gimp-file-preferences">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-07-27</date>
-        <authorinitials>scb</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>The <quote>Preferences</quote> Command</phrase>
-  </title>
+  <title>The <quote>Preferences</quote> Command</title>
+
   <indexterm>
     <primary>Preferences (command)</primary>
   </indexterm>
+
   <para>
      This command displays the
     <link linkend="gimp-prefs-dialog">Preferences dialog</link>,
     which lets you alter a variety of settings that affect the look, feel,
     and performance of the <acronym>GIMP</acronym>.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate Command</phrase>
-    </title>
+    <title>Activate Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/edit/redo.xml b/src/menus/edit/redo.xml
index a9f868f..8c91d94 100644
--- a/src/menus/edit/redo.xml
+++ b/src/menus/edit/redo.xml
@@ -1,26 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- Section history:
   2007-10-10 j.h No change needed for v2.4
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-redo">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-05</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Redo</phrase>
-  </title>
+  <title>Redo</title>
+
   <indexterm>
     <primary>Redo</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Redo</guimenuitem> command reverses the effects of
     the <guimenuitem>Undo</guimenuitem> command.  Each
@@ -30,22 +21,25 @@
     only <quote>Redo</quote> an operation if the last action you did was
     an <quote>Undo</quote>.  If you perform any operation on the image
     after Undoing something, then the former Redo steps are lost, and
-    there is no way to recover them.  See the <link linkend="gimp-concepts-undo">Undoing</link> section for more
+    there is no way to recover them.  See the
+    <link linkend="gimp-concepts-undo">Undoing</link> section for more
     information.
   </para>
   <para>
     To see the operations which you have done and undone, use the
     <link linkend="gimp-undo-dialog">Undo History</link> dialog.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Edit</guimenu><guimenuitem>Redo</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Redo</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
diff --git a/src/menus/edit/shortcuts.xml b/src/menus/edit/shortcuts.xml
index 5ce4d60..84f3b2f 100644
--- a/src/menus/edit/shortcuts.xml
+++ b/src/menus/edit/shortcuts.xml
@@ -1,34 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-01-07 j.h: renamed file-keyboard-shortcuts.xml to edit-shortcuts.xml
   2008-08-19 KoSt: added 'no'
   2008-07-20 lexa: created new description
 -->
 <sect2 id="gimp-help-keyboard-shortcuts">
-  <!--<sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-07-20</date>
-        <authorinitials>lexa</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Keyboard Shortcuts</phrase>
-  </title>
+  <title>Keyboard Shortcuts</title>
+
   <indexterm>
     <primary>Keyboard Shortcuts</primary>
   </indexterm>
+
   <para>
     How to use this command is described in
     <xref linkend="gimp-concepts-shortcuts"/>.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
diff --git a/src/menus/edit/stroke-path.xml b/src/menus/edit/stroke-path.xml
index 7c9503a..2a691b0 100644
--- a/src/menus/edit/stroke-path.xml
+++ b/src/menus/edit/stroke-path.xml
@@ -1,24 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- Section history:
-     2009-01-07 j.h: TODO link to Brush Dynamics (ex Jitter)
   2007-10-14 j.h: rearranged according to v2.4
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-path-stroke">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-07-27</date>
-        <authorinitials>sally</authorinitials>
-        <revremark>v2.6 revised by j.h</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Stroke Path</phrase>
-  </title>
+  <title>Stroke Path</title>
+
   <indexterm>
     <primary>Paths</primary>
     <secondary>Stroke</secondary>
@@ -26,6 +15,7 @@
   <indexterm>
     <primary>Stoke path</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Stroke Path</guimenuitem> command strokes a path in
     the image. There are two ways you can stroke the path, either by using
@@ -37,15 +27,17 @@
       This command is active only if there is a path in your image.
     </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Edit</guimenu><guimenuitem>Stroke Path</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Stroke Path</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
       <listitem>
@@ -56,19 +48,15 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Description of the Dialog Window</phrase>
-    </title>
+    <title>Description of the Dialog Window</title>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Choose Stroke Style</quote> dialog window
-        </phrase>
-      </title>
+      <title>The <quote>Choose Stroke Style</quote> dialog window</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/menus/edit-stroke-options.png" format="PNG"/>
+          <imagedata format="PNG"
+            fileref="images/menus/edit-stroke-options.png"/>
         </imageobject>
       </mediaobject>
     </figure>
@@ -79,9 +67,7 @@
       tool, the current paint tool options are used to draw the stroke.
     </para>
     <variablelist>
-      <title>
-        <phrase>Stroke line</phrase>
-      </title>
+      <title>Stroke line</title>
       <para>
         The stroke is drawn with the current foreground color,
         set in the Toolbox. By clicking on the triangle next to
@@ -126,22 +112,24 @@
           </para>
           <itemizedlist>
             <listitem>
-              <para><guilabel>Cap Style</guilabel> : You can choose the shape of
+              <para>
+                <guilabel>Cap Style</guilabel> : You can choose the shape of
                 the ends of an unclosed path,  which can be
                 <emphasis>Butt</emphasis>, <emphasis>Round</emphasis>
                 or <emphasis>Square</emphasis>.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Join Style</guilabel> :
+              <para>
+                <guilabel>Join Style</guilabel> :
                 You can choose the shape of the path corners by
                 clicking on <emphasis>Miter</emphasis>,
-                <emphasis>Round</emphasis>
-                  or <emphasis>Bevel</emphasis>.
+                <emphasis>Round</emphasis> or <emphasis>Bevel</emphasis>.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Miter limit</guilabel> :
+              <para>
+                <guilabel>Miter limit</guilabel> :
                 When two segments of a path come together, the mitering of
                 the corner is determined by the Miter Limit. If the strokes
                 were wide, and no mitering were done, there would be pointed
@@ -152,12 +140,11 @@
                 associated text box and its arrows.
               </para>
               <figure>
-                <title>
-                  <phrase>Example of miter limit</phrase>
-                </title>
+                <title>Example of miter limit</title>
                 <mediaobject>
                   <imageobject>
-                    <imagedata fileref="images/dialogs/examples/miter.png" format="PNG"/>
+                    <imagedata format="PNG"
+                      fileref="images/dialogs/examples/miter.png"/>
                   </imageobject>
                   <caption>
                     <para>Left: Limit=0; Right: Limit=5;</para>
@@ -166,7 +153,8 @@
               </figure>
             </listitem>
             <listitem>
-              <para><guilabel>Dash Pattern</guilabel> :
+              <para>
+                <guilabel>Dash Pattern</guilabel> :
                 On the pixel level, a dashed line is drawn as a series of
                 tiny boxes. You can modify the pattern of these boxes. The
                 black area with thin vertical lines represents the pixels of
@@ -177,7 +165,8 @@
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Dash Preset</guilabel> :
+              <para>
+                <guilabel>Dash Preset</guilabel> :
                 Instead of making your own dash pattern, you can choose
                 one from the drop-down box. This pattern will
                 then be displayed in the <guilabel>Dash pattern</guilabel>
@@ -185,7 +174,8 @@
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Anti-aliasing</guilabel> :
+              <para>
+                <guilabel>Anti-aliasing</guilabel> :
                 Curved strokes or strokes drawn at an angle may look jagged
                 or stair-stepped. The anti-aliasing option smooths them
                 out.
@@ -213,7 +203,8 @@
               <term>Emulate Brush Dynamics</term>
               <listitem>
                 <para>
-                  See <!--link linkend=".....">-->Brush Dynamics<!--</link>-->
+                  See <link linkend="gimp-tool-brush-dynamics">Brush
+                  Dynamics</link>.
                 </para>
               </listitem>
             </varlistentry>
diff --git a/src/menus/edit/stroke-selection.xml b/src/menus/edit/stroke-selection.xml
index dd457e2..289761b 100644
--- a/src/menus/edit/stroke-selection.xml
+++ b/src/menus/edit/stroke-selection.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
-
+  ??
 -->
 <sect2 id="gimp-selection-stroke">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-07-27</date>
-        <authorinitials>sally</authorinitials>
-        <revremark>v2.6 revised by j.h</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Stroke Selection</phrase>
-  </title>
+  <title>Stroke Selection</title>
+
   <indexterm>
     <primary>Selection</primary>
     <secondary>Stroke selection</secondary>
@@ -24,6 +14,7 @@
   <indexterm>
     <primary>Stroke Selection</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Stroke Selection</guimenuitem> command strokes a
     selection in the image. There are two ways you can stroke the selection,
@@ -37,10 +28,9 @@
     This command is only active if the image has an active selection.
      </para>
   </note>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -59,10 +49,9 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>The <quote>Stroke Selection</quote> dialog</phrase>
-    </title>
+    <title>The <quote>Stroke Selection</quote> dialog</title>
     <note>
       <para>
         The options for stroking selections and for stroking paths
diff --git a/src/menus/edit/undo-history.xml b/src/menus/edit/undo-history.xml
index b2b858d..fc21afc 100644
--- a/src/menus/edit/undo-history.xml
+++ b/src/menus/edit/undo-history.xml
@@ -1,26 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- Section history
   2007-05-14 Added Spanish translation by AntI
   2006-07-29 lexa: patch from julien that includes suggestions by Sally
 -->
 <sect2 id="gimp-edit-undo-history">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-05</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Undo History</phrase>
-  </title>
+  <title>Undo History</title>
+
   <indexterm>
     <primary>Undo History</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Undo History</guimenuitem> command activates the
     <link linkend="gimp-undo-dialog">Undo History dialog</link>, which
@@ -43,15 +34,17 @@
     The <quote>Clear undo History</quote> command may be useful if you are
     working on a complex image and you want to free some memory.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activating the Command</phrase>
-    </title>
+    <title>Activating the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Edit</guimenu><guimenuitem>Undo History</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Undo History</guimenuitem>
+          </menuchoice>.
           There is no default keyboard shortcut.
         </para>
       </listitem>
diff --git a/src/menus/edit/undo.xml b/src/menus/edit/undo.xml
index 71ba0ab..86ea83a 100644
--- a/src/menus/edit/undo.xml
+++ b/src/menus/edit/undo.xml
@@ -1,26 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2007-05-14 Added Spanish translation by AntI
   2005-05-31 en Addition
 -->
 <sect2 id="gimp-edit-undo">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2009-01-05</date>
-        <authorinitials>j.h</authorinitials>
-        <revremark> Updated to v2.6</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Undo</phrase>
-  </title>
+  <title>Undo</title>
+
   <indexterm>
     <primary>Undo</primary>
   </indexterm>
+
   <para>
     If you have made drawing or editing changes to the image which you
     don't want to keep, the <guimenu>Undo</guimenu> command allows you to
@@ -42,15 +33,17 @@
     if you perform another operation, the ability to <quote>Redo</quote> will
     be irretrievably lost.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Edit</guimenu><guimenuitem>Undo</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Undo</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
diff --git a/src/menus/edit/units.xml b/src/menus/edit/units.xml
index 2e2d47c..91f82eb 100644
--- a/src/menus/edit/units.xml
+++ b/src/menus/edit/units.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-01-07 j.h: renamed file-units to edit-units
   2008-05-06 ude: changed filename [was: xtns-unit-editor.xml]
@@ -7,25 +8,15 @@
   2005-11-24 split of from menus-toolbox.xml by axel.wernicke
 -->
 <sect2 id="plug-in-unit-editor">
-  <!--<sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-09</date>
-        <authorinitials>scb</authorinitials>
-        <revremark>v2.6: no change</revremark>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Units</phrase>
-  </title>
+  <title>Units</title>
+
   <indexterm>
     <primary>Unit of measurement</primary>
   </indexterm>
   <indexterm>
     <primary>Unit Editor</primary>
   </indexterm>
+
   <para>
     The <guimenuitem>Unit Editor</guimenuitem> command displays a dialog
     which shows information about the units of measurement that are
@@ -33,10 +24,9 @@
     allows you to create new units which can be used by
     <acronym>GIMP</acronym> in a variety of situations.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Command</phrase>
-    </title>
+    <title>Activate the Command</title>
     <itemizedlist>
       <listitem>
         <para>
@@ -49,18 +39,13 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
-      <phrase>
-        Description of the <quote>Unit Editor</quote> dialog window
-      </phrase>
+      Description of the <quote>Unit Editor</quote> dialog window
     </title>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Unit Editor</quote> dialog window
-        </phrase>
-      </title>
+      <title>The <quote>Unit Editor</quote> dialog window</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/unit-editor.png" format="PNG"/>
@@ -75,11 +60,10 @@
       unit, as described below.
     </para>
     <itemizedlist>
-      <title>
-        <phrase>Description of the list elements</phrase>
-      </title>
+      <title>Description of the list elements</title>
       <listitem>
-        <para><emphasis>Saved</emphasis>:
+        <para>
+          <emphasis>Saved</emphasis>:
           If this column is checked, a unit definition will be saved when
           <acronym>GIMP</acronym> exits.
           Some units are always kept, even if they are not marked with a
@@ -87,18 +71,21 @@
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>ID</emphasis>:
+        <para>
+          <emphasis>ID</emphasis>:
           The string <acronym>GIMP</acronym> uses to identify
           the unit in its configuration files.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Factor</emphasis>:
+        <para>
+          <emphasis>Factor</emphasis>:
           How many units make up an inch.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Digits</emphasis>:
+        <para>
+          <emphasis>Digits</emphasis>:
           This field is a hint for numerical input fields. It specifies
           how many decimal digits the input field should provide to get
           approximately the same accuracy as an <quote>inch</quote> input
@@ -106,25 +93,29 @@
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Symbol</emphasis>:
+        <para>
+          <emphasis>Symbol</emphasis>:
           The unit's symbol if it has one (e.g. " for inches). The unit's
           abbreviation is used if doesn't have a symbol.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Abbreviation</emphasis>:
+        <para>
+          <emphasis>Abbreviation</emphasis>:
           The unit's abbreviation (e.g. <quote>cm</quote> for centimeters).
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Singular</emphasis>:
+        <para>
+          <emphasis>Singular</emphasis>:
           The unit's singular form, which
           <acronym>GIMP</acronym> can use to display messages
           about the unit.
         </para>
       </listitem>
       <listitem>
-        <para><emphasis>Plural</emphasis>:
+        <para>
+          <emphasis>Plural</emphasis>:
           The unit's plural form, which
           <acronym>GIMP</acronym> can use to display messages
           about the unit.
@@ -132,14 +123,11 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase>Defining New Units</phrase>
-    </title>
+    <title>Defining New Units</title>
     <figure>
-      <title>
-        <phrase>The <quote>New Unit</quote> dialog</phrase>
-      </title>
+      <title>The <quote>New Unit</quote> dialog</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/menus/unit-editor-new.png" format="PNG"/>
diff --git a/src/toolbox/tool-brush.xml b/src/toolbox/tool-brush.xml
index adca9b0..a382d98 100644
--- a/src/toolbox/tool-brush.xml
+++ b/src/toolbox/tool-brush.xml
@@ -322,7 +322,7 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
+      <varlistentry id="gimp-tool-brush-dynamics" xreflabel="Brush Dynamics">
         <term>Brush Dynamics</term>
         <listitem>
           <figure>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]