[gimp-help-2] Minor enhancements to src layout



commit 1a6cee2ab08b4fa36b19b9db2d2d9ae759f1b607
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Sun Jan 31 13:07:02 2010 +0100

    Minor enhancements to src layout
    
    Especially,
    * move button icons from <listitem> to <term> (this looks better in
      HTML files and simplifies po files);
    * mark some phrases with 'condition="tag-is-required"' if they should
      not be resolved because they simplify the translatable msgid's
      ("condition" is a general-purpose attribute with no special meaning);
    * change edge detect algorithm name "Prewitt" to "Prewitt compass".

 src/concepts/fonts-and-text.xml           |   41 ++++---
 src/dialogs/brushes-dialog.xml            |   63 ++++++----
 src/dialogs/color-dialog.xml              |    4 +-
 src/dialogs/error-console.xml             |   24 +++--
 src/dialogs/fonts-dialog.xml              |   14 ++-
 src/dialogs/gradient-dialog.xml           |   54 +++++----
 src/dialogs/gradient-editor-dialog.xml    |   61 ++++++----
 src/dialogs/indexed-palette-dialog.xml    |   19 ++--
 src/dialogs/palettes-dialog.xml           |  190 ++++++++++++++++-------------
 src/dialogs/path-dialog.xml               |   48 +++++---
 src/dialogs/patterns-dialog.xml           |   55 +++++----
 src/dialogs/templates-dialog.xml          |   63 ++++++----
 src/dialogs/undo-history-dialog.xml       |   33 +++--
 src/filters/edge-detect/edge_detect.xml   |   99 +++++++--------
 src/menus/colors/components/decompose.xml |    3 +-
 src/toolbox/tool-text.xml                 |   22 ++--
 src/using/paths.xml                       |    3 +-
 17 files changed, 440 insertions(+), 356 deletions(-)
---
diff --git a/src/concepts/fonts-and-text.xml b/src/concepts/fonts-and-text.xml
index c01e3a4..3ba3db0 100644
--- a/src/concepts/fonts-and-text.xml
+++ b/src/concepts/fonts-and-text.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                       "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
   2009-02-19 j.h: revised for v2.6
   2007-01-28 added Spanish translation by manuq
@@ -14,10 +15,12 @@
 -->
 <sect1 id="gimp-concepts-text">
   <title>Text and Fonts</title>
+
   <indexterm>
     <primary>Fonts and Texts</primary>
     <secondary>Overview</secondary>
   </indexterm>
+
   <figure>
     <title>Example of a text item</title>
     <mediaobject>
@@ -45,10 +48,10 @@
   </para>
   <para>
     With <acronym>GIMP</acronym>-2.6, you can draw a bounding box (a
-    rectangular frame) for the
-    text on your image and you can adjust this rectangle in the same way as a
-    rectangular selection. The text goes on being edited in the Text Editor,
-    but it is automatically wrapped within this box.
+    rectangular frame) for the text on your image and you can adjust this
+    rectangle in the same way as a rectangular selection. The text goes on
+    being edited in the Text Editor, but it is automatically wrapped within
+    this box.
   </para>
   <para>
     Actually, you can operate on a text layer in the same ways as any other
@@ -84,21 +87,21 @@
     from it. If you operate on a text layer, and then later try to edit the
     text, a message pops up, warning you that your alterations will be undone,
     and giving you three options:
-    <itemizedlist>
-      <listitem>
-        <para>edit the text anyway;</para>
-      </listitem>
-      <listitem>
-        <para>cancel;</para>
-      </listitem>
-      <listitem>
-        <para>
-          create a new text layer with the same text as the existing layer,
-          leaving the existing layer unchanged.
-        </para>
-      </listitem>
-    </itemizedlist>
   </para>
+  <itemizedlist>
+    <listitem>
+      <para>edit the text anyway;</para>
+    </listitem>
+    <listitem>
+      <para>cancel;</para>
+    </listitem>
+    <listitem>
+      <para>
+        create a new text layer with the same text as the existing layer,
+        leaving the existing layer unchanged.
+      </para>
+    </listitem>
+  </itemizedlist>
   <figure>
     <title>Warning lose modifications</title>
     <mediaobject>
diff --git a/src/dialogs/brushes-dialog.xml b/src/dialogs/brushes-dialog.xml
index de63c74..97fe6c5 100644
--- a/src/dialogs/brushes-dialog.xml
+++ b/src/dialogs/brushes-dialog.xml
@@ -286,13 +286,14 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Edit Brush</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-edit-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">Edit Brush</phrase>
+          </term>
           <listitem>
             <para>
-              <guiicon>
-                <inlinegraphic
-                  fileref="images/dialogs/stock-edit-16.png"/>
-              </guiicon>
               This activates the
               <link linkend="gimp-brush-editor-dialog">Brush Editor</link>.
               Pressing the button will open the Editor for any brush. It
@@ -303,14 +304,15 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>New Brush</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/dialogs-icon-new.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">New Brush</phrase>
+          </term>
           <listitem>
             <anchor id="gimp-brush-new"/>
             <para>
-              <guiicon>
-                <inlinegraphic
-                  fileref="images/dialogs/dialogs-icon-new.png"/>
-              </guiicon>
               This creates a new parametric brush, initializes it with a small
               fuzzy round shape, and opens the Brush Editor so that you can
               modify it. The new brush is automatically saved in your personal
@@ -319,14 +321,15 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Duplicate Brush</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-duplicate-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">Duplicate Brush</phrase>
+          </term>
           <listitem>
             <anchor id="gimp-brush-duplicate"/>
             <para>
-              <guiicon>
-                <inlinegraphic
-                  fileref="images/dialogs/stock-duplicate-16.png"/>
-              </guiicon>
               This button is only enabled if the currently selected brush is a
               parametric brush. If so, the brush is duplicated, and the Brush
               Editor is opened so that you can modify the copy. The result is
@@ -336,14 +339,15 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Delete Brush</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/dialogs-icon-delete.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">Delete Brush</phrase>
+          </term>
           <listitem>
             <anchor id="gimp-brush-delete"/>
             <para>
-              <guiicon>
-                <inlinegraphic
-                  fileref="images/dialogs/dialogs-icon-delete.png"/>
-              </guiicon>
               This removes all traces of the brush, both from the dialog and
               the folder where its file is stored, if you have permission to
               do so. It asks for confirmation before doing anything.
@@ -351,7 +355,12 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Refresh Brushes</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">Refresh Brushes</phrase>
+          </term>
           <listitem>
             <anchor id="gimp-brush-refresh"/>
             <para>
@@ -359,9 +368,6 @@
               <filename class="directory">brushes</filename>
               folder or any other folder in your brush search path, by some
               means other than the Brush Editor,
-              <guiicon>
-                <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
-              </guiicon>
               this button causes the list to be reloaded, so that the new
               entries will be available in the dialog.
             </para>
@@ -425,13 +431,16 @@
       brush from a geometrical shape, a circle, a square, a diamond. This
       editor has several elements:
     </para>
-    <para><emphasis>The dialog bar</emphasis>:
+    <para>
+      <emphasis>The dialog bar</emphasis>:
       As with all dialog windows, a click on the small triangle prompts a
       menu allowing you to set the aspect of the Brush Editor.
     </para>
-    <para><emphasis>The title bar</emphasis>: To give a name to your brush.
+    <para>
+      <emphasis>The title bar</emphasis>: To give a name to your brush.
     </para>
-    <para><emphasis>The preview area</emphasis>: Brush changes appear in real
+    <para>
+      <emphasis>The preview area</emphasis>: Brush changes appear in real
       time in this preview.
     </para>
     <variablelist>
diff --git a/src/dialogs/color-dialog.xml b/src/dialogs/color-dialog.xml
index a1cb0dc..63ebe90 100644
--- a/src/dialogs/color-dialog.xml
+++ b/src/dialogs/color-dialog.xml
@@ -12,7 +12,7 @@
   2006-03-29 lexa: added german translation an made docbook compliant
 -->
 <sect2 id="gimp-color-dialog">
-  <title>The FG/BG Color Dialog</title>
+  <title>FG/BG Color Dialog</title>
 
   <indexterm>
     <primary>Dialogs</primary>
@@ -23,7 +23,7 @@
   </indexterm>
 
   <figure>
-    <title>The FG/BG Color Dialog</title>
+    <title>The FG/BG Color dialog</title>
     <mediaobject>
       <imageobject>
         <imagedata fileref="images/dialogs/color-dialog.png" format="PNG"/>
diff --git a/src/dialogs/error-console.xml b/src/dialogs/error-console.xml
index 7193897..8758b13 100644
--- a/src/dialogs/error-console.xml
+++ b/src/dialogs/error-console.xml
@@ -10,15 +10,18 @@
 -->
 <sect2 id="gimp-errors-dialog">
   <title>Error Console</title>
+
   <indexterm>
     <primary>Error console</primary>
   </indexterm>
+
   <para>
     The <guilabel>Error console</guilabel> offers more possibilities than
     the single <quote>GIMP Message</quote>. This is a log of all errors
     occurring while GIMP is running. You can save all this log or only a
     selected part.
   </para>
+
   <sect3>
     <title>Activating the Dialog</title>
     <para>
@@ -71,13 +74,14 @@
     </figure>
     <variablelist>
       <varlistentry>
-        <term>Clear errors</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-edit-clear-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Clear errors</phrase>
+        </term>
         <listitem>
           <para>
-            <guiicon>
-              <inlinegraphic
-                fileref="images/dialogs/stock-edit-clear-16.png"/>
-            </guiicon>
             This button lets you delete all errors in the log.
           </para>
           <warning>
@@ -88,12 +92,14 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Save all errors</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-save-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Save all errors</phrase>
+        </term>
         <listitem>
           <para>
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-save-16.png"/>
-            </guiicon>
             This button lets you save
             the whole log. You can also select a part of the log (by
             click-and-dragging the mouse pointer or by using the
diff --git a/src/dialogs/fonts-dialog.xml b/src/dialogs/fonts-dialog.xml
index a1af386..6870a51 100644
--- a/src/dialogs/fonts-dialog.xml
+++ b/src/dialogs/fonts-dialog.xml
@@ -17,6 +17,7 @@
     <primary>Fonts</primary>
     <secondary>Dialog</secondary>
   </indexterm>
+
   <figure>
     <title>The Fonts dialog</title>
     <mediaobject>
@@ -140,14 +141,15 @@
         </listitem>
       </varlistentry>
       <varlistentry id="gimp-font-refresh">
-        <term>Refresh font list</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Refresh font list</phrase>
+        </term>
         <listitem>
           <para>
-            Pressing
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
-            </guiicon>
-            the button at the bottom of the dialog causes the system
+            Pressing this button at the bottom of the dialog causes the system
             font list to be rescanned. This may be useful if you add new fonts
             while GIMP is running, and want to make them accessible for the
             Text tool. You can also cause the font list to be rescanned by
diff --git a/src/dialogs/gradient-dialog.xml b/src/dialogs/gradient-dialog.xml
index ec9dae6..241894c 100644
--- a/src/dialogs/gradient-dialog.xml
+++ b/src/dialogs/gradient-dialog.xml
@@ -50,7 +50,8 @@
       between Foreground and background colors of toolbox in different ways.
     </para>
     <listitem>
-      <para><guilabel>FG to BG (RGB)</guilabel>: default gradient, between the
+      <para>
+        <guilabel>FG to BG (RGB)</guilabel>: default gradient, between the
         Foreground and the background colors of the Toolbox, in the RGB mode.
       </para>
     </listitem>
@@ -185,26 +186,29 @@
     </para>
     <variablelist>
       <varlistentry>
-        <term>Edit Gradient</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-edit-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Edit Gradient</phrase>
+        </term>
         <listitem>
           <para>
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-edit-16.png"/>
-            </guiicon>
             This button activates the
             <link linkend="gimp-gradient-editor-dialog">Gradient Editor</link>.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>New Gradient</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/dialogs-icon-new.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">New Gradient</phrase>
+        </term>
         <listitem>
           <anchor id="gimp-gradient-new"/>
           <para>
-            <guiicon>
-              <inlinegraphic
-                fileref="images/dialogs/dialogs-icon-new.png"/>
-            </guiicon>
             This creates a new gradient, initialized as a simple grayscale,
             and activates the Gradient Editor so that you can alter it.
             Gradients that you create are automatically saved in the
@@ -216,42 +220,48 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Duplicate Gradient</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-duplicate-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Duplicate Gradient</phrase>
+        </term>
         <listitem>
           <anchor id="gimp-gradient-duplicate"/>
           <para>
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-duplicate-16.png"/>
-            </guiicon>
             This creates a copy of the currently selected gradient. You will
             be able to edit the copy even if you cannot edit the original.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Delete Gradient</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/dialogs-icon-delete.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Delete Gradient</phrase>
+        </term>
         <listitem>
           <anchor id="gimp-gradient-delete"/>
           <para>
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/dialogs-icon-delete.png"/>
-            </guiicon>
             This removes all traces of the gradient, if you have permission to
             do so. It asks for confirmation before doing anything.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Refresh Gradients</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Refresh Gradients</phrase>
+        </term>
         <listitem>
           <anchor id="gimp-gradient-refresh"/>
           <para>
             If you add gradients to your personal
             <filename class="directory">gradients</filename>
             folder by some means other than this dialog,
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
-            </guiicon>
             this button causes the list to be reloaded, so that the new
             entries will be available.
           </para>
diff --git a/src/dialogs/gradient-editor-dialog.xml b/src/dialogs/gradient-editor-dialog.xml
index 28c38e1..c1439fc 100644
--- a/src/dialogs/gradient-editor-dialog.xml
+++ b/src/dialogs/gradient-editor-dialog.xml
@@ -14,10 +14,12 @@
 <sect3 id="gimp-gradient-editor-dialog">
   <title>The Gradient Editor</title>
   <anchor id="gimp-gradient-edit"/>
+
   <indexterm>
     <primary>Gradient</primary>
     <secondary>Editor</secondary>
   </indexterm>
+
   <figure>
     <title>The gradient editor</title>
     <mediaobject>
@@ -180,13 +182,14 @@
           </para>
           <variablelist>
             <varlistentry>
-              <term>Save</term>
+              <term>
+                <guiicon>
+                  <inlinegraphic fileref="images/dialogs/stock-save-16.png"/>
+                </guiicon>
+                <phrase condition="tag-is-required">Save</phrase>
+              </term>
               <listitem>
                 <para>
-                  <guiicon>
-                    <inlinegraphic
-                      fileref="images/dialogs/stock-save-16.png"/>
-                  </guiicon>
                   Clicking this button causes the gradient, in its current
                   state, to be saved in your personal
                   <filename class="directory">gradients</filename>
@@ -196,13 +199,15 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>Revert</term>
+              <term>
+                <guiicon>
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-revert-16.png"/>
+                </guiicon>
+                <phrase condition="tag-is-required">Revert</phrase>
+              </term>
               <listitem>
                 <para>
-                  <guiicon>
-                    <inlinegraphic
-                      fileref="images/dialogs/stock-revert-16.png"/>
-                  </guiicon>
                   Clicking this button undoes all of your editing. (However,
                   at the time this is being written, this function is not yet
                   implemented.)
@@ -210,28 +215,32 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>Zoom Out</term>
+              <term>
+                <guiicon>
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-zoom-out-16.png"/>
+                </guiicon>
+                <phrase condition="tag-is-required">Zoom Out</phrase>
+              </term>
               <listitem>
                 <anchor id="gimp-gradient-editor-zoom-out"/>
                 <para>
-                  <guiicon>
-                    <inlinegraphic
-                      fileref="images/dialogs/stock-zoom-out-16.png"/>
-                  </guiicon>
                   Clicking this button shrinks the gradient display
                   horizontally.
                 </para>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>Zoom In</term>
+              <term>
+                <guiicon>
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-zoom-in-16.png"/>
+                </guiicon>
+                <phrase condition="tag-is-required">Zoom In</phrase>
+              </term>
               <listitem>
                 <anchor id="gimp-gradient-editor-zoom-in"/>
                 <para>
-                  <guiicon>
-                    <inlinegraphic
-                      fileref="images/dialogs/stock-zoom-in-16.png"/>
-                  </guiicon>
                   Clicking this button expands the gradient display
                   horizontally. You can then use the scrollbar to pan the
                   display left or right.
@@ -239,14 +248,16 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>Zoom All</term>
+              <term>
+                <guiicon>
+                  <inlinegraphic
+                    fileref="images/dialogs/stock-zoom-best-fit-16.png"/>
+                </guiicon>
+                <phrase condition="tag-is-required">Zoom All</phrase>
+              </term>
               <listitem>
                 <anchor id="gimp-gradient-editor-zoom-all"/>
                 <para>
-                  <guiicon>
-                    <inlinegraphic
-                      fileref="images/dialogs/stock-zoom-best-fit-16.png"/>
-                  </guiicon>
                   Clicking this button resizes the display horizontally so
                   that it fits precisely into the window.
                 </para>
diff --git a/src/dialogs/indexed-palette-dialog.xml b/src/dialogs/indexed-palette-dialog.xml
index 432aaa5..936e50f 100644
--- a/src/dialogs/indexed-palette-dialog.xml
+++ b/src/dialogs/indexed-palette-dialog.xml
@@ -107,7 +107,7 @@
       colors that can be assigned to an index or the order they appear in: any
       index can be assigned any color.
     </para>
-    <para><!-- changed dithering to quantization, bug #356354 -->
+    <para>
       It is important to realize that the colors in the colormap are the
       <emphasis>only colors available</emphasis> for an indexed image (that
       is, unless you add new colors to the colormap). This has a major effect
@@ -198,15 +198,16 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Add color</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-gtk-add-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Add color</phrase>
+        </term>
         <listitem>
           <anchor id="gimp-indexed-palette-add"/>
           <para>
-            This button
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-gtk-add-16.png"/>
-            </guiicon>
-            (in the lower right corner of the dialog) allows you
+            This button (in the lower right corner of the dialog) allows you
             to add new colors to the colormap. If you click on the button, the
             current foreground color, as shown in the Toolbox, will be tacked
             on to the end of the colormap. If instead you hold down
@@ -275,7 +276,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Add from FG</term>
+        <term>Add Color from FG</term>
         <listitem>
           <para>
             This command is enabled only if the indexed palette contains less
@@ -285,7 +286,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Add from BG</term>
+        <term>Add Color from BG</term>
         <listitem>
           <para>
             This command is enabled only if the indexed palette contains less
diff --git a/src/dialogs/palettes-dialog.xml b/src/dialogs/palettes-dialog.xml
index cf167d8..e2ab5f5 100644
--- a/src/dialogs/palettes-dialog.xml
+++ b/src/dialogs/palettes-dialog.xml
@@ -137,9 +137,8 @@
             palettes are lined up in a list, with the names beside them.
           </para>
           <para>
-            In the Tab menu, the option <guilabel>Preview Size</guilabel>
-            allows you to adapt the size of color cell previews to your
-            liking.
+            The option <guilabel>Preview Size</guilabel> allows you to adapt
+            the size of color cell previews to your liking.
           </para>
           <tip>
             <para>
@@ -150,85 +149,96 @@
           </tip>
         </listitem>
       </varlistentry>
+    </variablelist>
+    <variablelist>
+      <title>The buttons of the Palettes Dialog</title>
+      <para>
+        Below the palettes view, at the bottom of the dialog window, there are
+        several buttons:
+      </para>
       <varlistentry>
-        <term>Edit Palette</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-edit-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Edit Palette</phrase>
+        </term>
         <listitem>
           <para>
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-edit-16.png"/>
-            </guiicon>
             This button brings up the
-            <link linkend="gimp-palette-editor-dialog">Palette Editor</link>.
+            <xref linkend="gimp-palette-editor-dialog"/>.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry id="palette-new">
-        <term>New Palette</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/dialogs-icon-new.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">New Palette</phrase>
+        </term>
         <listitem>
           <indexterm>
             <primary>Palette</primary>
             <secondary>New palette</secondary>
           </indexterm>
           <para>
-            About
-            <guiicon>
-              <inlinegraphic
-                fileref="images/dialogs/dialogs-icon-new.png"/>
-            </guiicon>
-            this icon button, see
-            <link linkend="gimp-palette-new">New Palette</link>.
+            About this icon button, see
+            <xref linkend="gimp-palette-new"/>.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Duplicate Palette</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-duplicate-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Duplicate Palette</phrase>
+        </term>
         <listitem>
           <indexterm>
             <primary>Palette</primary>
             <secondary>Duplicate</secondary>
           </indexterm>
           <para>
-            About
-            <guiicon>
-              <inlinegraphic
-                fileref="images/dialogs/stock-duplicate-16.png"/>
-            </guiicon>
-            this icon button, see
-            <link linkend="gimp-palette-duplicate">Duplicate Palette</link>.
+            About this icon button, see
+            <xref linkend="gimp-palette-duplicate"/>.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Delete Palette</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/dialogs-icon-delete.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Delete Palette</phrase>
+        </term>
         <listitem>
           <indexterm>
             <primary>Palette</primary>
             <secondary>Delete</secondary>
           </indexterm>
           <para>
-            About
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/dialogs-icon-delete.png"/>
-            </guiicon>
-            this icon button, see
-            <link linkend="gimp-palette-delete">Delete Palette</link>.
+            About this icon button, see
+            <xref linkend="gimp-palette-delete"/>.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Refresh Palettes</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Refresh Palettes</phrase>
+        </term>
         <listitem>
           <indexterm>
             <primary>Palette</primary>
             <secondary>Refresh</secondary>
           </indexterm>
           <para>
-            About
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
-            </guiicon>
-            this icon button, see
-            <link linkend="gimp-palette-refresh">Refresh Palettes</link>.
+            About this icon button, see
+            <xref linkend="gimp-palette-refresh"/>.
           </para>
         </listitem>
       </varlistentry>
@@ -684,14 +694,16 @@
       </para>
       <variablelist>
         <varlistentry>
-          <term>Save</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-save-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">Save</phrase>
+          </term>
           <listitem>
             <para>
-              <guiicon>
-                <inlinegraphic fileref="images/dialogs/stock-save-16.png"/>
-              </guiicon>
               This button causes the palette to be saved in your personal
-              <filename class="directory">palettes</filename> folder.  It
+              <filename class="directory">palettes</filename> folder. It
               would be saved automatically when <acronym>GIMP</acronym> exits
               in any case, but you might want to use this button if you are
               concerned that <acronym>GIMP</acronym> might crash in the
@@ -700,24 +712,27 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Revert</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-revert-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">Revert</phrase>
+          </term>
           <listitem>
             <para>
-              <guiicon>
-                <inlinegraphic fileref="images/dialogs/stock-revert-16.png"/>
-              </guiicon>
               This operation has not yet been implemented.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Edit Color</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-edit-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">Edit Color</phrase>
+          </term>
           <listitem>
             <para>
-              <guiicon>
-                <inlinegraphic
-                  fileref="images/dialogs/stock-edit-16.png"/>
-              </guiicon>
               Pops up a color editor allowing you to alter the color.  If
               the palette is one you aren't allowed to alter, this button
               will be insensitive. See
@@ -726,71 +741,72 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>New Color from FG</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/dialogs-icon-new.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">New Color from FG</phrase>
+          </term>
           <listitem>
             <para>
-              About
-              <guiicon>
-                <inlinegraphic
-                  fileref="images/dialogs/dialogs-icon-new.png"/>
-              </guiicon>
-              this icon button, see
+              About this icon button, see
               <link linkend="gimp-palette-editor-new">below</link>.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Delete Color</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/dialogs-icon-delete.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">Delete Color</phrase>
+          </term>
           <listitem>
             <para>
-              About
-              <guiicon>
-                <inlinegraphic
-                  fileref="images/dialogs/dialogs-icon-delete.png"/>
-              </guiicon>
-              this icon button, see
+              About this icon button, see
               <link linkend="gimp-palette-editor-delete">below</link>.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Zoom Out</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-zoom-out-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">Zoom Out</phrase>
+          </term>
           <listitem>
             <para>
-              About
-              <guiicon>
-                <inlinegraphic
-                  fileref="images/dialogs/stock-zoom-out-16.png"/>
-              </guiicon>
-              this icon button, see
+              About this icon button, see
               <link linkend="gimp-palette-editor-zoom-out">below</link>.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Zoom In</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-zoom-in-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">Zoom In</phrase>
+          </term>
           <listitem>
             <para>
-              About
-              <guiicon>
-                <inlinegraphic
-                  fileref="images/dialogs/stock-zoom-in-16.png"/>
-              </guiicon>
-              this icon button, see
+              About this icon button, see
               <link linkend="gimp-palette-editor-zoom-in">below</link>.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Zoom All</term>
+          <term>
+            <guiicon>
+              <inlinegraphic
+                fileref="images/dialogs/stock-zoom-best-fit-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">Zoom All</phrase>
+          </term>
           <listitem>
             <para>
-              About
-              <guiicon>
-                <inlinegraphic
-                  fileref="images/dialogs/stock-zoom-best-fit-16.png"/>
-              </guiicon>
-              this icon button, see
+              About this icon button, see
               <link linkend="gimp-palette-editor-zoom-all">below</link>.
             </para>
           </listitem>
diff --git a/src/dialogs/path-dialog.xml b/src/dialogs/path-dialog.xml
index 6a2e34d..f87e52d 100644
--- a/src/dialogs/path-dialog.xml
+++ b/src/dialogs/path-dialog.xml
@@ -113,7 +113,7 @@
           <guiicon>
             <inlinegraphic fileref="images/dialogs/stock-eye-20.png"/>
           </guiicon>
-          <phrase>Path visibility</phrase>
+          <phrase condition="tag-is-required">Path visibility</phrase>
         </term>
         <listitem>
           <para>
@@ -131,7 +131,7 @@
           <guiicon>
             <inlinegraphic fileref="images/dialogs/stock-vchain-24.png"/>
           </guiicon>
-          <phrase>Chain paths</phrase>
+          <phrase condition="tag-is-required">Chain paths</phrase>
         </term>
         <listitem>
           <para>
@@ -290,7 +290,8 @@
       <varlistentry>
         <term>Delete Path</term>
         <listitem>
-          <para><guilabel>Delete Path</guilabel> deletes the current selected
+          <para>
+            <guilabel>Delete Path</guilabel> deletes the current selected
             path.
           </para>
         </listitem>
@@ -318,7 +319,8 @@
       <varlistentry>
         <term>Path Tool</term>
         <listitem>
-          <para><guilabel>Path Tool</guilabel> is an alternative way to
+          <para>
+            <guilabel>Path Tool</guilabel> is an alternative way to
             activate the <link linkend="gimp-tool-path">Path tool</link>,
             used for creating and manipulating paths.  It can also be
             activated from the Toolbox, or by using the keyboard shortcut
@@ -330,7 +332,8 @@
         <term>Edit Path Attributes</term>
         <listitem>
           <anchor id="gimp-path-edit"/>
-          <para><guilabel>Edit Path Attributes</guilabel> brings up a small
+          <para>
+            <guilabel>Edit Path Attributes</guilabel> brings up a small
             dialog that allows you to change the name of the path.  You
             can also do this by double-clicking on the name in the list in
             the Paths dialog.
@@ -341,7 +344,8 @@
         <term>New Path</term>
         <listitem>
           <anchor id="gimp-path-new"/>
-          <para><guilabel>New Path</guilabel>creates a new path, adds it to
+          <para>
+            <guilabel>New Path</guilabel>creates a new path, adds it to
             the list in the Paths dialog, and makes it the active path
             for the image.  It brings up a dialog that allows you to
             give a name to the path.  The new path is created with no
@@ -354,7 +358,8 @@
         <term>Raise Path</term>
         <listitem>
           <anchor id="gimp-path-raise"/>
-          <para><guilabel>Raise Path</guilabel> moves the path one slot higher
+          <para>
+            <guilabel>Raise Path</guilabel> moves the path one slot higher
             in the list in the Paths dialog.  The position of a path in
             the list has no functional significance, so this is simply a
             convenience to help you keep things organized.
@@ -365,7 +370,8 @@
         <term>Lower Path</term>
         <listitem>
           <anchor id="gimp-path-lower"/>
-          <para><guilabel>Lower Path</guilabel>moves the path one slot lower
+          <para>
+            <guilabel>Lower Path</guilabel>moves the path one slot lower
             in the list in the Paths dialog.  The position of a path in
             the list has no functional significance, so this is simply a
             convenience to help you keep things organized.
@@ -388,7 +394,8 @@
         <term>Delete Path</term>
         <listitem>
           <anchor id="gimp-path-delete"/>
-          <para><guilabel>Delete Path</guilabel> deletes the current selected
+          <para>
+            <guilabel>Delete Path</guilabel> deletes the current selected
             path.
           </para>
         </listitem>
@@ -396,7 +403,8 @@
       <varlistentry>
         <term>Merge Visible Paths</term>
         <listitem>
-          <para><guilabel>Merge Visible Paths</guilabel> takes all the paths
+          <para>
+            <guilabel>Merge Visible Paths</guilabel> takes all the paths
             in the image that are visible (that is, all that show
             <quote>open eye</quote> symbols in the Paths dialog), and turns
             them into components of a single path.  This may be convenient if
@@ -530,9 +538,9 @@
               </para>
             </listitem>
           </itemizedlist>
-          <para><quote>Stroke Path</quote> renders the active path on the active
-            layer of
-            the image, permitting a wide variety of line styles and
+          <para>
+            <quote>Stroke Path</quote> renders the active path on the active
+            layer of the image, permitting a wide variety of line styles and
             stroking options.  See the section on
             <link linkend="gimp-selection-stroke">Stroking</link> for more
             information.
@@ -543,7 +551,8 @@
         <term>Copy Path</term>
         <listitem>
           <anchor id="gimp-path-copy"/>
-          <para><guilabel>Copy Path</guilabel> copies the active path to the
+          <para>
+            <guilabel>Copy Path</guilabel> copies the active path to the
             Paths Clipboard, enabling you to paste it into a different image.
           </para>
           <tip>
@@ -564,7 +573,8 @@
         <term>Paste Path</term>
         <listitem>
           <anchor id="gimp-path-paste"/>
-          <para><guilabel>Paste Path</guilabel> creates a new path from the
+          <para>
+            <guilabel>Paste Path</guilabel> creates a new path from the
             contents of the Path Clipboard, adds it to the list in the
             Paths dialog, and makes it the active path for the image.  If
             no path has previously been copied into the clipboard, the
@@ -578,9 +588,8 @@
           <anchor id="gimp-path-import"/>
           <para>
             <guilabel>Import Path</guilabel> creates a new path from an SVG
-            file:
-            it pops up a file chooser dialog that allows you to navigate to
-            the file.  See the <link linkend="gimp-concepts-paths">Paths
+            file: it pops up a file chooser dialog that allows you to navigate
+            to the file.  See the <link linkend="gimp-concepts-paths">Paths
             </link> section for information on SVG files and how they relate
             to GIMP paths.
           </para>
@@ -589,7 +598,8 @@
       <varlistentry>
         <term>Export Path</term>
         <listitem>
-          <para><guilabel>Export Path</guilabel> allows you to save a path to
+          <para>
+            <guilabel>Export Path</guilabel> allows you to save a path to
             a file:  it pops up a file save dialog that allows you to
             specify the file name and location.  You can later add this
             path to any GIMP image using the <guilabel>Import
diff --git a/src/dialogs/patterns-dialog.xml b/src/dialogs/patterns-dialog.xml
index bcd0cd1..ee64daa 100644
--- a/src/dialogs/patterns-dialog.xml
+++ b/src/dialogs/patterns-dialog.xml
@@ -203,15 +203,16 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Delete Pattern</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/dialogs-icon-delete.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Delete Pattern</phrase>
+        </term>
         <listitem>
           <anchor id="gimp-pattern-delete"/>
           <para>
-            Pressing
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/dialogs-icon-delete.png"/>
-            </guiicon>
-            this button removes the pattern from the list and causes
+            Pressing this button removes the pattern from the list and causes
             the file representing it to be deleted from disk. Note that you
             cannot remove any of the patterns that are supplied with GIMP and
             installed in the system <filename>patterns</filename>
@@ -221,36 +222,40 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Refresh Patterns</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Refresh Patterns</phrase>
+        </term>
         <listitem>
           <anchor id="gimp-pattern-refresh"/>
           <para>
-            Pressing
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-reload-16.png"/>
-            </guiicon>
-            this button causes GIMP to rescan the folders in your
-            pattern search path, adding any newly discovered patterns to the
-            list. This button is useful if you add new patterns to a folder,
-            and want to make them available without having to restart GIMP.
+            Pressing this button causes <acronym>GIMP</acronym> to rescan the
+            folders in your pattern search path, adding any newly discovered
+            patterns to the list. This button is useful if you add new
+            patterns to a folder, and want to make them available without
+            having to restart <acronym>GIMP</acronym>.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Open pattern as image</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-fileopen-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Open pattern as image</phrase>
+
+        </term>
         <listitem>
           <anchor id="gimp-pattern-open-as-image"/>
           <para>
-            If you click on
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-fileopen-16.png"/>
-            </guiicon>
-            this button, the current pattern is opened in a
+            If you click on this button, the current pattern is opened in a
             new image window. So, you can edit it. But if you try to save it
-            with the <quote>.pat</quote>, even with a new name, you will bang
-            into a <quote>Denied permission </quote> problem because this
-            image file is <quote>root</quote>. But this is possible under
-            Windows, less protected.
+            with the <filename class="extension">.pat</filename>, even with a
+            new name, you will bang into a <quote>Denied permission </quote>
+            problem because this image file is <quote>root</quote>. But this
+            is possible under Windows, less protected.
           </para>
         </listitem>
       </varlistentry>
diff --git a/src/dialogs/templates-dialog.xml b/src/dialogs/templates-dialog.xml
index e1d5d63..2aeaa55 100644
--- a/src/dialogs/templates-dialog.xml
+++ b/src/dialogs/templates-dialog.xml
@@ -115,28 +115,34 @@
       </para>
       <variablelist>
         <varlistentry>
-          <term>Create a new image from the selected template</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-image-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">
+              Create a new image from the selected template
+            </phrase>
+          </term>
           <listitem>
             <para>
-              Clicking on
-              <guiicon>
-                <inlinegraphic fileref="images/dialogs/stock-image-16.png"/>
-              </guiicon>
-              this button opens the
+              Clicking on this button opens the dialog
               <link linkend="gimp-file-new">Create a new image</link>
               on the model of the selected template.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Create a new template</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/dialogs-icon-new.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">
+              Create a new template
+            </phrase>
+          </term>
           <listitem>
             <para>
-              Clicking on
-              <guiicon>
-                <inlinegraphic fileref="images/dialogs/dialogs-icon-new.png"/>
-              </guiicon>
-              this button opens the
+              Clicking on this button opens the
               <link linkend="edit-template-dialog">New template</link>
               dialog, identical to the Edit Template dialog, that we will see
               below.
@@ -144,28 +150,33 @@
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Duplicate the selected template</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-duplicate-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">
+              Duplicate the selected template
+            </phrase>
+          </term>
           <listitem>
             <para>
-              Clicking on
-              <guiicon>
-                <inlinegraphic
-                  fileref="images/dialogs/stock-duplicate-16.png"/>
-              </guiicon>
-              this button opens the Edit Template dialog that we
+              Clicking on this button opens the Edit Template dialog that we
               are going to study now.
             </para>
           </listitem>
         </varlistentry>
         <varlistentry>
-          <term>Edit the selected template</term>
+          <term>
+            <guiicon>
+              <inlinegraphic fileref="images/dialogs/stock-edit-16.png"/>
+            </guiicon>
+            <phrase condition="tag-is-required">
+              Edit the selected template
+            </phrase>
+          </term>
           <listitem>
             <para>
-              Clicking on
-              <guiicon>
-                <inlinegraphic fileref="images/dialogs/stock-edit-16.png"/>
-              </guiicon>
-              this button opens the
+              Clicking on this button opens the
               <link linkend="edit-template-dialog">Edit Template</link>
               dialog.
             </para>
@@ -177,7 +188,7 @@
             <para>Guess what?</para>
             <tip>
               <para>
-                Every templates are stored in a <filename>templaterc</filename>
+                Every template is stored in a <filename>templaterc</filename>
                 file at your personal <acronym>GIMP</acronym> directory.
                 If you want to restore some deleted templates, you can copy or
                 append template entries to your file from the master
diff --git a/src/dialogs/undo-history-dialog.xml b/src/dialogs/undo-history-dialog.xml
index 0588281..6339620 100644
--- a/src/dialogs/undo-history-dialog.xml
+++ b/src/dialogs/undo-history-dialog.xml
@@ -90,12 +90,14 @@
     <para>At the bottom of the dialog are three buttons:</para>
     <variablelist>
       <varlistentry>
-        <term>Undo</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-undo-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Undo</phrase>
+        </term>
         <listitem>
           <para>
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-undo-16.png"/>
-            </guiicon>
             This button has the same effect as choosing
             <menuchoice>
               <guimenu>Edit</guimenu>
@@ -108,12 +110,14 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Redo</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-redo-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Redo</phrase>
+        </term>
         <listitem>
           <para>
-            <guiicon>
-              <inlinegraphic fileref="images/dialogs/stock-redo-16.png"/>
-            </guiicon>
             This button has the same effect as choosing
             <menuchoice>
               <guimenu>Edit</guimenu>
@@ -126,13 +130,14 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Clear Undo History</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-edit-clear-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Clear Undo History</phrase>
+        </term>
         <listitem>
           <para>
-            <guiicon>
-              <inlinegraphic
-                fileref="images/dialogs/stock-edit-clear-16.png"/>
-            </guiicon>
             This button removes all contents from the undo history except the
             current state. If you press it, you are asked to confirm that you
             really want to do this. The only reason for doing it would be if
@@ -143,7 +148,7 @@
               In a tab, this dialog is represented by
               <guiicon>
                 <inlinegraphic
-                      fileref="images/dialogs/stock-undo-history-16.png"/>
+                  fileref="images/dialogs/stock-undo-history-16.png"/>
               </guiicon>
             </para>
           </note>
diff --git a/src/filters/edge-detect/edge_detect.xml b/src/filters/edge-detect/edge_detect.xml
index 5a6f773..c053031 100644
--- a/src/filters/edge-detect/edge_detect.xml
+++ b/src/filters/edge-detect/edge_detect.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-04-01 Fixed edge mode option (wrap, smear, black)
   2007-08-17 Added Spanish translation by AntI
@@ -10,9 +11,8 @@
   2005-08-29 de added by axel.wernicke
 -->
 <sect2 id="plug-in-edge">
-  <title>
-    Edge
-  </title>
+  <title>Edge</title>
+
   <indexterm>
     <primary>Filters</primary>
     <secondary>Edge Detect</secondary>
@@ -34,23 +34,20 @@
     <primary>Gradient</primary>
   </indexterm>
   <indexterm>
-    <primary>Prewitt</primary>
+    <primary>Prewitt compass</primary>
   </indexterm>
   <indexterm>
     <primary>Differential</primary>
   </indexterm>
 
   <sect3>
-    <title>
-      Overview
-    </title>
+    <title>Overview</title>
     <figure>
-      <title>
-        Applying example for the Edge filter
-      </title>
+      <title>Applying example for the Edge 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>
@@ -58,7 +55,8 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/edge-taj-edge-sobel.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/edge-taj-edge-sobel.jpg"/>
         </imageobject>
         <caption>
           <para>After applying the filter (Sobel option)</para>
@@ -66,20 +64,20 @@
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        Applying examples for the Edge filter
-      </title>
+      <title>Applying examples for the Edge filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/edge-taj-edge-prewitt.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/edge-taj-edge-prewitt.jpg"/>
         </imageobject>
         <caption>
-          <para>After applying the filter (Prewitt option)</para>
+          <para>After applying the filter (Prewitt compass option)</para>
         </caption>
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/edge-taj-edge-gradient.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/edge-taj-edge-gradient.jpg"/>
         </imageobject>
         <caption>
           <para>After applying the filter (Gradient option)</para>
@@ -87,12 +85,11 @@
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        Applying example for the Edge filter
-      </title>
+      <title>Applying example for the Edge filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/edge-taj-edge-roberts.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/edge-taj-edge-roberts.jpg"/>
         </imageobject>
         <caption>
           <para>After applying the filter (Roberts option)</para>
@@ -100,20 +97,20 @@
       </mediaobject>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/edge-taj-edge-differential.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/edge-taj-edge-differential.jpg"/>
         </imageobject>
         <caption>
           <para>After applying the filter (Differential option)</para>
-        </caption>	
+        </caption>
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        Applying example for the Edge filter
-      </title>
+      <title>Applying example for the Edge filter</title>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="images/filters/examples/edge-taj-edge-laplace.jpg" format="JPG"/>
+          <imagedata format="JPG"
+            fileref="images/filters/examples/edge-taj-edge-laplace.jpg"/>
         </imageobject>
         <caption>
           <para>After applying the filter (Laplace option)</para>
@@ -121,10 +118,9 @@
       </mediaobject>
     </figure>
   </sect3>
+
   <sect3>
-    <title>
-      Activating the filter
-    </title>
+    <title>Activating the filter</title>
     <para>
       You can find this filter through
       <menuchoice>
@@ -134,14 +130,11 @@
       </menuchoice>.
     </para>
   </sect3>
+
   <sect3>
-    <title>
-      Options
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        Edge filter options
-      </title>
+      <title>Edge filter options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/filters/edge-options.png" format="PNG"/>
@@ -157,30 +150,36 @@
           </para>
           <itemizedlist>
             <listitem>
-              <para><guilabel>Sobel</guilabel>: Here, this method has no options
+              <para>
+                <guilabel>Sobel</guilabel>: Here, this method has no options
                 and so is less interesting than the specific Sobel.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Prewitt</guilabel>: Result doesn't look different
-                from Sobel.
+              <para>
+                <guilabel>Prewitt compass</guilabel>: Result doesn't look
+                different from Sobel.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Gradient</guilabel>: Edges are thinner, less
+              <para>
+                <guilabel>Gradient</guilabel>: Edges are thinner, less
                 contrasted and more blurred than Sobel.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Roberts</guilabel>: No evident difference from Sobel.
+              <para>
+                <guilabel>Roberts</guilabel>: No evident difference from Sobel.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Differential</guilabel>: Edges less bright.
+              <para>
+                <guilabel>Differential</guilabel>: Edges less bright.
               </para>
             </listitem>
             <listitem>
-              <para><guilabel>Laplace</guilabel>: Less interesting than the
+              <para>
+                <guilabel>Laplace</guilabel>: Less interesting than the
                 specific one.
               </para>
             </listitem>
@@ -188,9 +187,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          Amount
-        </term>
+        <term>Amount</term>
         <listitem>
           <para>
             A low value results in black, high-contrasted image with thin
@@ -200,11 +197,9 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>
-          Wrap, Smear, Black
-        </term>
+        <term>Wrap, Smear, Black</term>
         <listitem>
-          <para><!--changed 2008-04-01 (ude)-->
+          <para>
             Where the edge detector will get adjoining pixels for its
             calculations when it is working on the image boundaries. This
             option will only have an effect on the boundaries of the result
diff --git a/src/menus/colors/components/decompose.xml b/src/menus/colors/components/decompose.xml
index 59b6e5e..13c3782 100644
--- a/src/menus/colors/components/decompose.xml
+++ b/src/menus/colors/components/decompose.xml
@@ -15,10 +15,9 @@
   2005-08-25 de added by axel.wernicke
 -->
 <sect2 id="plug-in-decompose-registered">
-  <!-- the <title><phrase> construct is required, don't resolve -->
   <title>
     <anchor id="plug-in-decompose"/>
-    <phrase>Decompose</phrase>
+    <phrase condition="tag-is-required">Decompose</phrase>
   </title>
 
   <indexterm>
diff --git a/src/toolbox/tool-text.xml b/src/toolbox/tool-text.xml
index e462133..16551f7 100644
--- a/src/toolbox/tool-text.xml
+++ b/src/toolbox/tool-text.xml
@@ -473,26 +473,28 @@
         <secondary>Load from file</secondary>
       </indexterm>
       <varlistentry>
-        <term>Load Text from file</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-fileopen-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Load text from file</phrase>
+        </term>
         <listitem>
           <para>
             Text can be loaded from a text file by clicking the folder icon
-            <guiicon>
-              <inlinegraphic
-                fileref="images/dialogs/stock-fileopen-16.png"/>
-            </guiicon>
             in the text editor. All the text in the file is loaded.
           </para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Clear all text</term>
+        <term>
+          <guiicon>
+            <inlinegraphic fileref="images/dialogs/stock-edit-clear-16.png"/>
+          </guiicon>
+          <phrase condition="tag-is-required">Clear all text</phrase>
+        </term>
         <listitem>
           <para>
-            <guiicon>
-              <inlinegraphic
-                fileref="images/dialogs/stock-edit-clear-16.png"/>
-            </guiicon>
             Clicking this icon clears the editor and the associated text on
             the image.
           </para>
diff --git a/src/using/paths.xml b/src/using/paths.xml
index 09e2af9..ba29d54 100644
--- a/src/using/paths.xml
+++ b/src/using/paths.xml
@@ -10,10 +10,9 @@
   2006-09-10 added norwegian translation by KoSt
 -->
 <sect1 id="gimp-using-paths">
-  <!-- the <title><phrase> construct is required, don't resolve -->
   <title>
     <anchor id="gimp-concepts-paths" xreflabel="Paths"/>
-    <phrase>Paths</phrase>
+    <phrase condition="tag-is-required">Paths</phrase>
   </title>
 
   <indexterm>



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