gimp-help-2 r2336 - in trunk: . images/toolbox src/concepts src/dialogs src/filters/animation src/filters/artistic src/filters/decor src/filters/map src/menus src/menus/colors src/menus/colors/map src/toolbox src/tutorial src/using src/using/preferences



Author: axelw
Date: Fri Feb  1 23:02:34 2008
New Revision: 2336
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2336&view=rev

Log:
2008-02-02  Axel Wernicke  <axel wernicke gmail com>

	* src/dialogs/color-dialog.xml
	* src/dialogs/palettes-dialog.xml
	* src/using/layers.xml
	* src/using/preferences/prefs-folders-data.xml
	* src/using/selections.xml
	* src/using/brushes.xml
	* src/toolbox/tool-move.xml
	* src/toolbox/tool-text.xml
	* src/toolbox/tool-scale.xml
	* src/toolbox/tool-align.xml
	* src/menus/edit-stroke-path.xml
	* src/menus/layer-mask-disable.xml
	* src/menus/edit-paste-as-pattern.xml
	* src/menus/selection-shrink.xml
	* src/menus/selection-none.xml
	* src/menus/file-save-as-template.xml
	* src/menus/layer-mask-apply.xml
	* src/menus/view-show-guides.xml
	* src/menus/layer-delete.xml
	* src/menus/layer-bottom.xml
	* src/menus/layer-next.xml
	* src/menus/layer-mask-edit.xml
	* src/menus/selection-sharpen.xml
	* src/menus/selection-invert.xml
	* src/menus/selection-feather.xml
	* src/menus/colors/desaturate.xml
	* src/menus/colors/invert.xml
	* src/menus/colors/map/exchange.xml
	* src/menus/colors/map/palettemap.xml
	* src/menus/image-convert-rgb.xml
	* src/menus/image-autocrop.xml
	* src/menus/edit-stroke-selection.xml
	* src/menus/edit-paste-as-brush.xml
	* src/menus/layer-stretch-commands.xml
	* src/menus/xtns-unit-editor.xml
	* src/menus/layer-mask-delete.xml
	* src/menus/image-convert-grayscale.xml
	* src/menus/layer-mask-add.xml
	* src/menus/image-convert-indexed.xml
	* src/menus/image-scale.xml
	* src/menus/layer-merge-down.xml
	* src/menus/layer-mask-show.xml
	* src/menus/layer-previous.xml
	* src/menus/selection-grow.xml
	* src/menus/view-show-selection.xml
	* src/menus/layer-top.xml
	* src/tutorial/quickies.xml
	* src/filters/animation/optimize.xml
	* src/filters/animation/playback.xml
	* src/filters/artistic/predator.xml
	* src/filters/decor/carve-it.xml
	* src/filters/map/introduction.xml
	* src/filters/map/displace.xml
	* src/filters/map/fractal-trace.xml
	* src/filters/map/smalltiles.xml
	* src/filters/map/illusion.xml
	* src/concepts/palettes.xml
	* src/concepts/docks.xml
	* src/concepts/images.xml
	* src/concepts/qmask.xml
	* src/concepts/concepts.xml: minor enhancements, mostly fixes to de, en and
	fixes to indexterms for de

	* src/toolbox/tool-transform.xml
	* images/dialogs/layers_overview.png
	* images/toolbox/clip-adjust2.png
	* images/toolbox/clip-crop.png
	* images/toolbox/clip-adjust.png
	* images/toolbox/clip-orig.png: reorganized clipping section

Added:
   trunk/images/toolbox/clip-adjust.png   (contents, props changed)
   trunk/images/toolbox/clip-adjust2.png   (contents, props changed)
   trunk/images/toolbox/clip-crop.png   (contents, props changed)
   trunk/images/toolbox/clip-orig.png   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/src/concepts/concepts.xml
   trunk/src/concepts/docks.xml
   trunk/src/concepts/images.xml
   trunk/src/concepts/palettes.xml
   trunk/src/concepts/qmask.xml
   trunk/src/dialogs/color-dialog.xml
   trunk/src/dialogs/palettes-dialog.xml
   trunk/src/filters/animation/optimize.xml
   trunk/src/filters/animation/playback.xml
   trunk/src/filters/artistic/predator.xml
   trunk/src/filters/decor/carve-it.xml
   trunk/src/filters/map/displace.xml
   trunk/src/filters/map/fractal-trace.xml
   trunk/src/filters/map/illusion.xml
   trunk/src/filters/map/introduction.xml
   trunk/src/filters/map/smalltiles.xml
   trunk/src/menus/colors/desaturate.xml
   trunk/src/menus/colors/invert.xml
   trunk/src/menus/colors/map/exchange.xml
   trunk/src/menus/colors/map/palettemap.xml
   trunk/src/menus/edit-paste-as-brush.xml
   trunk/src/menus/edit-paste-as-pattern.xml
   trunk/src/menus/edit-stroke-path.xml
   trunk/src/menus/edit-stroke-selection.xml
   trunk/src/menus/file-save-as-template.xml
   trunk/src/menus/image-autocrop.xml
   trunk/src/menus/image-convert-grayscale.xml
   trunk/src/menus/image-convert-indexed.xml
   trunk/src/menus/image-convert-rgb.xml
   trunk/src/menus/image-scale.xml
   trunk/src/menus/layer-bottom.xml
   trunk/src/menus/layer-delete.xml
   trunk/src/menus/layer-mask-add.xml
   trunk/src/menus/layer-mask-apply.xml
   trunk/src/menus/layer-mask-delete.xml
   trunk/src/menus/layer-mask-disable.xml
   trunk/src/menus/layer-mask-edit.xml
   trunk/src/menus/layer-mask-show.xml
   trunk/src/menus/layer-merge-down.xml
   trunk/src/menus/layer-next.xml
   trunk/src/menus/layer-previous.xml
   trunk/src/menus/layer-stretch-commands.xml
   trunk/src/menus/layer-top.xml
   trunk/src/menus/selection-feather.xml
   trunk/src/menus/selection-grow.xml
   trunk/src/menus/selection-invert.xml
   trunk/src/menus/selection-none.xml
   trunk/src/menus/selection-sharpen.xml
   trunk/src/menus/selection-shrink.xml
   trunk/src/menus/view-show-guides.xml
   trunk/src/menus/view-show-selection.xml
   trunk/src/menus/xtns-unit-editor.xml
   trunk/src/toolbox/tool-align.xml
   trunk/src/toolbox/tool-move.xml
   trunk/src/toolbox/tool-scale.xml
   trunk/src/toolbox/tool-text.xml
   trunk/src/toolbox/tool-transform.xml
   trunk/src/tutorial/quickies.xml
   trunk/src/using/brushes.xml
   trunk/src/using/layers.xml
   trunk/src/using/preferences/prefs-folders-data.xml
   trunk/src/using/selections.xml

Added: trunk/images/toolbox/clip-adjust.png
==============================================================================
Binary file. No diff available.

Added: trunk/images/toolbox/clip-adjust2.png
==============================================================================
Binary file. No diff available.

Added: trunk/images/toolbox/clip-crop.png
==============================================================================
Binary file. No diff available.

Added: trunk/images/toolbox/clip-orig.png
==============================================================================
Binary file. No diff available.

Modified: trunk/src/concepts/concepts.xml
==============================================================================
--- trunk/src/concepts/concepts.xml	(original)
+++ trunk/src/concepts/concepts.xml	Fri Feb  1 23:02:34 2008
@@ -54,43 +54,23 @@
     <phrase lang="zh_CN">GIMP åææå</phrase>
   </title>
 
-  <indexterm lang="en;fr">
-    <primary>Concepts</primary>
-  </indexterm>
-  <indexterm lang="cs">
-    <primary>MyÅlenky</primary>
-  </indexterm>
+  <indexterm lang="en;fr"><primary>Concepts</primary></indexterm>
+  <indexterm lang="cs"><primary>MyÅlenky</primary></indexterm>
   
   <indexterm lang="de"><primary>Bild</primary></indexterm>
   <indexterm lang="de"><primary>Ebene</primary></indexterm>
   <indexterm lang="de"><primary>Kanal</primary></indexterm>
   <indexterm lang="de"><primary>Erweiterung</primary></indexterm>
 
-  <indexterm lang="es">
-    <primary>Conceptos</primary>
-  </indexterm>
-  <indexterm lang="hr">
-    <primary>Koncepti</primary>
-  </indexterm>
-  <indexterm lang="nl">
-    <primary>principes</primary>
-  </indexterm>
-  <indexterm lang="it">
-    <primary>Concetti</primary>
-  </indexterm>
-  <indexterm lang="ko">
-    <primary>êëë</primary>
-  </indexterm>
-  <indexterm lang="no">
-    <primary>Konseptet</primary>
-  </indexterm>
-  <indexterm lang="ru">
-    <primary>ÐÑÐÐÑÐÐÑ</primary>
-  </indexterm>
+  <indexterm lang="es"><primary>Conceptos</primary></indexterm>
+  <indexterm lang="hr"><primary>Koncepti</primary></indexterm>
+  <indexterm lang="nl"><primary>principes</primary></indexterm>
+  <indexterm lang="it"><primary>Concetti</primary></indexterm>
+  <indexterm lang="ko"><primary>êëë</primary></indexterm>
+  <indexterm lang="no"><primary>Konseptet</primary></indexterm>
+  <indexterm lang="ru"><primary>ÐÑÐÐÑÐÐÑ</primary></indexterm>
   <indexterm lang="ru"><primary>ÐÐÐÑÐÐÑÐÐ</primary></indexterm>
-  <indexterm lang="zh_CN">
-    <primary>GIMP</primary>
-  </indexterm>
+  <indexterm lang="zh_CN"><primary>GIMP</primary></indexterm>
 
   <para lang="en">
     This section is intended to give you a brief introduction to the basic

Modified: trunk/src/concepts/docks.xml
==============================================================================
--- trunk/src/concepts/docks.xml	(original)
+++ trunk/src/concepts/docks.xml	Fri Feb  1 23:02:34 2008
@@ -68,7 +68,7 @@
 
   <indexterm lang="de"><primary>Docken</primary></indexterm>
   <indexterm lang="de">
-    <primary>Dialog</primary><secondary>Docken</secondary>
+    <primary>Dialog</primary><secondary>docken</secondary>
   </indexterm>
 
   <indexterm lang="es"><primary>Empotrable</primary></indexterm>

Modified: trunk/src/concepts/images.xml
==============================================================================
--- trunk/src/concepts/images.xml	(original)
+++ trunk/src/concepts/images.xml	Fri Feb  1 23:02:34 2008
@@ -62,7 +62,7 @@
   </indexterm>
 
   <indexterm lang="de">
-    <primary>Bilddateien</primary><secondary>Erstellen</secondary>
+    <primary>Bilddateien</primary><secondary>erstellen</secondary>
   </indexterm>
 
   <indexterm lang="es">

Modified: trunk/src/concepts/palettes.xml
==============================================================================
--- trunk/src/concepts/palettes.xml	(original)
+++ trunk/src/concepts/palettes.xml	Fri Feb  1 23:02:34 2008
@@ -69,54 +69,30 @@
   </title>
 
   <indexterm lang="en;fr">
-    <primary>Palette</primary>
-    <secondary>Introduction</secondary>
+    <primary>Palette</primary><secondary>Introduction</secondary>
   </indexterm>
   <indexterm lang="en">
-    <primary>Color</primary>
-    <secondary>Palettes (color map)</secondary>
-  </indexterm>
-  <indexterm lang="en">
-    <primary>Indexed palette</primary>
+    <primary>Color</primary><secondary>Palettes (color map)</secondary>
   </indexterm>
+  <indexterm lang="en"><primary>Indexed palette</primary></indexterm>
 
-  <indexterm lang="cs">
-    <primary>Palety</primary>
-  </indexterm>
-  <indexterm lang="de">
-    <primary>Farbpaletten</primary>
-  </indexterm>
-  <indexterm lang="es">
-    <primary>Paletas</primary>
-  </indexterm>
+  <indexterm lang="cs"><primary>Palety</primary></indexterm>
+  <indexterm lang="de"><primary>Farbpalette</primary></indexterm>
+  <indexterm lang="es"><primary>Paletas</primary></indexterm>
 
   <indexterm lang="fr">
-    <primary>Couleur</primary>
-    <secondary>Palettes</secondary>
-  </indexterm>
-  <indexterm lang="fr">
-    <primary>Palette indexÃe</primary>
+    <primary>Couleur</primary><secondary>Palettes</secondary>
   </indexterm>
+  <indexterm lang="fr"><primary>Palette indexÃe</primary></indexterm>
 
-  <indexterm lang="it">
-    <primary>Tavolozze</primary>
-  </indexterm>
+  <indexterm lang="it"><primary>Tavolozze</primary></indexterm>
   <indexterm lang="ko">
-    <primary>ììí</primary>
-    <secondary>ìê</secondary>
-  </indexterm>
-  <indexterm lang="nl">
-    <primary>Paletten</primary>
-  </indexterm>
-  <indexterm lang="no">
-    <primary>Palettar</primary>
-  </indexterm>
-  <indexterm lang="ru">
-    <primary>ÐÐÐÐÑÑÑ</primary>
-  </indexterm>
-  <indexterm lang="zh_CN">
-    <primary>èæ</primary>
+    <primary>ììí</primary><secondary>ìê</secondary>
   </indexterm>
+  <indexterm lang="nl"><primary>Paletten</primary></indexterm>
+  <indexterm lang="no"><primary>Palettar</primary></indexterm>
+  <indexterm lang="ru"><primary>ÐÐÐÐÑÑÑ</primary></indexterm>
+  <indexterm lang="zh_CN"><primary>èæ</primary></indexterm>
 
   <para lang="en">
     A <emphasis>palette</emphasis> is a set of discrete colors. In GIMP,

Modified: trunk/src/concepts/qmask.xml
==============================================================================
--- trunk/src/concepts/qmask.xml	(original)
+++ trunk/src/concepts/qmask.xml	Fri Feb  1 23:02:34 2008
@@ -70,10 +70,10 @@
   <indexterm lang="de"><primary>Schnellmaske</primary></indexterm>
   <indexterm lang="de"><primary>Auswahl</primary></indexterm>
   <indexterm lang="de"><primary>Auswahlmaske</primary></indexterm>
-
   <indexterm lang="de">
-    <primary>Auswahl</primary><secondary>Erstellen</secondary>
+    <primary>Auswahl</primary><secondary>erstellen</secondary>
   </indexterm>
+
   <indexterm lang="es"><primary>MÃscara rÃpida</primary></indexterm>
   <indexterm lang="fr"><primary>Masque Rapide</primary></indexterm>
   <indexterm lang="it"><primary>Maschera veloce</primary></indexterm>

Modified: trunk/src/dialogs/color-dialog.xml
==============================================================================
--- trunk/src/dialogs/color-dialog.xml	(original)
+++ trunk/src/dialogs/color-dialog.xml	Fri Feb  1 23:02:34 2008
@@ -1108,9 +1108,7 @@
           <indexterm lang="en">
             <primary>Palette Color Selector</primary>
           </indexterm>
-          <indexterm lang="de">
-            <primary>Farbpalette (FarbwÃhler)</primary>
-          </indexterm>
+          <indexterm lang="de"><primary>Farbpalette</primary></indexterm>
           <indexterm lang="fr"><!--CHECK fr-->
             <primary>Palette : SÃlecteur de couleur</primary>
           </indexterm>

Modified: trunk/src/dialogs/palettes-dialog.xml
==============================================================================
--- trunk/src/dialogs/palettes-dialog.xml	(original)
+++ trunk/src/dialogs/palettes-dialog.xml	Fri Feb  1 23:02:34 2008
@@ -59,116 +59,60 @@
   <indexterm lang="en">
     <primary>Dialogs</primary><secondary>Palettes</secondary></indexterm>
   <indexterm lang="en">
-    <primary>Palette</primary>
-    <secondary>Dialog</secondary>
+    <primary>Palette</primary><secondary>Dialog</secondary>
   </indexterm>
   <indexterm lang="en">
-    <primary>Color</primary>
-    <secondary>Color palettes</secondary>
+    <primary>Color</primary><secondary>Color palettes</secondary>
   </indexterm>
 
   <indexterm lang="cs">
-    <primary>Dialog</primary>
-    <secondary>Palety</secondary>
+    <primary>Dialog</primary><secondary>Palety</secondary>
   </indexterm>
+
   <indexterm lang="de"><primary>Paletten</primary></indexterm>
-  <indexterm lang="de"><primary>Farbpaletten</primary></indexterm>
+  <indexterm lang="de"><primary>Farbpalette</primary></indexterm>
+
   <indexterm lang="es">
-    <primary>DiÃlogos</primary>
-    <secondary>Paletas</secondary>
+    <primary>DiÃlogos</primary><secondary>Paletas</secondary>
   </indexterm>
+  <indexterm lang="es"><primary>Paletas</primary></indexterm>
 
   <indexterm lang="fr">
-    <primary>Dialogues</primary>
-    <secondary>Palettes</secondary>
+    <primary>Dialogues</primary><secondary>Palettes</secondary>
   </indexterm>
   <indexterm lang="fr">
-    <primary>Palette</primary>
-    <secondary>FenÃtre de dialogue</secondary>
+    <primary>Palette</primary><secondary>FenÃtre de dialogue</secondary>
   </indexterm>
   <indexterm lang="fr">
-    <primary>Couleur</primary>
-    <secondary>Palettes de couleurs</secondary>
+    <primary>Couleur</primary><secondary>Palettes de couleurs</secondary>
   </indexterm>
 
   <indexterm lang="it">
-    <primary>Finestre</primary>
-    <secondary>Tavolozze</secondary>
+    <primary>Finestre</primary><secondary>Tavolozze</secondary>
   </indexterm>
+  <indexterm lang="it"><primary>Tavolozze</primary></indexterm>
+
   <indexterm lang="lt">
     <primary>Dialogai</primary><secondary>PaletÄs</secondary></indexterm>
   <indexterm lang="lt">
-    <primary>PaletÄ</primary>
-    <secondary>Dialogas</secondary>
+    <primary>PaletÄ</primary><secondary>Dialogas</secondary>
   </indexterm>
   <indexterm lang="lt">
-    <primary>Spalva</primary>
-    <secondary>SpalvÅ paletÄs</secondary>
+    <primary>Spalva</primary><secondary>SpalvÅ paletÄs</secondary>
   </indexterm>
+
   <indexterm lang="no">
-    <primary>Dialogar</primary>
-    <secondary>Palettar</secondary>
+    <primary>Dialogar</primary><secondary>Palettar</secondary>
   </indexterm>
+  <indexterm lang="no"><primary>Palettar</primary></indexterm>
+
   <indexterm lang="ru">
-    <primary>ÐÐÐÐÐÐÐ</primary>
-    <secondary>ÐÐÐÐÑÑÑ</secondary>
+    <primary>ÐÐÐÐÐÐÐ</primary><secondary>ÐÐÐÐÑÑÑ</secondary>
   </indexterm>
   <indexterm lang="zh_CN">
-    <primary>åèæ</primary>
-    <secondary>èæ</secondary>
-  </indexterm>
-
-  <indexterm lang="es">
-    <primary>Paletas</primary>
-  </indexterm>
-  <indexterm lang="it">
-    <primary>Tavolozze</primary>
+    <primary>åèæ</primary><secondary>èæ</secondary>
   </indexterm>
-  <indexterm lang="no">
-    <primary>Palettar</primary>
-  </indexterm>
-<!--Not to be repeated
-  <figure>
-    <title>
-      <phrase lang="en">The Palettes dialog</phrase>
-      <phrase lang="cs">Dialog palety</phrase>
-      <phrase lang="de">Ansicht des Dialoges <quote>Farbpaletten</quote></phrase>
-      <phrase lang="es">El diÃlogo <quote>Paletas</quote></phrase>
-      <phrase lang="fr">Le dialogue des palettes</phrase>
-      <phrase lang="it">La finestra delle tavolozze</phrase>
-      <phrase lang="no">Palettdialogen</phrase>
-      <phrase lang="ru">ÐÐÐÐÐÐ ÐÐÐÐÑÑ</phrase>
-      <phrase lang="zh_CN">èæåèæ</phrase>
-    </title>
 
-    <mediaobject>
-      <imageobject lang="en;cs;de;es">
-        <imagedata fileref='../images/dialogs/dialogs-palettes.png'
-          format="PNG" />
-      </imageobject>
-      <imageobject lang="fr">
-        <imagedata fileref='../images/dialogs/fr/dialogs-palettes.png'
-          format="PNG" />
-      </imageobject>
-      <imageobject lang="it">
-        <imagedata fileref='../images/dialogs/it/dialogs-palettes.png'
-          format="PNG" />
-      </imageobject>
-      <imageobject lang="no">
-        <imagedata fileref='../images/dialogs/no/dialogs-palettes.png'
-          format="PNG" />
-      </imageobject>
-      <imageobject lang="ru">
-        <imagedata fileref='../images/dialogs/ru/dialogs-palettes.png'
-          format="PNG" />
-      </imageobject>
-      <imageobject lang="zh_CN">
-        <imagedata fileref='../images/dialogs/zh_CN/dialogs-palettes.png'
-          format="PNG" />
-      </imageobject>
-    </mediaobject>
-  </figure>
--->
 
   <para lang="en">
     A <emphasis>palette</emphasis> is a set of discrete colors, in no

Modified: trunk/src/filters/animation/optimize.xml
==============================================================================
--- trunk/src/filters/animation/optimize.xml	(original)
+++ trunk/src/filters/animation/optimize.xml	Fri Feb  1 23:02:34 2008
@@ -47,23 +47,19 @@
 
   <indexterm lang="en">
     <primary>Filters</primary>
-    <secondary>Animation</secondary>
-    <tertiary>Optimize</tertiary>
+    <secondary>Animation</secondary><tertiary>Optimize</tertiary>
   </indexterm>
   <indexterm lang="en">
-    <primary>Animation</primary>
-    <secondary>Optimize animation</secondary>
+    <primary>Animation</primary><secondary>Optimize animation</secondary>
   </indexterm>
   <indexterm lang="en"><primary>Optimize</primary></indexterm>
 
   <indexterm lang="de">
     <primary>Filter</primary><secondary>Animation</secondary>
   </indexterm>
+  <indexterm lang="de"><primary>Optimieren (Animation)</primary></indexterm>
   <indexterm lang="de">
-    <primary>Filter</primary><secondary>Optimieren (Animation)</secondary>
-  </indexterm>
-  <indexterm lang="de">
-    <primary>Animation</primary><secondary>Optimieren</secondary>
+    <primary>Animation</primary><secondary>optimieren</secondary>
   </indexterm>
 
   <indexterm lang="es">

Modified: trunk/src/filters/animation/playback.xml
==============================================================================
--- trunk/src/filters/animation/playback.xml	(original)
+++ trunk/src/filters/animation/playback.xml	Fri Feb  1 23:02:34 2008
@@ -61,7 +61,7 @@
     <primary>Filter</primary><secondary>Animation</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary>Animation</primary><secondary>Abspielen</secondary>
+    <primary>Animation</primary><secondary>abspielen</secondary>
   </indexterm>
   <indexterm lang="de"><primary>Playback</primary></indexterm>
 

Modified: trunk/src/filters/artistic/predator.xml
==============================================================================
--- trunk/src/filters/artistic/predator.xml	(original)
+++ trunk/src/filters/artistic/predator.xml	Fri Feb  1 23:02:34 2008
@@ -85,7 +85,6 @@
   
   <indexterm lang="ru">
     <primary>ÐÐÐÑÑÑÑ</primary><secondary>ÐÐÐÑÐÑÐÑ</secondary>
-    <tertiary></tertiary>
   </indexterm>
   <indexterm lang="ru"><primary><!-- Filter name ru --></primary></indexterm>
 

Modified: trunk/src/filters/decor/carve-it.xml
==============================================================================
--- trunk/src/filters/decor/carve-it.xml	(original)
+++ trunk/src/filters/decor/carve-it.xml	Fri Feb  1 23:02:34 2008
@@ -66,9 +66,7 @@
   <indexterm lang="en"><primary>Stencil Carve</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Filter</primary>
-    <secondary>Dekorationn</secondary>
-    <!--tertiary>Schablone einritzen</tertiary-->
+    <primary>Filter</primary><secondary>Dekoration</secondary>
   </indexterm>
   <indexterm lang="de"><primary>Schablone einritzen</primary></indexterm>
 

Modified: trunk/src/filters/map/displace.xml
==============================================================================
--- trunk/src/filters/map/displace.xml	(original)
+++ trunk/src/filters/map/displace.xml	Fri Feb  1 23:02:34 2008
@@ -172,16 +172,15 @@
             160, 110 bzw. 60.
           </para>
           <para lang="es">
-            Las Ãreas de la imagen correspondientes a un gris claro
-            (&ge;128) fueron desplazados 19 y 8 pÃxeles a la izquierda.
-            Las Ãreas de la imagen correspondientes a un gris oscuro
-            (&le;127) fueron desplazados 4 y 15 pÃxeles a la derecha
+            Las Ãreas de la imagen correspondientes a un gris claro (&ge;128)
+            fueron desplazados 19 y 8 pÃxeles a la izquierda. Las Ãreas de la
+            imagen correspondientes a un gris oscuro (&le;127) fueron
+            desplazados 4 y 15 pÃxeles a la derecha
           </para>
           <para lang="fr">
-            On voit que les bandes de gris clair (&gt;127.5) ont ÃtÃ
-            dÃplacÃes de 19 et 8 pixels vers la gauche. Les bandes de gris
-            foncà (&lt;127.5) ont Ãtà dÃplacÃes de 4 et 15 pixels vers la
-            droite.
+            On voit que les bandes de gris clair (&gt;127.5) ont Ãtà dÃplacÃes
+            de 19 et 8 pixels vers la gauche. Les bandes de gris foncÃ
+            (&lt;127.5) ont Ãtà dÃplacÃes de 4 et 15 pixels vers la droite.
           </para>
           <para lang="it">
             Si noti come le aree dell'immagine corrispondenti al grigio chiaro
@@ -222,10 +221,9 @@
           </para>
           <para lang="es">
             El coeficiente de desplazamiento X es 30 ( con un coeficiente
-            negativo el desplazamiento serÃa inverso). Los pÃxeles
-            desocupados son negros. El mapa de desplazamiento tienen
-            cuatro bandas grises con valores de 210, 160, 110, y 60,
-            respectivamente.
+            negativo el desplazamiento serÃa inverso). Los pÃxeles desocupados
+            son negros. El mapa de desplazamiento tienen cuatro bandas grises
+            con valores de 210, 160, 110, y 60, respectivamente.
           </para>
           <para lang="fr">
             Le coefficient de dÃplacement X est de 30 (avec un coefficient
@@ -454,19 +452,18 @@
 
         <listitem>
           <para lang="fr">
-            En choisissant l'une et/ou l'autre des deux options, les pixels
-            du calque actif correspondant aux pixels de la carte de
-            dÃplacement, seront dÃplacÃs horizontalement (H) et/ou
-            verticalement (V). La direction et l'importance du dÃplacement
-            dÃpendent de l'intensità des pixels correspondants dans la
-            carte de dÃplacement.
+            En choisissant l'une et/ou l'autre des deux options, les pixels du
+            calque actif correspondant aux pixels de la carte de dÃplacement,
+            seront dÃplacÃs horizontalement (H) et/ou verticalement (V). La
+            direction et l'importance du dÃplacement dÃpendent de l'intensitÃ
+            des pixels correspondants dans la carte de dÃplacement.
           </para>
           <para lang="fr">
             La carte, qui doit Ãtre une image en niveaux de gris, a 256
             niveaux de gris. La valeur moyenne thÃorique est 127.5. Le filtre
             dÃplace les pixels de l'image correspondant aux pixels de valeur
-            infÃrieure à 127.5 (0-127) dans la carte, vers la droite pour X
-            et vers le bas pour Y. Il dÃplace les pixels correspondants aux
+            infÃrieure à 127.5 (0-127) dans la carte, vers la droite pour X et
+            vers le bas pour Y. Il dÃplace les pixels correspondants aux
             pixels de valeur 128-255 vers la gauche pour X et vers le haut
             pour Y.
           </para>
@@ -552,16 +549,15 @@
             vertical, et vertical pour un dÃplacement horizontal.
           </para>
           <para lang="ru">
-            ÐÐÑÐÐ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÐÑ ÑÐÐÑÐÐ, ÐÑ ÐÐÐÐÑÐ ÐÑÐÑÐÑÑ ÐÐÑÑÑ
-            ÐÐÐÐÑÐÐÐÑ. ÐÐÑ ÑÐÐÐ, ÑÑÐÐÑ ÐÐÑÐÐÑÑÑÑ Ð ÑÑÐÐ ÑÐÐÑÐÐ, ÐÐÐÐÑÐÐÐÐÐÐ
-            ÐÐÐÐÐ ÐÑÐÐÑÐÑÑ ÐÐÑÐ ÑÑÐÐÐÐÑÐ. ÐÐ-ÐÐÑÐÑÑ, ÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÑÑÑ
-            ÐÑÐÑÑÑÐ ÐÐ ÐÐÐÐÐÑ ÐÐÑÐÐÐÑÐÐ ÑÐÐÑÑÑÐ. ÐÐ-ÐÑÐÑÑÑ, ÑÐÐÐÐÑ
-            ÐÐÐÐÑÐÐÐÐÐÑ ÐÐÐÐÐÐ ÐÑÑÑ ÑÐÑ ÐÐ, ÑÑÐ Ð Ñ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ.
-            ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐ, ÑÑÐ ÐÑÐÐÑ ÐÐÐÐÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ,
-            ÐÑÐÐÐÑÐÐÐÐÐÐÐÐÑ Ð ÑÐÑÐÐ Ð Ñ ÐÑÐÐÐÐÐÑÐÐ. ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐÐÑÑ
-            ÐÐÐÐÑÐÐÐÐÐÑ RGB, ÐÐ ÐÐ-ÐÐ ÑÐÐÐ, ÐÐÐ ÑÑÐÐÑÑÑ ÐÑÐÐÑÑÐÐÐÐÐÐ Ð
-            ÐÐÐÐÑÐÐÐÐÐÐ, ÑÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÑÑ ÑÐÐÑÐÑÑÐÑ. ÐÐÑÐÐÐÐÑÐÐÑÐÐÑ ÐÐÑÑÐ
-            ÐÐÐÐÑ ÐÑÐÐÑÐÑÑÑ ÐÑ ÐÐÑÑÐÐÐÐÑÐÐÐ.
+            ÐÐÑÐÐ ÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐÐÑ ÑÐÐÑÐÐ, ÐÑ ÐÐÐÐÑÐ ÐÑÐÑÐÑÑ ÐÐÑÑÑ ÐÐÐÐÑÐÐÐÑ.
+            ÐÐÑ ÑÐÐÐ, ÑÑÐÐÑ ÐÐÑÐÐÑÑÑÑ Ð ÑÑÐÐ ÑÐÐÑÐÐ, ÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐ
+            ÐÑÐÐÑÐÑÑ ÐÐÑÐ ÑÑÐÐÐÐÑÐ. ÐÐ-ÐÐÑÐÑÑ, ÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÑÑÑ ÐÑÐÑÑÑÐ
+            ÐÐ ÐÐÐÐÐÑ ÐÐÑÐÐÐÑÐÐ ÑÐÐÑÑÑÐ. ÐÐ-ÐÑÐÑÑÑ, ÑÐÐÐÐÑ ÐÐÐÐÑÐÐÐÐÐÑ ÐÐÐÐÐÐ
+            ÐÑÑÑ ÑÐÑ ÐÐ, ÑÑÐ Ð Ñ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ. ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐ, ÑÑÐ
+            ÐÑÐÐÑ ÐÐÐÐÑ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÑ, ÐÑÐÐÐÑÐÐÐÐÐÐÐÐÑ Ð ÑÐÑÐÐ Ð Ñ
+            ÐÑÐÐÐÐÐÑÐÐ. ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐÐÐÑ RGB, ÐÐ ÐÐ-ÐÐ ÑÐÐÐ,
+            ÐÐÐ ÑÑÐÐÑÑÑ ÐÑÐÐÑÑÐÐÐÐÐÐ Ð ÐÐÐÐÑÐÐÐÐÐÐ, ÑÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÑÑ
+            ÑÐÐÑÐÑÑÐÑ. ÐÐÑÐÐÐÐÑÐÐÑÐÐÑ ÐÐÑÑÐ ÐÐÐÐÑ ÐÑÐÐÑÐÑÑÑ ÐÑ ÐÐÑÑÐÐÐÐÑÐÐÐ.
           </para>
           <para lang="ru">
             ÐÐÑÑÐ ÐÑÐÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÑÑÑ ÐÐÑÐÐÐÐÑÐÐÑÐÐÑ ÐÐÑ ÐÐÑÑÐÐÐÐÑÐÐÐÐ

Modified: trunk/src/filters/map/fractal-trace.xml
==============================================================================
--- trunk/src/filters/map/fractal-trace.xml	(original)
+++ trunk/src/filters/map/fractal-trace.xml	Fri Feb  1 23:02:34 2008
@@ -52,8 +52,7 @@
   <indexterm lang="en"><primary>Fractal trace</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Filter</primary>
-    <secondary>Abbilden</secondary>
+    <primary>Filter</primary><secondary>Abbilden</secondary>
   </indexterm>
   <indexterm lang="de"><primary>Fraktal</primary></indexterm>
 
@@ -72,8 +71,7 @@
   <indexterm lang="fr"><primary>Fractaliser</primary></indexterm>
 
   <indexterm lang="it">
-    <primary>Filtri</primary>
-    <secondary>Mappa</secondary>
+    <primary>Filtri</primary><secondary>Mappa</secondary>
   </indexterm>
   <indexterm lang="it"><primary>Traccia frattale</primary></indexterm>
 
@@ -85,8 +83,7 @@
   <indexterm lang="no"><primary>Fraktal (filter)</primary></indexterm>
 
   <indexterm lang="ru">
-    <primary>ÐÐÐÑÑÑÑ</primary>
-    <secondary>ÐÐÑÑÐ</secondary>
+    <primary>ÐÐÐÑÑÑÑ</primary><secondary>ÐÐÑÑÐ</secondary>
   </indexterm>
   <indexterm lang="ru"><primary>ÐÑÐÐÑÐÐÑÐÑÐ ÑÐÐÐ</primary></indexterm>
 

Modified: trunk/src/filters/map/illusion.xml
==============================================================================
--- trunk/src/filters/map/illusion.xml	(original)
+++ trunk/src/filters/map/illusion.xml	Fri Feb  1 23:02:34 2008
@@ -51,8 +51,7 @@
   <indexterm lang="en"><primary>Illusion</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Filter</primary>
-    <secondary>Abbilden</secondary>
+    <primary>Filter</primary><secondary>Abbilden</secondary>
   </indexterm>
   <indexterm lang="de"><primary>Illusion</primary></indexterm>
 
@@ -85,8 +84,7 @@
   <indexterm lang="no"><primary>Illusjon (filter)</primary></indexterm>
 
   <indexterm lang="ru">
-    <primary>ÐÐÐÑÑÑÑ</primary>
-    <secondary>ÐÐÑÑÐ</secondary>
+    <primary>ÐÐÐÑÑÑÑ</primary><secondary>ÐÐÑÑÐ</secondary>
   </indexterm>
   <indexterm lang="ru"><primary>ÐÐÐÑÐÐÑ</primary></indexterm>
 

Modified: trunk/src/filters/map/introduction.xml
==============================================================================
--- trunk/src/filters/map/introduction.xml	(original)
+++ trunk/src/filters/map/introduction.xml	Fri Feb  1 23:02:34 2008
@@ -40,8 +40,7 @@
   </indexterm>
 
   <indexterm lang="de">
-    <primary>Filter</primary>
-    <secondary>Abbilden</secondary>
+    <primary>Filter</primary><secondary>Abbilden</secondary>
   </indexterm>
 
   <indexterm lang="es">
@@ -57,8 +56,7 @@
   </indexterm>
 
   <indexterm lang="it">
-    <primary>Filtri</primary>
-    <secondary>Mappa</secondary>
+    <primary>Filtri</primary><secondary>Mappa</secondary>
   </indexterm>
   <indexterm lang="it"><primary>Introduzione</primary></indexterm>
 
@@ -69,8 +67,7 @@
   <indexterm lang="no"><primary>Avbildingsfiltra</primary></indexterm>
 
   <indexterm lang="ru">
-    <primary>ÐÐÐÑÑÑÑ</primary>
-    <secondary>ÐÐÑÑÐ</secondary>
+    <primary>ÐÐÐÑÑÑÑ</primary><secondary>ÐÐÑÑÐ</secondary>
   </indexterm>
   <indexterm lang="ru"><primary>ÐÐÐÐÐÐÐÐ Ð ÑÐÐÑÑÑÑ ÐÐÑÑÑ</primary></indexterm>
 

Modified: trunk/src/filters/map/smalltiles.xml
==============================================================================
--- trunk/src/filters/map/smalltiles.xml	(original)
+++ trunk/src/filters/map/smalltiles.xml	Fri Feb  1 23:02:34 2008
@@ -51,8 +51,7 @@
   <indexterm lang="en"><primary>Small Tiles</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Filter</primary>
-    <secondary>Abbilden</secondary>
+    <primary>Filter</primary><secondary>Abbilden</secondary>
   </indexterm>
   <indexterm lang="de"><primary>Kleine Kacheln</primary></indexterm>
 

Modified: trunk/src/menus/colors/desaturate.xml
==============================================================================
--- trunk/src/menus/colors/desaturate.xml	(original)
+++ trunk/src/menus/colors/desaturate.xml	Fri Feb  1 23:02:34 2008
@@ -59,7 +59,6 @@
 
   <indexterm lang="de">
     <primary>Farbe</primary><secondary>SÃttigung entfernen</secondary>
-    <tertiary></tertiary>
   </indexterm>
   <indexterm lang="de"><primary>EntsÃttigen</primary></indexterm>
 
@@ -69,17 +68,13 @@
     <secondary>Gestionar los colores</secondary>
     <tertiary>Convertir los colores a escala de grises</tertiary>
   </indexterm>
-  <indexterm lang="es">
-    <primary>Desaturar</primary>
-  </indexterm>
+  <indexterm lang="es"><primary>Desaturar</primary></indexterm>
 
   <indexterm lang="fr">
     <primary>Couleurs</primary>
     <secondary>Convertir les couleurs en nuances de gris</secondary>
   </indexterm>
-  <indexterm lang="fr">
-    <primary>DÃsaturer</primary>
-  </indexterm>
+  <indexterm lang="fr"><primary>DÃsaturer</primary></indexterm>
 
   <indexterm lang="it">
     <primary>Colori</primary><secondary>Converti in scala di grigi</secondary>

Modified: trunk/src/menus/colors/invert.xml
==============================================================================
--- trunk/src/menus/colors/invert.xml	(original)
+++ trunk/src/menus/colors/invert.xml	Fri Feb  1 23:02:34 2008
@@ -54,8 +54,7 @@
   <indexterm lang="en"><primary>Invert colors</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Farbe</primary>
-    <secondary>Invertieren</secondary>
+    <primary>Farbe</primary><secondary>invertieren</secondary>
   </indexterm>
   <indexterm lang="de"><primary>Farben invertieren</primary></indexterm>
 
@@ -69,21 +68,15 @@
     <primary>Color</primary>
     <secondary>Invertir los colores de la capa</secondary>
   </indexterm>
-  <indexterm lang="es">
-    <primary>Invertir</primary>
-  </indexterm>
+  <indexterm lang="es"><primary>Invertir</primary></indexterm>
 
   <indexterm lang="fr">
-    <primary>Couleurs</primary>
-    <secondary>Inverser les couleurs</secondary>
-  </indexterm>
-  <indexterm lang="fr">
-    <primary>Inverser</primary>
+    <primary>Couleurs</primary><secondary>Inverser les couleurs</secondary>
   </indexterm>
+  <indexterm lang="fr"><primary>Inverser</primary></indexterm>
 
   <indexterm lang="it">
-    <primary>Livello</primary>
-    <secondary>Inverti</secondary>
+    <primary>Livello</primary><secondary>Inverti</secondary>
   </indexterm>
 
   <indexterm lang="lt">

Modified: trunk/src/menus/colors/map/exchange.xml
==============================================================================
--- trunk/src/menus/colors/map/exchange.xml	(original)
+++ trunk/src/menus/colors/map/exchange.xml	Fri Feb  1 23:02:34 2008
@@ -71,8 +71,7 @@
   </indexterm>
 
   <indexterm lang="de">
-    <primary>Farbe</primary>
-    <secondary>Vertauschen</secondary>
+    <primary>Farbe</primary><secondary>vertauschen</secondary>
   </indexterm>
 
   <indexterm lang="es">

Modified: trunk/src/menus/colors/map/palettemap.xml
==============================================================================
--- trunk/src/menus/colors/map/palettemap.xml	(original)
+++ trunk/src/menus/colors/map/palettemap.xml	Fri Feb  1 23:02:34 2008
@@ -46,15 +46,12 @@
   <indexterm lang="en"><primary>Palette Map</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Farben</primary>
-    <secondary>Abbilden</secondary>
-    <!--tertiary>Auf Palette</tertiary-->
+    <primary>Farbe</primary><secondary>abbilden</secondary>
   </indexterm>
   <indexterm lang="de"><primary>Palette</primary></indexterm>
 
   <indexterm lang="fr">
-    <primary>Couleurs</primary>
-    <secondary>Palette carte</secondary>
+    <primary>Couleurs</primary><secondary>Palette carte</secondary>
   </indexterm>
   <indexterm lang="fr">
     <primary>Palette</primary>
@@ -92,14 +89,13 @@
       This plug-in recolors the image using colors from the active palette
       that you choose in
       <menuchoice>
-        <guimenu>Dialogs</guimenu>
-        <guimenuitem>Palettes</guimenuitem>
+        <guimenu>Dialogs</guimenu><guimenuitem>Palettes</guimenuitem>
       </menuchoice>.
     </para>
     <para lang="en">
       It maps the contents of the specified drawable (layer, selection...)
       with the active palette. It calculates luminosity of each pixel and
-      replaces the pixel by the palette sample  at the corresponding index. A
+      replaces the pixel by the palette sample at the corresponding index. A
       complete black pixel becomes the lowest palette entry, and complete
       white becomes the highest. Works on both Grayscale and RGB image
       with/without alpha channel.
@@ -137,8 +133,8 @@
       Il mappe le contenu de l'objet graphique spÃcifià (calque, sÃlection...)
       avec la palette active. Il calcule la luminosità de chaque pixel et
       remplace le pixel par l'Ãchantillon de la palette à l'indice
-      correspondant. Un pixel complÃtement noir prend la couleur d'indice
-      le plus faible de la palette, et un pixel complÃtement blanc celle de
+      correspondant. Un pixel complÃtement noir prend la couleur d'indice le
+      plus faible de la palette, et un pixel complÃtement blanc celle de
       l'indice le plus haut.
     </para>
 
@@ -151,14 +147,15 @@
       </menuchoice>, spalvas.
     </para>
     <para lang="lt">
-      Jis perspalvina nurodyto paveikslÄlio elemento (sluoksnio, paÅymÄjimo...)
-      turinÄ naudodamas aktyviÄ paletÄ. Åis filtras apskaiÄiuoja kiekvieno
-      pikselio ÅviesingumÄ ir pakeiÄia ÅÄ pikselÄ atitinkamo indekso paletÄs
-      spalva. VisiÅkai juodas pikselis turi maÅiausiÄ indeksÄ paletÄje, o
-      visiÅkai baltas pikselis â didÅiausiÄ. Filtras veikia ir pilkÅ
-      atspalviÅ ir RGB paveikslÄliuose su arba be alfa kanalu.
+      Jis perspalvina nurodyto paveikslÄlio elemento (sluoksnio,
+      paÅymÄjimo...) turinÄ naudodamas aktyviÄ paletÄ. Åis filtras
+      apskaiÄiuoja kiekvieno pikselio ÅviesingumÄ ir pakeiÄia ÅÄ pikselÄ
+      atitinkamo indekso paletÄs spalva. VisiÅkai juodas pikselis turi
+      maÅiausiÄ indeksÄ paletÄje, o visiÅkai baltas pikselis â didÅiausiÄ.
+      Filtras veikia ir pilkÅ atspalviÅ ir RGB paveikslÄliuose su arba be alfa
+      kanalu.
     </para>
-    
+
     <para lang="no">
       Dette programtillegget bytter ut fargane i biletet med fargar frà den
       aktive paletten vald via
@@ -168,13 +165,12 @@
       </menuchoice>.
     </para>
     <para lang="no">
-      Kvar piksel i teikneomrÃdet (dvs. laget, utvalet osv.) fÃr farge
-      frà paletten ved at filteret reknar ut fargeglÃden for pikselen og
-      bruker denne verdien for à hente den fargen som har tilsvarande
-      indeksnummer i paletten. Ein svart piksel i biletet vil sÃleis fÃ
-      den fÃrste fargen i paletten, medan ein kvit piksel vil fà den
-      siste fargen. Filteret arbeider bÃde pà grÃskala- og RGB-bilete,
-      med og utan alfakanal.
+      Kvar piksel i teikneomrÃdet (dvs. laget, utvalet osv.) fÃr farge frÃ
+      paletten ved at filteret reknar ut fargeglÃden for pikselen og bruker
+      denne verdien for à hente den fargen som har tilsvarande indeksnummer i
+      paletten. Ein svart piksel i biletet vil sÃleis fà den fÃrste fargen i
+      paletten, medan ein kvit piksel vil fà den siste fargen. Filteret
+      arbeider bÃde pà grÃskala- og RGB-bilete, med og utan alfakanal.
     </para>
   </sect3>
 
@@ -191,6 +187,7 @@
       <phrase lang="ru">ÐÐÑÐÐÐÑÐÑ ÑÐÐÑÑÑÐ</phrase>
       <phrase lang="zh_CN">äçèäæé</phrase>
     </title>
+
     <para lang="en">
       You can access this filter in the image window menu under
       <menuchoice>

Modified: trunk/src/menus/edit-paste-as-brush.xml
==============================================================================
--- trunk/src/menus/edit-paste-as-brush.xml	(original)
+++ trunk/src/menus/edit-paste-as-brush.xml	Fri Feb  1 23:02:34 2008
@@ -55,48 +55,36 @@
   </title>
 
   <indexterm lang="en">
-    <primary>Layer</primary>
-    <secondary>Paste</secondary>
+    <primary>Layer</primary><secondary>Paste</secondary>
   </indexterm>
   <indexterm lang="en">
-    <primary>Selection</primary>
-    <secondary>Paste</secondary>
+    <primary>Selection</primary><secondary>Paste</secondary>
     </indexterm>
-  <indexterm lang="en">
-    <primary>Paste as new brush</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Paste as new brush</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Pinsel</primary>
-    <secondary>EinfÃgen</secondary>
+    <primary>Pinsel</primary><secondary>einfÃgen</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary>EinfÃgen</primary>
-    <secondary>Pinsel</secondary>
+    <primary>EinfÃgen</primary><secondary>Pinsel</secondary>
     </indexterm>
   <indexterm lang="de">
     <primary>EinfÃgen als neuer Pinsel</primary>
   </indexterm>
 
   <indexterm lang="es">
-    <primary>Capa</primary>
-    <secondary>Pegar</secondary>
+    <primary>Capa</primary><secondary>Pegar</secondary>
   </indexterm>
   <indexterm lang="es">
-    <primary>SelecciÃn</primary>
-    <secondary>Pegar</secondary>
+    <primary>SelecciÃn</primary><secondary>Pegar</secondary>
     </indexterm>
-  <indexterm lang="es">
-    <primary>Pegar como pincel nuevo</primary>
-  </indexterm>
+  <indexterm lang="es"><primary>Pegar como pincel nuevo</primary></indexterm>
 
   <indexterm lang="fr">
-    <primary>Calque</primary>
-    <secondary>Coller</secondary>
+    <primary>Calque</primary><secondary>Coller</secondary>
   </indexterm>
   <indexterm lang="fr">
-    <primary>SÃlection</primary>
-    <secondary>Coller</secondary>
+    <primary>SÃlection</primary><secondary>Coller</secondary>
   </indexterm>
   <indexterm lang="fr">
     <primary>Coller en tant que nouvelle brosse</primary>

Modified: trunk/src/menus/edit-paste-as-pattern.xml
==============================================================================
--- trunk/src/menus/edit-paste-as-pattern.xml	(original)
+++ trunk/src/menus/edit-paste-as-pattern.xml	Fri Feb  1 23:02:34 2008
@@ -55,36 +55,28 @@
   </title>
 
   <indexterm lang="en">
-    <primary>Layer</primary>
-    <secondary>Paste</secondary>
+    <primary>Layer</primary><secondary>Paste</secondary>
   </indexterm>
   <indexterm lang="en">
-    <primary>Selection</primary>
-    <secondary>Paste</secondary>
+    <primary>Selection</primary><secondary>Paste</secondary>
     </indexterm>
-  <indexterm lang="en">
-    <primary>Paste as new pattern</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Paste as new pattern</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Muster</primary>
-    <secondary>EinfÃgen</secondary>
+    <primary>Muster</primary><secondary>einfÃgen</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary>EinfÃgen</primary>
-    <secondary>Muster</secondary>
+    <primary>EinfÃgen</primary><secondary>Muster</secondary>
     </indexterm>
   <indexterm lang="de">
     <primary>EinfÃgen als neues Muster</primary>
   </indexterm>
 
   <indexterm lang="es">
-    <primary>Capa</primary>
-    <secondary>Pegar</secondary>
+    <primary>Capa</primary><secondary>Pegar</secondary>
   </indexterm>
   <indexterm lang="es">
-    <primary>SelecciÃn</primary>
-    <secondary>Pegar</secondary>
+    <primary>SelecciÃn</primary><secondary>Pegar</secondary>
     </indexterm>
   <indexterm lang="es">
     <primary>Pegar como un patrÃn nuevo</primary>

Modified: trunk/src/menus/edit-stroke-path.xml
==============================================================================
--- trunk/src/menus/edit-stroke-path.xml	(original)
+++ trunk/src/menus/edit-stroke-path.xml	Fri Feb  1 23:02:34 2008
@@ -56,52 +56,42 @@
   </title>
 
   <indexterm lang="en">
-    <primary>Paths</primary>
-    <secondary>Stroke</secondary>
+    <primary>Paths</primary><secondary>Stroke</secondary>
   </indexterm>
   <indexterm lang="en"><primary>Stoke path</primary></indexterm>
 
+  <indexterm lang="cs"><primary>Vykreslit cestu</primary></indexterm>
+
   <indexterm lang="de">
-    <primary>Pfad</primary>
-    <secondary>Nachziehen</secondary>
+    <primary>Pfad</primary><secondary>nachziehen</secondary>
   </indexterm>
+  <indexterm lang="de"><primary>Pfad nachziehen</primary></indexterm>
 
   <indexterm lang="es">
-    <primary>Rutas</primary>
-    <secondary>Trazar</secondary>
+    <primary>Rutas</primary><secondary>Trazar</secondary>
   </indexterm>
   <indexterm lang="es"><primary>Trazar ruta</primary></indexterm>
 
   <indexterm lang="fr">
-    <primary>Chemins</primary>
-    <secondary>Tracer</secondary>
+    <primary>Chemins</primary><secondary>Tracer</secondary>
   </indexterm>
   <indexterm lang="fr"><primary>Tracer le chemin</primary></indexterm>
 
   <indexterm lang="it">
-    <primary>Tracciato</primary>
-    <secondary>Delinea</secondary>
+    <primary>Tracciato</primary><secondary>Delinea</secondary>
   </indexterm>
+  <indexterm lang="it"><primary>Delinea tracciato</primary></indexterm>
 
   <indexterm lang="lt">
-    <primary>KontÅrai</primary>
-    <secondary>Apvesti</secondary>
+    <primary>KontÅrai</primary><secondary>Apvesti</secondary>
   </indexterm>
   <indexterm lang="lt"><primary>Apvesti kontÅrÄ</primary></indexterm>
 
   <indexterm lang="no">
-    <primary>Bane</primary>
-    <secondary>Strek opp</secondary>
+    <primary>Bane</primary><secondary>Strek opp</secondary>
   </indexterm>
-
-  <indexterm lang="en"><primary>Stroke Path</primary></indexterm>
-  <indexterm lang="cs"><primary>Vykreslit cestu</primary></indexterm>
-  <indexterm lang="de"><primary>Pfad nachziehen</primary></indexterm>
-  <indexterm lang="es"><primary>Trazar ruta</primary></indexterm>
-  <indexterm lang="fr"><primary>Tracer le chemin</primary></indexterm>
-  <indexterm lang="it"><primary>Delinea tracciato</primary></indexterm>
-  <indexterm lang="lt"><primary>Apvesti kontÅrÄ</primary></indexterm>
   <indexterm lang="no"><primary>Strek opp bane</primary></indexterm>
+
   <indexterm lang="zh_CN"><primary>åçèå</primary></indexterm>
 
   <para lang="en">

Modified: trunk/src/menus/edit-stroke-selection.xml
==============================================================================
--- trunk/src/menus/edit-stroke-selection.xml	(original)
+++ trunk/src/menus/edit-stroke-selection.xml	Fri Feb  1 23:02:34 2008
@@ -55,45 +55,43 @@
   </title>
 
   <indexterm lang="en">
-    <primary>Selection</primary>
-    <secondary>Stroke selection</secondary>
+    <primary>Selection</primary><secondary>Stroke selection</secondary>
   </indexterm>
+  <indexterm lang="en"><primary>Stroke Selection</primary></indexterm>
+
+  <indexterm lang="cs"><primary>Vykreslit vÃbÄr</primary></indexterm>
+
   <indexterm lang="de">
-    <primary>Auswahl</primary>
-    <secondary>Nachziehen</secondary>
+    <primary>Auswahl</primary><secondary>nachziehen</secondary>
   </indexterm>
+  <indexterm lang="de"><primary>Nachziehen</primary></indexterm>
+
   <indexterm lang="es">
-    <primary>SelecciÃn</primary>
-    <secondary>Trazar la selecciÃn</secondary>
+    <primary>SelecciÃn</primary><secondary>Trazar la selecciÃn</secondary>
   </indexterm>
+  <indexterm lang="es"><primary>Trazar la selecciÃn</primary></indexterm>
+
   <indexterm lang="fr">
-    <primary>SÃlection</primary>
-    <secondary>Tracer la sÃlection</secondary>
+    <primary>SÃlection</primary><secondary>Tracer la sÃlection</secondary>
   </indexterm>
+  <indexterm lang="fr"><primary>Tracer la sÃlection</primary></indexterm>
+
   <indexterm lang="it">
-    <primary>Selezione</primary>
-    <secondary>Delinea</secondary>
+    <primary>Selezione</primary><secondary>Delinea</secondary>
   </indexterm>
+  <indexterm lang="it"><primary>Delinea selezione</primary></indexterm>
+
   <indexterm lang="lt">
     <primary>PaÅymÄjimas</primary>
     <secondary>Apvesti paÅymÄtÄ sritÄ</secondary>
   </indexterm>
+  <indexterm lang="lt"><primary>Apvesti paÅymÄtÄ sritÄ</primary></indexterm>
+
   <indexterm lang="no">
-    <primary>Markering</primary>
-    <secondary>Strek opp</secondary>
-  </indexterm>
-  <indexterm lang="en"><primary>Stroke Selection</primary></indexterm>
-  <indexterm lang="cs"><primary>Vykreslit vÃbÄr</primary></indexterm>
-  <indexterm lang="de">
-    <primary>Auswahl</primary>
-    <secondary>Nachziehen</secondary>
+    <primary>Markering</primary><secondary>Strek opp</secondary>
   </indexterm>
-  <indexterm lang="de"><primary>Nachziehen</primary></indexterm>
-  <indexterm lang="es"><primary>Trazar la selecciÃn</primary></indexterm>
-  <indexterm lang="fr"><primary>Tracer la sÃlection</primary></indexterm>
-  <indexterm lang="it"><primary>Delinea selezione</primary></indexterm>
-  <indexterm lang="lt"><primary>Apvesti paÅymÄtÄ sritÄ</primary></indexterm>
   <indexterm lang="no"><primary>Strek opp markering</primary></indexterm>
+
   <indexterm lang="zh_CN"><primary>åçéå</primary></indexterm>
 
   <para lang="en">

Modified: trunk/src/menus/file-save-as-template.xml
==============================================================================
--- trunk/src/menus/file-save-as-template.xml	(original)
+++ trunk/src/menus/file-save-as-template.xml	Fri Feb  1 23:02:34 2008
@@ -68,12 +68,10 @@
   <indexterm lang="cs"><primary>UloÅit jako Åablonu</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Datei</primary>
-    <secondary>Speichern</secondary>
-    <tertiary>Als Vorlage</tertiary>
+    <primary>Datei</primary><secondary>speichern</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary>Vorlage</primary><secondary>Als Vorlage speichern</secondary>
+    <primary>Vorlage</primary><secondary>speichern</secondary>
   </indexterm>
 
   <indexterm lang="es">

Modified: trunk/src/menus/image-autocrop.xml
==============================================================================
--- trunk/src/menus/image-autocrop.xml	(original)
+++ trunk/src/menus/image-autocrop.xml	Fri Feb  1 23:02:34 2008
@@ -64,8 +64,7 @@
   <indexterm lang="en"><primary>Autocrop</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Zuschneiden</primary>
-    <secondary>automatisch</secondary>
+    <primary>Zuschneiden</primary><secondary>Automatisch</secondary>
   </indexterm>
 
   <indexterm lang="es">

Modified: trunk/src/menus/image-convert-grayscale.xml
==============================================================================
--- trunk/src/menus/image-convert-grayscale.xml	(original)
+++ trunk/src/menus/image-convert-grayscale.xml	Fri Feb  1 23:02:34 2008
@@ -64,10 +64,10 @@
 
   <indexterm lang="de"><primary>Graustufen</primary></indexterm>
   <indexterm lang="de">
-    <primary>Bild</primary><secondary>Umwandeln</secondary>
+    <primary>Bild</primary><secondary>umwandeln</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary>Modus</primary><secondary>Umwandeln</secondary>
+    <primary>Modus</primary><secondary>umwandeln</secondary>
   </indexterm>
 
   <indexterm lang="es"><primary>Escala de grises</primary></indexterm>

Modified: trunk/src/menus/image-convert-indexed.xml
==============================================================================
--- trunk/src/menus/image-convert-indexed.xml	(original)
+++ trunk/src/menus/image-convert-indexed.xml	Fri Feb  1 23:02:34 2008
@@ -69,24 +69,14 @@
   <indexterm lang="en"><primary>Indexed colors</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Bild</primary>
-    <secondary>Umwandeln</secondary>
-    <!--tertiary>In Indiziert-Modus umwandeln</tertiary-->
+    <primary>Bild</primary><secondary>umwandeln</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary>Modus</primary>
-    <secondary>Indiziert</secondary>
-    <tertiary>In Modus <quote>Indizierte Farben</quote> umwandeln</tertiary>
+    <primary>Modus</primary><secondary>Indiziert</secondary>
   </indexterm>
   <indexterm lang="de"><primary>Indizierte Farben</primary></indexterm>
 
-  <indexterm lang="es">
-    <primary>Indexados, colores</primary>
-  </indexterm>
-
-  <indexterm lang="fr">
-    <primary>IndexÃ</primary>
-  </indexterm>
+  <indexterm lang="es"><primary>Indexados, colores</primary></indexterm>
 
   <indexterm lang="fr">
     <primary>Image</primary>
@@ -94,15 +84,13 @@
     <tertiary>Convertir en mode indexÃ</tertiary>
   </indexterm>
   <indexterm lang="fr">
-    <primary>Modes de couleur</primary>
-    <secondary>IndexÃ</secondary>
+    <primary>Modes de couleur</primary><secondary>IndexÃ</secondary>
   </indexterm>
+  <indexterm lang="fr"><primary>IndexÃ</primary></indexterm>
   <indexterm lang="fr"><primary>Couleurs indexÃes</primary></indexterm>
   <indexterm lang="fr"><primary>IndexÃ</primary></indexterm>
 
-  <indexterm lang="it">
-    <primary>Colori indicizzati</primary>
-  </indexterm>
+  <indexterm lang="it"><primary>Colori indicizzati</primary></indexterm>
 
   <indexterm lang="lt">
     <primary>PaveikslÄlis</primary>
@@ -110,14 +98,12 @@
     <tertiary>Konvertuoti Ä indeksuotÄ veiksenÄ</tertiary>
   </indexterm>
   <indexterm lang="lt">
-    <primary>Veiksenos (spalva)</primary>
-    <secondary>Indeksuotas</secondary>
+    <primary>Veiksenos (spalva)</primary><secondary>Indeksuotas</secondary>
   </indexterm>
   <indexterm lang="lt"><primary>Indeksuotos spalvos</primary></indexterm>
 
   <indexterm lang="no">
-    <primary>Bilete (menyen)</primary>
-    <secondary>Indeksert modus</secondary>
+    <primary>Bilete (menyen)</primary><secondary>Indeksert modus</secondary>
   </indexterm>
   <indexterm lang="no"><primary>Indeksert (modus)</primary></indexterm>
 

Modified: trunk/src/menus/image-convert-rgb.xml
==============================================================================
--- trunk/src/menus/image-convert-rgb.xml	(original)
+++ trunk/src/menus/image-convert-rgb.xml	Fri Feb  1 23:02:34 2008
@@ -56,6 +56,8 @@
     <phrase lang="zh_CN">RGB</phrase>
   </title>
 
+  <indexterm lang="en;cs;de;es;it;lt;no"><primary>RGB</primary></indexterm>
+
   <indexterm lang="en">
     <primary>Image</primary>
     <secondary>Convert</secondary>
@@ -66,19 +68,12 @@
     <secondary>RGB</secondary>
     <tertiary>Convert image to RGB mode</tertiary>
   </indexterm>
-  <indexterm lang="en;cs;de;es;it">
-    <primary>RGB</primary>
-  </indexterm>
 
   <indexterm lang="de">
-    <primary>Bild</primary>
-    <secondary>Umwandeln</secondary>
-    <!--tertiary>In RGB-Modus umwandeln</tertiary-->
+    <primary>Bild</primary><secondary>umwandeln</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary>Modus</primary>
-    <secondary>RGB</secondary>
-    <tertiary>In RGB-Modus umwandeln</tertiary>
+    <primary>Modus</primary><secondary>RGB</secondary>
   </indexterm>
 
   <indexterm lang="fr">
@@ -102,15 +97,10 @@
     <secondary>RGB</secondary>
     <tertiary>Konvertuoti paveikslÄlÄ Ä RGB veiksenÄ</tertiary>
   </indexterm>
-  <indexterm lang="lt">
-    <primary>RGB</primary>
-  </indexterm>
 
   <indexterm lang="no">
-    <primary>Bilete (menyen)</primary>
-    <secondary>RGB (modus)</secondary>
+    <primary>Bilete (menyen)</primary><secondary>RGB (modus)</secondary>
   </indexterm>
-  <indexterm lang="no"><primary>RGB</primary></indexterm>
 
   <para lang="en">
     The <guimenuitem>RGB</guimenuitem> command converts your image to
@@ -133,8 +123,8 @@
   </para>
 
   <para lang="de">
-    Mit diesem Kommando kÃnnen Sie Bilder in das <link
-    linkend="glossary-rgb">RGB-Farbmodell</link> ÃberfÃhren.
+    Mit diesem Kommando kÃnnen Sie Bilder in das
+    <link linkend="glossary-rgb">RGB-Farbmodell</link> ÃberfÃhren.
   </para>
   <para lang="de">
     StandardmÃÃig werden Sie meistens im RGB-Modus arbeiten, wenn Sie neue

Modified: trunk/src/menus/image-scale.xml
==============================================================================
--- trunk/src/menus/image-scale.xml	(original)
+++ trunk/src/menus/image-scale.xml	Fri Feb  1 23:02:34 2008
@@ -54,10 +54,13 @@
 
   <indexterm lang="en"><primary>Scale Image</primary></indexterm>
   <indexterm lang="cs"><primary>Velikost obrÃzku</primary></indexterm>
+
   <indexterm lang="de">
-    <primary>Bild</primary><secondary>Skalieren</secondary>
+    <primary>Bild</primary><secondary>skalieren</secondary>
   </indexterm>
+
   <indexterm lang="es"><primary>Escalar la imagen</primary></indexterm>
+
   <indexterm lang="fr">
     <primary>Redimensionner</primary>
     <secondary>Changer l'Ãchelle et la taille de l'image</secondary>
@@ -65,14 +68,15 @@
   <indexterm lang="fr">
     <primary>Ãchelle et taille de l'image</primary>
   </indexterm>
+
   <indexterm lang="it"><primary>Scala immagine</primary></indexterm>
   <indexterm lang="it">
     <primary>Ridimensionamento immagine</primary>
   </indexterm>
+
   <indexterm lang="lt"><primary>Keisti paveikslÄlio dydÄ</primary></indexterm>
   <indexterm lang="no">
-    <primary>Bilete (menyen)</primary>
-    <secondary>Skaler biletet</secondary>
+    <primary>Bilete (menyen)</primary><secondary>Skaler biletet</secondary>
   </indexterm>
   <indexterm lang="no"><primary>Skaler biletet</primary></indexterm>
   <indexterm lang="zh_CN"><primary>çæåå</primary></indexterm>
@@ -86,9 +90,9 @@
   </para>
   <para lang="en">
     It operates on the entire image. If your image has layers of different
-    sizes, making the image smaller could shrink some of them down to
-    nothing, since a layer cannot be less than one pixel wide or high. If
-    this happens, you will be warned before the operation is performed.
+    sizes, making the image smaller could shrink some of them down to nothing,
+    since a layer cannot be less than one pixel wide or high. If this happens,
+    you will be warned before the operation is performed.
   </para>
   <para lang="en">
     If you only want to scale a particular layer, use the
@@ -156,10 +160,9 @@
   </para>
   <para lang="es">
     Opera sobre la imagen entera. Si la imagen tiene capas de diferentes
-    tamaÃos, al hacer la imagen mÃs pequeÃa podrÃan encoger algunas,
-    debido a que una capa no puede tener menos de un pÃxel de anhura o
-    altura. Si esto ocurre, serà avisadoantes de que la operaciÃn se
-    ejecute.
+    tamaÃos, al hacer la imagen mÃs pequeÃa podrÃan encoger algunas, debido a
+    que una capa no puede tener menos de un pÃxel de anhura o altura. Si esto
+    ocurre, serà avisadoantes de que la operaciÃn se ejecute.
   </para>
   <para lang="es">
     Si solo quiere escalar una capa en particular, use el comando 
@@ -190,12 +193,11 @@
     ridimensiona la sua superficie di conseguenza.
   </para>
   <para lang="it">
-    Il comando opera sull'intera immagine e se l'immagine possiede livelli
-    di diverse dimensioni, l'operazione di rimpicciolimento potrebbe
-    renderne alcuni cosà piccoli da annullarli, dato che un livello non puÃ
-    essere di dimensioni inferiori a un pixel di altezza per un pixel di
-    larghezza. Se cià succede, si viene avvertiti prima dell'esecuzione
-    dell'operazione.
+    Il comando opera sull'intera immagine e se l'immagine possiede livelli di
+    diverse dimensioni, l'operazione di rimpicciolimento potrebbe renderne
+    alcuni cosà piccoli da annullarli, dato che un livello non puà essere di
+    dimensioni inferiori a un pixel di altezza per un pixel di larghezza. Se
+    cià succede, si viene avvertiti prima dell'esecuzione dell'operazione.
   </para>
   <para lang="it">
     Se si vuole scalare solo un livello particolare, usare il comando
@@ -209,11 +211,11 @@
     matomosios srities dydÄ.
   </para>
   <para lang="lt">
-    Ji veikia visÄ paveikslÄlÄ. Jeigu jÅsÅ paveikslÄlyje yra skirtingÅ
-    dydÅiÅ sluoksniai, sumaÅinus paveikslÄlÄ kai kurie iÅ jÅ gali sumaÅÄti iki
-    nieko, kadangi sluoksnis negalite bÅti maÅiau nei vieno pikselio
-    ploÄio arba ilgio. Jeigu taip atsitinka, prieÅ atliekant operacijÄ
-    jÅs bÅsite perspÄti.
+    Ji veikia visÄ paveikslÄlÄ. Jeigu jÅsÅ paveikslÄlyje yra skirtingÅ dydÅiÅ
+    sluoksniai, sumaÅinus paveikslÄlÄ kai kurie iÅ jÅ gali sumaÅÄti iki nieko,
+    kadangi sluoksnis negalite bÅti maÅiau nei vieno pikselio ploÄio arba
+    ilgio. Jeigu taip atsitinka, prieÅ atliekant operacijÄ jÅs bÅsite
+    perspÄti.
   </para>
   <para lang="lt">
     Jeigu norite pakeisti konkretaus sluoksnio dydÄ, naudokite komandÄ

Modified: trunk/src/menus/layer-bottom.xml
==============================================================================
--- trunk/src/menus/layer-bottom.xml	(original)
+++ trunk/src/menus/layer-bottom.xml	Fri Feb  1 23:02:34 2008
@@ -52,14 +52,10 @@
     <secondary>Stack managing</secondary>
     <tertiary>Select bottom layer</tertiary>
   </indexterm>
-  <indexterm lang="en">
-    <primary>Select Bottom Layer</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Select Bottom Layer</primary></indexterm>
   
   <indexterm lang="de">
-    <primary>Ebene</primary>
-    <secondary>AuswÃhlen</secondary>
-    <tertiary>Unterste</tertiary>
+    <primary>Ebene</primary><secondary>auswÃhlen</secondary>
   </indexterm>
   
   <indexterm lang="es">
@@ -70,7 +66,7 @@
   <indexterm lang="es">
     <primary>Seleccionar la capa inferior</primary>
   </indexterm>
-  
+
   <indexterm lang="fr">
     <primary>Calque</primary>
     <secondary>GÃrer la pile de calques</secondary>
@@ -103,9 +99,7 @@
     <secondary>Stabel</secondary>
     <tertiary>Vel nedste laget</tertiary>
   </indexterm>
-  <indexterm lang="no">
-    <primary>Vel nedste laget</primary>
-  </indexterm>
+  <indexterm lang="no"><primary>Vel nedste laget</primary></indexterm>
   
   <para lang="en">
     With the <guimenuitem>Select Bottom Layer</guimenuitem> command, you

Modified: trunk/src/menus/layer-delete.xml
==============================================================================
--- trunk/src/menus/layer-delete.xml	(original)
+++ trunk/src/menus/layer-delete.xml	Fri Feb  1 23:02:34 2008
@@ -52,12 +52,10 @@
     <secondary>Stack managing</secondary>
     <tertiary>Delete current layer</tertiary>
   </indexterm>
-  <indexterm lang="en">
-    <primary>Delete Layer</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Delete Layer</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Ebene</primary><secondary>LÃschen</secondary>
+    <primary>Ebene</primary><secondary>lÃschen</secondary>
   </indexterm>
 
   <indexterm lang="es">
@@ -65,18 +63,14 @@
     <secondary>Gestionar la pila</secondary>
     <tertiary>Borrar la capa actual</tertiary>
   </indexterm>
-  <indexterm lang="es">
-    <primary>Borrar la capa</primary>
-  </indexterm>
+  <indexterm lang="es"><primary>Borrar la capa</primary></indexterm>
 
   <indexterm lang="fr">
     <primary>Calque</primary>
     <secondary>GÃrer la pile de calques</secondary>
     <tertiary>Supprimer le calque actif</tertiary>
   </indexterm>
-  <indexterm lang="fr">
-    <primary>Supprimer le calque</primary>
-  </indexterm>
+  <indexterm lang="fr"><primary>Supprimer le calque</primary></indexterm>
 
   <indexterm lang="it">
     <primary>Livello</primary>

Modified: trunk/src/menus/layer-mask-add.xml
==============================================================================
--- trunk/src/menus/layer-mask-add.xml	(original)
+++ trunk/src/menus/layer-mask-add.xml	Fri Feb  1 23:02:34 2008
@@ -56,13 +56,10 @@
     <secondary>Layer mask</secondary>
     <tertiary>Add</tertiary>
   </indexterm>
-  <indexterm lang="en">
-    <primary>Add Layer Mask (command)</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Add Layer Mask (command)</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Ebenenmaske</primary>
-    <secondary>Anlegen</secondary>
+    <primary>Ebenenmaske</primary><secondary>anlegen</secondary>
   </indexterm>
 
   <indexterm lang="es">
@@ -165,20 +162,19 @@
   <para lang="es">
     Una mÃscara de capa le permite definir que partes de la capa son opacas,
     semitransparentes o transparente. Puede mirar la secciÃn
-    <!--PENDING es: fix link
-    <link linkend="gimp-layer-mask"-->MÃscara de capa<!--/link-->, para mÃs
+    <!-- PENDING es: fix link
+      <link linkend="gimp-layer-mask"-->MÃscara de capa<!--/link-->, para mÃs
     informaciÃn.
   </para>
 
   <para lang="fr">
-    Un masque de calque permet de dÃfinir des parties du calque qui
-    resteront totalement ou partiellement visibles, le reste Ãtant rendu
-    transparent.
-    Cette commande ajoute un masque au calqueÂ: elle fait apparaÃtre une
-    boÃte de dialogue oà vous pouvez fixer les propriÃtÃs initiales du
-    masque. Si le calque possÃde dÃjà un masque de calque, ou ne peut pas en
-    avoir parce qu'il manque un canal Alpha, l'entrÃe du menu est
-    dÃsactivÃe. Voyez <link linkend="gimp-layer-mask">Masque de calque</link>
+    Un masque de calque permet de dÃfinir des parties du calque qui resteront
+    totalement ou partiellement visibles, le reste Ãtant rendu transparent.
+    Cette commande ajoute un masque au calqueÂ: elle fait apparaÃtre une boÃte
+    de dialogue oà vous pouvez fixer les propriÃtÃs initiales du masque. Si le
+    calque possÃde dÃjà un masque de calque, ou ne peut pas en avoir parce
+    qu'il manque un canal Alpha, l'entrÃe du menu est dÃsactivÃe. Voyez
+    <link linkend="gimp-layer-mask">Masque de calque</link>
     pour plus d'informations.
   </para>
 

Modified: trunk/src/menus/layer-mask-apply.xml
==============================================================================
--- trunk/src/menus/layer-mask-apply.xml	(original)
+++ trunk/src/menus/layer-mask-apply.xml	Fri Feb  1 23:02:34 2008
@@ -60,8 +60,7 @@
   </indexterm>
 
   <indexterm lang="de">
-    <primary>Ebenenmaske</primary>
-    <secondary>Anwenden</secondary>
+    <primary>Ebenenmaske</primary><secondary>anwenden</secondary>
   </indexterm>
 
   <indexterm lang="es">

Modified: trunk/src/menus/layer-mask-delete.xml
==============================================================================
--- trunk/src/menus/layer-mask-delete.xml	(original)
+++ trunk/src/menus/layer-mask-delete.xml	Fri Feb  1 23:02:34 2008
@@ -56,13 +56,10 @@
     <tertiary>Delete</tertiary>
   </indexterm>
 
-  <indexterm lang="en">
-    <primary>Delete</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Delete</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Ebenenmaske</primary>
-    <secondary>LÃschen</secondary>
+    <primary>Ebenenmaske</primary><secondary>lÃschen</secondary>
   </indexterm>
 
   <indexterm lang="es">
@@ -76,9 +73,7 @@
     <tertiary>Borrar</tertiary>
   </indexterm>
 
-  <indexterm lang="es">
-    <primary>Borrar</primary>
-  </indexterm>
+  <indexterm lang="es"><primary>Borrar</primary></indexterm>
 
   <indexterm lang="fr">
     <primary>Calque</primary>

Modified: trunk/src/menus/layer-mask-disable.xml
==============================================================================
--- trunk/src/menus/layer-mask-disable.xml	(original)
+++ trunk/src/menus/layer-mask-disable.xml	Fri Feb  1 23:02:34 2008
@@ -50,17 +50,14 @@
     <tertiary>Disable</tertiary>
   </indexterm>
   <indexterm lang="en">
-  <primary>Masks</primary>
-  <secondary>Layer mask</secondary>
-  <tertiary>Disable</tertiary>
-  </indexterm>
-  <indexterm lang="en">
-    <primary>Disable Layer Mask</primary>
+    <primary>Masks</primary>
+    <secondary>Layer mask</secondary>
+    <tertiary>Disable</tertiary>
   </indexterm>
+  <indexterm lang="en"><primary>Disable Layer Mask</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Ebenenmaske</primary>
-    <secondary>Deaktivieren</secondary>
+    <primary>Ebenenmaske</primary><secondary>deaktivieren</secondary>
   </indexterm>
 
   <indexterm lang="es">

Modified: trunk/src/menus/layer-mask-edit.xml
==============================================================================
--- trunk/src/menus/layer-mask-edit.xml	(original)
+++ trunk/src/menus/layer-mask-edit.xml	Fri Feb  1 23:02:34 2008
@@ -35,7 +35,7 @@
   </sect2info>
 
   <title>
-    <phrase lang="de">Ebenenmaske editieren</phrase>
+    <phrase lang="de">Ebenenmaske bearbeiten</phrase>
     <phrase lang="en">Edit Layer Mask</phrase>
     <phrase lang="es">Editar mÃscara de capa</phrase>
     <phrase lang="fr">Modifier le masque de calque</phrase>
@@ -54,13 +54,10 @@
   <secondary>Layer mask</secondary>
   <tertiary>Edit</tertiary>
 </indexterm>
-  <indexterm lang="en">
-    <primary>Edit Layer Mask</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Edit Layer Mask</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Ebenenmaske</primary>
-    <secondary>Editieren</secondary>
+    <primary>Ebenenmaske</primary><secondary>bearbeiten</secondary>
   </indexterm>
 
   <indexterm lang="es">
@@ -69,10 +66,10 @@
     <tertiary>Editar</tertiary>
   </indexterm>
   <indexterm lang="es">
-  <primary>MÃscaras</primary>
-  <secondary>MÃscara de capa</secondary>
-  <tertiary>Editar</tertiary>
-</indexterm>
+    <primary>MÃscaras</primary>
+    <secondary>MÃscara de capa</secondary>
+    <tertiary>Editar</tertiary>
+  </indexterm>
   <indexterm lang="es">
     <primary>Editar mÃscara de capa</primary>
   </indexterm>
@@ -83,10 +80,10 @@
     <tertiary>Modifier</tertiary>
   </indexterm>
   <indexterm lang="fr">
-  <primary>Masques</primary>
-  <secondary>Masque de calque</secondary>
-  <tertiary>Modifier</tertiary>
-</indexterm>
+    <primary>Masques</primary>
+    <secondary>Masque de calque</secondary>
+    <tertiary>Modifier</tertiary>
+  </indexterm>
   <indexterm lang="fr">
     <primary>Modifier le masque de calque</primary>
   </indexterm>
@@ -97,10 +94,10 @@
     <tertiary>Modifica</tertiary>
   </indexterm>
   <indexterm lang="it">
-  <primary>Maschere</primary>
-  <secondary>Maschera di livello</secondary>
-  <tertiary>Modifica</tertiary>
-</indexterm>
+    <primary>Maschere</primary>
+    <secondary>Maschera di livello</secondary>
+    <tertiary>Modifica</tertiary>
+  </indexterm>
   <indexterm lang="it">
     <primary>Modifica maschera di livello</primary>
   </indexterm>
@@ -111,13 +108,11 @@
     <tertiary>Keisti</tertiary>
   </indexterm>
   <indexterm lang="lt">
-  <primary>KaukÄs</primary>
-  <secondary>Sluoksnio kaukÄ</secondary>
-  <tertiary>Keisti</tertiary>
-</indexterm>
-  <indexterm lang="lt">
-    <primary>Keisti sluoksnio kaukÄ</primary>
+    <primary>KaukÄs</primary>
+    <secondary>Sluoksnio kaukÄ</secondary>
+    <tertiary>Keisti</tertiary>
   </indexterm>
+  <indexterm lang="lt"><primary>Keisti sluoksnio kaukÄ</primary></indexterm>
 
   <indexterm lang="no">
     <primary>Lagmenyen</primary>
@@ -125,8 +120,7 @@
     <tertiary>Rediger til lagmaske</tertiary>
   </indexterm>
   <indexterm lang="no">
-    <primary>Masker</primary>
-    <secondary>Rediger til lagmaske</secondary>
+    <primary>Masker</primary><secondary>Rediger til lagmaske</secondary>
   </indexterm>
 
   <para lang="en">
@@ -141,7 +135,7 @@
 
   <para lang="de">
     Wenn Sie im Ebenenmasken-Menà auf den Eintrag
-    <guimenuitem>Ebenenmaske editieren</guimenuitem> klicken, wird daneben
+    <guimenuitem>Ebenenmaske bearbeiten</guimenuitem> klicken, wird daneben
     ein HÃkchen angezeigt, die Ebenenmaske wird die aktive Komponente der
     aktuellen Ebene und im Ebenendialog wird der Rahmen des Miniaturbildes
     weiÃ. Wenn Sie das HÃkchen entfernen (indem Sie den Eintrag nochmals
@@ -233,7 +227,7 @@
           <menuchoice>
             <guimenu><accel>E</accel>bene</guimenu>
             <guisubmenu><accel>M</accel>aske</guisubmenu>
-            <guimenuitem>Ebenenmaske editieren</guimenuitem>
+            <guimenuitem>Ebenenmaske bearbeiten</guimenuitem>
           </menuchoice>.
         </para>
         <para lang="es">
@@ -291,7 +285,7 @@
         <para lang="de">
           Sie kÃnnen diese Aktion auf die gleiche Weise wieder rÃckgÃngig
           machen, also das HÃkchen im Ebenenmasken-Menà durch Klicken auf
-          <guimenuitem>Ebenenmaske editieren</guimenuitem> entfernen oder
+          <guimenuitem>Ebenenmaske bearbeiten</guimenuitem> entfernen oder
           mit einem Mausklick auf die Ebenenkomponente im Ebenendialog.
         </para>
         <para lang="es">

Modified: trunk/src/menus/layer-mask-show.xml
==============================================================================
--- trunk/src/menus/layer-mask-show.xml	(original)
+++ trunk/src/menus/layer-mask-show.xml	Fri Feb  1 23:02:34 2008
@@ -59,8 +59,7 @@
   </indexterm>
 
   <indexterm lang="de">
-    <primary>Ebenenmaske</primary>
-    <secondary>Anzeigen</secondary>
+    <primary>Ebenenmaske</primary><secondary>anzeigen</secondary>
   </indexterm>
 
   <indexterm lang="es">

Modified: trunk/src/menus/layer-merge-down.xml
==============================================================================
--- trunk/src/menus/layer-merge-down.xml	(original)
+++ trunk/src/menus/layer-merge-down.xml	Fri Feb  1 23:02:34 2008
@@ -50,12 +50,10 @@
     <secondary>Stack managing</secondary>
     <tertiary>Merge current layer with the underlying layer</tertiary>
   </indexterm>
-  <indexterm lang="en">
-    <primary>Merge Down</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Merge Down</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Ebene</primary><secondary>Vereinen</secondary>
+    <primary>Ebene</primary><secondary>vereinen</secondary>
   </indexterm>
 
   <indexterm lang="es">
@@ -63,40 +61,31 @@
     <secondary>Gestionar la pila</secondary>
     <tertiary>Combinar la capa actual con la capa subyacente</tertiary>
   </indexterm>
-  <indexterm lang="es">
-    <primary>Combinar hacia abajo</primary>
-  </indexterm>
+  <indexterm lang="es"><primary>Combinar hacia abajo</primary></indexterm>
 
   <indexterm lang="fr">
     <primary>Calque</primary>
     <secondary>GÃrer la pile de calques</secondary>
     <tertiary>Fusionner le calque actif avec le calque sous-jacent</tertiary>
   </indexterm>
-  <indexterm lang="fr">
-    <primary>Fusionner vers le bas</primary>
-  </indexterm>
+  <indexterm lang="fr"><primary>Fusionner vers le bas</primary></indexterm>
 
   <indexterm lang="it">
     <primary>Livello</primary>
     <secondary>Gestione della pila</secondary>
     <tertiary>Fonde il livello corrente con quello sottostante</tertiary>
   </indexterm>
-  <indexterm lang="it">
-    <primary>Fondi in basso</primary>
-  </indexterm>
+  <indexterm lang="it"><primary>Fondi in basso</primary></indexterm>
 
   <indexterm lang="lt">
     <primary>Sluoksnis</primary>
     <secondary>KrÅvos valdymas</secondary>
     <tertiary>Sujungti dabartinÄ sluoksnÄ su Åemiau esanÄiu sluoksniu</tertiary>
   </indexterm>
-  <indexterm lang="lt">
-    <primary>Sujungti su Åemesniu</primary>
-  </indexterm>
+  <indexterm lang="lt"><primary>Sujungti su Åemesniu</primary></indexterm>
 
   <indexterm lang="no">
-    <primary>Lagmenyen</primary>
-    <secondary>Flett saman nedover</secondary>
+    <primary>Lagmenyen</primary><secondary>Flett saman nedover</secondary>
   </indexterm>
 
   <para lang="en">

Modified: trunk/src/menus/layer-next.xml
==============================================================================
--- trunk/src/menus/layer-next.xml	(original)
+++ trunk/src/menus/layer-next.xml	Fri Feb  1 23:02:34 2008
@@ -50,14 +50,10 @@
     <secondary>Stack managing</secondary>
     <tertiary>Select next layer</tertiary>
   </indexterm>
-  <indexterm lang="en">
-    <primary>Select Next Layer</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Select Next Layer</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Ebene</primary>
-    <secondary>AuswÃhlen</secondary>
-    <tertiary>NÃchste</tertiary>
+    <primary>Ebene</primary><secondary>auswÃhlen</secondary>
   </indexterm>
 
   <indexterm lang="es">

Modified: trunk/src/menus/layer-previous.xml
==============================================================================
--- trunk/src/menus/layer-previous.xml	(original)
+++ trunk/src/menus/layer-previous.xml	Fri Feb  1 23:02:34 2008
@@ -50,14 +50,10 @@
     <secondary>Stack managing</secondary>
     <tertiary>Select previous layer</tertiary>
   </indexterm>
-  <indexterm lang="en">
-    <primary>Select Previous Layer</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Select Previous Layer</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Ebene</primary>
-    <secondary>AuswÃhlen</secondary>
-    <tertiary>Vorherige</tertiary>
+    <primary>Ebene</primary><secondary>auswÃhlen</secondary>
   </indexterm>
 
   <indexterm lang="es">

Modified: trunk/src/menus/layer-stretch-commands.xml
==============================================================================
--- trunk/src/menus/layer-stretch-commands.xml	(original)
+++ trunk/src/menus/layer-stretch-commands.xml	Fri Feb  1 23:02:34 2008
@@ -57,18 +57,13 @@
     <secondary>Colors managing</secondary>
     <tertiary>Color-stretching commands</tertiary>
   </indexterm>
-  <indexterm lang="en">
-    <primary>Colors</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Colors</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Ebene</primary>
-    <secondary>Farben</secondary>
-    <tertiary>Farbstreckung</tertiary>
+    <primary>Ebene</primary><secondary>Farbstreckung</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary>Farbe</primary>
-    <secondary>Automatische Farbstreckung</secondary>
+    <primary>Farbe</primary><secondary>Automatische Farbstreckung</secondary>
   </indexterm>
   <indexterm lang="de"><primary>Farbstreckung</primary></indexterm>
 
@@ -77,9 +72,7 @@
     <secondary>GestiÃn de los colores</secondary>
     <tertiary>Comandos de extensiÃn de colores</tertiary>
   </indexterm>
-  <indexterm lang="es">
-    <primary>Colores</primary>
-  </indexterm>
+  <indexterm lang="es"><primary>Colores</primary></indexterm>
 
   <indexterm lang="fr">
     <primary>Calque</primary>
@@ -97,9 +90,7 @@
     <secondary>SpalvÅ valdymas</secondary>
     <tertiary>SpalvÅ iÅtempimo komandos</tertiary>
   </indexterm>
-  <indexterm lang="lt">
-    <primary>Spalvos</primary>
-  </indexterm>
+  <indexterm lang="lt"><primary>Spalvos</primary></indexterm>
 
   <indexterm lang="no">
     <primary>Fargar</primary>

Modified: trunk/src/menus/layer-top.xml
==============================================================================
--- trunk/src/menus/layer-top.xml	(original)
+++ trunk/src/menus/layer-top.xml	Fri Feb  1 23:02:34 2008
@@ -55,9 +55,7 @@
   </indexterm>
 
   <indexterm lang="de">
-    <primary>Ebene</primary>
-    <secondary>AuswÃhlen</secondary>
-    <tertiary>Oberste</tertiary>
+    <primary>Ebene</primary><secondary>auswÃhlen</secondary>
   </indexterm>
 
   <indexterm lang="es">

Modified: trunk/src/menus/selection-feather.xml
==============================================================================
--- trunk/src/menus/selection-feather.xml	(original)
+++ trunk/src/menus/selection-feather.xml	Fri Feb  1 23:02:34 2008
@@ -50,15 +50,14 @@
     <phrase lang="no">FjÃrkant</phrase>
   </title>
 
-  <indexterm lang="cs"><primary>ProlnutÃ</primary></indexterm>
-  <indexterm lang="de">
-    <primary>Auswahl</primary>
-    <secondary>Ausblenden</secondary>
-  </indexterm>
   <indexterm lang="en">
     <primary>Selection</primary>
     <secondary>Feather selection edges</secondary>
   </indexterm>
+  <indexterm lang="cs"><primary>ProlnutÃ</primary></indexterm>
+  <indexterm lang="de">
+    <primary>Auswahl</primary><secondary>ausblenden</secondary>
+  </indexterm>
   <indexterm lang="es">
     <primary>SelecciÃn</primary>
     <secondary>Difuminar los bordes de la selecciÃn</secondary>

Modified: trunk/src/menus/selection-grow.xml
==============================================================================
--- trunk/src/menus/selection-grow.xml	(original)
+++ trunk/src/menus/selection-grow.xml	Fri Feb  1 23:02:34 2008
@@ -51,20 +51,16 @@
   </title>
 
   <indexterm lang="en">
-    <primary>Selection</primary>
-    <secondary>Grow selection</secondary>
+    <primary>Selection</primary><secondary>Grow selection</secondary>
   </indexterm>
   <indexterm lang="cs">
-    <primary>Vybrat</primary>
-    <secondary>ZvÄtÅit...</secondary>
+    <primary>Vybrat</primary><secondary>ZvÄtÅit...</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary>Auswahl</primary>
-    <secondary>VergrÃÃern</secondary>
+    <primary>Auswahl</primary><secondary>vergrÃÃern</secondary>
   </indexterm>
   <indexterm lang="es">
-    <primary>SelecciÃn</primary>
-    <secondary>Agrandar selecciÃn</secondary>
+    <primary>SelecciÃn</primary><secondary>Agrandar selecciÃn</secondary>
   </indexterm>
   <indexterm lang="fr">
     <primary>SÃlection</primary>
@@ -75,16 +71,13 @@
     <secondary>Agrandir le contour de sÃlection</secondary>
   </indexterm>
   <indexterm lang="it">
-    <primary>Selezione</primary>
-    <secondary>Allarga</secondary>
+    <primary>Selezione</primary><secondary>Allarga</secondary>
   </indexterm>
   <indexterm lang="lt">
-    <primary>ÅymÄjimas</primary>
-    <secondary>Padidinti paÅymÄjimÄ</secondary>
+    <primary>ÅymÄjimas</primary><secondary>Padidinti paÅymÄjimÄ</secondary>
   </indexterm>
   <indexterm lang="no">
-    <primary>Markering</primary>
-    <secondary>Auk</secondary>
+    <primary>Markering</primary><secondary>Auk</secondary>
   </indexterm>
 
   <para lang="en">

Modified: trunk/src/menus/selection-invert.xml
==============================================================================
--- trunk/src/menus/selection-invert.xml	(original)
+++ trunk/src/menus/selection-invert.xml	Fri Feb  1 23:02:34 2008
@@ -52,34 +52,27 @@
     <phrase lang="no">Inverter</phrase>
   </title>
 
+  <indexterm lang="en">
+    <primary>Selection</primary><secondary>Invert selection</secondary>
+  </indexterm>
   <indexterm lang="cs"><primary>Invertovat</primary></indexterm>
   <indexterm lang="de">
-    <primary>Auswahl</primary>
-    <secondary>Invertieren</secondary>
-  </indexterm>
-  <indexterm lang="en">
-    <primary>Selection</primary>
-    <secondary>Invert selection</secondary>
+    <primary>Auswahl</primary><secondary>invertieren</secondary>
   </indexterm>
   <indexterm lang="es">
-    <primary>SelecciÃn</primary>
-    <secondary>Invertir la selecciÃn</secondary>
+    <primary>SelecciÃn</primary><secondary>Invertir la selecciÃn</secondary>
   </indexterm>
   <indexterm lang="fr">
-      <primary>SÃlection</primary>
-      <secondary>Inverser la sÃlection</secondary>
+    <primary>SÃlection</primary><secondary>Inverser la sÃlection</secondary>
   </indexterm>
   <indexterm lang="it">
-    <primary>Selezione</primary>
-    <secondary>Inverti</secondary>
+    <primary>Selezione</primary><secondary>Inverti</secondary>
   </indexterm>
   <indexterm lang="lt">
-    <primary>ÅymÄjimas</primary>
-    <secondary>Invertuotas paÅymÄjimas</secondary>
+    <primary>ÅymÄjimas</primary><secondary>Invertuotas paÅymÄjimas</secondary>
   </indexterm>
   <indexterm lang="no">
-    <primary>Utval</primary>
-    <secondary>Inverter</secondary>
+    <primary>Utval</primary><secondary>Inverter</secondary>
   </indexterm>
 
   <para lang="cs">

Modified: trunk/src/menus/selection-none.xml
==============================================================================
--- trunk/src/menus/selection-none.xml	(original)
+++ trunk/src/menus/selection-none.xml	Fri Feb  1 23:02:34 2008
@@ -50,13 +50,13 @@
     <phrase lang="no">Ingen</phrase>
   </title>
 
-  <indexterm lang="cs"><primary>Nic</primary></indexterm>
-  <indexterm lang="de">
-    <primary>Auswahl</primary><secondary>Aufheben</secondary>
-  </indexterm>
   <indexterm lang="en">
     <primary>Selection</primary><secondary>Delete selections</secondary>
   </indexterm>
+  <indexterm lang="cs"><primary>Nic</primary></indexterm>
+  <indexterm lang="de">
+    <primary>Auswahl</primary><secondary>aufheben</secondary>
+  </indexterm>
   <indexterm lang="es">
     <primary>SelecciÃn</primary><secondary>Borrar selecciones</secondary>
   </indexterm>

Modified: trunk/src/menus/selection-sharpen.xml
==============================================================================
--- trunk/src/menus/selection-sharpen.xml	(original)
+++ trunk/src/menus/selection-sharpen.xml	Fri Feb  1 23:02:34 2008
@@ -50,15 +50,14 @@
     <phrase lang="no">Gjer skarpare</phrase>
   </title>
 
-  <indexterm lang="cs"><primary>ZaostÅit</primary></indexterm>
-  <indexterm lang="de">
-    <primary>Auswahl</primary>
-    <secondary>SchÃrfen</secondary>
-  </indexterm>
   <indexterm lang="en">
     <primary>Selection</primary>
     <secondary>Remove the feathering of border selection</secondary>
   </indexterm>
+  <indexterm lang="cs"><primary>ZaostÅit</primary></indexterm>
+  <indexterm lang="de">
+    <primary>Auswahl</primary><secondary>schÃrfen</secondary>
+  </indexterm>
   <indexterm lang="es">
     <primary>SelecciÃn</primary>
     <secondary>Quitar el difuminado del borde de la selecciÃn</secondary>
@@ -68,16 +67,14 @@
     <secondary>Enlever l'adoucissement des bords d'une selection</secondary>
   </indexterm>
   <indexterm lang="it">
-    <primary>Seleziona</primary>
-    <secondary>Definita</secondary>
+    <primary>Seleziona</primary><secondary>Definita</secondary>
   </indexterm>
   <indexterm lang="lt">
     <primary>ÅymÄjimas</primary>
     <secondary>PaÅalinti paÅymÄtos srities kraÅtÅ iÅliejimÄ</secondary>
   </indexterm>
   <indexterm lang="no">
-    <primary>Markering</primary>
-    <secondary>Gjer skarpare</secondary>
+    <primary>Markering</primary><secondary>Gjer skarpare</secondary>
   </indexterm>
 
   <para lang="cs">

Modified: trunk/src/menus/selection-shrink.xml
==============================================================================
--- trunk/src/menus/selection-shrink.xml	(original)
+++ trunk/src/menus/selection-shrink.xml	Fri Feb  1 23:02:34 2008
@@ -50,18 +50,16 @@
     <phrase lang="no">Krymp</phrase>
   </title>
 
-  <indexterm lang="cs">
-    <primary>Vybrat</primary>
-    <secondary>ZmenÅit...</secondary>
-  </indexterm>
-  <indexterm lang="de">
-    <primary>Auswahl</primary>
-    <secondary>Verkleinern</secondary>
-  </indexterm>
   <indexterm lang="en">
     <primary>Selection</primary>
     <secondary>Shrink the size of selection</secondary>
   </indexterm>
+  <indexterm lang="cs">
+    <primary>Vybrat</primary><secondary>ZmenÅit...</secondary>
+  </indexterm>
+  <indexterm lang="de">
+    <primary>Auswahl</primary><secondary>verkleinern</secondary>
+  </indexterm>
   <indexterm lang="es">
     <primary>SelecciÃn</primary>
     <secondary>Encoger el tamaÃo de la selecciÃn</secondary>
@@ -75,16 +73,14 @@
     <secondary>Agrandir le contour de sÃlection</secondary>
   </indexterm>
   <indexterm lang="it">
-    <primary>Selezione</primary>
-    <secondary>Riduci</secondary>
+    <primary>Selezione</primary><secondary>Riduci</secondary>
   </indexterm>
   <indexterm lang="lt">
     <primary>PaÅymÄjimas</primary>
     <secondary>SumaÅinti paÅymÄtos srities dydÄ</secondary>
   </indexterm>
   <indexterm lang="no">
-    <primary>Markering</primary>
-    <secondary>Krymp</secondary>
+    <primary>Markering</primary><secondary>Krymp</secondary>
   </indexterm>
 
 

Modified: trunk/src/menus/view-show-guides.xml
==============================================================================
--- trunk/src/menus/view-show-guides.xml	(original)
+++ trunk/src/menus/view-show-guides.xml	Fri Feb  1 23:02:34 2008
@@ -50,18 +50,16 @@
     <phrase lang="zh_CN">æçåèç</phrase>
   </title>
 
-  <indexterm lang="cs"><primary>Zobrazovat vodÃtka</primary></indexterm>
-  <indexterm lang="de">
-    <primary>Hilfslinie</primary>
-    <secondary>anzeigen</secondary>
-  </indexterm>
-
   <indexterm lang="en">
-    <primary>Guides</primary>
-    <secondary>Show/Mask Guides</secondary>
+    <primary>Guides</primary><secondary>Show/Mask Guides</secondary>
   </indexterm>
   <indexterm lang="en"><primary>Show Guides</primary></indexterm>
 
+  <indexterm lang="cs"><primary>Zobrazovat vodÃtka</primary></indexterm>
+  <indexterm lang="de">
+    <primary>Hilfslinie</primary><secondary>anzeigen</secondary>
+  </indexterm>
+
   <indexterm lang="es">
     <primary>GuÃas</primary>
     <secondary>Mostrar/Ocultar las guÃas</secondary>

Modified: trunk/src/menus/view-show-selection.xml
==============================================================================
--- trunk/src/menus/view-show-selection.xml	(original)
+++ trunk/src/menus/view-show-selection.xml	Fri Feb  1 23:02:34 2008
@@ -56,23 +56,26 @@
     <tertiary>Show/Mask selection boundary</tertiary>
   </indexterm>
   <indexterm lang="en"><primary>Show Selection</primary></indexterm>
+
   <indexterm lang="cs"><primary>Zobrazovat vÃbÄr</primary></indexterm>
   <indexterm lang="de">
-    <primary>Auswahl</primary>
-    <secondary>Anzeigen</secondary>
+    <primary>Auswahl</primary><secondary>anzeigen</secondary>
   </indexterm>
+
   <indexterm lang="es">
     <primary>SelecciÃn</primary>
     <secondary>LÃmites de la selecciÃn</secondary>
     <tertiary>Mostrar/Ocultar los lÃmites de la selecciÃn</tertiary>
   </indexterm>
   <indexterm lang="es"><primary>Mostrar selecciÃn</primary></indexterm>
+
   <indexterm lang="fr">
     <primary>SÃlection</primary>
     <secondary>Bords de sÃlection</secondary>
     <tertiary>Afficher/Masquer les limites de sÃlection</tertiary>
   </indexterm>
   <indexterm lang="fr"><primary>Afficher la sÃlection</primary></indexterm>
+
   <indexterm lang="it"><primary>Selezione</primary></indexterm>
   <indexterm lang="lt">
     <primary>PaÅymÄjimas</primary>

Modified: trunk/src/menus/xtns-unit-editor.xml
==============================================================================
--- trunk/src/menus/xtns-unit-editor.xml	(original)
+++ trunk/src/menus/xtns-unit-editor.xml	Fri Feb  1 23:02:34 2008
@@ -54,28 +54,19 @@
     <phrase lang="zh_CN">åäçèå</phrase>
   </title>
 
-  <indexterm lang="en">
-    <primary>Unit of measurement</primary>
-  </indexterm>
-  <indexterm lang="en">
-    <primary>Unit Editor</primary>
-  </indexterm>
-  <indexterm lang="cs">
-    <primary>jednotky mÄÅenÃ</primary>
-  </indexterm>
+  <indexterm lang="en"><primary>Unit of measurement</primary></indexterm>
+  <indexterm lang="en"><primary>Unit Editor</primary></indexterm>
+
+  <indexterm lang="cs"><primary>jednotky mÄÅenÃ</primary></indexterm>
 
   <indexterm lang="de">
-    <primary>Einheiten</primary>
-    <secondary>bearbeiten</secondary>
+    <primary>Einheiten</primary><secondary>bearbeiten</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary>MaÃeinheiten</primary>
-    <secondary>Bearbeiten</secondary>
+    <primary>MaÃeinheiten</primary><secondary>bearbeiten</secondary>
   </indexterm>
 
-  <indexterm lang="es">
-    <primary>Unidad de medida</primary>
-  </indexterm>
+  <indexterm lang="es"><primary>Unidad de medida</primary></indexterm>
   <indexterm lang="es">
     <primary>Editor de medida</primary>
   </indexterm>

Modified: trunk/src/toolbox/tool-align.xml
==============================================================================
--- trunk/src/toolbox/tool-align.xml	(original)
+++ trunk/src/toolbox/tool-align.xml	Fri Feb  1 23:02:34 2008
@@ -77,7 +77,7 @@
 
   <indexterm lang="de"><primary>Ausrichten</primary></indexterm>
   <indexterm lang="de">
-    <primary>Werkzeug</primary><secondary>Ausrichten</secondary>
+    <primary>Werkzeug</primary><secondary>ausrichten</secondary>
   </indexterm>
 
   <indexterm lang="es"><primary>Alineado</primary></indexterm>

Modified: trunk/src/toolbox/tool-move.xml
==============================================================================
--- trunk/src/toolbox/tool-move.xml	(original)
+++ trunk/src/toolbox/tool-move.xml	Fri Feb  1 23:02:34 2008
@@ -76,8 +76,7 @@
   </indexterm>
 
   <indexterm lang="es">
-    <primary>Herramientas</primary>
-    <secondary>Mover</secondary>
+    <primary>Herramientas</primary><secondary>Mover</secondary>
   </indexterm>
   <indexterm lang="es"><primary>Mover</primary></indexterm>
 
@@ -92,8 +91,7 @@
   <indexterm lang="it"><primary>Spostamento</primary></indexterm>
 
   <indexterm lang="no">
-    <primary>VerktÃy</primary>
-    <secondary>Flytt</secondary>
+    <primary>VerktÃy</primary><secondary>Flytt</secondary>
   </indexterm>
   <indexterm lang="no"><primary>FlytteverktÃyet</primary></indexterm>
 
@@ -138,7 +136,7 @@
         <imagedata fileref="../images/toolbox/es/toolbox-move.png"
           format="PNG" />
       </imageobject>
-     <imageobject lang="fr">
+      <imageobject lang="fr">
         <imagedata fileref="../images/toolbox/fr/toolbox-move.png"
           format="PNG" />
       </imageobject>
@@ -243,9 +241,7 @@
       Sie haben verschiedene MÃglichkeiten, das Werkzeug
       <quote>Verschieben</quote> zu aktivieren:
     </para>
-    <para lang="no">
-      Du kan hente fram dette verktÃyet pà fleire mÃtar:
-    </para>
+    <para lang="no">Du kan hente fram dette verktÃyet pà fleire mÃtar:</para>
 
     <itemizedlist>
       <listitem>
@@ -304,9 +300,9 @@
           <guimenuitem>TransformeringsverktÃya</guimenuitem>
           <guimenuitem>Flytt</guimenuitem>,
         </para>
-  <para lang="pl">
+        <para lang="pl">
           NarzÄdzie moÅna aktywowaÄ na kilka sposobÃw:
-    poprzez menu obrazu
+          poprzez menu obrazu
           <menuchoice>
             <guimenu>NarzÄdzia</guimenu>
             <guisubmenu>NarzÄdzia przeksztaÅcania</guisubmenu>
@@ -1575,12 +1571,13 @@
       <term lang="en">Moving a layer</term>
       <term lang="de">Eine Ebene verschieben</term>
       <term lang="fr">DÃplacer un calque</term>
+
       <listitem>
         <indexterm lang="en">
           <primary>Layer</primary><secondary>Move</secondary>
         </indexterm>
         <indexterm lang="de">
-          <primary>Ebene</primary><secondary>Verschieben</secondary>
+          <primary>Ebene</primary><secondary>verschieben</secondary>
         </indexterm>
         <indexterm lang="fr">
           <primary>Calque</primary><secondary>DÃplacer</secondary>
@@ -1611,12 +1608,13 @@
       <term lang="en">Moving a guide</term>
       <term lang="de">Eine Hilfslinie verschieben</term>
       <term lang="fr">DÃplacer un guide</term>
+
       <listitem>
         <indexterm lang="en">
           <primary>Guide</primary><secondary>Move</secondary>
         </indexterm>
         <indexterm lang="de">
-          <primary>Hilfslinie</primary><secondary>Verschieben</secondary>
+          <primary>Hilfslinie</primary><secondary>verschieben</secondary>
         </indexterm>
         <indexterm lang="fr">
           <primary>Guide</primary><secondary>DÃplacer</secondary>
@@ -1625,9 +1623,9 @@
         <para lang="en">
           When you pull a guide from a ruler, the Move tool is automatically
           activated. That's not the case after using another tool, and you
-          have to activate it by yourself. When the mouse pointer goes over
-          a guide, this guide turns to red and you can click-and-drag to
-          move it.
+          have to activate it by yourself. When the mouse pointer goes over a
+          guide, this guide turns to red and you can click-and-drag to move
+          it.
         </para>
         <para lang="de">
           Wenn Sie eine Hilfslinie aus einem Lineal herausziehen, wird
@@ -1639,10 +1637,10 @@
         </para>
         <para lang="fr">
           Quand vous tirez un guide d'une rÃgle, l'outil de DÃplacement est
-          automatiquement activÃ. Ce n'est plus le cas aprÃs avoir utilisÃ
-          un autre outil et vous devez l'activer vous-mÃme. Quand le pointeur
-          de la souris passe sur un guide, ce guide devient rouge et vous
-          pouvez le dÃplacer par un cliquer-glisser.
+          automatiquement activÃ. Ce n'est plus le cas aprÃs avoir utilisà un
+          autre outil et vous devez l'activer vous-mÃme. Quand le pointeur de
+          la souris passe sur un guide, ce guide devient rouge et vous pouvez
+          le dÃplacer par un cliquer-glisser.
         </para>
       </listitem>
     </varlistentry>
@@ -1651,12 +1649,13 @@
       <term lang="en">Moving a path</term>
       <term lang="de">Einen Pfad verschieben</term>
       <term lang="fr">DÃplacer un chemin</term>
+
       <listitem>
         <indexterm lang="en">
           <primary>Path</primary><secondary>Move</secondary>
         </indexterm>
         <indexterm lang="de">
-          <primary>Pfad</primary><secondary>Verschieben</secondary>
+          <primary>Pfad</primary><secondary>verschieben</secondary>
         </indexterm>
         <indexterm lang="fr">
           <primary>Chemin</primary><secondary>DÃplacer</secondary>
@@ -1694,12 +1693,13 @@
       <term lang="en">Moving a text</term>
       <term lang="de">Einen Text verschieben</term>
       <term lang="fr">DÃplacer un texte</term>
+
       <listitem>
         <indexterm lang="en">
           <primary>Text</primary><secondary>Move</secondary>
         </indexterm>
         <indexterm lang="de">
-          <primary>Text</primary><secondary>Verschieben</secondary>
+          <primary>Text</primary><secondary>verschieben</secondary>
         </indexterm>
         <indexterm lang="fr">
           <primary>Texte</primary><secondary>DÃplacer</secondary>

Modified: trunk/src/toolbox/tool-scale.xml
==============================================================================
--- trunk/src/toolbox/tool-scale.xml	(original)
+++ trunk/src/toolbox/tool-scale.xml	Fri Feb  1 23:02:34 2008
@@ -67,19 +67,18 @@
   <indexterm lang="de"><primary>Skalieren</primary></indexterm>
 
   <indexterm lang="es">
-    <primary>Herramientas</primary>
-    <secondary>Escalar</secondary>
+    <primary>Herramientas</primary><secondary>Escalar</secondary>
   </indexterm>
   <indexterm lang="es"><primary>Escalar</primary></indexterm>
 
   <indexterm lang="fr">
-    <primary>Outils</primary>
-    <secondary>Ãtirer ou RÃtrÃcir</secondary>
+    <primary>Outils</primary><secondary>Ãtirer ou RÃtrÃcir</secondary>
   </indexterm>
   <indexterm lang="fr">
     <primary>Redimensionner</primary>
-    <secondary>Redimensionner le calque, le contour de sÃlection ou le
-      chemin</secondary>
+    <secondary>
+      Redimensionner le calque, le contour de sÃlection ou le chemin
+    </secondary>
   </indexterm>
   <indexterm lang="fr"><primary>Ãtirer ou RÃtrÃcir</primary></indexterm>
   <indexterm lang="fr"><primary>Changer la taille</primary></indexterm>
@@ -98,21 +97,16 @@
   <indexterm lang="no"><primary>Skalering</primary></indexterm>
 
   <indexterm lang="pl">
-    <primary>NarzÄdzia</primary>
-    <secondary>Skalowanie</secondary>
-  </indexterm>
-  <indexterm lang="pl">
-    <primary>Skalowanie</primary>
+    <primary>NarzÄdzia</primary><secondary>Skalowanie</secondary>
   </indexterm>
+  <indexterm lang="pl"><primary>Skalowanie</primary></indexterm>
 
   <indexterm lang="ru">
     <primary>ÐÐÑÑÑÑÐÐÐÑÑ</primary>
     <secondary>ÐÐÑÑÑÐÐ</secondary>
     <tertiary>ÐÐÐÐ</tertiary>
   </indexterm>
-  <indexterm lang="ru">
-    <primary>ÐÐÑÑÑÐÐ</primary>
-  </indexterm>
+  <indexterm lang="ru"><primary>ÐÐÑÑÑÐÐ</primary></indexterm>
 
   <indexterm lang="zh_CN">
     <primary>ååç</primary>

Modified: trunk/src/toolbox/tool-text.xml
==============================================================================
--- trunk/src/toolbox/tool-text.xml	(original)
+++ trunk/src/toolbox/tool-text.xml	Fri Feb  1 23:02:34 2008
@@ -969,6 +969,7 @@
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term lang="cs">VyhlazovÃnÃ</term>
         <term lang="en">Antialiasing</term>
@@ -979,56 +980,55 @@
         <term lang="pl">WygÅadzaj</term>
         <term lang="ru">ÐÐÐÐÐÐÐÐÐÐÐ</term>
         <term lang="zh_CN">èçåæ</term>
+
         <listitem>
           <para lang="cs">
-            VyhlazovÃnà (neboli antialiasing) vyhladà zubatà hrany pÃsma.
-            Je toho dosaÅeno mÃrnÃm rozmazÃnÃm okrajÅ pÃsma. VyhlazovÃnà mÅÅe
+            VyhlazovÃnà (neboli antialiasing) vyhladà zubatà hrany pÃsma. Je
+            toho dosaÅeno mÃrnÃm rozmazÃnÃm okrajÅ pÃsma. VyhlazovÃnà mÅÅe
             nesmÃrnÄ vylepÅit vizuÃlnà dojem z pÃsma. OvÅem u malÃch velikostÃ
             mÅÅe vyhlazovÃnà zhorÅit Äitelnost pÃsma.
           </para>
           <para lang="en">
-            Antialiasing will render the text with much smoother edges
-            and curves. This is achieved by slight blurring and merging
-            of the edges. This option can radically improve the visual
-            appearance of the rendered typeface. Caution should be
-            exercised when using antialiasing on images that are not in
-            RGB color space.
-          </para>
-          <para lang="de">
-            Mit aktivierter <guilabel>KantenglÃttung</guilabel> wird
-            Text sehr viel weicher auf das Bild gezeichnet, indem
-            schrÃge Kanten weichgezeichnet werden. Dadurch kann vor
-            allem bei groÃer Schrift die Lesbarkeit erheblich gesteigert werden.
-            Jedoch bewirkt die KantenglÃttung bei sehr kleiner Schrift leider
-            genau das Gegenteil. Der Text ist nur noch schwer
-            lesbar und wirkt verschwommen. Vor allem bei Schriften mit
-            einer konstanten SchriftgrÃÃe (Pixelschriftarten) ist die
-            KantenglÃttung nicht zu empfehlen.
-          </para>
-          <para lang="fr">
-            Avec cette option les bords de vos lettres seront
-            rÃgularisÃs, ce qui peut amÃliorer grandement leur aspect.
-            Mais mÃfiez-vous si vous n'Ãtes pas dans l'espace de
-            couleurs RVB.
+            Antialiasing will render the text with much smoother edges and
+            curves. This is achieved by slight blurring and merging of the
+            edges. This option can radically improve the visual appearance of
+            the rendered typeface. Caution should be exercised when using
+            antialiasing on images that are not in RGB color space.
+          </para>
+          <para lang="de">
+            Mit aktivierter <guilabel>KantenglÃttung</guilabel>
+            wird Text sehr viel weicher auf das Bild gezeichnet, indem schrÃge
+            Kanten weichgezeichnet werden. Dadurch kann vor allem bei groÃer
+            Schrift die Lesbarkeit erheblich gesteigert werden. Jedoch bewirkt
+            die KantenglÃttung bei sehr kleiner Schrift leider genau das
+            Gegenteil. Der Text ist nur noch schwer lesbar und wirkt
+            verschwommen. Vor allem bei Schriften mit einer konstanten
+            SchriftgrÃÃe (Pixelschriftarten) ist die KantenglÃttung nicht zu
+            empfehlen.
+          </para>
+          <para lang="fr">
+            Avec cette option les bords de vos lettres seront rÃgularisÃs, ce
+            qui peut amÃliorer grandement leur aspect. Mais mÃfiez-vous si
+            vous n'Ãtes pas dans l'espace de couleurs RVB.
           </para>
           <para lang="it">
-            Antialiasing produrrà testi con bordi e curve pià smussate.
-            Cià à ottenuto con una leggera sfocatura e fondendo i bordi.
-            Questa opzione puà migliorare sensibilmente la resa visiva del
-            carattere. Bisogna stare attenti quando di usa l'antialiasing
-            in immagini che non sono nello spazio colore RGB.
+            Antialiasing produrrà testi con bordi e curve pià smussate. Cià Ã
+            ottenuto con una leggera sfocatura e fondendo i bordi. Questa
+            opzione puà migliorare sensibilmente la resa visiva del carattere.
+            Bisogna stare attenti quando di usa l'antialiasing in immagini che
+            non sono nello spazio colore RGB.
           </para>
           <para lang="no">
-            NÃr denne er aktivisert, vil teksten bli teikna med meir
-            avrunda og diffuse kantar. Dette vil normalt forbetra det
-            visuelle inntrykket av teksten. Unntaket kan vere dersom
-            biletet ikkje er i RGB-format.
+            NÃr denne er aktivisert, vil teksten bli teikna med meir avrunda
+            og diffuse kantar. Dette vil normalt forbetra det visuelle
+            inntrykket av teksten. Unntaket kan vere dersom biletet ikkje er i
+            RGB-format.
           </para>
           <para lang="pl">
-            WygÅadzanie pokazuje tekst z bardziej miÄkkim konturem.
-            Jest to moÅliwe dziÄki lekkiemu rozmywaniu granic. Opcja ta moÅe
-            o wiele ulepszyÄ widok tekstu. JeÅli modelem koloru nie jest RGB,
-            to wygÅadzanie naleÅy stosowaÄ ostroÅnie.
+            WygÅadzanie pokazuje tekst z bardziej miÄkkim konturem. Jest to
+            moÅliwe dziÄki lekkiemu rozmywaniu granic. Opcja ta moÅe o wiele
+            ulepszyÄ widok tekstu. JeÅli modelem koloru nie jest RGB, to
+            wygÅadzanie naleÅy stosowaÄ ostroÅnie.
           </para>
           <para lang="ru">
             ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÑ ÑÐÐÑÑ Ñ ÐÐÐÐÐ ÐÑÐÐÐÐ ÐÐÐÑÑÑÐÐ. ÐÑÐ ÐÐÑÑÐÐÐÐÑÑÑ
@@ -1037,10 +1037,12 @@
             ÑÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐ ÐÑÐÐÐÐÑÑÑ ÐÑÑÐÑÐÐÐÐ.
           </para>
           <para lang="zh_CN">
-            èçåæééåäåäçèçåæçæåæãåååèçèèääæçåååæäãèäééäåçååæèåäçèèææãèèæåé RGB éèçéååääçèçåææäã
+            èçåæééåäåäçèçåæçæåæãåååèçèèääæçåååæäãèäééäåçååæèåäçèèææãèèæåé RGB
+            éèçéååääçèçåææäã
           </para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term lang="cs">Barva</term>
         <term lang="en">Color</term>
@@ -1051,87 +1053,77 @@
         <term lang="pl">Kolor</term>
         <term lang="ru">ÐÐÐÑ</term>
         <term lang="zh_CN">éè</term>
+
         <listitem>
           <para lang="cs">
-            Barva pÃsma. Jednà se obarvu popÅedà Gimpu. MÅÅete ji nastavit i zde
-            ve volbÃch nÃstroje Text kliknutÃm na barevnou plochu. TÃm se otevÅe
-            dialog pro volbu barvy.
+            Barva pÃsma. Jednà se obarvu popÅedà Gimpu. MÅÅete ji nastavit i
+            zde ve volbÃch nÃstroje Text kliknutÃm na barevnou plochu. TÃm se
+            otevÅe dialog pro volbu barvy.
           </para>
           <para lang="en">
-            Color of the text that will be drawn next.  Defaults to
-            black.  Selectable from the color picker dialog box that
-            opens when the current color sample is clicked.
-            <tip>
-              <para>
-                You can also click-and-drag the color from the Toolbox color
-                area onto the text.
-              </para>
-            </tip>
+            Color of the text that will be drawn next. Defaults to black.
+            Selectable from the color picker dialog box that opens when the
+            current color sample is clicked.
           </para>
           <para lang="de">
             Klicken Sie auf die SchaltflÃche, um aus dem erscheinenden
             Farbendialog die Textfarbe auszuwÃhlen.
-            <tip>
-              <para>
-                Alternativ kÃnnen Sie auch eine Farbe aus dem
-                Werkzeugfenster auswÃhlen und die ausgewÃhlte Farbe auf
-                den Text ziehen.
-              </para>
-            </tip>
           </para>
           <para lang="fr">
-            C'est la couleur de votre texte. Elle est noire par dÃfaut,
-            mais vous pouvez en changer en cliquant sur la barre de
-            couleur adjacente, ce qui fait apparaÃtre la fenÃtre
+            C'est la couleur de votre texte. Elle est noire par dÃfaut, mais
+            vous pouvez en changer en cliquant sur la barre de couleur
+            adjacente, ce qui fait apparaÃtre la fenÃtre
             <quote>Couleur du texte</quote>.
-            <tip>
-              <para>
-                Vous pouvez aussi cliquer-glisser une couleur de l'aire des
-                couleurs de la BoÃte à outils jusque sur le texte.
-              </para>
-            </tip>
           </para>
           <para lang="it">
-            Imposta il colore che sarà usato per rappresentare il
-            carattere.  Il colore predefinito à il nero. Il colore potrÃ
-            essere scelto dalla finestra di dialogo che si aprirà quando si
-            fa clic sul riquadro colorato.
+            Imposta il colore che sarà usato per rappresentare il carattere.
+            Il colore predefinito à il nero. Il colore potrà essere scelto
+            dalla finestra di dialogo che si aprirà quando si fa clic sul
+            riquadro colorato.
           </para>
           <para lang="no">
             Skriftfargen er normalt sett til svart, men du kan velje andre
-            fargar ved à trykke pà denne fargeruta for à fà opp
-            fargeveljaren.
-            <tip>
-              <para>
-                Du kan ogsà klikke og dra farge frà fargeomrÃdet i
-                verktÃyskrinet over i boksen for tekstfarge.
-              </para>
-            </tip>
+            fargar ved à trykke pà denne fargeruta for à fà opp fargeveljaren.
           </para>
           <para lang="pl">
-            ÐkreÅla kolor tekstu. DomyÅlnym kolorem jest czarny.
-            Po klikniÄciu pola pojawia siÄ okno wyboru koloru.
-            <tip>
-              <para>
-                MoÅna rÃwnieÅ przeciÄgnÄÄ kolor z paska narzÄdzi na tekst.
-              </para>
-            </tip>
+            ÐkreÅla kolor tekstu. DomyÅlnym kolorem jest czarny. Po klikniÄciu
+            pola pojawia siÄ okno wyboru koloru.
           </para>
           <para lang="ru">
-            ÐÐÑÐÐÐÐÑÐÑ ÑÐÐÑ ÐÐÑÐÐÐÑÑÑÐÐÐ ÑÐÐÑÑÐ. ÐÑÑÐÑÐ ÑÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÑÐÐÐÑ.
-            ÐÑÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐÑÐÑÑÑ ÐÐÐÐÐÐ ÐÑÐÐÑÐ ÑÐÐÑÐ.
-            <tip>
-              <para>
-                ÐÐÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÑÑ ÑÐÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐÑÑÑÑÐÐÐÑÐÐ ÐÐ ÑÐÐÑÑ.
-              </para>
-            </tip>
+            ÐÐÑÐÐÐÐÑÐÑ ÑÐÐÑ ÐÐÑÐÐÐÑÑÑÐÐÐ ÑÐÐÑÑÐ. ÐÑÑÐÑÐ ÑÑÑÐÐÐÐÐÐÐ ÐÐ
+            ÑÐÐÐÑÐÐÐÑ. ÐÑÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐÑÐÑÑÑ ÐÐÐÐÐÐ ÐÑÐÐÑÐ ÑÐÐÑÐ.
           </para>
           <para lang="zh_CN">
-            èåæåçéèãéèçéèäéèãçåååæåéèïåäæåéè
-            æååèæïäèåèæäéæææäççéèã
+            èåæåçéèãéèçéèäéèãçåååæåéèïåäæåéè æååèæïäèåèæäéæææäççéèã
           </para>
+
+          <tip lang="en;de;fr;no;pl;ru">
+            <para lang="en">
+              You can also click-and-drag the color from the Toolbox color
+              area onto the text.
+            </para>
+            <para lang="de">
+              Alternativ kÃnnen Sie auch eine Farbe aus dem Werkzeugfenster
+              auswÃhlen und die ausgewÃhlte Farbe auf den Text ziehen.
+            </para>
+            <para lang="fr">
+              Vous pouvez aussi cliquer-glisser une couleur de l'aire des
+              couleurs de la BoÃte à outils jusque sur le texte.
+            </para>
+            <para lang="no">
+              Du kan ogsà klikke og dra farge frà fargeomrÃdet i
+              verktÃyskrinet over i boksen for tekstfarge.
+            </para>
+            <para lang="pl">
+              MoÅna rÃwnieÅ przeciÄgnÄÄ kolor z paska narzÄdzi na tekst.
+            </para>
+            <para lang="ru">
+              ÐÐÐÐÐ ÑÐÐÐÐ ÐÐÐÐÑÑÑ ÑÐÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐÑÑÑÑÐÐÐÑÐÐ ÐÐ ÑÐÐÑÑ.
+            </para>
+          </tip>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <!--TODO it;no;pl;ru; v2.4-->
         <term lang="cs">Zarovnat</term>
@@ -1143,10 +1135,11 @@
         <term lang="pl">Justowanie</term>
         <term lang="ru">ÐÑÐÐÑÑÐÐ</term>
         <term lang="zh_CN">åé</term>
+
         <listitem>
           <indexterm lang="en"><primary>Justify</primary></indexterm>
           <indexterm lang="de">
-            <primary>Text</primary><secondary>Ausrichten</secondary>
+            <primary>Text</primary><secondary>ausrichten</secondary>
           </indexterm>
           <indexterm lang="fr"><primary>Justifier</primary></indexterm>
           <indexterm lang="pl"><primary>Justowanie</primary></indexterm>
@@ -1157,43 +1150,39 @@
             zpÅsob zarovnÃnà textu.
           </para>
           <para lang="en">
-            Causes the text to be justified according to any of four
-            rules selectable from the associated icons.
+            Causes the text to be justified according to any of four rules
+            selectable from the associated icons.
           </para>
           <para lang="de">
-            Die Ausrichtung bestimmt die Anordnung des mehrzeiligen Textes.
-            So besteht die MÃglichkeit, Text zentriert, links- oder
-            rechtsbÃndig auszurichten. Blocksatz ist nur dann sinnvoll,
-            wenn der Text durch Silbentrennung auch richtig umgebrochen
-            werden kann. So ist diese Einstellung im Moment noch als optional
-            anzusehen.
+            Die Ausrichtung bestimmt die Anordnung des mehrzeiligen Textes. So
+            besteht die MÃglichkeit, Text zentriert, links- oder rechtsbÃndig
+            auszurichten. Blocksatz ist nur dann sinnvoll, wenn der Text durch
+            Silbentrennung auch richtig umgebrochen werden kann. So ist diese
+            Einstellung im Moment noch als optional anzusehen.
           </para>
           <para lang="fr">
-            Vous disposez là de quatre boutons qui vous permettent de
-            choisir comment sera alignà votre texte. Les bulles
-            d'information sont explicites.
+            Vous disposez là de quatre boutons qui vous permettent de choisir
+            comment sera alignà votre texte. Les bulles d'information sont
+            explicites.
           </para>
           <para lang="it">
-            Consente di giustificare il testo in accordo ad una delle
-            quattro opzioni selezionabili dalle icone associate.
+            Consente di giustificare il testo in accordo ad una delle quattro
+            opzioni selezionabili dalle icone associate.
           </para>
           <para lang="no">
             Trykk pà desse knappane for à bestemme om teksten skal vere
             venstrejustert, hÃgrejustert, midtstilt eller blokkjustert (med
             rette margar).
           </para>
-          <para lang="pl">
-            WyrÃwnuje tekst zgodnie z wybranÄ ikonÄ.
-          </para>
+          <para lang="pl">WyrÃwnuje tekst zgodnie z wybranÄ ikonÄ.</para>
           <para lang="ru">
-            ÐÐÐÐÐÐÑÐÑ ÑÐÐÑÑ ÐÐÐÐÐÑÑÑÑ Ð ÑÐÐÑÐÐÑÑÑÐÐÐ Ñ ÐÑÐÐÐÐÐÐÐ, ÐÑÐÐÑÐÐÐÑÑ ÐÐ
-            ÑÐÐÑÐÐÑÑÑÐÑÑÑÐÑ ÐÐÐÑÐÐÑÐÐÐ.
-          </para>
-          <para lang="zh_CN">
-            æææååçåéæåéæçåæåéææã
+            ÐÐÐÐÐÐÑÐÑ ÑÐÐÑÑ ÐÐÐÐÐÑÑÑÑ Ð ÑÐÐÑÐÐÑÑÑÐÐÐ Ñ ÐÑÐÐÐÐÐÐÐ, ÐÑÐÐÑÐÐÐÑÑ
+            ÐÐ ÑÐÐÑÐÐÑÑÑÐÑÑÑÐÑ ÐÐÐÑÐÐÑÐÐÐ.
           </para>
+          <para lang="zh_CN">æææååçåéæåéæçåæåéææã</para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term lang="cs">OdsazenÃ</term>
         <term lang="en">Indent</term>
@@ -1204,6 +1193,7 @@
         <term lang="pl">ÐdstÄp</term>
         <term lang="ru">ÐÑÑÑÑÐ</term>
         <term lang="zh_CN">çè</term>
+
         <listitem>
           <indexterm lang="en"><primary>Indent</primary></indexterm>
           <indexterm lang="de">
@@ -1213,22 +1203,20 @@
           <indexterm lang="pl"><primary>ÐdstÄp</primary></indexterm>
           <indexterm lang="ru"><primary>ÐÑÑÑÑÐ</primary></indexterm>
 
-          <para lang="cs">
-            OvlÃdà odsazenà prvnà ÅÃdky od okraje.
-          </para>
+          <para lang="cs">OvlÃdà odsazenà prvnà ÅÃdky od okraje.</para>
           <para lang="en">
             Controls the indent spacing from the left margin, for the fist
             line.
           </para>
           <para lang="de">
-            Der <guilabel>Einzug</guilabel> bestimmt bei mehrzeiligen Texten den
-            Grad der EinrÃckung der ersten Zeile. Mit einem Einzug ist es
-            mÃglich, AbsÃtze besser zu kennzeichnen und die Lesbarkeit zu
-            erhÃhen.
+            Der <guilabel>Einzug</guilabel>
+            bestimmt bei mehrzeiligen Texten den Grad der EinrÃckung der
+            ersten Zeile. Mit einem Einzug ist es mÃglich, AbsÃtze besser zu
+            kennzeichnen und die Lesbarkeit zu erhÃhen.
           </para>
           <para lang="fr">
-            L'indentation est le dÃcalage vers la droite de la premiÃre
-            ligne d'un paragraphe. Elle est exprimÃe ici en pixels.
+            L'indentation est le dÃcalage vers la droite de la premiÃre ligne
+            d'un paragraphe. Elle est exprimÃe ici en pixels.
           </para>
           <para lang="it">
             Controlla lo spazio di indentazione dal margine sinistro.
@@ -1236,17 +1224,12 @@
           <para lang="no">
             Bestemmer kor langt frà margen den fÃrste linja skal begynne.
           </para>
-          <para lang="pl">
-            OkreÅla odlegÅoÅÄ od lewej krawÄdzi.
-          </para>
-          <para lang="ru">
-            ÐÐÑÐÐÐÐÑÐÑ ÑÐÑÑÐÑÐÐÐ ÐÑ ÐÐÐÐÐÐ ÐÑÐÑ.
-          </para>
-          <para lang="zh_CN">
-            çäæåäåèçååççèéã
-          </para>
+          <para lang="pl">OkreÅla odlegÅoÅÄ od lewej krawÄdzi.</para>
+          <para lang="ru">ÐÐÑÐÐÐÐÑÐÑ ÑÐÑÑÐÑÐÐÐ ÐÑ ÐÐÐÐÐÐ ÐÑÐÑ.</para>
+          <para lang="zh_CN">çäæåäåèçååççèéã</para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term lang="cs">Rozestup ÅÃdkÅ</term>
         <term lang="en">Line Spacing</term>
@@ -1257,37 +1240,42 @@
         <term lang="pl">OdlegÅoÅÄ miÄdzy wierszami</term>
         <term lang="ru">ÐÐÑÑÐÑÐÐÐ ÐÐÐÐÑ ÑÑÑÐÐ</term>
         <term lang="zh_CN">èéè</term>
+
         <listitem>
           <indexterm lang="en"><primary>Line spacing</primary></indexterm>
           <indexterm lang="de">
             <primary>Text</primary><secondary>Zeilenabstand</secondary>
           </indexterm>
           <indexterm lang="fr"><primary>Interligne</primary></indexterm>
-          <indexterm lang="pl"><primary>OdlegÅoÅÄ miÄdzy wierszami</primary></indexterm>
-          <indexterm lang="ru"><primary>ÐÐÑÑÐÑÐÐÐ ÐÐÐÐÑ ÑÑÑÐÐ</primary></indexterm>
+          <indexterm lang="pl">
+            <primary>OdlegÅoÅÄ miÄdzy wierszami</primary>
+          </indexterm>
+          <indexterm lang="ru">
+            <primary>ÐÐÑÑÐÑÐÐÐ ÐÐÐÐÑ ÑÑÑÐÐ</primary>
+          </indexterm>
 
           <para lang="cs">
             Tato volba ovlÃdà rozestup ÅÃdkÅ textu. Nastavenà je interaktivnÃ,
             okamÅitÄ se promÃtà do napsanÃho textu. ÄÃslo nevyjadÅuje prostor
-            mezi ÅÃdky, nÃbrÅ kolik je od nÄj odeÄteno (pokud je zÃpornÃ)
-            nebo kolik je k nÄmu pÅiÄteno (pokud je kladnÃ).
+            mezi ÅÃdky, nÃbrÅ kolik je od nÄj odeÄteno (pokud je zÃpornÃ) nebo
+            kolik je k nÄmu pÅiÄteno (pokud je kladnÃ).
           </para>
           <para lang="en">
             Controls the spacing between successive lines of text. This
-            setting is interactive: it appears at the same time in image
-            text. The number is not the space between lines itself, but
-            how many pixels must be added to or substracted from this
-            space (the value can be negative).
+            setting is interactive: it appears at the same time in image text.
+            The number is not the space between lines itself, but how many
+            pixels must be added to or substracted from this space (the value
+            can be negative).
           </para>
           <para lang="de">
-            Der Zeilenabstand bestimmt den Leerraum zwischen den Zeilen.
-            Diese Option hat keine Auswirkung auf einzeiligen Text.
+            Der Zeilenabstand bestimmt den Leerraum zwischen den Zeilen. Diese
+            Option hat keine Auswirkung auf einzeiligen Text.
           </para>
           <para lang="fr">
             Vous rÃglez là de combien de pixels l'interligne doit Ãtre
-            augmentà ou diminuà (la valeur peut-Ãtre nÃgative). Ce
-            rÃglage est interactifÂ: il apparaÃt en mÃme temps sur votre
-            texte dans l'image.
+            augmentà ou diminuà (la valeur peut-Ãtre nÃgative). Ce rÃglage est
+            interactifÂ: il apparaÃt en mÃme temps sur votre texte dans
+            l'image.
           </para>
           <para lang="it">
             Controlla lo spazio tra linee di testo successive. Questa
@@ -1297,17 +1285,17 @@
             da questo spazio (il valore puà essere negativo).
           </para>
           <para lang="no">
-            Her bestemmer du linjeavstanden. Innstillinga er interaktiv,
-            dvs. resultatet blir synleg i teksten etter kvart som du
-            forandrar innstillinga. Tala her er ikkje sjÃlve linjeavstanden,
-            men kor mange pikslar du vil auke eller minske linjeavstanden
-            med. Talet kan sÃleis ogsà vere negativt.
+            Her bestemmer du linjeavstanden. Innstillinga er interaktiv, dvs.
+            resultatet blir synleg i teksten etter kvart som du forandrar
+            innstillinga. Tala her er ikkje sjÃlve linjeavstanden, men kor
+            mange pikslar du vil auke eller minske linjeavstanden med. Talet
+            kan sÃleis ogsà vere negativt.
           </para>
           <para lang="pl">
             ÐkreÅla odlegÅoÅÄ pomiÄdzy sÄsiadujÄcymi wersami. Efekt zmiany tej
             opcji od razu widoczny jest na obrazie. WartoÅÄ opcji to nie tylko
-            sama odlegÅoÅÄ, Ð liczba pikseli, ktÃrÄ naleÅy dodaÄ lub odjÄÄ
-            od tej odlegÅoÅci. WartoÅÄ moÅe byÄ ujemna.
+            sama odlegÅoÅÄ, Ð liczba pikseli, ktÃrÄ naleÅy dodaÄ lub odjÄÄ od
+            tej odlegÅoÅci. WartoÅÄ moÅe byÄ ujemna.
           </para>
           <para lang="ru">
             ÐÐÑÐÐÐÐÑÐÑ ÑÐÑÑÐÑÐÐÐ ÐÐÐÐÑ ÑÐÑÐÐÐÐÐÐ ÑÑÑÐÐÐÐÐ. ÐÐÐÑÐÑÑÐÑ ÐÐÐÐÐÐÐÐÑ
@@ -1315,9 +1303,7 @@
             ÑÐÐÐ ÑÐÑÑÐÑÐÐÐ, Ð ÑÐÑÐÐ ÑÐÑÐÐ, ÐÐÑÐÑÐÐ ÐÑÐÐÐ ÐÑÐÐÐÐÐÑÑ ÐÐÐ ÐÑÐÑÑÑ
             ÐÑ ÑÑÐÐÐ ÑÐÑÑÐÑÐÐÑ. ÐÐÐÑÐÐÐÐ ÐÐÐÐÑ ÐÑÑÑ ÐÑÑÐÑÐÑÐÐÑÐÑÐ.
           </para>
-          <para lang="zh_CN">
-            æåææçéèäéçéèãèééæääçïåæåäåæåçåååäçææäã
-          </para>
+          <para lang="zh_CN">æåææçéèäéçéèãèééæääçïåæåäåæåçåååäçææäã</para>
         </listitem>
       </varlistentry>
 
@@ -1326,17 +1312,14 @@
         <term lang="en">Letter Spacing</term>
         <term lang="de">Zeichenabstand</term>
         <term lang="fr">Espacement entre les lettres</term>
+
         <listitem>
-          <para lang="en">
-            The help pop-up is self explanatory.
-          </para>
+          <para lang="en">The help pop-up is self explanatory.</para>
           <para lang="de">
             Der Zeichenenabstand bestimmt den Leerraum zwischen den einzelnen
             Buchstaben.
           </para>
-          <para lang="fr">
-            La bulle d'info est explicite.
-          </para>
+          <para lang="fr">La bulle d'info est explicite.</para>
         </listitem>
       </varlistentry>
 
@@ -1345,6 +1328,7 @@
         <term lang="de">Text an Pfad</term>
         <term lang="fr">Texte le long d'un chemin</term>
         <term lang="pl">Tekst za ÅcieÅkÄ</term>
+
         <listitem>
           <para lang="en">
             This option is enabled only if a
@@ -1437,6 +1421,7 @@
                 PrzykÅad <quote>Tekstu za ÅcieÅkÄ</quote>
               </phrase>
             </title>
+
             <mediaobject>
               <imageobject>
                 <imagedata format="PNG"
@@ -1460,7 +1445,7 @@
                 <imagedata format="PNG"
                   fileref="../images/toolbox/text-path.png" />
               </imageobject>
-        <imageobject lang="pl">
+              <imageobject lang="pl">
                 <imagedata format="PNG"
                   fileref="../images/toolbox/text-path.png" />
               </imageobject>
@@ -1480,6 +1465,7 @@
         <term lang="pl">UtwÃrz z tekstu ÅcieÅkÄ</term>
         <term lang="ru">ÐÐÐÐÐÑÑ ÐÐÐÑÑÑ ÐÐ ÑÐÐÑÑÐ</term>
         <term lang="zh_CN">äææåçèå</term>
+
         <listitem>
           <para lang="cs">
             Toto tlaÄÃtko vytvoÅÃ z textu cestu.
@@ -1546,24 +1532,22 @@
     </title>
 
     <indexterm lang="en">
-      <primary>Text</primary>
-      <secondary>Editor</secondary>
+      <primary>Text</primary><secondary>Editor</secondary>
+    </indexterm>
+    <indexterm lang="de">
+      <primary>Text</primary><secondary>Editor</secondary>
     </indexterm>
     <indexterm lang="fr">
-      <primary>Texte</primary>
-      <secondary>Ãditeur</secondary>
+      <primary>Texte</primary><secondary>Ãditeur</secondary>
     </indexterm>
     <indexterm lang="no">
-      <primary>Tekst</primary>
-      <secondary>Tekstbehandlaren</secondary>
+      <primary>Tekst</primary><secondary>Tekstbehandlaren</secondary>
     </indexterm>
     <indexterm lang="pl">
-      <primary>Ðekst</primary>
-      <secondary>Edytor</secondary>
+      <primary>Ðekst</primary><secondary>Edytor</secondary>
     </indexterm>
     <indexterm lang="ru">
-      <primary>ÐÐÐÑÑ</primary>
-      <secondary>ÐÐÐÐÐÑÐÑ</secondary>
+      <primary>ÐÐÐÑÑ</primary><secondary>ÐÐÐÐÐÑÐÑ</secondary>
     </indexterm>
 
     <figure lang="en;de;fr;no;pl;ru">
@@ -1579,6 +1563,7 @@
         <phrase lang="pl">Opcje edytora tekstowego</phrase>
         <phrase lang="ru">ÐÐÑÐÐÐÑÑÑ ÑÐÐÐÐÑÐÑÐ ÑÐÐÑÑÐ</phrase>
       </title>
+
       <mediaobject>
         <imageobject lang="en;pl;ru">
           <imagedata fileref="../images/toolbox/tool-dialog-text.png"
@@ -1604,13 +1589,14 @@
         <primary>Text</primary>
         <secondary>Load text from file</secondary>
       </indexterm>
+      <indexterm lang="de">
+        <primary>Text</primary><secondary>laden</secondary></indexterm>
       <indexterm lang="fr">
         <primary>Texte</primary>
         <secondary>Charger le texte à partir d'un fichier</secondary>
       </indexterm>
       <indexterm lang="no">
-        <primary>Tekst</primary>
-        <secondary>Opna tekst frà fil</secondary>
+        <primary>Tekst</primary><secondary>Opna tekst frà fil</secondary>
       </indexterm>
       <indexterm lang="pl">
         <primary>ÐÐkst</primary>
@@ -1927,23 +1913,23 @@
           </para>
           <para lang="no">
             For à legge til ein ny tekst klikker du med tekstverktÃyet pà eit
-            ikkje-tekstlag. For à skifte frà ein tekst til ein annan, aktiviserer
-            du det Ãnskte tekstlaget i lagdialogen og eventuelt aktiviserer
-            tekstbehandlaren ved à (dobbelt)klikke pà laget.
+            ikkje-tekstlag. For à skifte frà ein tekst til ein annan,
+            aktiviserer du det Ãnskte tekstlaget i lagdialogen og eventuelt
+            aktiviserer tekstbehandlaren ved à (dobbelt)klikke pà laget.
           </para>
           <para lang="pl">
             Aby dodaÄ tekst do obrazu, naleÅy kliknÄÄ nie tekstowÄ warstwÄ.
             Pojawi siÄ wtedy nowy edytor i utworzona zostanie nowa warstwa.
-            Aby przejÅÄ z jednego tekstu na drugi, naleÅy aktywowaÄ odpowiedniÄ
-            warstwÄ tekstowÄ i kliknÄÄ go. Aktywowany bÄdzie wtedy odpowiedni
-            edytor.
+            Aby przejÅÄ z jednego tekstu na drugi, naleÅy aktywowaÄ
+            odpowiedniÄ warstwÄ tekstowÄ i kliknÄÄ go. Aktywowany bÄdzie wtedy
+            odpowiedni edytor.
           </para>
           <para lang="ru">
-            ÐÑÐÐÑ ÐÐÐÐÐÐÑÑ ÑÐÐÑÑ Ð ÐÐÐÐÑÐÐÐÐÐÑ, ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐ ÐÐ-ÑÐÐÑÑÐÐÑÐ
-            ÑÐÐÐ. ÐÐÐÐÐ ÐÐÑÐÐÑÑÑ ÐÐÐÑÐ ÑÐÐÑÑÐÐÑÐ ÑÐÐÐÐÑÐÑ Ð ÑÐÐÐÐÑÑÑÑ ÐÐÐÑÐ ÑÐÐÐ.
-            ÐÑÐÐÑ ÐÐÑÐÐÑÐ Ñ ÐÐÐÐÐÐ ÑÐÐÑÑÐ ÐÐ ÐÑÑÐÐÐ, ÐÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÑÑ
-            ÑÐÐÑÐÐÑÑÑÐÑÑÑÐÐ ÑÐÐÑÑÐÐÑÐ ÑÐÐÐ Ð ÐÐÐÐÑÑ ÐÐ ÐÐÐÐ. ÐÐÐÐÐ ÐÐÑÐÐÑÑÐÑÑÑ
-            ÑÐÐÑÐÐÑÑÑÐÑÑÑÐÐ ÑÐÐÐÐÑÐÑ.
+            ÐÑÐÐÑ ÐÐÐÐÐÐÑÑ ÑÐÐÑÑ Ð ÐÐÐÐÑÐÐÐÐÐÑ, ÐÐÐÐÑÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐ
+            ÐÐ-ÑÐÐÑÑÐÐÑÐ ÑÐÐÐ. ÐÐÐÐÐ ÐÐÑÐÐÑÑÑ ÐÐÐÑÐ ÑÐÐÑÑÐÐÑÐ ÑÐÐÐÐÑÐÑ Ð
+            ÑÐÐÐÐÑÑÑÑ ÐÐÐÑÐ ÑÐÐÐ. ÐÑÐÐÑ ÐÐÑÐÐÑÐ Ñ ÐÐÐÐÐÐ ÑÐÐÑÑÐ ÐÐ ÐÑÑÐÐÐ,
+            ÐÑÐÐÐ ÐÐÑÐÐÐÑÐÐÐÑÑ ÑÐÐÑÐÐÑÑÑÐÑÑÑÐÐ ÑÐÐÑÑÐÐÑÐ ÑÐÐÐ Ð ÐÐÐÐÑÑ ÐÐ
+            ÐÐÐÐ. ÐÐÐÐÐ ÐÐÑÐÐÑÑÐÑÑÑ ÑÐÐÑÐÐÑÑÑÐÑÑÑÐÐ ÑÐÐÐÐÑÐÑ.
           </para>
           <para lang="zh_CN">
             èçååäæåååçææïååéæååååçåïäåçæçææçèååæåääæåååãèäääææèååääææåéèéäçåçæåååçåååèææååçèåã
@@ -2153,11 +2139,12 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry lang="en;de;fr">
-        <!--TODO it;no;pl;ru; v2.4-->
+      <!--TODO it;no;pl;ru; v2.4-->
+      <varlistentry lang="en;de;fr">        
         <term lang="en">Use Selected Font</term>
         <term lang="de">AusgewÃhlte Schriftart verwenden</term>
         <term lang="fr">Utiliser la police sÃlectionnÃe</term>
+
         <listitem>
           <para lang="en">
             Default doesn't use the font you have selected in the Options
@@ -2174,10 +2161,13 @@
            cochez cette option.
           </para>
 
-          <note lang="en;fr;no;pl;ru">
+          <note>
             <para lang="en">
-              See also
-              <link linkend="gimp-using-text">Text and fonts</link>.
+              See also <xref linkend="gimp-using-text" />.
+            </para>
+            <para lang="de">
+              Weitere Informationen finden Sie auch im
+             <xref linkend="gimp-using-text" />.
             </para>
             <para lang="fr">
               Voyez aussi

Modified: trunk/src/toolbox/tool-transform.xml
==============================================================================
--- trunk/src/toolbox/tool-transform.xml	(original)
+++ trunk/src/toolbox/tool-transform.xml	Fri Feb  1 23:02:34 2008
@@ -68,8 +68,7 @@
   <figure>
     <title>
       <phrase lang="de">
-        Eine Ãbersicht aller Transformationswerkzeuge von
-        <acronym>GIMP</acronym>
+        Eine Ãbersicht aller Transformationswerkzeuge von GIMP
       </phrase>
       <phrase lang="cs">
         PÅehled transformaÄnÃch nÃstrojÅ <acronym>GIMP</acronym>u.
@@ -128,7 +127,7 @@
   </para>
 
   <para lang="de">
-    Im mittleren Bereich des Werkzeugfensters finden Sie die 8
+    Im mittleren Bereich des Werkzeugfensters finden Sie die acht
     Transformationswerkzeuge, welche <acronym>GIMP</acronym>
     Ihnen zur VerfÃgung stellt. WÃhrend die Malwerkzeuge die Eigenschaften von
     Pixeln verÃndern, werden durch die Transformationswerkzeuge die Pixel
@@ -204,13 +203,15 @@
         <phrase lang="de">
           Allgemeine Werkzeugeigenschaften der Transformationswerkzeuge
         </phrase>
-        <phrase lang="es">Opciones comunes de las herramientas de
-        transformaciÃn</phrase>
+        <phrase lang="es">
+          Opciones comunes de las herramientas de transformaciÃn
+        </phrase>
         <phrase lang="fr">
           Options communes des outils de transformation
         </phrase>
-        <phrase lang="it">Opzioni comuni agli strumenti di
-        trasformazione</phrase>
+        <phrase lang="it">
+          Opzioni comuni agli strumenti di trasformazione
+        </phrase>
         <phrase lang="no">
           Felles innstillingar for transformasjonsverktÃya
         </phrase>
@@ -294,16 +295,17 @@
     </para>
 
     <variablelist>
-      <!-- Options have ben renamed in v2.4-->
+      <!-- CHECK: es fri it no pl ru options have ben renamed in v2.4-->
       <varlistentry>
         <term lang="en">Transform</term>
-        <term lang="de">Wirkt auf</term>
+        <term lang="de">Transformation</term>
         <term lang="es">Afectar</term>
         <term lang="fr">Transformer</term>
         <term lang="it">Trasforma</term>
         <term lang="no">Verkar pÃ</term>
-         <term lang="pl">PrzeksztaÅcenie</term>
+        <term lang="pl">PrzeksztaÅcenie</term>
         <term lang="ru">ÐÐÐÑÐÐÐÐ</term>
+
         <listitem>
           <para lang="en">
             <acronym>GIMP</acronym>
@@ -343,7 +345,7 @@
             ÐÐÑÑÑÑÐÐÐÑÐ.
           </para>
 
-          <warning lang="en;de;es;fr;it;no;pl;ru">
+          <note lang="en;de;es;fr;it;no;pl;ru">
             <para lang="en">
               Remind that the Transform option persists when you quit the
               tool.
@@ -368,355 +370,364 @@
               Hugs at valet du gjer blir gjeldande heilt til du trykker ein
               annan knapp, ogsà om du avslutter arbeidet.
             </para>
-             <para lang="pl">
+            <para lang="pl">
               Tryb przeksztaÅcenia jest zachowywany nawet po zamkniÄciu
               narzÄdzia.
             </para>
             <para lang="ru">
               ÐÐÐÐÐ ÑÐÐÑÐÐÐÐ ÑÐÑÑÐÐÑÐÑÑÑ ÐÑÐ ÐÐÐÑÑÑÐÐ ÐÐÑÑÑÑÐÐÐÑÐ.
             </para>
-          </warning>
-
-          <para lang="en">
-            When you activate the first button
-            <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>
-
-          <para lang="de">
-            Durch Aktivieren der ersten SchaltflÃche
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-layer.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            wird das Werkzeug auf die aktuelle Ebene angewendet. Sie sollten
-            darauf achten, dass keine Auswahlen auf dem Bild existieren, da
-            <acronym>GIMP</acronym>
-            die Auswahlen bevorzugt.
-          </para>
-
-          <para lang="es">
-            Cuando activa el primer botÃn
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-layer.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            La herramienta trabaja sobre la capa activa. Si no hay
-            selecciones en esta capa, se transformarà toda la capa.
-          </para>
-
-          <para lang="fr">
-            En activant le premier bouton,
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-layer.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            , l'outil agira sur le calque actif. Si aucune sÃlection n'existe
-            sur ce calque, l'outil agira sur l'ensemble du calque.
-          </para>
+          </note>
 
-          <para lang="it">
-            Se si attiva il primo pulsante
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-layer.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            lo strumento lavorerà sul livello attivo. Se non c'à una
-            selezione nel livello corrente, verrà trasformato l'intero
-            livello.
-          </para>
+          <itemizedlist>
+            <listitem>
+              <para lang="en">
+                When you activate the first button
+                <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>
 
-          <para lang="no">
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-layer.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            NÃr du den fÃrste knappen er aktivisert, vil verktÃyet arbeide pÃ
-            det aktive laget. Dersom laget inneheld ei markering, vil
-            verktÃyet verke pà denne i staden for pà laget.
-          </para>
+              <para lang="de">
+                Durch Aktivieren der ersten SchaltflÃche
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-layer.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                wird das Werkzeug auf die aktuelle Ebene angewendet. Sie
+                sollten darauf achten, dass keine Auswahlen auf dem Bild
+                existieren, da
+                <acronym>GIMP</acronym>
+                die Auswahlen bevorzugt.
+              </para>
 
-           <para lang="pl">
-            WybierajÄc pierwszy przycisk
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-layer.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            narzÄdzie pracuje nad aktywnÄ warstwÄ. JeÅli warstwa nie posiada
-            zaznaczenia, przeksztaÅcana bÄdzie caÅa warstwa.
-          </para>
+              <para lang="es">
+                Cuando activa el primer botÃn
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-layer.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                La herramienta trabaja sobre la capa activa. Si no hay
+                selecciones en esta capa, se transformarà toda la capa.
+              </para>
 
-          <para lang="ru">
-            ÐÑÐ ÐÑÐÐÑÐ ÐÐÑÐÐÐ ÐÐÐÐÐÐ
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-layer.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            ÐÐÑÑÑÑÐÐÐÑ ÑÐÐÐÑÐÐÑ ÐÐÐ ÐÐÑÐÐÐÑÐ ÑÐÐÐÐ. ÐÑÐÐ Ð ÑÐÐÐ ÐÐÑ ÐÑÐÐÐÐÐÐÑ,
-            ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÑÐÐÑ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐ.
-          </para>
+              <para lang="fr">
+                En activant le premier bouton,
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-layer.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                , l'outil agira sur le calque actif. Si aucune sÃlection
+                n'existe sur ce calque, l'outil agira sur l'ensemble du
+                calque.
+              </para>
 
-          <para lang="en">
-            <!--TODO es;it;no;pl;ru "selection contour"-->
-            When you activate the second button
-            <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>
+              <para lang="it">
+                Se si attiva il primo pulsante
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-layer.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                lo strumento lavorerà sul livello attivo. Se non c'à una
+                selezione nel livello corrente, verrà trasformato l'intero
+                livello.
+              </para>
 
-          <para lang="de">
-            Durch Aktivieren der zweiten SchaltflÃche
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-selection.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            wird dafÃr gesorgt, dass das Werkzeug nur auf die Auswahl (genauer
-            gesagt: auf den Umriss der Auswahl, nicht auf den Inhalt)
-            angewendet wird. Falls es keine Auswahl gibt, wirkt das Werkzeug
-            auf die ganze Ebene.
-          </para>
+              <para lang="no">
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-layer.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                NÃr du den fÃrste knappen er aktivisert, vil verktÃyet arbeide
+                pà det aktive laget. Dersom laget inneheld ei markering, vil
+                verktÃyet verke pà denne i staden for pà laget.
+              </para>
+
+              <para lang="pl">
+                WybierajÄc pierwszy przycisk
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-layer.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                narzÄdzie pracuje nad aktywnÄ warstwÄ. JeÅli warstwa nie
+                posiada zaznaczenia, przeksztaÅcana bÄdzie caÅa warstwa.
+              </para>
 
-          <para lang="es">
-            Cuando activa el segundo botÃn
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-selection.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            La herramienta solo trabaja sobre la selecciÃn, si no hay
-            selecciÃn trabaja sobre toda la imagen.
-          </para>
+              <para lang="ru">
+                ÐÑÐ ÐÑÐÐÑÐ ÐÐÑÐÐÐ ÐÐÐÐÐÐ
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-layer.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                ÐÐÑÑÑÑÐÐÐÑ ÑÐÐÐÑÐÐÑ ÐÐÐ ÐÐÑÐÐÐÑÐ ÑÐÐÐÐ. ÐÑÐÐ Ð ÑÐÐÐ ÐÐÑ
+                ÐÑÐÐÐÐÐÐÑ, ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÐÑÐÐÑ ÐÐÐ ÐÑÐÐ ÑÐÐÐÐ.
+              </para>
+            </listitem>
 
-          <para lang="fr">
-            En activant le deuxiÃme bouton,
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-selection.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            l'outil n'agira que sur la sÃlection existante (l'ensemble du
-            calque en l'absence de sÃlection).
-          </para>
+            <listitem>
+              <para lang="en">
+                <!--TODO es;it;no;pl;ru "selection contour"-->
+                When you activate the second button
+                <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>
 
-          <para lang="it">
-            Se si attiva il secondo pulsante
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-selection.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            lo strumento lavorerà solo sulla selezione (o sull'intero
-            livello se non c'Ã una selezione attiva).
-          </para>
+              <para lang="de">
+                Durch Aktivieren der zweiten SchaltflÃche
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-selection.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                wird dafÃr gesorgt, dass das Werkzeug nur auf die Auswahl
+                (genauer gesagt: auf den Umriss der Auswahl, nicht auf den
+                Inhalt) angewendet wird. Falls es keine Auswahl gibt, wirkt
+                das Werkzeug auf die ganze Ebene.
+              </para>
 
-          <para lang="no">
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-selection.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            NÃr den andre knappen er aktiv, vil verktÃyet verke bare pÃ
-            markeringa, eller pà heile laget dersom det ikkje finst
-            markeringar.
-          </para>
+              <para lang="es">
+                Cuando activa el segundo botÃn
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-selection.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                La herramienta solo trabaja sobre la selecciÃn, si no hay
+                selecciÃn trabaja sobre toda la imagen.
+              </para>
 
-           <para lang="pl">
-            WybierajÄc drugi przycisk
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-selection.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            narzÄdzie bÄdzie pracowaÄ tylko nad zaznaczeniem (lub caÅÄ warstwÄ,
-             jeÅli nie ma zaznaczenia).
-          </para>
+              <para lang="fr">
+                En activant le deuxiÃme bouton,
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-selection.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                l'outil n'agira que sur la sÃlection existante (l'ensemble du
+                calque en l'absence de sÃlection).
+              </para>
 
-          <para lang="ru">
-            ÐÑÐ ÐÑÐÐÑÐ ÐÑÐÑÐÐ ÐÐÐÐÐÐ
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-selection.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            ÐÐÑÑÑÑÐÐÐÑ ÑÐÐÐÑÐÐÑ ÑÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐÐÐÐÐ (ÐÐÐ ÐÑÐÐ ÑÐÐÐÐ, ÐÑÐÐ ÐÐÑ
-            ÐÑÐÐÐÐÐÐÑ).
-          </para>
+              <para lang="it">
+                Se si attiva il secondo pulsante
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-selection.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                lo strumento lavorerà solo sulla selezione (o sull'intero
+                livello se non c'Ã una selezione attiva).
+              </para>
 
-          <para lang="en">
-            When you activate the third button,
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-path.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            the tool works on the path only.
-          </para>
+              <para lang="no">
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-selection.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                NÃr den andre knappen er aktiv, vil verktÃyet verke bare pÃ
+                markeringa, eller pà heile laget dersom det ikkje finst
+                markeringar.
+              </para>
+
+              <para lang="pl">
+                WybierajÄc drugi przycisk
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-selection.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                narzÄdzie bÄdzie pracowaÄ tylko nad zaznaczeniem (lub caÅÄ
+                warstwÄ, jeÅli nie ma zaznaczenia).
+              </para>
 
-          <para lang="de">
-            Mit aktivierter dritter SchaltflÃche
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-path.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            kÃnnen nur Pfade transformiert werden.
-          </para>
+              <para lang="ru">
+                ÐÑÐ ÐÑÐÐÑÐ ÐÑÐÑÐÐ ÐÐÐÐÐÐ
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-selection.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                ÐÐÑÑÑÑÐÐÐÑ ÑÐÐÐÑÐÐÑ ÑÐÐÑÐÐ ÐÐÐ ÐÑÐÐÐÐÐÐÐÐ (ÐÐÐ ÐÑÐÐ ÑÐÐÐÐ,
+                ÐÑÐÐ ÐÐÑ ÐÑÐÐÐÐÐÐÑ).
+              </para>
+            </listitem>
 
-          <para lang="es">
-            Cuando activa el tercer botÃn,
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-path.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            La herramiena solo trabaja sobre la ruta.
-          </para>
+            <listitem>
+              <para lang="en">
+                When you activate the third button,
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-path.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                the tool works on the path only.
+              </para>
 
-          <para lang="fr">
-            En activant le troisiÃme bouton
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-path.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            l'outil agira sur le chemin.
-          </para>
+              <para lang="de">
+                Mit aktivierter dritter SchaltflÃche
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-path.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                kÃnnen nur Pfade transformiert werden.
+              </para>
 
-          <para lang="it">
-            Se si attiva il terzo pulsante,
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-path.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            lo strumento lavora solo sul tracciato.
-          </para>
+              <para lang="es">
+                Cuando activa el tercer botÃn,
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-path.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                La herramiena solo trabaja sobre la ruta.
+              </para>
 
-          <para lang="no">
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-path.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            NÃr den tredje knappen er aktivert, vil verktÃyet verke bare pÃ
-            banar.
-          </para>
+              <para lang="fr">
+                En activant le troisiÃme bouton
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-path.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                l'outil agira sur le chemin.
+              </para>
 
-           <para lang="pl">
-            WybÃr trzeciego przycisku
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-path.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            sprawia, Åe narzÄdzie pracuje tylko nad ÅcieÅkÄ.
-          </para>
+              <para lang="it">
+                Se si attiva il terzo pulsante,
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-path.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                lo strumento lavora solo sul tracciato.
+              </para>
 
-          <para lang="ru">
-            ÐÑÐ ÐÑÐÐÑÐ ÑÑÐÑÑÐÐ ÐÐÐÐÐÐ
-            <guiicon>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata
-                    fileref="../images/tool-options/rotate-affect-path.png" />
-                </imageobject>
-              </inlinemediaobject>
-            </guiicon>
-            ÐÐÑÑÑÑÐÐÐÑ ÑÐÐÐÑÐÐÑ ÑÐÐÑÐÐ ÐÐÐ ÐÐÐÑÑÑÐÐ.
-          </para>
+              <para lang="no">
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-path.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                NÃr den tredje knappen er aktivert, vil verktÃyet verke bare
+                pà banar.
+              </para>
+
+              <para lang="pl">
+                WybÃr trzeciego przycisku
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-path.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                sprawia, Åe narzÄdzie pracuje tylko nad ÅcieÅkÄ.
+              </para>
 
+              <para lang="ru">
+                ÐÑÐ ÐÑÐÐÑÐ ÑÑÐÑÑÐÐ ÐÐÐÐÐÐ
+                <guiicon>
+                  <inlinemediaobject>
+                    <imageobject>
+                      <imagedata
+                        fileref="../images/tool-options/rotate-affect-path.png" />
+                    </imageobject>
+                  </inlinemediaobject>
+                </guiicon>
+                ÐÐÑÑÑÑÐÐÐÑ ÑÐÐÐÑÐÐÑ ÑÐÐÑÐÐ ÐÐÐ ÐÐÐÑÑÑÐÐ.
+              </para>
+            </listitem>
+          </itemizedlist>
         </listitem>
       </varlistentry>
 
       <varlistentry lang="en;de;es;fr;it;no;pl;ru">
         <term lang="en">Direction</term>
-        <term lang="de">Transformationsrichtung</term>
+        <term lang="de">Richtung</term>
         <term lang="es">DirecciÃn de la transformaciÃn</term>
         <term lang="fr">Direction</term>
         <term lang="it">Direzione (di trasformazione)</term>
@@ -789,11 +800,11 @@
             La direzione di trasformazione imposta il senso o la direzione
             nella quale un livello viene trasformato. La modalità "Normale"
             trasformerà l'immagine o il livello come ci si aspetta. Basta
-            usare gli appigli per fare la trasformazione che si
-            desidererebbe veder accadere sull'immagine o sul livello sulla
-            griglia. Quando poi si esegue la trasformazione l'immagine o il
-            livello viene trasformato nella forma e nella posizione in cui
-            si imposta la griglia.
+            usare gli appigli per fare la trasformazione che si desidererebbe
+            veder accadere sull'immagine o sul livello sulla griglia. Quando
+            poi si esegue la trasformazione l'immagine o il livello viene
+            trasformato nella forma e nella posizione in cui si imposta la
+            griglia.
           </para>
           <para lang="it">
             La modalità correttiva viene usata principalmente per
@@ -825,11 +836,11 @@
             husvegg, plasserer du ramma parallelt med husveggen.
           </para>
 
-           <para lang="pl">
-            Opcja okreÅla kierunek, w ktÃrym warstwa bÄdzie przeksztaÅcana.
-            W normalnym trybie przeksztaÅcanie odbywa siÄ w kierunku przednim,
-             przy pomocy uchwytÃw. Po zastosowaniu przeksztaÅcenia warstwa lub
-             obraz bÄdÄ przeksztaÅcone wg formy i poÅoÅenia wskazanej siatki.
+          <para lang="pl">
+            Opcja okreÅla kierunek, w ktÃrym warstwa bÄdzie przeksztaÅcana. W
+            normalnym trybie przeksztaÅcanie odbywa siÄ w kierunku przednim,
+            przy pomocy uchwytÃw. Po zastosowaniu przeksztaÅcenia warstwa lub
+            obraz bÄdÄ przeksztaÅcone wg formy i poÅoÅenia wskazanej siatki.
           </para>
           <para lang="pl">
             PrzeksztaÅcenie korekcyjne jest wykorzystywane do wyrÃwnywania
@@ -925,64 +936,9 @@
         </listitem>
       </varlistentry>
 
-<!--Obsolete in v2.4
-      <varlistentry lang="en;de;es;fr;it;no;pl;ru">
-        <term lang="en">Supersampling</term>
-        <term lang="de">Hochrechnung</term>
-        <term lang="es">Supermuestreo</term>
-        <term lang="fr">SurÃchantillonnage</term>
-        <term lang="it">Supercampionamento</term>
-        <term lang="no">Superutjamning</term>
-         <term lang="pl">Interpolacja...</term>
-        <term lang="ru">ÐÐÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÐÑÑÐÑ</term>
-
-        <listitem>
-          <para lang="en">
-            See glossary for
-            <link linkend="glossary-supersampling">Supersampling</link>
-          </para>
-          <para lang="de">
-            Bei der Hochrechnung (engl.
-            <foreignphrase>Supersampling</foreignphrase>) werden umliegende
-            Pixel zur Berechnung eines Farbverlaufs mit einbezogen. Das
-            Resultat wird dabei verbessert, jedoch wird fÃr die Berechnung
-            mehr Zeit benÃtigt.
-          </para>
-          <para lang="es">
-            Ver en el glosario,
-            <link linkend="glossary-supersampling">Supermuestreo</link>
-          </para>
-          <para lang="fr">
-            Voyez le glossaire à la rubrique
-            <link linkend="glossary-supersampling">SurÃchantillonnage
-            </link>
-          </para>
-          <para lang="it">
-            Vedere il glossario per
-            <link linkend="glossary-supersampling">Supercampionamento</link>
-          </para>
-          <para lang="no">
-            Dette er ein mÃte à glatte ut omforminga slik at skillet mellom
-            markeringa og resten av biletet blir mindre synleg. (eng.
-            <foreignphrase>Supersampling</foreignphrase>). Du finn meir om
-            dette i ordlista under <link
-            linkend="glossary-supersampling">Superutjamning</link>.
-          </para>
-           <para lang="pl">
-            WiÄcej informacji na
-             <!-link linkend="glossary-supersampling"PrÃbkowanie adaptywne</link->
-          </para>
-          <para lang="ru">
-            ÐÐÑÐÑÐÑÐÑÑ Ð ÐÐÐÑÑÐÑÐÑ ÐÐ ÐÐÑÐÑÐÐÑÐÐÐ ÐÐ <link
-            linkend="glossary-supersampling">ÐÐÐÐÑÐÐÐÐÐ
-            ÐÐÑÐÑÐÐÐÑÑÐÐ</link>.
-          </para>
-        </listitem>
-      </varlistentry>-->
-
       <varlistentry lang="en;de;es;fr;it;no;pl;ru">
         <term lang="en">Clipping</term>
-        <term lang="de">Ergebnis beschneiden</term>
+        <term lang="de">Beschneidung</term>
         <term lang="es">Resultado del recorte</term>
         <term lang="fr">Rognage</term>
         <term lang="it">Ritaglio (del risultato)</term>
@@ -1000,8 +956,8 @@
             Elementes auf die GrÃÃe des Originals zugeschnitten.
           </para>
           <para lang="es">
-            DespuÃs de la transformaciÃn, la imagen puede ser mÃs grande.
-            Esta opciÃn la recortarà a la imagen original.
+            DespuÃs de la transformaciÃn, la imagen puede ser mÃs grande. Esta
+            opciÃn la recortarà a la imagen original.
           </para>
           <para lang="fr">
             Il se peut qu'aprÃs transformation, l'image rÃsultante soit plus
@@ -1009,121 +965,70 @@
             l'image d'origine.
           </para>
           <para lang="it">
-            Dopo la trasformazione, l'immagine puà risultare piÃ
-            grande. Quest'opzione permette di ritagliare l'immagine
-            trasformata all'interno delle dimensioni originali
-            dell'immagine di partenza.
+            Dopo la trasformazione, l'immagine puà risultare pià grande.
+            Quest'opzione permette di ritagliare l'immagine trasformata
+            all'interno delle dimensioni originali dell'immagine di partenza.
           </para>
           <para lang="no">
             Dersom transformasjonen skulle fÃre til at biletet blir stÃrre,
-            vil dette valet gjere at biletet blir klipt til same storleik
-            som det hadde fÃr omforming.
+            vil dette valet gjere at biletet blir klipt til same storleik som
+            det hadde fÃr omforming.
           </para>
-           <para lang="pl">
-            Po przeksztaÅceniu obraz moÅe staÄ siÄ wiÄkszy. Opcja ta
-            przycina przeksztaÅcony obraz do rozmiarÃw obrazu wyjÅciowego.
+          <para lang="pl">
+            Po przeksztaÅceniu obraz moÅe staÄ siÄ wiÄkszy. Opcja ta przycina
+            przeksztaÅcony obraz do rozmiarÃw obrazu wyjÅciowego.
           </para>
           <para lang="ru">
             ÐÐÑÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÐÑ, ÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑ ÐÑÑÑ ÐÐÐÑÑÐ. ÐÑÐÑ ÐÐÑÐÐÐÑÑ
             ÐÐÐÑÐÑÑÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐÐÐ ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐ.
           </para>
 
-          <!--TODO es;it;no;pl;ru; v2.4-->
-          <para lang="en">
-            You can choose between several ways to clip:
-          </para>
+          <!-- TODO: es it no pl ru  v2.4 -->
+          <para lang="en">You can choose between several ways to clip:</para>
           <para lang="de">
             Sie kÃnnen zwischen verschiedenen Methoden wÃhlen:
           </para>
           <para lang="fr">
             Plusieurs faÃons de rogner sont à votre disposition :
           </para>
-          <itemizedlist lang="en;de;fr">
-            <listitem>
-              <para lang="en"><guilabel>Adjust</guilabel></para>
-              <para lang="de">Anpassen</para>
-              <para lang="fr"><guilabel>Ajuster</guilabel> :</para>
-            </listitem>
-            <listitem>
-              <para lang="en"><guilabel>Clip</guilabel></para>
-              <para lang="de">Beschneiden</para>
-              <para lang="fr"><guilabel>Rogner</guilabel></para>
-            </listitem>
-            <listitem>
-              <para lang="en"><guilabel>Crop to result</guilabel></para>
-              <para lang="de">Auf Ergebnis beschneiden</para>
-              <para lang="fr">
-                <guilabel>DÃcouper selon rÃsultat</guilabel>
-              </para>
-            </listitem>
-            <listitem>
-              <para lang="en"><guilabel>Crop with aspect</guilabel></para>
-              <para lang="de">Auf SeitenverhÃltnis beschneiden</para>
-              <para lang="fr">
-                <guilabel>DÃcouper avec le mÃme rapport</guilabel>
-              </para>
-            </listitem>
-          </itemizedlist>
-          <figure lang="en;de;fr">
+
+          <figure lang="fr">
             <title>
-              <phrase lang="en">Original image for examples</phrase>
-              <phrase lang="de">Ausgangsbild fÃr die Beispiele</phrase>
               <phrase lang="fr">Image d'origine pour les exemples</phrase>
             </title>
+
             <mediaobject>
               <imageobject>
-                <imagedata
-                  fileref="../images/toolbox/clip-0.png" format="PNG" />
+                <imagedata format="PNG"
+                  fileref="../images/toolbox/clip-0.png" />
               </imageobject>
+
               <caption>
-                <para lang="en">
+                <para lang="fr">
                   Two layers. The blue layer is active. We are going to apply
                   a 45Â rotation.
                 </para>
-                <para lang="de">
-                  Zwei Ebenen, die blaue Ebene ist die aktive. Eine
-                  45Â-Drehung wird angewendet.
-                </para>
-                <!--CECK fr: IMHO 45Â is not the best choice, should be an
-                    "odd" value, e.g. 12.345Â ...-->
-                <para lang="fr">
-                  Deux calques. Le calque bleu est actif. Nous allons
-                  appliquer une rotation de 45Â.
-                </para>
               </caption>
             </mediaobject>
           </figure>
-          <!--XXX de: very short captions, description in list below-->
-          <figure lang="en;de;fr">
+
+          <figure lang="fr">
             <title>
-              <phrase lang="en">Applying option to clipping</phrase>
-              <phrase lang="de">
-                Beispiele fÃr <quote>Ergebnis beschneiden</quote>
-              </phrase>
               <phrase lang="fr">Application des options au rognage</phrase>
             </title>
+
             <mediaobject>
               <imageobject>
-                <imagedata
-                  fileref="../images/toolbox/clip-1.png" format="PNG" />
+                <imagedata fileref="../images/toolbox/clip-1.png"
+                  format="PNG" />
               </imageobject>
+
               <caption>
-                <para lang="en">
-                  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>Ajust Canvas to Layers</guimenuitem>
-                  </menuchoice>
-                  command (on the right).
-                </para>
-                <para lang="de">Anpassen</para>
                 <para lang="fr">
                   Avec Ajuster : le calque est agrandi pour contenir tout le
-                  calque qui a subi la rotation. La nouvelle limite du
-                  calque est visible  ; la totalità du calque du calque
-                  devient visible en utilisant la commande
+                  calque qui a subi la rotation. La nouvelle limite du calque
+                  est visible ; la totalità du calque du calque devient
+                  visible en utilisant la commande
                   <menuchoice>
                     <guimenu>Image</guimenu>
                     <guimenuitem>Ajuster le canevas aux calques</guimenuitem>
@@ -1132,33 +1037,28 @@
                 </para>
               </caption>
             </mediaobject>
+
             <mediaobject>
               <imageobject>
                 <imagedata
                   fileref="../images/toolbox/clip-2.png" format="PNG" />
               </imageobject>
+
               <caption>
-                <para lang="en">
-                  With Clip: all what exceeds image limits is deleted.
-                </para>
-                <para lang="de">Beschneiden</para>
                 <para lang="fr">
                   Avec Rogner : tout ce qui excÃde les limites de l'image
                   est ÃliminÃ.
                 </para>
               </caption>
             </mediaobject>
+
             <mediaobject>
               <imageobject>
                 <imagedata
                   fileref="../images/toolbox/clip-3.png" format="PNG" />
               </imageobject>
+
               <caption>
-                <para lang="en">
-                  With Crop to result: the layer is cropped according to the
-                  largest rectangular selection inscribed in the layer.
-                </para>
-                <para lang="de">Auf Ergebnis beschneiden</para>
                 <para lang="fr">
                   Avec DÃcouper selon rÃsultat : le calque est dÃcoupà selon
                   la plus grande sÃlection rectangulaire inscrite dans le
@@ -1166,20 +1066,14 @@
                 </para>
               </caption>
             </mediaobject>
+
             <mediaobject>
               <imageobject>
                 <imagedata
                   fileref="../images/toolbox/clip-4.png" format="PNG" />
               </imageobject>
-              <!--FIXME de: "Crop with aspect" description -->
+
               <caption>
-                <para lang="en">
-                  With Crop with aspect: Clipping is performed on the active
-                  layer according to its initial dimensions. That comes down
-                  to deleting the active layer content...
-                  <!--clip-0.xcf in src/images/toolbox for test-->
-                </para>
-                <para lang="de">Auf SeitenverhÃltnis beschneiden</para>
                 <para lang="fr">
                   Avec DÃcouper avec le mÃme rapport : le rognage du calque
                   actif est effectuà selon ses dimensions initiales, ce qui
@@ -1189,52 +1083,206 @@
             </mediaobject>
           </figure>
 
-          <variablelist lang="de">
+          <variablelist lang="en;de">
             <varlistentry>
               <term>
                 <phrase lang="en">Adjust</phrase>
                 <phrase lang="de">Anpassen</phrase>
               </term>
-              <listitem> 
+
+              <listitem>
+                <figure>
+                  <title>
+                    <phrase lang="en">Original image for examples</phrase>
+                    <phrase lang="de">
+                      Beispielbilder fÃr die Beschneidung
+                    </phrase>
+                  </title>
+
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata format="PNG"
+                        fileref="../images/toolbox/clip-orig.png" />
+                    </imageobject>
+
+                    <caption>
+                      <para lang="en">Original image</para>
+                      <para lang="de">Originalbild</para>
+                    </caption>
+                  </mediaobject>
+
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="../images/toolbox/clip-adjust.png"
+                        format="PNG" />
+                    </imageobject>
+
+                    <caption>
+                      <para lang="en">
+                        Rotation applied with <quote>Adjust</quote>
+                      </para>
+                      <para lang="de">
+                        Drehen angewendet mit <quote>Anpassen</quote>
+                      </para>
+                    </caption>
+                  </mediaobject>
+
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="../images/toolbox/clip-adjust2.png"
+                        format="PNG" />
+                    </imageobject>
+
+                    <caption>
+                      <para lang="en">
+                        Rotation applied with <quote>Adjust</quote>
+                        and canvas enlarged to layer size
+                      </para>
+                      <para lang="de">
+                        Drehen angewendet mit <quote>Anpassen</quote>
+                        (Leinwand auf EbenengrÃÃe angepasst)
+                      </para>
+                    </caption>
+                  </mediaobject>
+                </figure>
+
+                <para lang="en">
+                  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>Ajust Canvas to Layers</guimenuitem>
+                  </menuchoice>
+                  command (on the right).
+                </para>
+
                 <para lang="de">
-                  Die Ebene wird vergrÃÃert, um alle gedrehten Ebenen umfassen zu
-                  kÃnnen. Der neue Ebenenrahmen ist sichtbar. Die gesamte Ebene
-                  wird durch
+                  Die Ebene wird soweit vergrÃÃert, dass der gedrehte Inhalt
+                  komplett hineinpasst. Da sind die GrÃÃe der Leinwand selbst
+                  jedoch nicht geÃndert hat, wird ein Rahmen sichtbar. Durch
+                  anpassen der GrÃÃe der Leinwand an die Ebene mittels
                   <menuchoice>
                     <guimenu>Bild</guimenu>
                     <guimenuitem>Leinwand an Ebenen anpassen</guimenuitem>
-                  </menuchoice>
-                  sichtbar gemacht (rechte Seite im Beispiel).
+                  </menuchoice>,
+                  wird das gesamte Bild sichtbar gemacht (rechte Seite im 
+                  Beispiel).
                 </para>
               </listitem> 
             </varlistentry>
+
             <varlistentry>
               <term>
                 <phrase lang="en">Clip</phrase>
                 <phrase lang="de">Beschneiden</phrase>
               </term>
-              <listitem> 
-                <para lang="de">Alles auÃerhalb des Bildes wird entfernt.</para>
+
+              <listitem>
+                <figure>
+                  <title>
+                    <phrase lang="en">Example for Clip</phrase>
+                    <phrase lang="de">Beispiel fÃr Beschneiden</phrase>
+                  </title>
+
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="../images/toolbox/clip-crop.png"
+                        format="PNG" />
+                    </imageobject>
+      
+                    <caption>
+                      <para lang="en">Clip</para>
+                      <para lang="de">Beschneiden</para>
+                    </caption>
+                  </mediaobject>
+                </figure>
+
+                <para lang="en">
+                  With Clip: all what exceeds image limits is deleted.
+                </para>
+                <para lang="de">
+                  Die Ebene wird beim Drehen nicht vergrÃÃert. Dadurch werden
+                  Teile des gedrehten Inhaltes abgeschnitten.
+                </para>
               </listitem> 
             </varlistentry>
+
+            <!-- FIXME: en de review needed - I didn't get what happens here -->
             <varlistentry>
               <term>
                 <phrase lang="en">Crop to result</phrase>
-                <phrase lang="de">Auf Ergebnis</phrase>
+                <phrase lang="de">Auf Ergebnis beschneiden</phrase>
               </term>
+
               <listitem> 
+                <figure>
+                  <title>
+                    <phrase lang="en">Example for Crop to result</phrase>
+                    <phrase lang="de">
+                      Beispiel fÃr Auf Ergebnis beschneiden
+                    </phrase>
+                  </title>
+
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="../images/toolbox/clip-3.png"
+                        format="PNG" />
+                    </imageobject>
+      
+                    <caption>
+                      <para lang="en">Crop to result</para>
+                      <para lang="de">Auf Ergebnis beschneiden</para>
+                    </caption>
+                  </mediaobject>
+                </figure>
+
+                <para lang="en">
+                  With Crop to result: the layer is cropped according to the
+                  largest rectangular selection inscribed in the layer.
+                </para>
                 <para lang="de">
                   Die Ebene wird auf die grÃÃte rechteckige Auswahl innerhalb
                   der Ebene beschnitten.
                 </para>
               </listitem> 
             </varlistentry>
+
+            <!-- FIXME: en de review needed - I didn't get what happens here -->
             <varlistentry>
               <term>
                 <phrase lang="en">Crop with aspect</phrase>
-                <phrase lang="de">Auf SeitenverhÃltnis</phrase>
+                <phrase lang="de">Auf SeitenverhÃltnis beschneiden</phrase>
               </term>
-              <listitem> 
+
+              <listitem>
+                <figure>
+                  <title>
+                    <phrase lang="en">Example for Crop with aspect</phrase>
+                    <phrase lang="de">
+                      Beispiel fÃr Auf SeitenverhÃltnis beschneiden
+                    </phrase>
+                  </title>
+
+                  <mediaobject>
+                    <imageobject>
+                      <imagedata fileref="../images/toolbox/clip-4.png"
+                        format="PNG" />
+                    </imageobject>
+      
+                    <caption>
+                      <para lang="en">Crop with aspect</para>
+                      <para lang="de">Auf SeitenverhÃltnis beschneiden</para>
+                    </caption>
+                  </mediaobject>
+                </figure>
+
+                <para lang="en">
+                  With Crop with aspect: Clipping is performed on the active
+                  layer according to its initial dimensions. That comes down
+                  to deleting the active layer content...
+                  <!--clip-0.xcf in src/images/toolbox for test-->
+                </para>
                 <para lang="de">Hmm, wenn wir das nur wÃÃten...</para>
               </listitem> 
             </varlistentry>
@@ -1312,219 +1360,225 @@
             ÐÐÐÐÐÐÐÑÑ ÐÐÑÐÐÐÑÐÐ:
           </para>
 
-          <orderedlist numeration="arabic">
-            <listitem>
-              <para lang="en">
-                <guilabel>Outline</guilabel>
-                : Puts a frame to mark the image outline, with a handle on
-                each corner. Movements will affect this frame only on the
-                Preview, but the result of the transformation will concern
-                either the content or the boundaries of the selection
-                according to the selected Affect mode.
-              </para>
-              <para lang="de">
-                <guilabel>Umriss</guilabel>
-                : Legt einen Rahmen um das Bild. Dieser Umriss hat an jeder
-                Ecke einen aktiven Punkt, mit dem Sie die Transformation
-                beeinflussen kÃnnen. Diese wird zunÃchst nur am Rahmen
-                sichtbar.
-              </para>
-              <para lang="es">
-                <guilabel>Esquema</guilabel>
-                : pone un marco para marcar el contorno de la imagen, con un
-                manejador en cada esquina. Los movimientos afectarÃn a este
-                marco solo en la vista previa, pero el resultado de la
-                transformaciÃn afectarà tanto al contenido como a los
-                lÃmites de la selecciÃn, en concordancia con el modo
-                seleccionado en afectar.
-              </para>
-              <para lang="fr">
-                <guilabel>Contour</guilabel>
-                Â: entoure l'image d'un cadre fait d'une fine ligne, avec
-                une poignÃe à chaque coin. Le mouvement ne concernera que le
-                cadre sur l'AperÃu, mais le rÃsultat de la transformation
-                portera sur le contenu ou les limites de la sÃlection en
-                fonction du mode Transformer choisi.
-              </para>
-              <para lang="it">
-                <guilabel>Profilo</guilabel>: piazza un riquadro per
-                marchiare il profilo dell'immagine con degli appigli su
-                ogni spigolo. Gli spostamenti riguarderanno solo questo
-                riquadro sull'anteprima, ma il risultato della
-                trasformazione concernerà i contenuti o il bordo della
-                selezione a seconda della modalità di trasformazione.
-              </para>
-              <para lang="no">
-                <guilabel>Omriss</guilabel>: Legg ei ramme rundt omrÃdet,
-                med eit handtak i kvart hjÃrne. NÃr du drar i handtaka, vil
-                bare ramma bli flytta pà i fÃrehandsvisinga. Biletet blir ikkje
-                forandra fÃr du trykker pà knappen
-                <guilabel>Forskyv</guilabel>.
-              </para>
-               <para lang="pl">
-                <guilabel>ObwÃdka</guilabel>: tworzy ramkÄ wokÃÅ obrazu z
-                uchwytami w rogach. Ruchy wpÅywajÄ na niÄ tylko na podglÄdzie,
-                a efekt przeksztaÅcania wpÅywa na zawartoÅÄ lub na ÅcieÅki
+          <variablelist>
+            <varlistentry>
+              <term lang="en">Outline</term>
+              <term lang="de">Umriss</term>
+              <term lang="es">Esquema</term>
+              <term lang="fr">Contour</term>
+              <term lang="it">Profilo</term>
+              <term lang="no">Omriss</term>
+              <term lang="pl">ObwÃdka</term>
+              <term lang="ru">ÐÐÐÑÑÑ</term>
+
+              <listitem>
+                <para lang="en">
+                  Puts a frame to mark the image outline, with a handle on
+                  each corner. Movements will affect this frame only on the
+                  Preview, but the result of the transformation will concern
+                  either the content or the boundaries of the selection
+                  according to the selected Affect mode.
+                </para>
+                <para lang="de">
+                  Legt einen Rahmen um das Bild. Dieser Umriss hat an jeder
+                  Ecke einen aktiven Punkt, mit dem Sie die Transformation
+                  beeinflussen kÃnnen. Diese wird zunÃchst nur am Rahmen
+                  sichtbar.
+                </para>
+                <para lang="es">
+                  pone un marco para marcar el contorno de la imagen, con un
+                  manejador en cada esquina. Los movimientos afectarÃn a este
+                  marco solo en la vista previa, pero el resultado de la
+                  transformaciÃn afectarà tanto al contenido como a los
+                  lÃmites de la selecciÃn, en concordancia con el modo
+                  seleccionado en afectar.
+                </para>
+                <para lang="fr">
+                  entoure l'image d'un cadre fait d'une fine ligne, avec une
+                  poignÃe à chaque coin. Le mouvement ne concernera que le
+                  cadre sur l'AperÃu, mais le rÃsultat de la transformation
+                  portera sur le contenu ou les limites de la sÃlection en
+                  fonction du mode Transformer choisi.
+                </para>
+                <para lang="it">
+                  piazza un riquadro per marchiare il profilo dell'immagine
+                  con degli appigli su ogni spigolo. Gli spostamenti
+                  riguarderanno solo questo riquadro sull'anteprima, ma il
+                  risultato della trasformazione concernerà i contenuti o il
+                  bordo della selezione a seconda della modalità di
+                  trasformazione.
+                </para>
+                <para lang="no">
+                  Legg ei ramme rundt omrÃdet, med eit handtak i kvart hjÃrne.
+                  NÃr du drar i handtaka, vil bare ramma bli flytta pà i
+                  fÃrehandsvisinga. Biletet blir ikkje forandra fÃr du trykker
+                  pà knappen <guilabel>Forskyv</guilabel>.
+                </para>
+                <para lang="pl">
+                  tworzy ramkÄ wokÃÅ obrazu z uchwytami w rogach. Ruchy
+                  wpÅywajÄ na niÄ tylko na podglÄdzie, a efekt przeksztaÅcania
+                  wpÅywa na zawartoÅÄ lub na ÅcieÅki zaznaczenia zgodnie z
+                  wybranym trybem przeksztaÅcenia.
+                </para>
+                <para lang="ru">
+                  ÐÐÐÐÑÑ ÑÐÐÐÑ ÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÐÐÑ Ñ ÐÐÑÐÐÐÑÑÐÐÐÐÐ ÐÐ ÑÐÐÐÐ.
+                  ÐÐÐÐÐÐÐÑ Ð ÐÐÐÑÑÑ ÐÐ ÑÑÑ ÑÐÐÐÑ ÑÐÐÑÐÐ Ð ÐÑÐÑÐÐÑÑÐ, Ð
+                  ÑÐÐÑÐÑÑÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÐÑ ÐÐÐÑÐÑ ÐÐÐÐ ÐÐ ÑÐÐÐÑÐÐÐÐÐ, ÐÐÐÐ ÐÐ
+                  ÐÐÐÑÑÑ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐÑ ÑÐÐÐÐÑ ÑÐÐÑÐÐÐÑ.
+                </para>
+              </listitem>
+            </varlistentry>
+            
+            <varlistentry>
+              <term lang="en">Grid</term>
+              <term lang="de">Gitter</term>
+              <term lang="es">Rejilla</term>
+              <term lang="fr">Grille</term>
+              <term lang="it">Griglia</term>
+              <term lang="no">Rutenett</term>
+              <term lang="pl">Siatka</term>
+              <term lang="ru">ÐÐÑÐÐ</term>
+
+              <listitem>
+                <para lang="en">
+                  Puts a grid on the image, with four handles. Movements will
+                  affect this grid only on the Preview, but the result of the
+                  transformation will concern either the content or the
+                  boundaries of the selection according to the selected
+                  Transform mode.
+                </para>
+                <para lang="de">
+                  Legt ein Gitter auf das Bild. Dieses Gitter hat an jeder
+                  Ecke einen aktiven Punkt, mit dem Sie die Transformation
+                  beeinflussen kÃnnen. Diese wird zunÃchst nur am Gitter
+                  sichtbar.
+                </para>
+                <para lang="es">
+                  pone una rejilla en la imagen, con cuatro manejadores. Los
+                  movimientos afectarÃn a la rejilla solo en la vista previa,
+                  pero el resultado de la transformaciÃn afectarà tanto al
+                  contenido como a los lÃmites de la selecciÃn, en
+                  concordancia con el modo seleccionado en afectar.
+                </para>
+                <para lang="fr">
+                  plaque une grille sur l'image, avec quatre poignÃes. Le
+                  mouvement ne concernera que la grille sur l'AperÃu, mais le
+                  rÃsultat de la transformation portera sur le contenu ou les
+                  limites de la sÃlection en fonction du mode Transformer
+                  choisi.
+                </para>
+                <para lang="it">
+                  pone una griglia sull'immagine, con quattro appigli. Gli
+                  spostamenti trasformeranno solo la griglia nell'anteprima,
+                  ma i risultati della trasformazione riguarderanno i
+                  contenuti o il bordo della selezione a seconda della
+                  modalità di trasformazione.
+                </para>
+                <para lang="no">
+                  Legg eit nett over biletet, med eit handtak i kvart hjÃrne.
+                  NÃr du drar i handtaka, vil bare nette bli flytta pà i
+                  fÃrehandsvisinga. Biletet blir ikkje forandra fÃr du trykker
+                  pà knappen <guilabel>Forskyv</guilabel>.
+                </para>
+                <para lang="pl">
+                  nakÅada siatkÄ na obraz wraz z czterema uchwytami.
+                  PrzeciÄganie ma wpÅyw tylko na podglÄdzie, a efekt
+                  przeksztaÅcenia wpÅywa na zawartoÅÄ lub na ÅcieÅkÄ
                   zaznaczenia zgodnie z wybranym trybem przeksztaÅcenia.
-              </para>
-              <para lang="ru">
-                <guilabel>ÐÐÐÑÑÑ</guilabel>: ÐÐÐÐÑÑ ÑÐÐÐÑ ÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÐÐÑ Ñ
-                ÐÐÑÐÐÐÑÑÐÐÐÐÐ ÐÐ ÑÐÐÐÐ. ÐÐÐÐÐÐÐÑ Ð ÐÐÐÑÑÑ ÐÐ ÑÑÑ ÑÐÐÐÑ ÑÐÐÑÐÐ
-                Ð ÐÑÐÑÐÐÑÑÐ, Ð ÑÐÐÑÐÑÑÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÐÑ ÐÐÐÑÐÑ ÐÐÐÐ ÐÐ
-                ÑÐÐÐÑÐÐÐÐÐ, ÐÐÐÐ ÐÐ ÐÐÐÑÑÑ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐÑ ÑÐÐÐÐÑ
-                ÑÐÐÑÐÐÐÑ.
-              </para>
-            </listitem>
+                </para>
+                <para lang="ru">
+                  ÐÐÐÐÑÑ ÑÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐÐÐÐ Ñ ÑÐÑÑÑÐÑ ÐÐÑÐÐÐÑÑÐÐÐÐÐ.
+                  ÐÐÐÐÐÐÐÑ ÐÐÐÑÑÑ ÐÐ ÑÐÑÐÑ ÑÐÐÑÐÐ Ð ÐÑÐÑÐÐÑÑÐ, Ð ÑÐÐÑÐÑÑÐÑ
+                  ÐÑÐÐÐÑÐÐÐÐÐÐÐÑ ÐÐÐÑÐÑ ÐÐÐÐ ÐÐ ÑÐÐÐÑÐÐÐÐÐ, ÐÐÐÐ ÐÐ ÐÐÐÑÑÑ
+                  ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐÑ ÑÐÐÐÐÑ ÑÐÐÑÐÐÐÑ.
+                </para>
+              </listitem>
+            </varlistentry>
 
-            <listitem>
-              <para lang="en">
-                <guilabel>Grid</guilabel>
-                : Puts a grid on the image, with four handles. Movements
-                will affect this grid only on the Preview, but the result of
-                the transformation will concern either the content or the
-                boundaries of the selection according to the selected
-                Transform mode.
-              </para>
-              <para lang="de">
-                <guilabel>Gitter</guilabel>
-                : Legt ein Gitter auf das Bild. Dieses Gitter hat an jeder
-                Ecke einen aktiven Punkt, mit dem Sie die Transformation
-                beeinflussen kÃnnen. Diese wird zunÃchst nur am Gitter
-                sichtbar.
-              </para>
-              <para lang="es">
-                <guilabel>Rejilla</guilabel>
-                : pone una rejilla en la imagen, con cuatro manejadores. Los
-                movimientos afectarÃn a la rejilla solo en la vista previa,
-                pero el resultado de la transformaciÃn afectarà tanto al
-                contenido como a los lÃmites de la selecciÃn, en concordancia
-                con el modo seleccionado en afectar.
-              </para>
-              <para lang="fr">
-                <guilabel>Grille</guilabel>
-                Â: plaque une grille sur l'image, avec quatre poignÃes. Le
-                mouvement ne concernera que la grille sur l'AperÃu, mais le
-                rÃsultat de la transformation portera sur le contenu ou les
-                limites de la sÃlection en fonction du mode Transformer
-                choisi.
-              </para>
-              <para lang="it">
-                <guilabel>Griglia</guilabel>: pone una griglia
-                sull'immagine, con quattro appigli. Gli spostamenti
-                trasformeranno solo la griglia nell'anteprima, ma i
-                risultati della trasformazione riguarderanno i
-                contenuti o il bordo della selezione a seconda della
-                modalità di trasformazione.
-              </para>
-              <para lang="no">
-                <guilabel>Rutenett</guilabel>: Legg eit nett over biletet,
-                med eit handtak i kvart hjÃrne. NÃr du drar i handtaka, vil
-                bare nette bli flytta pà i fÃrehandsvisinga. Biletet blir ikkje
-                forandra fÃr du trykker pà knappen
-                <guilabel>Forskyv</guilabel>.
-              </para>
-               <para lang="pl">
-                <guilabel>Siatka</guilabel>: nakÅada siatkÄ na obraz wraz
-                z czterema uchwytami. PrzeciÄganie ma wpÅyw tylko na
-                podglÄdzie, a efekt przeksztaÅcenia wpÅywa na zawartoÅÄ
-                  lub na ÅcieÅkÄ zaznaczenia zgodnie z wybranym trybem
-                  przeksztaÅcenia.
-              </para>
-              <para lang="ru">
-                <guilabel>ÐÐÑÐÐ</guilabel>: ÐÐÐÐÑÑ ÑÐÑÐÑ ÐÐ ÐÐÐÐÑÐÐÐÐÐÐ Ñ
-                ÑÐÑÑÑÐÑ ÐÐÑÐÐÐÑÑÐÐÐÐÐ. ÐÐÐÐÐÐÐÑ ÐÐÐÑÑÑ ÐÐ ÑÐÑÐÑ ÑÐÐÑÐÐ Ð
-                ÐÑÐÑÐÐÑÑÐ, Ð ÑÐÐÑÐÑÑÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÐÑ ÐÐÐÑÐÑ ÐÐÐÐ ÐÐ
-                ÑÐÐÐÑÐÐÐÐÐ, ÐÐÐÐ ÐÐ ÐÐÐÑÑÑ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÐÑÐÐ ÐÑÐÑÐÐÐÐÐÑ
-                ÑÐÐÐÐÑ ÑÐÐÑÐÐÐÑ.
-              </para>
-            </listitem>
+            <varlistentry>
+              <term lang="en">Image</term>
+              <term lang="de">Bild</term>
+              <term lang="es">Imagen</term>
+              <term lang="fr">Image</term>
+              <term lang="it">Imagine</term>
+              <term lang="no">Bilete</term>
+              <term lang="pl">Obraz</term>
+              <term lang="ru">ÐÐÐÐÑÐÐÐÐÐÐ</term>
 
-            <listitem>
-              <para lang="en">
-                <guilabel>Image</guilabel>
-                : Here, the preview is a copy of the image superimposed on
-                the image, with an outline. Movements affect this copy and
-                the underlying image appears.
-              </para>
-              <para lang="de">
-                <guilabel>Bild</guilabel>
-                : In diesem Fall wird eine Kopie des Bildes mit einem Rahmen
-                Ãber das eigentliche Bild gelegt. Die Transformation wird
-                fÃr dieses Vorschaubild angezeigt, so dass Sie genau sehen,
-                wie das Ergebnis aussehen wÃrde.
-              </para>
-              <para lang="es">
-                <guilabel>Imagen</guilabel>
-                : AquÃ, la vista previa es una copia de la imagen superpuesta
-                a la imagen, con un contorno. Los movimientos afectan a esta
-                copia y aparece la capa subyacente.
-              </para>
-              <para lang="fr">
-                <guilabel>Image</guilabel>
-                Â: l'aperÃu est constituà ici d'une copie de l'image plaquÃe
-                sur l'image et entourÃe d'un contour. Le mouvement concerne
-                cette copie d'image, laissant apparaÃtre l'image
-                sous-jacente.
-              </para>
-              <para lang="it">
-                <guilabel>Imagine</guilabel>: in questo caso l'anteprima Ã
-                una copia dell'immagine sovrapposta sull'immagine stessa,
-                con un contorno. Gli spostamenti modificano questa copia e
-                come appare l'immagine sottostante.
-              </para>
-              <para lang="no">
-                <guilabel>Bilete</guilabel>: FÃrehandsvisinga viser nà ein
-                kopi av biletet, med ei ramme rundt. Flyttingane pÃverkar
-                denne kopien. Det underliggande biletet blir synleg der kopien
-                ikkje dekker biletet.
-              </para>
-               <para lang="pl">
-                <guilabel>Obraz</guilabel>: w tym wypadku na podglÄdzie
-                widoczna jest kopia obrazu ze ÅcieÅkÄ pokazanÄ powyÅej obrazu.
-                PrzeciÄgniÄcia majÄ wpÅyw na kopiÄ i poÅoÅony poniÅej obraz
-                  jest pokazywany.
-              </para>
-              <para lang="ru">
-                <guilabel>ÐÐÐÐÑÐÐÐÐÐÐ</guilabel>: ÐÐÐÑÑ Ð ÐÑÐÑÐÐÑÑÐ ÐÐÐÐÑ
-                ÐÐÐÐÑÐÐÐÐÐÑ Ñ ÐÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐÐÐÑ. ÐÐÐÐÐÐÐÑ
-                ÐÐÐÑÑÑ ÐÐ ÐÐÐÐÑ, Ð ÐÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐÐÑÑÑ.
-              </para>
-            </listitem>
+              <listitem>
+                <para lang="en">
+                  Here, the preview is a copy of the image superimposed on the
+                  image, with an outline. Movements affect this copy and the
+                  underlying image appears.
+                </para>
+                <para lang="de">
+                  In diesem Fall wird eine Kopie des Bildes mit einem Rahmen
+                  Ãber das eigentliche Bild gelegt. Die Transformation wird
+                  fÃr dieses Vorschaubild angezeigt, so dass Sie genau sehen,
+                  wie das Ergebnis aussehen wÃrde.
+                </para>
+                <para lang="es">
+                  AquÃ, la vista previa es una copia de la imagen superpuesta
+                  a la imagen, con un contorno. Los movimientos afectan a esta
+                  copia y aparece la capa subyacente.
+                </para>
+                <para lang="fr">
+                  l'aperÃu est constituà ici d'une copie de l'image plaquÃe
+                  sur l'image et entourÃe d'un contour. Le mouvement concerne
+                  cette copie d'image, laissant apparaÃtre l'image
+                  sous-jacente.
+                </para>
+                <para lang="it">
+                  in questo caso l'anteprima à una copia dell'immagine
+                  sovrapposta sull'immagine stessa, con un contorno. Gli
+                  spostamenti modificano questa copia e come appare l'immagine
+                  sottostante.
+                </para>
+                <para lang="no">
+                  FÃrehandsvisinga viser nà ein kopi av biletet, med ei ramme
+                  rundt. Flyttingane pÃverkar denne kopien. Det underliggande
+                  biletet blir synleg der kopien ikkje dekker biletet.
+                </para>
+                <para lang="pl">
+                  w tym wypadku na podglÄdzie widoczna jest kopia obrazu ze
+                  ÅcieÅkÄ pokazanÄ powyÅej obrazu. PrzeciÄgniÄcia majÄ wpÅyw
+                  na kopiÄ i poÅoÅony poniÅej obraz jest pokazywany.
+                </para>
+                <para lang="ru">
+                  ÐÐÐÑÑ Ð ÐÑÐÑÐÐÑÑÐ ÐÐÐÐÑ ÐÐÐÐÑÐÐÐÐÐÑ Ñ ÐÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÐ
+                  ÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐÐÐÑ. ÐÐÐÐÐÐÐÑ ÐÐÐÑÑÑ ÐÐ ÐÐÐÐÑ, Ð ÐÐÐÐÐÐÐÑÐÐ
+                  ÐÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐÐÑÑÑ.
+                </para>
+              </listitem>
+            </varlistentry>
 
-            <listitem>
-              <para lang="en">
-                <guilabel>Grid+Image</guilabel>: Both turn at the
-                same time.
-              </para>
-              <para lang="de">
-                <guilabel>Bild + Gitter</guilabel>:
-                Sowohl das Gitter als auch das Vorschaubild werden
-                angezeigt.
-              </para>
-              <para lang="es">
-                <guilabel>Rejilla+imagen</guilabel>: ambos a la vez.
-              </para>
-              <para lang="fr">
-                <guilabel>Image+Grille</guilabel>Â: les deux tournent
-                en mÃme temps.
-              </para>
-              <para lang="it">
-                <guilabel>Immagine+griglia</guilabel>: si deformano assieme
-                contemporaneamente.
-              </para>
-              <para lang="no">
-                <guilabel>Bilete + rutenett</guilabel>: Begge er synlege.
-              </para>
-               <para lang="pl">
-                <guilabel>Obraz + siatka</guilabel>: oba obracajÄ siÄ
-                jednoczeÅnie.
-              </para>
-              <para lang="ru">
-                <guilabel>ÐÐÑÐÐ Ð ÐÐÐÐÑÐÐÐÐÐÐ</guilabel>: ÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÑÑÑ
-                ÐÐÐÐÐÑÐÐÐÐÐÐ.
-              </para>
-            </listitem>
-          </orderedlist>
+            <varlistentry>
+              <term lang="en">Grid+Image</term>
+              <term lang="de">Bild + Gitter</term>
+              <term lang="es">Rejilla+imagen</term>
+              <term lang="fr">Image+Grille</term>
+              <term lang="it">Immagine+griglia</term>
+              <term lang="no">Bilete + rutenett</term>
+              <term lang="pl">Obraz + siatka</term>
+              <term lang="ru">ÐÐÑÐÐ Ð ÐÐÐÐÑÐÐÐÐÐÐ</term>
+
+              <listitem>
+                <para lang="en">Both turn at the same time.</para>
+                <para lang="de">
+                  Sowohl das Gitter als auch das Vorschaubild werden
+                  angezeigt.
+                </para>
+                <para lang="es">ambos a la vez.</para>
+                <para lang="fr">les deux tournent en mÃme temps.</para>
+                <para lang="it">
+                  si deformano assieme contemporaneamente.
+                </para>
+                <para lang="no">Begge er synlege.</para>
+                <para lang="pl">oba obracajÄ siÄ jednoczeÅnie.</para>
+                <para lang="ru">ÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÑÑÑ ÐÐÐÐÐÑÐÐÐÐÐÐ.</para>
+              </listitem>
+            </varlistentry>
+          </variablelist>
 
           <para lang="en"><!-- 2008-01-06 Adapted to Transform tools-->
             Preview is only for greater convenience. Whatever your choice,

Modified: trunk/src/tutorial/quickies.xml
==============================================================================
--- trunk/src/tutorial/quickies.xml	(original)
+++ trunk/src/tutorial/quickies.xml	Fri Feb  1 23:02:34 2008
@@ -273,7 +273,7 @@
 
     <indexterm lang="de"><primary>Tutorial</primary></indexterm>
     <indexterm lang="de">
-      <primary>Bild</primary><secondary>Skalieren</secondary>
+      <primary>Bild</primary><secondary>skalieren</secondary>
     </indexterm>
 
     <indexterm lang="es"><primary>Tutorial</primary></indexterm>

Modified: trunk/src/using/brushes.xml
==============================================================================
--- trunk/src/using/brushes.xml	(original)
+++ trunk/src/using/brushes.xml	Fri Feb  1 23:02:34 2008
@@ -53,7 +53,7 @@
     <primary>Brushes</primary><secondary>Add New</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary>Pinsel</primary><secondary>HinzufÃgen</secondary>
+    <primary>Pinsel</primary><secondary>hinzufÃgen</secondary>
   </indexterm>
   <indexterm lang="es">
     <primary>Brochas</primary><secondary>CreaciÃn de nuevas</secondary>

Modified: trunk/src/using/layers.xml
==============================================================================
--- trunk/src/using/layers.xml	(original)
+++ trunk/src/using/layers.xml	Fri Feb  1 23:02:34 2008
@@ -40,12 +40,12 @@
   </title>
 
   <indexterm lang="en">
-    <primary lang="en">Layers</primary>
-    <secondary lang="en">Creating new layers</secondary>
+    <primary>Layer</primary>
+    <secondary>Creating new layers</secondary>
   </indexterm>
   <indexterm lang="de">
-    <primary lang="de">Ebenen</primary>
-    <secondary lang="de">Neue Ebenen erstellen</secondary>
+    <primary>Ebene</primary>
+    <secondary>Neue Ebenen erstellen</secondary>
   </indexterm>
   <indexterm lang="es">
     <primary lang="es">Capas</primary>
@@ -117,8 +117,7 @@
       <para lang='en'>
         Selecting
         <menuchoice>
-          <guimenu>Layer</guimenu>
-          <guimenuitem>New Layer</guimenuitem>
+          <guimenu>Layer</guimenu><guimenuitem>New Layer</guimenuitem>
         </menuchoice>
         in the image menu.  This brings up a dialog that allows you
         to set the basic properties of the new layer; see the <link
@@ -131,15 +130,15 @@
           <guimenu>Vrstva</guimenu>
           <guimenuitem>Novà vrstva</guimenuitem>
         </menuchoice>
-        z nabÃdky obrÃzku se otevÅe dialog, ve kterÃm mÅÅet nastavit
-        zÃkladnà vlastnosti novà vrstvy (viz <!--FIXME <link
-        linkend='gimp-new-layer-dialog'>-->Dialog Novà vrstva<!--</link>-->).
+        z nabÃdky obrÃzku se otevÅe dialog, ve kterÃm mÅÅet nastavit zÃkladnÃ
+        vlastnosti novà vrstvy (viz
+        <!-- FIXME cs: <link
+          linkend='gimp-new-layer-dialog'>-->Dialog Novà vrstva<!--</link>-->).
       </para>
       <para lang="de">
         WÃhlen Sie
         <menuchoice>
-          <guimenu>Ebene</guimenu>
-          <guimenuitem>Neue Ebene</guimenuitem>
+          <guimenu>Ebene</guimenu><guimenuitem>Neue Ebene</guimenuitem>
         </menuchoice>
         im Menà des Bildfensters. Der sich nun Ãffnende Dialog ermÃglicht
         es Ihnen, die grundlegenden Eigenschaften der neuen Ebene
@@ -190,7 +189,7 @@
         ë ìííëë. êëë ì ëììì êë ììëì ìíí ì ìë
         ëíììê íìëëë. ìì ëí ë ììí ìíì
         <!-- PENDING: ko <link linkend='gimp-new-layer-dialog'>ì ëìì ëëê ëíìì</link> -->
-		ì ëìì ëëê ëíììë ìêíìì.
+    		ì ëìì ëëê ëíììë ìêíìì.
       </para>
       <para lang="lt">
         PaveikslÄlio meniu pasirenkant
@@ -227,11 +226,10 @@
      </listitem>
 
     <listitem>
-      <para lang='en'>
+      <para lang="en">
         Selecting
         <menuchoice>
-          <guimenu>Layer</guimenu>
-          <guimenuitem>Duplicate Layer</guimenuitem>
+          <guimenu>Layer</guimenu><guimenuitem>Duplicate Layer</guimenuitem>
         </menuchoice>
         in the image menu. This creates a new layer, that is a perfect
         copy of the currently active layer, just above the active layer.
@@ -248,8 +246,7 @@
       <para lang="de">
         WÃhlen Sie
         <menuchoice>
-          <guimenu>Ebene</guimenu>
-          <guimenuitem>Ebene duplizieren</guimenuitem>
+          <guimenu>Ebene</guimenu><guimenuitem>Ebene duplizieren</guimenuitem>
         </menuchoice>
         im Menà des Bildfensters. Das erstellt eine exakte Kopie der gerade
         aktiven Ebene, und zwar oberhalb dieser Ebene.

Modified: trunk/src/using/preferences/prefs-folders-data.xml
==============================================================================
--- trunk/src/using/preferences/prefs-folders-data.xml	(original)
+++ trunk/src/using/preferences/prefs-folders-data.xml	Fri Feb  1 23:02:34 2008
@@ -36,8 +36,7 @@
     <tertiary>Data folders</tertiary>
   </indexterm>
   <indexterm lang="en">
-    <primary>Data folders</primary>
-    <secondary>Preferences</secondary>
+    <primary>Data folders</primary><secondary>Preferences</secondary>
   </indexterm>
 
   <indexterm lang="cs">
@@ -46,8 +45,7 @@
     <tertiary>adresÃÅe s daty</tertiary>
   </indexterm>
   <indexterm lang="cs">
-    <primary>AdresÃÅe s daty</primary>
-    <secondary>PÅedvolby</secondary>
+    <primary>AdresÃÅe s daty</primary><secondary>PÅedvolby</secondary>
   </indexterm>
 
   <indexterm lang="de">
@@ -65,8 +63,7 @@
     <tertiary>Carpetas de datos</tertiary>
   </indexterm>
   <indexterm lang="es">
-    <primary>Carpetas de datos</primary>
-    <secondary>Preferencias</secondary>
+    <primary>Carpetas de datos</primary><secondary>Preferencias</secondary>
   </indexterm>
 
   <indexterm lang="fr">
@@ -75,18 +72,14 @@
     <tertiary>Dossiers des donnÃes</tertiary>
   </indexterm>
   <indexterm lang="fr">
-    <primary>Dossiers des donnÃes</primary>
-    <secondary>PrÃfÃrences</secondary>
+    <primary>Dossiers des donnÃes</primary><secondary>PrÃfÃrences</secondary>
   </indexterm>
 
   <indexterm lang="it">
-    <primary>Finestre</primary>
-    <secondary>Preferenze</secondary>
-    <tertiary></tertiary>
+    <primary>Finestre</primary><secondary>Preferenze</secondary>
   </indexterm>
   <indexterm lang="it">
-    <primary>Cartelle</primary>
-    <secondary>Preferenze</secondary>
+    <primary>Cartelle</primary><secondary>Preferenze</secondary>
   </indexterm>
   
   <indexterm lang="no">

Modified: trunk/src/using/selections.xml
==============================================================================
--- trunk/src/using/selections.xml	(original)
+++ trunk/src/using/selections.xml	Fri Feb  1 23:02:34 2008
@@ -106,24 +106,19 @@
     </title>
 
     <indexterm lang="en">
-      <primary>Selection</primary>
-      <secondary>Move selection</secondary>
+      <primary>Selection</primary><secondary>Move selection</secondary>
     </indexterm>
     <indexterm lang="de">
-      <primary>Auswahl</primary>
-      <secondary>Verschieben</secondary>
+      <primary>Auswahl</primary><secondary>verschieben</secondary>
     </indexterm>
     <indexterm lang="fr">
-      <primary>SÃlection</primary>
-      <secondary>DÃplacer</secondary>
+      <primary>SÃlection</primary><secondary>DÃplacer</secondary>
     </indexterm>
     <indexterm lang="it">
-      <primary>Selezione</primary>
-      <secondary>Spostamento</secondary>
+      <primary>Selezione</primary><secondary>Spostamento</secondary>
     </indexterm>
     <indexterm lang="lt">
-      <primary>PaÅymÄjimas</primary>
-      <secondary>Perkelti paÅymÄjimÄ</secondary>
+      <primary>PaÅymÄjimas</primary><secondary>Perkelti paÅymÄjimÄ</secondary>
     </indexterm>
 
     <para lang="en">



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