gimp-help-2 r2780 - in trunk: . images/C/menus images/C/toolbox src/appendix src/menus src/menus/colors src/toolbox



Author: jhardlin
Date: Fri Mar 13 13:43:01 2009
New Revision: 2780
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2780&view=rev

Log:
2009-03-14 Julien hardelin <jm hard wanadoo fr>

        * src/toolbox/tool-curves.xml
        * src/toolbox/tool-hue-saturation.xml
        * src/toolbox/tool-posterize.xml
        * src/toolbox/tool-zoom.xml
        * src/toolbox/tool-color-balance.xml
        * src/toolbox/tools-color.xml
        * src/toolbox/tool-transform.xml
        * src/toolbox/tool-text.xml
        * src/toolbox/tool-colorize.xml
        * src/toolbox/tool-levels.xml
        * src/toolbox/tool-threshold.xml
        * src/toolbox/tool-brightness-contrast.xml
        * src/menus/colors.xml
        * src/appendix/history.xml: updated v2.6

        * images/C/toolbox/save-color-settings.png
        * images/C/toolbox/tool-options-text.png
        * images/C/toolbox/tools-curves.png
        * images/C/toolbox/tools-threshold.png
        * images/C/toolbox/tools-brightness.png
        * images/C/toolbox/toolbox-text.png
        * images/C/toolbox/tools-levels.png
        * images/C/toolbox/tools-color-balance.png
        * images/C/toolbox/tools-hue-sat.png
        * images/C/toolbox/tool-options-zoom.png
        * images/C/toolbox/tools-colorize.png
        * images/C/toolbox/stock-convert-grayscale-16.png
        * images/C/toolbox/toolbox-zoom.png: updated

        * src/toolbox/tool-desaturate.xml
        * src/menus/colors/desaturate.xml
        * images/C/menus/colors-desaturate-luminosity.png
        * images/C/menus/colors-desaturate.png
        * images/C/menus/colors-desaturate-brightness.png
        * images/C/menus/colors-desaturate-average.png
        * images/C/toolbox/desaturate.png
        * images/C/toolbox/colors-desaturate-luminosity.png
        * images/C/toolbox/colors-desaturate-brightness.png
        * images/C/toolbox/colors-desaturate-average.png: desaturate is now a tool.
          Moved from menus to toolbox.


Added:
   trunk/images/C/toolbox/colors-desaturate-average.png   (props changed)
      - copied unchanged from r2775, /trunk/images/C/menus/colors-desaturate-average.png
   trunk/images/C/toolbox/colors-desaturate-brightness.png   (props changed)
      - copied unchanged from r2775, /trunk/images/C/menus/colors-desaturate-brightness.png
   trunk/images/C/toolbox/colors-desaturate-luminosity.png   (props changed)
      - copied unchanged from r2775, /trunk/images/C/menus/colors-desaturate-luminosity.png
   trunk/images/C/toolbox/desaturate.png   (contents, props changed)
   trunk/images/C/toolbox/save-color-settings.png   (contents, props changed)
   trunk/images/C/toolbox/stock-convert-grayscale-16.png   (contents, props changed)
   trunk/src/toolbox/tool-desaturate.xml
Removed:
   trunk/images/C/menus/colors-desaturate-average.png
   trunk/images/C/menus/colors-desaturate-brightness.png
   trunk/images/C/menus/colors-desaturate-luminosity.png
   trunk/images/C/menus/colors-desaturate.png
   trunk/src/menus/colors/desaturate.xml
Modified:
   trunk/ChangeLog
   trunk/images/C/toolbox/tool-options-text.png
   trunk/images/C/toolbox/tool-options-zoom.png
   trunk/images/C/toolbox/toolbox-text.png
   trunk/images/C/toolbox/toolbox-zoom.png
   trunk/images/C/toolbox/tools-brightness.png
   trunk/images/C/toolbox/tools-color-balance.png
   trunk/images/C/toolbox/tools-colorize.png
   trunk/images/C/toolbox/tools-curves.png
   trunk/images/C/toolbox/tools-hue-sat.png
   trunk/images/C/toolbox/tools-levels.png
   trunk/images/C/toolbox/tools-threshold.png
   trunk/src/appendix/history.xml
   trunk/src/menus/colors.xml
   trunk/src/toolbox/tool-brightness-contrast.xml
   trunk/src/toolbox/tool-color-balance.xml
   trunk/src/toolbox/tool-colorize.xml
   trunk/src/toolbox/tool-curves.xml
   trunk/src/toolbox/tool-hue-saturation.xml
   trunk/src/toolbox/tool-levels.xml
   trunk/src/toolbox/tool-posterize.xml
   trunk/src/toolbox/tool-text.xml
   trunk/src/toolbox/tool-threshold.xml
   trunk/src/toolbox/tool-transform.xml
   trunk/src/toolbox/tool-zoom.xml
   trunk/src/toolbox/tools-color.xml

Added: trunk/images/C/toolbox/desaturate.png
==============================================================================
Binary file. No diff available.

Added: trunk/images/C/toolbox/save-color-settings.png
==============================================================================
Binary file. No diff available.

Added: trunk/images/C/toolbox/stock-convert-grayscale-16.png
==============================================================================
Binary file. No diff available.

Modified: trunk/images/C/toolbox/tool-options-text.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tool-options-zoom.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-text.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/toolbox-zoom.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tools-brightness.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tools-color-balance.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tools-colorize.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tools-curves.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tools-hue-sat.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tools-levels.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/C/toolbox/tools-threshold.png
==============================================================================
Binary files. No diff available.

Modified: trunk/src/appendix/history.xml
==============================================================================
--- trunk/src/appendix/history.xml	(original)
+++ trunk/src/appendix/history.xml	Fri Mar 13 13:43:01 2009
@@ -12,26 +12,13 @@
   2005-12-10 added de translation, made the file valid docbook by lexa
 -->
 <appendix xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-introduction-history">
-  <!--<appendixinfo role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2006-08-02</date>
-        <authorinitials>romanofski</authorinitials>
-      </revision>
-    </revhistory>
-  </appendixinfo>-->
-  <title>
-    <phrase>GIMP History</phrase>
-  </title>
+  <title>GIMP History</title>
   <indexterm>
     <primary>GIMP</primary>
     <secondary>History</secondary>
   </indexterm>
   <sect1 id="gimp-introduction-history-beginning">
-    <title>
-      <phrase>The Very Beginning</phrase>
-    </title>
+    <title>The Very Beginning</title>
     <para>
       According to Peter Mattis and Spencer Kimball, the original creators of
       <acronym>GIMP</acronym>, in their announcement of <acronym>GIMP</acronym>
@@ -79,9 +66,7 @@
     </para>
   </sect1>
   <sect1 id="gimp-introduction-history-early-days">
-    <title>
-      <phrase>The Early Days of GIMP</phrase>
-    </title>
+    <title>The Early Days of GIMP</title>
     <variablelist>
       <varlistentry>
         <term>Version 0.54</term>
@@ -184,18 +169,7 @@
     </variablelist>
   </sect1>
   <sect1 id="gimp-introduction-history-1-0">
-    <sect1info role="cvs">
-      <revhistory>
-        <revision>
-          <revnumber>$Revision$</revnumber>
-          <date>2006-02-08</date>
-          <authorinitials>jfriedl</authorinitials>
-        </revision>
-      </revhistory>
-    </sect1info>
-    <title>
-      <phrase>The One to Change the World</phrase>
-    </title>
+    <title>The One to Change the World</title>
     <variablelist>
       <varlistentry>
         <term>Version 1.0</term>
@@ -221,4 +195,5 @@
   </sect1>
   <xi:include href="history-20.xml"/>
   <xi:include href="history-22.xml"/>
+  <xi:include href="history-24.xml"/>
 </appendix>

Modified: trunk/src/menus/colors.xml
==============================================================================
--- trunk/src/menus/colors.xml	(original)
+++ trunk/src/menus/colors.xml	Fri Mar 13 13:43:01 2009
@@ -2,6 +2,8 @@
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
           "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!--section history:
+  2009 03-12 j.h: moved desaturate to toolbox
+  2009-02-05 j.h: added use-gegl.xml
   2009-01-07 ude: removed colors/map/{adjust,colormap}.xml
   2007-12-29 j.h: added palettemap
   2007-10-23 ude: added Colors/Map ('en','de')
@@ -21,13 +23,12 @@
 
   <xi:include href="colors/introduction.xml"/>
   <xi:include href="colors/tools.xml"/>
+  <!-- Moved to toolbox
   <xi:include href="colors/desaturate.xml"/>
-  <!-- -->
+  -->
   <xi:include href="colors/invert.xml"/>
   <xi:include href="colors/vinvert.xml"/>
-  <!-- -->
   <xi:include href="colors/use-gegl.xml"/>
-  <!-- -->
   <xi:include href="colors/auto.xml"/>
   <xi:include href="colors/auto/equalize.xml"/>
   <xi:include href="colors/auto/white-balance.xml"/>

Modified: trunk/src/toolbox/tool-brightness-contrast.xml
==============================================================================
--- trunk/src/toolbox/tool-brightness-contrast.xml	(original)
+++ trunk/src/toolbox/tool-brightness-contrast.xml	Fri Mar 13 13:43:01 2009
@@ -1,6 +1,7 @@
 <?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";>
 <!-- section history:
+     2009-03-11 j.h: revised for v2.6. Added Presets
      2008-01-16 j.h updated "en;fr" to v2.4
      2007-06-06 kost: added 'no'
      2007-04-15 Added Spanish translation by AntI
@@ -9,18 +10,7 @@
      2005-05-31 en revised Bill Skaggs
      -->
 <sect2 id="gimp-tool-brightness-contrast">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-16</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Brightness-Contrast tool</phrase>
-  </title>
+  <title>Brightness-Contrast tool</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Brightness-Contrast</secondary>
@@ -44,9 +34,7 @@
     on your keyboard.
   </para>
   <sect3>
-    <title>
-      <phrase>Activate the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <para>
       You can get to the Brightness-Contrast tool in two ways :
     </para>
@@ -54,14 +42,28 @@
       <listitem>
         <para>
           In the the image-menu through:
-          <menuchoice><guimenu>Tools</guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Brightness-Contrast</guimenuitem></menuchoice> or
-          <menuchoice><guimenu>Colors</guimenu><guimenuitem>Brightness-Contrast</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Color Tools</guisubmenu>
+            <guimenuitem>Brightness-Contrast</guimenuitem>
+          </menuchoice> or
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guimenuitem>Brightness-Contrast</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
           by clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-brightness-contrast-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata
+                fileref="images/toolbox/stock-tool-brightness-contrast-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
           For this, go to
           <link linkend="gimp-tools-dialog">Tools Dialog</link>.
@@ -70,13 +72,9 @@
     </itemizedlist>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Brightness-Contrast options dialog</phrase>
-      </title>
+      <title>Brightness-Contrast options dialog</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tools-brightness.png" format="PNG"/>
@@ -85,6 +83,25 @@
     </figure>
     <variablelist>
       <varlistentry>
+        <term>Presets</term>
+        <listitem>
+          <para>
+            You can save the color settings of your image by clicking the
+            <guibutton>Add settings to favourites</guibutton> button
+            <guiicon>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
+                </imageobject>
+              </inlinemediaobject>
+            </guiicon>
+            and you can get a favourite preset back by selecting it in the
+            <guibutton>Pick a setting from the list</guibutton> drop-down
+            list.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>Brightness</term>
         <listitem>
           <para>
@@ -103,6 +120,15 @@
         </listitem>
       </varlistentry>
       <varlistentry>
+        <term>Edit these settings as Levels</term>
+        <listitem>
+          <para>
+            To make your work easier, this button lets you turn to
+            <xref linkend="gimp-tool-levels" /> with the same settings.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>Preview</term>
         <listitem>
           <para>

Modified: trunk/src/toolbox/tool-color-balance.xml
==============================================================================
--- trunk/src/toolbox/tool-color-balance.xml	(original)
+++ trunk/src/toolbox/tool-color-balance.xml	Fri Mar 13 13:43:01 2009
@@ -1,6 +1,7 @@
 <?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";>
 <!-- section history:
+  2009-03-11 j.h: revised for v2.6. Added Presets
   2008-01-13 j.h: updated to v2.4
   2007-06-06 kost: added 'no' (Norwegian)
   2007-04-15 Added Spanish translation by AntI
@@ -10,18 +11,7 @@
   050808 de reviewed and restructured by axel.wernicke
  -->
 <sect2 id="gimp-tool-color-balance">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-13</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Color Balance</phrase>
-  </title>
+  <title>Color Balance</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Color Balance</secondary>
@@ -33,14 +23,14 @@
   <indexterm>
     <primary>Color Balance</primary>
   </indexterm>
-  <para><!--Changed 2008-01-13-->
+  <para>
     The color balance tool modifies the color balance of the active selection
     or layer. Changes are not drastic. This tool is suitable to correct
     predominant colors in digital photos.
   </para>
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
     <para>
       You can get to the Color balance tool in several ways :
@@ -49,14 +39,28 @@
       <listitem>
         <para>
           In the the image-menu through:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>C</accel>olor Tools</guisubmenu><guimenuitem>Color <accel>B</accel>alance</guimenuitem></menuchoice>, or
-          <menuchoice><guimenu>Colors</guimenu><guimenuitem>Color Balance</guimenuitem></menuchoice>
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Color Tools</guisubmenu>
+            <guimenuitem>Color Balance</guimenuitem>
+          </menuchoice>, or
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guimenuitem>Color Balance</guimenuitem>
+          </menuchoice>
         </para>
       </listitem>
       <listitem>
         <para>
           By clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-color-balance-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata
+                  fileref="images/toolbox/stock-tool-color-balance-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
           For this, go to
           <link linkend="gimp-tools-dialog">Tools Dialog</link>.
@@ -64,6 +68,7 @@
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
     <title>
       <phrase>Options</phrase>
@@ -80,9 +85,27 @@
     </figure>
     <variablelist>
       <varlistentry>
+        <term>Presets</term>
+        <listitem>
+          <para>
+            You can save the color settings of your image by clicking the
+            <guibutton>Add settings to favourites</guibutton> button
+            <guiicon>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
+                </imageobject>
+              </inlinemediaobject>
+            </guiicon>
+            and you can get a favourite preset back by selecting it in the
+            <guibutton>Pick a setting from the list</guibutton> button.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>Select range to adjust</term>
         <listitem>
-          <para><!--TODO es;it;pl;-->
+          <para>
             Selecting one of these options will restrict the range of colors
             which are changed with the sliders or input boxes for Shadows
             (darkest pixels), Midtones (medium pixels) and Highlights
@@ -93,7 +116,7 @@
       <varlistentry>
         <term>Adjust color levels</term>
         <listitem>
-          <para><!--Changed 2008-01-13-->
+          <para>
             Sliders and range from the three RGB colors to their
             complementary colors (CMY). The zero position corresponds to
             the current level value of pixels in the original image. You can
@@ -105,7 +128,7 @@
       <varlistentry>
         <term>Reset Range</term>
         <listitem>
-          <para><!--Changed 2008-01-13-->
+          <para>
              This button sets color levels of the selected range back to
              the zero position (original values).
            </para>
@@ -114,7 +137,7 @@
       <varlistentry>
         <term>Preserve Luminosity</term>
         <listitem>
-          <para><!--Changed 2008-01-13-->
+          <para>
              This option ensures that brightness of the active layer or
              selection is maintained. The Value of brightest pixels is not
              changed.

Modified: trunk/src/toolbox/tool-colorize.xml
==============================================================================
--- trunk/src/toolbox/tool-colorize.xml	(original)
+++ trunk/src/toolbox/tool-colorize.xml	Fri Mar 13 13:43:01 2009
@@ -1,6 +1,7 @@
 <?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";>
 <!-- section history:
+  2009-03-11 j.h: revised for v2.6. Added Presets
   2008-01-16 j.h: updated to v2.4
   2007-06-06 kost: added 'no'
   2007-04-15 Added Spanish translation by AntI
@@ -10,18 +11,7 @@
   2005-08-07 de restructured and reviewed by axel.wernicke
 -->
 <sect2 id="gimp-tool-colorize">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-16</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Colorize</phrase>
-  </title>
+  <title>Colorize</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Colorize</secondary>
@@ -50,15 +40,29 @@
       <listitem>
         <para>
           In the the image-menu through:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>C</accel>olor Tools</guisubmenu><guimenuitem>Colori <accel>z</accel>e</guimenuitem></menuchoice> or
-          <menuchoice><guimenu>Colors</guimenu><guimenuitem>Colorize</guimenuitem></menuchoice>,
-
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Color Tools</guisubmenu>
+            <guimenuitem>Colorize</guimenuitem>
+          </menuchoice>
+          or
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guimenuitem>Colorize</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
           or by clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-colorize-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata
+                  fileref="images/toolbox/stock-tool-colorize-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
           For this, go to
           <link linkend="gimp-tools-dialog">Tools Dialog</link>.
@@ -82,19 +86,37 @@
     </figure>
     <variablelist>
       <varlistentry>
+        <term>Presets</term>
+        <listitem>
+          <para>
+            You can save the color settings of your image by clicking the
+            <guibutton>Add settings to favourites</guibutton> button
+            <guiicon>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
+                </imageobject>
+              </inlinemediaobject>
+            </guiicon>
+            and you can get a favourite preset back by selecting it in the
+            <guibutton>Pick a setting from the list</guibutton> button.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>Select Color</term>
         <listitem>
           <itemizedlist>
             <listitem>
               <para><guilabel>Hue</guilabel>:
-                The slider and the numeric text box allow you to select a hue in the HSV
-                color circle (0 - 360).
+                The slider and the numeric text box allow you to select a hue
+                in the HSV color circle (0 - 360).
               </para>
             </listitem>
             <listitem>
               <para><guilabel>Saturation</guilabel>:
-                The slider and the input box allows you to select a saturation: 0
-                through 100.
+                The slider and the input box allows you to select a
+                saturation: 0 through 100.
               </para>
             </listitem>
             <listitem>

Modified: trunk/src/toolbox/tool-curves.xml
==============================================================================
--- trunk/src/toolbox/tool-curves.xml	(original)
+++ trunk/src/toolbox/tool-curves.xml	Fri Mar 13 13:43:01 2009
@@ -1,6 +1,7 @@
 <?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";>
 <!-- section history:
+  2009-03-11 j.h: revised for v2.6. Added Presets
   2008-02-03 ude: updated 'de'
   2008-01-23 j.h updated 'en;fr' to v2.4
   2007-06-06 kost: added 'no'
@@ -11,18 +12,7 @@
   2005-08-08 de reviewed by axel.wernicke
 -->
 <sect2 id="gimp-tool-curves">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-23</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Curves</phrase>
-  </title>
+  <title>Curves</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Curves</secondary>
@@ -38,39 +28,45 @@
     images.
   </para>
   <sect3>
-    <title>
-      <phrase>Activate the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <para>You can get to this tools in several ways :</para>
     <itemizedlist>
       <listitem>
         <para>
           In the image menu through
-          <menuchoice><guimenu>Tools</guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Curves</guimenuitem></menuchoice> or
-          <menuchoice><guimenu>Colors</guimenu><guimenuitem>Curves</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Color Tools</guisubmenu>
+            <guimenuitem>Curves</guimenuitem>
+          </menuchoice> or
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guimenuitem>Curves</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
       <listitem>
         <para>
           By clicking on the tool icon
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-curves-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata
+                  fileref="images/toolbox/stock-tool-curves-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           in Toolbox, if this tool has been installed there (see
           <link linkend="gimp-tools-dialog">Tools dialog</link>.
         </para>
       </listitem>
     </itemizedlist>
   </sect3>
+
   <sect3>
-    <title>
-      <phrase><quote>Adjust Color Curves</quote> options
-      </phrase>
-    </title>
+    <title><quote>Adjust Color Curves</quote> options</title>
     <figure>
-      <title>
-        <phrase>
-          The <quote>Adjust Color Curves</quote> dialog
-        </phrase>
-      </title>
+      <title>The <quote>Adjust Color Curves</quote> dialog</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tools-curves.png" format="PNG"/>
@@ -79,16 +75,32 @@
     </figure>
     <variablelist>
       <varlistentry>
+        <term>Presets</term>
+        <listitem>
+          <para>
+            You can save the color settings of your image by clicking the
+            <guibutton>Add settings to favourites</guibutton> button
+            <guiicon>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
+                </imageobject>
+              </inlinemediaobject>
+            </guiicon>
+            and you can get a favourite preset back by selecting it in the
+            <guibutton>Pick a setting from the list</guibutton> button.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>Channel</term>
         <listitem>
-          <para><!--Changed 2008-01-23-->
+          <para>
             There are five options:
           </para>
           <variablelist>
             <varlistentry>
-              <term>
-                <phrase>Value</phrase>
-              </term>
+              <term>Value</term>
               <listitem>
                 <para>
                   The curve represents the Value, i.e the brightness of
@@ -97,9 +109,7 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>
-                <phrase>Red; Green; Blue</phrase>
-              </term>
+              <term>Red; Green; Blue</term>
               <listitem>
                 <para>
                   The curve represents the quantity of color in each of the
@@ -111,9 +121,7 @@
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>
-                <phrase>Alpha</phrase>
-              </term>
+              <term>Alpha</term>
               <listitem>
                 <para>
                   The curve represents the opacity of the pixels.
@@ -143,7 +151,7 @@
           <para>
             These buttons allow to choose the Linear or Logarithmic type of
             the histogram. You can also use the same options in Tool Options
-            dialog.
+            dialog. This grayed out histogram is not displayed by default.
           </para>
         </listitem>
       </varlistentry>
@@ -178,7 +186,7 @@
               <para>
                 If you click on the curve, a new <emphasis>anchor</emphasis>
                 is created. When the mouse pointer goes over an anchor, it
-                takes the form of the moving crosshair. You can
+                takes the form of a small hand. You can
                 click-and-drag the anchor to bend the curve. If you click
                 outside of the curve, an anchor is also created, and the
                 curve includes it automatically.
@@ -201,8 +209,8 @@
               <para>
                 To delete all anchors (apart from both ends), click on the
                 <guilabel>Reset Channel</guilabel> button. To delete only one
-                anchor, move it onto another point or to the
-                grid border.
+                anchor, move it onto another point or to the grid border, left
+                or right.
               </para>
               <para>
                 Meanwhile, on the canvas, the mouse pointer has the form of
@@ -218,12 +226,7 @@
               <para>
                 The histogram of the active layer or selection for the
                 selected channel is represented grayed out in the chart. It's
-                only a reference. <!--Using shift-drag on the image, you can see
-                that you can't get a color and place an anchor with it
-                outside of the histogram limits.
-                <!-CHECK : placing an anchor outside the limits
-                    is possible - did I miss(undestand) something?-->
-                <!--USING SHIFT-DRAG...But actually misleading-->--&gt;
+                only a reference.
               </para>
             </listitem>
           </itemizedlist>
@@ -243,14 +246,13 @@
       <varlistentry>
         <term>Curve type</term>
         <listitem>
-          <para><guilabel>Smooth</guilabel>: This mode constrains the curve
-            type to a smooth line with tension. It provides a more
-            realistic render than the following.
-          </para>
-          <para><!--CHECK de : IMHO "not totally free..." is wrong/misleading--><!-- In former versions, you could draw separate line segments.
-                 That's no longer possible--><guilabel>Free</guilabel>: With GIMP-v2.4, you are not totally
-            free to draw the curve. You actually draw a broken line that you
-            can smooth by clicking the <guibutton>Smooth</guibutton> button.
+          <para><guilabel>Smooth</guilabel>: This the default mode. It
+            constrains the curve type to a smooth line with tension. It
+            provides a more realistic render than the following.
+          </para>
+          <para><guilabel>Free Hand</guilabel>: With this mode, you can draw
+            a broken line that you can smooth by clicking the
+            <guibutton>Smooth</guibutton> button.
           </para>
         </listitem>
       </varlistentry>
@@ -285,7 +287,7 @@
       <varlistentry>
         <term>Sample Average</term>
         <listitem>
-          <para><!--Changed 2008-01-24-->
+          <para>
              This slider sets the <quote>radius</quote> of the color-picking
              area. This area appears as a more or less enlarged square
              when you maintain the click on a pixel. Here, the eye-dropper is
@@ -296,9 +298,7 @@
     </variablelist>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Using the <quote>Curves</quote> tool</phrase>
-    </title>
+    <title>Using the <quote>Curves</quote> tool</title>
     <variablelist>
       <varlistentry>
         <term>Summary and basic shapes</term>
@@ -309,9 +309,7 @@
             the active layer or selection to <quote>output</quote> tones.
           </para>
           <figure>
-            <title>
-              <phrase>How the Curves tool works</phrase>
-            </title>
+            <title>How the Curves tool works</title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/toolbox/curves-work.png" format="PNG"/>
@@ -407,11 +405,11 @@
                 <imagedata fileref="images/toolbox/curves-invert.png" format="PNG"/>
               </imageobject>
               <caption>
-                <para><!--CHECK en,fr,ru: Subracting 255 from the channel or the channel from 255?-->
+                <para>
                   Black is made White (fully colored / fully opaque). White
                   is made black (black, fully transparent). All pixels adopt
-                  the complementary color. Why that? Because subtracting 255
-                  from the channel values gives the complementary color. For
+                  the complementary color. Why that? Because subtracting
+                  the channel values from 255 gives the complementary color. For
                   example: 19;197;248 a sky blue gives 255-19; 255-197;
                   255-248 = 236;58;7, a bright red.
                 </para>

Added: trunk/src/toolbox/tool-desaturate.xml
==============================================================================
--- (empty file)
+++ trunk/src/toolbox/tool-desaturate.xml	Fri Mar 13 13:43:01 2009
@@ -0,0 +1,184 @@
+<?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";>
+<!-- section history:
+  2009-03-12 j.h: moved from menus:colors/. revised for v2.6
+  2008-01-21 ude: updated de; added equations
+  2007-12-31 j.h updated to v2.4. Options added en;fr
+  2007-10-16 ude: copied here from "menus/layer-desaturate.xml"
+  2007-06-6 Added Spanish translation by AntI
+  2007-02-22 KoSt: added no
+  2005/11/12 split of from layer-colors.xml by axel.wernicke
+-->
+<sect2 id="gimp-layer-desaturate">
+  <title>Desaturate</title>
+  <indexterm>
+    <primary>Colors</primary>
+    <secondary>Convert to gray scale</secondary>
+  </indexterm>
+  <indexterm>
+    <primary>Desaturate</primary>
+  </indexterm>
+  <para>
+    By using the <guimenuitem>Desaturate</guimenuitem> command, you can
+    convert all of the colors on the active layer to corresponding shades
+    of gray. This differs from converting the image to grayscale in two
+    respects. First, it only operates on the active layer and second,
+    the colors on the layer are still RGB values with three components. This
+    means that you can paint on the layer, or individual parts of it,
+    using color at a later time.
+  </para>
+
+  <note>
+    <para>
+      This command only works on layers of RGB images. If the image is in
+      Grayscale or Indexed mode, the menu entry is insensitive and
+      grayed out.
+    </para>
+  </note>
+
+  <sect3>
+    <title>Activating the Command</title>
+    <para>You can get to this tools in several ways :</para>
+    <itemizedlist>
+      <listitem>
+        <para>
+          In the image menu through
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Color Tools</guisubmenu>
+            <guimenuitem>Desturate</guimenuitem>
+          </menuchoice> or
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guimenuitem>Desaturate</guimenuitem>
+          </menuchoice>.
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          By clicking on the tool icon
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata
+                  fileref="images/toolbox/stock-convert-grayscale-16.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
+          in Toolbox, if this tool has been installed there (see
+          <link linkend="gimp-tools-dialog">Tools dialog</link>.
+        </para>
+      </listitem>
+    </itemizedlist>
+  </sect3>
+
+  <sect3>
+    <title>Options</title>
+    <figure>
+      <title>The <quote>Desaturate</quote> option dialog</title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/toolbox/desaturate.png" format="PNG"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+    <para>Three options are available:</para>
+    <variablelist>
+      <title>
+        <phrase>Choose shade of gray based on</phrase>
+      </title>
+      <varlistentry>
+        <term>
+          <phrase>Lightness</phrase>
+        </term>
+        <listitem>
+          <para>The graylevel will be calculated as</para>
+          <informalequation>
+            <mediaobject>
+              <textobject>
+                <phrase>
+                  Lightness = Â * (max(R,G,B) + min(R,G,B))
+                </phrase>
+              </textobject>
+            </mediaobject>
+          </informalequation>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <phrase>Luminosity</phrase>
+        </term>
+        <listitem>
+          <para>The graylevel will be calculated as</para>
+          <informalequation>
+            <mediaobject>
+              <textobject>
+                <phrase>
+                  Luminosity = 0.21 * R + 0.71 * G + 0.07 * B
+                </phrase>
+              </textobject>
+            </mediaobject>
+          </informalequation>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <phrase>Average</phrase>
+        </term>
+        <listitem>
+          <para>The graylevel will be calculated as</para>
+          <informalequation>
+            <mediaobject>
+              <textobject>
+                <phrase>Average Brightness = (R + G + B) / 3</phrase>
+              </textobject>
+            </mediaobject>
+          </informalequation>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <figure>
+      <title>
+        <phrase>Comparing the three options</phrase>
+      </title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/menus/sunflower.png" format="PNG"/>
+        </imageobject>
+        <caption>
+          <para>Original image</para>
+        </caption>
+      </mediaobject>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/toolbox/colors-desaturate-brightness.png"
+format="PNG"/>
+        </imageobject>
+        <caption>
+          <para><quote>Lightness</quote> applied</para>
+        </caption>
+      </mediaobject>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/toolbox/colors-desaturate-luminosity.png"
+format="PNG"/>
+        </imageobject>
+        <caption>
+          <para><quote>Luminosity</quote> applied. The result is brighter.
+          </para>
+        </caption>
+      </mediaobject>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/toolbox/colors-desaturate-average.png"
+format="PNG"/>
+        </imageobject>
+        <caption>
+          <para><quote>Average</quote> applied. The result is in between
+            Brightness and Luminosity.
+          </para>
+        </caption>
+      </mediaobject>
+    </figure>
+  </sect3>
+</sect2>

Modified: trunk/src/toolbox/tool-hue-saturation.xml
==============================================================================
--- trunk/src/toolbox/tool-hue-saturation.xml	(original)
+++ trunk/src/toolbox/tool-hue-saturation.xml	Fri Mar 13 13:43:01 2009
@@ -1,6 +1,7 @@
 <?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";>
 <!-- section history:
+  2009-03-11 j.h: revised for v2.6. Added Presets
   2008-01-18 ude: updated 'de'
   2008-01-14 j.h: updated to v2.4. Overlap option added
   2007-06-06 kost: added 'no'
@@ -11,18 +12,7 @@
   050807 de restructured and reviewed by axel.wernicke
   -->
 <sect2 id="gimp-tool-hue-saturation">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-14</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Hue-Saturation</phrase>
-  </title>
+  <title>Hue-Saturation</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Hue-Saturation</secondary>
@@ -36,21 +26,35 @@
   </para>
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
-    <para>You can get to the Hue-Saturationtool in two ways :</para>
+    <para>You can get to the Hue-Saturation tool in two ways :</para>
     <itemizedlist>
       <listitem>
         <para>
           In the the image-menu through:
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>C</accel>olor Tools</guisubmenu><guimenuitem>Hue- <accel>S</accel>aturation</guimenuitem></menuchoice>, or
-          <menuchoice><guimenu>Colors</guimenu><guimenuitem>Hue-Saturation</guimenuitem></menuchoice>
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Color Tools</guisubmenu>
+            <guimenuitem>Hue-Saturation</guimenuitem>
+          </menuchoice>, or
+          <menuchoice>
+            <guimenu>Colors</guimenu>
+            <guimenuitem>Hue-Saturation</guimenuitem>
+          </menuchoice>
         </para>
       </listitem>
       <listitem>
         <para>
           By clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-hue-saturation-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata
+                  fileref="images/toolbox/stock-tool-hue-saturation-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           in Toolbox, provided that you have installed color tools in Toolbox.
           For this, go to
           <link linkend="gimp-tools-dialog">Tools Dialog</link>.
@@ -74,6 +78,24 @@
     </figure>
     <variablelist>
       <varlistentry>
+        <term>Presets</term>
+        <listitem>
+          <para>
+            You can save the color settings of your image by clicking the
+            <guibutton>Add settings to favourites</guibutton> button
+            <guiicon>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
+                </imageobject>
+              </inlinemediaobject>
+            </guiicon>
+            and you can get a favourite preset back by selecting it in the
+            <guibutton>Pick a setting from the list</guibutton> button.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>Select Primary Color to Adjust</term>
         <listitem>
           <para>

Modified: trunk/src/toolbox/tool-levels.xml
==============================================================================
--- trunk/src/toolbox/tool-levels.xml	(original)
+++ trunk/src/toolbox/tool-levels.xml	Fri Mar 13 13:43:01 2009
@@ -1,6 +1,7 @@
 <?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";>
 <!-- section history
+  2009-03-11 j.h: revised for v2.6. Added Presets
   2008-01-17 j.h: updated to v2.4 and enhanced 'en;fr'
   2007-06-06 kost: added 'no'
   2007-04-15 Added Spanish translation by AntI
@@ -10,18 +11,7 @@
   050807 de reviewed by axel.wernicke
 -->
 <sect2 id="gimp-tool-levels">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-17</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Levels</phrase>
-  </title>
+  <title>Levels</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Levels</secondary>
@@ -52,25 +42,36 @@
     contrast or to correct a predominant color cast.
   </para>
   <sect3>
-    <title>
-      <phrase>Activate the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <para>
       You can get to the Level Tool in the image-menu through:
-      <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>C</accel>olor Tools</guisubmenu><guimenuitem><accel>L</accel>evels</guimenuitem></menuchoice>, or
-      <menuchoice><guimenu>Colors</guimenu><guimenuitem>Levels</guimenuitem></menuchoice>,
+      <menuchoice>
+        <guimenu>Tools</guimenu>
+        <guisubmenu>Color Tools</guisubmenu>
+        <guimenuitem>Levels</guimenuitem>
+      </menuchoice>,
+      or
+      <menuchoice>
+        <guimenu>Colors</guimenu>
+        <guimenuitem>Levels</guimenuitem>
+      </menuchoice>,
     </para>
     <para>
       or by clicking the
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-levels-22.png"/></imageobject></inlinemediaobject></guiicon>
+      <guiicon>
+        <inlinemediaobject>
+          <imageobject>
+            <imagedata
+              fileref="images/toolbox/stock-tool-levels-22.png"/>
+          </imageobject>
+        </inlinemediaobject>
+      </guiicon>
       icon in Toolbox if this tool has been installed there. For this, go to
         <link linkend="gimp-tools-dialog">Tools Dialog</link>.
     </para>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
       <title>
         <phrase>Level tool options</phrase>
@@ -83,26 +84,62 @@
     </figure>
     <variablelist>
       <varlistentry>
+        <term>Presets</term>
+        <listitem>
+          <para>
+            You can save the color settings of your image by clicking the
+            <guibutton>Add settings to favourites</guibutton> button
+            <guiicon>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
+                </imageobject>
+              </inlinemediaobject>
+            </guiicon>
+            and you can get a favourite preset back by selecting it in the
+            <guibutton>Pick a setting from the list</guibutton> drop-down
+            list.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>Channel</term>
         <listitem>
-          <para><!--Changed 2008-01-18-->
+          <para>
             You can select the specific channel which will be modified by the
             tool:
-            <itemizedlist><listitem><para><guilabel>Value</guilabel> makes changes to the value of
+            <itemizedlist>
+              <listitem>
+                <para>
+                  <guilabel>Value</guilabel> makes changes to the value of
                   all RGB channels in the image: the image becomes darker or
                   lighter.
-                </para></listitem><listitem><para><guilabel>Red</guilabel>, <guilabel>Green</guilabel> and
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <guilabel>Red</guilabel>, <guilabel>Green</guilabel> and
                   <guilabel>Blue</guilabel> work on a particular color
                   channel: the image gets more or less color. Remember that
                   adding or removing a color result in removing or adding
                   the complementary color
-                </para></listitem><listitem><para><guilabel>Alpha</guilabel> works on semi-transparent layers
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <guilabel>Alpha</guilabel> works on semi-transparent layers
                   or selections: here, dark means more transparency, and
                   white is fully opaque. Your image must have an Alpha
                   Channel, otherwise this option is disabled.
-                </para></listitem><listitem><para><guilabel>Initialize channel</guilabel> cancels changes to
+                </para>
+              </listitem>
+              <listitem>
+                <para>
+                  <guilabel>Initialize channel</guilabel> cancels changes to
                   the selected channel.
-                </para></listitem></itemizedlist>
+                </para>
+              </listitem>
+            </itemizedlist>
           </para>
         </listitem>
       </varlistentry>
@@ -232,7 +269,7 @@
             located here that can be used to interactively change the Output
             Levels.
           </para>
-          <para><!--TODO es;it;pl-->
+          <para>
             Output levels force the tone range to fit the new limits you have
             set.
           </para>
@@ -261,9 +298,7 @@
             </listitem>
           </itemizedlist>
           <figure>
-            <title>
-              <phrase>Example for Output Levels</phrase>
-            </title>
+            <title>Example for Output Levels</title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/toolbox/levels-output-1.png" format="PNG"/>
@@ -272,7 +307,11 @@
                 <para><emphasis role="bold">Original image</emphasis>:
                   A RGB gradient from black (0;0;0) to white (255;255;255).
                   Output Levels has no histogram; here, we used
-                  <menuchoice><guimenu>Dialogs</guimenu><guimenuitem>Histogram</guimenuitem></menuchoice>.
+                  <menuchoice>
+                    <guimenu>Windows</guimenu>
+                    <guisubmenu>Dockable Dialogs</guisubmenu>
+                    <guimenuitem>Histogram</guimenuitem>
+                  </menuchoice>.
                 </para>
               </caption>
             </mediaobject>
@@ -306,7 +345,8 @@
           <para><guilabel>Auto</guilabel>: Performs an automatic setting
             of the levels.
           </para>
-          <para><!--TODO es;it;pl--><guilabel>Three eyedroppers</guilabel>: These three buttons
+          <para>
+            <guilabel>Three eyedroppers</guilabel>: These three buttons
             respectively represent a white, a gray and a black eye-dropper.
             When you click one of these buttons, the mouse pointer takes the
             form of the eye-dropper it represents. Then, when clicking the
@@ -317,9 +357,7 @@
             selected.
           </para>
           <figure>
-            <title>
-              <phrase>Example for Levels eye-droppers</phrase>
-            </title>
+            <title>Example for Levels eye-droppers</title>
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/toolbox/levels-eyedrop.png" format="PNG"/>
@@ -336,6 +374,17 @@
           </figure>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term>Edit these settings as Curves</term>
+        <listitem>
+          <para>
+            To make your work easier, this button lets you turn to
+            <xref linkend="gimp-tool-curves" /> with the same settings.
+          </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term>Preview</term>
         <listitem>
@@ -348,15 +397,11 @@
     </variablelist>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Tool Options dialog</phrase>
-    </title>
+    <title>Tool Options dialog</title>
     <variablelist>
       <para>
         <figure>
-          <title>
-            <phrase><quote>Levels</quote> toool options</phrase>
-          </title>
+          <title><quote>Levels</quote> tool options</title>
           <mediaobject>
             <imageobject>
               <imagedata fileref="images/toolbox/tool-options-levels.png" format="PNG"/>
@@ -390,13 +435,9 @@
     </variablelist>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Actual practice</phrase>
-    </title>
+    <title>Actual practice</title>
     <figure>
-      <title>
-        <phrase>A very under-exposed image</phrase>
-      </title>
+      <title>A very under-exposed image</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/filters/examples/colors-retinex1.png" format="PNG"/>
@@ -418,9 +459,7 @@
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        <phrase>Setting the white point</phrase>
-      </title>
+      <title>Setting the white point</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/levels-ex2a.png" format="PNG"/>
@@ -445,11 +484,7 @@
       </mediaobject>
     </figure>
     <figure>
-      <title>
-        <phrase>
-          Setting the balance between Shadows and Highlights
-        </phrase>
-      </title>
+      <title>Setting the balance between Shadows and Highlights</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/levels-ex3a.png" format="PNG"/>

Modified: trunk/src/toolbox/tool-posterize.xml
==============================================================================
--- trunk/src/toolbox/tool-posterize.xml	(original)
+++ trunk/src/toolbox/tool-posterize.xml	Fri Mar 13 13:43:01 2009
@@ -10,15 +10,6 @@
   050808 de reviewed and restructured by axel.wernicke
   -->
 <sect2 id="gimp-tool-posterize">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-28</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>Posterize</title>
   <indexterm>
     <primary>Tools</primary>
@@ -33,28 +24,36 @@
     maintaining a semblance of the original image characteristics.
   </para>
   <sect3>
-    <title>
-      <phrase>Activate the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <para>
       You can find this tool from the image-menu through:
-      <menuchoice><guimenu>Tools</guimenu><guisubmenu>Color Tools</guisubmenu><guimenuitem>Posterize</guimenuitem></menuchoice> or
-      <menuchoice><guimenu>Colors</guimenu><guimenuitem>Posterize</guimenuitem></menuchoice>,
+      <menuchoice>
+        <guimenu>Tools</guimenu>
+        <guisubmenu>Color Tools</guisubmenu>
+        <guimenuitem>Posterize</guimenuitem>
+      </menuchoice> or
+      <menuchoice>
+        <guimenu>Colors</guimenu>
+        <guimenuitem>Posterize</guimenuitem>
+      </menuchoice>,
     </para>
     <para>
       or by clicking the
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-posterize-22.png"/></imageobject></inlinemediaobject></guiicon>
+      <guiicon>
+        <inlinemediaobject>
+          <imageobject>
+            <imagedata
+              fileref="images/toolbox/stock-tool-posterize-22.png"/>
+          </imageobject>
+        </inlinemediaobject>
+      </guiicon>
       icon in ToolBox, if Color Tools have been added to it.
     </para>
   </sect3>
   <sect3>
-    <title>
-      <phrase>Options</phrase>
-    </title>
+    <title>Options</title>
     <figure>
-      <title>
-        <phrase>Posterize tool options</phrase>
-      </title>
+      <title>Posterize tool options</title>
       <mediaobject>
         <imageobject>
           <imagedata fileref="images/toolbox/tools-posterize.png" format="PNG"/>

Modified: trunk/src/toolbox/tool-text.xml
==============================================================================
--- trunk/src/toolbox/tool-text.xml	(original)
+++ trunk/src/toolbox/tool-text.xml	Fri Mar 13 13:43:01 2009
@@ -1,6 +1,7 @@
 <?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";>
 <!-- section history:
+  2009-03-09 j.h: updated to v2.6
   2008-01-05 j.h: updated en;fr to v2.4.
   2007-06-04 kost: added 'no'
   2006-07-03 lexa: enhanced docbook compliance
@@ -10,16 +11,8 @@
   050818 de reviewed by axel.wernicke
   -->
 <sect2 id="gimp-tool-text">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-05</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
   <title>Text</title>
+
   <indexterm>
     <primary>Tools</primary>
     <secondary>Text</secondary>
@@ -28,6 +21,7 @@
     <primary>Text</primary>
     <secondary>Tool</secondary>
   </indexterm>
+
   <figure>
     <title>
       <phrase>The Text tool in Toolbox</phrase>
@@ -38,6 +32,7 @@
       </imageobject>
     </mediaobject>
   </figure>
+
   <para>
     The Text tool places text into an image. When you click on an image with
     this tool the <emphasis>Text Editor dialog</emphasis> is opened where
@@ -45,15 +40,31 @@
     In the <emphasis>Text Option dialog</emphasis>, you can change the font,
     color and size of your text, and justify it, interactively.
   </para>
-  <para><!--TODO pl;-->
-    With the Move tool, you can move the text layer. But you must click on a
-    letter, and this is not always easy when letters are fine.
-    <!-- Hmm, zoom !? -->
+  <para>
+    A new possibility appeared with GIMP-2.6: click-dragging the
+    mouse pointer on the canvas draws a rectangular frame that you
+    can enlarge and move as you do with rectangular selections. The
+    text you type in the Text Editor is displayed in this frame and
+    automatically adapted to the frame size. You can adjust this frame
+    whenever you like.
+  </para>
+  <para>
+    When the mouse pointer is around the center of the frame, it
+    comes with a small move-cross
+    <guiicon>
+      <inlinemediaobject>
+        <imageobject>
+          <imagedata fileref="images/toolbox/stock-move-16.png"/>
+        </imageobject>
+      </inlinemediaobject>
+    </guiicon>.
+    Click-and-drag to move the frame and its contents (the text shows up when
+    you release the mouse button). The text remains at the same place in the
+    frame.
   </para>
+
   <sect3>
-    <title>
-      <phrase>Activate the Tool</phrase>
-    </title>
+    <title>Activating the Tool</title>
     <para>
       You can access this tool in several ways:
     </para>
@@ -61,13 +72,22 @@
       <listitem>
         <para>
           In the image menu through
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu>Te<accel>x</accel>t</guisubmenu></menuchoice>,
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Text</guisubmenu>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
           by clicking the tool icon
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-text-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata fileref="images/toolbox/stock-tool-text-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           in Toolbox,
         </para>
       </listitem>
@@ -92,16 +112,25 @@
         </imageobject>
       </mediaobject>
     </figure>
+
     <variablelist>
       <varlistentry>
         <term>Overview</term>
         <listitem>
           <para>
             The available tool options for the Text tool can be accessed
-            by double clicking the text tool icon:<guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-text-22.png"/></imageobject></inlinemediaobject></guiicon>
+            by double clicking the text tool icon:
+            <guiicon>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata fileref="images/toolbox/stock-tool-text-22.png"/>
+                </imageobject>
+              </inlinemediaobject>
+            </guiicon>
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Font</term>
         <listitem>
@@ -120,6 +149,7 @@
           </note>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Size</term>
         <listitem>
@@ -129,6 +159,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Hinting</term>
         <listitem>
@@ -147,6 +178,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Antialiasing</term>
         <listitem>
@@ -159,6 +191,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Color</term>
         <listitem>
@@ -175,6 +208,7 @@
           </tip>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Justify</term>
         <listitem>
@@ -187,6 +221,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Indent</term>
         <listitem>
@@ -199,6 +234,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Line Spacing</term>
         <listitem>
@@ -214,6 +250,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>Letter Spacing</term>
         <listitem>
@@ -225,6 +262,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry id="text-along-path">
         <term>Text along Path</term>
         <listitem>
@@ -249,7 +287,8 @@
             </title>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="images/menus/layer-text-commands.png" format="PNG"/>
+                <imagedata format="PNG"
+                           fileref="images/menus/layer-text-commands.png"/>
               </imageobject>
               <caption>
                 <para>
@@ -288,13 +327,14 @@
           </figure>
         </listitem>
       </varlistentry>
+
       <varlistentry id="text-to-path">
         <term>Create Path from Text</term>
         <listitem>
           <indexterm>
             <primary>Text to Path</primary>
           </indexterm>
-          <para><!--Changed 070404-->
+          <para>
             This tool creates a selection path from the selected text. Every
             letter is surrounded with a path component. So you can modify
             the shape of letters by moving path control points.
@@ -303,10 +343,9 @@
       </varlistentry>
     </variablelist>
   </sect3>
+
   <sect3 id="gimp-text-editor-dialog">
-    <title>
-      <phrase>Text Editor</phrase>
-    </title>
+    <title>Text Editor</title>
     <indexterm>
       <primary>Text</primary>
       <secondary>Editor</secondary>
@@ -331,28 +370,14 @@
         <listitem>
           <para>
             This dialog window is opened when you click on the image with the
-            Text Tool. It's a still basic text editor that nevertheless
-            allows you to write on several lines. Word wrap is not possible
-            - the text layer lengthens gradually - and you have to press the
-            <keycap>Enter</keycap> key to move to the next line.
-          </para>
-          <para>
-            The text you type appears interactively in the image. If the
-            option <quote>Show Layer Boundary</quote> is checked in the View
-            menu, this text will be surrounded with black and yellow dashes
-            that mark the layer boundary. Now look, it's not a selection:
-            if you want to move the text, you must click on the text itself
-            and not inside this frame only.
+            Text Tool. There, you can enter the text which shows up in real
+            time in the frame on top of the canvas.
           </para>
           <para>
             You can correct the text you are writing and you can change the
             text font with the Font Editor.
           </para>
           <para>
-            You can move the text by using the Move Tool, but you lose the
-            Editor then. You can re-edit this text as you will see now.
-          </para>
-          <para>
             As soon as you start writing, a Text layer is created in the Layer
             Dialog. On an image with such a layer (the image you are working
             on, or a .xcf image), you can resume text editing by activating
@@ -373,7 +398,7 @@
         <listitem>
           <para>
             Text can be loaded from a text file by clicking the folder icon in
-            the text editor.
+            the text editor. All the text in the file is loaded.
           </para>
         </listitem>
       </varlistentry>

Modified: trunk/src/toolbox/tool-threshold.xml
==============================================================================
--- trunk/src/toolbox/tool-threshold.xml	(original)
+++ trunk/src/toolbox/tool-threshold.xml	Fri Mar 13 13:43:01 2009
@@ -1,6 +1,7 @@
 <?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";>
 <!-- section history:
+  2009-03-11 j.h: revised for v2.6. Added Presets
   2008-01-05 j.h: updated to v2.4
   2007-06-06 kost: added 'no'
   2007-04-15 Added Spanish translation by AntI
@@ -12,18 +13,7 @@
 -->
 <!-- TODO: it zh_CN review needed -->
 <sect2 id="gimp-tool-threshold">
-<!--  <sect2info>
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2008-01-05</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Threshold</phrase>
-  </title>
+  <title>Threshold</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Threshold</secondary>
@@ -50,19 +40,33 @@
   </note>
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
     <para>
       You can access this tool from the image menu through
-      <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu><accel>C</accel>olor Tools</guisubmenu><guimenuitem><accel>T</accel>hreshold,</guimenuitem></menuchoice>,
+      <menuchoice>
+        <guimenu>Tools</guimenu>
+        <guisubmenu>Color Tools</guisubmenu>
+        <guimenuitem>Threshold,</guimenuitem>
+      </menuchoice>,
     </para>
-    <para><!--TODO es;it;pl; v2.4-->
+    <para>
       or through
-      <menuchoice><guimenu>Colors</guimenu><guimenuitem>Threshold</guimenuitem></menuchoice>,
+      <menuchoice>
+        <guimenu>Colors</guimenu>
+        <guimenuitem>Threshold</guimenuitem>
+      </menuchoice>,
     </para>
     <para>
       or by clicking on the
-      <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-threshold-22.png"/></imageobject></inlinemediaobject></guiicon>
+      <guiicon>
+        <inlinemediaobject>
+          <imageobject>
+            <imagedata
+              fileref="images/toolbox/stock-tool-threshold-22.png"/>
+          </imageobject>
+        </inlinemediaobject>
+      </guiicon>
       icon in Toolbox if this tool has been installed in it. You can do
       that through the <link linkend="gimp-tools-dialog">Tool dialog</link>.
     </para>
@@ -83,6 +87,24 @@
     </figure>
     <variablelist>
       <varlistentry>
+        <term>Presets</term>
+        <listitem>
+          <para>
+            You can save the color settings of your image by clicking the
+            <guibutton>Add settings to favourites</guibutton> button
+            <guiicon>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata fileref="images/toolbox/save-color-settings.png"/>
+                </imageobject>
+              </inlinemediaobject>
+            </guiicon>
+            and you can get a favourite preset back by selecting it in the
+            <guibutton>Pick a setting from the list</guibutton> button.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term>Threshold range</term>
         <listitem>
           <para>

Modified: trunk/src/toolbox/tool-transform.xml
==============================================================================
--- trunk/src/toolbox/tool-transform.xml	(original)
+++ trunk/src/toolbox/tool-transform.xml	Fri Mar 13 13:43:01 2009
@@ -28,7 +28,7 @@
       </imageobject>
     </mediaobject>
   </figure>
-  <para><!-- modified 2007-08-16-->
+  <para>
     Inside the Transformation tool dialog, you will find eight tools to modify
     the presentation of the image or the presentation of an element of the
     image, selection, layer or path. Each transform tool has an Option dialog
@@ -70,15 +70,27 @@
             <listitem>
               <para>
                 When you activate the first button
-                <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/tool-options/rotate-affect-layer.png"/></imageobject></inlinemediaobject></guiicon>
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="images/tool-options/rotate-affect-layer.png"/>
+                    </imageobject></inlinemediaobject>
+                </guiicon>
                 the tool works on the active layer. If no selection exists in
                 this layer, the whole layer will be transformed.
               </para>
             </listitem>
             <listitem>
-              <para><!--TODO es;it;pl "selection contour"-->
+              <para>
                 When you activate the second button
-                <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/tool-options/rotate-affect-selection.png"/></imageobject></inlinemediaobject></guiicon>
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                      fileref="images/tool-options/rotate-affect-selection.png"/>
+                    </imageobject></inlinemediaobject>
+                </guiicon>
                 the tool works on the selection contour only (the whole layer
                 contour if no selection).
               </para>
@@ -86,7 +98,14 @@
             <listitem>
               <para>
                 When you activate the third button,
-                <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/tool-options/rotate-affect-path.png"/></imageobject></inlinemediaobject></guiicon>
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="images/tool-options/rotate-affect-path.png"/>
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
                 the tool works on the path only.
               </para>
             </listitem>
@@ -97,7 +116,7 @@
         <term>Direction</term>
         <listitem>
           <para><guilabel>Direction</guilabel> sets which way or direction a
-            layer is transformed. The Traditional mode will transform the 
+            layer is transformed. The Traditional mode will transform the
             image or layer as one might expect. You just use the handles to do
             the  transformation that want to see happen on the image or layer
             on the grid. When you then execute the transformation the image or
@@ -121,7 +140,8 @@
             The <guilabel>Interpolation</guilabel> drop-down list lets
             you choose the quality of the transformation. For more
             information about the different methods that can be employed,
-            see the glossary entry <link linkend="glossary-interpolation">Interpolation</link>.
+            see the glossary entry
+            <link linkend="glossary-interpolation">Interpolation</link>.
           </para>
         </listitem>
       </varlistentry>
@@ -177,7 +197,10 @@
                   With Adjust: the layer is enlarged to contain all the
                   rotated layer. The new layer border is visible; the whole
                   layer becomes visible by using the
-                  <menuchoice><guimenu>Image</guimenu><guimenuitem>Fit Canvas to Layers</guimenuitem></menuchoice>
+                  <menuchoice>
+                    <guimenu>Image</guimenu>
+                    <guimenuitem>Fit Canvas to Layers</guimenuitem>
+                  </menuchoice>
                   command.
                 </para>
               </listitem>
@@ -309,7 +332,7 @@
               </listitem>
             </varlistentry>
           </variablelist>
-          <para><!-- 2008-01-06 Adapted to Transform tools-->
+          <para>
             Preview is only for greater convenience. Whatever your choice,
             result will be the same when you validate the transformation.
           </para>

Modified: trunk/src/toolbox/tool-zoom.xml
==============================================================================
--- trunk/src/toolbox/tool-zoom.xml	(original)
+++ trunk/src/toolbox/tool-zoom.xml	Fri Mar 13 13:43:01 2009
@@ -1,6 +1,7 @@
 <?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";>
 <!-- section history:
+  2009 j.h: review for v2.6. No change
   2008-02-28 j.h: added Ctrl+mouse wheel en;fr
   2007-12-21 j.h: updated to v2.4. One option is deprecated
   2007-06-05 kost: added 'no'
@@ -13,18 +14,7 @@
   050818 de reviewed by axel.wernicke
 -->
 <sect2 id="gimp-tool-zoom">
-<!--  <sect2info role="cvs">
-    <revhistory>
-      <revision>
-        <revnumber>$Revision$</revnumber>
-        <date>2007-12-21</date>
-        <authorinitials>j.h</authorinitials>
-      </revision>
-    </revhistory>
-  </sect2info>-->
-  <title>
-    <phrase>Magnify</phrase>
-  </title>
+  <title>Magnify</title>
   <indexterm>
     <primary>Tools</primary>
     <secondary>Magnify</secondary>
@@ -60,19 +50,29 @@
   </para>
   <sect3>
     <title>
-      <phrase>Activate the Tool</phrase>
+      <phrase>Activating the Tool</phrase>
     </title>
     <itemizedlist>
       <listitem>
         <para>
           You can get to the Magnify Tool from the image-menu through :
-          <menuchoice><guimenu><accel>T</accel>ools</guimenu><guisubmenu>M<accel>a</accel>gnify</guisubmenu></menuchoice>,
+          <menuchoice>
+            <guimenu>Tools</guimenu>
+            <guisubmenu>Magnify</guisubmenu>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>
         <para>
           or by clicking the tool icon:
-          <guiicon><inlinemediaobject><imageobject><imagedata fileref="images/toolbox/stock-tool-zoom-22.png"/></imageobject></inlinemediaobject></guiicon>
+          <guiicon>
+            <inlinemediaobject>
+              <imageobject>
+                <imagedata
+                  fileref="images/toolbox/stock-tool-zoom-22.png"/>
+              </imageobject>
+            </inlinemediaobject>
+          </guiicon>
           in Toolbox.
         </para>
       </listitem>
@@ -138,7 +138,7 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term>Allow Window Resizing</term>
+        <term>Auto-resize window</term>
         <listitem>
           <para>
             This option will allow the canvas to be resized if the zoom level

Modified: trunk/src/toolbox/tools-color.xml
==============================================================================
--- trunk/src/toolbox/tools-color.xml	(original)
+++ trunk/src/toolbox/tools-color.xml	Fri Mar 13 13:43:01 2009
@@ -1,6 +1,7 @@
 <?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";>
 <!-- section history:
+  2009-03-12 j.h: added tool-desaturate
   2007-06-06 kost: added 'no'
   2007-04-15 Added Spanish translation by AntI
   20050807 de reviewed by axel.wernicke
@@ -17,4 +18,5 @@
   <xi:include href="tool-levels.xml"/>
   <xi:include href="tool-curves.xml"/>
   <xi:include href="tool-posterize.xml"/>
+  <xi:include href="tool-desaturate.xml"/>
 </sect1>



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