gimp-help-2 r2679 - in trunk: . images/menus images/menus/fr po/de/menus po/es/menus po/fi/menus po/fr po/fr/appendix po/fr/menus po/fr/menus/colors po/fr/menus/colors/map po/hr/menus po/it/menus po/ko/menus po/lt/menus po/nl/menus po/no/menus po/pl/menus po/ru/menus po/sv/menus src src/menus

[jhardlin svn gnome org]

Author: jhardlin
Date: Sat Jan 10 08:03:03 2009
New Revision: 2679
URL: http://svn.gnome.org/viewvc/gimp-help-2?rev=2679&view=rev

Log:
2009-01-10 Julien hardelin <jm hard wanadoo fr>

* src/menus/file-close.xml
* src/menus/edit-stroke-path.xml
* src/menus/edit-copy-visible.xml
* src/menus/edit-copy.xml
* src/menus/edit-clear.xml
* src/menus/menus-xtns.xml
* src/menus/edit-fill-bg.xml
* src/menus/edit-paste-as.xml
* src/menus/edit-stroke-selection.xml
* src/menus/menus-toolbox-file.xml
* src/menus/edit-fill-pattern.xml
* src/menus/edit-buffer-dialog.xml
* src/menus/edit-fill-fg.xml
* src/menus/edit-paste-into.xml
* src/menus/menus-edit.xml
* src/gimp.xml
* images/menus/edit-stroke-options.png
* images/menus/fr/edit-stroke-options.png: updated to v2.6

* src/menus/file-units.xml
* src/menus/xtns-module-manager.xml
* src/menus/file-keyboard-shortcuts.xml
* src/menus/file-preferences.xml: removed
* src/menus/edit-units.xml
* src/menus/edit-module-manager.xml
* src/menus/edit-shortcuts.xml
* src/menus/edit-preferences.xml: added

* po/de/menus/file-preferences.po
* po/de/menus/file-keyboard-shortcuts.po
* po/de/menus/file-units.po
* po/de/menus/xtns-module-manager.po:removed
* po/de/menus/edit-preferences.po
* po/de/menus/edit-shortcuts.po
* po/de/menus/edit-module-manager.po
* po/de/menus/edit-units.po: added

* po/es/menus/file-preferences.po
* po/es/menus/file-keyboard-shortcuts.po
* po/es/menus/file-units.po
* po/es/menus/xtns-module-manager.po: removed
* po/es/menus/edit-preferences.po
* po/es/menus/edit-shortcuts.po
* po/es/menus/edit-module-manager.po
* po/es/menus/edit-units.po: added


* po/fi/menus/file-preferences.po
* po/fi/menus/file-keyboard-shortcuts.po
* po/fi/menus/file-units.po
* po/fi/menus/xtns-module-manager.po:removed
* po/fi/menus/edit-preferences.po
* po/fi/menus/edit-shortcuts.po
* po/fi/menus/edit-module-manager.po
* po/fi/menus/edit-units.po: addded

* po/fr/menus/file-preferences.po
* po/fr/menus/file-keyboard-shortcuts.po
* po/fr/menus/file-units.po
* po/fr/menus/xtns-module-manager.po: removed
* po/fr/menus/edit-shortcuts.po
* po/fr/menus/edit-module-manager.po
* po/fr/menus/edit-units.po
* po/fr/menus/Compendium.po
* po/fr/menus/edit-preferences.po: added
* po/fr/menus/edit-paste-as-new.po
* po/fr/menus/edit-copy-visible.po
* po/fr/menus/edit-paste-into.po
* po/fr/menus/edit-clear.po
* po/fr/menus/menus-colors.po
* po/fr/menus/file-new.po
* po/fr/menus/edit-fade.po
* po/fr/menus/edit-fill-pattern.po
* po/fr/menus/file-create.po
* po/fr/menus/edit-paste-as-brush.po
* po/fr/menus/colors/map.po
* po/fr/menus/colors/map/set-colormap.po
* po/fr/menus/colors/map/rotate-colormap.po
* po/fr/menus/colors/map/palettemap.po
* po/fr/menus/colors/map/rearrange-colormap.po
* po/fr/menus/edit-undo-history.po
* po/fr/menus/edit-copy.po
* po/fr/menus/edit-fill-bg.po
* po/fr/menus/edit-paste-as.po
* po/fr/menus/edit-fill-fg.po
* po/fr/menus/edit-cut.po
* po/fr/menus/edit-stroke-path.po
* po/fr/menus/edit-undo.po
* po/fr/menus/menus-edit.po
* po/fr/menus/edit-paste-as-layer.po
* po/fr/menus/edit-redo.po
* po/fr/menus/menus-toolbox-file.po
* po/fr/menus/edit-buffer-dialog.po
* po/fr/menus/edit-paste.po
* po/fr/menus/edit-paste-as-pattern.po
* po/fr/menus/file-close.po
* po/fr/menus/edit-stroke-selection.po
* po/fr/appendix/bibliography.po
* po/fr/gimp.po: updated

* po/hr/menus/file-preferences.po
* po/hr/menus/file-keyboard-shortcuts.po
* po/hr/menus/file-units.po
* po/hr/menus/xtns-module-manager.po: removed
* po/hr/menus/edit-preferences.po
* po/hr/menus/edit-shortcuts.po
* po/hr/menus/edit-module-manager.po
* po/hr/menus/edit-units.po: added

* po/it/menus/file-preferences.po
* po/it/menus/file-keyboard-shortcuts.po
* po/it/menus/file-units.po
* po/it/menus/xtns-module-manager.po: removed
* po/it/menus/edit-preferences.po
* po/it/menus/edit-shortcuts.po
* po/it/menus/edit-module-manager.po
* po/it/menus/edit-units.po: added

* po/ko/menus/file-preferences.po
* po/ko/menus/file-keyboard-shortcuts.po
* po/ko/menus/file-units.po
* po/ko/menus/xtns-module-manager.po: removed
* po/ko/menus/edit-preferences.po
* po/ko/menus/edit-shortcuts.po
* po/ko/menus/edit-module-manager.po
* po/ko/menus/edit-units.po: added


* po/lt/menus/file-preferences.po
* po/lt/menus/file-keyboard-shortcuts.po
* po/lt/menus/file-units.po
* po/lt/menus/xtns-module-manager.po: removed
* po/lt/menus/edit-preferences.po
* po/lt/menus/edit-shortcuts.po
* po/lt/menus/edit-module-manager.po
* po/lt/menus/edit-units.po: added


* po/nl/menus/file-preferences.po
* po/nl/menus/file-keyboard-shortcuts.po
* po/nl/menus/file-units.po
* po/nl/menus/xtns-module-manager.po:removed
* po/nl/menus/edit-preferences.po
* po/nl/menus/edit-shortcuts.po
* po/nl/menus/edit-module-manager.po
* po/nl/menus/edit-units.po:added


* po/no/menus/file-preferences.po
* po/no/menus/file-keyboard-shortcuts.po
* po/no/menus/file-units.po
* po/no/menus/xtns-module-manager.po: removed
* po/no/menus/edit-preferences.po
* po/no/menus/edit-shortcuts.po
* po/no/menus/edit-module-manager.po
* po/no/menus/edit-units.po: added

* po/pl/menus/file-preferences.po
* po/pl/menus/file-keyboard-shortcuts.po
* po/pl/menus/file-units.po
* po/pl/menus/xtns-module-manager.po: removed
* po/pl/menus/edit-preferences.po
* po/pl/menus/edit-shortcuts.po
* po/pl/menus/edit-module-manager.po
* po/pl/menus/edit-units.po: added


* po/ru/menus/file-preferences.po
* po/ru/menus/file-keyboard-shortcuts.po
* po/ru/menus/file-units.po
* po/ru/menus/xtns-module-manager.po:removed
* po/ru/menus/edit-preferences.po
* po/ru/menus/edit-shortcuts.po
* po/ru/menus/edit-module-manager.po
* po/ru/menus/edit-units.po: added

* po/sv/menus/file-preferences.po
* po/sv/menus/file-keyboard-shortcuts.po
* po/sv/menus/file-units.po
* po/sv/menus/xtns-module-manager.po:removed
* po/sv/menus/edit-preferences.po
* po/sv/menus/edit-shortcuts.po
* po/sv/menus/edit-module-manager.po
* po/sv/menus/edit-units.po: added


Added:
   trunk/po/de/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/de/menus/xtns-module-manager.po
   trunk/po/de/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/de/menus/file-preferences.po
   trunk/po/de/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/de/menus/file-keyboard-shortcuts.po
   trunk/po/de/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/de/menus/file-units.po
   trunk/po/es/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/es/menus/xtns-module-manager.po
   trunk/po/es/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/es/menus/file-preferences.po
   trunk/po/es/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/es/menus/file-keyboard-shortcuts.po
   trunk/po/es/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/es/menus/file-units.po
   trunk/po/fi/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/fi/menus/xtns-module-manager.po
   trunk/po/fi/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/fi/menus/file-preferences.po
   trunk/po/fi/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/fi/menus/file-keyboard-shortcuts.po
   trunk/po/fi/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/fi/menus/file-units.po
   trunk/po/fr/menus/Compendium.po
   trunk/po/fr/menus/edit-module-manager.po
   trunk/po/fr/menus/edit-preferences.po
   trunk/po/fr/menus/edit-shortcuts.po
   trunk/po/fr/menus/edit-units.po
   trunk/po/hr/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/hr/menus/xtns-module-manager.po
   trunk/po/hr/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/hr/menus/file-preferences.po
   trunk/po/hr/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/hr/menus/file-keyboard-shortcuts.po
   trunk/po/hr/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/hr/menus/file-units.po
   trunk/po/it/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/it/menus/xtns-module-manager.po
   trunk/po/it/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/it/menus/file-preferences.po
   trunk/po/it/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/it/menus/file-keyboard-shortcuts.po
   trunk/po/it/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/it/menus/file-units.po
   trunk/po/ko/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/ko/menus/xtns-module-manager.po
   trunk/po/ko/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/ko/menus/file-preferences.po
   trunk/po/ko/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/ko/menus/file-keyboard-shortcuts.po
   trunk/po/ko/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/ko/menus/file-units.po
   trunk/po/lt/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/lt/menus/xtns-module-manager.po
   trunk/po/lt/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/lt/menus/file-preferences.po
   trunk/po/lt/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/lt/menus/file-keyboard-shortcuts.po
   trunk/po/lt/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/lt/menus/file-units.po
   trunk/po/nl/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/nl/menus/xtns-module-manager.po
   trunk/po/nl/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/nl/menus/file-preferences.po
   trunk/po/nl/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/nl/menus/file-keyboard-shortcuts.po
   trunk/po/nl/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/nl/menus/file-units.po
   trunk/po/no/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/no/menus/xtns-module-manager.po
   trunk/po/no/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/no/menus/file-preferences.po
   trunk/po/no/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/no/menus/file-keyboard-shortcuts.po
   trunk/po/no/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/no/menus/file-units.po
   trunk/po/pl/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/pl/menus/xtns-module-manager.po
   trunk/po/pl/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/pl/menus/file-preferences.po
   trunk/po/pl/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/pl/menus/file-keyboard-shortcuts.po
   trunk/po/pl/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/pl/menus/file-units.po
   trunk/po/ru/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/ru/menus/xtns-module-manager.po
   trunk/po/ru/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/ru/menus/file-preferences.po
   trunk/po/ru/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/ru/menus/file-keyboard-shortcuts.po
   trunk/po/ru/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/ru/menus/file-units.po
   trunk/po/sv/menus/edit-module-manager.po   (props changed)
      - copied unchanged from r2678, /trunk/po/sv/menus/xtns-module-manager.po
   trunk/po/sv/menus/edit-preferences.po   (props changed)
      - copied unchanged from r2678, /trunk/po/sv/menus/file-preferences.po
   trunk/po/sv/menus/edit-shortcuts.po   (props changed)
      - copied unchanged from r2678, /trunk/po/sv/menus/file-keyboard-shortcuts.po
   trunk/po/sv/menus/edit-units.po   (props changed)
      - copied unchanged from r2678, /trunk/po/sv/menus/file-units.po
   trunk/src/menus/edit-module-manager.xml
   trunk/src/menus/edit-preferences.xml   (contents, props changed)
      - copied, changed from r2671, /trunk/src/menus/file-preferences.xml
   trunk/src/menus/edit-shortcuts.xml   (contents, props changed)
      - copied, changed from r2671, /trunk/src/menus/file-keyboard-shortcuts.xml
   trunk/src/menus/edit-units.xml   (contents, props changed)
      - copied, changed from r2671, /trunk/src/menus/file-units.xml
Removed:
   trunk/po/de/menus/file-keyboard-shortcuts.po
   trunk/po/de/menus/file-preferences.po
   trunk/po/de/menus/file-units.po
   trunk/po/de/menus/xtns-module-manager.po
   trunk/po/es/menus/file-keyboard-shortcuts.po
   trunk/po/es/menus/file-preferences.po
   trunk/po/es/menus/file-units.po
   trunk/po/es/menus/xtns-module-manager.po
   trunk/po/fi/menus/file-keyboard-shortcuts.po
   trunk/po/fi/menus/file-preferences.po
   trunk/po/fi/menus/file-units.po
   trunk/po/fi/menus/xtns-module-manager.po
   trunk/po/fr/menus/file-keyboard-shortcuts.po
   trunk/po/fr/menus/file-preferences.po
   trunk/po/fr/menus/file-units.po
   trunk/po/fr/menus/xtns-module-manager.po
   trunk/po/hr/menus/file-keyboard-shortcuts.po
   trunk/po/hr/menus/file-preferences.po
   trunk/po/hr/menus/file-units.po
   trunk/po/hr/menus/xtns-module-manager.po
   trunk/po/it/menus/file-keyboard-shortcuts.po
   trunk/po/it/menus/file-preferences.po
   trunk/po/it/menus/file-units.po
   trunk/po/it/menus/xtns-module-manager.po
   trunk/po/ko/menus/file-keyboard-shortcuts.po
   trunk/po/ko/menus/file-preferences.po
   trunk/po/ko/menus/file-units.po
   trunk/po/ko/menus/xtns-module-manager.po
   trunk/po/lt/menus/file-keyboard-shortcuts.po
   trunk/po/lt/menus/file-preferences.po
   trunk/po/lt/menus/file-units.po
   trunk/po/lt/menus/xtns-module-manager.po
   trunk/po/nl/menus/file-keyboard-shortcuts.po
   trunk/po/nl/menus/file-preferences.po
   trunk/po/nl/menus/file-units.po
   trunk/po/nl/menus/xtns-module-manager.po
   trunk/po/no/menus/file-keyboard-shortcuts.po
   trunk/po/no/menus/file-preferences.po
   trunk/po/no/menus/file-units.po
   trunk/po/no/menus/xtns-module-manager.po
   trunk/po/pl/menus/file-keyboard-shortcuts.po
   trunk/po/pl/menus/file-preferences.po
   trunk/po/pl/menus/file-units.po
   trunk/po/pl/menus/xtns-module-manager.po
   trunk/po/ru/menus/file-keyboard-shortcuts.po
   trunk/po/ru/menus/file-preferences.po
   trunk/po/ru/menus/file-units.po
   trunk/po/ru/menus/xtns-module-manager.po
   trunk/po/sv/menus/file-keyboard-shortcuts.po
   trunk/po/sv/menus/file-preferences.po
   trunk/po/sv/menus/file-units.po
   trunk/po/sv/menus/xtns-module-manager.po
   trunk/src/menus/file-keyboard-shortcuts.xml
   trunk/src/menus/file-preferences.xml
   trunk/src/menus/file-units.xml
   trunk/src/menus/xtns-module-manager.xml
Modified:
   trunk/ChangeLog
   trunk/images/menus/edit-stroke-options.png
   trunk/images/menus/fr/edit-stroke-options.png
   trunk/po/fr/appendix/bibliography.po
   trunk/po/fr/gimp.po
   trunk/po/fr/menus/colors/map.po
   trunk/po/fr/menus/colors/map/palettemap.po
   trunk/po/fr/menus/colors/map/rearrange-colormap.po
   trunk/po/fr/menus/colors/map/rotate-colormap.po
   trunk/po/fr/menus/colors/map/set-colormap.po
   trunk/po/fr/menus/edit-buffer-dialog.po
   trunk/po/fr/menus/edit-clear.po
   trunk/po/fr/menus/edit-copy-visible.po
   trunk/po/fr/menus/edit-copy.po
   trunk/po/fr/menus/edit-cut.po
   trunk/po/fr/menus/edit-fade.po
   trunk/po/fr/menus/edit-fill-bg.po
   trunk/po/fr/menus/edit-fill-fg.po
   trunk/po/fr/menus/edit-fill-pattern.po
   trunk/po/fr/menus/edit-paste-as-brush.po
   trunk/po/fr/menus/edit-paste-as-layer.po
   trunk/po/fr/menus/edit-paste-as-new.po
   trunk/po/fr/menus/edit-paste-as-pattern.po
   trunk/po/fr/menus/edit-paste-as.po
   trunk/po/fr/menus/edit-paste-into.po
   trunk/po/fr/menus/edit-paste.po
   trunk/po/fr/menus/edit-redo.po
   trunk/po/fr/menus/edit-stroke-path.po
   trunk/po/fr/menus/edit-stroke-selection.po
   trunk/po/fr/menus/edit-undo-history.po
   trunk/po/fr/menus/edit-undo.po
   trunk/po/fr/menus/file-close.po
   trunk/po/fr/menus/file-create.po
   trunk/po/fr/menus/file-new.po
   trunk/po/fr/menus/menus-colors.po
   trunk/po/fr/menus/menus-edit.po
   trunk/po/fr/menus/menus-toolbox-file.po
   trunk/src/gimp.xml
   trunk/src/menus/edit-buffer-dialog.xml
   trunk/src/menus/edit-clear.xml
   trunk/src/menus/edit-copy-visible.xml
   trunk/src/menus/edit-copy.xml
   trunk/src/menus/edit-fill-bg.xml
   trunk/src/menus/edit-fill-fg.xml
   trunk/src/menus/edit-fill-pattern.xml
   trunk/src/menus/edit-paste-as.xml
   trunk/src/menus/edit-paste-into.xml
   trunk/src/menus/edit-stroke-path.xml
   trunk/src/menus/edit-stroke-selection.xml
   trunk/src/menus/file-close.xml
   trunk/src/menus/menus-edit.xml
   trunk/src/menus/menus-toolbox-file.xml
   trunk/src/menus/menus-xtns.xml

Modified: trunk/images/menus/edit-stroke-options.png
==============================================================================
Binary files. No diff available.

Modified: trunk/images/menus/fr/edit-stroke-options.png
==============================================================================
Binary files. No diff available.

Modified: trunk/src/gimp.xml
==============================================================================
--- trunk/src/gimp.xml	(original)
+++ trunk/src/gimp.xml	Sat Jan 10 08:03:03 2009
@@ -19,13 +19,13 @@
   <bookinfo>
     <title>GNU Image Manipulation Program</title>
     <subtitle>User Manual</subtitle>
-    <revhistory role="cvs">
+    <!--<revhistory role="cvs">
       <revision>
         <revnumber>$Revision$</revnumber>
         <date>2007-07-15</date>
         <authorinitials>romanofski</authorinitials>
       </revision>
-    </revhistory>
+    </revhistory>-->
     <copyright>
       <year>2002</year>
       <year>2003</year>

Modified: trunk/src/menus/edit-buffer-dialog.xml
==============================================================================
--- trunk/src/menus/edit-buffer-dialog.xml	(original)
+++ trunk/src/menus/edit-buffer-dialog.xml	Sat Jan 10 08:03:03 2009
@@ -8,15 +8,16 @@
   2007-05-16 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-buffer-dialog">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
-        <date>2007-10-09</date>
-        <authorinitials>sally</authorinitials>
+        <date>2009-01-07</date>
+        <authorinitials>j.h</authorinitials>
+        <revremark>ÂUpdated to v2.6</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Buffers</phrase>
   </title>
@@ -44,13 +45,16 @@
   </para>
   <sect3>
     <title>
-      <phrase>Activating the Submenu</phrase>
+      <phrase>Activate the Submenu</phrase>
     </title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this submenu from the image menubar through
-          <menuchoice><guimenu><accel>E</accel>dit</guimenu><guimenuitem><accel>B</accel>uffer</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Buffer</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>

Modified: trunk/src/menus/edit-clear.xml
==============================================================================
--- trunk/src/menus/edit-clear.xml	(original)
+++ trunk/src/menus/edit-clear.xml	Sat Jan 10 08:03:03 2009
@@ -8,15 +8,16 @@
   2005-09-09 de added; reviewed by axel.wernicke
 -->
 <sect2 id="gimp-edit-clear">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
-        <date>2006-07-27</date>
-        <authorinitials>scb</authorinitials>
+        <date>2009-01-07</date>
+        <authorinitials>j.h</authorinitials>
+        <revremark>ÂUpdated to v2.6</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Clear</phrase>
   </title>
@@ -45,17 +46,21 @@
   <para>
     Clearing a selection does not delete the selection itself. Unlike
     <quote>Cut</quote>, <quote>Clear</quote> does not place the deleted
-    contents in the Clipboard and the contents of the clipboard are unaffected.
+    contents in the Clipboard and the contents of the clipboard are
+    unaffected.
   </para>
   <sect3>
     <title>
-      <phrase>Activating the Command</phrase>
+      <phrase>Activate the Command</phrase>
     </title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu><accel>E</accel>dit</guimenu><guimenuitem>Cl<accel>e</accel>ar</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Clear</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>

Modified: trunk/src/menus/edit-copy-visible.xml
==============================================================================
--- trunk/src/menus/edit-copy-visible.xml	(original)
+++ trunk/src/menus/edit-copy-visible.xml	Sat Jan 10 08:03:03 2009
@@ -5,7 +5,7 @@
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-copy-visible">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
@@ -14,7 +14,7 @@
         <revremark>ÂUpdated to v2.6</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Copy Visible</phrase>
   </title>

Modified: trunk/src/menus/edit-copy.xml
==============================================================================
--- trunk/src/menus/edit-copy.xml	(original)
+++ trunk/src/menus/edit-copy.xml	Sat Jan 10 08:03:03 2009
@@ -5,7 +5,7 @@
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-copy">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
@@ -14,7 +14,7 @@
         <revremark>ÂUpdated to v2.6</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Copy</phrase>
   </title>
@@ -42,7 +42,10 @@
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu>Edit</guimenu><guimenuitem>Copy</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Copy</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>

Modified: trunk/src/menus/edit-fill-bg.xml
==============================================================================
--- trunk/src/menus/edit-fill-bg.xml	(original)
+++ trunk/src/menus/edit-fill-bg.xml	Sat Jan 10 08:03:03 2009
@@ -6,15 +6,16 @@
   2006-06-28 note added en;fr for click-and-drag by j.h
 -->
 <sect2 id="gimp-edit-fill-bg">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
         <date>2006-07-27</date>
         <authorinitials>sally</authorinitials>
+        <revremark>v2.6 revised by j.h</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Fill with BG Color</phrase>
   </title>
@@ -47,13 +48,16 @@
   </note>
   <sect3>
     <title>
-      <phrase>Activating the Command</phrase>
+      <phrase>Activae the Command</phrase>
     </title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu><accel>E</accel>dit</guimenu><guimenuitem>Fill with B<accel>G</accel> Color</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Fill with BG Color</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>

Modified: trunk/src/menus/edit-fill-fg.xml
==============================================================================
--- trunk/src/menus/edit-fill-fg.xml	(original)
+++ trunk/src/menus/edit-fill-fg.xml	Sat Jan 10 08:03:03 2009
@@ -5,15 +5,16 @@
   2006-06-28 note added en;fr for click-and-drag by j.h
 -->
 <sect2 id="gimp-edit-fill-fg">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
         <date>2006-07-27</date>
         <authorinitials>sally</authorinitials>
+        <revremark>v2.6 revised by j.h</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Fill with FG Color</phrase>
   </title>
@@ -47,13 +48,14 @@
   </note>
   <sect3>
     <title>
-      <phrase>Activating the Command</phrase>
+      <phrase>Activate the Command</phrase>
     </title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu><accel>E</accel>dit</guimenu><guimenuitem>Fill with <accel>F</accel>G Color</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Edit</guimenu><guimenuitem>Fill with <accel>F</accel>G Color</guimenuitem></menuchoice>,
         </para>
       </listitem>
       <listitem>

Modified: trunk/src/menus/edit-fill-pattern.xml
==============================================================================
--- trunk/src/menus/edit-fill-pattern.xml	(original)
+++ trunk/src/menus/edit-fill-pattern.xml	Sat Jan 10 08:03:03 2009
@@ -5,15 +5,16 @@
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-fill-pattern">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
         <date>2006-07-27</date>
         <authorinitials>sally</authorinitials>
+        <revremark>v2.6 revised by j.h</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Fill with Pattern</phrase>
   </title>
@@ -50,13 +51,16 @@
   </note>
   <sect3>
     <title>
-      <phrase>Activating the Command</phrase>
+      <phrase>Activate the Command</phrase>
     </title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu><accel>E</accel>dit</guimenu><guimenuitem>Fill with P<accel>a</accel>ttern</guimenuitem></menuchoice>,
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Fill with Pattern</guimenuitem>
+          </menuchoice>,
         </para>
       </listitem>
       <listitem>

Added: trunk/src/menus/edit-module-manager.xml
==============================================================================
--- (empty file)
+++ trunk/src/menus/edit-module-manager.xml	Sat Jan 10 08:03:03 2009
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!-- section history:
+  2008-01-07 j.h: copy-pasted from menus/xtns-module-manager.xml
+  2008-05-06 ude: changed (help-)id [was: gimp-xtns-module-manager]
+  2008-03-13 ude: enhanced dialog description
+  2005-11-24 split of from menus-toolbox.xml by axel.wernicke
+-->
+<sect2 id="gimp-module-dialog">
+  <!--<sect2info role="cvs">
+    <revhistory>
+      <revision>
+        <revnumber>$Revision: 2635 $</revnumber>
+        <date>2008-03-13</date>
+        <authorinitials>ude</authorinitials>
+      </revision>
+    </revhistory>
+  </sect2info>-->
+  <title>
+    <phrase>The Module Manager</phrase>
+  </title>
+  <indexterm>
+    <primary>Module Manager</primary>
+  </indexterm>
+  <para>
+    With the <guimenuitem>Module Manager</guimenuitem> command, you can show
+    the various extension modules which are available and control which
+    of them should be loaded. Modules perform functions such as choosing
+    colors and display filtering. Any changes you make to the settings with
+    the Module Manager command will take effect the next time you start
+    <acronym>GIMP</acronym>.  These changes affect
+    <acronym>GIMP</acronym>'s functional capabilities, its size in
+    memory and its start-up time.
+  </para>
+  <sect3>
+    <title>
+      <phrase>Activate the Command</phrase>
+    </title>
+    <itemizedlist>
+      <listitem>
+        <para>
+          You can access this command from the image menubar through
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Modules</guimenuitem>
+          </menuchoice>
+        </para>
+      </listitem>
+    </itemizedlist>
+  </sect3>
+  <sect3>
+    <title>
+      <phrase>
+        Description of the <quote>Module Manager</quote> Dialog
+      </phrase>
+    </title>
+    <figure>
+      <title>
+        <phrase>
+          The <quote>Module Manager</quote> dialog window
+        </phrase>
+      </title>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="../images/menus/module-manager.png" format="PNG"/>
+        </imageobject>
+      </mediaobject>
+    </figure>
+    <variablelist>
+      <title>
+        <phrase>Modules list</phrase>
+      </title>
+      <para>
+        The scrolled window of the Module Manager shows the loadable modules.
+      </para>
+      <varlistentry>
+        <term>
+          <phrase>Autoload</phrase>
+        </term>
+        <listitem>
+          <para>
+            Clicking on the boxes in this column will check or uncheck the
+            modules. The next time you start <acronym>GIMP</acronym>, any
+            checked module will be loaded automatically.
+          </para>
+          <para>
+            You will notice the difference only when you try to use the
+            modules. For example, there are several
+            <link linkend="gimp-color-dialog">color selectors</link> to select
+            the foreground or background color. Some of these selectors are
+            modules and will only be available when you check the respective
+            option in the module manager:
+          </para>
+          <figure>
+            <title>
+              <phrase>
+                Autoload example: Color selector modules
+              </phrase>
+            </title>
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="../images/menus/module-manager-ex1.png" format="PNG"/>
+              </imageobject>
+              <caption>
+                <para>Color selector modules loaded</para>
+              </caption>
+            </mediaobject>
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="../images/menus/module-manager-ex2.png" format="PNG"/>
+              </imageobject>
+              <caption>
+                <para>Color selector modules not loaded</para>
+              </caption>
+            </mediaobject>
+          </figure>
+          <para>
+            For automatically loaded modules, information about the selected
+            module is displayed at the bottom of the dialog.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <phrase>Module path</phrase>
+        </term>
+        <listitem>
+          <para>
+            In this column, the directory path for each module is shown.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <variablelist>
+      <title>
+        <phrase>Buttons</phrase>
+      </title>
+      <varlistentry>
+        <term>
+          <phrase>Query</phrase>
+        </term>
+        <listitem>
+          <para>
+            This button is only visible, when the respective module has not
+            been auto-loaded. When you click on the button, information about
+            the selected module is displayed at the bottom of the dialog, and
+            the button changes to <guibutton>Load</guibutton>.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <phrase>Load; Unload</phrase>
+        </term>
+        <listitem>
+          <para>
+            Loading modules manually does not work properly. The buttons are
+            useless (<quote>Unload</quote> is even disabled) and will probably
+            removed in future versions.
+          </para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term>
+          <phrase>Refresh</phrase>
+        </term>
+        <listitem>
+          <para>
+            When you click on this button, the list of modules will be
+            updated: modules no longer on disk will be removed, and new
+            modules found will be added.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect3>
+</sect2>

Modified: trunk/src/menus/edit-paste-as.xml
==============================================================================
--- trunk/src/menus/edit-paste-as.xml	(original)
+++ trunk/src/menus/edit-paste-as.xml	Sat Jan 10 08:03:03 2009
@@ -8,7 +8,7 @@
   2007-10-10 j.h : created
 -->
 <sect2 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-edit-paste-as">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
@@ -17,7 +17,7 @@
         <revremark>ÂUpdated to v2.6</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Paste as...</phrase>
   </title>

Modified: trunk/src/menus/edit-paste-into.xml
==============================================================================
--- trunk/src/menus/edit-paste-into.xml	(original)
+++ trunk/src/menus/edit-paste-into.xml	Sat Jan 10 08:03:03 2009
@@ -5,15 +5,16 @@
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-edit-paste-into">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
-        <date>2006-07-27</date>
-        <authorinitials>sally</authorinitials>
+        <date>2009-01-07</date>
+        <authorinitials>j.h</authorinitials>
+        <revremark>ÂUpdated to v2.6</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Paste Into</phrase>
   </title>
@@ -45,13 +46,16 @@
   </para>
   <sect3>
     <title>
-      <phrase>Activating the Command</phrase>
+      <phrase>Activate the Command</phrase>
     </title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu><accel>E</accel>dit</guimenu><guimenuitem>Paste <accel>I</accel>nto</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Paste Into</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>

Copied: trunk/src/menus/edit-preferences.xml (from r2671, /trunk/src/menus/file-preferences.xml)
==============================================================================
--- /trunk/src/menus/file-preferences.xml	(original)
+++ trunk/src/menus/edit-preferences.xml	Sat Jan 10 08:03:03 2009
@@ -6,7 +6,7 @@
   2005-11-25 extracted from menus-toolbox-file by axel.wernicke
 -->
 <sect2 id="gimp-file-preferences">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
@@ -14,7 +14,7 @@
         <authorinitials>scb</authorinitials>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>The <quote>Preferences</quote> Command</phrase>
   </title>
@@ -22,7 +22,7 @@
     <primary>Preferences (command)</primary>
   </indexterm>
   <para>
-    The <guimenuitem>File Preferences</guimenuitem> command displays the
+     This command displays the
     <link linkend="gimp-prefs-dialog">Preferences dialog</link>,
     which lets you alter a variety of settings that affect the look, feel,
     and performance of the <acronym>GIMP</acronym>.
@@ -34,8 +34,11 @@
     <itemizedlist>
       <listitem>
         <para>
-          You can access this command in the Toolbox menu bar through
-          <menuchoice><guimenu><accel>F</accel>ile</guimenu><guimenuitem><accel>P</accel>references</guimenuitem></menuchoice>
+          You can access this command in the image menu bar through
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Preferences</guimenuitem>
+          </menuchoice>
         </para>
       </listitem>
     </itemizedlist>

Copied: trunk/src/menus/edit-shortcuts.xml (from r2671, /trunk/src/menus/file-keyboard-shortcuts.xml)
==============================================================================
--- /trunk/src/menus/file-keyboard-shortcuts.xml	(original)
+++ trunk/src/menus/edit-shortcuts.xml	Sat Jan 10 08:03:03 2009
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-01-07 j.h: renamed file-keyboard-shortcuts.xml to edit-shortcuts.xml
   2008-08-19 KoSt: added 'no'
   2008-07-20 lexa: created new description
 -->
 <sect2 id="gimp-help-keyboard-shortcuts">
-  <sect2info>
+  <!--<sect2info>
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
@@ -13,7 +14,7 @@
         <authorinitials>lexa</authorinitials>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Keyboard Shortcuts</phrase>
   </title>
@@ -21,7 +22,7 @@
     <primary>Keyboard Shortcuts</primary>
   </indexterm>
   <para>
-    The usage of this command is described in
+    How to use this command is described in
     <xref linkend="gimp-concepts-shortcuts"/>.
   </para>
   <sect3>
@@ -31,14 +32,11 @@
     <itemizedlist>
       <listitem>
         <para>
-          You can access this command from the toolbox menubar through
-          <menuchoice><guimenu><accel>F</accel>ile</guimenu><guimenuitem><accel>K</accel>eyboard Shortcutsâ</guimenuitem></menuchoice>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu><accel>E</accel>dit</guimenu><guimenuitem><accel>K</accel>eyboard Shortcutsâ</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Keyboard Shortcutsâ</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>

Modified: trunk/src/menus/edit-stroke-path.xml
==============================================================================
--- trunk/src/menus/edit-stroke-path.xml	(original)
+++ trunk/src/menus/edit-stroke-path.xml	Sat Jan 10 08:03:03 2009
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- Section history:
+     2009-01-07 j.h: TODO link to Brush Dynamics (ex Jitter)
   2007-10-14 j.h: rearranged according to v2.4
   2007-05-14 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-path-stroke">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
         <date>2006-07-27</date>
         <authorinitials>sally</authorinitials>
+        <revremark>v2.6 revised by j.h</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Stroke Path</phrase>
   </title>
@@ -43,7 +45,7 @@
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu><accel>E</accel>dit</guimenu><guimenuitem>Stro<accel>k</accel>e Path</guimenuitem></menuchoice>.
+          <menuchoice><guimenu>Edit</guimenu><guimenuitem>Stroke Path</guimenuitem></menuchoice>.
         </para>
       </listitem>
       <listitem>
@@ -207,6 +209,14 @@
                 </para>
               </listitem>
             </varlistentry>
+            <varlistentry>
+              <term>Emulate Brush Dynamics</term>
+              <listitem>
+                <para>
+                  See <!--link linkend=".....">-->Brush Dynamics<!--</link>-->
+                </para>
+              </listitem>
+            </varlistentry>
           </variablelist>
         </listitem>
       </varlistentry>

Modified: trunk/src/menus/edit-stroke-selection.xml
==============================================================================
--- trunk/src/menus/edit-stroke-selection.xml	(original)
+++ trunk/src/menus/edit-stroke-selection.xml	Sat Jan 10 08:03:03 2009
@@ -4,15 +4,16 @@
 
 -->
 <sect2 id="gimp-selection-stroke">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
         <date>2006-07-27</date>
         <authorinitials>sally</authorinitials>
+        <revremark>v2.6 revised by j.h</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Stroke Selection</phrase>
   </title>
@@ -38,13 +39,16 @@
   </note>
   <sect3>
     <title>
-      <phrase>Activating the Command</phrase>
+      <phrase>Activate the Command</phrase>
     </title>
     <itemizedlist>
       <listitem>
         <para>
           You can access this command from the image menubar through
-          <menuchoice><guimenu><accel>E</accel>dit</guimenu><guimenuitem><accel>S</accel>troke Selection</guimenuitem></menuchoice>.
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Stroke Selection</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
       <listitem>

Copied: trunk/src/menus/edit-units.xml (from r2671, /trunk/src/menus/file-units.xml)
==============================================================================
--- /trunk/src/menus/file-units.xml	(original)
+++ trunk/src/menus/edit-units.xml	Sat Jan 10 08:03:03 2009
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
 <!-- section history:
+  2009-01-07 j.h: renamed file-units to edit-units
   2008-05-06 ude: changed filename [was: xtns-unit-editor.xml]
                   and (help-)id [was: gimp-xtns-unit-editor]
   2005-11-24 split of from menus-toolbox.xml by axel.wernicke
 -->
 <sect2 id="plug-in-unit-editor">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
         <date>2006-08-09</date>
         <authorinitials>scb</authorinitials>
+        <revremark>v2.6: no change</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Units</phrase>
   </title>
@@ -33,13 +35,16 @@
   </para>
   <sect3>
     <title>
-      <phrase>Activating the Command</phrase>
+      <phrase>Activate the Command</phrase>
     </title>
     <itemizedlist>
       <listitem>
         <para>
-          You can access this command from the toolbox menubar through
-          <menuchoice><guimenu><accel>F</accel>ile</guimenu><guimenuitem>U<accel>n</accel>nits</guimenuitem></menuchoice>.
+          You can access this command from the image menubar through
+          <menuchoice>
+            <guimenu>Edit</guimenu>
+            <guimenuitem>Units</guimenuitem>
+          </menuchoice>.
         </para>
       </listitem>
     </itemizedlist>

Modified: trunk/src/menus/file-close.xml
==============================================================================
--- trunk/src/menus/file-close.xml	(original)
+++ trunk/src/menus/file-close.xml	Sat Jan 10 08:03:03 2009
@@ -5,7 +5,7 @@
   2007-05-19 Added Spanish translation by AntI
 -->
 <sect2 id="gimp-file-close">
-  <sect2info role="cvs">
+  <!--<sect2info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
@@ -14,7 +14,7 @@
         <revremark>ÂUpdated to v2.6</revremark>
       </revision>
     </revhistory>
-  </sect2info>
+  </sect2info>-->
   <title>
     <phrase>Close</phrase>
   </title>

Modified: trunk/src/menus/menus-edit.xml
==============================================================================
--- trunk/src/menus/menus-edit.xml	(original)
+++ trunk/src/menus/menus-edit.xml	Sat Jan 10 08:03:03 2009
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.docbook.org/xml/4.3/docbookx.dtd";>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.docbook.org/xml/4.5/docbookx.dtd";>
 <!-- section history:
+  2008-01-07 j.h: added edit-units.xml (copy of file-units.xml),
+  edit-shortcuts.xml, edit-preferences.xml, edit-module-manager.xml.
   2007-10-10 j.h Updated <include> to v2.4
   2006-11-11 added italian translation by ciampix
   2006-01-21 en;fr reviewed by j.h
   2005-09-09 reviewed and intro added by axel.wernicke
 -->
 <sect1 xmlns:xi="http://www.w3.org/2001/XInclude"; id="gimp-imagewindow-menus-edit">
-  <sect1info role="cvs">
+  <!--<sect1info role="cvs">
     <revhistory>
       <revision>
         <revnumber>$Revision$</revnumber>
-        <date>2006-08-17</date>
-        <authorinitials>scb</authorinitials>
+        <date>2009-01-07</date>
+        <authorinitials>j.h</authorinitials>
+        <revremark>ÂUpdated to v2.6</revremark>
       </revision>
     </revhistory>
-  </sect1info>
+  </sect1info>-->
   <title>
     <phrase>The <quote>Edit</quote> Menu</phrase>
   </title>
@@ -41,4 +44,8 @@
   <xi:include href="edit-fill-pattern.xml"/>
   <xi:include href="edit-stroke-selection.xml"/>
   <xi:include href="edit-stroke-path.xml"/>
+  <xi:include href="edit-preferences.xml"/>
+  <xi:include href="edit-shortcuts.xml"/>
+  <xi:include href="edit-module-manager.xml"/>
+  <xi:include href="edit-units.xml"/>
 </sect1>

Modified: trunk/src/menus/menus-toolbox-file.xml
==============================================================================
--- trunk/src/menus/menus-toolbox-file.xml	(original)
+++ trunk/src/menus/menus-toolbox-file.xml	Sat Jan 10 08:03:03 2009
@@ -17,8 +17,15 @@
   </indexterm>
   <xi:include href="file-toolbox-introduction.xml"/>
   <xi:include href="file-acquire.xml"/>
-  <xi:include href="file-preferences.xml"/>
-  <xi:include href="file-keyboard-shortcuts.xml"/>
-  <xi:include href="file-units.xml"/>
+
+  <!--moved as edit-preferences.xml in menu-edit.xml
+  <xi:include href="file-preferences.xml"/>-->
+
+  <!-- moved as edit-shortcuts in menu-edit.xml
+  <xi:include href="file-keyboard-shortcuts.xml"/>-->
+
+  <!-- moved as edit-units.xml in menu-edit.xml
+  <xi:include href="file-units.xml"/>-->
+
   <xi:include href="file-dialogs.xml"/>
 </sect1>

Modified: trunk/src/menus/menus-xtns.xml
==============================================================================
--- trunk/src/menus/menus-xtns.xml	(original)
+++ trunk/src/menus/menus-xtns.xml	Sat Jan 10 08:03:03 2009
@@ -13,7 +13,8 @@
     <secondary>Xtns menu (Extensions)</secondary>
   </indexterm>
   <xi:include href="xtns-introduction.xml"/>
-  <xi:include href="xtns-module-manager.xml"/>
+  <!-- becomes edit-module-manager.xml
+  <xi:include href="xtns-module-manager.xml"/>-->
   <xi:include href="xtns-plug-in-browser.xml"/>
   <xi:include href="xtns-procedure-browser.xml"/>
   <xi:include href="xtns-script-fu.xml"/>