[gimp-help-2] Updated Simplified Chinese translations.



commit feb8f49356a9f6dcf97f3cb6315e53f5242c44cf
Author: Aron Xu <aronxu gnome org>
Date:   Wed Jul 22 12:20:27 2009 +0800

    Updated Simplified Chinese translations.

 po/zh_CN/appendix.po                | 1673 ++++++++++-------
 po/zh_CN/concepts.po                | 3608 +++++++++++++++++++----------------
 po/zh_CN/dialogs.po                 |  817 ++++----
 po/zh_CN/filters.po                 |    2 +-
 po/zh_CN/filters/alpha-to-logo.po   |    2 +-
 po/zh_CN/filters/animation.po       |    4 +-
 po/zh_CN/filters/artistic.po        |  456 +++---
 po/zh_CN/filters/blur.po            |    2 +-
 po/zh_CN/filters/combine.po         |    2 +-
 po/zh_CN/filters/decor.po           |  129 +-
 po/zh_CN/filters/distort.po         |   22 +-
 po/zh_CN/filters/edge-detect.po     |    2 +-
 po/zh_CN/filters/enhance.po         |   60 +-
 po/zh_CN/filters/generic.po         |    2 +-
 po/zh_CN/filters/light_effects.po   |  153 +-
 po/zh_CN/filters/map.po             |    2 +-
 po/zh_CN/filters/noise.po           |    2 +-
 po/zh_CN/filters/render.po          |    2 +-
 po/zh_CN/filters/web.po             |    2 +-
 po/zh_CN/gimp.po                    |  150 +-
 po/zh_CN/glossary.po                | 1009 +++++------
 po/zh_CN/introduction.po            |  146 +-
 po/zh_CN/menus.po                   |   21 +-
 po/zh_CN/menus/colors.po            |    2 +-
 po/zh_CN/menus/colors/auto.po       |    2 +-
 po/zh_CN/menus/colors/components.po |    4 +-
 po/zh_CN/menus/colors/info.po       |    2 +-
 po/zh_CN/menus/colors/map.po        |    4 +-
 po/zh_CN/menus/edit.po              |   80 +-
 po/zh_CN/menus/file.po              |  162 +-
 po/zh_CN/menus/help.po              |    2 +-
 po/zh_CN/menus/image.po             |  167 +-
 po/zh_CN/menus/layer.po             |  136 +-
 po/zh_CN/menus/select.po            |    2 +-
 po/zh_CN/menus/view.po              |    2 +-
 po/zh_CN/preface.po                 |  138 +-
 po/zh_CN/toolbox.po                 |  624 ++++---
 po/zh_CN/tutorial.po                |  612 +++---
 po/zh_CN/using.po                   |  807 +++++----
 po/zh_CN/using/preferences.po       |  111 +-
 40 files changed, 5949 insertions(+), 5176 deletions(-)
---
diff --git a/po/zh_CN/appendix.po b/po/zh_CN/appendix.po
index 4ae67cd..fb82fa2 100644
--- a/po/zh_CN/appendix.po
+++ b/po/zh_CN/appendix.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-07-17 22:08+0800\n"
 "Last-Translator: Aron Xu <aronxu gnome org>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
@@ -14,24 +14,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/appendix/history.xml:15(title)
+#: src/appendix/history.xml:16(title)
 msgid "GIMP History"
 msgstr "GIMP å??å?²"
 
-#: src/appendix/history.xml:17(primary) src/appendix/bugs.xml:13(primary)
-#: src/appendix/bibliography.xml:299(abbrev)
+#: src/appendix/history.xml:19(primary) src/appendix/bugs.xml:14(primary)
+#: src/appendix/bibliography.xml:318(abbrev)
 msgid "GIMP"
 msgstr "GIMP"
 
-#: src/appendix/history.xml:18(secondary)
+#: src/appendix/history.xml:20(secondary)
 msgid "History"
 msgstr "å??å?²"
 
-#: src/appendix/history.xml:21(title)
+#: src/appendix/history.xml:24(title)
 msgid "The Very Beginning"
 msgstr "æ??å¼?å§?"
 
-#: src/appendix/history.xml:22(para)
+#: src/appendix/history.xml:25(para)
 msgid ""
 "According to Peter Mattis and Spencer Kimball, the original creators of "
 "<acronym>GIMP</acronym>, in their announcement of <acronym>GIMP</acronym> "
@@ -39,7 +39,7 @@ msgid ""
 msgstr ""
 "æ ¹æ?® GIMP å??ä½?è?? Peter Mattis å?? Spencer Kimball å?¨ GIMP 0.54 中ç??声æ??ï¼?"
 
-#: src/appendix/history.xml:27(para)
+#: src/appendix/history.xml:30(para)
 msgid ""
 "The <acronym>GIMP</acronym> arose from the ashes of a hideously crafted "
 "CS164 (compilers) class project. The setting: early morning. We were both "
@@ -48,7 +48,7 @@ msgid ""
 "the dam held."
 msgstr ""
 
-#: src/appendix/history.xml:35(para)
+#: src/appendix/history.xml:38(para)
 msgid ""
 "And then it happened. Common LISP messily dumped core when it could not "
 "allocate the 17 MB it needed to generate a parser for a simple grammar using "
@@ -59,14 +59,14 @@ msgid ""
 "<acronym>GIMP</acronym> was born."
 msgstr ""
 
-#: src/appendix/history.xml:45(para)
+#: src/appendix/history.xml:48(para)
 msgid ""
 "Like the phoenix, glorious, new life sprung out of the burnt remnants of "
 "LISP and <application>yacc</application>. Ideas went flying, decisions were "
 "made, the <acronym>GIMP</acronym> began to take form."
 msgstr ""
 
-#: src/appendix/history.xml:51(para)
+#: src/appendix/history.xml:54(para)
 msgid ""
 "An image manipulation program was the consensus. A program that would at the "
 "very least lessen the necessity of using commercial software under "
@@ -76,7 +76,7 @@ msgid ""
 "and free UNIX applications."
 msgstr ""
 
-#: src/appendix/history.xml:60(para)
+#: src/appendix/history.xml:63(para)
 msgid ""
 "Six months later, we've reached an early beta stage. We want to release now "
 "to start working on compatibility issues and cross-platform stability. Also, "
@@ -84,15 +84,15 @@ msgid ""
 "interested programmers developing plug-ins and various file format support."
 msgstr ""
 
-#: src/appendix/history.xml:69(title)
+#: src/appendix/history.xml:73(title)
 msgid "The Early Days of GIMP"
 msgstr "æ?©æ??ç?? GIMP"
 
-#: src/appendix/history.xml:72(term)
+#: src/appendix/history.xml:76(term)
 msgid "Version 0.54"
 msgstr ""
 
-#: src/appendix/history.xml:74(para)
+#: src/appendix/history.xml:78(para)
 msgid ""
 "Version 0.54 was released in February 1996, and had a major impact as the "
 "first truly professional free image manipulation program. This was the first "
@@ -100,7 +100,7 @@ msgid ""
 "programs."
 msgstr ""
 
-#: src/appendix/history.xml:80(para)
+#: src/appendix/history.xml:84(para)
 msgid ""
 "Version 0.54 was a beta release, but it was so stable that you could use it "
 "for daily work. However, one of the major drawbacks of 0.54 was that the "
@@ -111,11 +111,11 @@ msgid ""
 "students running Linux, who could not afford to buy Motif."
 msgstr ""
 
-#: src/appendix/history.xml:95(term)
+#: src/appendix/history.xml:99(term)
 msgid "Version 0.60"
 msgstr ""
 
-#: src/appendix/history.xml:97(para)
+#: src/appendix/history.xml:101(para)
 msgid ""
 "When 0.60 was released in July 1996, it had been under S and P (Spencer and "
 "Peter) development for four months. Main programming advantages were the new "
@@ -126,7 +126,7 @@ msgid ""
 "sampling, brush spacing); a better airbrush; paint modes; etc."
 msgstr ""
 
-#: src/appendix/history.xml:108(para)
+#: src/appendix/history.xml:112(para)
 msgid ""
 "Version 0.60 was only a developer's release, and was not intended for "
 "widespread use. It served as a workbench for 0.99 and the final 1.0 version, "
@@ -134,11 +134,11 @@ msgid ""
 "look at 0.60 as the alpha version of 0.99."
 msgstr ""
 
-#: src/appendix/history.xml:118(term)
+#: src/appendix/history.xml:122(term)
 msgid "Version 0.99"
 msgstr ""
 
-#: src/appendix/history.xml:120(para)
+#: src/appendix/history.xml:124(para)
 msgid ""
 "In February 1997, 0.99 came on the scene. Together with other developers, S "
 "and P had made several changes to <acronym>GIMP</acronym> and added even "
@@ -153,7 +153,7 @@ msgid ""
 "acronym> file format called XCF."
 msgstr ""
 
-#: src/appendix/history.xml:137(para)
+#: src/appendix/history.xml:141(para)
 msgid ""
 "The new API made it really easy to write extensions and plug-ins for "
 "<acronym>GIMP</acronym>. Several new plug-ins and extensions emerged to make "
@@ -161,7 +161,7 @@ msgid ""
 "which enables scanning directly into <acronym>GIMP</acronym>)."
 msgstr ""
 
-#: src/appendix/history.xml:144(para)
+#: src/appendix/history.xml:148(para)
 msgid ""
 "In the summer of 1997, <acronym>GIMP</acronym> had reached version 0.99.10, "
 "and S and P had to drop most of their support since they had graduated and "
@@ -170,14 +170,14 @@ msgid ""
 "acronym> ready for prime time."
 msgstr ""
 
-#: src/appendix/history.xml:153(para)
+#: src/appendix/history.xml:157(para)
 msgid ""
 "<acronym>GTK+</acronym> was separated from <acronym>GIMP</acronym> in "
 "September 1997. <acronym>GTK+</acronym> had been recognized as an excellent "
 "toolkit, and other developers began using it to build their own applications."
 msgstr ""
 
-#: src/appendix/history.xml:159(para)
+#: src/appendix/history.xml:164(para)
 msgid ""
 "<acronym>GIMP</acronym> went into feature freeze in October 1997. This meant "
 "that no new features would be added to the <acronym>GIMP</acronym> core "
@@ -186,26 +186,26 @@ msgid ""
 "to make <acronym>GIMP</acronym> stable and ready for version 1.0."
 msgstr ""
 
-#: src/appendix/history.xml:172(title)
+#: src/appendix/history.xml:179(title)
 msgid "The One to Change the World"
 msgstr ""
 
-#: src/appendix/history.xml:175(term)
+#: src/appendix/history.xml:182(term)
 msgid "Version 1.0"
 msgstr ""
 
-#: src/appendix/history.xml:177(para)
+#: src/appendix/history.xml:184(para)
 msgid ""
 "<acronym>GIMP</acronym> version 1.0 was released on June 5, 1998. Finally, "
 "<acronym>GIMP</acronym> was considered stable enough to warrant a worldwide "
 "announcement and professional use."
 msgstr ""
 
-#: src/appendix/history.xml:185(term)
+#: src/appendix/history.xml:193(term)
 msgid "Version 1.2"
 msgstr ""
 
-#: src/appendix/history.xml:187(para)
+#: src/appendix/history.xml:195(para)
 msgid ""
 "<acronym>GIMP</acronym> version 1.2.0 was released on December 25, 2000. "
 "Compared to the version 1.0, it included mostly fixes and improvements of "
@@ -214,7 +214,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/appendix/history-24.xml:31(None)
+#: src/appendix/history-24.xml:30(None)
 msgid ""
 "@@image: 'images/using/24-refreshed-look.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -222,7 +222,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/appendix/history-24.xml:60(None)
+#: src/appendix/history-24.xml:58(None)
 msgid ""
 "@@image: 'images/using/24-scalable-brushes.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -230,7 +230,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/appendix/history-24.xml:88(None)
+#: src/appendix/history-24.xml:85(None)
 msgid ""
 "@@image: 'images/using/24-selection-tools.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -238,13 +238,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/appendix/history-24.xml:215(None)
+#: src/appendix/history-24.xml:210(None)
 msgid ""
 "@@image: 'images/using/24-color-management.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 "@@image: 'images/using/24-color-management.png'; md5=THIS FILE DOESN'T EXIST"
 
-#: src/appendix/history-24.xml:12(phrase)
+#: src/appendix/history-24.xml:12(title)
 msgid "What's New in GIMP 2.4?"
 msgstr ""
 
@@ -261,39 +261,39 @@ msgid ""
 "consistent look."
 msgstr ""
 
-#: src/appendix/history-24.xml:27(phrase)
+#: src/appendix/history-24.xml:26(title)
 msgid "New Look of the toolbox in GIMP 2.4"
 msgstr ""
 
-#: src/appendix/history-24.xml:35(para)
+#: src/appendix/history-24.xml:34(para)
 msgid ""
 "Additionally the icons also have enhanced usability on dark widget themes, "
 "which is a common setting among digital artists."
 msgstr ""
 
-#: src/appendix/history-24.xml:39(para)
+#: src/appendix/history-24.xml:38(para)
 msgid ""
 "For artists preferring more desaturated color theme for their icons is an "
 "alternative icon theme available for download <xref linkend=\"bibliography-"
 "online-jimmac01\"/>."
 msgstr ""
 
-#: src/appendix/history-24.xml:47(term)
+#: src/appendix/history-24.xml:46(term)
 msgid "Scalable Brushes"
 msgstr ""
 
-#: src/appendix/history-24.xml:49(para)
+#: src/appendix/history-24.xml:48(para)
 msgid ""
 "The tool options now include a brush size slider that affects both the "
 "parametric and bitmap brushes. This has been an oft-requested feature from "
 "both digital painters and photo editors."
 msgstr ""
 
-#: src/appendix/history-24.xml:56(phrase)
+#: src/appendix/history-24.xml:54(title)
 msgid "Scalable brushes in GIMP 2.4"
 msgstr ""
 
-#: src/appendix/history-24.xml:64(para)
+#: src/appendix/history-24.xml:62(para)
 msgid ""
 "Unlike previous versions of GIMP, regardless of whether you're using a "
 "bitmap brush, parametric brush or even a picture tube (multiple bitmaps), "
@@ -302,11 +302,11 @@ msgid ""
 "Griffin Powermate."
 msgstr ""
 
-#: src/appendix/history-24.xml:74(term)
+#: src/appendix/history-24.xml:72(term)
 msgid "Selection Tools"
 msgstr "é??å??å·¥å?·"
 
-#: src/appendix/history-24.xml:76(para)
+#: src/appendix/history-24.xml:74(para)
 msgid ""
 "The selection tools have been rewritten from scratch to allow resizing of "
 "existing selections. Additionally the rectangular selection tool includes a "
@@ -314,11 +314,11 @@ msgid ""
 "common task among web designers."
 msgstr ""
 
-#: src/appendix/history-24.xml:84(phrase)
+#: src/appendix/history-24.xml:81(title)
 msgid "Selection tools in GIMP 2.4"
 msgstr ""
 
-#: src/appendix/history-24.xml:92(para)
+#: src/appendix/history-24.xml:89(para)
 msgid ""
 "The learning curve for the tools has been flattened as the key functionality "
 "is available without obscure shortcuts that confused GIMP beginners. Most of "
@@ -327,46 +327,46 @@ msgid ""
 "resize on canvas."
 msgstr ""
 
-#: src/appendix/history-24.xml:99(para)
+#: src/appendix/history-24.xml:96(para)
 msgid ""
 "While the tools have been redesigned to make them easier to understand for "
 "the newbies, all the former functionality is there. You can still constrain "
 "aspect ratios or specific sizes."
 msgstr ""
 
-#: src/appendix/history-24.xml:107(term)
+#: src/appendix/history-24.xml:104(term)
 msgid "Foreground Select Tool"
 msgstr ""
 
-#: src/appendix/history-24.xml:109(para)
+#: src/appendix/history-24.xml:106(para)
 msgid ""
 "Selecting individual objects on images is easier now with a new <link "
-"linkend=\"gimp-tool-foreground-select\"> foreground select tool </link>. It "
-"is done in two steps. First, you make select region of interest which "
-"contains the entire object. Then you paint over selected area with a brush, "
-"not crossing objectâ??s border. Release mouse button when youâ??re done and "
-"look, if there are dark blue spots on your objects. If there are some, paint "
-"with a brush over them again and release to refine selection. When there are "
-"no more blue areas inside the object, press Enter and there you have a "
+"linkend=\"gimp-tool-foreground-select\">foreground select tool</link>. It is "
+"done in two steps. First, you make select region of interest which contains "
+"the entire object. Then you paint over selected area with a brush, not "
+"crossing objectâ??s border. Release mouse button when youâ??re done and look, if "
+"there are dark blue spots on your objects. If there are some, paint with a "
+"brush over them again and release to refine selection. When there are no "
+"more blue areas inside the object, press Enter and there you have a "
 "perfectly selected object."
 msgstr ""
 
-#: src/appendix/history-24.xml:125(term)
+#: src/appendix/history-24.xml:121(term)
 msgid "Align Tool"
 msgstr ""
 
-#: src/appendix/history-24.xml:127(para)
+#: src/appendix/history-24.xml:123(para)
 msgid ""
 "While GIMP has provided a grid and guideline functionality, the actual "
 "alignment of objects had to be done manually. A new tool comes at rescue "
 "<link linkend=\"gimp-tool-align\">...</link>"
 msgstr ""
 
-#: src/appendix/history-24.xml:135(term)
+#: src/appendix/history-24.xml:131(term)
 msgid "Changes in menus"
 msgstr ""
 
-#: src/appendix/history-24.xml:137(para)
+#: src/appendix/history-24.xml:133(para)
 msgid ""
 "Most notable is the new top-level Color menu that accumulates most tools, "
 "plug-ins and scripts that adjust colors in RGB/Grayscale mode and color "
@@ -375,7 +375,7 @@ msgid ""
 "shortcuts for them using the improved keyboard shortcuts manager."
 msgstr ""
 
-#: src/appendix/history-24.xml:145(para)
+#: src/appendix/history-24.xml:141(para)
 msgid ""
 "In the new version of GIMP, some menu entries have changed their names and "
 "position. It was done mostly to simplify learning curve and improve user "
@@ -384,39 +384,39 @@ msgid ""
 "for all plug-ins and scripts are quite helpful too."
 msgstr ""
 
-#: src/appendix/history-24.xml:156(term)
+#: src/appendix/history-24.xml:152(term)
 msgid "Support for file formats"
 msgstr "æ??件格å¼?æ?¯æ??"
 
-#: src/appendix/history-24.xml:160(para)
+#: src/appendix/history-24.xml:156(para)
 msgid "Support for Photoshop ABR brush format;"
 msgstr ""
 
-#: src/appendix/history-24.xml:163(para)
+#: src/appendix/history-24.xml:159(para)
 msgid "Improved reading/writing EXIF in JPEG;"
 msgstr ""
 
-#: src/appendix/history-24.xml:166(para)
+#: src/appendix/history-24.xml:162(para)
 msgid "Importing clipping paths in TIFF;"
 msgstr ""
 
-#: src/appendix/history-24.xml:169(para)
+#: src/appendix/history-24.xml:165(para)
 msgid "Layer masks can be saved to PSD;"
 msgstr "å?¾å±?è??ç??å?¯ä»¥ä¿?å­?å?° PSDï¼?"
 
-#: src/appendix/history-24.xml:172(para)
+#: src/appendix/history-24.xml:168(para)
 msgid "16/32 bit bitmaps and alpha-channel support in BMP;"
 msgstr ""
 
-#: src/appendix/history-24.xml:177(para)
+#: src/appendix/history-24.xml:173(para)
 msgid "24 bit and Vista icons can be opened and saved."
 msgstr ""
 
-#: src/appendix/history-24.xml:185(term)
+#: src/appendix/history-24.xml:181(term)
 msgid "Fullscreen Editing"
 msgstr "����"
 
-#: src/appendix/history-24.xml:187(para)
+#: src/appendix/history-24.xml:183(para)
 msgid ""
 "The fullscreen mode has been improved to not only allow getting a full scale "
 "preview of the artwork, but also allow comfortable editing. The artist has "
@@ -425,32 +425,32 @@ msgid ""
 "working fullscreen."
 msgstr ""
 
-#: src/appendix/history-24.xml:194(para)
+#: src/appendix/history-24.xml:190(para)
 msgid ""
 "Whether painting or touching up photos, fullscreen editing keeps all the "
 "distracting elements out of sight on a key press. It's like observing stars "
 "in a field as opposed to a light-polluted city."
 msgstr ""
 
-#: src/appendix/history-24.xml:202(term)
+#: src/appendix/history-24.xml:198(term)
 msgid "Color Management and Soft-proofing"
 msgstr ""
 
-#: src/appendix/history-24.xml:204(para)
+#: src/appendix/history-24.xml:200(para)
 msgid ""
 "GIMP now provides full support for color profiles allowing precise color "
 "modification throughout the whole <quote>digital darkroom</quote> process."
 msgstr ""
 
-#: src/appendix/history-24.xml:211(phrase)
+#: src/appendix/history-24.xml:206(title)
 msgid "Color management in GIMP 2.4"
 msgstr "GIMP 2.4 中ç??è?²å½©ç®¡ç??"
 
-#: src/appendix/history-24.xml:222(term)
+#: src/appendix/history-24.xml:217(term)
 msgid "New Crop Tool"
 msgstr ""
 
-#: src/appendix/history-24.xml:224(para)
+#: src/appendix/history-24.xml:219(para)
 msgid ""
 "Just like the selection tools, the new crop tool has been enhanced since the "
 "last release. The resize handles actually resize the crop rectangle instead "
@@ -459,7 +459,7 @@ msgid ""
 "linkend=\"gimp-tool-crop\"/>."
 msgstr ""
 
-#: src/appendix/history-24.xml:231(para)
+#: src/appendix/history-24.xml:226(para)
 msgid ""
 "To move, simply drag the rectangle clicking within the area. Resizing is "
 "possible in one or two axes at the same time dragging the handle-bars on the "
@@ -467,21 +467,21 @@ msgid ""
 "effect to better get the idea of how the final crop will look like."
 msgstr ""
 
-#: src/appendix/history-24.xml:241(term)
+#: src/appendix/history-24.xml:236(term)
 msgid "Red Eye Removal"
 msgstr ""
 
-#: src/appendix/history-24.xml:243(para)
+#: src/appendix/history-24.xml:238(para)
 msgid ""
 "While numerous red-eye workflows exist already, GIMP now features a very "
 "convenient auto-magic filter to remove red eye from your shots."
 msgstr ""
 
-#: src/appendix/history-24.xml:250(term)
+#: src/appendix/history-24.xml:245(term)
 msgid "Healing Brush"
 msgstr ""
 
-#: src/appendix/history-24.xml:252(para)
+#: src/appendix/history-24.xml:247(para)
 msgid ""
 "The healing brush is a new tool, similar in the working of the clone tool, "
 "that permits to quickly fix small defects or imperfections due to scratching "
@@ -490,11 +490,11 @@ msgid ""
 "these defects based on image color context."
 msgstr ""
 
-#: src/appendix/history-24.xml:263(term)
+#: src/appendix/history-24.xml:258(term)
 msgid "Perspective Clone"
 msgstr ""
 
-#: src/appendix/history-24.xml:265(para)
+#: src/appendix/history-24.xml:260(para)
 msgid ""
 "Here is another clone-like new tool that is able to adapt the destination "
 "geometry, instead of color as does the healing brush, based on preselected "
@@ -502,11 +502,11 @@ msgid ""
 "blocks with some type of prospective changes."
 msgstr ""
 
-#: src/appendix/history-24.xml:275(term)
+#: src/appendix/history-24.xml:270(term)
 msgid "Lens Distortion"
 msgstr ""
 
-#: src/appendix/history-24.xml:277(para)
+#: src/appendix/history-24.xml:272(para)
 msgid ""
 "A very common problem exposing itself especially when using cheaper lenses "
 "is barrel distortion and vignetting. Luckily GIMP provides a brand new "
@@ -514,32 +514,32 @@ msgid ""
 "mission!"
 msgstr ""
 
-#: src/appendix/history-24.xml:286(term)
+#: src/appendix/history-24.xml:281(term)
 msgid "Various Other Improvements"
 msgstr ""
 
-#: src/appendix/history-24.xml:288(para)
+#: src/appendix/history-24.xml:283(para)
 msgid ""
 "In addition to all the above, GIMP has been improved in other areas such as:"
 msgstr ""
 
-#: src/appendix/history-24.xml:294(para)
+#: src/appendix/history-24.xml:289(para)
 msgid "Better status information for tools in the window status bar."
 msgstr ""
 
-#: src/appendix/history-24.xml:299(para)
+#: src/appendix/history-24.xml:294(para)
 msgid "Various speedups in composing functions and gradient drawing."
 msgstr ""
 
-#: src/appendix/history-24.xml:304(para)
+#: src/appendix/history-24.xml:299(para)
 msgid "Zoomable preview widget for plugins."
 msgstr ""
 
-#: src/appendix/history-22.xml:17(phrase)
+#: src/appendix/history-22.xml:8(title)
 msgid "What's New in GIMP 2.2?"
 msgstr ""
 
-#: src/appendix/history-22.xml:19(para)
+#: src/appendix/history-22.xml:10(para)
 msgid ""
 "Here is a brief summary of some of the most important new features "
 "introduced in <acronym>GIMP</acronym> 2.2. There are many other smaller "
@@ -548,11 +548,11 @@ msgid ""
 "programming and script-fu creating that are not covered here."
 msgstr ""
 
-#: src/appendix/history-22.xml:29(term)
+#: src/appendix/history-22.xml:20(term)
 msgid "Interoperability and Standards Support"
 msgstr ""
 
-#: src/appendix/history-22.xml:33(para)
+#: src/appendix/history-22.xml:24(para)
 msgid ""
 "You can drag-and-drop or copy-and-paste image data from the <acronym>GIMP</"
 "acronym> to any application which supports image/png drops (currently "
@@ -563,47 +563,47 @@ msgid ""
 "<application>Abiword</application> to include it inline in your document."
 msgstr ""
 
-#: src/appendix/history-22.xml:48(para)
+#: src/appendix/history-22.xml:39(para)
 msgid ""
 "Patterns can now be any supported <classname>GtkPixbuf</classname> format, "
 "including png, jpeg, xbm and others."
 msgstr ""
 
-#: src/appendix/history-22.xml:54(para)
+#: src/appendix/history-22.xml:45(para)
 msgid ""
 "<acronym>GIMP</acronym> can load gradients from SVG files, and palettes from "
 "ACT and RIFF files."
 msgstr ""
 
-#: src/appendix/history-22.xml:59(para)
+#: src/appendix/history-22.xml:51(para)
 msgid ""
 "Drag-and-drop support has been extended. You can now drop files and URIs "
 "onto an image window, where they will be opened in the existing image as new "
 "layers."
 msgstr ""
 
-#: src/appendix/history-22.xml:65(para)
+#: src/appendix/history-22.xml:57(para)
 msgid ""
 "Please note, that Drag and Drop will not work for Apple Mac OS X between "
 "GIMP and the finder. This is due to a lack of functionality on Apples X11.app"
 msgstr ""
 
-#: src/appendix/history-22.xml:76(term)
+#: src/appendix/history-22.xml:68(term)
 msgid "Shortcut Editor"
 msgstr ""
 
-#: src/appendix/history-22.xml:78(para)
+#: src/appendix/history-22.xml:70(para)
 msgid ""
 "You can now edit your shortcuts in a dedicated dialog, as well as continue "
 "to use the little-known dynamic shortcuts feature (which has been there "
 "since 1.2)."
 msgstr ""
 
-#: src/appendix/history-22.xml:86(term)
+#: src/appendix/history-22.xml:78(term)
 msgid "Plug-in Previews"
 msgstr "æ??件é¢?è§?"
 
-#: src/appendix/history-22.xml:88(para)
+#: src/appendix/history-22.xml:80(para)
 msgid ""
 "We have provided a standard preview widget for plug-in authors which greatly "
 "reduces the amount of code required to support previews. David Odin has "
@@ -612,11 +612,11 @@ msgid ""
 "real time, and the various previews behave much more consistently."
 msgstr ""
 
-#: src/appendix/history-22.xml:99(term)
+#: src/appendix/history-22.xml:91(term)
 msgid "Real-Time Previews of Transform Operations"
 msgstr ""
 
-#: src/appendix/history-22.xml:101(para)
+#: src/appendix/history-22.xml:93(para)
 msgid ""
 "The transform tools (shear, scale, perspective and rotate) can now show a "
 "real-time preview of the result of the operation when the tool is in "
@@ -624,11 +624,11 @@ msgid ""
 "shown."
 msgstr ""
 
-#: src/appendix/history-22.xml:110(term)
+#: src/appendix/history-22.xml:102(term)
 msgid "GNOME Human Interface Guide Conformance"
 msgstr ""
 
-#: src/appendix/history-22.xml:112(para)
+#: src/appendix/history-22.xml:104(para)
 msgid ""
 "A lot of work has been done on making the <acronym>GIMP</acronym>'s "
 "interface simpler and more usable for newcomers. Most dialogs now follows "
@@ -637,17 +637,17 @@ msgid ""
 "and replaced them with sane defaults or hidden them in an expander."
 msgstr ""
 
-#: src/appendix/history-22.xml:124(term)
+#: src/appendix/history-22.xml:116(term)
 msgid "GTK+ 2.4 Migration"
 msgstr "GTK+ 2.4 �移"
 
-#: src/appendix/history-22.xml:128(para)
+#: src/appendix/history-22.xml:120(para)
 msgid ""
 "Menus use the <classname>GtkUIManager</classname> to generate menu structure "
 "dynamically from XML data files."
 msgstr ""
 
-#: src/appendix/history-22.xml:134(para)
+#: src/appendix/history-22.xml:126(para)
 msgid ""
 "A completely revamped File Chooser is used everywhere in the <acronym>GIMP</"
 "acronym> for opening or saving files. The best thing about it is that it "
@@ -655,17 +655,17 @@ msgid ""
 "navigate quickly and easily to commonly used directories."
 msgstr ""
 
-#: src/appendix/history-22.xml:144(para)
+#: src/appendix/history-22.xml:136(para)
 msgid ""
 "<acronym>GIMP</acronym> now supports fancy ARGB cursors when they are "
 "available on the system."
 msgstr ""
 
-#: src/appendix/history-22.xml:152(term)
+#: src/appendix/history-22.xml:144(term)
 msgid "Basic Vector Support"
 msgstr ""
 
-#: src/appendix/history-22.xml:154(para)
+#: src/appendix/history-22.xml:146(para)
 msgid ""
 "Using the GFig plug-in, the <acronym>GIMP</acronym> now supports the basic "
 "functionality of vector layers. The GFig plug-in supports a number of vector "
@@ -677,54 +677,54 @@ msgid ""
 "vector-graphics programs such as <application>Inkscape</application>."
 msgstr ""
 
-#: src/appendix/history-22.xml:169(term)
+#: src/appendix/history-22.xml:161(term)
 msgid "Also . . ."
 msgstr ""
 
-#: src/appendix/history-22.xml:171(para)
+#: src/appendix/history-22.xml:163(para)
 msgid ""
 "There are many other smaller user-visible features. A rapid-fire list of "
 "some of those features is below."
 msgstr ""
 
-#: src/appendix/history-22.xml:177(para)
+#: src/appendix/history-22.xml:169(para)
 msgid ""
 "It is now possible to run the <acronym>GIMP</acronym> in batch mode without "
 "an X server."
 msgstr ""
 
-#: src/appendix/history-22.xml:183(para)
+#: src/appendix/history-22.xml:175(para)
 msgid ""
 "We have a <acronym>GIMP</acronym> binary (<acronym>GIMP</acronym>-console) "
 "which is not linked to GTK+ at all."
 msgstr ""
 
-#: src/appendix/history-22.xml:190(para)
+#: src/appendix/history-22.xml:182(para)
 msgid "Improved interface for extended input devices"
 msgstr ""
 
-#: src/appendix/history-22.xml:193(para)
+#: src/appendix/history-22.xml:185(para)
 msgid ""
 "Editable toolbox: You can now decide which tools should be shown in the "
 "Toolbox, and their order. In particular, you can add any or all of the Color "
 "Tools to the Toolbox if you wish to."
 msgstr ""
 
-#: src/appendix/history-22.xml:200(para)
+#: src/appendix/history-22.xml:192(para)
 msgid ""
 "Histogram overlays R, G and B histograms on the Value histogram, and "
 "calculates the histogram only for the contents of the selection."
 msgstr ""
 
-#: src/appendix/history-22.xml:206(para)
+#: src/appendix/history-22.xml:198(para)
 msgid "Shortcuts are now shared across all <acronym>GIMP</acronym> windows."
 msgstr ""
 
-#: src/appendix/history-20.xml:17(phrase)
+#: src/appendix/history-20.xml:8(title)
 msgid "Version 2.0"
 msgstr ""
 
-#: src/appendix/history-20.xml:19(para)
+#: src/appendix/history-20.xml:10(para)
 msgid ""
 "First, a statistic: the <acronym>GIMP</acronym> code base contains about "
 "230,000 lines of C code, and most of these lines were rewritten in the "
@@ -739,11 +739,11 @@ msgid ""
 "acronym> 1.2."
 msgstr ""
 
-#: src/appendix/history-20.xml:36(term)
+#: src/appendix/history-20.xml:27(term)
 msgid "Basic tools"
 msgstr ""
 
-#: src/appendix/history-20.xml:38(para)
+#: src/appendix/history-20.xml:29(para)
 msgid ""
 "The basic tools in <acronym>GIMP</acronym> 2 are not very different from "
 "their predecessors in <acronym>GIMP</acronym> 1. The <quote>Select Regions "
@@ -760,7 +760,7 @@ msgid ""
 "tool. More on this below."
 msgstr ""
 
-#: src/appendix/history-20.xml:57(para)
+#: src/appendix/history-20.xml:51(para)
 msgid ""
 "The user interface for tools has also changed significantly. The <quote>Tool "
 "Options</quote> dialog box was modified to not resize itself when a new tool "
@@ -770,18 +770,18 @@ msgid ""
 "be found."
 msgstr ""
 
-#: src/appendix/history-20.xml:71(term)
+#: src/appendix/history-20.xml:65(term)
 msgid "Tool options"
 msgstr ""
 
-#: src/appendix/history-20.xml:73(para)
+#: src/appendix/history-20.xml:67(para)
 msgid ""
 "The <quote>Tool Options</quote> for many tools have new possibilities that "
 "weren't available in <acronym>GIMP</acronym> 1. Without being exhaustive, "
 "here are the most noticeable improvements."
 msgstr ""
 
-#: src/appendix/history-20.xml:79(para)
+#: src/appendix/history-20.xml:73(para)
 msgid ""
 "All selection tools now have mode buttons: Replace, Add, Subtract and "
 "Intersect. In <acronym>GIMP</acronym> 1 the only way to change the selection "
@@ -795,7 +795,7 @@ msgid ""
 "mouse, then release <keycap>Shift</keycap>. It can now be done more easily."
 msgstr ""
 
-#: src/appendix/history-20.xml:97(para)
+#: src/appendix/history-20.xml:91(para)
 msgid ""
 "For transformation tools, buttons now control which object (layer, selection "
 "or path) is affected by the transformation. You can for example transform a "
@@ -803,7 +803,7 @@ msgid ""
 "in particular is now easier than it was before."
 msgstr ""
 
-#: src/appendix/history-20.xml:105(para)
+#: src/appendix/history-20.xml:99(para)
 msgid ""
 "<quote>Fade out</quote> and <quote>Paint Using Gradient</quote> are now "
 "available for all drawing tools. In fact, all drawing tools now have their "
@@ -816,11 +816,11 @@ msgid ""
 "choosing a brush)."
 msgstr ""
 
-#: src/appendix/history-20.xml:121(term)
+#: src/appendix/history-20.xml:115(term)
 msgid "User Interface"
 msgstr ""
 
-#: src/appendix/history-20.xml:123(para)
+#: src/appendix/history-20.xml:117(para)
 msgid ""
 "The most visible changes in <acronym>GIMP</acronym> 2 concern the user "
 "interface. <acronym>GIMP</acronym> now uses the <acronym>GTK2+</acronym> "
@@ -833,7 +833,7 @@ msgid ""
 "menu, which provides maximum flexibility in organizing your workspace."
 msgstr ""
 
-#: src/appendix/history-20.xml:138(para)
+#: src/appendix/history-20.xml:132(para)
 msgid ""
 "The Image window has some interesting new features. These are not "
 "necessarily activated by default, but they can be checked as options in the "
@@ -853,7 +853,7 @@ msgid ""
 "<keycap>Esc</keycap> key also exits fullscreen mode)."
 msgstr ""
 
-#: src/appendix/history-20.xml:162(para)
+#: src/appendix/history-20.xml:160(para)
 msgid ""
 "<acronym>GIMP</acronym> 2 features keyboard accelerators to ease menu "
 "access. If you find that navigating through menus using your mouse is "
@@ -869,7 +869,7 @@ msgid ""
 "and the quickest way to open a new image."
 msgstr ""
 
-#: src/appendix/history-20.xml:179(para)
+#: src/appendix/history-20.xml:182(para)
 msgid ""
 "To ease access to your most commonly used menu items, the <acronym>GIMP</"
 "acronym> has provided dynamic shortcuts for many years. When a menu is open, "
@@ -879,7 +879,7 @@ msgid ""
 "existing shortcuts."
 msgstr ""
 
-#: src/appendix/history-20.xml:189(para)
+#: src/appendix/history-20.xml:192(para)
 msgid ""
 "The <acronym>GIMP</acronym> also ships with a number of sets of key-bindings "
 "for its menus. If you would like to replace the default <acronym>GIMP</"
@@ -889,11 +889,11 @@ msgid ""
 "<filename>menurc</filename> and restart <acronym>GIMP</acronym>."
 msgstr ""
 
-#: src/appendix/history-20.xml:204(term)
+#: src/appendix/history-20.xml:207(term)
 msgid "Handling Tabs and Docks"
 msgstr ""
 
-#: src/appendix/history-20.xml:206(para)
+#: src/appendix/history-20.xml:209(para)
 msgid ""
 "The <acronym>GIMP</acronym> 2.0 introduces a system of tabbed dialogs to "
 "allow you to make your workspace look the way you want it to be. Almost all "
@@ -901,17 +901,17 @@ msgid ""
 "dialog set."
 msgstr ""
 
-#: src/appendix/history-20.xml:213(para)
+#: src/appendix/history-20.xml:216(para)
 msgid ""
 "Furthermore, at the bottom of each dialog, there is a dockable area: drag "
 "and drop tabs here to attach dialogs beneath the bottom tab group."
 msgstr ""
 
-#: src/appendix/history-20.xml:221(term)
+#: src/appendix/history-20.xml:224(term)
 msgid "Scripting"
 msgstr ""
 
-#: src/appendix/history-20.xml:223(para)
+#: src/appendix/history-20.xml:226(para)
 msgid ""
 "<quote>Python-fu</quote> is now the standard external scripting interface "
 "for <acronym>GIMP</acronym> 2. This means that you can now use "
@@ -930,7 +930,7 @@ msgid ""
 "a more sophisticated version is a goal of future development."
 msgstr ""
 
-#: src/appendix/history-20.xml:251(para)
+#: src/appendix/history-20.xml:254(para)
 msgid ""
 "<acronym>GIMP</acronym>-Perl is no longer distributed with the standard "
 "<acronym>GIMP</acronym> 2 distribution, but is available as a separate "
@@ -941,7 +941,7 @@ msgid ""
 "of <acronym>PDL</acronym>."
 msgstr ""
 
-#: src/appendix/history-20.xml:262(para)
+#: src/appendix/history-20.xml:266(para)
 msgid ""
 "Script-Fu, based on <quote>Scheme</quote>, has the same drawbacks as before: "
 "not intuitive, hard to use and lacking a real development environment. It "
@@ -951,11 +951,11 @@ msgid ""
 "install a package for the Python language."
 msgstr ""
 
-#: src/appendix/history-20.xml:275(term)
+#: src/appendix/history-20.xml:279(term)
 msgid "The Text Tool"
 msgstr ""
 
-#: src/appendix/history-20.xml:277(para)
+#: src/appendix/history-20.xml:281(para)
 msgid ""
 "The big problem with the standard text tool in <acronym>GIMP</acronym> 1 was "
 "that text could not be modified after it was rendered. If you wanted to "
@@ -977,11 +977,11 @@ msgid ""
 "layer, clicking on it opens the editor, and you can then modify your text."
 msgstr ""
 
-#: src/appendix/history-20.xml:307(term)
+#: src/appendix/history-20.xml:311(term)
 msgid "The Path Tool"
 msgstr ""
 
-#: src/appendix/history-20.xml:309(para)
+#: src/appendix/history-20.xml:313(para)
 msgid ""
 "The second generation Path tool has a completely new interface. The first "
 "major difference you notice is that paths are no longer required to be "
@@ -990,21 +990,21 @@ msgid ""
 "Design, Edit and Move."
 msgstr ""
 
-#: src/appendix/history-20.xml:316(para)
+#: src/appendix/history-20.xml:320(para)
 msgid ""
 "In Design mode, you can create a path, add nodes to an existing path and "
 "modify the shape of a curve either by dragging edges of the curve or "
 "dragging the <quote>handles</quote> of a node."
 msgstr ""
 
-#: src/appendix/history-20.xml:322(para)
+#: src/appendix/history-20.xml:326(para)
 msgid ""
 "In Edit mode, you can add nodes in the middle of curve edges, and remove "
 "nodes or edges, as well as change the shape of the curve. You can also "
 "connect two path components."
 msgstr ""
 
-#: src/appendix/history-20.xml:327(para)
+#: src/appendix/history-20.xml:331(para)
 msgid ""
 "The third mode, Move, is, as you might expect, used to move path components. "
 "If your path has several components, you can move each path component "
@@ -1012,7 +1012,7 @@ msgid ""
 "key."
 msgstr ""
 
-#: src/appendix/history-20.xml:333(para)
+#: src/appendix/history-20.xml:337(para)
 msgid ""
 "Two other path-related features are new in the <acronym>GIMP</acronym> 2.0. "
 "The <acronym>GIMP</acronym> can not only import an SVG image as a raster "
@@ -1026,20 +1026,20 @@ msgid ""
 "<acronym>libart</acronym>."
 msgstr ""
 
-#: src/appendix/history-20.xml:351(term)
+#: src/appendix/history-20.xml:355(term)
 msgid "Other improvements"
 msgstr ""
 
-#: src/appendix/history-20.xml:353(para)
+#: src/appendix/history-20.xml:357(para)
 msgid "Some other improvements in brief:"
 msgstr ""
 
-#: src/appendix/history-20.xml:356(para)
+#: src/appendix/history-20.xml:360(para)
 msgid ""
 "Higher-quality antialiasing in some places â?? most notibly in the Text tool."
 msgstr ""
 
-#: src/appendix/history-20.xml:362(para)
+#: src/appendix/history-20.xml:366(para)
 msgid ""
 "Icons and menus are skinnable. You can create your own icon set and apply it "
 "to the toolbox using the <menuchoice><guimenu>Preference</"
@@ -1047,32 +1047,32 @@ msgid ""
 "called <quote>small</quote> is included with the standard distribution."
 msgstr ""
 
-#: src/appendix/history-20.xml:371(para)
+#: src/appendix/history-20.xml:378(para)
 msgid "An image can be saved as a template and used to create new images."
 msgstr ""
 
-#: src/appendix/history-20.xml:377(para)
+#: src/appendix/history-20.xml:384(para)
 msgid ""
 "There are four new combination modes for layers that lie one on top of "
 "another within an image: <quote>Hard Light</quote>, <quote>Soft Light</"
 "quote>, <quote>Grain Extract</quote> and <quote>Grain Merge</quote>."
 msgstr ""
 
-#: src/appendix/history-20.xml:386(para)
+#: src/appendix/history-20.xml:393(para)
 msgid ""
 "If there is an active selection, you can crop the image directly to the "
 "selection size using image menu <menuchoice><guimenu>Image</"
 "guimenu><guisubmenu>Crop</guisubmenu></menuchoice>."
 msgstr ""
 
-#: src/appendix/history-20.xml:393(para)
+#: src/appendix/history-20.xml:403(para)
 msgid ""
 "As well as being able to create guides, there's now a grid functionality in "
 "<acronym>GIMP</acronym>. It is complementary to the guides functionality and "
 "makes it easier to position objects so that they align perfectly."
 msgstr ""
 
-#: src/appendix/history-20.xml:401(para)
+#: src/appendix/history-20.xml:411(para)
 msgid ""
 "The Layers dialog is more coherent, in that there are no more hidden "
 "functions accessed only with right click on the miniature image of the layer "
@@ -1081,7 +1081,7 @@ msgid ""
 "operations are directly in the Layer submenu."
 msgstr ""
 
-#: src/appendix/history-20.xml:411(para)
+#: src/appendix/history-20.xml:421(para)
 msgid ""
 "Color display filters are now available from the image menu "
 "<menuchoice><guimenu>View</guimenu><guisubmenu>Display Filters</guisubmenu></"
@@ -1092,19 +1092,19 @@ msgid ""
 "appear in a stable version of the <acronym>GIMP</acronym> before."
 msgstr ""
 
-#: src/appendix/history-20.xml:425(para)
+#: src/appendix/history-20.xml:438(para)
 msgid ""
 "The color selection dialog has a new CMYK mode, associated with the printer "
 "icon."
 msgstr ""
 
-#: src/appendix/history-20.xml:431(para)
+#: src/appendix/history-20.xml:444(para)
 msgid ""
 "Data stored in <acronym>EXIF</acronym> tags by digital cameras are now "
 "handled in read and write mode for JPEG files."
 msgstr ""
 
-#: src/appendix/history-20.xml:438(para)
+#: src/appendix/history-20.xml:451(para)
 msgid ""
 "MNG animations are now supported. The MNG file format can be considered as "
 "animated PNG. It has all the advantages of PNG over GIF, such as more "
@@ -1113,13 +1113,13 @@ msgid ""
 "browsers support it."
 msgstr ""
 
-#: src/appendix/history-20.xml:448(para)
+#: src/appendix/history-20.xml:461(para)
 msgid ""
 "The <acronym>GIMP</acronym> Animation package now does onion-skinning, a "
 "bluescreen feature was added as well as audio support."
 msgstr ""
 
-#: src/appendix/history-20.xml:455(para)
+#: src/appendix/history-20.xml:468(para)
 msgid ""
 "A channel mixer filter, previously available from the web as an add-on, "
 "appears in <menuchoice><guimenu>Filters</guimenu><guisubmenu>Colors</"
@@ -1760,19 +1760,64 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/appendix/bugs.xml:113(None)
-msgid "@@image: 'images/using/bugzilla-page.png'; md5=THIS FILE DOESN'T EXIST"
+#: src/appendix/bugs.xml:116(None)
+#, fuzzy
+msgid ""
+"@@image: 'images/misc/bugzilla/query-short.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr "@@image: 'images/using/bugzilla-page.png'; md5=THIS FILE DOESN'T EXIST"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/appendix/bugs.xml:160(None)
+#, fuzzy
+msgid ""
+"@@image: 'images/misc/bugzilla/query-complicated.png'; md5=THIS FILE DOESN'T "
+"EXIST"
+msgstr "@@image: 'images/using/bugzilla-page.png'; md5=THIS FILE DOESN'T EXIST"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/appendix/bugs.xml:308(None)
+#, fuzzy
+msgid ""
+"@@image: 'images/misc/bugzilla/simple-bug-guide.png'; md5=THIS FILE DOESN'T "
+"EXIST"
+msgstr "@@image: 'images/using/bugzilla-page.png'; md5=THIS FILE DOESN'T EXIST"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/appendix/bugs.xml:385(None)
+#, fuzzy
+msgid ""
+"@@image: 'images/misc/bugzilla/enter-bug-info.png'; md5=THIS FILE DOESN'T "
+"EXIST"
+msgstr "@@image: 'images/using/bugzilla-page.png'; md5=THIS FILE DOESN'T EXIST"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/appendix/bugs.xml:448(None)
+#, fuzzy
+msgid ""
+"@@image: 'images/misc/bugzilla/pick-product.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr "@@image: 'images/using/bugzilla-page.png'; md5=THIS FILE DOESN'T EXIST"
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/appendix/bugs.xml:474(None)
+#, fuzzy
+msgid ""
+"@@image: 'images/misc/bugzilla/enter-bug.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr "@@image: 'images/using/bugzilla-page.png'; md5=THIS FILE DOESN'T EXIST"
 
-#: src/appendix/bugs.xml:10(phrase)
+#: src/appendix/bugs.xml:11(title)
 msgid "Reporting Bugs and Requesting Enhancements"
 msgstr ""
 
-#: src/appendix/bugs.xml:14(secondary) src/appendix/bugs.xml:17(primary)
+#: src/appendix/bugs.xml:15(secondary) src/appendix/bugs.xml:18(primary)
 msgid "Bugs"
 msgstr "Bugs"
 
-#: src/appendix/bugs.xml:19(para)
+#: src/appendix/bugs.xml:21(para)
 msgid ""
 "Sad to say, no version of <acronym>GIMP</acronym> has yet been absolutely "
 "perfect. Even sadder, it is likely that no version ever will be. In spite of "
@@ -1781,30 +1826,30 @@ msgid ""
 "crash."
 msgstr ""
 
-#: src/appendix/bugs.xml:26(para)
+#: src/appendix/bugs.xml:28(para)
 msgid ""
 "But the fact that bugs are unavoidable does not mean that they should be "
 "passively accepted. If you find a bug in <acronym>GIMP</acronym>, the "
 "developers would like to know about it so they can at least try to fix it."
 msgstr ""
 
-#: src/appendix/bugs.xml:31(para)
+#: src/appendix/bugs.xml:33(para)
 msgid ""
 "Suppose, then, that you have found a bug, or at least think you have: you "
 "try to do something, and the results are not what you expect. What should "
 "you do? How should you report it?"
 msgstr ""
 
-#: src/appendix/bugs.xml:37(para)
+#: src/appendix/bugs.xml:39(para)
 msgid ""
-"The procedure for making an <emphasis>enhancement request</emphasis>â??that "
-"is, for asking the developers to add a missing featureâ??is nearly the same as "
-"the procedure for reporting a bug. The only thing you do differently is to "
-"mark the report as an <quote>enhancement</quote> at the appropriate stage, "
-"as described below."
+"The procedure for making an <emphasis>enhancement request</emphasis>&mdash;"
+"that is, for asking the developers to add a missing feature&mdash;is nearly "
+"the same as the procedure for reporting a bug. The only thing you do "
+"differently is to mark the report as an <quote>enhancement</quote> at the "
+"appropriate stage, as described below."
 msgstr ""
 
-#: src/appendix/bugs.xml:46(para)
+#: src/appendix/bugs.xml:47(para)
 msgid ""
 "In common with many other free software projects, <acronym>GIMP</acronym> "
 "uses a bug-reporting mechanism called <emphasis>Bugzilla</emphasis>. This is "
@@ -1814,7 +1859,7 @@ msgid ""
 "written, Gnome Bugzilla contains 148632 bug reportsâ??no, make that 148633."
 msgstr ""
 
-#: src/appendix/bugs.xml:58(phrase)
+#: src/appendix/bugs.xml:59(title)
 msgid "Making sure it's a Bug"
 msgstr ""
 
@@ -1843,7 +1888,7 @@ msgid ""
 "pixels on a side."
 msgstr ""
 
-#: src/appendix/bugs.xml:86(para)
+#: src/appendix/bugs.xml:85(para)
 msgid ""
 "You should also make sure that you are using an up-to-date version of "
 "<acronym>GIMP</acronym>: reporting bugs that have already been fixed is just "
@@ -1854,78 +1899,142 @@ msgid ""
 "the latest release before filing a report."
 msgstr ""
 
-#: src/appendix/bugs.xml:96(para)
+#: src/appendix/bugs.xml:95(para)
 msgid ""
 "If after due consideration you still think you have a legitimate bug report "
 "or enhancement request, the next step is to go to <acronym>GIMP</acronym>'s "
-"bugzilla query page (http://bugzilla.gnome.org/query.cgi), and try to see "
-"whether somebody else has already reported the same thing. The query page "
-"allows you to search the bug database in a variety of ways. Unfortunately "
-"this page is a bit more complicated to use than it really ought to be, but "
-"here is basically what you should do:"
+"bugzilla query page (<ulink url=\"http://bugzilla.gnome.org/query.cgi\"/>), "
+"and try to see whether somebody else has already reported the same thing."
+msgstr ""
+
+#: src/appendix/bugs.xml:103(para)
+msgid ""
+"There are two forms you can use for searching bugs: a simple <quote>short</"
+"quote> form, and an advanced <quote>complicated</quote> form."
+msgstr ""
+
+#: src/appendix/bugs.xml:110(title)
+msgid "The Short Bug Search Form"
 msgstr ""
 
-#: src/appendix/bugs.xml:109(phrase)
-msgid "Bugzilla page"
+#: src/appendix/bugs.xml:112(title)
+msgid "Bugzilla: Short Bug Search Form"
 msgstr ""
 
-#: src/appendix/bugs.xml:117(para)
-msgid "In this page, some items are hyperlinks leading to detailed help."
+#: src/appendix/bugs.xml:119(para)
+msgid "Searching for bugs using the short bug search form"
 msgstr ""
 
-#: src/appendix/bugs.xml:122(term)
-msgid "Summary:"
-msgstr "Summary:"
+#: src/appendix/bugs.xml:128(userinput)
+#, no-wrap
+msgid "gimp&nbsp;filter&nbsp;crash"
+msgstr ""
 
-#: src/appendix/bugs.xml:124(para)
+#: src/appendix/bugs.xml:135(userinput)
+#, no-wrap
+msgid "product:gimp severity&gt;=major"
+msgstr ""
+
+#: src/appendix/bugs.xml:123(para)
+msgid ""
+"Using the short form, you just have to enter some (space separated) search "
+"terms, e.g. <placeholder-1/> in the text box and click on <guilabel>Search</"
+"guilabel>. Even elaborate terms like <placeholder-2/> are possible."
+msgstr ""
+
+#: src/appendix/bugs.xml:141(para)
+msgid ""
+"Clicking on <quote>Help</quote> will lead you to an excellent help page, "
+"including some instructive <quote>Examples with Explanations</quote>."
+msgstr ""
+
+#: src/appendix/bugs.xml:150(title)
+msgid "The Complicated Bug Search Form"
+msgstr ""
+
+#: src/appendix/bugs.xml:151(para)
+msgid ""
+"The alternative form, the advanced query page, allows you to search the bug "
+"database in a variety of ways:"
+msgstr ""
+
+#: src/appendix/bugs.xml:156(title)
+msgid "Bugzilla: Complicated Bug Search Form"
+msgstr ""
+
+#: src/appendix/bugs.xml:163(para)
+msgid "Searching for bugs using the complicated bug search form"
+msgstr ""
+
+#: src/appendix/bugs.xml:169(para)
+msgid ""
+"Unfortunately this page is a bit more <quote>complicated</quote> to use than "
+"it really ought to be (at least, some items are hyperlinks leading to "
+"detailed help), but here is basically what you should do:"
+msgstr ""
+
+#: src/appendix/bugs.xml:176(term) src/appendix/bugs.xml:391(term)
+msgid "Summary"
+msgstr "Summary"
+
+#: src/appendix/bugs.xml:178(para)
 msgid "Set this to <quote>contains any of the words/strings</quote>."
 msgstr ""
 
-#: src/appendix/bugs.xml:130(term)
-msgid "(the adjoining entry area)"
+#: src/appendix/bugs.xml:181(para)
+msgid ""
+"In the adjoining text box, give one or more words that somebody would be "
+"likely to use in writing a one-sentence summary of a bug similar to yours. "
+"For example, if the problem is that zooming too much causes <acronym>GIMP</"
+"acronym> to crash, the word <quote>zoom</quote> would be good."
+msgstr ""
+
+#: src/appendix/bugs.xml:191(term)
+msgid "Classification"
 msgstr ""
 
-#: src/appendix/bugs.xml:132(para)
+#: src/appendix/bugs.xml:193(para)
 msgid ""
-"Give one or more words that somebody would be likely to use in writing a one-"
-"sentence summary of a bug similar to yours. For example, if the problem is "
-"that zooming too much causes <acronym>GIMP</acronym> to crash, the word "
-"<quote>zoom</quote> would be good."
+"Other (since <acronym>GIMP</acronym> is not part of the GNOME Desktop suite)."
 msgstr ""
 
-#: src/appendix/bugs.xml:142(term)
-msgid "Product:"
+#: src/appendix/bugs.xml:200(term)
+#, fuzzy
+msgid "Product"
 msgstr "Product:"
 
-#: src/appendix/bugs.xml:144(para)
-msgid "Set this to <quote>GIMP</quote>"
-msgstr "�此�设置为 <quote>GIMP</quote>"
+#: src/appendix/bugs.xml:202(para)
+msgid ""
+"Set this to <quote>GIMP</quote> (or <quote>GEGL</quote>, <quote>GIMP-manual</"
+"quote> etc., if appropriate)."
+msgstr ""
 
-#: src/appendix/bugs.xml:148(term)
-msgid "Component:, Version:, Target:"
+#: src/appendix/bugs.xml:209(term)
+#, fuzzy
+msgid "Component, Version, Target Milestone"
 msgstr "Component:, Version:, Target:"
 
-#: src/appendix/bugs.xml:150(para)
+#: src/appendix/bugs.xml:211(para) src/appendix/bugs.xml:248(para)
 msgid "Don't do anything for these."
 msgstr ""
 
-#: src/appendix/bugs.xml:154(term)
-msgid "Text information:"
+#: src/appendix/bugs.xml:215(term)
+msgid "Comment, Whiteboard, Keywords"
 msgstr ""
 
-#: src/appendix/bugs.xml:156(para)
+#: src/appendix/bugs.xml:217(para)
 msgid ""
 "For now, leave this alone. If your search does not turn up anything, it "
-"might be worth entering your search terms in the <quote>comment</quote> area "
+"might be worth entering your search terms in the <quote>Comment</quote> area "
 "here, but this often turns out to give you either great masses of stuff or "
 "nothing."
 msgstr ""
 
-#: src/appendix/bugs.xml:165(term)
-msgid "Status:"
+#: src/appendix/bugs.xml:226(term)
+msgid "Status"
 msgstr ""
 
-#: src/appendix/bugs.xml:167(para)
+#: src/appendix/bugs.xml:228(para)
 msgid ""
 "This field encodes the status of a bug report: whether it is still open, has "
 "been resolved, etc. You want to see all relevant bug reports, regardless of "
@@ -1933,88 +2042,129 @@ msgid ""
 "Leaving it alone will not work."
 msgstr ""
 
-#: src/appendix/bugs.xml:176(para)
+#: src/appendix/bugs.xml:238(term)
+msgid "Resolution, Severity, Priority, OS"
+msgstr ""
+
+#: src/appendix/bugs.xml:240(para)
+msgid "Usually you shouldn't touch these items."
+msgstr ""
+
+#: src/appendix/bugs.xml:246(term)
+msgid "(Any other items)"
+msgstr ""
+
+#: src/appendix/bugs.xml:252(para)
 msgid ""
 "When you have set these things up, click on the <quote>Search</quote> button "
 "at either the top or bottom; they both do the same thing. The result is "
-"either a list of bug reportsâ??hopefully not too longâ??or a message saying "
-"<quote>Zarro boogs found</quote>. If you don't find a related bug report by "
-"doing this, it may be worth trying another search with different terms. If "
-"in spite of your best efforts, you file a bug report and it ends up being "
-"resolved as <quote>Duplicate</quote>, don't be too upset: it has happened "
-"repeatedly to the author of this documentation, who works with "
-"<acronym>GIMP</acronym> Bugzilla nearly every day."
+"either a list of bug reports &ndash; hopefully not too long &ndash; or a "
+"message saying <quote>Zarro boogs found</quote>. If you don't find a related "
+"bug report by doing this, it may be worth trying another search with "
+"different terms. If in spite of your best efforts, you file a bug report and "
+"it ends up being resolved as <quote>Duplicate</quote>, don't be too upset: "
+"it has happened repeatedly to the author of this documentation, who works "
+"with <acronym>GIMP</acronym> Bugzilla nearly every day."
 msgstr ""
 
-#: src/appendix/bugs.xml:192(phrase)
+#: src/appendix/bugs.xml:265(para)
+msgid ""
+"Depending on your browser configuration (i.e. whether JavaScript is "
+"enabled), you may see a link <guilabel>Give&nbsp;me&nbsp;some&nbsp;help</"
+"guilabel>. If you click on this link, the page will be reloaded and then "
+"moving the mouse pointer over an input widget produces a little help popup."
+msgstr ""
+
+#: src/appendix/bugs.xml:277(title)
 msgid "Reporting the Bug"
 msgstr ""
 
-#: src/appendix/bugs.xml:194(para)
+#: src/appendix/bugs.xml:278(para)
 msgid ""
 "Okay, so you have done everything you could to make sure, and you still "
-"think it's probably a bug. You should then go ahead and file a bug report. "
-"To do this, begin by going to http://bugzilla.gnome.org/enter_bug.cgi, and "
-"go down the page until you can select the component <quote>GIMP</quote>."
+"think it's probably a bug. You should then go ahead and file a bug report on "
+"the Bugzilla page."
 msgstr ""
 
-#: src/appendix/bugs.xml:202(para)
+#: src/appendix/bugs.xml:284(para)
 msgid ""
 "The first time you file a bug report, you will be asked to create a Bugzilla "
 "account. The process is easy and painless, and you probably won't even get "
 "any spam as a result."
 msgstr ""
 
-#: src/appendix/bugs.xml:208(para)
+#: src/appendix/bugs.xml:290(para)
 msgid ""
-"This takes you to the bug report form, which you should fill out as follows. "
-"Note that most of the information you enter can be changed later by the "
-"developers if you get it wrong, so try to get it right but don't be "
-"obsessive about it."
+"There are two ways to file a bug report: a simple way using a guided tour, "
+"or a more advanced way using a single page."
 msgstr ""
 
-#: src/appendix/bugs.xml:216(term)
-msgid "Summary"
-msgstr "Summary"
+#: src/appendix/bugs.xml:296(title)
+msgid "The Simple Bug Guide"
+msgstr ""
 
-#: src/appendix/bugs.xml:218(para)
+#: src/appendix/bugs.xml:297(para)
 msgid ""
-"Give a one-sentence summary that is descriptive enough so that somebody "
-"searching for similar bugs would find your bug report on the basis of the "
-"words this summary contains."
+"If you go to <ulink url=\" http://bugzilla.gnome.org/simple-bug-guide.cgi\"/";
+">, you have to login, of course, and then you start a guided tour with the "
+"following dialog:"
 msgstr ""
 
-#: src/appendix/bugs.xml:226(term)
-msgid "Steps to reproduce the bug"
+#: src/appendix/bugs.xml:304(title)
+msgid "Bugzilla: Simple Bug Guide"
 msgstr ""
 
-#: src/appendix/bugs.xml:228(para)
+#: src/appendix/bugs.xml:311(para)
+msgid "First dialog window of the simple bug guide"
+msgstr ""
+
+#: src/appendix/bugs.xml:315(para)
+msgid ""
+"First you will have to answer a few questions, that is you just have to "
+"select one of several choices. As you can see in the above figure, you will "
+"always get some useful explanations."
+msgstr ""
+
+#: src/appendix/bugs.xml:321(para)
+msgid "You will be asked for"
+msgstr ""
+
+#: src/appendix/bugs.xml:323(term)
+msgid "Bug type"
+msgstr ""
+
+#: src/appendix/bugs.xml:325(para)
 msgid ""
-"Follow the directions. Be as specific as you can, and include all "
-"information that you think might possibly be relevant. The classic totally "
-"useless bug report is, <quote>GIMP crashes. This program sucks</quote>. "
-"There is no hope that the developers can solve a problem if they can't tell "
-"what it is. If at all possible, give a procedure that will reliably "
-"reproduce the buggy behavior, and give it in enough detail so that a moron "
-"could follow it."
+"<quote>Normal</quote> is usually a good choice (but have a look at the "
+"explanations)."
 msgstr ""
 
-#: src/appendix/bugs.xml:241(term)
+#: src/appendix/bugs.xml:332(term)
+msgid "Classification and Application"
+msgstr ""
+
+#: src/appendix/bugs.xml:334(para)
+msgid ""
+"Select Classification <quote>Other</quote>, and Application <quote>GIMP</"
+"quote>."
+msgstr ""
+
+#: src/appendix/bugs.xml:341(term)
 msgid "Component"
 msgstr "Component"
 
-#: src/appendix/bugs.xml:243(para)
+#: src/appendix/bugs.xml:343(para)
 msgid ""
 "Set this to the part of <acronym>GIMP</acronym> that the bug affects. You "
 "have to pick something here, but if you aren't sure, make a guess and don't "
 "worry about it."
 msgstr ""
 
-#: src/appendix/bugs.xml:251(term)
+#: src/appendix/bugs.xml:351(term)
 msgid "Severity"
 msgstr "Severity"
 
-#: src/appendix/bugs.xml:253(para)
+#: src/appendix/bugs.xml:353(para)
 msgid ""
 "In most cases you should either leave this as <quote>Normal</quote> or set "
 "it to <quote>Enhancement</quote>, if it is an enhancement request rather "
@@ -2022,76 +2172,176 @@ msgid ""
 "it is warranted."
 msgstr ""
 
-#: src/appendix/bugs.xml:263(term)
-msgid "Priority"
-msgstr "Priority"
+#: src/appendix/bugs.xml:363(term)
+msgid "Version"
+msgstr "Version"
+
+#: src/appendix/bugs.xml:365(para)
+msgid ""
+"Set this to the version of <acronym>GIMP</acronym> that you are using. See "
+"<menuchoice><guimenu>Help</guimenu><guimenuitem>About</guimenuitem></"
+"menuchoice>."
+msgstr ""
+
+#: src/appendix/bugs.xml:376(para)
+msgid ""
+"Then you get to the guided bug report form, which you should fill out as "
+"follows:"
+msgstr ""
 
-#: src/appendix/bugs.xml:265(para)
+#: src/appendix/bugs.xml:381(title)
+msgid "Bugzilla: Enter bug information"
+msgstr ""
+
+#: src/appendix/bugs.xml:393(para)
 msgid ""
-"In most cases you should leave this at <quote>Normal</quote>, and allow the "
-"maintainers to adjust it. Setting the priority to <quote>Immediate</quote> "
-"or <quote>Urgent</quote> usually just manages to annoy people."
+"Give a one-sentence summary that is descriptive enough so that somebody "
+"searching for similar bugs would find your bug report on the basis of the "
+"words this summary contains."
 msgstr ""
 
-#: src/appendix/bugs.xml:274(term)
-msgid "Version"
-msgstr "Version"
+#: src/appendix/bugs.xml:401(term)
+msgid "Description"
+msgstr ""
+
+#: src/appendix/bugs.xml:403(para)
+msgid ""
+"Describe the problem. Be as specific as you can, and include all information "
+"that you think might possibly be relevant. The classic totally useless bug "
+"report is, <quote>GIMP crashes. This program sucks</quote>. There is no hope "
+"that the developers can solve a problem if they can't tell what it is."
+msgstr ""
+
+#: src/appendix/bugs.xml:413(term)
+msgid "Steps to reproduce the bug"
+msgstr ""
+
+#: src/appendix/bugs.xml:415(para)
+msgid ""
+"If at all possible, give a procedure that will reliably reproduce the buggy "
+"behavior, and give it in enough detail so that a moron could follow it."
+msgstr ""
+
+#: src/appendix/bugs.xml:423(term)
+msgid "Additional information"
+msgstr ""
+
+#: src/appendix/bugs.xml:425(para)
+msgid ""
+"Here you may add any additional information that might be relevant, but it's "
+"not necessary to duplicate your previous reports."
+msgstr ""
+
+#: src/appendix/bugs.xml:436(title)
+msgid "The Advanced Bugreport"
+msgstr ""
+
+#: src/appendix/bugs.xml:437(para)
+msgid ""
+"To use the advanced bug form, go to <ulink url=\"http://bugzilla.gnome.org/";
+"enter_bug.cgi\"/>, and scroll down the page until you can select the product "
+"<quote>GIMP</quote>."
+msgstr ""
+
+#: src/appendix/bugs.xml:444(title)
+msgid "Bugzilla: Enter Bug (pick a product)"
+msgstr ""
 
-#: src/appendix/bugs.xml:276(para)
+#: src/appendix/bugs.xml:451(para)
+msgid "Select the product: <acronym>GIMP</acronym>"
+msgstr ""
+
+#: src/appendix/bugs.xml:456(para)
+msgid ""
+"You can skip this step by using <ulink url=\"http://bugzilla.gnome.org/";
+"enter_bug.cgi?product=GIMP\"/>."
+msgstr ""
+
+#: src/appendix/bugs.xml:462(para)
 msgid ""
-"Set this to the version of <acronym>GIMP</acronym> that you are using. Leave "
-"the Gnome version unspecified."
+"Selecting <quote>GIMP</quote> as product takes you to the following bug "
+"report form, which you should fill out as follows. Note that most of the "
+"information you enter can be changed later by the developers if you get it "
+"wrong, so try to get it right but don't be obsessive about it."
 msgstr ""
 
-#: src/appendix/bugs.xml:283(term)
+#: src/appendix/bugs.xml:470(title)
+msgid "Bugzilla: Enter Bug (<acronym>GIMP</acronym>)"
+msgstr ""
+
+#: src/appendix/bugs.xml:477(para)
+msgid "The main bugreport page"
+msgstr ""
+
+#: src/appendix/bugs.xml:483(term)
+#, fuzzy
+msgid "Version, Severity"
+msgstr "Severity"
+
+#: src/appendix/bugs.xml:485(para)
+msgid ""
+"See <link linkend=\"bugzilla-simple-bug-guide\">Simple Bug Guide</link>."
+msgstr ""
+
+#: src/appendix/bugs.xml:492(term)
 msgid "Operating System"
 msgstr "Operating System"
 
-#: src/appendix/bugs.xml:285(para)
+#: src/appendix/bugs.xml:494(para)
 msgid ""
 "Set this to your OS unless you have a very good reason for thinking that the "
 "bug applies to all operating systems."
 msgstr ""
 
-#: src/appendix/bugs.xml:292(para)
+#: src/appendix/bugs.xml:501(term)
+msgid "Summary, Description"
+msgstr ""
+
+#: src/appendix/bugs.xml:503(para)
+msgid ""
+"See <link linkend=\"bugzilla-bug-information\">Enter bug information</link>."
+msgstr ""
+
+#: src/appendix/bugs.xml:523(para)
 msgid ""
 "You can ignore the rest. When you have filled out all of these things, press "
-"the <quote>Commit</quote> button and your bug report will be submitted. It "
-"will be assigned a number, which you may want to make note of; you will, "
-"however, be emailed any time somebody makes a comment on your bug report or "
-"otherwise alters it, so you will receive reminders in any case. You can see "
-"the current state of your bug report at any time by going to http://bugzilla.";
-"gnome.org and, at the bottom of the page, in the <quote>Actions:</quote> "
-"area, entering the bug number and pressing the <quote>Find</quote> button."
+"the <guilabel>Commit</guilabel> button and your bug report will be "
+"submitted. It will be assigned a number, which you may want to make note of; "
+"you will, however, be emailed any time somebody makes a comment on your bug "
+"report or otherwise alters it, so you will receive reminders in any case. "
+"You can see the current state of your bug report at any time by going to "
+"<ulink url=\"http://bugzilla.gnome.org\"/> and, at the bottom of the page, "
+"in the <quote>Actions:</quote> area, entering the bug number and pressing "
+"the <guilabel>Find</guilabel> button."
 msgstr ""
 
-#: src/appendix/bugs.xml:304(para)
+#: src/appendix/bugs.xml:535(para)
 msgid ""
 "Sometimes it is very helpful to augment a bug report with a screenshot or "
 "some other type of data. If you need to do this, go to the web page for your "
 "bug report, click on the link <quote>Create a New Attachment</quote>, and "
 "follow the directions. But please don't do this unless you think the "
-"attachment is really going to be usefulâ??and if you need to attach a "
+"attachment is really going to be useful&mdash;and if you need to attach a "
 "screenshot, don't make it any larger than necessary. Bug reports are likely "
 "to remain on the system for years, so there is no sense in wasting memory."
 msgstr ""
 
-#: src/appendix/bugs.xml:318(phrase)
+#: src/appendix/bugs.xml:549(title)
 msgid "What Happens to a Bug Report after you Submit it"
 msgstr ""
 
-#: src/appendix/bugs.xml:322(para)
+#: src/appendix/bugs.xml:550(para)
 msgid ""
 "At any time after it is submitted, a bug report has a <quote>Status</quote> "
 "that describes how it is currently being handled. Here are the possible "
 "values of <emphasis>Status</emphasis> and what they mean:"
 msgstr ""
 
-#: src/appendix/bugs.xml:330(term)
+#: src/appendix/bugs.xml:558(term)
 msgid "Unconfirmed"
 msgstr "Unconfirmed"
 
-#: src/appendix/bugs.xml:332(para)
+#: src/appendix/bugs.xml:560(para)
 msgid ""
 "This is the initial status of a bug report, from the time it is submitted "
 "until one of the maintainers reads it and decides whether it is really a "
@@ -2101,11 +2351,11 @@ msgid ""
 "bad thing and does not happen very often."
 msgstr ""
 
-#: src/appendix/bugs.xml:345(term)
+#: src/appendix/bugs.xml:573(term)
 msgid "New"
 msgstr "New"
 
-#: src/appendix/bugs.xml:347(para)
+#: src/appendix/bugs.xml:575(para)
 msgid ""
 "This means that the bug report has been read by one of the maintainers, and "
 "is considered, for the moment at least, to be valid. It does not necessarily "
@@ -2115,11 +2365,11 @@ msgid ""
 "the other hand, are fixed within hours of being reported."
 msgstr ""
 
-#: src/appendix/bugs.xml:359(term)
+#: src/appendix/bugs.xml:587(term)
 msgid "Assigned"
 msgstr "Assigned"
 
-#: src/appendix/bugs.xml:361(para)
+#: src/appendix/bugs.xml:589(para)
 msgid ""
 "This means that a specific person has agreed to work on the bug. It does "
 "not, this world being the kind of world that it is, mean that that person "
@@ -2128,11 +2378,11 @@ msgid ""
 "quote>."
 msgstr ""
 
-#: src/appendix/bugs.xml:371(term)
+#: src/appendix/bugs.xml:599(term)
 msgid "Reopened"
 msgstr "Reopened"
 
-#: src/appendix/bugs.xml:373(para)
+#: src/appendix/bugs.xml:601(para)
 msgid ""
 "This means that the bug report was at some point considered by the "
 "maintainers to be resolved (i.e., finished), but new information came in "
@@ -2140,11 +2390,11 @@ msgid ""
 "intended to fix the problem did not completely work."
 msgstr ""
 
-#: src/appendix/bugs.xml:383(term)
+#: src/appendix/bugs.xml:611(term)
 msgid "Needinfo"
 msgstr "Needinfo"
 
-#: src/appendix/bugs.xml:385(para)
+#: src/appendix/bugs.xml:613(para)
 msgid ""
 "This is a status you should pay particular attention to. It means that you "
 "did not supply enough information in your bug report to enable anything to "
@@ -2154,11 +2404,11 @@ msgid ""
 "be resolved as <quote>Incomplete</quote>."
 msgstr ""
 
-#: src/appendix/bugs.xml:397(term)
+#: src/appendix/bugs.xml:625(term)
 msgid "Resolved"
 msgstr "Resolved"
 
-#: src/appendix/bugs.xml:399(para)
+#: src/appendix/bugs.xml:627(para)
 msgid ""
 "This means that the maintainers believe that they have finished dealing with "
 "the bug report. If you disagree, you can re-open it, but since you cannot "
@@ -2167,43 +2417,43 @@ msgid ""
 "possible values of <emphasis>Resolution</emphasis> and what they mean:"
 msgstr ""
 
-#: src/appendix/bugs.xml:409(term)
+#: src/appendix/bugs.xml:637(term)
 msgid "Fixed"
 msgstr "Fixed"
 
-#: src/appendix/bugs.xml:411(para)
+#: src/appendix/bugs.xml:639(para)
 msgid ""
 "The bug report is considered valid, and <acronym>GIMP</acronym> has been "
 "changed in a way that is considered to fix it."
 msgstr ""
 
-#: src/appendix/bugs.xml:419(term)
+#: src/appendix/bugs.xml:647(term)
 msgid "Wontfix"
 msgstr "Wontfix"
 
-#: src/appendix/bugs.xml:421(para)
+#: src/appendix/bugs.xml:649(para)
 msgid ""
 "The maintainers agree that the bug report is valid, but it would take so "
 "much effort to fix, in relation to its importance, that it is not worth the "
 "trouble."
 msgstr ""
 
-#: src/appendix/bugs.xml:429(term)
+#: src/appendix/bugs.xml:657(term)
 msgid "Duplicate"
 msgstr "Duplicate"
 
-#: src/appendix/bugs.xml:431(para)
+#: src/appendix/bugs.xml:659(para)
 msgid ""
 "This means that the same bug has already been reported by somebody else. If "
 "you see this resolution, you will also see a pointer to the earlier bug "
 "report, which will often give you a lot of useful information."
 msgstr ""
 
-#: src/appendix/bugs.xml:440(term)
+#: src/appendix/bugs.xml:668(term)
 msgid "Notabug"
 msgstr "Notabug"
 
-#: src/appendix/bugs.xml:442(para)
+#: src/appendix/bugs.xml:670(para)
 msgid ""
 "This means that the behavior described in the bug report is intentional. It "
 "may seem like a bug to you (and there may be many people who agree with "
@@ -2211,11 +2461,11 @@ msgid ""
 "developers don't want to change it."
 msgstr ""
 
-#: src/appendix/bugs.xml:452(term)
+#: src/appendix/bugs.xml:680(term)
 msgid "NotGnome"
 msgstr "NotGnome"
 
-#: src/appendix/bugs.xml:454(para)
+#: src/appendix/bugs.xml:682(para)
 msgid ""
 "The bug report is valid, but it can't be addressed by changing "
 "<acronym>GIMP</acronym>. Problems in operating systems, window managers, or "
@@ -2224,11 +2474,11 @@ msgid ""
 "the software that is really at fault."
 msgstr ""
 
-#: src/appendix/bugs.xml:466(term)
+#: src/appendix/bugs.xml:694(term)
 msgid "Incomplete"
 msgstr "Incomplete"
 
-#: src/appendix/bugs.xml:468(para)
+#: src/appendix/bugs.xml:696(para)
 msgid ""
 "The bug report did not contain enough information for anything to be done "
 "about it, and the reporter did not respond to requests for more information. "
@@ -2236,11 +2486,11 @@ msgid ""
 "resolved in this way."
 msgstr ""
 
-#: src/appendix/bugs.xml:478(term)
+#: src/appendix/bugs.xml:706(term)
 msgid "Invalid"
 msgstr "Invalid"
 
-#: src/appendix/bugs.xml:480(para)
+#: src/appendix/bugs.xml:708(para)
 msgid ""
 "Something is wrong with the form of the bug report: most commonly, the "
 "reporter has accidentally submitted the same bug report multiple times. "
@@ -2251,7 +2501,7 @@ msgstr ""
 "(ä¸?äº?ç½?页æµ?è§?å?¨å¾?容æ??使å¾?类似ç??é?®é¢?å??ç??ã??)没æ??正确æ??è¿°ç¨?åº?è¿?è¡?ç?¶å?µç?? Bug æ?¥å??"
 "ä¹?ä¼?被设为 Invalidã??"
 
-#: src/appendix/bugs.xml:492(para)
+#: src/appendix/bugs.xml:720(para)
 msgid ""
 "If you disagree with the resolution of a bug report, you are always free to "
 "add your comments to it. Any comment added to any bug report, resolved or "
@@ -2269,702 +2519,746 @@ msgid "Books"
 msgstr ""
 
 #: src/appendix/bibliography.xml:17(abbrev)
-msgid "Bunks00"
-msgstr ""
-
-#: src/appendix/bibliography.xml:18(title)
-msgid "Grokking the Gimp"
-msgstr ""
-
-#: src/appendix/bibliography.xml:20(firstname)
-msgid "Carey"
-msgstr "Carey"
-
-#: src/appendix/bibliography.xml:21(surname)
-msgid "Bunks"
-msgstr "Bunks"
-
-#: src/appendix/bibliography.xml:24(year)
-msgid "2000"
-msgstr "2000"
-
-#: src/appendix/bibliography.xml:25(holder)
-msgid "New Riders Publishing"
-msgstr ""
-
-#: src/appendix/bibliography.xml:28(publishername)
-msgid "New Riders Publishing, www.newriders.com"
-msgstr ""
-
-#: src/appendix/bibliography.xml:32(isbn)
-msgid "ISBN 0-7357-0924-6"
-msgstr "ISBN 0-7357-0924-6"
-
-#: src/appendix/bibliography.xml:34(ulink)
-msgid "http://gimp-savvy.com/BOOK";
-msgstr "http://gimp-savvy.com/BOOK";
-
-#: src/appendix/bibliography.xml:40(abbrev)
 msgid "APRESS00"
 msgstr "APRESS00"
 
-#: src/appendix/bibliography.xml:41(title)
+#: src/appendix/bibliography.xml:18(title)
 msgid "Beginning GIMP: From Novice to Professional"
 msgstr ""
 
-#: src/appendix/bibliography.xml:43(firstname)
+#: src/appendix/bibliography.xml:20(firstname)
 msgid "Akkana"
 msgstr "Akkana"
 
-#: src/appendix/bibliography.xml:44(surname)
+#: src/appendix/bibliography.xml:21(surname)
 msgid "Peck"
 msgstr "Peck"
 
-#: src/appendix/bibliography.xml:47(year)
+#: src/appendix/bibliography.xml:24(year)
 msgid "2006"
 msgstr "2006"
 
-#: src/appendix/bibliography.xml:48(holder)
+#: src/appendix/bibliography.xml:25(holder)
 msgid "Apress Inc."
 msgstr "Apress Inc."
 
-#: src/appendix/bibliography.xml:51(publishername)
+#: src/appendix/bibliography.xml:28(publishername)
 msgid "Apress Inc, www.apress.com"
 msgstr "Apress Inc, www.apress.com"
 
-#: src/appendix/bibliography.xml:53(isbn)
+#: src/appendix/bibliography.xml:30(isbn)
 msgid "ISBN 1-59059-587-4"
 msgstr "ISBN 1-59059-587-4"
 
-#: src/appendix/bibliography.xml:55(ulink)
+#: src/appendix/bibliography.xml:32(ulink)
 msgid "http://gimpbook.com/";
 msgstr "http://gimpbook.com/";
 
-#: src/appendix/bibliography.xml:59(abbrev)
+#: src/appendix/bibliography.xml:36(abbrev)
 msgid "FOLEY01"
 msgstr "FOLEY01"
 
-#: src/appendix/bibliography.xml:60(title)
+#: src/appendix/bibliography.xml:37(title)
 msgid "Computer Graphics, Principles and Practice"
 msgstr ""
 
-#: src/appendix/bibliography.xml:62(othername)
+#: src/appendix/bibliography.xml:39(othername)
 msgid "Foley and van Dam, et al"
 msgstr ""
 
-#: src/appendix/bibliography.xml:65(year)
+#: src/appendix/bibliography.xml:42(year)
 msgid "1990"
 msgstr "1990"
 
-#: src/appendix/bibliography.xml:66(holder)
-#: src/appendix/bibliography.xml:69(publishername)
+#: src/appendix/bibliography.xml:43(holder)
+#: src/appendix/bibliography.xml:46(publishername)
 msgid "Addison Wesley"
 msgstr "Addison Wesley"
 
-#: src/appendix/bibliography.xml:72(remark)
+#: src/appendix/bibliography.xml:49(remark)
 msgid "2nd Ed. (Addison Wesley, 1990)"
 msgstr "第äº?ç?? (Addison Wesley, 1990)"
 
-#: src/appendix/bibliography.xml:77(title)
+#: src/appendix/bibliography.xml:53(abbrev)
+#, fuzzy
+msgid "GROKKING"
+msgstr "GROKKING01"
+
+#: src/appendix/bibliography.xml:54(title)
+msgid "Grokking the Gimp"
+msgstr ""
+
+#: src/appendix/bibliography.xml:56(firstname)
+msgid "Carey"
+msgstr "Carey"
+
+#: src/appendix/bibliography.xml:57(surname)
+msgid "Bunks"
+msgstr "Bunks"
+
+#: src/appendix/bibliography.xml:60(year)
+msgid "2000"
+msgstr "2000"
+
+#: src/appendix/bibliography.xml:61(holder)
+msgid "New Riders Publishing"
+msgstr ""
+
+#: src/appendix/bibliography.xml:64(publishername)
+msgid "New Riders Publishing, www.newriders.com"
+msgstr ""
+
+#: src/appendix/bibliography.xml:68(isbn)
+msgid "ISBN 0-7357-0924-6"
+msgstr "ISBN 0-7357-0924-6"
+
+#: src/appendix/bibliography.xml:70(ulink)
+msgid "http://gimp-savvy.com/BOOK";
+msgstr "http://gimp-savvy.com/BOOK";
+
+#: src/appendix/bibliography.xml:78(title)
 msgid "Online resources"
 msgstr "�线��"
 
-#: src/appendix/bibliography.xml:79(abbrev)
+#: src/appendix/bibliography.xml:80(abbrev)
 msgid "AdobeRGB"
 msgstr "AdobeRGB"
 
-#: src/appendix/bibliography.xml:80(title)
+#: src/appendix/bibliography.xml:81(title)
 msgid "Adobe RGB (1998) ICC Profile"
 msgstr ""
 
-#: src/appendix/bibliography.xml:82(ulink)
+#: src/appendix/bibliography.xml:83(ulink)
 msgid "http://www.adobe.com/digitalimag/adobergb.html";
 msgstr "http://www.adobe.com/digitalimag/adobergb.html";
 
-#: src/appendix/bibliography.xml:88(abbrev)
+#: src/appendix/bibliography.xml:89(abbrev)
+#, fuzzy
+msgid "APOD"
+msgstr "APOD01"
+
+#: src/appendix/bibliography.xml:90(title)
+msgid "Astronomy Picture of the Day"
+msgstr ""
+
+#: src/appendix/bibliography.xml:92(ulink)
+#, fuzzy
+msgid "http://antwrp.gsfc.nasa.gov/apod/";
+msgstr "http://antwrp.gsfc.nasa.gov/apod/astropix.html";
+
+#: src/appendix/bibliography.xml:98(abbrev)
 msgid "APOD01"
 msgstr "APOD01"
 
-#: src/appendix/bibliography.xml:89(title)
+#: src/appendix/bibliography.xml:99(title)
 msgid "Astronomy Picture of the Day (today)"
 msgstr ""
 
-#: src/appendix/bibliography.xml:91(ulink)
+#: src/appendix/bibliography.xml:101(ulink)
 msgid "http://antwrp.gsfc.nasa.gov/apod/astropix.html";
 msgstr "http://antwrp.gsfc.nasa.gov/apod/astropix.html";
 
-#: src/appendix/bibliography.xml:97(abbrev)
+#: src/appendix/bibliography.xml:107(abbrev)
 msgid "APOD02"
 msgstr "APOD02"
 
-#: src/appendix/bibliography.xml:98(title)
+#: src/appendix/bibliography.xml:108(title)
 msgid ""
 "Astronomy Picture of the Day - The Hubble Ultra Deep Field (2004 March 9)"
 msgstr ""
 
-#: src/appendix/bibliography.xml:103(ulink)
+#: src/appendix/bibliography.xml:113(ulink)
 msgid "http://antwrp.gsfc.nasa.gov/apod/ap040309.html";
 msgstr "http://antwrp.gsfc.nasa.gov/apod/ap040309.html";
 
-#: src/appendix/bibliography.xml:109(abbrev)
+#: src/appendix/bibliography.xml:119(abbrev)
 msgid "APOD03"
 msgstr "APOD03"
 
-#: src/appendix/bibliography.xml:110(title)
+#: src/appendix/bibliography.xml:120(title)
 msgid "Astronomy Picture of the Day - M51: Cosmic Whirlpool (2002 July 10)"
 msgstr ""
 
-#: src/appendix/bibliography.xml:114(ulink)
+#: src/appendix/bibliography.xml:124(ulink)
 msgid "http://antwrp.gsfc.nasa.gov/apod/ap020710.html";
 msgstr "http://antwrp.gsfc.nasa.gov/apod/ap020710.html";
 
-#: src/appendix/bibliography.xml:120(abbrev)
+#: src/appendix/bibliography.xml:130(abbrev)
 msgid "APOD04"
 msgstr "APOD04"
 
-#: src/appendix/bibliography.xml:121(title)
+#: src/appendix/bibliography.xml:131(title)
 msgid ""
 "Astronomy Picture of the Day - Saturn: Lord of the Rings (2002 February 15)"
 msgstr ""
 
-#: src/appendix/bibliography.xml:126(ulink)
+#: src/appendix/bibliography.xml:136(ulink)
 msgid "http://antwrp.gsfc.nasa.gov/apod/ap020215.html";
 msgstr "http://antwrp.gsfc.nasa.gov/apod/ap020215.html";
 
-#: src/appendix/bibliography.xml:132(abbrev)
+#: src/appendix/bibliography.xml:142(abbrev)
 msgid "APOD05"
 msgstr "APOD05"
 
-#: src/appendix/bibliography.xml:133(title)
+#: src/appendix/bibliography.xml:143(title)
 msgid ""
 "Astronomy Picture of the Day - NGC 6369: The Little Ghost Nebula (2002 "
 "November 8)"
 msgstr ""
 
-#: src/appendix/bibliography.xml:138(ulink)
+#: src/appendix/bibliography.xml:148(ulink)
 msgid "http://antwrp.gsfc.nasa.gov/apod/ap021108.html";
 msgstr "http://antwrp.gsfc.nasa.gov/apod/ap021108.html";
 
-#: src/appendix/bibliography.xml:144(abbrev)
+#: src/appendix/bibliography.xml:154(abbrev)
 msgid "APOD06"
 msgstr "APOD06"
 
-#: src/appendix/bibliography.xml:145(title)
+#: src/appendix/bibliography.xml:155(title)
 msgid ""
 "Astronomy Picture of the Day - Disorder in Stephan's Quintet (2000 November "
 "13)"
 msgstr ""
 
-#: src/appendix/bibliography.xml:150(ulink)
+#: src/appendix/bibliography.xml:160(ulink)
 msgid "http://antwrp.gsfc.nasa.gov/apod/ap001113.html";
 msgstr "http://antwrp.gsfc.nasa.gov/apod/ap001113.html";
 
-#: src/appendix/bibliography.xml:156(abbrev)
+#: src/appendix/bibliography.xml:166(abbrev)
 msgid "APOD07"
 msgstr "APOD07"
 
-#: src/appendix/bibliography.xml:157(title)
+#: src/appendix/bibliography.xml:167(title)
 msgid ""
 "Astronomy Picture of the Day - The Sharpest View of the Sun (2002 November "
 "14)"
 msgstr ""
 
-#: src/appendix/bibliography.xml:162(ulink)
+#: src/appendix/bibliography.xml:172(ulink)
 msgid "http://antwrp.gsfc.nasa.gov/apod/ap021114.html";
 msgstr "http://antwrp.gsfc.nasa.gov/apod/ap021114.html";
 
-#: src/appendix/bibliography.xml:168(abbrev)
+#: src/appendix/bibliography.xml:178(abbrev)
 msgid "ARGYLLCMS"
 msgstr "ARGYLLCMS"
 
-#: src/appendix/bibliography.xml:169(title)
+#: src/appendix/bibliography.xml:179(title)
 msgid "Argyll Color Management System Home Page"
 msgstr ""
 
-#: src/appendix/bibliography.xml:171(ulink)
+#: src/appendix/bibliography.xml:181(ulink)
 msgid "http://www.argyllcms.com/";
 msgstr "http://www.argyllcms.com/";
 
-#: src/appendix/bibliography.xml:177(abbrev)
+#: src/appendix/bibliography.xml:187(abbrev)
 msgid "BABL"
 msgstr "BABL"
 
-#: src/appendix/bibliography.xml:178(title)
+#: src/appendix/bibliography.xml:188(title)
 msgid "babl (pixel format translation library)"
 msgstr ""
 
-#: src/appendix/bibliography.xml:180(ulink)
+#: src/appendix/bibliography.xml:190(ulink)
 msgid "http://www.gegl.org/babl";
 msgstr "http://www.gegl.org/babl";
 
-#: src/appendix/bibliography.xml:184(abbrev)
+#: src/appendix/bibliography.xml:194(abbrev)
 msgid "BACH04"
 msgstr "BACH04"
 
-#: src/appendix/bibliography.xml:185(title)
+#: src/appendix/bibliography.xml:195(title)
 msgid "Face in blocks"
 msgstr ""
 
-#: src/appendix/bibliography.xml:187(firstname)
+#: src/appendix/bibliography.xml:197(firstname)
 msgid "Michael"
 msgstr "Michael"
 
-#: src/appendix/bibliography.xml:188(surname)
+#: src/appendix/bibliography.xml:198(surname)
 msgid "Bach"
 msgstr "Bach"
 
-#: src/appendix/bibliography.xml:191(year)
-#: src/appendix/bibliography.xml:393(year)
-#: src/appendix/bibliography.xml:602(year)
-#: src/appendix/bibliography.xml:625(year)
+#: src/appendix/bibliography.xml:201(year)
+#: src/appendix/bibliography.xml:412(year)
+#: src/appendix/bibliography.xml:630(year)
+#: src/appendix/bibliography.xml:653(year)
 msgid "2004"
 msgstr "2004"
 
-#: src/appendix/bibliography.xml:192(holder)
+#: src/appendix/bibliography.xml:202(holder)
 msgid "Michael Bach"
 msgstr "Michael Bach"
 
-#: src/appendix/bibliography.xml:195(ulink)
+#: src/appendix/bibliography.xml:205(ulink)
 msgid "http://www.michaelbach.de/ot/fcs_mosaic/";
 msgstr "http://www.michaelbach.de/ot/fcs_mosaic/";
 
-#: src/appendix/bibliography.xml:201(abbrev)
+#: src/appendix/bibliography.xml:211(abbrev)
 msgid "BUDIG01"
 msgstr "BUDIG01"
 
-#: src/appendix/bibliography.xml:202(title)
+#: src/appendix/bibliography.xml:212(title)
 msgid "Golden Text"
 msgstr ""
 
-#: src/appendix/bibliography.xml:204(ulink)
+#: src/appendix/bibliography.xml:214(ulink)
 msgid "http://www.home.unix-ag.org/simon/gimp/golden.html";
 msgstr "http://www.home.unix-ag.org/simon/gimp/golden.html";
 
-#: src/appendix/bibliography.xml:210(abbrev)
+#: src/appendix/bibliography.xml:220(abbrev)
+#, fuzzy
+msgid "BUGZILLA"
+msgstr "BUGZILLA-GIMP"
+
+#: src/appendix/bibliography.xml:221(title)
+#, fuzzy
+msgid "Bugzilla"
+msgstr "Bugzilla-GIMP"
+
+#: src/appendix/bibliography.xml:223(ulink)
+#, fuzzy
+msgid "http://bugzilla.gnome.org";
+msgstr "http://gimp.org";
+
+#: src/appendix/bibliography.xml:229(abbrev)
 msgid "BUGZILLA-GIMP"
 msgstr "BUGZILLA-GIMP"
 
-#: src/appendix/bibliography.xml:211(title)
+#: src/appendix/bibliography.xml:230(title)
 msgid "Bugzilla-GIMP"
 msgstr "Bugzilla-GIMP"
 
-#: src/appendix/bibliography.xml:213(ulink)
+#: src/appendix/bibliography.xml:232(ulink)
 msgid "http://bugzilla.gnome.org/browse.cgi?product=GIMP";
 msgstr "http://bugzilla.gnome.org/browse.cgi?product=GIMP";
 
-#: src/appendix/bibliography.xml:219(abbrev)
+#: src/appendix/bibliography.xml:238(abbrev)
 msgid "CAIRO"
 msgstr "CAIRO"
 
-#: src/appendix/bibliography.xml:220(title)
+#: src/appendix/bibliography.xml:239(title)
 msgid "Cairo"
 msgstr "Cairo"
 
-#: src/appendix/bibliography.xml:222(ulink)
+#: src/appendix/bibliography.xml:241(ulink)
 msgid "http://www.cairographics.org";
 msgstr "http://www.cairographics.org";
 
-#: src/appendix/bibliography.xml:228(abbrev)
+#: src/appendix/bibliography.xml:247(abbrev)
 msgid "DARWINORTS"
 msgstr "DARWINORTS"
 
-#: src/appendix/bibliography.xml:229(title)
+#: src/appendix/bibliography.xml:248(title)
 msgid "Darwin Ports Package Manager for OS X"
 msgstr ""
 
-#: src/appendix/bibliography.xml:231(ulink)
+#: src/appendix/bibliography.xml:250(ulink)
 msgid "http://darwinports.org";
 msgstr "http://darwinports.org";
 
-#: src/appendix/bibliography.xml:235(abbrev)
+#: src/appendix/bibliography.xml:254(abbrev)
 msgid "ECI"
 msgstr "ECI"
 
-#: src/appendix/bibliography.xml:236(title)
+#: src/appendix/bibliography.xml:255(title)
 msgid "ECI (European Color Initiative) Profiles"
 msgstr ""
 
-#: src/appendix/bibliography.xml:238(ulink)
+#: src/appendix/bibliography.xml:257(ulink)
 msgid "http://www.eci.org/eci/en/060_downloads.php";
 msgstr "http://www.eci.org/eci/en/060_downloads.php";
 
-#: src/appendix/bibliography.xml:244(abbrev)
+#: src/appendix/bibliography.xml:263(abbrev)
 msgid "FDL-TRANSLATION"
 msgstr "FDL-TRANSLATION"
 
-#: src/appendix/bibliography.xml:245(title)
+#: src/appendix/bibliography.xml:264(title)
 msgid "Unofficial translation of the GNU Free Documentation License"
 msgstr "GNU è?ªç?±æ??档许å?¯é??å®?æ?¹ç¿»è¯?"
 
-#: src/appendix/bibliography.xml:250(abbrev)
+#: src/appendix/bibliography.xml:269(abbrev)
 msgid "FINK"
 msgstr "FINK"
 
-#: src/appendix/bibliography.xml:251(title)
+#: src/appendix/bibliography.xml:270(title)
 msgid "Fink Package Manager for OS X"
 msgstr ""
 
-#: src/appendix/bibliography.xml:253(ulink)
+#: src/appendix/bibliography.xml:272(ulink)
 msgid "http://fink.sf.net";
 msgstr "http://fink.sf.net";
 
-#: src/appendix/bibliography.xml:257(abbrev)
+#: src/appendix/bibliography.xml:276(abbrev)
 msgid "FREETYPE"
 msgstr "FREETYPE"
 
-#: src/appendix/bibliography.xml:258(title)
+#: src/appendix/bibliography.xml:277(title)
 msgid "Freetype 2 home page"
 msgstr "Freetype 2 �页"
 
-#: src/appendix/bibliography.xml:260(ulink)
+#: src/appendix/bibliography.xml:279(ulink)
 msgid "http://www.freetype.org/freetype2/index.html";
 msgstr "http://www.freetype.org/freetype2/index.html";
 
-#: src/appendix/bibliography.xml:266(abbrev)
+#: src/appendix/bibliography.xml:285(abbrev)
 msgid "GEGL"
 msgstr "GEGL"
 
-#: src/appendix/bibliography.xml:267(title)
+#: src/appendix/bibliography.xml:286(title)
 msgid "GEGL (Generic Graphics Library)"
 msgstr "GEGL (���形���)"
 
-#: src/appendix/bibliography.xml:269(ulink)
+#: src/appendix/bibliography.xml:288(ulink)
 msgid "http://gegl.org";
 msgstr "http://gegl.org";
 
-#: src/appendix/bibliography.xml:273(abbrev)
+#: src/appendix/bibliography.xml:292(abbrev)
 msgid "GEORGIEV01"
 msgstr "GEORGIEV01"
 
-#: src/appendix/bibliography.xml:274(title)
+#: src/appendix/bibliography.xml:293(title)
 msgid "Image Reconstruction Invariant to Relighting"
 msgstr ""
 
-#: src/appendix/bibliography.xml:276(firstname)
+#: src/appendix/bibliography.xml:295(firstname)
 msgid "Todor"
 msgstr "Todor"
 
-#: src/appendix/bibliography.xml:277(surname)
+#: src/appendix/bibliography.xml:296(surname)
 msgid "Georgiev"
 msgstr "Georgiev"
 
-#: src/appendix/bibliography.xml:280(year)
+#: src/appendix/bibliography.xml:299(year)
 msgid "2005"
 msgstr "2005"
 
-#: src/appendix/bibliography.xml:281(holder)
+#: src/appendix/bibliography.xml:300(holder)
 msgid "Todor Georgiev"
 msgstr "Todor Georgiev"
 
-#: src/appendix/bibliography.xml:284(ulink)
+#: src/appendix/bibliography.xml:303(ulink)
 msgid "http://www.tgeorgiev.net/Invariant.pdf";
 msgstr "http://www.tgeorgiev.net/Invariant.pdf";
 
-#: src/appendix/bibliography.xml:290(abbrev)
+#: src/appendix/bibliography.xml:309(abbrev)
 msgid "GHOSTSCRIPT"
 msgstr "GHOSTSCRIPT"
 
-#: src/appendix/bibliography.xml:291(title)
+#: src/appendix/bibliography.xml:310(title)
 msgid "Ghostscript project page on Sourceforge.net"
 msgstr "Sourceforge.net ä¸?ç?? Ghostscript 项ç?®é¡µé?¢"
 
-#: src/appendix/bibliography.xml:293(ulink)
+#: src/appendix/bibliography.xml:312(ulink)
 msgid "http://sourceforge.net/projects/ghostscript";
 msgstr "http://sourceforge.net/projects/ghostscript";
 
-#: src/appendix/bibliography.xml:300(title)
+#: src/appendix/bibliography.xml:319(title)
 msgid "GIMP - The Gnu Image Manipulation Program"
 msgstr "GIMP - GNU å?¾å??å¤?ç??ç¨?åº?"
 
-#: src/appendix/bibliography.xml:302(ulink)
+#: src/appendix/bibliography.xml:321(ulink)
 msgid "http://gimp.org";
 msgstr "http://gimp.org";
 
-#: src/appendix/bibliography.xml:306(abbrev)
+#: src/appendix/bibliography.xml:325(abbrev)
 msgid "GIMP-DEV"
 msgstr "GIMP-DEV"
 
-#: src/appendix/bibliography.xml:307(title)
+#: src/appendix/bibliography.xml:326(title)
 msgid "GIMP Development"
 msgstr "GIMP å¼?å??"
 
-#: src/appendix/bibliography.xml:309(ulink)
+#: src/appendix/bibliography.xml:328(ulink)
 msgid "http://developer.gimp.org";
 msgstr "http://developer.gimp.org";
 
-#: src/appendix/bibliography.xml:315(abbrev)
+#: src/appendix/bibliography.xml:334(abbrev)
 msgid "GIMP-DEV-PLUGIN"
 msgstr "GIMP-DEV-PLUGIN"
 
-#: src/appendix/bibliography.xml:316(title)
+#: src/appendix/bibliography.xml:335(title)
 msgid "GIMP Plugin Development"
 msgstr "GIMP æ??件å¼?å??"
 
-#: src/appendix/bibliography.xml:318(ulink)
+#: src/appendix/bibliography.xml:337(ulink)
 msgid "http://developer.gimp.org/plug-ins.html";
 msgstr "http://developer.gimp.org/plug-ins.html";
 
-#: src/appendix/bibliography.xml:324(abbrev)
+#: src/appendix/bibliography.xml:343(abbrev)
 msgid "GIMP-DOCS"
 msgstr "GIMP-DOCS"
 
-#: src/appendix/bibliography.xml:325(title)
+#: src/appendix/bibliography.xml:344(title)
 msgid "GIMP Documentation project page"
 msgstr "GIMP æ??档项ç?®é¡µé?¢"
 
-#: src/appendix/bibliography.xml:327(ulink)
-msgid "http://docs.gimp.org/en";
+#: src/appendix/bibliography.xml:346(ulink)
+#, fuzzy
+msgid "http://docs.gimp.org";
 msgstr "http://docs.gimp.org/zh_CN";
 
-#: src/appendix/bibliography.xml:333(abbrev)
+#: src/appendix/bibliography.xml:352(abbrev)
 msgid "GIMP-FONTS"
 msgstr "GIMP-FONTS"
 
-#: src/appendix/bibliography.xml:334(title)
+#: src/appendix/bibliography.xml:353(title)
 msgid "Fonts in GIMP 2.0"
 msgstr "GIMP 2.0 中ç??å­?ä½?"
 
-#: src/appendix/bibliography.xml:336(ulink)
+#: src/appendix/bibliography.xml:355(ulink)
 msgid "http://gimp.org/unix/fonts.html";
 msgstr "http://gimp.org/unix/fonts.html";
 
-#: src/appendix/bibliography.xml:342(abbrev)
+#: src/appendix/bibliography.xml:361(abbrev)
 msgid "GIMP-NEWSYM26"
 msgstr "GIMP-NEWSYM26"
 
-#: src/appendix/bibliography.xml:343(title)
+#: src/appendix/bibliography.xml:362(title)
 msgid "List of new symbols in GIMP 2.6"
 msgstr ""
 
-#: src/appendix/bibliography.xml:346(ulink)
+#: src/appendix/bibliography.xml:365(ulink)
 msgid "libgimp-index-new-in-2-6.html"
 msgstr ""
 
-#: src/appendix/bibliography.xml:352(abbrev)
+#: src/appendix/bibliography.xml:371(abbrev)
 msgid "GIMP-REGISTRY"
 msgstr "GIMP-REGISTRY"
 
-#: src/appendix/bibliography.xml:353(title)
+#: src/appendix/bibliography.xml:372(title)
 msgid "GIMP-Plugin Registry"
 msgstr ""
 
-#: src/appendix/bibliography.xml:355(ulink)
+#: src/appendix/bibliography.xml:374(ulink)
 msgid "http://registry.gimp.org";
 msgstr "http://registry.gimp.org";
 
-#: src/appendix/bibliography.xml:359(abbrev)
+#: src/appendix/bibliography.xml:378(abbrev)
 msgid "GIMP-WIKI-MS"
 msgstr "GIMP-WIKI-MS"
 
-#: src/appendix/bibliography.xml:360(title)
+#: src/appendix/bibliography.xml:379(title)
 msgid "GIMP-Wiki - How to compile for Windows"
 msgstr "GIMP-Wiki - ��为 Windows ��"
 
-#: src/appendix/bibliography.xml:362(ulink)
+#: src/appendix/bibliography.xml:381(ulink)
 msgid "http://wiki.gimp.org/gimp/HowToCompileGimp/MicrosoftWindows";
 msgstr "http://wiki.gimp.org/gimp/HowToCompileGimp/MicrosoftWindows";
 
-#: src/appendix/bibliography.xml:368(abbrev)
+#: src/appendix/bibliography.xml:387(abbrev)
 msgid "GROKKING01"
 msgstr "GROKKING01"
 
-#: src/appendix/bibliography.xml:369(title)
+#: src/appendix/bibliography.xml:388(title)
 msgid "Grokking the GIMP"
 msgstr ""
 
-#: src/appendix/bibliography.xml:371(ulink)
+#: src/appendix/bibliography.xml:390(ulink)
 msgid "http://gimp-savvy.com/BOOK/index.html";
 msgstr "http://gimp-savvy.com/BOOK/index.html";
 
-#: src/appendix/bibliography.xml:377(abbrev)
+#: src/appendix/bibliography.xml:396(abbrev)
 msgid "GROKKING02"
 msgstr "GROKKING02"
 
-#: src/appendix/bibliography.xml:378(title)
+#: src/appendix/bibliography.xml:397(title)
 msgid "Grokking the GIMP (9.2 Clickable Image Maps)"
 msgstr ""
 
-#: src/appendix/bibliography.xml:380(ulink)
+#: src/appendix/bibliography.xml:399(ulink)
 msgid "http://gimp-savvy.com/BOOK/index.html?node81.html";
 msgstr "http://gimp-savvy.com/BOOK/index.html?node81.html";
 
-#: src/appendix/bibliography.xml:386(abbrev)
+#: src/appendix/bibliography.xml:405(abbrev)
 msgid "GUNTHER04"
 msgstr ""
 
-#: src/appendix/bibliography.xml:387(title)
+#: src/appendix/bibliography.xml:406(title)
 msgid "Making shapes in GIMP"
 msgstr ""
 
-#: src/appendix/bibliography.xml:389(firstname)
+#: src/appendix/bibliography.xml:408(firstname)
 msgid "Gunther"
 msgstr ""
 
-#: src/appendix/bibliography.xml:390(surname)
+#: src/appendix/bibliography.xml:409(surname)
 msgid "Dale"
 msgstr ""
 
-#: src/appendix/bibliography.xml:394(holder)
+#: src/appendix/bibliography.xml:413(holder)
 msgid "Dale (Gunther)"
 msgstr ""
 
-#: src/appendix/bibliography.xml:397(ulink)
+#: src/appendix/bibliography.xml:416(ulink)
 msgid "http://gug.sunsite.dk/tutorials/gunther1";
 msgstr "http://gug.sunsite.dk/tutorials/gunther1";
 
-#: src/appendix/bibliography.xml:403(abbrev)
+#: src/appendix/bibliography.xml:422(abbrev)
 msgid "ICC"
 msgstr "ICC"
 
-#: src/appendix/bibliography.xml:404(title)
+#: src/appendix/bibliography.xml:423(title)
 msgid "INTERNATIONAL COLOR CONSORTIUM"
 msgstr ""
 
-#: src/appendix/bibliography.xml:406(ulink)
+#: src/appendix/bibliography.xml:425(ulink)
 msgid "http://www.color.org/";
 msgstr "http://www.color.org/";
 
-#: src/appendix/bibliography.xml:410(abbrev)
+#: src/appendix/bibliography.xml:429(abbrev)
 msgid "ICCsRGB"
 msgstr ""
 
-#: src/appendix/bibliography.xml:411(title)
+#: src/appendix/bibliography.xml:430(title)
 msgid "ICC sRGB PROFILES"
 msgstr ""
 
-#: src/appendix/bibliography.xml:413(ulink)
+#: src/appendix/bibliography.xml:432(ulink)
 msgid "http://www.color.org/srgbprofiles.html";
 msgstr "http://www.color.org/srgbprofiles.html";
 
-#: src/appendix/bibliography.xml:419(abbrev)
+#: src/appendix/bibliography.xml:438(abbrev)
+msgid "GPL"
+msgstr ""
+
+#: src/appendix/bibliography.xml:439(title)
+msgid "General Public License (GPL)"
+msgstr ""
+
+#: src/appendix/bibliography.xml:441(ulink)
+#, fuzzy
+msgid "http://www.fsf.org/licensing/licenses/gpl.html";
+msgstr "http://www.color.org/srgbprofiles.html";
+
+#: src/appendix/bibliography.xml:447(abbrev)
 msgid "GQVIEW"
 msgstr "GQVIEW"
 
-#: src/appendix/bibliography.xml:420(title)
+#: src/appendix/bibliography.xml:448(title)
 msgid "Homepage of GQview, an image browser"
 msgstr ""
 
-#: src/appendix/bibliography.xml:422(ulink)
+#: src/appendix/bibliography.xml:450(ulink)
 msgid "http://gqview.sourceforge.net";
 msgstr "http://gqview.sourceforge.net";
 
-#: src/appendix/bibliography.xml:428(abbrev)
+#: src/appendix/bibliography.xml:456(abbrev)
 msgid "GTHUMB"
 msgstr "GTHUMB"
 
-#: src/appendix/bibliography.xml:429(title)
+#: src/appendix/bibliography.xml:457(title)
 msgid "gThumb - An Image Viewer and Browser for the GNOME Desktop"
 msgstr ""
 
-#: src/appendix/bibliography.xml:433(ulink)
+#: src/appendix/bibliography.xml:461(ulink)
 msgid "http://gthumb.sourceforge.net";
 msgstr "http://gthumb.sourceforge.net";
 
-#: src/appendix/bibliography.xml:439(abbrev)
+#: src/appendix/bibliography.xml:467(abbrev)
 msgid "INKSCAPE"
 msgstr "INKSCAPE"
 
-#: src/appendix/bibliography.xml:440(title)
+#: src/appendix/bibliography.xml:468(title)
 msgid "Inkscape is an Open Source vector graphics editor"
 msgstr ""
 
-#: src/appendix/bibliography.xml:442(ulink)
+#: src/appendix/bibliography.xml:470(ulink)
 msgid "http://www.inkscape.org";
 msgstr "http://www.inkscape.org";
 
-#: src/appendix/bibliography.xml:446(abbrev)
+#: src/appendix/bibliography.xml:474(abbrev)
 msgid "JIMMAC01"
 msgstr ""
 
-#: src/appendix/bibliography.xml:447(title)
+#: src/appendix/bibliography.xml:475(title)
 msgid "Alternative icon theme for GIMP 2.4"
 msgstr ""
 
-#: src/appendix/bibliography.xml:449(ulink)
+#: src/appendix/bibliography.xml:477(ulink)
 msgid "http://jimmac.musichall.cz/zip/GIMP-Greyscale-tools-0.1.tar.bz2";
 msgstr "http://jimmac.musichall.cz/zip/GIMP-Greyscale-tools-0.1.tar.bz2";
 
-#: src/appendix/bibliography.xml:455(abbrev)
+#: src/appendix/bibliography.xml:483(abbrev)
 msgid "LPROF"
 msgstr ""
 
-#: src/appendix/bibliography.xml:456(title)
+#: src/appendix/bibliography.xml:484(title)
 msgid "LPROF ICC Profiler"
 msgstr ""
 
-#: src/appendix/bibliography.xml:458(ulink)
+#: src/appendix/bibliography.xml:486(ulink)
 msgid "http://lprof.sourceforge.net/";
 msgstr "http://lprof.sourceforge.net/";
 
-#: src/appendix/bibliography.xml:464(abbrev)
+#: src/appendix/bibliography.xml:492(abbrev)
 msgid "MSKB-294714"
 msgstr "MSKB-294714"
 
-#: src/appendix/bibliography.xml:465(title)
+#: src/appendix/bibliography.xml:493(title)
 msgid "Microsoft Knowledge Base Article 294714"
 msgstr ""
 
-#: src/appendix/bibliography.xml:467(ulink)
+#: src/appendix/bibliography.xml:495(ulink)
 msgid "http://support.microsoft.com/kb/294714";
 msgstr "http://support.microsoft.com/kb/294714";
 
-#: src/appendix/bibliography.xml:473(abbrev)
+#: src/appendix/bibliography.xml:501(abbrev)
 msgid "MsRGB"
 msgstr "MsRGB"
 
-#: src/appendix/bibliography.xml:474(title)
+#: src/appendix/bibliography.xml:502(title)
 msgid "Microsoft sRVB Workspace"
 msgstr ""
 
-#: src/appendix/bibliography.xml:476(ulink)
+#: src/appendix/bibliography.xml:504(ulink)
 msgid "http://www.microsoft.com/whdc/device/display/color/default.mspx";
 msgstr "http://www.microsoft.com/whdc/device/display/color/default.mspx";
 
-#: src/appendix/bibliography.xml:482(abbrev)
+#: src/appendix/bibliography.xml:510(abbrev)
 msgid "OPENCLIPART-GRADIENT"
 msgstr ""
 
-#: src/appendix/bibliography.xml:483(title)
+#: src/appendix/bibliography.xml:511(title)
 msgid "Open Clipart - Gradients"
 msgstr ""
 
-#: src/appendix/bibliography.xml:485(ulink)
+#: src/appendix/bibliography.xml:513(ulink)
 msgid "http://openclipart.org/";
 msgstr "http://openclipart.org/";
 
-#: src/appendix/bibliography.xml:489(abbrev)
+#: src/appendix/bibliography.xml:517(abbrev)
 msgid "OPENICC"
 msgstr "OPENICC"
 
-#: src/appendix/bibliography.xml:490(title)
+#: src/appendix/bibliography.xml:518(title)
 msgid "The OpenICC project"
 msgstr ""
 
-#: src/appendix/bibliography.xml:492(ulink)
+#: src/appendix/bibliography.xml:520(ulink)
 msgid "http://freedesktop.org/wiki/OpenIcc";
 msgstr "http://freedesktop.org/wiki/OpenIcc";
 
-#: src/appendix/bibliography.xml:498(abbrev)
+#: src/appendix/bibliography.xml:526(abbrev)
 msgid "PLUGIN-EXIF"
 msgstr "PLUGIN-EXIF"
 
-#: src/appendix/bibliography.xml:499(title)
+#: src/appendix/bibliography.xml:527(title)
 msgid "GIMP-Plugin Exif Browser"
 msgstr ""
 
-#: src/appendix/bibliography.xml:501(ulink)
+#: src/appendix/bibliography.xml:529(ulink)
 msgid "http://registry.gimp.org/plugin?id=4153";
 msgstr "http://registry.gimp.org/plugin?id=4153";
 
-#: src/appendix/bibliography.xml:507(abbrev)
+#: src/appendix/bibliography.xml:535(abbrev)
 msgid "PLUGIN-FLAMES"
 msgstr "PLUGIN-FLAMES"
 
-#: src/appendix/bibliography.xml:508(title)
+#: src/appendix/bibliography.xml:536(title)
 msgid "GIMP-Plugin Flames"
 msgstr ""
 
-#: src/appendix/bibliography.xml:509(releaseinfo)
+#: src/appendix/bibliography.xml:537(releaseinfo)
 msgid ""
 "<ulink url=\"http://draves.org/gimp/flame.html\";> http://draves.org/gimp/";
 "flame.html </ulink>; <ulink url=\"http://flam3.com/\";>http://flam3.com/</"
@@ -2974,593 +3268,637 @@ msgstr ""
 "flame.html </ulink>; <ulink url=\"http://flam3.com/\";>http://flam3.com/</"
 "ulink>"
 
-#: src/appendix/bibliography.xml:515(abbrev)
+#: src/appendix/bibliography.xml:543(abbrev)
 msgid "PLUGIN-PLASMA2"
 msgstr ""
 
-#: src/appendix/bibliography.xml:516(title)
+#: src/appendix/bibliography.xml:544(title)
 msgid "GIMP-Plugin Plasma2 at the Registry"
 msgstr ""
 
-#: src/appendix/bibliography.xml:518(ulink)
+#: src/appendix/bibliography.xml:546(ulink)
 msgid "http://registry.gimp.org/plugin?id=501";
 msgstr "http://registry.gimp.org/plugin?id=501";
 
-#: src/appendix/bibliography.xml:524(abbrev)
+#: src/appendix/bibliography.xml:552(abbrev)
 msgid "PLUGIN-REDEYE"
 msgstr ""
 
-#: src/appendix/bibliography.xml:525(title)
+#: src/appendix/bibliography.xml:553(title)
 msgid "A plugin to quickly remove <quote>redeye</quote> caused by camera flash"
 msgstr ""
 
-#: src/appendix/bibliography.xml:530(ulink)
+#: src/appendix/bibliography.xml:558(ulink)
 msgid "http://registry.gimp.org/plugin?id=4212";
 msgstr "http://registry.gimp.org/plugin?id=4212";
 
-#: src/appendix/bibliography.xml:536(abbrev)
+#: src/appendix/bibliography.xml:564(abbrev)
 msgid "PLUGIN-RESYNTH"
 msgstr ""
 
-#: src/appendix/bibliography.xml:537(title)
+#: src/appendix/bibliography.xml:565(title)
 msgid "Resynthesizer is a Gimp plug-in for texture synthesis"
 msgstr ""
 
-#: src/appendix/bibliography.xml:539(ulink)
+#: src/appendix/bibliography.xml:567(ulink)
 msgid "http://www.logarithmic.net/pfh/resynthesizer";
 msgstr "http://www.logarithmic.net/pfh/resynthesizer";
 
-#: src/appendix/bibliography.xml:545(abbrev)
+#: src/appendix/bibliography.xml:573(abbrev)
 msgid "PLUGIN-RETINEX"
 msgstr ""
 
-#: src/appendix/bibliography.xml:546(title)
+#: src/appendix/bibliography.xml:574(title)
 msgid "A plugin providing the Retinex algorithm for GIMP"
 msgstr ""
 
-#: src/appendix/bibliography.xml:548(ulink)
+#: src/appendix/bibliography.xml:576(ulink)
 msgid "www-prima.inrialpes.fr/pelisson/MSRCR.php"
 msgstr "www-prima.inrialpes.fr/pelisson/MSRCR.php"
 
-#: src/appendix/bibliography.xml:554(abbrev)
+#: src/appendix/bibliography.xml:582(abbrev)
 msgid "PLUGIN-SEPARATE"
 msgstr ""
 
-#: src/appendix/bibliography.xml:555(title)
+#: src/appendix/bibliography.xml:583(title)
 msgid "A plugin providing rudimentary CMYK support for GIMP"
 msgstr ""
 
-#: src/appendix/bibliography.xml:557(ulink)
+#: src/appendix/bibliography.xml:585(ulink)
 msgid "http://www.blackfiveservices.co.uk/separate.shtml";
 msgstr "http://www.blackfiveservices.co.uk/separate.shtml";
 
-#: src/appendix/bibliography.xml:563(abbrev)
+#: src/appendix/bibliography.xml:591(abbrev)
 msgid "SCRIBUS"
 msgstr "SCRIBUS"
 
-#: src/appendix/bibliography.xml:564(title)
+#: src/appendix/bibliography.xml:592(title)
 msgid "Scribus :: Open Source Desktop Publishing"
 msgstr ""
 
-#: src/appendix/bibliography.xml:566(ulink)
+#: src/appendix/bibliography.xml:594(ulink)
 msgid "http://www.scribus.net/";
 msgstr "http://www.scribus.net/";
 
-#: src/appendix/bibliography.xml:570(abbrev)
+#: src/appendix/bibliography.xml:598(abbrev)
 msgid "SIOX"
 msgstr ""
 
-#: src/appendix/bibliography.xml:571(title)
+#: src/appendix/bibliography.xml:599(title)
 msgid "Simple Interactive Object Extraction"
 msgstr ""
 
-#: src/appendix/bibliography.xml:573(ulink)
+#: src/appendix/bibliography.xml:601(ulink)
 msgid "http://www.siox.org/";
 msgstr "http://www.siox.org/";
 
-#: src/appendix/bibliography.xml:577(abbrev)
+#: src/appendix/bibliography.xml:605(abbrev)
 msgid "TUT01"
 msgstr "TUT01"
 
-#: src/appendix/bibliography.xml:578(title)
+#: src/appendix/bibliography.xml:606(title)
 msgid "Tutorial: How to draw straight lines"
 msgstr ""
 
-#: src/appendix/bibliography.xml:580(firstname)
+#: src/appendix/bibliography.xml:608(firstname)
 msgid "Seth"
 msgstr "Seth"
 
-#: src/appendix/bibliography.xml:581(surname)
+#: src/appendix/bibliography.xml:609(surname)
 msgid "Burgess"
 msgstr "Burgess"
 
-#: src/appendix/bibliography.xml:584(year)
+#: src/appendix/bibliography.xml:612(year)
 msgid "2002"
 msgstr "2002"
 
-#: src/appendix/bibliography.xml:585(holder)
+#: src/appendix/bibliography.xml:613(holder)
 msgid "Seth Burgess"
 msgstr "Seth Burgess"
 
-#: src/appendix/bibliography.xml:588(ulink)
+#: src/appendix/bibliography.xml:616(ulink)
 msgid "http://www.gimp.org/tutorials/Straight_Line";
 msgstr "http://www.gimp.org/tutorials/Straight_Line";
 
-#: src/appendix/bibliography.xml:594(abbrev)
+#: src/appendix/bibliography.xml:622(abbrev)
 msgid "TUT02"
 msgstr "TUT02"
 
-#: src/appendix/bibliography.xml:595(title)
+#: src/appendix/bibliography.xml:623(title)
 msgid "Tutorial: GIMPLite Quickies"
 msgstr ""
 
-#: src/appendix/bibliography.xml:597(firstname)
+#: src/appendix/bibliography.xml:625(firstname)
 msgid "Carol"
 msgstr "Carol"
 
-#: src/appendix/bibliography.xml:598(surname)
+#: src/appendix/bibliography.xml:626(surname)
 msgid "Spears"
 msgstr "Spears"
 
-#: src/appendix/bibliography.xml:599(email)
+#: src/appendix/bibliography.xml:627(email)
 msgid "carolNOSPAM gimp org"
 msgstr "carolNOSPAM gimp org"
 
-#: src/appendix/bibliography.xml:603(holder)
+#: src/appendix/bibliography.xml:631(holder)
 msgid "Carol Spears"
 msgstr "Carol Spears"
 
-#: src/appendix/bibliography.xml:606(ulink)
+#: src/appendix/bibliography.xml:634(ulink)
 msgid "http://next.gimp.org/tutorials/Lite_Quickies/";
 msgstr "http://next.gimp.org/tutorials/Lite_Quickies/";
 
-#: src/appendix/bibliography.xml:612(abbrev)
+#: src/appendix/bibliography.xml:640(abbrev)
 msgid "UNICODE"
 msgstr "UNICODE"
 
-#: src/appendix/bibliography.xml:613(title)
+#: src/appendix/bibliography.xml:641(title)
 msgid "Unicode"
 msgstr "Unicode"
 
-#: src/appendix/bibliography.xml:615(ulink)
+#: src/appendix/bibliography.xml:643(ulink)
 msgid "http://www.unicode.org";
 msgstr "http://www.unicode.org";
 
-#: src/appendix/bibliography.xml:619(abbrev)
+#: src/appendix/bibliography.xml:647(abbrev)
 msgid "WIKIPEDIA"
 msgstr "WIKIPEDIA"
 
-#: src/appendix/bibliography.xml:620(title)
+#: src/appendix/bibliography.xml:648(title)
 msgid "Wikipedia"
 msgstr "维���"
 
-#: src/appendix/bibliography.xml:622(othername)
+#: src/appendix/bibliography.xml:650(othername)
 msgid "Wikipedia Foundation"
 msgstr "ç»´å?ºç?¾ç§?å?ºé??ä¼?"
 
-#: src/appendix/bibliography.xml:626(holder)
+#: src/appendix/bibliography.xml:654(holder)
 msgid "Wikipedia Foundation Inc."
 msgstr "ç»´å?ºç?¾ç§?å?ºé??ä¼?"
 
-#: src/appendix/bibliography.xml:629(ulink)
+#: src/appendix/bibliography.xml:657(ulink)
 msgid "http://www.wikipedia.org";
 msgstr "http://www.wikipedia.org";
 
-#: src/appendix/bibliography.xml:633(abbrev)
+#: src/appendix/bibliography.xml:661(abbrev)
 msgid "WKPD-ALPHA"
 msgstr "WKPD-ALPHA"
 
-#: src/appendix/bibliography.xml:634(title)
+#: src/appendix/bibliography.xml:662(title)
 msgid "Wikipedia - Alpha channel"
 msgstr "维���(en) - Alpha channel"
 
-#: src/appendix/bibliography.xml:636(ulink)
+#: src/appendix/bibliography.xml:664(ulink)
 msgid "http://en.wikipedia.org/wiki/Alpha_channel";
 msgstr "http://en.wikipedia.org/wiki/Alpha_channel";
 
-#: src/appendix/bibliography.xml:642(abbrev)
+#: src/appendix/bibliography.xml:670(abbrev)
+msgid "WKPD-B&Eacute;ZIER"
+msgstr ""
+
+#: src/appendix/bibliography.xml:671(title)
+#, fuzzy
+msgid "Wikipedia - B&eacute;zier curve"
+msgstr "维���(en) - Gamut"
+
+#: src/appendix/bibliography.xml:673(ulink)
+#, fuzzy
+msgid "http://en.wikipedia.org/wiki/Bezier_curve";
+msgstr "http://en.wikipedia.org/wiki/Moire";
+
+#: src/appendix/bibliography.xml:679(abbrev)
 msgid "WKPD-BUMP"
 msgstr "WKPD-BUMP"
 
-#: src/appendix/bibliography.xml:643(title)
+#: src/appendix/bibliography.xml:680(title)
 msgid "Wikipedia - Bumpmap"
 msgstr "维���(en) - Bumpmap"
 
-#: src/appendix/bibliography.xml:645(ulink)
+#: src/appendix/bibliography.xml:682(ulink)
 msgid "http://en.wikipedia.org/wiki/Bump_Mapping";
 msgstr "http://en.wikipedia.org/wiki/Bump_Mapping";
 
-#: src/appendix/bibliography.xml:652(abbrev)
+#: src/appendix/bibliography.xml:689(abbrev)
 msgid "WKPD-BURN"
 msgstr "WKPD-BURN"
 
-#: src/appendix/bibliography.xml:653(title)
+#: src/appendix/bibliography.xml:690(title)
 msgid "Wikipedia - Burning"
 msgstr "维���(en) - Burning"
 
-#: src/appendix/bibliography.xml:655(ulink)
-#: src/appendix/bibliography.xml:700(ulink)
+#: src/appendix/bibliography.xml:692(ulink)
+#: src/appendix/bibliography.xml:755(ulink)
 msgid "http://en.wikipedia.org/wiki/Dodging_and_burning";
 msgstr "http://en.wikipedia.org/wiki/Dodging_and_burning";
 
-#: src/appendix/bibliography.xml:661(abbrev)
+#: src/appendix/bibliography.xml:698(abbrev)
 msgid "WKPD-CA"
 msgstr "WKPD-CA"
 
-#: src/appendix/bibliography.xml:662(title)
+#: src/appendix/bibliography.xml:699(title)
 msgid "Wikipedia - Cellular Automata"
 msgstr "维���(en) - Cellular Automata"
 
-#: src/appendix/bibliography.xml:664(ulink)
+#: src/appendix/bibliography.xml:701(ulink)
 msgid "http://en.wikipedia.org/wiki/Cellular_Automata";
 msgstr "http://en.wikipedia.org/wiki/Cellular_Automata";
 
-#: src/appendix/bibliography.xml:670(abbrev)
+#: src/appendix/bibliography.xml:707(abbrev)
 msgid "WKPD-CMYK"
 msgstr "WKPD-CMYK"
 
-#: src/appendix/bibliography.xml:671(title)
+#: src/appendix/bibliography.xml:708(title)
 msgid "Wikipedia - CMYK"
 msgstr "维���(en) - CMYK"
 
-#: src/appendix/bibliography.xml:673(ulink)
+#: src/appendix/bibliography.xml:710(ulink)
 msgid "http://en.wikipedia.org/wiki/CMYK";
 msgstr "http://en.wikipedia.org/wiki/CMYK";
 
-#: src/appendix/bibliography.xml:679(abbrev)
+#: src/appendix/bibliography.xml:716(abbrev)
 msgid "WKPD-COLORSPACE"
 msgstr "WKPD-COLORSPACE"
 
-#: src/appendix/bibliography.xml:680(title)
+#: src/appendix/bibliography.xml:717(title)
 msgid "Wikipedia - Colorspace"
 msgstr "维���(en) - Colorspace"
 
-#: src/appendix/bibliography.xml:682(ulink)
+#: src/appendix/bibliography.xml:719(ulink)
 msgid "http://en.wikipedia.org/wiki/Colorspace";
 msgstr "http://en.wikipedia.org/wiki/Colorspace";
 
-#: src/appendix/bibliography.xml:688(abbrev)
+#: src/appendix/bibliography.xml:725(abbrev)
+#, fuzzy
+msgid "WKPD-DEFLATE"
+msgstr "WKPD-LAB"
+
+#: src/appendix/bibliography.xml:726(title)
+#, fuzzy
+msgid "Wikipedia - Deflate"
+msgstr "维���(en) - Fileformat"
+
+#: src/appendix/bibliography.xml:728(ulink)
+#, fuzzy
+msgid "http://en.wikipedia.org/wiki/deflate";
+msgstr "http://en.wikipedia.org/wiki/Gamut";
+
+#: src/appendix/bibliography.xml:734(abbrev)
+#, fuzzy
+msgid "WKPD-DEINTERLACE"
+msgstr "WKPD-INTERPOL"
+
+#: src/appendix/bibliography.xml:735(title)
+#, fuzzy
+msgid "Wikipedia - Deinterlace"
+msgstr "维���(en) - Retina"
+
+#: src/appendix/bibliography.xml:737(ulink)
+#, fuzzy
+msgid "http://en.wikipedia.org/wiki/Deinterlace";
+msgstr "http://en.wikipedia.org/wiki/Retina";
+
+#: src/appendix/bibliography.xml:743(abbrev)
 msgid "WKPD-DITHERING"
 msgstr "WKPD-DITHERING"
 
-#: src/appendix/bibliography.xml:689(title)
+#: src/appendix/bibliography.xml:744(title)
 msgid "Wikipedia - Dithering"
 msgstr "维���(en) - Dithering"
 
-#: src/appendix/bibliography.xml:691(ulink)
+#: src/appendix/bibliography.xml:746(ulink)
 msgid "http://en.wikipedia.org/wiki/Dithering";
 msgstr "http://en.wikipedia.org/wiki/Dithering";
 
-#: src/appendix/bibliography.xml:697(abbrev)
+#: src/appendix/bibliography.xml:752(abbrev)
 msgid "WKPD-DODGE"
 msgstr "WKPD-DODGE"
 
-#: src/appendix/bibliography.xml:698(title)
+#: src/appendix/bibliography.xml:753(title)
 msgid "Wikipedia - Dodging"
 msgstr "维���(en) - Dodging"
 
-#: src/appendix/bibliography.xml:706(abbrev)
+#: src/appendix/bibliography.xml:761(abbrev)
 msgid "WKPD-EXIF"
 msgstr "WKPD-EXIF"
 
-#: src/appendix/bibliography.xml:707(title)
+#: src/appendix/bibliography.xml:762(title)
 msgid "Wikipedia - EXIF"
 msgstr "维���(en) - EXIF"
 
-#: src/appendix/bibliography.xml:709(ulink)
+#: src/appendix/bibliography.xml:764(ulink)
 msgid "http://en.wikipedia.org/wiki/EXIF";
 msgstr "http://en.wikipedia.org/wiki/EXIF";
 
-#: src/appendix/bibliography.xml:715(abbrev)
+#: src/appendix/bibliography.xml:770(abbrev)
 msgid "WKPD-FILEFORMAT"
 msgstr "WKPD-FILEFORMAT"
 
-#: src/appendix/bibliography.xml:716(title)
+#: src/appendix/bibliography.xml:771(title)
 msgid "Wikipedia - Fileformat"
 msgstr "维���(en) - Fileformat"
 
-#: src/appendix/bibliography.xml:718(ulink)
+#: src/appendix/bibliography.xml:773(ulink)
 msgid "http://en.wikipedia.org/wiki/Image_file_format";
 msgstr "http://en.wikipedia.org/wiki/Image_file_format";
 
-#: src/appendix/bibliography.xml:724(abbrev)
+#: src/appendix/bibliography.xml:779(abbrev)
 msgid "WKPD-GAMUT"
 msgstr "WKPD-GAMUT"
 
-#: src/appendix/bibliography.xml:725(title)
+#: src/appendix/bibliography.xml:780(title)
 msgid "Wikipedia - Gamut"
 msgstr "维���(en) - Gamut"
 
-#: src/appendix/bibliography.xml:727(ulink)
+#: src/appendix/bibliography.xml:782(ulink)
 msgid "http://en.wikipedia.org/wiki/Gamut";
 msgstr "http://en.wikipedia.org/wiki/Gamut";
 
-#: src/appendix/bibliography.xml:733(abbrev)
+#: src/appendix/bibliography.xml:788(abbrev)
 msgid "WKPD-GIF"
 msgstr "WKPD-GIF"
 
-#: src/appendix/bibliography.xml:734(title)
+#: src/appendix/bibliography.xml:789(title)
 msgid "Wikipedia - GIF"
 msgstr "维���(en) - GIF"
 
-#: src/appendix/bibliography.xml:736(ulink)
+#: src/appendix/bibliography.xml:791(ulink)
 msgid "http://en.wikipedia.org/wiki/GIF";
 msgstr "http://en.wikipedia.org/wiki/GIF";
 
-#: src/appendix/bibliography.xml:742(abbrev)
+#: src/appendix/bibliography.xml:797(abbrev)
 msgid "WKPD-GNU"
 msgstr "WKPD-GNU"
 
-#: src/appendix/bibliography.xml:743(title)
+#: src/appendix/bibliography.xml:798(title)
 msgid "Wikipedia - GNU"
 msgstr "维���(en) - GNU"
 
-#: src/appendix/bibliography.xml:745(ulink)
+#: src/appendix/bibliography.xml:800(ulink)
 msgid "http://en.wikipedia.org/wiki/GNU";
 msgstr "http://en.wikipedia.org/wiki/GNU";
 
-#: src/appendix/bibliography.xml:751(abbrev)
+#: src/appendix/bibliography.xml:806(abbrev)
 msgid "WKPD-HISTOGRAM"
 msgstr "WKPD-HISTOGRAM"
 
-#: src/appendix/bibliography.xml:752(title)
+#: src/appendix/bibliography.xml:807(title)
 msgid "Wikipedia - Histogram"
 msgstr "维���(en) - Histogram"
 
-#: src/appendix/bibliography.xml:754(ulink)
+#: src/appendix/bibliography.xml:809(ulink)
 msgid "http://en.wikipedia.org/wiki/Image_histogram";
 msgstr "http://en.wikipedia.org/wiki/Image_histogram";
 
-#: src/appendix/bibliography.xml:760(abbrev)
+#: src/appendix/bibliography.xml:815(abbrev)
 msgid "WKPD-HSV"
 msgstr "WKPD-HSV"
 
-#: src/appendix/bibliography.xml:761(title)
+#: src/appendix/bibliography.xml:816(title)
 msgid "Wikipedia - HSV"
 msgstr "维���(en) - HSV"
 
-#: src/appendix/bibliography.xml:763(ulink)
+#: src/appendix/bibliography.xml:818(ulink)
 msgid "http://en.wikipedia.org/wiki/HSL_and_HSV";
 msgstr "http://en.wikipedia.org/wiki/HSL_and_HSV";
 
-#: src/appendix/bibliography.xml:769(abbrev)
+#: src/appendix/bibliography.xml:824(abbrev)
 msgid "WKPD-ICC"
 msgstr "WKPD-ICC"
 
-#: src/appendix/bibliography.xml:770(title)
+#: src/appendix/bibliography.xml:825(title)
 msgid "Wikipedia - ICC Profile"
 msgstr "维���(en) - ICC Profile"
 
-#: src/appendix/bibliography.xml:772(ulink)
+#: src/appendix/bibliography.xml:827(ulink)
 msgid "http://en.wikipedia.org/wiki/ICC_Profile";
 msgstr "http://en.wikipedia.org/wiki/ICC_Profile";
 
-#: src/appendix/bibliography.xml:778(abbrev)
+#: src/appendix/bibliography.xml:833(abbrev)
 msgid "WKPD-INTERPOL"
 msgstr "WKPD-INTERPOL"
 
 #. Police?
-#: src/appendix/bibliography.xml:779(title)
+#: src/appendix/bibliography.xml:834(title)
 msgid "Wikipedia - Interpolation"
 msgstr "维���(en) - Interpolation"
 
-#: src/appendix/bibliography.xml:781(ulink)
+#: src/appendix/bibliography.xml:836(ulink)
 msgid "http://en.wikipedia.org/wiki/Interpolation";
 msgstr "http://en.wikipedia.org/wiki/Interpolation";
 
-#: src/appendix/bibliography.xml:787(abbrev)
+#: src/appendix/bibliography.xml:842(abbrev)
 msgid "WKPD-JPEG"
 msgstr "WKPD-JPEG"
 
-#: src/appendix/bibliography.xml:788(title)
+#: src/appendix/bibliography.xml:843(title)
 msgid "Wikipedia - JPEG"
 msgstr "维���(en) - JPEG"
 
-#: src/appendix/bibliography.xml:790(ulink)
+#: src/appendix/bibliography.xml:845(ulink)
 msgid "http://en.wikipedia.org/wiki/JPEG";
 msgstr "http://en.wikipedia.org/wiki/JPEG";
 
-#: src/appendix/bibliography.xml:796(abbrev)
+#: src/appendix/bibliography.xml:851(abbrev)
 msgid "WKPD-LAB"
 msgstr "WKPD-LAB"
 
-#: src/appendix/bibliography.xml:797(title)
+#: src/appendix/bibliography.xml:852(title)
 msgid "Wikipedia - L*a*b"
 msgstr "维���(en) - L*a*b"
 
-#: src/appendix/bibliography.xml:799(ulink)
+#: src/appendix/bibliography.xml:854(ulink)
 msgid "http://en.wikipedia.org/wiki/Lab_color_space";
 msgstr "http://en.wikipedia.org/wiki/Lab_color_space";
 
-#: src/appendix/bibliography.xml:805(abbrev)
+#: src/appendix/bibliography.xml:860(abbrev)
 msgid "WKPD-LZW"
 msgstr "WKPD-LZW"
 
-#: src/appendix/bibliography.xml:806(title)
+#: src/appendix/bibliography.xml:861(title)
 msgid "Wikipedia - LZW"
 msgstr "维���(en) - LZW"
 
-#: src/appendix/bibliography.xml:808(ulink)
+#: src/appendix/bibliography.xml:863(ulink)
 msgid "http://en.wikipedia.org/wiki/LZW";
 msgstr "http://en.wikipedia.org/wiki/LZW";
 
-#: src/appendix/bibliography.xml:814(abbrev)
+#: src/appendix/bibliography.xml:869(abbrev)
 msgid "WKPD-MOIRE"
 msgstr "WKPD-MOIRE"
 
-#: src/appendix/bibliography.xml:815(title)
+#: src/appendix/bibliography.xml:870(title)
 msgid "Wikipedia - Moire"
 msgstr "维���(en) - Moire"
 
-#: src/appendix/bibliography.xml:817(ulink)
+#: src/appendix/bibliography.xml:872(ulink)
 msgid "http://en.wikipedia.org/wiki/Moire";
 msgstr "http://en.wikipedia.org/wiki/Moire";
 
-#: src/appendix/bibliography.xml:823(abbrev)
+#: src/appendix/bibliography.xml:878(abbrev)
 msgid "WKPD-PACKBITS"
 msgstr "WKPD-PACKBITS"
 
-#: src/appendix/bibliography.xml:824(title)
+#: src/appendix/bibliography.xml:879(title)
 msgid "Wikipedia - PackBits"
 msgstr "维���(en) - PackBits"
 
-#: src/appendix/bibliography.xml:826(ulink)
+#: src/appendix/bibliography.xml:881(ulink)
 msgid "http://en.wikipedia.org/wiki/PackBits";
 msgstr "http://en.wikipedia.org/wiki/PackBits";
 
-#: src/appendix/bibliography.xml:832(abbrev)
+#: src/appendix/bibliography.xml:887(abbrev)
 msgid "WKPD-PNG"
 msgstr "WKPD-PNG"
 
-#: src/appendix/bibliography.xml:833(title)
+#: src/appendix/bibliography.xml:888(title)
 msgid "Wikipedia - PNG"
 msgstr "维���(en) - PNG"
 
-#: src/appendix/bibliography.xml:835(ulink)
+#: src/appendix/bibliography.xml:890(ulink)
 msgid "http://en.wikipedia.org/wiki/Portable_Network_Graphics";
 msgstr ""
 
-#: src/appendix/bibliography.xml:841(abbrev)
+#: src/appendix/bibliography.xml:896(abbrev)
 msgid "WKPD-RASTER"
 msgstr "WKPD-RASTER"
 
-#: src/appendix/bibliography.xml:842(title)
+#: src/appendix/bibliography.xml:897(title)
 msgid "Wikipedia - Raster Graphics"
 msgstr "维���(en) - Raster Graphics"
 
-#: src/appendix/bibliography.xml:844(ulink)
+#: src/appendix/bibliography.xml:899(ulink)
 msgid "http://en.wikipedia.org/wiki/Raster_graphics";
 msgstr ""
 
-#: src/appendix/bibliography.xml:850(abbrev)
+#: src/appendix/bibliography.xml:905(abbrev)
 msgid "WKPD-RI"
 msgstr "WKPD-RI"
 
-#: src/appendix/bibliography.xml:851(title)
+#: src/appendix/bibliography.xml:906(title)
 msgid "Wikipedia - Rendering Intent"
 msgstr "维���(en)- Rendering Intent"
 
-#: src/appendix/bibliography.xml:853(ulink)
+#: src/appendix/bibliography.xml:908(ulink)
 msgid "http://en.wikipedia.org/wiki/Rendering_intent";
 msgstr "http://en.wikipedia.org/wiki/Rendering_intent";
 
-#: src/appendix/bibliography.xml:859(abbrev)
+#: src/appendix/bibliography.xml:914(abbrev)
 msgid "WKPD-RETINA"
 msgstr "WKPD-RETINA"
 
-#: src/appendix/bibliography.xml:860(title)
+#: src/appendix/bibliography.xml:915(title)
 msgid "Wikipedia - Retina"
 msgstr "维���(en) - Retina"
 
-#: src/appendix/bibliography.xml:862(ulink)
+#: src/appendix/bibliography.xml:917(ulink)
 msgid "http://en.wikipedia.org/wiki/Retina";
 msgstr "http://en.wikipedia.org/wiki/Retina";
 
-#: src/appendix/bibliography.xml:868(abbrev)
+#: src/appendix/bibliography.xml:923(abbrev)
 msgid "WKPD-SEPIA"
 msgstr "WKPD-SEPIA"
 
-#: src/appendix/bibliography.xml:869(title)
+#: src/appendix/bibliography.xml:924(title)
 msgid "Wikipedia - Sepia"
 msgstr "维���(en) - Sepia"
 
-#: src/appendix/bibliography.xml:871(ulink)
+#: src/appendix/bibliography.xml:926(ulink)
 msgid "http://en.wikipedia.org/wiki/Sepia";
 msgstr "http://en.wikipedia.org/wiki/Sepia";
 
-#: src/appendix/bibliography.xml:877(abbrev)
+#: src/appendix/bibliography.xml:932(abbrev)
 msgid "WKPD-SVG"
 msgstr "WKPD-SVG"
 
-#: src/appendix/bibliography.xml:878(title)
+#: src/appendix/bibliography.xml:933(title)
 msgid "Wikipedia - SVG"
 msgstr "维���(en) - SVG"
 
-#: src/appendix/bibliography.xml:880(ulink)
+#: src/appendix/bibliography.xml:935(ulink)
 msgid "http://en.wikipedia.org/wiki/Scalable_Vector_Graphics";
 msgstr ""
 
-#: src/appendix/bibliography.xml:886(abbrev)
+#: src/appendix/bibliography.xml:941(abbrev)
 msgid "WKPD-URI"
 msgstr ""
 
-#: src/appendix/bibliography.xml:887(title)
+#: src/appendix/bibliography.xml:942(title)
 msgid "Wikipedia - URI"
 msgstr "维���(en) - URI"
 
-#: src/appendix/bibliography.xml:889(ulink)
+#: src/appendix/bibliography.xml:944(ulink)
 msgid "http://en.wikipedia.org/wiki/Uniform_Resource_Identifier";
 msgstr "http://en.wikipedia.org/wiki/Uniform_Resource_Identifier";
 
-#: src/appendix/bibliography.xml:895(abbrev)
+#: src/appendix/bibliography.xml:950(abbrev)
 msgid "WKPD-URL"
 msgstr "WKPD-URL"
 
-#: src/appendix/bibliography.xml:896(title)
+#: src/appendix/bibliography.xml:951(title)
 msgid "Wikipedia - URL"
 msgstr "维���(en) - URL"
 
-#: src/appendix/bibliography.xml:898(ulink)
+#: src/appendix/bibliography.xml:953(ulink)
 msgid "http://en.wikipedia.org/wiki/Uniform_Resource_Locator";
 msgstr "http://en.wikipedia.org/wiki/Uniform_Resource_Locator";
 
-#: src/appendix/bibliography.xml:904(abbrev)
+#: src/appendix/bibliography.xml:959(abbrev)
 msgid "WKPD-Web-colors"
 msgstr "WKPD-Web-colors"
 
-#: src/appendix/bibliography.xml:905(title)
+#: src/appendix/bibliography.xml:960(title)
 msgid "Wikipedia - Web-colors"
 msgstr "维���(en) - Web-colors"
 
-#: src/appendix/bibliography.xml:907(ulink)
+#: src/appendix/bibliography.xml:962(ulink)
 msgid "http://en.wikipedia.org/wiki/Web_colors";
 msgstr "http://en.wikipedia.org/wiki/Web_colors";
 
-#: src/appendix/bibliography.xml:913(abbrev)
+#: src/appendix/bibliography.xml:968(abbrev)
 msgid "WKPD-YCBCR"
 msgstr "WKPD-YCBCR"
 
-#: src/appendix/bibliography.xml:914(title)
+#: src/appendix/bibliography.xml:969(title)
 msgid "Wikipedia - YCbCr"
 msgstr "维���(en) - YCbCr"
 
-#: src/appendix/bibliography.xml:916(ulink)
+#: src/appendix/bibliography.xml:971(ulink)
 msgid "http://en.wikipedia.org/wiki/YCbCr";
 msgstr "http://en.wikipedia.org/wiki/YCbCr";
 
-#: src/appendix/bibliography.xml:922(abbrev)
+#: src/appendix/bibliography.xml:977(abbrev)
 msgid "WKPD-YUV"
 msgstr "WKPD-YUV"
 
-#: src/appendix/bibliography.xml:923(title)
+#: src/appendix/bibliography.xml:978(title)
 msgid "Wikipedia - YUV"
 msgstr "维���(en) - YUV"
 
-#: src/appendix/bibliography.xml:925(ulink)
+#: src/appendix/bibliography.xml:980(ulink)
 msgid "http://en.wikipedia.org/wiki/YUV";
 msgstr "http://en.wikipedia.org/wiki/YUV";
 
-#: src/appendix/bibliography.xml:931(abbrev)
+#: src/appendix/bibliography.xml:986(abbrev)
 msgid "XDS"
 msgstr "XDS"
 
-#: src/appendix/bibliography.xml:932(title)
+#: src/appendix/bibliography.xml:987(title)
 msgid "Direct Save Protocol (XDS)"
 msgstr ""
 
-#: src/appendix/bibliography.xml:934(ulink)
+#: src/appendix/bibliography.xml:989(ulink)
 msgid "http://freedesktop.org/wiki/Specifications/XDS";
 msgstr "http://freedesktop.org/wiki/Specifications/XDS";
 
-#: src/appendix/bibliography.xml:940(abbrev)
+#: src/appendix/bibliography.xml:995(abbrev)
 msgid "XNVIEW"
 msgstr "XNVIEW"
 
-#: src/appendix/bibliography.xml:941(title)
+#: src/appendix/bibliography.xml:996(title)
 msgid "XnView"
 msgstr "XnView"
 
-#: src/appendix/bibliography.xml:943(ulink)
+#: src/appendix/bibliography.xml:998(ulink)
 msgid "http://perso.orange.fr/pierre.g/xnview/enhome.html";
 msgstr "http://perso.orange.fr/pierre.g/xnview/enhome.html";
 
@@ -3568,3 +3906,12 @@ msgstr "http://perso.orange.fr/pierre.g/xnview/enhome.html";
 #: src/appendix/bibliography.xml:0(None)
 msgid "translator-credits"
 msgstr "Aron Xu <aronxu gnome org>"
+
+#~ msgid "Summary:"
+#~ msgstr "Summary:"
+
+#~ msgid "Set this to <quote>GIMP</quote>"
+#~ msgstr "�此�设置为 <quote>GIMP</quote>"
+
+#~ msgid "Priority"
+#~ msgstr "Priority"
diff --git a/po/zh_CN/concepts.po b/po/zh_CN/concepts.po
index 85b6941..ed6da11 100644
--- a/po/zh_CN/concepts.po
+++ b/po/zh_CN/concepts.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:33+0800\n"
 "Last-Translator: Aron Xu <aronxu gnome org>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
@@ -24,8 +24,8 @@ msgstr "æ?¤é??"
 
 #: src/concepts/undo.xml:18(para)
 msgid ""
-"Almost anything you do to an image in GIMP can be undone. You can undo the "
-"most recent action by choosing <menuchoice><guimenu>Edit</"
+"Almost anything you do to an image in <acronym>GIMP</acronym> can be undone. "
+"You can undo the most recent action by choosing <menuchoice><guimenu>Edit</"
 "guimenu><guimenuitem>Undo</guimenuitem></menuchoice> from the image menu, "
 "but this is done so frequently that you really should memorize the keyboard "
 "shortcut, <keycombo><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo>."
@@ -48,12 +48,12 @@ msgid ""
 "If you undo one or more actions and then operate on the image in any way "
 "except by using Undo or Redo, it will no longer be possible to redo those "
 "actions: they are lost forever. The solution to this, if it creates a "
-"problem for you, is to duplicate the image and then operate on the copy. "
-"( <emphasis>Not</emphasis> the original, because the undo/redo history is "
+"problem for you, is to duplicate the image and then test on the copy. ( Do "
+"<emphasis>Not</emphasis> test the original, because the undo/redo history is "
 "not copied when you duplicate an image.)"
 msgstr ""
 
-#: src/concepts/undo.xml:53(para)
+#: src/concepts/undo.xml:54(para)
 msgid ""
 "If you often find yourself undoing and redoing many steps at a time, it may "
 "be more convenient to work with the <link linkend=\"gimp-undo-dialog\">Undo "
@@ -62,97 +62,99 @@ msgid ""
 "point by clicking."
 msgstr ""
 
-#: src/concepts/undo.xml:61(para)
+#: src/concepts/undo.xml:62(para)
 msgid ""
 "Undo is performed on an image-specific basis: the \"Undo History\" is one of "
-"the components of an image. GIMP allocates a certain amount of memory to "
-"each image for this purpose. You can customize your Preferences to increase "
-"or decrease the amount, using the <link linkend=\"gimp-prefs-environment"
-"\">Environment</link> page of the Preferences dialog. There are two "
-"important variables: the <emphasis>minimal number of undo levels</emphasis>, "
-"which GIMP will maintain regardless of how much memory they consume, and the "
-"<emphasis>maximum undo memory</emphasis>, beyond which GIMP will begin to "
-"delete the oldest items from the Undo History."
+"the components of an image. <acronym>GIMP</acronym> allocates a certain "
+"amount of memory to each image for this purpose. You can customize your "
+"Preferences to increase or decrease the amount, using the <link linkend="
+"\"gimp-prefs-environment\">Environment</link> page of the Preferences "
+"dialog. There are two important variables: the <emphasis>minimal number of "
+"undo levels</emphasis>, which <acronym>GIMP</acronym> will maintain "
+"regardless of how much memory they consume, and the <emphasis>maximum undo "
+"memory</emphasis>, beyond which <acronym>GIMP</acronym> will begin to delete "
+"the oldest items from the Undo History."
 msgstr ""
 
-#: src/concepts/undo.xml:74(para)
+#: src/concepts/undo.xml:78(para)
 msgid ""
 "Even though the Undo History is a component of an image, it is not saved "
-"when you save the image using GIMP's native XCF format, which preserves "
-"every other image property. When the image is reopened, it will have an "
-"empty Undo History."
+"when you save the image using <acronym>GIMP</acronym>'s native XCF format, "
+"which preserves every other image property. When the image is reopened, it "
+"will have an empty Undo History."
 msgstr ""
 
-#: src/concepts/undo.xml:81(para)
+#: src/concepts/undo.xml:86(para)
 msgid ""
-"The implementation of Undo by GIMP is rather sophisticated. Many operations "
-"require very little Undo memory (e.g., changing visibility of a layer), so "
-"you can perform long sequences of them before they drop out of the Undo "
-"History. Some operations (changing layer visibility is again an example) are "
+"<acronym>GIMP</acronym>'s implementation of Undo is rather sophisticated. "
+"Many operations require very little Undo memory (e.g., changing visibility "
+"of a layer), so you can perform long sequences of them before they drop out "
+"of the Undo History. Some operations, such as changing layer visibility, are "
 "<emphasis>compressed</emphasis>, so that doing them several times in a row "
 "produces only a single point in the Undo History. However, there are other "
-"operations that may consume a lot of undo memory. Most filters are examples "
-"of this: because they are implemented by plug-ins, the GIMP core has no "
-"really efficient way of knowing what they have changed, so it has no way to "
-"implement Undo except by memorizing the entire contents of the affected "
-"layer before and after the operation. You might only be able to perform a "
-"few such operations before they drop out of the Undo History."
+"operations that may consume a lot of undo memory. Most filters are "
+"implemented by plug-ins, so the <acronym>GIMP</acronym> core has no "
+"efficient way of knowing what changed. As such, there is no way to implement "
+"Undo except by memorizing the entire contents of the affected layer before "
+"and after the operation. You might only be able to perform a few such "
+"operations before they drop out of the Undo History."
 msgstr ""
 
-#: src/concepts/undo.xml:98(phrase)
+#: src/concepts/undo.xml:104(phrase)
 msgid "Things That Cannot be Undone"
 msgstr "ä¸?å?¯æ?¤é??ç??æ??ä½?"
 
-#: src/concepts/undo.xml:100(para)
+#: src/concepts/undo.xml:106(para)
 msgid ""
 "Most actions that alter an image can be undone. Actions that do not alter "
-"the image generally cannot be. This includes operations such as saving the "
-"image to a file, duplicating the image, copying part of the image to the "
-"clipboard, etc. It also includes most actions that affect the image display "
-"without altering the underlying image data. The most important example is "
-"zooming. There are, however, exceptions: toggling QuickMask on or off can be "
-"undone, even though it does not alter the image data."
+"the image generally cannot be undone. Examples include saving the image to a "
+"file, duplicating the image, copying part of the image to the clipboard, "
+"etc. It also includes most actions that affect the image display without "
+"altering the underlying image data. The most important example is zooming. "
+"There are, however, exceptions: toggling QuickMask on or off can be undone, "
+"even though it does not alter the image data."
 msgstr ""
 
-#: src/concepts/undo.xml:110(para)
+#: src/concepts/undo.xml:116(para)
 msgid ""
 "There are a few important actions that do alter an image but cannot be "
 "undone:"
-msgstr ""
-"以ä¸?æ??ä½?ä¼?æ?¹å??å?¾å??ä¸?ä¸?å?¯æ?¢å¤?ï¼?"
+msgstr "以ä¸?æ??ä½?ä¼?æ?¹å??å?¾å??ä¸?ä¸?å?¯æ?¢å¤?ï¼?"
 
-#: src/concepts/undo.xml:116(term)
+#: src/concepts/undo.xml:122(term)
 msgid "Closing the image"
 msgstr "å?³é?­å?¾å??"
 
-#: src/concepts/undo.xml:118(para)
+#: src/concepts/undo.xml:124(para)
 msgid ""
 "The Undo History is a component of the image, so when the image is closed "
-"and all of its resources are freed, the Undo History goes along. Because of "
+"and all of its resources are freed, the Undo History is gone. Because of "
 "this, unless the image has not been modified since the last time it was "
-"saved, GIMP always asks you to confirm that you really want to close it. "
-"(You can disable this in the <link linkend=\"gimp-prefs-environment"
-"\">Environment</link> page of the Preferences dialog; if you do, you are "
-"assuming responsibility for thinking about what you are doing.)"
+"saved, <acronym>GIMP</acronym> always asks you to confirm that you really "
+"want to close the image. (You can disable this in the <link linkend=\"gimp-"
+"prefs-environment\">Environment</link> page of the Preferences dialog; if "
+"you do, you are assuming responsibility for thinking about what you are "
+"doing.)"
 msgstr ""
 
-#: src/concepts/undo.xml:131(term)
+#: src/concepts/undo.xml:138(term)
 msgid "Reverting the image"
 msgstr ""
 
-#: src/concepts/undo.xml:133(para)
+#: src/concepts/undo.xml:140(para)
 msgid ""
-"<quote>Reverting</quote> means reloading the image from file. GIMP actually "
-"implements this by closing the image and creating a new image, so the Undo "
-"History is lost as a consequence. Because of this, if the image is unclean, "
-"GIMP always asks you to confirm that you really want to revert the image."
+"<quote>Reverting</quote> means reloading the image from the file. "
+"<acronym>GIMP</acronym> actually implements this by closing the image and "
+"creating a new image, so the Undo History is lost as a consequence. Because "
+"of this, if the image is unclean, <acronym>GIMP</acronym> asks you to "
+"confirm that you really want to revert the image."
 msgstr ""
 
-#: src/concepts/undo.xml:143(term)
+#: src/concepts/undo.xml:151(term)
 msgid "<quote>Pieces</quote> of actions"
 msgstr ""
 
-#: src/concepts/undo.xml:145(para)
+#: src/concepts/undo.xml:153(para)
 msgid ""
 "Some tools require you to perform a complex series of manipulations before "
 "they take effect, but only allow you to undo the whole thing rather than the "
@@ -165,19 +167,20 @@ msgid ""
 "after you are finished removes the newly created text layer."
 msgstr ""
 
-#: src/concepts/undo.xml:161(para)
+#: src/concepts/undo.xml:169(para)
 msgid ""
 "Filters, and other actions performed by plugins or scripts, can be undone "
-"just like actions implemented by the GIMP core, but this requires them to "
-"make correct use of GIMP's Undo functions. If the code is not correct, a "
-"plugin can potentially corrupt the Undo History, so that not only the plugin "
-"but also previous actions can no longer properly be undone. The plugins and "
-"scripts distributed with GIMP are all believed to be set up correctly, but "
+"just like actions implemented by the <acronym>GIMP</acronym> core, but this "
+"requires them to make correct use of <acronym>GIMP</acronym>'s Undo "
+"functions. If the code is not correct, a plugin can potentially corrupt the "
+"Undo History, so that not only the plugin but also previous actions can no "
+"longer properly be undone. The plugins and scripts distributed with "
+"<acronym>GIMP</acronym> are all believed to be set up correctly, but "
 "obviously no guarantees can be given for plugins you obtain from other "
 "sources. Also, even if the code is correct, canceling a plugin while it is "
-"running can sometimes leave the Undo History corrupted, so it is best to "
-"avoid this unless you have accidentally done something whose consequences "
-"are going to be very harmful."
+"running may corrupt the Undo History, so it is best to avoid this unless you "
+"have accidentally done something whose consequences are going to be very "
+"harmful."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -201,7 +204,7 @@ msgstr "工�箱"
 #: src/concepts/patterns.xml:22(secondary)
 #: src/concepts/palettes.xml:20(secondary)
 #: src/concepts/brushes.xml:19(secondary)
-#: src/concepts/brushes.xml:143(tertiary)
+#: src/concepts/brushes.xml:147(tertiary)
 msgid "Introduction"
 msgstr "ç®?ä»?"
 
@@ -211,40 +214,43 @@ msgstr ""
 
 #: src/concepts/toolbox.xml:31(para)
 msgid ""
-"The Main Toolbox is the heart of GIMP. If you close it, you quit GIMP. Here "
-"is a quick tour of what you will find there."
+"The Main Toolbox is the heart of <acronym>GIMP</acronym>. If you close it, "
+"you quit <acronym>GIMP</acronym>. Here is a quick tour of what you will find "
+"there."
 msgstr ""
 
-#: src/concepts/toolbox.xml:36(para)
+#: src/concepts/toolbox.xml:37(para)
 msgid ""
-"In the Toolbox, as in most parts of GIMP, moving the mouse on top of "
-"something and letting it rest for a moment will usually bring up a \"tooltip"
-"\" message that may help you understand what the thing is or what you can do "
-"with it. Also, in many cases you can press the <keycap>F1</keycap> key to "
-"get help about the thing that is underneath the mouse."
+"In the Toolbox, as in most parts of <acronym>GIMP</acronym>, moving the "
+"mouse over something and letting it rest for a moment, usually displays a "
+"<quote>tooltip</quote> that describes the thing. Short cut keys are also "
+"frequently shown in the tooltip. In many cases, you can hover the mouse over "
+"an item and press the <keycap>F1</keycap> key to get help about the thing "
+"that is underneath the mouse."
 msgstr ""
 
-#: src/concepts/toolbox.xml:47(para)
+#: src/concepts/toolbox.xml:50(para)
 msgid ""
 "<emphasis>Tool icons:</emphasis> These icons are buttons which activate "
-"tools for a wide variety of purposes: selecting parts of images, painting on "
-"them, transforming them, etc. The <link linkend=\"gimp-toolbox-introduction"
-"\">Toolbox Introduction</link> section gives an overview of how to work with "
-"tools, and each tool is described systematically in the <link linkend=\"gimp-"
-"toolbox\">Tools</link> chapter."
+"tools for a wide variety of purposes: selecting parts of images, painting an "
+"image, transforming an image, etc. The <link linkend=\"gimp-toolbox-"
+"introduction\">Toolbox Introduction</link> section gives an overview of how "
+"to work with tools, and each tool is described systematically in the <link "
+"linkend=\"gimp-toolbox\">Tools</link> chapter."
 msgstr ""
 
-#: src/concepts/toolbox.xml:58(para)
+#: src/concepts/toolbox.xml:61(para)
 msgid ""
 "<emphasis>Foreground/Background colors:</emphasis> The color areas here show "
-"you GIMP's current foreground and background colors, which come into play in "
-"many operations. Clicking on either one of them brings up a color selector "
-"dialog that allows you to change to a different color. Clicking on the "
-"double-headed arrow swaps the two colors, and clicking on the small symbol "
-"in the lower left corner resets them to black and white."
+"you <acronym>GIMP</acronym>'s current foreground and background colors, "
+"which come into play in many operations. Clicking on either one of them "
+"brings up a color selector dialog that allows you to change to a different "
+"color. Clicking on the double-headed arrow swaps the two colors, and "
+"clicking on the small symbol in the lower left corner resets them to black "
+"and white."
 msgstr ""
 
-#: src/concepts/toolbox.xml:69(para)
+#: src/concepts/toolbox.xml:73(para)
 msgid ""
 "<emphasis>Brush/Pattern/Gradient:</emphasis> The symbols here show you "
 "<acronym>GIMP's</acronym> current selections for: the Paintbrush, used by "
@@ -256,107 +262,113 @@ msgid ""
 "that allows you to change it."
 msgstr ""
 
-#: src/concepts/toolbox.xml:82(para)
+#: src/concepts/toolbox.xml:86(para)
 msgid ""
 "<emphasis>Active Image:</emphasis> In <acronym>GIMP</acronym>, you can work "
-"with many images at once, but at any given moment, one of them is the "
+"with many images at once, but at any given moment, only one image is the "
 "<quote>active image</quote>. Here you find a small iconic representation of "
-"the active image. Clicking on it brings up a dialog with a list of all the "
-"currently open images, allowing you to make a different one active if you "
-"want to. (Clicking on the window where the image is displayed will "
-"accomplish the same thing, though.)"
+"the active image. Click the icon to display a dialog with a list of the "
+"currently open images, click an image in the dialog to make it active. You "
+"can also click an image window to make it the active image."
 msgstr ""
 
-#: src/concepts/toolbox.xml:93(para)
+#: src/concepts/toolbox.xml:96(para)
 msgid ""
 "The <quote>Active Image</quote> preview is disabled by default. If you want "
 "it, you can enable it in the <link linkend=\"gimp-prefs-toolbox\">Toolbox "
 "Preferences</link> tab."
 msgstr ""
 
-#: src/concepts/toolbox.xml:102(para)
+#: src/concepts/toolbox.xml:105(para)
+msgid ""
+"At every start, <acronym>GIMP</acronym> selects a tool (the brush), a color, "
+"a brush and a pattern by default, always the same. If you want "
+"<acronym>GIMP</acronym> to select the last tool, color, brush and pattern "
+"you used when quitting your previous session, check the <guilabel>Save input "
+"device settings on exit</guilabel> in <link linkend=\"gimp-prefs-input-"
+"devices\">Preferences/Input Devices</link>."
+msgstr ""
+
+#: src/concepts/toolbox.xml:117(para)
 msgid ""
-"At every start, GIMP selects a tool (the brush), a color, a brush and a "
-"pattern by default, always the same. If you want GIMP to select the last "
-"tool, color, brush and pattern you used when quitting your previous session, "
-"check the <guilabel>Save input device settings on exit</guilabel> in <link "
-"linkend=\"gimp-prefs-input-devices\">Preferences/Input Devices</link>."
+"The Toolbox window displays <quote>Wilber's eyes</quote> along the top of "
+"the dialog. You can get rid of the <quote>Wilber's eyes</quote> by adding "
+"the following line to your <filename>gimprc</filename> file: <code>(toolbox-"
+"wilber&nbsp;no)</code>. It only affects the toolbox. The eyes in the Image "
+"window are only visible when you do not have an open image."
 msgstr ""
 
-#: src/concepts/toolbox.xml:113(para)
+#: src/concepts/toolbox.xml:128(para) src/concepts/imagewindow.xml:287(para)
 msgid ""
-"You can get rid of the <quote>Wilber's eyes</quote> (replacing the old "
-"Toolbox menu) from the Toolbox by adding the following line to your "
-"<filename>gimprc</filename> file: <code>(toolbox-wilber&nbsp;no)</code>. It "
-"only affects the toolbox. The eyes in the Image window are only visible when "
-"you do not have an open image."
+"Drag and drop an image into the Toolbox window to open the image in its own "
+"Image window. This is very different than dragging an image into an existing "
+"Image window, which adds it to the currently open image in a new layer&mdash;"
+"usually not what you want."
 msgstr ""
 
-#: src/concepts/setup.xml:15(phrase)
+#: src/concepts/setup.xml:14(title)
 msgid "Starting GIMP the first time"
 msgstr ""
 
-#: src/concepts/setup.xml:18(primary)
+#: src/concepts/setup.xml:17(primary)
 msgid "Setup"
 msgstr ""
 
 #: src/concepts/setup.xml:20(para)
 msgid ""
-"The first time you run GIMP, it goes through a series of steps to set up "
-"options and directories. This process creates a subdirectory of your home "
-"directory called <filename class=\"directory\">.gimp-2.6</filename>. All of "
-"the information about the choices you make here goes into that directory. If "
-"you later remove that directory, or rename it as something like <filename "
-"class=\"directory\">.gimp-2.6.bak</filename>, then the next time you start "
-"GIMP, it will go through the whole setup sequence again, creating a new "
-"<filename class=\"directory\">.gimp-2.6</filename> directory. You can "
-"exploit this if you want to explore the effect of different choices without "
-"destroying your existing installation, or if you have screwed things up so "
-"badly that your existing installation needs to be nuked."
+"When first run, <acronym>GIMP</acronym> performs a series of steps to "
+"configure options and directories. The configuration process creates a "
+"subdirectory in your home directory called <filename class=\"directory\">."
+"gimp-2.6</filename>. All of the configuration information is stored in this "
+"directory. If you remove or rename the directory, <acronym>GIMP</acronym> "
+"will repeat the initial configuration process, creating a new <filename "
+"class=\"directory\">.gimp-2.6</filename> directory. Use this capability to "
+"explore different configuration options without destroying your existing "
+"installation, or to recover if your configuration files are damaged."
 msgstr ""
 
-#: src/concepts/setup.xml:38(phrase)
+#: src/concepts/setup.xml:36(title)
 msgid "Finally . . ."
 msgstr ""
 
+#. TODO: "Tip of the Day" is no longer displayed automatically, is it?
+#.          (ude 2009-06-29)
 #: src/concepts/setup.xml:40(para)
 msgid ""
-"Just a couple of suggestions before you start, though: First, when you run "
-"GIMP, by default it shows a \"tip\" each time it starts up. These tips tell "
-"you things that are very useful but not easy to learn by experimenting, so "
-"they are worth paying attention to. If you find it too distracting to look "
-"at them each time you start, you can disable them; but please go through "
-"them when you have the chance: for your convenience, you can read them at "
-"any time using the menu command <menuchoice><guimenu>Help</"
-"guimenu><guimenuitem>Tips</guimenuitem></menuchoice>. Second, if at some "
-"point you are trying to do something, and GIMP seems to have suddenly "
-"stopped functioning, the section <link linkend=\"gimp-using-getting-unstuck"
-"\">Getting Unstuck</link> may help you out. Happy Gimping!"
+"Just a couple of suggestions before you start, though: First, <acronym>GIMP</"
+"acronym> provides tips you can read at any time using the menu command "
+"<menuchoice><guimenu>Help</guimenu><guimenuitem>Tip of the Day</"
+"guimenuitem></menuchoice>. The tips provide information that is considered "
+"useful, but not easy to learn by experimenting; so they are worth reading. "
+"Please read the tips when you have the time. Second, if at some point you "
+"are trying to do something, and <acronym>GIMP</acronym> seems to have "
+"suddenly stopped functioning, the section <link linkend=\"gimp-using-getting-"
+"unstuck\">Getting Unstuck</link> may help you out. Happy Gimping!"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/selection.xml:36(None)
+#: src/concepts/selection.xml:37(None)
 msgid ""
 "@@image: 'images/using/fog-tree-example.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/selection.xml:53(None)
+#: src/concepts/selection.xml:54(None)
 msgid "@@image: 'images/using/select-outline.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/selection.xml:88(None)
+#: src/concepts/selection.xml:89(None)
 msgid ""
 "@@image: 'images/using/select-outline-qmask.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/selection.xml:113(None)
+#: src/concepts/selection.xml:115(None)
 msgid ""
 "@@image: 'images/using/select-outline-qmask-feather.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -378,16 +390,17 @@ msgstr ""
 #: src/concepts/selection.xml:25(para)
 msgid ""
 "Often when you operate on an image, you only want part of it to be affected. "
-"In GIMP, you make this happen by <emphasis>selecting</emphasis> that part. "
-"Each image has a <emphasis>selection</emphasis> associated with it. Most, "
-"but not all, GIMP operations act only on the selected portions of the image."
+"In <acronym>GIMP</acronym>, you make this happen by <emphasis>selecting</"
+"emphasis> that part. Each image has a <emphasis>selection</emphasis> "
+"associated with it. Most, but not all, <acronym>GIMP</acronym> operations "
+"act only on the selected portions of the image."
 msgstr ""
 
-#: src/concepts/selection.xml:33(title)
+#: src/concepts/selection.xml:34(title)
 msgid "How would you isolate the tree?"
 msgstr ""
 
-#: src/concepts/selection.xml:40(para)
+#: src/concepts/selection.xml:41(para)
 msgid ""
 "There are many, many situations where creating just the right selection is "
 "the key to getting the result you want, and often it is not very easy to do. "
@@ -398,11 +411,11 @@ msgid ""
 "hard to distinguish from the objects behind it."
 msgstr ""
 
-#: src/concepts/selection.xml:50(title)
+#: src/concepts/selection.xml:51(title)
 msgid "Selection shown as usual with dashed line"
 msgstr ""
 
-#: src/concepts/selection.xml:57(para)
+#: src/concepts/selection.xml:58(para)
 msgid ""
 "Now here is a very important point, and it is crucial to understand this. "
 "Ordinarily when you create a selection, you see it as a dashed line "
@@ -412,7 +425,7 @@ msgid ""
 "okay for many purposes, but it is not really correct."
 msgstr ""
 
-#: src/concepts/selection.xml:65(para)
+#: src/concepts/selection.xml:66(para)
 msgid ""
 "Actually the selection is implemented as a <emphasis>channel</emphasis>. In "
 "terms of its internal structure, it is identical to the red, green, blue, "
@@ -425,22 +438,22 @@ msgid ""
 "regions."
 msgstr ""
 
-#: src/concepts/selection.xml:76(para)
+#: src/concepts/selection.xml:77(para)
 msgid ""
 "What, then, is the dashed line that appears when you create a selection?"
 msgstr ""
 
-#: src/concepts/selection.xml:79(para)
+#: src/concepts/selection.xml:80(para)
 msgid ""
 "It is a <emphasis>contour line</emphasis>, dividing areas that are more than "
 "half selected from areas that are less than half selected."
 msgstr ""
 
-#: src/concepts/selection.xml:84(title)
+#: src/concepts/selection.xml:85(title)
 msgid "Same selection in QuickMask mode"
 msgstr ""
 
-#: src/concepts/selection.xml:92(para)
+#: src/concepts/selection.xml:93(para)
 msgid ""
 "You should always bear in mind, when looking at the dashed line that "
 "represents the selection, that it only tells you part of the story. If you "
@@ -451,23 +464,24 @@ msgid ""
 "completely selected an area is, the less red it appears."
 msgstr ""
 
-#: src/concepts/selection.xml:101(para)
+#: src/concepts/selection.xml:102(para)
 msgid ""
 "QuickMask mode, and its uses, are described in detail below. Meanwhile, if "
-"you are following this discussion by trying things out in GIMP, you should "
-"know that many operations work differently in QuickMask mode, so go ahead "
-"and toggle it off again for now (by clicking the QuickMask button once more)."
+"you are following this discussion by trying things out in <acronym>GIMP</"
+"acronym>, you should know that many operations work differently in QuickMask "
+"mode, so go ahead and toggle it off again for now (by clicking the QuickMask "
+"button once more)."
 msgstr ""
 
-#: src/concepts/selection.xml:109(title)
+#: src/concepts/selection.xml:111(title)
 msgid "Same selection in QuickMask mode after feathering"
 msgstr ""
 
-#: src/concepts/selection.xml:119(title)
+#: src/concepts/selection.xml:121(title)
 msgid "Feathering"
 msgstr ""
 
-#: src/concepts/selection.xml:120(para)
+#: src/concepts/selection.xml:122(para)
 msgid ""
 "With the default settings, the basic selection tools, such as the Rectangle "
 "Select tool, create sharp selections. Pixels inside the dashed line are "
@@ -479,21 +493,21 @@ msgid ""
 "adjust, determines the distance over which the transition occurs."
 msgstr ""
 
-#: src/concepts/selection.xml:131(para)
+#: src/concepts/selection.xml:133(para)
 msgid ""
 "If you are following along, try this out with the Rectangle Select tool, and "
 "then toggle QuickMask. You will now see that the clear rectangle has a fuzzy "
 "edge."
 msgstr ""
 
-#: src/concepts/selection.xml:136(para)
+#: src/concepts/selection.xml:138(para)
 msgid ""
 "Feathering is particularly useful when you are cutting and pasting, in "
 "helping the pasted object to blend smoothly and unobtrusively with its "
 "surroundings."
 msgstr ""
 
-#: src/concepts/selection.xml:141(para)
+#: src/concepts/selection.xml:143(para)
 msgid ""
 "Actually, it is possible to feather a selection at any time, even if it was "
 "originally created as a sharp selection. You can do this from the image "
@@ -504,28 +518,28 @@ msgid ""
 "guimenu><guimenuitem>Sharpen</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/concepts/selection.xml:158(para)
+#: src/concepts/selection.xml:160(para)
 msgid ""
 "For technically oriented readers: feathering works by applying a Gaussian "
 "blur to the selection channel, with the specified blurring radius."
 msgstr ""
 
-#: src/concepts/selection.xml:167(title)
+#: src/concepts/selection.xml:169(title)
 msgid "Making a Selection Partially Transparent"
 msgstr ""
 
-#: src/concepts/selection.xml:168(para)
+#: src/concepts/selection.xml:170(para)
 msgid ""
 "You can set layer opacity, but you cannot do that directly for a selection. "
 "It is quite useful to make the image of a glass transparent. You can achieve "
 "this by using these methods:"
 msgstr ""
 
-#: src/concepts/selection.xml:175(para)
+#: src/concepts/selection.xml:177(para)
 msgid "For simple selections, use the Eraser tool with the wanted opacity."
 msgstr ""
 
-#: src/concepts/selection.xml:180(para)
+#: src/concepts/selection.xml:182(para)
 msgid ""
 "For complex selections: use the command <menuchoice><guimenu>Selection</"
 "guimenu><guimenuitem>Floating</guimenuitem></menuchoice> to create a "
@@ -539,7 +553,7 @@ msgid ""
 "right clicking on the selected layer in the layer dialog)."
 msgstr ""
 
-#: src/concepts/selection.xml:198(para)
+#: src/concepts/selection.xml:200(para)
 msgid ""
 "And, if you use this function frequently: <keycombo action=\"press"
 "\"><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> to copy the selection, "
@@ -550,7 +564,7 @@ msgid ""
 "only."
 msgstr ""
 
-#: src/concepts/selection.xml:214(para)
+#: src/concepts/selection.xml:216(para)
 msgid ""
 "Another way: <menuchoice><guimenu>Layer</guimenu><guisubmenu>Mask</"
 "guisubmenu><guimenuitem>Layer mask</guimenuitem></menuchoice> to add a layer "
@@ -560,7 +574,7 @@ msgid ""
 "linkend=\"gimp-layer-mask\"/>."
 msgstr ""
 
-#: src/concepts/selection.xml:229(para)
+#: src/concepts/selection.xml:231(para)
 msgid ""
 "If you want to <emphasis>make transparent the solid background of an image</"
 "emphasis>, add an Alpha channel and select the background by using the Magic "
@@ -571,7 +585,7 @@ msgid ""
 "color is changed."
 msgstr ""
 
-#: src/concepts/selection.xml:239(para)
+#: src/concepts/selection.xml:241(para)
 msgid ""
 "The simplest method is the <menuchoice><guimenu>Edit</"
 "guimenu><guimenuitem>Erase</guimenuitem></menuchoice> command, which gives "
@@ -581,13 +595,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/script-fu.xml:136(None)
+#: src/concepts/script-fu.xml:142(None)
 msgid "@@image: 'images/using/script-fu-exts.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/script-fu.xml:164(None)
+#: src/concepts/script-fu.xml:170(None)
 msgid ""
 "@@image: 'images/using/script-fu-image.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -597,10 +611,10 @@ msgid "Using Script-Fu Scripts"
 msgstr "使ç?¨ Script-Fu è??æ?¬"
 
 #: src/concepts/script-fu.xml:18(primary)
-#: src/concepts/script-fu.xml:64(primary)
-#: src/concepts/script-fu.xml:176(primary)
-#: src/concepts/script-fu.xml:289(primary)
-#: src/concepts/script-fu.xml:341(primary)
+#: src/concepts/script-fu.xml:69(primary)
+#: src/concepts/script-fu.xml:182(primary)
+#: src/concepts/script-fu.xml:296(primary)
+#: src/concepts/script-fu.xml:349(primary)
 msgid "Script-Fu"
 msgstr "Script-Fu"
 
@@ -612,29 +626,30 @@ msgstr "Script-Fu?"
 msgid ""
 "Script-Fu is what the Windows world would call \"macros\" But Script-Fu is "
 "more powerful than that. Script-Fu is based on an interpreting language "
-"called Scheme, and works by using querying functions to the GIMP database. "
-"You can do all kinds of things with Script-Fu, but an ordinary GIMP user "
-"will probably use it for automating things that:"
+"called Scheme, and works by using querying functions to the <acronym>GIMP</"
+"acronym> database. You can do all kinds of things with Script-Fu, but an "
+"ordinary <acronym>GIMP</acronym> user will probably use it for automating "
+"things that:"
 msgstr ""
 
-#: src/concepts/script-fu.xml:33(para)
+#: src/concepts/script-fu.xml:35(para)
 msgid "You want to do frequently."
 msgstr ""
 
-#: src/concepts/script-fu.xml:36(para)
+#: src/concepts/script-fu.xml:38(para)
 msgid "Are really complicated to do, and hard to remember."
 msgstr ""
 
-#: src/concepts/script-fu.xml:39(para)
+#: src/concepts/script-fu.xml:41(para)
 msgid ""
 "Remember that you can do a whole lot with Script-Fu. The scripts that come "
-"with GIMP can be quite useful, but they can also serve as models for "
-"learning Script-Fu, or at least as a framework and source of modification "
-"when you make your own script. Read the Script-Fu Tutorial in the next "
-"section if you want to learn more about how to make scripts."
+"with <acronym>GIMP</acronym> can be quite useful, but they can also serve as "
+"models for learning Script-Fu, or at least as a framework and source of "
+"modification when you make your own script. Read the Script-Fu Tutorial in "
+"the next section if you want to learn more about how to make scripts."
 msgstr ""
 
-#: src/concepts/script-fu.xml:46(para)
+#: src/concepts/script-fu.xml:49(para)
 msgid ""
 "We will describe some of the most useful scripts in this chapter, but we "
 "won't cover them all. There are simply too many scripts. Some of the scripts "
@@ -642,33 +657,35 @@ msgid ""
 "able to use them."
 msgstr ""
 
-#: src/concepts/script-fu.xml:52(para)
+#: src/concepts/script-fu.xml:55(para)
 msgid ""
 "Script-Fu (a dialect of Scheme) isn't the only scripting language available "
-"for GIMP. But Script-Fu is the only scripting language that is installed by "
-"default. Other available scripting extensions are Perl and Tcl. You can "
-"download and install both extensions at the GIMP Plugin Registry <xref "
-"linkend=\"bibliography-online-gimp-plugin-registry\"/>."
+"for <acronym>GIMP</acronym>. But Script-Fu is the only scripting language "
+"that is installed by default. Other available scripting extensions are Perl "
+"and Tcl. You can download and install both extensions at the <acronym>GIMP</"
+"acronym> Plugin Registry <xref linkend=\"bibliography-online-gimp-plugin-"
+"registry\"/>."
 msgstr ""
 
-#: src/concepts/script-fu.xml:62(title)
+#: src/concepts/script-fu.xml:67(title)
 msgid "Installing Script-Fus"
 msgstr ""
 
-#: src/concepts/script-fu.xml:65(secondary)
-#: src/concepts/plugins.xml:162(secondary)
+#: src/concepts/script-fu.xml:70(secondary)
+#: src/concepts/plugins.xml:163(secondary)
 msgid "Install"
 msgstr ""
 
-#: src/concepts/script-fu.xml:67(para)
+#: src/concepts/script-fu.xml:72(para)
 msgid ""
 "One of the great things about Script-Fu is that you can share your script "
-"with all your GIMP friends. There are many scripts that come with GIMP by "
-"default, but there are also vast quantities of scripts that are available "
-"for download all around the Internet."
+"with all your <acronym>GIMP</acronym> friends. There are many scripts that "
+"come with <acronym>GIMP</acronym> by default, but there are also vast "
+"quantities of scripts that are available for download all around the "
+"Internet."
 msgstr ""
 
-#: src/concepts/script-fu.xml:75(para)
+#: src/concepts/script-fu.xml:81(para)
 msgid ""
 "If you have downloaded a script, copy or move it to your scripts directory. "
 "It can be found in the <link linkend=\"gimp-prefs-folders\">Preferences</"
@@ -676,7 +693,7 @@ msgid ""
 "guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/concepts/script-fu.xml:86(para)
+#: src/concepts/script-fu.xml:92(para)
 msgid ""
 "Do a refresh by using <menuchoice><guimenu>Filters</"
 "guimenu><guisubmenu>Script-Fu</guisubmenu><guimenuitem>Refresh Scripts</"
@@ -686,11 +703,11 @@ msgid ""
 "script (e.g. it contains syntax errors)."
 msgstr ""
 
-#: src/concepts/script-fu.xml:104(title)
+#: src/concepts/script-fu.xml:110(title)
 msgid "Do's and Don'ts"
 msgstr ""
 
-#: src/concepts/script-fu.xml:105(para)
+#: src/concepts/script-fu.xml:111(para)
 msgid ""
 "A common error when you are dealing with Script-Fus is that you simply bring "
 "them up and press the OK button. When nothing happens, you probably think "
@@ -698,34 +715,34 @@ msgid ""
 "with it."
 msgstr ""
 
-#: src/concepts/script-fu.xml:114(title)
+#: src/concepts/script-fu.xml:120(title)
 msgid "Different Kinds Of Script-Fus"
 msgstr "两ç§?ä¸?å??ç?? Script-Fu"
 
-#: src/concepts/script-fu.xml:115(para)
+#: src/concepts/script-fu.xml:121(para)
 msgid "There are two kinds of Script-Fus:"
 msgstr "æ??两ç§?ä¸?å??ç?? Script-Fuï¼?"
 
-#: src/concepts/script-fu.xml:120(term)
+#: src/concepts/script-fu.xml:126(term)
 msgid "Standalone Script-Fus"
 msgstr "�� Script-Fu"
 
-#: src/concepts/script-fu.xml:122(para)
+#: src/concepts/script-fu.xml:128(para)
 msgid ""
 "You will find the standalone variants under <menuchoice><guimenu>File</"
 "guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Type of Script</"
 "guisubmenu></menuchoice> in the image menubar (see the figure below)."
 msgstr ""
 
-#: src/concepts/script-fu.xml:132(title)
+#: src/concepts/script-fu.xml:138(title)
 msgid "Script-Fus by category"
 msgstr ""
 
-#: src/concepts/script-fu.xml:143(term)
+#: src/concepts/script-fu.xml:149(term)
 msgid "Image-dependent Script-Fus"
 msgstr "å?ºäº?å?¾å??ç?? Script-Fu"
 
-#: src/concepts/script-fu.xml:145(para)
+#: src/concepts/script-fu.xml:151(para)
 msgid ""
 "Menus have been reorganized. A new Colors-menu appears. It groups together "
 "all scripts that work on colors, for example tools that adjust hue, "
@@ -737,64 +754,64 @@ msgid ""
 "it's more logical."
 msgstr ""
 
-#: src/concepts/script-fu.xml:156(para)
+#: src/concepts/script-fu.xml:162(para)
 msgid "The figure below show where you can find them in the image-menu."
 msgstr ""
 
-#: src/concepts/script-fu.xml:160(title)
+#: src/concepts/script-fu.xml:166(title)
 msgid "Where find Image-dependent scripts"
 msgstr ""
 
-#: src/concepts/script-fu.xml:174(title)
+#: src/concepts/script-fu.xml:180(title)
 msgid "Standalone Scripts"
 msgstr "ç?¬ç«?è??æ?¬"
 
-#: src/concepts/script-fu.xml:177(secondary)
+#: src/concepts/script-fu.xml:183(secondary)
 msgid "Standalone"
 msgstr "��"
 
-#: src/concepts/script-fu.xml:180(primary)
-#: src/concepts/script-fu.xml:191(para) src/concepts/script-fu.xml:208(term)
+#: src/concepts/script-fu.xml:186(primary)
+#: src/concepts/script-fu.xml:197(para) src/concepts/script-fu.xml:214(term)
 #: src/concepts/patterns.xml:18(title) src/concepts/patterns.xml:21(primary)
 msgid "Patterns"
 msgstr ""
 
-#: src/concepts/script-fu.xml:181(secondary)
-#: src/concepts/script-fu.xml:294(secondary)
-#: src/concepts/script-fu.xml:346(secondary)
+#: src/concepts/script-fu.xml:187(secondary)
+#: src/concepts/script-fu.xml:301(secondary)
+#: src/concepts/script-fu.xml:354(secondary)
 msgid "Script-Fu-generated"
 msgstr ""
 
-#: src/concepts/script-fu.xml:184(para)
+#: src/concepts/script-fu.xml:190(para)
 msgid ""
 "We will not try to describe every script in depth. Most Script-Fus are very "
 "easy to understand and use. At the time of this writing, the following types "
 "are installed by default:"
 msgstr ""
 
-#: src/concepts/script-fu.xml:194(para)
+#: src/concepts/script-fu.xml:200(para)
 msgid "Web page themes"
 msgstr "�页主�"
 
-#: src/concepts/script-fu.xml:197(para) src/concepts/script-fu.xml:286(term)
+#: src/concepts/script-fu.xml:203(para) src/concepts/script-fu.xml:293(term)
 msgid "Logos"
 msgstr "Logo"
 
-#: src/concepts/script-fu.xml:200(para)
+#: src/concepts/script-fu.xml:206(para)
 msgid "Buttons"
 msgstr "æ??é?®"
 
-#: src/concepts/script-fu.xml:203(para) src/concepts/script-fu.xml:359(term)
+#: src/concepts/script-fu.xml:209(para) src/concepts/script-fu.xml:367(term)
 msgid "Misc."
 msgstr "æ??项"
 
-#: src/concepts/script-fu.xml:210(para)
+#: src/concepts/script-fu.xml:216(para)
 msgid ""
 "You will find all kinds of pattern-generating scripts here. Generally, they "
 "are quite useful because you can add many arguments to your own patterns."
 msgstr ""
 
-#: src/concepts/script-fu.xml:215(para)
+#: src/concepts/script-fu.xml:221(para)
 msgid ""
 "We'll take a look at the Land script. In this script you have to set the "
 "image/pattern size, and specify what levels of random to use for your land "
@@ -805,11 +822,11 @@ msgid ""
 "will be typed as 10."
 msgstr ""
 
-#: src/concepts/script-fu.xml:228(term)
+#: src/concepts/script-fu.xml:234(term)
 msgid "Web Page Themes"
 msgstr "�页主�"
 
-#: src/concepts/script-fu.xml:230(para)
+#: src/concepts/script-fu.xml:236(para)
 msgid ""
 "Here is clearly a practical use for scripts. By creating a script for making "
 "custom text, logos, buttons arrows, etc., for your web site, you will give "
@@ -817,92 +834,92 @@ msgid ""
 "because you don't have to create every logo, text or button by hand."
 msgstr ""
 
-#: src/concepts/script-fu.xml:237(para)
+#: src/concepts/script-fu.xml:243(para)
 msgid ""
-"You will find the GIMP.org theme under the Web page theme submenu. If you "
-"want to create your own theme, this script will serve as an excellent "
-"template that you can modify to create a theme for your web site."
+"You will find the <acronym>GIMP</acronym>.org theme under the Web page theme "
+"submenu. If you want to create your own theme, this script will serve as an "
+"excellent template that you can modify to create a theme for your web site."
 msgstr ""
 
-#: src/concepts/script-fu.xml:243(para)
+#: src/concepts/script-fu.xml:250(para)
 msgid ""
 "Most of the scripts are quite self-explanatory, but here are some hints:"
 msgstr ""
 
-#: src/concepts/script-fu.xml:249(para)
+#: src/concepts/script-fu.xml:256(para)
 msgid "Leave all strange characters like ' and \" intact."
 msgstr ""
 
-#: src/concepts/script-fu.xml:254(para)
+#: src/concepts/script-fu.xml:261(para)
 msgid "Make sure that the pattern specified in the script exists."
 msgstr ""
 
-#: src/concepts/script-fu.xml:259(para)
+#: src/concepts/script-fu.xml:266(para)
 msgid "Padding refers to the amount of space around your text."
 msgstr ""
 
-#: src/concepts/script-fu.xml:264(para)
+#: src/concepts/script-fu.xml:271(para)
 msgid "A high value for bevel width gives the illusion of a higher button."
 msgstr ""
 
-#: src/concepts/script-fu.xml:270(para)
+#: src/concepts/script-fu.xml:277(para)
 msgid "If you type TRUE for \"Press\", the button will look pushed down."
 msgstr ""
 
-#: src/concepts/script-fu.xml:276(para)
+#: src/concepts/script-fu.xml:283(para)
 msgid ""
 "Choose transparency if you don't want a solid background. If you choose a "
 "solid background, make sure it is the same color as the web page background."
 msgstr ""
 
-#: src/concepts/script-fu.xml:290(secondary)
-#: src/concepts/script-fu.xml:293(primary)
+#: src/concepts/script-fu.xml:297(secondary)
+#: src/concepts/script-fu.xml:300(primary)
 msgid "Logo"
 msgstr "Logo"
 
-#: src/concepts/script-fu.xml:296(para)
+#: src/concepts/script-fu.xml:303(para)
 msgid ""
 "Here you will find all kinds of logo-generating scripts. This is nice, but "
 "use it with care, as people might recognize your logo as being made by a "
-"known GIMP script. You should rather regard it as a base that you can modify "
-"to fit your needs. The dialog for making a logo is more or less the same for "
-"all such scripts:"
+"known <acronym>GIMP</acronym> script. You should rather regard it as a base "
+"that you can modify to fit your needs. The dialog for making a logo is more "
+"or less the same for all such scripts:"
 msgstr ""
 
-#: src/concepts/script-fu.xml:305(para)
+#: src/concepts/script-fu.xml:313(para)
 msgid "In the Text String field, type your logo name, like Frozenriver."
 msgstr ""
 
-#: src/concepts/script-fu.xml:311(para)
+#: src/concepts/script-fu.xml:319(para)
 msgid "In the Font Size text field, type the size of your logo in pixels."
 msgstr ""
 
-#: src/concepts/script-fu.xml:317(para)
+#: src/concepts/script-fu.xml:325(para)
 msgid ""
 "In the Font text field, type the name of the font that you want to use for "
 "your logo."
 msgstr ""
 
-#: src/concepts/script-fu.xml:323(para)
+#: src/concepts/script-fu.xml:331(para)
 msgid ""
 "To choose the color of your logo, just click on the color button. This "
 "brings up a color dialog."
 msgstr ""
 
-#: src/concepts/script-fu.xml:329(para)
+#: src/concepts/script-fu.xml:337(para)
 msgid "If you look at the current command field, you can watch the script run."
 msgstr ""
 
-#: src/concepts/script-fu.xml:338(term)
+#: src/concepts/script-fu.xml:346(term)
 msgid "Make Buttons"
 msgstr ""
 
-#: src/concepts/script-fu.xml:342(secondary)
-#: src/concepts/script-fu.xml:345(primary)
+#: src/concepts/script-fu.xml:350(secondary)
+#: src/concepts/script-fu.xml:353(primary)
 msgid "Button"
 msgstr "æ??é?®"
 
-#: src/concepts/script-fu.xml:348(para)
+#: src/concepts/script-fu.xml:356(para)
 msgid ""
 "Under this headline you'll find two scripts that makes rectangular beveled "
 "buttons, with or without round corners (Round Button or Simple Beveled "
@@ -911,7 +928,7 @@ msgid ""
 "come up with a button you like."
 msgstr ""
 
-#: src/concepts/script-fu.xml:361(para)
+#: src/concepts/script-fu.xml:369(para)
 msgid ""
 "Under Misc. you'll find scripts that can be quite useful, but aren't "
 "suitable for the other submenus. An example is the Sphere script. You will "
@@ -922,11 +939,11 @@ msgid ""
 "select is background color, and the color of your sphere."
 msgstr ""
 
-#: src/concepts/script-fu.xml:377(title)
+#: src/concepts/script-fu.xml:385(title)
 msgid "Image-Dependent Scripts"
 msgstr "å?ºäº?å?¾å??ç??è??æ­¥"
 
-#: src/concepts/script-fu.xml:378(para)
+#: src/concepts/script-fu.xml:386(para)
 msgid ""
 "Now, scripts and filters that perform operations on an existing image are "
 "accessible directly by the appropriate menu. For example, the script "
@@ -936,14 +953,14 @@ msgid ""
 "guimenuitem></menuchoice>), that is more logical."
 msgstr ""
 
-#: src/concepts/script-fu.xml:390(para)
+#: src/concepts/script-fu.xml:398(para)
 msgid ""
 "Furthermore, a new <guimenu>Color</guimenu> menu has been created that "
 "regroups together all that concern works on colors, the hue or level color "
 "adjustment tools, etc..."
 msgstr ""
 
-#: src/concepts/script-fu.xml:395(para)
+#: src/concepts/script-fu.xml:403(para)
 msgid ""
 "<guimenu>Filters</guimenu> menu and <guimenu>Scripts-Fu</guimenu> menu are "
 "regrouped in one <guimenu>Filters</guimenu> menu and organised according to "
@@ -951,7 +968,7 @@ msgid ""
 "nearby in the menu."
 msgstr ""
 
-#: src/concepts/script-fu.xml:401(para)
+#: src/concepts/script-fu.xml:409(para)
 msgid ""
 "The <guimenu>Scripts-Fu</guimenu> menu only appears if you have loaded "
 "additional scripts: for example the gimp-resynthesizer pack corresponding to "
@@ -984,7 +1001,7 @@ msgid ""
 "tracing its outline."
 msgstr ""
 
-#: src/concepts/qmask.xml:39(phrase) src/concepts/layers.xml:410(tertiary)
+#: src/concepts/qmask.xml:39(phrase) src/concepts/layers.xml:414(tertiary)
 #: src/concepts/grid-and-guides.xml:24(secondary)
 #: src/concepts/grid-and-guides.xml:28(secondary)
 #: src/concepts/gradients.xml:19(secondary)
@@ -994,31 +1011,32 @@ msgstr "��"
 
 #: src/concepts/qmask.xml:41(para)
 msgid ""
-"Normally when you create a selection in GIMP, you see it represented by the "
-"\"marching ants\" that trace along its outline. But really there may be a "
-"lot more to a selection than the marching ants show you: in GIMP a selection "
-"is actually a full-fledged grayscale channel, covering the image, with pixel "
-"values ranging from 0 (unselected) to 255 (fully selected). The marching "
-"ants are drawn along a contour of half-selected pixels. Thus, what the "
-"marching ants show you as either inside or outside the boundary is really "
-"just a slice through a continuum."
-msgstr ""
-
-#: src/concepts/qmask.xml:51(para)
-msgid ""
-"The QuickMask is GIMP's way of showing you the full structure of the "
-"selection. Activating it also gives you the ability to interact with the "
-"selection in new, and substantially more powerful, ways. To activate the "
-"QuickMask, click on the small red-outlined button at the lower left of the "
-"image window. The button is a toggle, so clicking it again will return you "
-"to normal marching-ant mode. You can also activate the QuickMask by "
-"selecting in the image window menu <menuchoice><guimenu>Select</"
+"Normally when you create a selection in <acronym>GIMP</acronym>, you see it "
+"represented by the \"marching ants\" that trace along its outline. But "
+"really there may be a lot more to a selection than the marching ants show "
+"you: in <acronym>GIMP</acronym> a selection is actually a full-fledged "
+"grayscale channel, covering the image, with pixel values ranging from 0 "
+"(unselected) to 255 (fully selected). The marching ants are drawn along a "
+"contour of half-selected pixels. Thus, what the marching ants show you as "
+"either inside or outside the boundary is really just a slice through a "
+"continuum."
+msgstr ""
+
+#: src/concepts/qmask.xml:53(para)
+msgid ""
+"The QuickMask is <acronym>GIMP</acronym>'s way of showing you the full "
+"structure of the selection. Activating it also gives you the ability to "
+"interact with the selection in new, and substantially more powerful, ways. "
+"To activate the QuickMask, click on the small red-outlined button at the "
+"lower left of the image window. The button is a toggle, so clicking it again "
+"will return you to normal marching-ant mode. You can also activate the "
+"QuickMask by selecting in the image window menu <menuchoice><guimenu>Select</"
 "guimenu><guimenuitem>Toggle QuickMask</guimenuitem></menuchoice>, or by "
 "using the <keycombo><keycap>Shift</keycap><keycap>Q</keycap></keycombo> "
 "shortcut."
 msgstr ""
 
-#: src/concepts/qmask.xml:63(para)
+#: src/concepts/qmask.xml:66(para)
 msgid ""
 "Activating the QuickMask shows you the selection as though it were a "
 "translucent screen overlying the image, whose transparency at each pixel "
@@ -1028,18 +1046,19 @@ msgid ""
 "mask. Fully selected pixels are shown completely clear."
 msgstr ""
 
-#: src/concepts/qmask.xml:71(para)
+#: src/concepts/qmask.xml:74(para)
 msgid ""
 "When you are in QuickMask mode, many image manipulations act on the "
 "selection channel rather than the image itself. This includes, in "
 "particular, paint tools. Painting with white causes the painted pixels to be "
 "selected; painting with black causes them to be unselected. You can use any "
 "of the paint tools, as well as the bucket fill and gradient fill tools, in "
-"this way. Advanced users of GIMP learn that <quote>painting the selection</"
-"quote> is the easiest and most effective way to delicately manipulate it."
+"this way. Advanced users of <acronym>GIMP</acronym> learn that "
+"<quote>painting the selection</quote> is the easiest and most effective way "
+"to delicately manipulate it."
 msgstr ""
 
-#: src/concepts/qmask.xml:82(para)
+#: src/concepts/qmask.xml:86(para)
 msgid ""
 "To save the selection done by the Quickmask to a new channel; Make sure that "
 "there is a selection and that Quickmask is not active in the image window. "
@@ -1050,30 +1069,30 @@ msgid ""
 "quote>, <quote>...copy#2</quote> and so on...)."
 msgstr ""
 
-#: src/concepts/qmask.xml:97(para)
+#: src/concepts/qmask.xml:101(para)
 msgid ""
 "When QuickMask is active, Cut and Paste act on the selection rather than the "
 "image. You can sometimes make use of this as the most convenient way of "
 "transferring a selection from one image to another."
 msgstr ""
 
-#: src/concepts/qmask.xml:103(para)
+#: src/concepts/qmask.xml:107(para)
 msgid ""
 "You can learn more on <link linkend=\"dialogs-selection-masks\">Selection "
 "masks</link> in the section dedicated to the channel dialog."
 msgstr ""
 
-#: src/concepts/qmask.xml:112(phrase)
+#: src/concepts/qmask.xml:116(phrase)
 msgid "Properties"
 msgstr "å±?æ?§"
 
-#: src/concepts/qmask.xml:114(para)
+#: src/concepts/qmask.xml:118(para)
 msgid ""
 "There are two QuickMask properties you can change by right-clicking on the "
 "QuickMask button."
 msgstr ""
 
-#: src/concepts/qmask.xml:120(para)
+#: src/concepts/qmask.xml:124(para)
 msgid ""
 "Normally the QuickMask shows unselected areas <quote>fogged over </quote> "
 "and selected areas <quote>in clear</quote>, but you can reverse this by "
@@ -1081,7 +1100,7 @@ msgid ""
 "<quote>Mask Unselected Areas</quote>."
 msgstr ""
 
-#: src/concepts/qmask.xml:128(para)
+#: src/concepts/qmask.xml:132(para)
 msgid ""
 "By choosing <quote>Configure Color and Opacity</quote>, you can bring up a "
 "dialog that allows you to set these to values other than the defaults, which "
@@ -1089,7 +1108,7 @@ msgid ""
 msgstr ""
 
 #: src/concepts/plugins.xml:12(phrase) src/concepts/plugins.xml:15(primary)
-#: src/concepts/plugins.xml:161(primary) src/concepts/plugins.xml:294(primary)
+#: src/concepts/plugins.xml:162(primary) src/concepts/plugins.xml:298(primary)
 msgid "Plugins"
 msgstr "æ??件"
 
@@ -1120,15 +1139,15 @@ msgstr ""
 
 #: src/concepts/plugins.xml:45(para)
 msgid ""
-"In addition to the plugins included with GIMP , many more are available on "
-"the net. A large number can be found at the GIMP Plugin Registry <xref "
-"linkend=\"bibliography-online-gimp-plugin-registry\"/>, a web site whose "
-"purpose is to provide a central repository for plugins. Creators of plugins "
-"can upload them there; users in search of plugins for a specific purpose can "
-"search the site in a variety of ways."
+"In addition to the plugins included with <acronym>GIMP</acronym> , many more "
+"are available on the net. A large number can be found at the <acronym>GIMP</"
+"acronym> Plugin Registry <xref linkend=\"bibliography-online-gimp-plugin-"
+"registry\"/>, a web site whose purpose is to provide a central repository "
+"for plugins. Creators of plugins can upload them there; users in search of "
+"plugins for a specific purpose can search the site in a variety of ways."
 msgstr ""
 
-#: src/concepts/plugins.xml:53(para)
+#: src/concepts/plugins.xml:54(para)
 msgid ""
 "Anybody in the world can write a <acronym>GIMP</acronym> plugin and make it "
 "available over the web, either via the Registry or a personal web site, and "
@@ -1146,7 +1165,7 @@ msgid ""
 "you, just to make sure you understand reality."
 msgstr ""
 
-#: src/concepts/plugins.xml:71(para)
+#: src/concepts/plugins.xml:72(para)
 msgid ""
 "Plugins, being full-fledged executable programs, can do any of the things "
 "that any other program can do, including install back-doors on your system "
@@ -1154,7 +1173,7 @@ msgid ""
 "from a trusted source."
 msgstr ""
 
-#: src/concepts/plugins.xml:78(para)
+#: src/concepts/plugins.xml:79(para)
 msgid ""
 "These caveats apply as much to the Plugin Registry as to any other source of "
 "plugins. The Registry is available to any plugin creator who wants to use "
@@ -1164,7 +1183,7 @@ msgid ""
 "plugins the same warranty as for any other free software: namely, none."
 msgstr ""
 
-#: src/concepts/plugins.xml:88(para)
+#: src/concepts/plugins.xml:89(para)
 msgid ""
 "Plugins have been a feature of <acronym>GIMP</acronym> for many versions. "
 "However, plugins written for one version of <acronym>GIMP</acronym> can "
@@ -1175,18 +1194,18 @@ msgid ""
 "acronym>."
 msgstr ""
 
-#: src/concepts/plugins.xml:102(phrase)
+#: src/concepts/plugins.xml:103(phrase)
 msgid "Using Plugins"
 msgstr "使ç?¨æ??件"
 
-#: src/concepts/plugins.xml:104(para)
+#: src/concepts/plugins.xml:105(para)
 msgid ""
 "For the most part you can use a plugin like any other <acronym>GIMP</"
 "acronym> tool, without needing to be aware that it is a plugin. But there "
 "are a few things about plugins that are useful to understand."
 msgstr ""
 
-#: src/concepts/plugins.xml:110(para)
+#: src/concepts/plugins.xml:111(para)
 msgid ""
 "One is that plugins are generally not as robust as the <acronym>GIMP</"
 "acronym> core. When <acronym>GIMP</acronym> crashes, it is considered a very "
@@ -1195,7 +1214,7 @@ msgid ""
 "you can just continuing working without worrying about it."
 msgstr ""
 
-#: src/concepts/plugins.xml:119(para)
+#: src/concepts/plugins.xml:120(para)
 msgid ""
 "Because plugins are separate programs, they communicate with the "
 "<acronym>GIMP</acronym> core in a special way: The <acronym>GIMP</acronym> "
@@ -1204,7 +1223,7 @@ msgid ""
 "about a <quote>wire read error</quote>."
 msgstr ""
 
-#: src/concepts/plugins.xml:129(para)
+#: src/concepts/plugins.xml:130(para)
 msgid ""
 "When a plugin crashes, <acronym>GIMP</acronym> gives you a very ominous-"
 "looking message telling you that the plugin may have left <acronym>GIMP</"
@@ -1217,7 +1236,7 @@ msgid ""
 "something went wrong, and weigh it against the odds."
 msgstr ""
 
-#: src/concepts/plugins.xml:142(para)
+#: src/concepts/plugins.xml:143(para)
 msgid ""
 "Because of the way plugins communicate with <acronym>GIMP</acronym>, they do "
 "not have any mechanism for being informed about changes you make to an image "
@@ -1231,11 +1250,11 @@ msgid ""
 "foolishness."
 msgstr ""
 
-#: src/concepts/plugins.xml:158(phrase)
+#: src/concepts/plugins.xml:159(phrase)
 msgid "Installing New Plugins"
 msgstr ""
 
-#: src/concepts/plugins.xml:164(para)
+#: src/concepts/plugins.xml:165(para)
 msgid ""
 "The plugins that are distributed with <acronym>GIMP</acronym> don't require "
 "any special installation. Plugins that you download yourself do. There are "
@@ -1245,11 +1264,11 @@ msgid ""
 "considered separately."
 msgstr ""
 
-#: src/concepts/plugins.xml:174(phrase) src/concepts/intro.xml:74(term)
+#: src/concepts/plugins.xml:175(phrase) src/concepts/intro.xml:81(term)
 msgid "Linux"
 msgstr ""
 
-#: src/concepts/plugins.xml:176(para)
+#: src/concepts/plugins.xml:177(para)
 msgid ""
 "Most plugins fall into two categories: small ones whose source code is "
 "distributed as a single .c file, and larger ones whose source code is "
@@ -1257,7 +1276,7 @@ msgid ""
 "<filename>Makefile</filename>."
 msgstr ""
 
-#: src/concepts/plugins.xml:182(para)
+#: src/concepts/plugins.xml:183(para)
 msgid ""
 "For a simple one-file plugin, call it <filename>borker.c</filename>, "
 "installing it is just a matter of running the command <command>gimptool-2.0 "
@@ -1269,7 +1288,7 @@ msgid ""
 "fails to compile, well, be creative."
 msgstr ""
 
-#: src/concepts/plugins.xml:193(para)
+#: src/concepts/plugins.xml:194(para)
 msgid ""
 "Once you have installed the plugin, how do you activate it? The menu path is "
 "determined by the plugin itself, so to answer this you need to either look "
@@ -1280,7 +1299,7 @@ msgid ""
 "section -- whichever is easiest."
 msgstr ""
 
-#: src/concepts/plugins.xml:203(para)
+#: src/concepts/plugins.xml:204(para)
 msgid ""
 "For more complex plugins, organized as a directory with multiple files, "
 "there ought to be a file inside called either <filename>INSTALL</filename> "
@@ -1290,7 +1309,7 @@ msgid ""
 "frustrating in myriad ways."
 msgstr ""
 
-#: src/concepts/plugins.xml:212(para)
+#: src/concepts/plugins.xml:213(para)
 msgid ""
 "Some plugins (specifically those based on the <acronym>GIMP</acronym> Plugin "
 "Template) are designed to be installed in the main system <acronym>GIMP</"
@@ -1299,7 +1318,7 @@ msgid ""
 "<command>make install</command> command)."
 msgstr ""
 
-#: src/concepts/plugins.xml:220(para)
+#: src/concepts/plugins.xml:221(para)
 msgid ""
 "If you install in your personal plugin directory a plugin that has the same "
 "name as one in the system plugin directory, only one can be loaded, and it "
@@ -1308,11 +1327,11 @@ msgid ""
 "situation best avoided."
 msgstr ""
 
-#: src/concepts/plugins.xml:230(title)
+#: src/concepts/plugins.xml:231(title)
 msgid "Windows"
 msgstr "Windows"
 
-#: src/concepts/plugins.xml:231(para)
+#: src/concepts/plugins.xml:232(para)
 msgid ""
 "Windows is a much more problematic environment for building software than "
 "Linux. Every decent Linux distribution comes fully supplied with tools for "
@@ -1322,7 +1341,7 @@ msgid ""
 "substantial amount of money or a substantial amount of effort and knowledge."
 msgstr ""
 
-#: src/concepts/plugins.xml:240(para)
+#: src/concepts/plugins.xml:241(para)
 msgid ""
 "What this means in relation to <acronym>GIMP</acronym> plugins is the "
 "following: either you have an environment in which you can build software, "
@@ -1335,7 +1354,7 @@ msgid ""
 "these things, and just need to follow the Linux instructions."
 msgstr ""
 
-#: src/concepts/plugins.xml:252(para)
+#: src/concepts/plugins.xml:253(para)
 msgid ""
 "If you would like to set up a build environment, and are ready for the "
 "heroism involved, you can find a reasonably recent description of how to go "
@@ -1345,40 +1364,42 @@ msgid ""
 "it up to date by adding advice based on your own experiences."
 msgstr ""
 
-#: src/concepts/plugins.xml:265(phrase) src/concepts/intro.xml:126(term)
+#: src/concepts/plugins.xml:266(phrase) src/concepts/intro.xml:134(term)
 msgid "Apple Mac OS X"
 msgstr "Apple Mac OS X"
 
-#: src/concepts/plugins.xml:267(para)
+#: src/concepts/plugins.xml:268(para)
 msgid ""
-"How you install plugins on OS X mostly depends on how you installed GIMP "
-"itself. If you were one of the brave and installed GIMP through one of the "
-"package managers like fink <xref linkend=\"bibliography-online-darwinports\"/"
-"> or darwinports, <xref linkend=\"bibliography-online-fink\"/> the plugin "
-"installation works exactly the way it is described for the Linux platform "
-"already. The only difference is, that a couple of plugins might be even "
-"available in the repository of you package manager, so give it a try."
+"How you install plugins on OS X mostly depends on how you installed "
+"<acronym>GIMP</acronym> itself. If you were one of the brave and installed "
+"<acronym>GIMP</acronym> through one of the package managers like fink <xref "
+"linkend=\"bibliography-online-darwinports\"/> or darwinports, <xref linkend="
+"\"bibliography-online-fink\"/> the plugin installation works exactly the way "
+"it is described for the Linux platform already. The only difference is, that "
+"a couple of plugins might be even available in the repository of you package "
+"manager, so give it a try."
 msgstr ""
 
-#: src/concepts/plugins.xml:278(para)
+#: src/concepts/plugins.xml:280(para)
 msgid ""
 "If you on the other hand are one of the Users that preferred to grab a "
-"prebuild GIMP package like GIMP.app, you most probably want to stick to that "
-"prebuild stuff. So you can try to get a prebuild version of the plugin of "
-"you dreams from the author of the plugin, but I'd not want to bet on this. "
-"Building your own binaries unfortunately involves installing GIMP through "
-"one of the package managers mentioned above."
+"prebuild <acronym>GIMP</acronym> package like GIMP.app, you most probably "
+"want to stick to that prebuild stuff. So you can try to get a prebuild "
+"version of the plugin of you dreams from the author of the plugin, but I'd "
+"not want to bet on this. Building your own binaries unfortunately involves "
+"installing <acronym>GIMP</acronym> through one of the package managers "
+"mentioned above."
 msgstr ""
 
-#: src/concepts/plugins.xml:291(phrase)
+#: src/concepts/plugins.xml:295(phrase)
 msgid "Writing Plugins"
 msgstr "ç¼?å??æ??件"
 
-#: src/concepts/plugins.xml:295(secondary)
+#: src/concepts/plugins.xml:299(secondary)
 msgid "Write"
 msgstr "ç¼?å??"
 
-#: src/concepts/plugins.xml:297(para)
+#: src/concepts/plugins.xml:301(para)
 msgid ""
 "If you want to learn how to write a plugin, you can find plenty of help at "
 "the <acronym>GIMP</acronym> Developers web site <xref linkend=\"bibliography-"
@@ -1603,28 +1624,28 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/palettes.xml:65(None)
+#: src/concepts/palettes.xml:67(None)
 msgid ""
 "@@image: 'images/dialogs/palettes-dialog.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/palettes.xml:86(None)
+#: src/concepts/palettes.xml:89(None)
 msgid ""
 "@@image: 'images/dialogs/palette-editor.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/palettes.xml:148(None)
+#: src/concepts/palettes.xml:161(None)
 msgid ""
 "@@image: 'images/dialogs/colormap-dialog.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/palettes.xml:188(None)
+#: src/concepts/palettes.xml:202(None)
 msgid "@@image: 'images/using/palettes.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
@@ -1637,13 +1658,12 @@ msgid "Palette"
 msgstr ""
 
 #: src/concepts/palettes.xml:23(primary)
-#: src/concepts/layer-modes.xml:30(primary)
-#: src/concepts/layer-modes.xml:1309(term)
-#: src/concepts/layer-modes.xml:1313(secondary)
-#: src/concepts/layer-modes.xml:1316(primary)
-#: src/concepts/layer-modes.xml:1321(quote)
+#: src/concepts/layer-modes.xml:29(primary)
+#: src/concepts/layer-modes.xml:1233(term)
+#: src/concepts/layer-modes.xml:1237(secondary)
+#: src/concepts/layer-modes.xml:1240(primary)
 #: src/concepts/color-management.xml:13(primary)
-#: src/concepts/brushes.xml:99(secondary)
+#: src/concepts/brushes.xml:103(secondary)
 msgid "Color"
 msgstr ""
 
@@ -1657,8 +1677,8 @@ msgstr ""
 
 #: src/concepts/palettes.xml:30(para)
 msgid ""
-"A <emphasis>palette</emphasis> is a set of discrete colors. In GIMP, "
-"palettes are used mainly for two purposes:"
+"A <emphasis>palette</emphasis> is a set of discrete colors. In "
+"<acronym>GIMP</acronym>, palettes are used mainly for two purposes:"
 msgstr ""
 
 #: src/concepts/palettes.xml:36(para)
@@ -1671,101 +1691,105 @@ msgstr ""
 msgid ""
 "They form the colormaps of indexed images. An indexed image can use a "
 "maximum of 256 different colors, but these can be any colors. The colormap "
-"of an indexed image is called an \"indexed palette\" in GIMP."
+"of an indexed image is called an \"indexed palette\" in <acronym>GIMP</"
+"acronym>."
 msgstr ""
 
-#: src/concepts/palettes.xml:50(para)
+#: src/concepts/palettes.xml:51(para)
 msgid ""
 "Actually neither of these functions fall very much into the mainstream of "
-"GIMP usage: it is possible to do rather sophisticated things in GIMP without "
-"ever dealing with palettes. Still, they are something that an advanced user "
-"should understand, and even a less advanced user may need to think about "
-"them in some situations, as for example when working with GIF files."
+"<acronym>GIMP</acronym> usage: it is possible to do rather sophisticated "
+"things in <acronym>GIMP</acronym> without ever dealing with palettes. Still, "
+"they are something that an advanced user should understand, and even a less "
+"advanced user may need to think about them in some situations, as for "
+"example when working with GIF files."
 msgstr ""
 
-#: src/concepts/palettes.xml:61(phrase)
+#: src/concepts/palettes.xml:63(phrase)
 msgid "The Palettes dialog"
 msgstr ""
 
-#: src/concepts/palettes.xml:69(para)
+#: src/concepts/palettes.xml:71(para)
 msgid ""
-"When you install GIMP, it comes supplied with several dozen predefined "
-"palettes, and you can also create new ones. Some of the predefined palettes "
-"are commonly useful, such as the <quote>Web</quote> palette, which contains "
-"the set of colors considered <quote>web safe</quote>; many of the palettes "
-"seem to have been chosen more or less whimsically. You can access all of the "
-"available palettes using the <link linkend=\"gimp-palette-dialog\">Palettes "
-"dialog</link>. This is also the starting point if you want to create a new "
-"palette."
+"When you install <acronym>GIMP</acronym>, it comes supplied with several "
+"dozen predefined palettes, and you can also create new ones. Some of the "
+"predefined palettes are commonly useful, such as the <quote>Web</quote> "
+"palette, which contains the set of colors considered <quote>web safe</"
+"quote>; many of the palettes seem to have been chosen more or less "
+"whimsically. You can access all of the available palettes using the <link "
+"linkend=\"gimp-palette-dialog\">Palettes dialog</link>. This is also the "
+"starting point if you want to create a new palette."
 msgstr ""
 
-#: src/concepts/palettes.xml:82(phrase)
+#: src/concepts/palettes.xml:85(phrase)
 msgid "The Palette Editor"
 msgstr ""
 
-#: src/concepts/palettes.xml:90(para)
+#: src/concepts/palettes.xml:93(para)
 msgid ""
 "Double-clicking on a palette in the Palettes dialog brings up the <link "
 "linkend=\"gimp-palette-editor-dialog\">Palette Editor</link>, showing the "
 "colors from the palette you clicked on. You can use this to paint with the "
-"palette: clicking on a color sets GIMP's foreground to that color, as shown "
-"in the Color Area of the Toolbox. Holding down the <keycap>Ctrl</keycap> key "
-"while clicking, on the other hand, sets GIMP's background color to the color "
-"you click on."
+"palette: clicking on a color sets <acronym>GIMP</acronym>'s foreground to "
+"that color, as shown in the Color Area of the Toolbox. Holding down the "
+"<keycap>Ctrl</keycap> key while clicking, on the other hand, sets "
+"<acronym>GIMP</acronym>'s background color to the color you click on."
 msgstr ""
 
-#: src/concepts/palettes.xml:99(para)
+#: src/concepts/palettes.xml:104(para)
 msgid ""
 "You can also, as the name implies, use the Palette Editor to change the "
 "colors in a palette, so long as it is a palette that you have created "
-"yourself. You cannot edit the palettes that are supplied with GIMP; however "
-"you can duplicate them and then edit the copies."
+"yourself. You cannot edit the palettes that are supplied with <acronym>GIMP</"
+"acronym>; however you can duplicate them and then edit the copies."
 msgstr ""
 
-#: src/concepts/palettes.xml:105(para)
+#: src/concepts/palettes.xml:111(para)
 msgid ""
 "When you create palettes using the Palette Editor, they are automatically "
-"saved as soon as you exit GIMP, in the <filename>palettes</filename> folder "
-"of your personal GIMP directory. Any palette files in this directory, or in "
-"the system <filename>palettes</filename> directory created when GIMP is "
-"installed, are automatically loaded and shown in the Palettes dialog the "
-"next time you start GIMP. You can also add other folders to the palette "
-"search path using the <link linkend=\"gimp-prefs-folders-data\">Palette "
-"Folders</link> page of the Preferences dialog."
+"saved as soon as you exit <acronym>GIMP</acronym>, in the "
+"<filename>palettes</filename> folder of your personal <acronym>GIMP</"
+"acronym> directory. Any palette files in this directory, or in the system "
+"<filename>palettes</filename> directory created when <acronym>GIMP</acronym> "
+"is installed, are automatically loaded and shown in the Palettes dialog the "
+"next time you start <acronym>GIMP</acronym>. You can also add other folders "
+"to the palette search path using the <link linkend=\"gimp-prefs-folders-data"
+"\">Palette Folders</link> page of the Preferences dialog."
 msgstr ""
 
-#: src/concepts/palettes.xml:116(para)
+#: src/concepts/palettes.xml:126(para)
 msgid ""
-"GIMP palettes are stored using a special file format, in files with the "
-"extension <filename>.gpl</filename>. It is a very simple format, and they "
-"are ASCII files, so if you happen to obtain palettes from another source, "
-"and would like to use them in GIMP, it probably won't be very hard to "
-"convert them: just take a look at any <filename>.gpl</filename> and you will "
-"see what to do."
+"<acronym>GIMP</acronym> palettes are stored using a special file format, in "
+"files with the extension <filename>.gpl</filename>. It is a very simple "
+"format, and they are ASCII files, so if you happen to obtain palettes from "
+"another source, and would like to use them in <acronym>GIMP</acronym>, it "
+"probably won't be very hard to convert them: just take a look at any "
+"<filename>.gpl</filename> and you will see what to do."
 msgstr ""
 
-#: src/concepts/palettes.xml:127(phrase)
+#: src/concepts/palettes.xml:139(phrase)
 msgid "Colormap"
 msgstr ""
 
-#: src/concepts/palettes.xml:129(para)
+#: src/concepts/palettes.xml:141(para)
 msgid ""
-"Confusingly, GIMP makes use of two types of palettes. The more noticeable "
-"are the type shown in the Palettes dialog: palettes that exist independently "
-"of any image. The second type, <emphasis>indexed palettes</emphasis>, form "
-"the colormaps of indexed images. Each indexed image has its own private "
-"indexed palette, defining the set of colors available in the image: the "
-"maximum number of colors allowed in an indexed palette is 256. These "
-"palettes are called <quote>indexed</quote> because each color is associated "
-"with an index number. (Actually, the colors in ordinary palettes are "
-"numbered as well, but the numbers have no functional significance.)"
+"Confusingly, <acronym>GIMP</acronym> makes use of two types of palettes. The "
+"more noticeable are the type shown in the Palettes dialog: palettes that "
+"exist independently of any image. The second type, <emphasis>indexed "
+"palettes</emphasis>, form the colormaps of indexed images. Each indexed "
+"image has its own private indexed palette, defining the set of colors "
+"available in the image: the maximum number of colors allowed in an indexed "
+"palette is 256. These palettes are called <quote>indexed</quote> because "
+"each color is associated with an index number. (Actually, the colors in "
+"ordinary palettes are numbered as well, but the numbers have no functional "
+"significance.)"
 msgstr ""
 
-#: src/concepts/palettes.xml:144(phrase)
+#: src/concepts/palettes.xml:157(phrase)
 msgid "The Colormap dialog"
 msgstr ""
 
-#: src/concepts/palettes.xml:152(para)
+#: src/concepts/palettes.xml:165(para)
 msgid ""
 "The colormap of an indexed image is shown in the <link linkend=\"gimp-"
 "indexed-palette-dialog\"> Indexed Palette dialog </link>, which should not "
@@ -1775,19 +1799,19 @@ msgid ""
 "nothing."
 msgstr ""
 
-#: src/concepts/palettes.xml:159(para)
+#: src/concepts/palettes.xml:172(para)
 msgid ""
 "You can, however, create an ordinary palette from the colors in an indexed "
 "image---actually from the colors in any image. To do this, choose "
 "<guimenuitem>Import Palette</guimenuitem> from the right-click popup menu in "
 "the Palettes dialog: this pops up a dialog that gives you several options, "
 "including the option to import the palette from an image. (You can also "
-"import any of GIMP's gradients as a palette.) This possibility becomes "
-"important if you want to create a set of indexed images that all use the "
-"same set of colors."
+"import any of <acronym>GIMP</acronym>'s gradients as a palette.) This "
+"possibility becomes important if you want to create a set of indexed images "
+"that all use the same set of colors."
 msgstr ""
 
-#: src/concepts/palettes.xml:169(para)
+#: src/concepts/palettes.xml:183(para)
 msgid ""
 "When you convert an image into indexed mode, a major part of the process is "
 "the creation of an indexed palette for the image. How this happens is "
@@ -1796,75 +1820,75 @@ msgid ""
 "specified palette from the Palettes dialog."
 msgstr ""
 
-#: src/concepts/palettes.xml:176(para)
+#: src/concepts/palettes.xml:190(para)
 msgid ""
 "Thus, to sum up the foregoing, ordinary palettes can be turned into indexed "
 "palettes when you convert an image into indexed mode; indexed palettes can "
 "be turned into ordinary palettes by importing them into the Palettes dialog."
 msgstr ""
 
-#: src/concepts/palettes.xml:184(phrase)
+#: src/concepts/palettes.xml:198(phrase)
 msgid "Colormap dialog (1) and Palette dialog (2)"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layers.xml:131(None)
+#: src/concepts/layers.xml:134(None)
 msgid ""
 "@@image: 'images/glossary/alpha-channel-0.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layers.xml:151(None)
+#: src/concepts/layers.xml:154(None)
 msgid ""
 "@@image: 'images/glossary/alpha-channel-1.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layers.xml:168(None)
+#: src/concepts/layers.xml:171(None)
 msgid ""
 "@@image: 'images/glossary/alpha-channel-2.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layers.xml:185(None)
+#: src/concepts/layers.xml:188(None)
 msgid ""
 "@@image: 'images/glossary/alpha-channel-3a.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layers.xml:205(None)
+#: src/concepts/layers.xml:208(None)
 msgid ""
 "@@image: 'images/glossary/alpha-channel-3b.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layers.xml:266(None)
+#: src/concepts/layers.xml:269(None)
 msgid "@@image: 'images/dialogs/stock-eye-20.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layers.xml:303(None)
+#: src/concepts/layers.xml:306(None)
 msgid ""
 "@@image: 'images/dialogs/stock-vchain-24.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layers.xml:328(None)
+#: src/concepts/layers.xml:331(None)
 msgid ""
 "@@image: 'images/dialogs/link-visibility.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layers.xml:442(None)
+#: src/concepts/layers.xml:446(None)
 msgid "@@image: 'images/dialogs/lock-alpha.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
@@ -1872,46 +1896,47 @@ msgstr ""
 msgid "Introduction to Layers"
 msgstr ""
 
-#: src/concepts/layers.xml:21(primary) src/concepts/layers.xml:311(primary)
+#: src/concepts/layers.xml:21(primary) src/concepts/layers.xml:314(primary)
 #: src/concepts/concepts.xml:82(term)
 msgid "Layers"
 msgstr ""
 
 #: src/concepts/layers.xml:24(para)
 msgid ""
-"A good way to visualize a GIMP image is as a stack of transparencies: in "
-"GIMP terminology, each individual transparency is called a <emphasis>layer</"
-"emphasis>. There is no limit, in principle, to the number of layers an image "
-"can have: only the amount of memory available on the system. It is not "
-"uncommon for advanced users to work with images containing dozens of layers."
+"A good way to visualize a <acronym>GIMP</acronym> image is as a stack of "
+"transparencies: in <acronym>GIMP</acronym> terminology, each individual "
+"transparency is called a <emphasis>layer</emphasis>. There is no limit, in "
+"principle, to the number of layers an image can have: only the amount of "
+"memory available on the system. It is not uncommon for advanced users to "
+"work with images containing dozens of layers."
 msgstr ""
 
-#: src/concepts/layers.xml:32(para)
+#: src/concepts/layers.xml:33(para)
 msgid ""
 "The organization of layers in an image is shown by the Layers dialog, which "
-"is the second most important type of dialog window in GIMP, after the Main "
-"Toolbox. The appearance of the Layers dialog is shown in the adjoining "
-"illustration. How it works is described in detail in the <link linkend="
-"\"gimp-layer-dialog\">Layers Dialog</link> section, but we will touch on "
-"some aspects of it here, in relation to the layer properties that they "
-"display."
+"is the second most important type of dialog window in <acronym>GIMP</"
+"acronym>, after the Main Toolbox. The appearance of the Layers dialog is "
+"shown in the adjoining illustration. How it works is described in detail in "
+"the <link linkend=\"gimp-layer-dialog\">Layers Dialog</link> section, but we "
+"will touch on some aspects of it here, in relation to the layer properties "
+"that they display."
 msgstr ""
 
-#: src/concepts/layers.xml:41(para)
+#: src/concepts/layers.xml:43(para)
 msgid ""
 "<indexterm><primary>Drawable</primary></indexterm> Each open image has at "
 "any time a single <emphasis>active drawable</emphasis>. A <quote>drawable</"
-"quote> is a GIMP concept that includes layers, but also several other types "
-"of things, such as channels, layer masks, and the selection mask. "
-"(Basically, a <quote>drawable</quote> is anything that can be drawn on with "
-"painting tools). If a layer is currently active, it is shown highlighted in "
-"the Layers dialog, and its name is shown in the status area of the image "
-"window. If not, you can activate it by clicking on it. If none of the layers "
-"are highlighted, it means the active drawable is something other than a "
-"layer."
+"quote> is a <acronym>GIMP</acronym> concept that includes layers, but also "
+"several other types of things, such as channels, layer masks, and the "
+"selection mask. (Basically, a <quote>drawable</quote> is anything that can "
+"be drawn on with painting tools). If a layer is currently active, it is "
+"shown highlighted in the Layers dialog, and its name is shown in the status "
+"area of the image window. If not, you can activate it by clicking on it. If "
+"none of the layers are highlighted, it means the active drawable is "
+"something other than a layer."
 msgstr ""
 
-#: src/concepts/layers.xml:54(para)
+#: src/concepts/layers.xml:57(para)
 msgid ""
 "In the menubar above an image window, you can find a menu called "
 "<guimenu>Layer</guimenu>, containing a number of commands that affect the "
@@ -1919,19 +1944,19 @@ msgid ""
 "in the Layers dialog."
 msgstr ""
 
-#: src/concepts/layers.xml:62(title)
+#: src/concepts/layers.xml:65(title)
 msgid "Layer Properties"
 msgstr ""
 
-#: src/concepts/layers.xml:64(para)
+#: src/concepts/layers.xml:67(para)
 msgid "Each layer in an image has a number of important attributes:"
 msgstr ""
 
-#: src/concepts/layers.xml:70(term)
+#: src/concepts/layers.xml:73(term)
 msgid "Name"
 msgstr ""
 
-#: src/concepts/layers.xml:72(para)
+#: src/concepts/layers.xml:75(para)
 msgid ""
 "Every layer has a name. This is assigned automatically when the layer is "
 "created, but you can change it. You can change the name of a layer either by "
@@ -1940,30 +1965,30 @@ msgid ""
 "Layer Attributes</guimenuitem>."
 msgstr ""
 
-#: src/concepts/layers.xml:84(term)
+#: src/concepts/layers.xml:87(term)
 msgid "Presence or absence of an alpha channel"
 msgstr ""
 
-#: src/concepts/layers.xml:87(primary)
+#: src/concepts/layers.xml:90(primary)
 msgid "Background layer"
 msgstr ""
 
-#: src/concepts/layers.xml:90(primary)
+#: src/concepts/layers.xml:93(primary)
 msgid "Transparency"
 msgstr ""
 
-#: src/concepts/layers.xml:91(secondary)
+#: src/concepts/layers.xml:94(secondary)
 msgid "Background layer transparency"
 msgstr ""
 
-#: src/concepts/layers.xml:93(para)
+#: src/concepts/layers.xml:96(para)
 msgid ""
 "An alpha channel encodes information about how transparent a layer is at "
 "each pixel. It is visible in the Channel Dialog: white is complete opacity, "
 "black is complete transparency and grey levels are partial transparencies."
 msgstr ""
 
-#: src/concepts/layers.xml:99(para)
+#: src/concepts/layers.xml:102(para)
 msgid ""
 "The background layer is particular. If you have just created a new image, it "
 "has still only one layer which is a background layer. If the image has been "
@@ -1975,7 +2000,7 @@ msgid ""
 "layer-alpha-add\">Add an Alpha Channel</link>."
 msgstr ""
 
-#: src/concepts/layers.xml:111(para)
+#: src/concepts/layers.xml:114(para)
 msgid ""
 "Every layer other than the bottom layer of an image has automatically an "
 "Alpha channel, but you can't see a grayscale representation of the alpha "
@@ -1983,19 +2008,19 @@ msgid ""
 "more information."
 msgstr ""
 
-#: src/concepts/layers.xml:119(title)
+#: src/concepts/layers.xml:122(title)
 msgid "Example for Alpha channel"
 msgstr ""
 
-#: src/concepts/layers.xml:121(primary)
+#: src/concepts/layers.xml:124(primary)
 msgid "Alpha Channel"
 msgstr "Alpha é??é??"
 
-#: src/concepts/layers.xml:126(phrase)
+#: src/concepts/layers.xml:129(phrase)
 msgid "Alpha channel example: Basic image"
 msgstr "Alpha é??é??æ ·ä¾?ï¼?å?ºæ?¬å?¾å??"
 
-#: src/concepts/layers.xml:134(para)
+#: src/concepts/layers.xml:137(para)
 msgid ""
 "This image has three layers painted with pure 100% opaque Red, Green, and "
 "Blue. In the Channel Dialog, you can see that an alpha Channel has been "
@@ -2005,11 +2030,11 @@ msgid ""
 "channels are black."
 msgstr ""
 
-#: src/concepts/layers.xml:147(title)
+#: src/concepts/layers.xml:150(title)
 msgid "Alpha channel example: One transparent layer"
 msgstr ""
 
-#: src/concepts/layers.xml:154(para)
+#: src/concepts/layers.xml:157(para)
 msgid ""
 "The left part of the first layer has been made transparent (Rectangular "
 "selection, Edit/Clear). The second layer, green, is visible. The Alpha "
@@ -2017,11 +2042,11 @@ msgid ""
 "image."
 msgstr ""
 
-#: src/concepts/layers.xml:164(title)
+#: src/concepts/layers.xml:167(title)
 msgid "Alpha channel example: Two transparent layers"
 msgstr ""
 
-#: src/concepts/layers.xml:171(para)
+#: src/concepts/layers.xml:174(para)
 msgid ""
 "The left part of the second layer has been made transparent. The third "
 "layer, blue, is visible through the first and second layers. The Alpha "
@@ -2029,11 +2054,11 @@ msgid ""
 "image."
 msgstr ""
 
-#: src/concepts/layers.xml:181(title)
+#: src/concepts/layers.xml:184(title)
 msgid "Alpha channel example: Three transparent layers"
 msgstr ""
 
-#: src/concepts/layers.xml:188(para)
+#: src/concepts/layers.xml:191(para)
 msgid ""
 "The left part of the third layer has been made transparent. The Alpha "
 "channel is still white and the left part of the layer is white, opaque! The "
@@ -2041,11 +2066,11 @@ msgid ""
 "like the Eraser and uses the Background color of Toolbox."
 msgstr ""
 
-#: src/concepts/layers.xml:199(title)
+#: src/concepts/layers.xml:202(title)
 msgid "Alpha channel example: Alpha channel added to the Background"
 msgstr ""
 
-#: src/concepts/layers.xml:208(para)
+#: src/concepts/layers.xml:211(para)
 msgid ""
 "We used the <menuchoice><guimenu>Layer</guimenu><guimenuitem>Transparency</"
 "guimenuitem><guisubmenu>Add Alpha Channel</guisubmenu></menuchoice> command, "
@@ -2055,53 +2080,53 @@ msgid ""
 "Dialog."
 msgstr ""
 
-#: src/concepts/layers.xml:230(term)
+#: src/concepts/layers.xml:233(term)
 msgid "Layer type"
 msgstr "å?¾å±?ç±»å??"
 
-#: src/concepts/layers.xml:233(primary) src/concepts/layers.xml:344(primary)
-#: src/concepts/layers.xml:348(primary)
-#: src/concepts/layer-modes.xml:23(primary)
-#: src/concepts/docks.xml:358(primary)
+#: src/concepts/layers.xml:236(primary) src/concepts/layers.xml:347(primary)
+#: src/concepts/layers.xml:351(primary)
+#: src/concepts/layer-modes.xml:22(primary)
+#: src/concepts/docks.xml:385(primary)
 msgid "Layer"
 msgstr "��"
 
-#: src/concepts/layers.xml:234(secondary)
+#: src/concepts/layers.xml:237(secondary)
 msgid "Type"
 msgstr "ç±»å??"
 
-#: src/concepts/layers.xml:236(para)
+#: src/concepts/layers.xml:239(para)
 msgid ""
 "The layer type is determined by the image type (see previous section) and "
 "the presence or absence of an alpha channel. These are the possible layer "
 "types:"
 msgstr ""
 
-#: src/concepts/layers.xml:242(para)
+#: src/concepts/layers.xml:245(para)
 msgid "RGB"
 msgstr ""
 
-#: src/concepts/layers.xml:243(para)
+#: src/concepts/layers.xml:246(para)
 msgid "RGBA"
 msgstr ""
 
-#: src/concepts/layers.xml:244(para)
+#: src/concepts/layers.xml:247(para)
 msgid "Gray"
 msgstr ""
 
-#: src/concepts/layers.xml:245(para)
+#: src/concepts/layers.xml:248(para)
 msgid "GrayA"
 msgstr ""
 
-#: src/concepts/layers.xml:246(para)
+#: src/concepts/layers.xml:249(para)
 msgid "Indexed"
 msgstr ""
 
-#: src/concepts/layers.xml:247(para)
+#: src/concepts/layers.xml:250(para)
 msgid "IndexedA"
 msgstr ""
 
-#: src/concepts/layers.xml:249(para)
+#: src/concepts/layers.xml:252(para)
 msgid ""
 "The main reason this matters is that most filters (in the <guimenu>Filters</"
 "guimenu> menu) only accept a subset of layer types, and appear grayed out in "
@@ -2110,15 +2135,15 @@ msgid ""
 "removing an alpha channel."
 msgstr ""
 
-#: src/concepts/layers.xml:270(phrase) src/concepts/layers.xml:274(primary)
+#: src/concepts/layers.xml:273(phrase) src/concepts/layers.xml:277(primary)
 msgid "Visibility"
 msgstr ""
 
-#: src/concepts/layers.xml:275(secondary) src/concepts/docks.xml:416(term)
+#: src/concepts/layers.xml:278(secondary) src/concepts/docks.xml:439(term)
 msgid "Icon"
 msgstr ""
 
-#: src/concepts/layers.xml:277(para)
+#: src/concepts/layers.xml:280(para)
 msgid ""
 "It is possible to temporarily remove a layer from an image, without "
 "destroying it, by clicking on the symbol in the Layers dialog. This is "
@@ -2129,63 +2154,64 @@ msgid ""
 "some of the other layers."
 msgstr ""
 
-#: src/concepts/layers.xml:288(para)
+#: src/concepts/layers.xml:291(para)
 msgid ""
 "If you <emphasis>Shift</emphasis>-click on the eye symbol, this will cause "
 "all layers <emphasis>except</emphasis> the one you click on to be hidden."
 msgstr ""
 
-#: src/concepts/layers.xml:307(phrase)
+#: src/concepts/layers.xml:310(phrase)
 msgid "Linkage to other layers"
 msgstr ""
 
-#: src/concepts/layers.xml:312(secondary)
+#: src/concepts/layers.xml:315(secondary)
 msgid "Linkage"
 msgstr ""
 
-#: src/concepts/layers.xml:315(primary)
+#: src/concepts/layers.xml:318(primary)
 msgid "Chain icon"
 msgstr ""
 
-#: src/concepts/layers.xml:317(para)
+#: src/concepts/layers.xml:320(para)
 msgid ""
 "If you click between the eye icon and the layer thumbnail, you get a chain "
 "icon, which enables you to group layers for operations on multiple layers "
 "(for example with the Move tool or a transform tool)."
 msgstr ""
 
-#: src/concepts/layers.xml:324(title)
+#: src/concepts/layers.xml:327(title)
 msgid "Layer Dialog"
 msgstr ""
 
-#: src/concepts/layers.xml:331(para)
+#: src/concepts/layers.xml:334(para)
 msgid "Red: Linkage to others layers. Green: Visibility."
 msgstr ""
 
-#: src/concepts/layers.xml:341(term)
+#: src/concepts/layers.xml:344(term)
 msgid "Size and boundaries"
 msgstr ""
 
-#: src/concepts/layers.xml:345(secondary)
+#: src/concepts/layers.xml:348(secondary)
 msgid "Size"
 msgstr ""
 
-#: src/concepts/layers.xml:349(secondary)
+#: src/concepts/layers.xml:352(secondary)
 msgid "Boundaries"
 msgstr ""
 
-#: src/concepts/layers.xml:351(para)
+#: src/concepts/layers.xml:354(para)
 msgid ""
-"In GIMP, the boundaries of a layer do not necessarily match the boundaries "
-"of the image that contains it. When you create text, for example, each text "
-"item goes into its own separate layer, and the layer is precisely sized to "
-"contain the text and nothing more. Also, when you create a new layer using "
-"cut-and-paste, the new layer is sized just large enough to contain the "
-"pasted item. In the image window, the boundaries of the currently active "
-"layer are shown outlined with a black-and-yellow dashed line."
+"In <acronym>GIMP</acronym>, the boundaries of a layer do not necessarily "
+"match the boundaries of the image that contains it. When you create text, "
+"for example, each text item goes into its own separate layer, and the layer "
+"is precisely sized to contain the text and nothing more. Also, when you "
+"create a new layer using cut-and-paste, the new layer is sized just large "
+"enough to contain the pasted item. In the image window, the boundaries of "
+"the currently active layer are shown outlined with a black-and-yellow dashed "
+"line."
 msgstr ""
 
-#: src/concepts/layers.xml:361(para)
+#: src/concepts/layers.xml:365(para)
 msgid ""
 "The main reason why this matters is that you cannot do anything to a layer "
 "outside of its boundaries: you can't act on what doesn't exist. If this "
@@ -2194,7 +2220,7 @@ msgid ""
 "guimenu> menu."
 msgstr ""
 
-#: src/concepts/layers.xml:369(para)
+#: src/concepts/layers.xml:373(para)
 msgid ""
 "The amount of memory that a layer consumes is determined by its dimensions, "
 "not its contents. So, if you are working with large images or images that "
@@ -2202,22 +2228,22 @@ msgid ""
 "size."
 msgstr ""
 
-#: src/concepts/layers.xml:380(term)
+#: src/concepts/layers.xml:384(term)
 msgid "Opacity"
 msgstr ""
 
-#: src/concepts/layers.xml:382(para)
+#: src/concepts/layers.xml:386(para)
 msgid ""
 "The opacity of a layer determines the extent to which it lets colors from "
 "layers beneath it in the stack show through. Opacity ranges from 0 to 100, "
 "with 0 meaning complete transparency, and 100 meaning complete opacity."
 msgstr ""
 
-#: src/concepts/layers.xml:392(term)
+#: src/concepts/layers.xml:396(term)
 msgid "Mode"
 msgstr ""
 
-#: src/concepts/layers.xml:394(para)
+#: src/concepts/layers.xml:398(para)
 msgid ""
 "The Mode of a layer determines how colors from the layer are combined with "
 "colors from the underlying layers to produce a visible result. This is a "
@@ -2226,15 +2252,15 @@ msgid ""
 "modes\"/>."
 msgstr ""
 
-#: src/concepts/layers.xml:405(term) src/concepts/layers.xml:409(secondary)
+#: src/concepts/layers.xml:409(term) src/concepts/layers.xml:413(secondary)
 msgid "Layer mask"
 msgstr ""
 
-#: src/concepts/layers.xml:408(primary)
+#: src/concepts/layers.xml:412(primary)
 msgid "Masks"
 msgstr ""
 
-#: src/concepts/layers.xml:412(para)
+#: src/concepts/layers.xml:416(para)
 msgid ""
 "In addition to the alpha channel, there is another way to control the "
 "transparency of a layer: by adding a <emphasis>layer mask</emphasis>, which "
@@ -2244,11 +2270,11 @@ msgid ""
 "linkend=\"gimp-layer-mask\">Layer Mask</link> section."
 msgstr ""
 
-#: src/concepts/layers.xml:426(term)
+#: src/concepts/layers.xml:430(term)
 msgid "<quote>Lock alpha channel</quote> setting"
 msgstr ""
 
-#: src/concepts/layers.xml:428(para)
+#: src/concepts/layers.xml:432(para)
 msgid ""
 "In the upper left corner of the Layers dialog appears a small checkbox that "
 "controls the <quote>Lock</quote> setting for the transparency of the layer "
@@ -2257,46 +2283,46 @@ msgid ""
 "nothing that you do to a transparent part of the layer will have any effect."
 msgstr ""
 
-#: src/concepts/layers.xml:438(title)
+#: src/concepts/layers.xml:442(title)
 msgid "Lock Alpha channel"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:69(None)
+#: src/concepts/layer-modes.xml:68(None)
 msgid ""
 "@@image: 'images/using/layer-mode-mask1.jpg'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:77(None)
+#: src/concepts/layer-modes.xml:76(None)
 msgid ""
 "@@image: 'images/using/layer-mode-mask2.jpg'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:91(None)
+#: src/concepts/layer-modes.xml:90(None)
 msgid "@@image: 'images/using/keyfob_orig.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:99(None)
+#: src/concepts/layer-modes.xml:98(None)
 msgid "@@image: 'images/using/duck_orig.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:163(None)
+#: src/concepts/layer-modes.xml:164(None)
 msgid ""
 "@@image: 'images/using/layer-mode-normal-50.jpg'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:174(None)
+#: src/concepts/layer-modes.xml:176(None)
 msgid ""
 "@@image: 'images/using/layer-mode-normal-100.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2328,7 +2354,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:270(None)
+#: src/concepts/layer-modes.xml:271(None)
 msgid ""
 "@@image: 'images/using/layer-mode-dissolve-dbig.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2336,7 +2362,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:298(None)
+#: src/concepts/layer-modes.xml:296(None)
 msgid ""
 "@@image: 'images/using/layer-mode-multiply-mask1.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2344,7 +2370,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:308(None)
+#: src/concepts/layer-modes.xml:307(None)
 msgid ""
 "@@image: 'images/using/layer-mode-multiply-mask2.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2352,7 +2378,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:358(None)
+#: src/concepts/layer-modes.xml:351(None)
 msgid ""
 "@@image: 'images/using/layer-mode-divide-mask1.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2360,7 +2386,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:368(None)
+#: src/concepts/layer-modes.xml:362(None)
 msgid ""
 "@@image: 'images/using/layer-mode-divide-mask2.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2368,7 +2394,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:415(None)
+#: src/concepts/layer-modes.xml:407(None)
 msgid ""
 "@@image: 'images/using/layer-mode-screen-mask1.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2376,7 +2402,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:425(None)
+#: src/concepts/layer-modes.xml:418(None)
 msgid ""
 "@@image: 'images/using/layer-mode-screen-mask2.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2384,7 +2410,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:481(None)
+#: src/concepts/layer-modes.xml:468(None)
 msgid ""
 "@@image: 'images/using/layer-mode-overlay-mask1.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2392,7 +2418,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:491(None)
+#: src/concepts/layer-modes.xml:479(None)
 msgid ""
 "@@image: 'images/using/layer-mode-overlay-mask2.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2400,7 +2426,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:551(None)
+#: src/concepts/layer-modes.xml:534(None)
 msgid ""
 "@@image: 'images/using/layer-mode-dodge-mask1.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2408,7 +2434,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:561(None)
+#: src/concepts/layer-modes.xml:545(None)
 msgid ""
 "@@image: 'images/using/layer-mode-dodge-mask2.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2416,7 +2442,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:613(None)
+#: src/concepts/layer-modes.xml:591(None)
 msgid ""
 "@@image: 'images/using/layer-mode-burn-mask1.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2424,7 +2450,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:623(None)
+#: src/concepts/layer-modes.xml:602(None)
 msgid ""
 "@@image: 'images/using/layer-mode-burn-mask2.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2432,7 +2458,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:677(None)
+#: src/concepts/layer-modes.xml:650(None)
 msgid ""
 "@@image: 'images/using/layer-mode-hard-light-mask1.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2440,7 +2466,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:687(None)
+#: src/concepts/layer-modes.xml:661(None)
 msgid ""
 "@@image: 'images/using/layer-mode-hard-light-mask2.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2448,7 +2474,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:750(None)
+#: src/concepts/layer-modes.xml:718(None)
 msgid ""
 "@@image: 'images/using/layer-mode-soft-light-mask1.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2456,7 +2482,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:760(None)
+#: src/concepts/layer-modes.xml:729(None)
 msgid ""
 "@@image: 'images/using/layer-mode-soft-light-mask2.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2464,7 +2490,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:822(None)
+#: src/concepts/layer-modes.xml:781(None)
 msgid ""
 "@@image: 'images/using/layer-mode-grain-extract-mask1.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2472,7 +2498,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:832(None)
+#: src/concepts/layer-modes.xml:792(None)
 msgid ""
 "@@image: 'images/using/layer-mode-grain-extract-mask2.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2480,7 +2506,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:886(None)
+#: src/concepts/layer-modes.xml:839(None)
 msgid ""
 "@@image: 'images/using/layer-mode-grain-merge-mask1.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2488,7 +2514,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:896(None)
+#: src/concepts/layer-modes.xml:850(None)
 msgid ""
 "@@image: 'images/using/layer-mode-grain-merge-mask2.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2496,7 +2522,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:943(None)
+#: src/concepts/layer-modes.xml:891(None)
 msgid ""
 "@@image: 'images/using/layer-mode-difference-mask1.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2504,7 +2530,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:953(None)
+#: src/concepts/layer-modes.xml:902(None)
 msgid ""
 "@@image: 'images/using/layer-mode-difference-mask2.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2512,7 +2538,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1002(None)
+#: src/concepts/layer-modes.xml:945(None)
 msgid ""
 "@@image: 'images/using/layer-mode-addition-mask1.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2520,7 +2546,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1012(None)
+#: src/concepts/layer-modes.xml:956(None)
 msgid ""
 "@@image: 'images/using/layer-mode-addition-mask2.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2528,7 +2554,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1061(None)
+#: src/concepts/layer-modes.xml:999(None)
 msgid ""
 "@@image: 'images/using/layer-mode-subtract-mask1.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2536,7 +2562,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1071(None)
+#: src/concepts/layer-modes.xml:1010(None)
 msgid ""
 "@@image: 'images/using/layer-mode-subtract-mask2.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2544,7 +2570,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1118(None)
+#: src/concepts/layer-modes.xml:1051(None)
 msgid ""
 "@@image: 'images/using/layer-mode-darken-only-mask1.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2552,7 +2578,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1128(None)
+#: src/concepts/layer-modes.xml:1062(None)
 msgid ""
 "@@image: 'images/using/layer-mode-darken-only-mask2.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2560,7 +2586,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1177(None)
+#: src/concepts/layer-modes.xml:1105(None)
 msgid ""
 "@@image: 'images/using/layer-mode-lighten-only-mask1.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2568,7 +2594,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1187(None)
+#: src/concepts/layer-modes.xml:1116(None)
 msgid ""
 "@@image: 'images/using/layer-mode-lighten-only-mask2.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2576,21 +2602,21 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1236(None)
+#: src/concepts/layer-modes.xml:1159(None)
 msgid ""
 "@@image: 'images/using/layer-mode-hue-mask1.jpg'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1246(None)
+#: src/concepts/layer-modes.xml:1170(None)
 msgid ""
 "@@image: 'images/using/layer-mode-hue-mask2.jpg'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1282(None)
+#: src/concepts/layer-modes.xml:1204(None)
 msgid ""
 "@@image: 'images/using/layer-mode-saturation-mask1.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2598,7 +2624,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1292(None)
+#: src/concepts/layer-modes.xml:1215(None)
 msgid ""
 "@@image: 'images/using/layer-mode-saturation-mask2.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -2606,7 +2632,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1326(None)
+#: src/concepts/layer-modes.xml:1247(None)
 msgid ""
 "@@image: 'images/using/layer-mode-color-mask1.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2614,7 +2640,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1336(None)
+#: src/concepts/layer-modes.xml:1258(None)
 msgid ""
 "@@image: 'images/using/layer-mode-color-mask2.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2622,7 +2648,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1370(None)
+#: src/concepts/layer-modes.xml:1290(None)
 msgid ""
 "@@image: 'images/using/layer-mode-value-mask1.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2630,7 +2656,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1380(None)
+#: src/concepts/layer-modes.xml:1301(None)
 msgid ""
 "@@image: 'images/using/layer-mode-value-mask2.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2638,45 +2664,45 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/layer-modes.xml:1415(None)
+#: src/concepts/layer-modes.xml:1336(None)
 msgid ""
 "@@image: 'images/glossary/modes-multilayer.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:20(phrase)
-#: src/concepts/layer-modes.xml:152(primary)
-#: src/concepts/layer-modes.xml:206(primary)
-#: src/concepts/layer-modes.xml:284(primary)
-#: src/concepts/layer-modes.xml:344(primary)
-#: src/concepts/layer-modes.xml:401(primary)
-#: src/concepts/layer-modes.xml:467(primary)
-#: src/concepts/layer-modes.xml:537(primary)
-#: src/concepts/layer-modes.xml:599(primary)
-#: src/concepts/layer-modes.xml:663(primary)
-#: src/concepts/layer-modes.xml:736(primary)
-#: src/concepts/layer-modes.xml:808(primary)
-#: src/concepts/layer-modes.xml:865(primary)
-#: src/concepts/layer-modes.xml:929(primary)
+#: src/concepts/layer-modes.xml:19(title)
+#: src/concepts/layer-modes.xml:156(primary)
+#: src/concepts/layer-modes.xml:209(primary)
+#: src/concepts/layer-modes.xml:285(primary)
+#: src/concepts/layer-modes.xml:340(primary)
+#: src/concepts/layer-modes.xml:396(primary)
+#: src/concepts/layer-modes.xml:457(primary)
+#: src/concepts/layer-modes.xml:523(primary)
+#: src/concepts/layer-modes.xml:580(primary)
+#: src/concepts/layer-modes.xml:639(primary)
+#: src/concepts/layer-modes.xml:707(primary)
+#: src/concepts/layer-modes.xml:770(primary)
+#: src/concepts/layer-modes.xml:822(primary)
+#: src/concepts/layer-modes.xml:880(primary)
+#: src/concepts/layer-modes.xml:934(primary)
 #: src/concepts/layer-modes.xml:988(primary)
-#: src/concepts/layer-modes.xml:1047(primary)
-#: src/concepts/layer-modes.xml:1104(primary)
-#: src/concepts/layer-modes.xml:1163(primary)
-#: src/concepts/layer-modes.xml:1222(primary)
-#: src/concepts/layer-modes.xml:1268(primary)
-#: src/concepts/layer-modes.xml:1312(primary)
-#: src/concepts/layer-modes.xml:1356(primary)
+#: src/concepts/layer-modes.xml:1040(primary)
+#: src/concepts/layer-modes.xml:1094(primary)
+#: src/concepts/layer-modes.xml:1148(primary)
+#: src/concepts/layer-modes.xml:1193(primary)
+#: src/concepts/layer-modes.xml:1236(primary)
+#: src/concepts/layer-modes.xml:1279(primary)
 msgid "Layer Modes"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:24(secondary)
+#: src/concepts/layer-modes.xml:23(secondary)
 msgid "Modes"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:27(primary)
+#: src/concepts/layer-modes.xml:26(primary)
 msgid "Modes of layers"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:31(secondary)
+#: src/concepts/layer-modes.xml:30(secondary)
 msgid "Merging layer Modes"
 msgstr ""
 
@@ -2690,7 +2716,7 @@ msgid ""
 "modes."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:40(para)
+#: src/concepts/layer-modes.xml:41(para)
 msgid ""
 "You can set the layer mode in the <guilabel>Mode</guilabel> menu in the "
 "Layers dialog. <acronym>GIMP</acronym> uses the layer mode to determine how "
@@ -2698,7 +2724,7 @@ msgid ""
 "in the layer below it."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:47(para)
+#: src/concepts/layer-modes.xml:48(para)
 msgid ""
 "There is a drop-down list in the Toolbox options box which contains modes "
 "that affect the painting tools in a similar way to the layer modes. You can "
@@ -2707,7 +2733,7 @@ msgid ""
 "linkend=\"gimp-tool-painting\"/>."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:55(para)
+#: src/concepts/layer-modes.xml:56(para)
 msgid ""
 "Layer modes permit complex color changes in the image. They are often used "
 "with a new layer which acts as a kind of mask. For example, if you put a "
@@ -2716,31 +2742,31 @@ msgid ""
 "shades of gray."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:65(phrase)
+#: src/concepts/layer-modes.xml:65(title)
 msgid "Images (masks) for layer mode examples"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:72(para)
+#: src/concepts/layer-modes.xml:71(para)
 msgid "Mask 1"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:80(para)
+#: src/concepts/layer-modes.xml:79(para)
 msgid "Mask 2"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:87(phrase)
+#: src/concepts/layer-modes.xml:86(phrase)
 msgid "Images (backgrounds) for layer mode examples"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:94(para)
+#: src/concepts/layer-modes.xml:93(para)
 msgid "Key fob"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:102(para)
+#: src/concepts/layer-modes.xml:101(para)
 msgid "Ducks"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:107(para)
+#: src/concepts/layer-modes.xml:106(para)
 msgid ""
 "In the descriptions of the layer modes below, the equations are also shown. "
 "This is for those who are curious about the mathematics of the layer modes. "
@@ -2748,33 +2774,39 @@ msgid ""
 "effectively, however."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:113(para)
+#: src/concepts/layer-modes.xml:112(para)
 msgid "The equations are in a shorthand notation. For example, the equation"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:118(phrase)
+#: src/concepts/layer-modes.xml:117(phrase)
 msgid "Example"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:120(alt)
+#: src/concepts/layer-modes.xml:119(alt)
 msgid "$E = M + I$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:123(para)
+#: src/concepts/layer-modes.xml:122(para)
 msgid ""
 "means, <quote> For each pixel in the upper (<emphasis>M</emphasis>ask)and "
 "lower (<emphasis>I</emphasis>mage) layer, add each of the corresponding "
 "color components together to form the <emphasis>E</emphasis> resulting "
 "pixel's color. </quote> Pixel color components must always be between 0 and "
-"255. Unless the description below says otherwise, a negative color component "
-"is set to 0 and a color component larger than 255 is set to 255."
+"255."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:135(para)
+#. cf. bug #544965 (2008-07-27)
+#: src/concepts/layer-modes.xml:134(para)
+msgid ""
+"Unless the description below says otherwise, a negative color component is "
+"set to 0 and a color component larger than 255 is set to 255."
+msgstr ""
+
+#: src/concepts/layer-modes.xml:139(para)
 msgid "The examples below show the effects of each of the modes."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:138(para)
+#: src/concepts/layer-modes.xml:142(para)
 msgid ""
 "Since the results of each mode vary greatly depending upon the colors on the "
 "layers, these images can only give you a general idea of how the modes work. "
@@ -2784,102 +2816,70 @@ msgid ""
 "happens with the layer modes."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:149(term)
-#: src/concepts/layer-modes.xml:153(secondary)
-#: src/concepts/layer-modes.xml:158(quote)
-#: src/concepts/layer-modes.xml:193(quote)
+#: src/concepts/layer-modes.xml:153(term)
+#: src/concepts/layer-modes.xml:157(secondary)
+#: src/concepts/layer-modes.xml:196(quote)
 msgid "Normal"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:157(phrase)
-#: src/concepts/layer-modes.xml:214(phrase)
-#: src/concepts/layer-modes.xml:292(phrase)
-#: src/concepts/layer-modes.xml:352(phrase)
-#: src/concepts/layer-modes.xml:409(phrase)
-#: src/concepts/layer-modes.xml:475(phrase)
-#: src/concepts/layer-modes.xml:545(phrase)
-#: src/concepts/layer-modes.xml:607(phrase)
-#: src/concepts/layer-modes.xml:671(phrase)
-#: src/concepts/layer-modes.xml:744(phrase)
-#: src/concepts/layer-modes.xml:816(phrase)
-#: src/concepts/layer-modes.xml:879(phrase)
-#: src/concepts/layer-modes.xml:937(phrase)
-#: src/concepts/layer-modes.xml:996(phrase)
-#: src/concepts/layer-modes.xml:1055(phrase)
-#: src/concepts/layer-modes.xml:1112(phrase)
-#: src/concepts/layer-modes.xml:1171(phrase)
-#: src/concepts/layer-modes.xml:1230(phrase)
-#: src/concepts/layer-modes.xml:1276(phrase)
-#: src/concepts/layer-modes.xml:1320(phrase)
-#: src/concepts/layer-modes.xml:1364(phrase)
-msgid "Example for layer mode <placeholder-1/>"
-msgstr ""
-
-#: src/concepts/layer-modes.xml:166(para)
+#: src/concepts/layer-modes.xml:160(title)
+msgid "Example for layer mode <quote>Normal</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:167(para)
 #: src/concepts/layer-modes.xml:223(para)
 msgid "Both images are blended into each other with the same intensity."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:177(para)
+#: src/concepts/layer-modes.xml:179(para)
 msgid ""
 "With 100% opacity only the upper layer is shown when blending with "
 "<quote>Normal</quote>."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:184(para)
+#: src/concepts/layer-modes.xml:186(para)
 msgid ""
 "<guilabel>Normal</guilabel> mode is the default layer mode. The layer on top "
 "covers the layers below it. If you want to see anything below the top layer "
 "when you use this mode, the layer must have some transparent areas."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:189(para)
+#: src/concepts/layer-modes.xml:192(para)
 #: src/concepts/layer-modes.xml:324(para)
-#: src/concepts/layer-modes.xml:384(para)
-#: src/concepts/layer-modes.xml:445(para)
-#: src/concepts/layer-modes.xml:509(phrase)
-#: src/concepts/layer-modes.xml:582(para)
-#: src/concepts/layer-modes.xml:645(para)
-#: src/concepts/layer-modes.xml:848(para)
-#: src/concepts/layer-modes.xml:912(para)
-#: src/concepts/layer-modes.xml:968(para)
+#: src/concepts/layer-modes.xml:379(para)
+#: src/concepts/layer-modes.xml:439(para)
+#: src/concepts/layer-modes.xml:498(phrase)
+#: src/concepts/layer-modes.xml:567(para)
+#: src/concepts/layer-modes.xml:625(para)
+#: src/concepts/layer-modes.xml:809(para)
+#: src/concepts/layer-modes.xml:867(para)
+#: src/concepts/layer-modes.xml:918(para)
+#: src/concepts/layer-modes.xml:972(para)
 #: src/concepts/layer-modes.xml:1027(para)
-#: src/concepts/layer-modes.xml:1087(para)
-#: src/concepts/layer-modes.xml:1143(para)
-#: src/concepts/layer-modes.xml:1202(para)
+#: src/concepts/layer-modes.xml:1078(para)
+#: src/concepts/layer-modes.xml:1132(para)
 msgid "The equation is:"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:192(phrase)
-#: src/concepts/layer-modes.xml:327(phrase)
-#: src/concepts/layer-modes.xml:387(phrase)
-#: src/concepts/layer-modes.xml:448(phrase)
-#: src/concepts/layer-modes.xml:521(phrase)
-#: src/concepts/layer-modes.xml:585(phrase)
-#: src/concepts/layer-modes.xml:648(phrase)
-#: src/concepts/layer-modes.xml:781(phrase)
-#: src/concepts/layer-modes.xml:792(phrase)
-#: src/concepts/layer-modes.xml:851(phrase)
-#: src/concepts/layer-modes.xml:915(phrase)
-#: src/concepts/layer-modes.xml:971(phrase)
-#: src/concepts/layer-modes.xml:1030(phrase)
-#: src/concepts/layer-modes.xml:1090(phrase)
-#: src/concepts/layer-modes.xml:1146(phrase)
-#: src/concepts/layer-modes.xml:1205(phrase)
+#: src/concepts/layer-modes.xml:195(phrase)
+#: src/concepts/layer-modes.xml:382(phrase)
 msgid "Equation for layer mode <placeholder-1/>"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:196(alt)
+#: src/concepts/layer-modes.xml:199(alt)
 msgid "$E = M$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:203(term)
-#: src/concepts/layer-modes.xml:207(secondary)
-#: src/concepts/layer-modes.xml:210(primary)
-#: src/concepts/layer-modes.xml:215(quote)
+#: src/concepts/layer-modes.xml:206(term)
+#: src/concepts/layer-modes.xml:210(secondary)
+#: src/concepts/layer-modes.xml:213(primary)
 msgid "Dissolve"
 msgstr ""
 
+#: src/concepts/layer-modes.xml:216(title)
+msgid "Example for layer mode <quote>Dissolve</quote>"
+msgstr ""
+
 #: src/concepts/layer-modes.xml:235(para)
 msgid ""
 "With 100% opacity only the upper layer is shown when blending with "
@@ -2894,7 +2894,7 @@ msgid ""
 "painting mode."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:248(para)
+#: src/concepts/layer-modes.xml:249(para)
 msgid ""
 "This is especially visible along the edges within an image. It is easiest to "
 "see in an enlarged screenshot. The image on the left illustrates "
@@ -2903,7 +2903,7 @@ msgid ""
 "seen how the pixels are dispersed."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:258(phrase)
+#: src/concepts/layer-modes.xml:258(title)
 msgid "Enlarged screenshots"
 msgstr ""
 
@@ -2911,63 +2911,65 @@ msgstr ""
 msgid "Normal mode."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:273(para)
+#: src/concepts/layer-modes.xml:274(para)
 msgid "Dissolve mode."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:281(term)
-#: src/concepts/layer-modes.xml:285(secondary)
-#: src/concepts/layer-modes.xml:288(primary)
-#: src/concepts/layer-modes.xml:293(quote)
-#: src/concepts/layer-modes.xml:328(quote)
+#: src/concepts/layer-modes.xml:282(term)
+#: src/concepts/layer-modes.xml:286(secondary)
+#: src/concepts/layer-modes.xml:289(primary)
 msgid "Multiply"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:301(para)
-#: src/concepts/layer-modes.xml:361(para)
-#: src/concepts/layer-modes.xml:418(para)
-#: src/concepts/layer-modes.xml:484(para)
-#: src/concepts/layer-modes.xml:554(para)
-#: src/concepts/layer-modes.xml:616(para)
-#: src/concepts/layer-modes.xml:680(para)
-#: src/concepts/layer-modes.xml:753(para)
-#: src/concepts/layer-modes.xml:825(para)
-#: src/concepts/layer-modes.xml:889(para)
-#: src/concepts/layer-modes.xml:946(para)
-#: src/concepts/layer-modes.xml:1005(para)
-#: src/concepts/layer-modes.xml:1064(para)
-#: src/concepts/layer-modes.xml:1121(para)
-#: src/concepts/layer-modes.xml:1180(para)
-#: src/concepts/layer-modes.xml:1239(para)
-#: src/concepts/layer-modes.xml:1285(para)
-#: src/concepts/layer-modes.xml:1329(para)
-#: src/concepts/layer-modes.xml:1373(para)
+#: src/concepts/layer-modes.xml:292(title)
+msgid "Example for layer mode <quote>Multiply</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:299(para)
+#: src/concepts/layer-modes.xml:354(para)
+#: src/concepts/layer-modes.xml:410(para)
+#: src/concepts/layer-modes.xml:471(para)
+#: src/concepts/layer-modes.xml:537(para)
+#: src/concepts/layer-modes.xml:594(para)
+#: src/concepts/layer-modes.xml:653(para)
+#: src/concepts/layer-modes.xml:721(para)
+#: src/concepts/layer-modes.xml:784(para)
+#: src/concepts/layer-modes.xml:842(para)
+#: src/concepts/layer-modes.xml:894(para)
+#: src/concepts/layer-modes.xml:948(para)
+#: src/concepts/layer-modes.xml:1002(para)
+#: src/concepts/layer-modes.xml:1054(para)
+#: src/concepts/layer-modes.xml:1108(para)
+#: src/concepts/layer-modes.xml:1162(para)
+#: src/concepts/layer-modes.xml:1207(para)
+#: src/concepts/layer-modes.xml:1250(para)
+#: src/concepts/layer-modes.xml:1293(para)
 msgid "Mask 1 is used as upper layer with 100% opacity."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:311(para)
-#: src/concepts/layer-modes.xml:371(para)
-#: src/concepts/layer-modes.xml:428(para)
-#: src/concepts/layer-modes.xml:494(para)
-#: src/concepts/layer-modes.xml:564(para)
-#: src/concepts/layer-modes.xml:626(para)
-#: src/concepts/layer-modes.xml:690(para)
-#: src/concepts/layer-modes.xml:763(para)
-#: src/concepts/layer-modes.xml:835(para)
-#: src/concepts/layer-modes.xml:899(para)
-#: src/concepts/layer-modes.xml:956(para)
-#: src/concepts/layer-modes.xml:1015(para)
-#: src/concepts/layer-modes.xml:1074(para)
-#: src/concepts/layer-modes.xml:1131(para)
-#: src/concepts/layer-modes.xml:1190(para)
-#: src/concepts/layer-modes.xml:1249(para)
-#: src/concepts/layer-modes.xml:1295(para)
-#: src/concepts/layer-modes.xml:1339(para)
-#: src/concepts/layer-modes.xml:1383(para)
+#: src/concepts/layer-modes.xml:310(para)
+#: src/concepts/layer-modes.xml:365(para)
+#: src/concepts/layer-modes.xml:421(para)
+#: src/concepts/layer-modes.xml:482(para)
+#: src/concepts/layer-modes.xml:548(para)
+#: src/concepts/layer-modes.xml:605(para)
+#: src/concepts/layer-modes.xml:664(para)
+#: src/concepts/layer-modes.xml:732(para)
+#: src/concepts/layer-modes.xml:795(para)
+#: src/concepts/layer-modes.xml:853(para)
+#: src/concepts/layer-modes.xml:905(para)
+#: src/concepts/layer-modes.xml:959(para)
+#: src/concepts/layer-modes.xml:1013(para)
+#: src/concepts/layer-modes.xml:1065(para)
+#: src/concepts/layer-modes.xml:1119(para)
+#: src/concepts/layer-modes.xml:1173(para)
+#: src/concepts/layer-modes.xml:1218(para)
+#: src/concepts/layer-modes.xml:1261(para)
+#: src/concepts/layer-modes.xml:1304(para)
 msgid "Mask 2 is used as upper layer with 100% opacity."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:317(para)
+#: src/concepts/layer-modes.xml:316(para)
 msgid ""
 "<guilabel>Multiply</guilabel> mode multiplies the pixel values of the upper "
 "layer with those of the layer below it and then divides the result by 255. "
@@ -2976,28 +2978,35 @@ msgid ""
 "is black, the resulting image is completely black (0 * I = 0)."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:331(alt)
+#: src/concepts/layer-modes.xml:326(title)
+msgid "Equation for layer mode <quote>Multiply</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:327(alt)
 msgid "$E = \\frac {1}{255} (M * I)$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:334(para)
-#: src/concepts/layer-modes.xml:457(para)
+#: src/concepts/layer-modes.xml:330(para)
+#: src/concepts/layer-modes.xml:447(para)
+#: src/concepts/layer-modes.xml:924(para)
 #: src/concepts/layer-modes.xml:978(para)
-#: src/concepts/layer-modes.xml:1037(para)
-#: src/concepts/layer-modes.xml:1153(para)
-#: src/concepts/layer-modes.xml:1212(para)
+#: src/concepts/layer-modes.xml:1084(para)
+#: src/concepts/layer-modes.xml:1138(para)
 msgid "The mode is commutative; the order of the two layers doesn't matter."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:341(term)
-#: src/concepts/layer-modes.xml:345(secondary)
-#: src/concepts/layer-modes.xml:348(primary)
-#: src/concepts/layer-modes.xml:353(quote)
-#: src/concepts/layer-modes.xml:388(quote)
+#: src/concepts/layer-modes.xml:337(term)
+#: src/concepts/layer-modes.xml:341(secondary)
+#: src/concepts/layer-modes.xml:344(primary)
+#: src/concepts/layer-modes.xml:383(quote)
 msgid "Divide"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:377(para)
+#: src/concepts/layer-modes.xml:347(title)
+msgid "Example for layer mode <quote>Divide</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:371(para)
 msgid ""
 "<guilabel>Divide</guilabel> mode multiplies each pixel value in the lower "
 "layer by 256 and then divides that by the corresponding pixel value of the "
@@ -3006,20 +3015,21 @@ msgid ""
 "<quote>burned out</quote>."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:391(alt)
+#: src/concepts/layer-modes.xml:386(alt)
 msgid "$E = 256 \\frac {I}{M + 1}$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:398(term)
-#: src/concepts/layer-modes.xml:402(secondary)
-#: src/concepts/layer-modes.xml:405(primary)
-#: src/concepts/layer-modes.xml:410(quote)
-#: src/concepts/layer-modes.xml:449(quote)
-#: src/concepts/layer-modes.xml:782(quote)
+#: src/concepts/layer-modes.xml:393(term)
+#: src/concepts/layer-modes.xml:397(secondary)
+#: src/concepts/layer-modes.xml:400(primary)
 msgid "Screen"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:434(para)
+#: src/concepts/layer-modes.xml:403(title)
+msgid "Example for layer mode <quote>Screen</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:427(para)
 msgid ""
 "<guilabel>Screen</guilabel> mode inverts the values of each of the visible "
 "pixels in the two layers of the image. (That is, it subtracts each of them "
@@ -3031,19 +3041,26 @@ msgid ""
 "transparent."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:452(alt)
+#: src/concepts/layer-modes.xml:441(title)
+#: src/concepts/layer-modes.xml:750(title)
+msgid "Equation for layer mode <quote>Screen</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:442(alt)
 msgid "$E = 255 - \\frac {(255-M)*(255-I)}{255}$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:464(term)
-#: src/concepts/layer-modes.xml:468(secondary)
-#: src/concepts/layer-modes.xml:471(primary)
-#: src/concepts/layer-modes.xml:476(quote)
-#: src/concepts/layer-modes.xml:522(quote)
+#: src/concepts/layer-modes.xml:454(term)
+#: src/concepts/layer-modes.xml:458(secondary)
+#: src/concepts/layer-modes.xml:461(primary)
 msgid "Overlay"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:500(para)
+#: src/concepts/layer-modes.xml:464(title)
+msgid "Example for layer mode <quote>Overlay</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:488(para)
 msgid ""
 "<guilabel>Overlay</guilabel> mode inverts the pixel value of the lower "
 "layer, multiplies it by two times the pixel value of the upper layer, adds "
@@ -3053,7 +3070,7 @@ msgid ""
 "quote> mode."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:511(para)
+#: src/concepts/layer-modes.xml:500(para)
 msgid ""
 "The equation is the *theoretical* equation. Due to <ulink url=\"http://";
 "bugzilla.gnome.org/show_bug.cgi?id=162395\"> Bug #162395 </ulink>, the "
@@ -3061,19 +3078,25 @@ msgid ""
 "without changing the appearance of existing images."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:525(alt)
+#: src/concepts/layer-modes.xml:510(title)
+msgid "Equation for layer mode <quote>Overlay</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:511(alt)
 msgid "$E = \\frac{1I}{255} * (I+ \\frac{2M}{255} * (255 - I))$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:534(term)
-#: src/concepts/layer-modes.xml:538(secondary)
-#: src/concepts/layer-modes.xml:541(primary)
-#: src/concepts/layer-modes.xml:546(quote)
-#: src/concepts/layer-modes.xml:586(quote)
+#: src/concepts/layer-modes.xml:520(term)
+#: src/concepts/layer-modes.xml:524(secondary)
+#: src/concepts/layer-modes.xml:527(primary)
 msgid "Dodge"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:570(para)
+#: src/concepts/layer-modes.xml:530(title)
+msgid "Example for layer mode <quote>Dodge</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:554(para)
 msgid ""
 "<guilabel>Dodge</guilabel> mode multiplies the pixel value of the lower "
 "layer by 256, then divides that by the inverse of the pixel value of the top "
@@ -3081,7 +3104,7 @@ msgid ""
 "inverted."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:575(para)
+#: src/concepts/layer-modes.xml:560(para)
 msgid ""
 "In photography, dodging is a technique used in a darkroom to decrease the "
 "exposure in particular areas of the image. This brings out details in the "
@@ -3089,19 +3112,25 @@ msgid ""
 "and with a painting tool, rather than as a layer mode."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:589(alt)
+#: src/concepts/layer-modes.xml:569(title)
+msgid "Equation for layer mode <quote>Dodge</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:570(alt)
 msgid "$E = \\frac{I*256}{(255-M)+1}$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:596(term)
-#: src/concepts/layer-modes.xml:600(secondary)
-#: src/concepts/layer-modes.xml:603(primary)
-#: src/concepts/layer-modes.xml:608(quote)
-#: src/concepts/layer-modes.xml:649(quote)
+#: src/concepts/layer-modes.xml:577(term)
+#: src/concepts/layer-modes.xml:581(secondary)
+#: src/concepts/layer-modes.xml:584(primary)
 msgid "Burn"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:632(para)
+#: src/concepts/layer-modes.xml:587(title)
+msgid "Example for layer mode <quote>Burn</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:611(para)
 msgid ""
 "<guilabel>Burn</guilabel> mode inverts the pixel value of the lower layer, "
 "multiplies it by 256, divides that by one plus the pixel value of the upper "
@@ -3109,7 +3138,7 @@ msgid ""
 "similar to <quote>Multiply</quote> mode."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:638(para)
+#: src/concepts/layer-modes.xml:618(para)
 msgid ""
 "In photography, burning is a technique used in a darkroom to increase the "
 "exposure in particular areas of the image. This brings out details in the "
@@ -3117,20 +3146,25 @@ msgid ""
 "images and with a painting tool, rather than as a layer mode."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:652(alt)
+#: src/concepts/layer-modes.xml:627(title)
+msgid "Equation for layer mode <quote>Burn</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:628(alt)
 msgid "$E = 255 - \\frac{(255-I)*256}{M+1}$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:660(term)
-#: src/concepts/layer-modes.xml:664(secondary)
-#: src/concepts/layer-modes.xml:667(primary)
-#: src/concepts/layer-modes.xml:672(quote)
-#: src/concepts/layer-modes.xml:710(quote)
-#: src/concepts/layer-modes.xml:721(quote)
+#: src/concepts/layer-modes.xml:636(term)
+#: src/concepts/layer-modes.xml:640(secondary)
+#: src/concepts/layer-modes.xml:643(primary)
 msgid "Hard light"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:696(para)
+#: src/concepts/layer-modes.xml:646(title)
+msgid "Example for layer mode <quote>Hard light</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:670(para)
 msgid ""
 "<guilabel>Hard light</guilabel> mode is rather complicated because the "
 "equation consists of two parts, one for darker colors and one for brighter "
@@ -3141,36 +3175,38 @@ msgid ""
 "two photographs and obtain bright colors and sharp edges."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:705(para)
+#: src/concepts/layer-modes.xml:680(para)
 msgid ""
 "The equation is complex and different according to the value &gt;128 or 128 :"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:709(phrase)
-msgid "Equation for layer mode <placeholder-1/>, M &gt; 128"
+#: src/concepts/layer-modes.xml:683(title)
+msgid "Equation for layer mode <quote>Hard light</quote>, M &gt; 128"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:713(alt)
+#: src/concepts/layer-modes.xml:686(alt)
 msgid "$M &gt; 128: E = 255- \\frac{(255-I)*(255-(2*(M-128)))}{256}$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:720(phrase)
-msgid "Equation for layer mode <placeholder-1/>, M 128"
+#: src/concepts/layer-modes.xml:692(title)
+msgid "Equation for layer mode <quote>Hard light</quote>, M &le; 128"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:724(alt)
+#: src/concepts/layer-modes.xml:695(alt)
 msgid "$M \\leq 128: E = \\frac{I*M*2}{256}$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:733(term)
-#: src/concepts/layer-modes.xml:737(secondary)
-#: src/concepts/layer-modes.xml:740(primary)
-#: src/concepts/layer-modes.xml:745(quote)
-#: src/concepts/layer-modes.xml:793(quote)
+#: src/concepts/layer-modes.xml:704(term)
+#: src/concepts/layer-modes.xml:708(secondary)
+#: src/concepts/layer-modes.xml:711(primary)
 msgid "Soft light"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:769(para)
+#: src/concepts/layer-modes.xml:714(title)
+msgid "Example for layer mode <quote>Soft light</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:738(para)
 msgid ""
 "<guilabel>Soft light</guilabel> is not related to <quote>Hard light</quote> "
 "in anything but the name, but it does tend to make the edges softer and the "
@@ -3179,27 +3215,33 @@ msgid ""
 "<quote>Soft light</quote> mode are identical."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:776(para)
+#: src/concepts/layer-modes.xml:746(para)
 msgid "The equation is complicated. It needs Rs, the result of Screen mode :"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:785(alt)
-msgid "$R_{s} = \\frac {255-((255-I)*(255-M))}{256}$"
+#: src/concepts/layer-modes.xml:751(alt)
+msgid "$R_{s} = 255 - \\frac {(255-M)*(255-I)}{255}$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:796(alt)
+#: src/concepts/layer-modes.xml:757(title)
+msgid "Equation for layer mode <quote>Soft light</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:758(alt)
 msgid "$E = \\frac {((255-I)*M*I)+(I*R_{s})}{255}$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:805(term)
-#: src/concepts/layer-modes.xml:809(secondary)
-#: src/concepts/layer-modes.xml:812(primary)
-#: src/concepts/layer-modes.xml:817(quote)
-#: src/concepts/layer-modes.xml:852(quote)
+#: src/concepts/layer-modes.xml:767(term)
+#: src/concepts/layer-modes.xml:771(secondary)
+#: src/concepts/layer-modes.xml:774(primary)
 msgid "Grain extract"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:841(para)
+#: src/concepts/layer-modes.xml:777(title)
+msgid "Example for layer mode <quote>Grain extract</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:801(para)
 msgid ""
 "<guilabel>Grain extract</guilabel> mode is supposed to extract the "
 "<quote>film grain</quote> from a layer to produce a new layer that is pure "
@@ -3208,26 +3250,32 @@ msgid ""
 "and adds 128."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:855(alt)
+#: src/concepts/layer-modes.xml:811(title)
+msgid "Equation for layer mode <quote>Grain extract</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:812(alt)
 msgid "$E = I - M + 128$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:862(term)
-#: src/concepts/layer-modes.xml:866(secondary)
-#: src/concepts/layer-modes.xml:869(primary)
-#: src/concepts/layer-modes.xml:880(quote)
-#: src/concepts/layer-modes.xml:916(quote)
+#: src/concepts/layer-modes.xml:819(term)
+#: src/concepts/layer-modes.xml:823(secondary)
+#: src/concepts/layer-modes.xml:826(primary)
 msgid "Grain merge"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:871(para)
+#: src/concepts/layer-modes.xml:828(para)
 msgid ""
 "There are two more layer modes, but these are available only for painting "
 "tools. See <link linkend=\"gimp-tool-painting-modes\">Painting Modes</link> "
 "for detailed information."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:905(para)
+#: src/concepts/layer-modes.xml:835(title)
+msgid "Example for layer mode <quote>Grain merge</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:859(para)
 msgid ""
 "<guilabel>Grain merge</guilabel> mode merges a grain layer (possibly one "
 "created from the <quote>Grain extract</quote> mode) into the current layer, "
@@ -3236,19 +3284,25 @@ msgid ""
 "lower layers together and subtracts 128."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:919(alt)
+#: src/concepts/layer-modes.xml:869(title)
+msgid "Equation for layer mode <quote>Grain merge</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:870(alt)
 msgid "$E = I + M - 128$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:926(term)
-#: src/concepts/layer-modes.xml:930(secondary)
-#: src/concepts/layer-modes.xml:933(primary)
-#: src/concepts/layer-modes.xml:938(quote)
-#: src/concepts/layer-modes.xml:972(quote)
+#: src/concepts/layer-modes.xml:877(term)
+#: src/concepts/layer-modes.xml:881(secondary)
+#: src/concepts/layer-modes.xml:884(primary)
 msgid "Difference"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:962(para)
+#: src/concepts/layer-modes.xml:887(title)
+msgid "Example for layer mode <quote>Difference</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:911(para)
 msgid ""
 "<guilabel>Difference</guilabel> mode subtracts the pixel value of the upper "
 "layer from that of the lower layer and then takes the absolute value of the "
@@ -3256,19 +3310,25 @@ msgid ""
 "rather odd. You can use it to invert elements of an image."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:975(alt)
+#: src/concepts/layer-modes.xml:920(title)
+msgid "Equation for layer mode <quote>Difference</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:921(alt)
 msgid "$E = |I - M|$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:985(term)
-#: src/concepts/layer-modes.xml:989(secondary)
-#: src/concepts/layer-modes.xml:992(primary)
-#: src/concepts/layer-modes.xml:997(quote)
-#: src/concepts/layer-modes.xml:1031(quote)
+#: src/concepts/layer-modes.xml:931(term)
+#: src/concepts/layer-modes.xml:935(secondary)
+#: src/concepts/layer-modes.xml:938(primary)
 msgid "Addition"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1021(para)
+#: src/concepts/layer-modes.xml:941(title)
+msgid "Example for layer mode <quote>Addition</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:965(para)
 msgid ""
 "<guilabel>Addition</guilabel> mode is very simple. The pixel values of the "
 "upper and lower layers are added to each other. The resulting image is "
@@ -3276,18 +3336,25 @@ msgid ""
 "so some of the light colors may be set to the maximum value of 255."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1034(alt)
+#: src/concepts/layer-modes.xml:974(title)
+msgid "Equation for layer mode <quote>Addition</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:975(alt)
 msgid "$E = min( (M + I), 255)$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1044(term)
-#: src/concepts/layer-modes.xml:1048(secondary)
-#: src/concepts/layer-modes.xml:1051(primary)
-#: src/concepts/layer-modes.xml:1056(quote)
+#: src/concepts/layer-modes.xml:985(term)
+#: src/concepts/layer-modes.xml:989(secondary)
+#: src/concepts/layer-modes.xml:992(primary)
 msgid "Subtract"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1080(para)
+#: src/concepts/layer-modes.xml:995(title)
+msgid "Example for layer mode <quote>Subtract</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:1019(para)
 msgid ""
 "<guilabel>Subtract</guilabel> mode subtracts the pixel values of the upper "
 "layer from the pixel values of the lower layer. The resulting image is "
@@ -3296,23 +3363,25 @@ msgid ""
 "colors may be set to the minimum value of 0."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1091(quote)
-msgid "Subtraction"
+#: src/concepts/layer-modes.xml:1029(title)
+msgid "Equation for layer mode <quote>Subtraction</quote>"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1094(alt)
+#: src/concepts/layer-modes.xml:1030(alt)
 msgid "$E = max( (I - M),0)$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1101(term)
-#: src/concepts/layer-modes.xml:1105(secondary)
-#: src/concepts/layer-modes.xml:1108(primary)
-#: src/concepts/layer-modes.xml:1113(quote)
-#: src/concepts/layer-modes.xml:1147(quote)
+#: src/concepts/layer-modes.xml:1037(term)
+#: src/concepts/layer-modes.xml:1041(secondary)
+#: src/concepts/layer-modes.xml:1044(primary)
 msgid "Darken only"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1137(para)
+#: src/concepts/layer-modes.xml:1047(title)
+msgid "Example for layer mode <quote>Darken only</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:1071(para)
 msgid ""
 "<guimenuitem>Darken only</guimenuitem> mode compares each component of each "
 "pixel in the upper layer with the corresponding one in the lower layer and "
@@ -3321,19 +3390,25 @@ msgid ""
 "image."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1150(alt)
+#: src/concepts/layer-modes.xml:1080(title)
+msgid "Equation for layer mode <quote>Darken only</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:1081(alt)
 msgid "$E = min(M,I)$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1160(term)
-#: src/concepts/layer-modes.xml:1164(secondary)
-#: src/concepts/layer-modes.xml:1167(primary)
-#: src/concepts/layer-modes.xml:1172(quote)
-#: src/concepts/layer-modes.xml:1206(quote)
+#: src/concepts/layer-modes.xml:1091(term)
+#: src/concepts/layer-modes.xml:1095(secondary)
+#: src/concepts/layer-modes.xml:1098(primary)
 msgid "Lighten only"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1196(para)
+#: src/concepts/layer-modes.xml:1101(title)
+msgid "Example for layer mode <quote>Lighten only</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:1125(para)
 msgid ""
 "<guimenuitem>Lighten only</guimenuitem> mode compares each component of each "
 "pixel in the upper layer with the corresponding one in the lower layer and "
@@ -3342,18 +3417,25 @@ msgid ""
 "image."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1209(alt)
+#: src/concepts/layer-modes.xml:1134(title)
+msgid "Equation for layer mode <quote>Lighten only</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:1135(alt)
 msgid "$E = max(M,I)$"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1219(term)
-#: src/concepts/layer-modes.xml:1223(secondary)
-#: src/concepts/layer-modes.xml:1226(primary)
-#: src/concepts/layer-modes.xml:1231(quote)
+#: src/concepts/layer-modes.xml:1145(term)
+#: src/concepts/layer-modes.xml:1149(secondary)
+#: src/concepts/layer-modes.xml:1152(primary)
 msgid "Hue"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1255(para)
+#: src/concepts/layer-modes.xml:1155(title)
+msgid "Example for layer mode <quote>Hue</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:1179(para)
 msgid ""
 "<guilabel>Hue</guilabel> mode uses the hue of the upper layer and the "
 "saturation and value of the lower layer to form the resulting image. "
@@ -3361,33 +3443,43 @@ msgid ""
 "the lower layer, too."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1265(term)
-#: src/concepts/layer-modes.xml:1269(secondary)
-#: src/concepts/layer-modes.xml:1272(primary)
-#: src/concepts/layer-modes.xml:1277(quote)
+#: src/concepts/layer-modes.xml:1190(term)
+#: src/concepts/layer-modes.xml:1194(secondary)
+#: src/concepts/layer-modes.xml:1197(primary)
 msgid "Saturation"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1301(para)
+#: src/concepts/layer-modes.xml:1200(title)
+msgid "Example for layer mode <quote>Saturation</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:1224(para)
 msgid ""
 "<guilabel>Saturation</guilabel> mode uses the saturation of the upper layer "
 "and the hue and value of the lower layer to form the resulting image."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1345(para)
+#: src/concepts/layer-modes.xml:1243(title)
+msgid "Example for layer mode <quote>Color</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:1267(para)
 msgid ""
 "<guilabel>Color</guilabel> mode uses the hue and saturation of the upper "
 "layer and the value of the lower layer to form the resulting image."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1353(term)
-#: src/concepts/layer-modes.xml:1357(secondary)
-#: src/concepts/layer-modes.xml:1360(primary)
-#: src/concepts/layer-modes.xml:1365(quote)
+#: src/concepts/layer-modes.xml:1276(term)
+#: src/concepts/layer-modes.xml:1280(secondary)
+#: src/concepts/layer-modes.xml:1283(primary)
 msgid "Value"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1389(para)
+#: src/concepts/layer-modes.xml:1286(title)
+msgid "Example for layer mode <quote>Value</quote>"
+msgstr ""
+
+#: src/concepts/layer-modes.xml:1310(para)
 msgid ""
 "<guilabel>Value</guilabel> mode uses the value of the upper layer and the "
 "saturation and hue of the lower layer to form the resulting image. You can "
@@ -3395,7 +3487,7 @@ msgid ""
 "changing the saturation."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1399(para)
+#: src/concepts/layer-modes.xml:1321(para)
 msgid ""
 "Each layer in an image can have a different layer mode. (Of course, the "
 "layer mode of the bottom layer of an image has no effect.) The effects of "
@@ -3406,11 +3498,11 @@ msgid ""
 "the <quote>Red Cubes</quote> pattern."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1411(phrase)
+#: src/concepts/layer-modes.xml:1332(title)
 msgid "Multi layer example"
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1419(para)
+#: src/concepts/layer-modes.xml:1340(para)
 msgid ""
 "<acronym>GIMP</acronym> also has similar modes which are used for the "
 "painting tools. These are the same twenty-one modes as the layer modes, plus "
@@ -3423,7 +3515,7 @@ msgid ""
 "layer and the selected painting tool."
 msgstr ""
 
-#: src/concepts/layer-modes.xml:1430(para)
+#: src/concepts/layer-modes.xml:1351(para)
 msgid ""
 "See <xref linkend=\"gimp-paint-mode-examples\"/> for a description of the "
 "two additional painting modes."
@@ -3435,34 +3527,38 @@ msgstr ""
 
 #: src/concepts/intro.xml:18(para)
 msgid ""
-"Most often, you start GIMP either by clicking on an icon (if your system is "
-"set up to provide you with one), or by typing <command>gimp</command> on a "
-"command line. If you have multiple versions of GIMP installed, you may need "
-"to type <command>gimp-2.6</command> to get the latest version. You can, if "
-"you want, give a list of image files on the command line after the program "
-"name, and they will automatically be opened by GIMP as it starts. It is also "
-"possible, though, to open files from within GIMP once it is running."
+"Most often, you start <acronym>GIMP</acronym> either by clicking on an icon "
+"(if your system is set up to provide you with one), or by typing "
+"<command>gimp</command> on a command line. If you have multiple versions of "
+"<acronym>GIMP</acronym> installed, you may need to type <command>gimp-2.6</"
+"command> to get the latest version. You can, if you want, give a list of "
+"image files on the command line after the program name, and they will "
+"automatically be opened by <acronym>GIMP</acronym> as it starts. It is also "
+"possible, though, to open files from within <acronym>GIMP</acronym> once it "
+"is running."
 msgstr ""
 
-#: src/concepts/intro.xml:28(para)
+#: src/concepts/intro.xml:31(para)
 msgid ""
-"In most operating systems, you can set things up so that various types of "
-"image files are <quote>associated</quote> with GIMP, and cause it to start "
-"automatically when icons for them are double-clicked."
+"Most operating systems support file associations, which associates a class "
+"of files (as determined by their filename extension, such as .jpg) with a "
+"corresponding application (such as <acronym>GIMP</acronym>). When image "
+"files are properly <quote>associated</quote> to <acronym>GIMP</acronym>, you "
+"can double click on an image to open it in <acronym>GIMP</acronym>."
 msgstr ""
 
-#: src/concepts/intro.xml:35(title)
+#: src/concepts/intro.xml:41(title)
 msgid "Known Platforms"
 msgstr ""
 
-#: src/concepts/intro.xml:36(para)
+#: src/concepts/intro.xml:42(para)
 msgid ""
 "The <acronym>GIMP</acronym> is the most widely supported image manipulation "
-"available today. The platforms that The <acronym>GIMP</acronym> is known to "
-"work on include:"
+"available today. The platforms on which <acronym>GIMP</acronym> is known to "
+"work include:"
 msgstr ""
 
-#: src/concepts/intro.xml:41(para)
+#: src/concepts/intro.xml:47(para)
 msgid ""
 "<productname><acronym>GNU</acronym>/Linux</productname>, <productname>Apple "
 "Mac OS X</productname>, <productname>Microsoft Windows</productname>, "
@@ -3475,42 +3571,43 @@ msgid ""
 "<productname>BeOS</productname>."
 msgstr ""
 
-#: src/concepts/intro.xml:54(para)
+#: src/concepts/intro.xml:60(para)
 msgid ""
-"The <acronym>GIMP</acronym> can easily be ported to other operating systems "
+"The <acronym>GIMP</acronym> is easily ported to other operating systems "
 "because of its source code availability. For further information visit the "
-"GIMP developers homepage. <xref linkend=\"bibliography-online-gimp-dev\"/>."
+"<acronym>GIMP</acronym> developers homepage. <xref linkend=\"bibliography-"
+"online-gimp-dev\"/>."
 msgstr ""
 
-#: src/concepts/intro.xml:63(title)
+#: src/concepts/intro.xml:69(title)
 msgid "Language"
 msgstr ""
 
-#: src/concepts/intro.xml:65(primary)
+#: src/concepts/intro.xml:71(primary)
 msgid "Languages"
 msgstr ""
 
-#: src/concepts/intro.xml:67(para)
+#: src/concepts/intro.xml:73(para)
 msgid ""
-"All being well, GIMP detects the system language. This may fail on some "
-"machines and you may want use another language. It is possible to change the "
-"language:"
+"<acronym>GIMP</acronym> automatically detects and uses the system language. "
+"In the unlikely event that language detection fails, or if you just want to "
+"use a different language, you may do so:"
 msgstr ""
 
-#: src/concepts/intro.xml:76(para)
+#: src/concepts/intro.xml:83(para)
 msgid ""
 "<emphasis>In LINUX</emphasis>: in console mode, type <userinput>LANGUAGE=en "
 "gimp</userinput> or <userinput>LANG=en gimp</userinput> replacing en by fr, "
-"de, ... according to the language you want. Background: By using "
-"<userinput>LANGUAGE=en</userinput> you're setting an environment variable "
-"for the executed program <userinput>gimp</userinput> here."
+"de, ... according to the language you want. Background: Using "
+"<userinput>LANGUAGE=en</userinput> sets an environment variable for the "
+"executed program <userinput>gimp</userinput>."
 msgstr ""
 
-#: src/concepts/intro.xml:88(term)
+#: src/concepts/intro.xml:95(term)
 msgid "Windows XP"
 msgstr ""
 
-#: src/concepts/intro.xml:90(para)
+#: src/concepts/intro.xml:97(para)
 msgid ""
 "<menuchoice><guimenu>Control Panel</guimenu><guisubmenu>System</"
 "guisubmenu><guisubmenu>Advanced</guisubmenu><guimenuitem>Environment</"
@@ -3520,293 +3617,299 @@ msgid ""
 "guibutton> to validate your choice."
 msgstr ""
 
-#: src/concepts/intro.xml:102(para)
+#: src/concepts/intro.xml:109(para)
 msgid ""
-"If you often change language, you can create a batch file. Open NotePad. "
-"Type the following commands (for french for instance): "
-"<literallayout><userinput>set lang=fr\n"
+"If you change languages often, you can create a batch file to change the "
+"language. Open NotePad. Type the following commands (for french for "
+"instance): <literallayout><userinput>set lang=fr\n"
 "start gimp-2.6.exe</userinput></literallayout> Save this file as "
 "<filename>GIMP-FR.BAT</filename> (or another name, but always with a "
-"<filename class=\"extension\">.BAT</filename> extension). Create shortcut "
+"<filename class=\"extension\">.BAT</filename> extension). Create a shortcut "
 "and drag it to your desktop."
 msgstr ""
 
-#: src/concepts/intro.xml:113(para)
+#: src/concepts/intro.xml:121(para)
 msgid ""
 "Another possibility: <menuchoice><guimenu>Start</"
 "guimenu><guisubmenu>Programs</guisubmenu><guimenuitem>GTK Runtime "
 "Environment</guimenuitem></menuchoice> Then <guimenuitem>Select language</"
-"guimenuitem> and select the language you want in the dropping list that "
-"shows up."
+"guimenuitem> and select the language you want in the dropdown list."
 msgstr ""
 
-#: src/concepts/intro.xml:128(para)
+#: src/concepts/intro.xml:136(para)
 msgid ""
-"Go to System Preferences, click on the International icon, and in the "
-"Language tab, the desired language should be the first in the list."
+"From System Preferences, click on the International icon. In the Language "
+"tab, the desired language should be the first in the list."
 msgstr ""
 
-#: src/concepts/intro.xml:136(term)
+#: src/concepts/intro.xml:144(term)
 msgid "Another GIMP instance"
 msgstr ""
 
-#: src/concepts/intro.xml:138(para)
+#: src/concepts/intro.xml:146(para)
 msgid ""
-"You can have a new GIMP instance by running the command line with the "
-"<userinput>-n</userinput> option: For example: <userinput>gimp-2.6</"
-"userinput> for GIMP in your language and <userinput>LANGUAGE=en gimp-2.6 -n</"
-"userinput> to have GIMP in English also. This is useful for translators."
+"Use <userinput>-n</userinput> to run multiple instances GIMP. For example, "
+"use <userinput>gimp-2.6</userinput> to start GIMP in the default system "
+"language, and <userinput>LANGUAGE=en gimp-2.6 -n</userinput> to start "
+"another instance of <acronym>GIMP</acronym> in English; this is very useful "
+"for translators."
 msgstr ""
 
-#: src/concepts/intro.xml:151(title)
+#: src/concepts/intro.xml:160(title)
 msgid "Command Line Arguments"
 msgstr ""
 
-#: src/concepts/intro.xml:153(primary)
+#: src/concepts/intro.xml:162(primary)
 msgid "Command line Arguments"
 msgstr ""
 
-#: src/concepts/intro.xml:155(para)
+#: src/concepts/intro.xml:164(para)
 msgid ""
-"Ordinarily you don't need to give any arguments when starting GIMP, but here "
-"is a list of some that may at one time or another be useful. This is not a "
-"complete list; on Unix systems you can get a complete list by running "
-"<userinput>man gimp</userinput> in a terminal window."
+"Although arguments are not required when starting <acronym>GIMP</acronym>, "
+"the most common arguments are shown below. On a Unix system, you can use "
+"<userinput>man gimp</userinput>for a complete list."
 msgstr ""
 
-#: src/concepts/intro.xml:162(para)
+#: src/concepts/intro.xml:170(para)
 msgid ""
-"To use the command line options, you have to put them in the command line "
-"which you use to start GIMP as <command>gimp-2.6 [OPTION...] [FILE|URI...]</"
+"Command line arguments must be in the command line that you use to start "
+"<acronym>GIMP</acronym> as <command>gimp-2.6 [OPTION...] [FILE|URI...]</"
 "command>."
 msgstr ""
 
-#: src/concepts/intro.xml:169(term)
+#: src/concepts/intro.xml:177(term)
 msgid "-?, --help"
 msgstr "-?, --help"
 
-#: src/concepts/intro.xml:171(para)
+#: src/concepts/intro.xml:179(para)
 msgid "Display a list of all commandline options."
 msgstr "æ?¾ç¤ºæ??æ??å?½ä»¤è¡?é??项å??表ã??"
 
-#: src/concepts/intro.xml:175(term)
+#: src/concepts/intro.xml:183(term)
 msgid "--help-all"
 msgstr "--help-all"
 
-#: src/concepts/intro.xml:177(para)
+#: src/concepts/intro.xml:185(para)
 msgid "Show all help options."
 msgstr "æ?¾ç¤ºæ??æ??帮å?©å??容ã??"
 
-#: src/concepts/intro.xml:181(term)
+#: src/concepts/intro.xml:189(term)
 msgid "--help-gtk"
 msgstr "--help-gtk"
 
-#: src/concepts/intro.xml:183(para)
+#: src/concepts/intro.xml:191(para)
 msgid "Show GTK+ Options."
 msgstr "æ?¾ç¤º GTK+ é??项"
 
-#: src/concepts/intro.xml:187(term)
+#: src/concepts/intro.xml:195(term)
 msgid "-v, --version"
 msgstr "-v, --version"
 
-#: src/concepts/intro.xml:189(para)
-msgid "Print the version of GIMP being used, and exit."
+#: src/concepts/intro.xml:197(para)
+#, fuzzy
+msgid "Print the <acronym>GIMP</acronym> version and exit."
 msgstr "æ?¾ç¤ºå½?å?? GIMP ç??æ?¬å¹¶é??å?ºã??"
 
-#: src/concepts/intro.xml:195(term)
+#: src/concepts/intro.xml:203(term)
 msgid "--license"
 msgstr "--license"
 
-#: src/concepts/intro.xml:197(para)
-msgid "Show license information and exit"
+#: src/concepts/intro.xml:205(para)
+#, fuzzy
+msgid "Show license information and exit."
 msgstr "æ?¾ç¤ºæ??æ??ä¿¡æ?¯å¹¶é??å?º"
 
-#: src/concepts/intro.xml:201(term)
+#: src/concepts/intro.xml:209(term)
 msgid "--verbose"
 msgstr "--verbose"
 
-#: src/concepts/intro.xml:203(para)
+#: src/concepts/intro.xml:211(para)
 msgid "Show detailed start-up messages."
 msgstr "æ?¾ç¤ºè¯¦ç»?å?¯å?¨ä¿¡æ?¯ã??"
 
-#: src/concepts/intro.xml:207(term)
+#: src/concepts/intro.xml:215(term)
 msgid "-n, --new-instance"
 msgstr "-n, --new-instance"
 
-#: src/concepts/intro.xml:209(para)
-msgid "Start a new GIMP instance."
+#: src/concepts/intro.xml:217(para)
+#, fuzzy
+msgid "Start a new <acronym>GIMP</acronym> instance."
 msgstr "å?¯å?¨ä¸?个æ?°ç?? GIMP å®?ä¾?ã??"
 
-#: src/concepts/intro.xml:213(term)
+#: src/concepts/intro.xml:221(term)
 msgid "-a, --as-new"
 msgstr ""
 
-#: src/concepts/intro.xml:215(para)
+#: src/concepts/intro.xml:223(para)
 msgid "Open images as new."
 msgstr ""
 
-#: src/concepts/intro.xml:219(term)
+#: src/concepts/intro.xml:227(term)
 msgid "-i, --no-interface"
 msgstr ""
 
-#: src/concepts/intro.xml:221(para)
+#: src/concepts/intro.xml:229(para)
 msgid "Run without a user interface."
 msgstr ""
 
-#: src/concepts/intro.xml:225(term)
+#: src/concepts/intro.xml:233(term)
 msgid "-d, --no-data"
 msgstr ""
 
-#: src/concepts/intro.xml:227(para)
+#: src/concepts/intro.xml:235(para)
 msgid ""
 "Do not load patterns, gradients, palettes, or brushes. Often useful in non-"
 "interactive situations where start-up time is to be minimized."
 msgstr ""
 
-#: src/concepts/intro.xml:235(term)
+#: src/concepts/intro.xml:243(term)
 msgid "-f, --no-fonts"
 msgstr ""
 
-#: src/concepts/intro.xml:237(para)
+#: src/concepts/intro.xml:245(para)
 msgid ""
-"Do not load any fonts. This option could be useful either for speeding up "
-"GIMP start-up for scripts that does not use fonts or to find malformed fonts "
-"related problems that could hang GIMP."
+"Do not load any fonts. This is useful to load <acronym>GIMP</acronym> faster "
+"for scripts that do not use fonts, or to find problems related to malformed "
+"fonts that hang <acronym>GIMP</acronym>."
 msgstr ""
 
-#: src/concepts/intro.xml:244(term)
+#: src/concepts/intro.xml:253(term)
 msgid "-s, --no-splash"
 msgstr ""
 
-#: src/concepts/intro.xml:246(para)
+#: src/concepts/intro.xml:255(para)
 msgid "Do not show the splash screen while starting."
 msgstr ""
 
-#: src/concepts/intro.xml:250(term)
+#: src/concepts/intro.xml:259(term)
 msgid "--no-shm"
 msgstr ""
 
-#: src/concepts/intro.xml:252(para)
-msgid "Do not use shared memory between GIMP and plugins."
+#: src/concepts/intro.xml:261(para)
+msgid "Do not use shared memory between <acronym>GIMP</acronym> and plugins."
 msgstr ""
 
-#: src/concepts/intro.xml:257(term)
+#: src/concepts/intro.xml:266(term)
 msgid "--no-cpu-accel"
 msgstr ""
 
-#: src/concepts/intro.xml:259(para)
+#: src/concepts/intro.xml:268(para)
 msgid ""
 "Do not use special CPU acceleration functions. Useful for finding or "
 "disabling buggy accelerated hardware or functions."
 msgstr ""
 
-#: src/concepts/intro.xml:265(term)
+#: src/concepts/intro.xml:274(term)
 msgid "--session=<replaceable>name</replaceable>"
 msgstr ""
 
-#: src/concepts/intro.xml:267(para)
+#: src/concepts/intro.xml:276(para)
 msgid ""
-"Use a different <filename>sessionrc</filename> for this GIMP session. The "
-"given session name is appended to the default <filename>sessionrc</filename> "
-"filename."
+"Use a different <filename>sessionrc</filename> for this <acronym>GIMP</"
+"acronym> session. The given session name is appended to the default "
+"<filename>sessionrc</filename> filename."
 msgstr ""
 
-#: src/concepts/intro.xml:275(term)
+#: src/concepts/intro.xml:285(term)
 msgid "--gimprc=<filename>filename</filename>"
 msgstr ""
 
-#: src/concepts/intro.xml:277(para)
+#: src/concepts/intro.xml:287(para)
 msgid ""
 "Use an alternative <filename>gimprc</filename> instead of the default one. "
 "The <filename>gimprc</filename> file contains a record of your preferences. "
 "Useful in cases where plugins paths or machine specs may be different."
 msgstr ""
 
-#: src/concepts/intro.xml:286(term)
+#: src/concepts/intro.xml:296(term)
 msgid "--system-gimprc=<replaceable>filename</replaceable>"
 msgstr ""
 
-#: src/concepts/intro.xml:288(para)
-msgid "Use an alternate system gimprc file"
+#: src/concepts/intro.xml:298(para)
+msgid "Use an alternate system gimprc file."
 msgstr ""
 
-#: src/concepts/intro.xml:292(term)
+#: src/concepts/intro.xml:302(term)
 msgid "-b, --batch=<replaceable>commands</replaceable>"
 msgstr ""
 
-#: src/concepts/intro.xml:296(para)
+#: src/concepts/intro.xml:306(para)
 msgid ""
 "Execute the set of commands non-interactively. The set of commands is "
-"typically in the form of a script that can be executed by one of the GIMP "
-"scripting extensions. When commands is <userinput>-</userinput>, the "
-"commands are read from standard input."
+"typically in the form of a script that can be executed by one of the "
+"<acronym>GIMP</acronym> scripting extensions. When the command is "
+"<userinput>-</userinput>, commands are read from standard input."
 msgstr ""
 
-#: src/concepts/intro.xml:306(term)
+#: src/concepts/intro.xml:316(term)
 msgid "--batch-interpreter=<replaceable>proc</replaceable>"
 msgstr ""
 
-#: src/concepts/intro.xml:308(para)
-msgid "The procedure to process batch commands with"
+#: src/concepts/intro.xml:318(para)
+msgid ""
+"Specify the procedure to use to process batch commands. The default "
+"procedure is Script-Fu."
 msgstr ""
 
-#: src/concepts/intro.xml:312(term)
+#: src/concepts/intro.xml:323(term)
 msgid "--console-messages"
 msgstr ""
 
-#: src/concepts/intro.xml:314(para)
+#: src/concepts/intro.xml:325(para)
 msgid ""
 "Do not popup dialog boxes on errors or warnings. Print the messages on the "
 "console instead."
 msgstr ""
 
-#: src/concepts/intro.xml:321(term)
+#: src/concepts/intro.xml:332(term)
 msgid "--pdb-compat-mode=<replaceable>mode</replaceable>"
 msgstr ""
 
-#: src/concepts/intro.xml:323(para)
+#: src/concepts/intro.xml:334(para)
 msgid "PDB compatibility mode (off|on|warn)."
 msgstr ""
 
-#: src/concepts/intro.xml:327(term)
+#: src/concepts/intro.xml:338(term)
 msgid "--stack-trace-mode=<replaceable>mode</replaceable>"
 msgstr ""
 
-#: src/concepts/intro.xml:329(para)
-msgid "Debug in case of a crash (never|query|always)"
+#: src/concepts/intro.xml:340(para)
+msgid "Debug in case of a crash (never|query|always)."
 msgstr ""
 
-#: src/concepts/intro.xml:333(term)
+#: src/concepts/intro.xml:344(term)
 msgid "--debug-handlers"
 msgstr ""
 
-#: src/concepts/intro.xml:335(para)
-msgid "Enable non-fatal debugging signal handlers. Useful for GIMP debugging."
+#: src/concepts/intro.xml:346(para)
+msgid ""
+"Enable non-fatal debugging signal handlers. Useful for <acronym>GIMP</"
+"acronym> debugging."
 msgstr ""
 
-#: src/concepts/intro.xml:340(term)
+#: src/concepts/intro.xml:351(term)
 msgid "--g-fatal-warnings"
 msgstr ""
 
-#: src/concepts/intro.xml:342(para)
+#: src/concepts/intro.xml:353(para)
 msgid "Make all warnings fatal. Useful for debug."
 msgstr ""
 
-#: src/concepts/intro.xml:346(term)
+#: src/concepts/intro.xml:357(term)
 msgid "--dump-gimprc"
 msgstr ""
 
-#: src/concepts/intro.xml:348(para)
+#: src/concepts/intro.xml:359(para)
 msgid ""
 "Output a gimprc file with default settings. Useful if you messed up the "
 "gimprc file."
 msgstr ""
 
-#: src/concepts/intro.xml:353(term)
+#: src/concepts/intro.xml:364(term)
 msgid "--display=<replaceable>display</replaceable>"
 msgstr ""
 
-#: src/concepts/intro.xml:355(para)
+#: src/concepts/intro.xml:366(para)
 msgid "Use the designated X display (does not apply to all platforms)."
 msgstr ""
 
@@ -3848,37 +3951,37 @@ msgid "Preview"
 msgstr ""
 
 #: src/concepts/imagewindow.xml:37(title)
-msgid "A screenshot of the image window illustrating the important components"
+msgid "A screenshot of the image window illustrating the important components."
 msgstr ""
 
 #: src/concepts/imagewindow.xml:49(para)
 msgid ""
-"<acronym>GIMP</acronym> starts opening an empty window which is named "
-"<quote>GNU Image Manipulating Program</quote>. As soon as you open an image, "
-"it is displayed in the window and its specifications are displayed in the "
-"title bar according to the settings you defined in <link linkend=\"gimp-"
-"prefs-dialog\">Preference Dialog</link>. Each image that you have open is "
-"displayed in its own separate window. (In some cases, multiple windows may "
-"all display the same image, but this is unusual.) We will begin with a brief "
-"description of the components that are present by default in an ordinary "
-"image window. Some of them can be removed by using commands in the <link "
-"linkend=\"gimp-imagewindow-menus-view\">View</link> menu; but probably you "
-"don't want to do that."
+"An image window exists, even if no image is open. The Title Bar in an image "
+"window without an image reads <quote>GNU Image Manipulating Program</quote>. "
+"An image window with an image displays the image name and its specifications "
+"in the title bar according to the settings in <link linkend=\"gimp-prefs-"
+"dialog\">Preference Dialog</link>. Each window displays exactly one image, "
+"or no image if no image is open. Each image is displayed in one or more "
+"image windows; it is unusual to display the same image in more than one "
+"window. We will begin with a brief description of the components that are "
+"present by default in an ordinary image window. Some of the components can "
+"be removed by using commands in the <link linkend=\"gimp-imagewindow-menus-"
+"view\">View</link> menu."
 msgstr ""
 
 #. 1
-#: src/concepts/imagewindow.xml:65(para)
+#: src/concepts/imagewindow.xml:67(para)
 msgid ""
-"<emphasis>Title Bar:</emphasis> At the top of the image window you will "
-"probably see a emphasis bar, showing the name of the image and some basic "
-"information about it. The emphasis bar is actually provided by the windowing "
-"system, not by GIMP itself, so its appearance may vary with different "
-"operating systems, window managers, and/or themes. In the <link linkend="
-"\"gimp-prefs-dialog\">Preferences dialog</link> you can customize the "
-"information that appears here, if you want to."
+"<emphasis>Title Bar:</emphasis> The top of the image window typically "
+"displays a Title Bar with the name of the image and some basic information "
+"about the image. The Title Bar is provided by the operating system, not by "
+"<acronym>GIMP</acronym>, so its appearance is likely to vary with the "
+"operating system, window manager, and/or theme. Use the <link linkend=\"gimp-"
+"prefs-dialog\">Preferences dialog</link> to customize the information that "
+"appears in the Title Bar."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:84(para)
+#: src/concepts/imagewindow.xml:86(para)
 msgid ""
 "Users with an Apple Macintosh and a one button mouse can use "
 "<keycombo><keycap>Ctrl</keycap><mousebutton>mousebutton</mousebutton></"
@@ -3886,152 +3989,152 @@ msgid ""
 msgstr ""
 
 #. 2
-#: src/concepts/imagewindow.xml:78(para)
-msgid ""
-"<emphasis>Image Menu:</emphasis> Directly below the emphasis bar appears the "
-"Image Menu (unless it has been suppressed). This menu gives you access to "
-"nearly every operation you can perform on an image.You can also get the "
-"Image Menu by right-clicking inside the image <placeholder-1/>, or by left-"
-"clicking on the little <quote>arrow</quote> symbol in the upper left corner, "
-"if for some reason you find one of these more convenient. More: most menu "
-"operations can also be activated from the keyboard, using Alt plus an "
-"<quote>accelerator</quote> key underlined in the menu emphasis. More: you "
-"can define your own custom shortcuts for menu actions, if you enable <link "
+#: src/concepts/imagewindow.xml:80(para)
+msgid ""
+"<emphasis>Image Menu:</emphasis> Directly below the Title Bar appears the "
+"Image Menu (unless it has been suppressed). The Image Menu provides access "
+"to nearly every operation you can perform on an image. You can also right-"
+"click on an image to display a pop-up image menu. <placeholder-1/>, or by "
+"left-clicking on the little <quote>arrow</quote> symbol in the upper left "
+"corner, called the <emphasis>Menu Button:</emphasis>, if for some reason you "
+"find one of these more convenient. Many menu commands are also associated "
+"with keyboard <emphasis>shortcuts</emphasis> as shown in the menu. You can "
+"define your own custom shortcuts for menu actions, if you enable <link "
 "linkend=\"gimp-prefs-interface\"> Use Dynamic Keyboard Shortcuts</link> in "
 "the Preferences dialog."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:105(para)
+#: src/concepts/imagewindow.xml:106(para)
 msgid ""
-"<emphasis>Menu Button:</emphasis> Clicking on this little button gives you "
-"the Image Menu, except in a column instead of a row. Mnemonics users who "
-"don't want the menu bar visible can access to this menu by pressing the "
-"<keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo> key."
+"<emphasis>Menu Button:</emphasis> Click the Menu Button to display the Image "
+"Menu in a column. If you like to use keyboard shortcuts, use "
+"<keycombo><keycap>Shift</keycap><keycap>F10</keycap></keycombo> to open the "
+"menu."
 msgstr ""
 
 #: src/concepts/imagewindow.xml:117(para)
 msgid ""
 "<emphasis>Ruler:</emphasis> In the default layout, rulers are shown above "
-"and to the left of the image, indicating coordinates within the image. You "
-"can control what type of coordinates are shown if you want to. By default, "
-"pixels are used, but you can change to other units, using the Units setting "
-"described below."
+"and to the left of the image. Use the rulers to determine coordinates within "
+"the image. The default unit for rulers is pixels; use the settings described "
+"below to use a unit other than pixels."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:125(para)
+#: src/concepts/imagewindow.xml:124(para)
 msgid ""
 "One of the most important uses of rulers is to create <emphasis>guides</"
-"emphasis>. If you click on a ruler and drag into the image display, a "
-"guideline will be created, which you can use to help you position things "
-"accurately. Guides can be moved by clicking on them and dragging, or deleted "
-"by dragging them out of the image display."
+"emphasis>. Click and drag a ruler into the image to create a guide. A guide "
+"is a line that helps you accurately position things&mdash;or verify that "
+"another line is truly horizontal or vertical. Click and drag a guide to move "
+"it. Drag a guide out of the image to delete it; you can always drag another "
+"guide into the image. You can even use multiple guides at the same time."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:137(para)
+#: src/concepts/imagewindow.xml:139(para)
 msgid ""
-"<emphasis>QuickMask Toggle:</emphasis> At the lower left corner of the image "
-"display is a small button that toggles on or off the Quick Mask, which is an "
-"alternate, and often extremely useful, way of viewing the selected area "
-"within the image. For more details see <link linkend=\"gimp-qmask"
-"\">QuickMask</link>."
+"<emphasis>QuickMask Toggle:</emphasis> The small button in the lower left "
+"corner of the image toggles the Quick Mask on and off. When the Quick Mask "
+"is on, the button is outlined in red. See <link linkend=\"gimp-qmask"
+"\">QuickMask</link> for more details on this highly useful tool."
 msgstr ""
 
 #. 6
-#: src/concepts/imagewindow.xml:147(para)
+#: src/concepts/imagewindow.xml:149(para)
 msgid ""
-"<emphasis>Pointer Coordinates:</emphasis> In the lower left corner of the "
-"window is a rectangular area used to show the current pointer coordinates "
-"(that is, the mouse location, if you are using a mouse), whenever the "
-"pointer is within the image boundaries. The units are the same as for the "
-"rulers."
+"<emphasis>Pointer Coordinates:</emphasis> When the pointer (mouse cursor, if "
+"you are using a mouse) is within the image boundaries, the rectangular area "
+"in the lower left corner of the window displays the current pointer "
+"coordinates. The units are the same as for the rulers."
 msgstr ""
 
 #. 7
-#: src/concepts/imagewindow.xml:157(para)
+#: src/concepts/imagewindow.xml:159(para)
 msgid ""
-"<emphasis>Units menu:</emphasis> By default, the units used for the rulers "
-"and several other purposes are pixels. You can change to inches, cm, or "
-"several other possibilities using this menu. (If you do, note that the "
-"setting of <quote>Dot for dot</quote> in the View menu affects how the "
-"display is scaled: see <link linkend=\"gimp-view-dot-for-dot\">Dot for Dot</"
-"link> for more information."
+"<emphasis>Units Menu:</emphasis> Use the Units Menu to change the units used "
+"for rulers and several other purposes. The default unit is pixels, but you "
+"can quickly change to inches, cm, or several other possibilities using this "
+"menu. Note that the setting of <quote>Dot for dot</quote> in the View menu "
+"affects how the display is scaled: see <link linkend=\"gimp-view-dot-for-dot"
+"\">Dot for Dot</link> for more information."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:170(para)
+#: src/concepts/imagewindow.xml:173(para)
 msgid ""
-"<emphasis>Zoom button:</emphasis> There are a number of ways to zoom the "
-"image in or out, but this menu is perhaps the simplest. With GIMP-2.6 it is "
-"now possible to enter the zoom level you want in the text box."
+"<emphasis>Zoom Button:</emphasis> There are a number of ways to zoom the "
+"image in or out, but the Zoom Button is perhaps the simplest. With GIMP-2.6, "
+"you can directly enter a zoom level in the text box for very fine control."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:180(para)
+#: src/concepts/imagewindow.xml:183(para)
 msgid ""
-"<emphasis>Status Area:</emphasis> The Status Area appears below the image "
-"display. Most of the time, by default, it shows which part of the image is "
-"currently active, and the amount of system memory that the image is "
-"consuming. You can customize the information that appears here, by changing "
-"your Preferences. When you perform time-consuming operations, the status "
-"area changes temporarily to show what operation is being performed, and its "
-"state of progress."
+"<emphasis>Status Area:</emphasis> The Status Area is at the bottom of the "
+"image window. By default, the Status Area displays the active part of the "
+"image, and the amount of system memory used by the image.Use "
+"<menuchoice><guimenu>Edit</guimenu><guisubmenu>Preferences</"
+"guisubmenu><guimenuitem>Image Windows</guimenuitem><guimenuitem>Title &amp; "
+"Status</guimenuitem></menuchoice> to customize the information displayed in "
+"the Status Area. During time-consuming operations, the status area "
+"temporarily shows the running operation and how complete the operation is."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:191(para)
+#: src/concepts/imagewindow.xml:199(para)
 msgid ""
-"Note that the amount of memory consumed by the image is quite different from "
-"the image file size. For instance, a 69.7Kb .PNG image will occupy 246Kb in "
-"memory when displayed. Two reasons for that. First, image is reconstituted "
-"from the compressed .PNG file. Then, GIMP keeps a copy of the image in "
-"memory to be used by the Undo command."
+"Note that the memory used by the image is very different from the image file "
+"size. For instance, a 70Kb .PNG image may occupy 246Kb in memory when "
+"displayed. There are two primary reasons the difference in memory usage. "
+"First, a .PNG file is compressed format, and the image is reconstituted in "
+"memory in uncompressed form. Second, <acronym>GIMP</acronym> uses extra "
+"memory, and copies of the image, for use by the Undo command."
 msgstr ""
 
 #. 10
-#: src/concepts/imagewindow.xml:203(para)
+#: src/concepts/imagewindow.xml:213(para)
 msgid ""
-"<emphasis>Cancel Button:</emphasis> At the lower right corner of the window "
-"the Cancel button appears temporarily. If you start a complex, time-"
-"consuming operation (most commonly a plug-in), and then decide, while it is "
-"being computed, that you didn't really want to do it after all, this button, "
-"which appears then, will cancel it immediately."
+"<emphasis>Cancel Button:</emphasis> During complex time-consuming "
+"operations, usually a plug-in, a Cancel button temporarily appears in the "
+"lower right corner of the window. Use the Cancel button to stop the "
+"operation."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:212(para)
+#: src/concepts/imagewindow.xml:220(para)
 msgid ""
-"There are a few plug-ins that respond badly to being canceled, possibly "
-"leaving corrupted pieces of images behind."
+"A few plug-ins respond badly to being canceled, sometimes leaving corrupted "
+"pieces of images behind."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:222(primary)
+#: src/concepts/imagewindow.xml:230(primary)
 msgid "Navigation"
 msgstr ""
 
-#: src/concepts/imagewindow.xml:223(secondary)
+#: src/concepts/imagewindow.xml:231(secondary)
 msgid "Navigation button"
 msgstr ""
 
-#: src/concepts/imagewindow.xml:225(para)
+#: src/concepts/imagewindow.xml:233(para)
 msgid ""
-"<emphasis>Navigation control:</emphasis> This is a small cross-shaped button "
-"at the lower right corner of the image display. Clicking on it, and holding "
-"the left mouse button down, brings up a window showing a miniature view of "
-"the image (Navigation Preview), with the displayed area outlined. You can "
-"pan to a different part of the image by moving the mouse while keeping the "
-"button depressed. For large images of which only a small part is displayed, "
-"the navigation window is often the most convenient way of getting to the "
-"part of the image you are looking for. (See <link linkend=\"gimp-navigation-"
-"dialog\">Navigation Dialog</link> for other ways to access the Navigation "
-"Window). (If your mouse has a middle-button, click-drag with it to span "
-"across the image)."
+"<emphasis>Navigation Control:</emphasis> This is a small cross-shaped button "
+"at the lower right corner of the image display. Click and hold (do not "
+"release the mouse button) on the navigation control to display the "
+"Navigation Preview. The Navigation Preview has a miniature view of the image "
+"with the displayed area outlined. Use the Navigation Preview To quickly pan "
+"to a different part of the image&mdash;move the mouse while keeping the "
+"button depressed. The Navigation Window is often the most convenient way to "
+"quickly navigate around a large image with only a small portion displayed. "
+"(See <link linkend=\"gimp-navigation-dialog\">Navigation Dialog</link> for "
+"other ways to access the Navigation Window). (If your mouse has a middle-"
+"button, click-drag with it to pan across the image)."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:242(para)
+#. 12
+#: src/concepts/imagewindow.xml:252(para)
 msgid ""
 "<emphasis>Inactive Padding Area:</emphasis> This padding area separates the "
 "active image display and the inactive padding area, so you're able to "
 "distinguish between them. You cannot apply any Filters or Operations in "
-"general on the inactive area."
+"general to the inactive area."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:252(para)
+#: src/concepts/imagewindow.xml:262(para)
 msgid ""
 "<emphasis>Image Display:</emphasis> The most important part of the image "
 "window is, of course, the image display or canvas. It occupies the central "
@@ -4041,15 +4144,19 @@ msgid ""
 "described below."
 msgstr ""
 
-#: src/concepts/imagewindow.xml:265(para)
+#: src/concepts/imagewindow.xml:275(para)
 msgid ""
-"<emphasis>Image Window Resize Toggle:</emphasis> If this button is pressed, "
-"the image itself will be resized if the image window is resized."
+"<emphasis>Image Window Resize Toggle:</emphasis> Without enabling this "
+"feature, if you change the size of the image window, the image size and zoom "
+"does not change. If you make the window larger, for example, then you will "
+"see more of the image. If this button is pressed, however, the image resizes "
+"when the window resizes so that (mostly) the same portion of the image is "
+"displayed before and after the window is resized."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/image-types.xml:53(None)
+#: src/concepts/image-types.xml:54(None)
 msgid ""
 "@@image: 'images/glossary/color-model-additive.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -4057,7 +4164,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/image-types.xml:64(None)
+#: src/concepts/image-types.xml:65(None)
 msgid ""
 "@@image: 'images/glossary/color-model-subtractive.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -4065,21 +4172,21 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/image-types.xml:103(None)
+#: src/concepts/image-types.xml:104(None)
 msgid ""
 "@@image: 'images/using/wilber-channel-rgb.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/image-types.xml:114(None)
+#: src/concepts/image-types.xml:115(None)
 msgid ""
 "@@image: 'images/using/wilber-channel-gray.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/image-types.xml:139(None)
+#: src/concepts/image-types.xml:142(None)
 msgid ""
 "@@image: 'images/dialogs/wilber-channels-red.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -4087,7 +4194,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/image-types.xml:147(None)
+#: src/concepts/image-types.xml:150(None)
 msgid ""
 "@@image: 'images/dialogs/wilber-channels-green.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -4095,7 +4202,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/image-types.xml:155(None)
+#: src/concepts/image-types.xml:158(None)
 msgid ""
 "@@image: 'images/dialogs/wilber-channels-blue.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -4103,7 +4210,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/image-types.xml:163(None)
+#: src/concepts/image-types.xml:166(None)
 msgid ""
 "@@image: 'images/dialogs/wilber-channels-alpha.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -4111,7 +4218,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/image-types.xml:173(None)
+#: src/concepts/image-types.xml:176(None)
 msgid ""
 "@@image: 'images/dialogs/wilber-channels-combined.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -4133,15 +4240,15 @@ msgstr ""
 msgid ""
 "It is tempting to think of an <emphasis>image</emphasis> as something that "
 "corresponds with a single display window, or to a single file such as a "
-"<link linkend=\"file-jpeg-load\">JPEG</link> file, but really a GIMP image "
-"is a rather complicated structure, containing a stack of layers plus several "
-"other types of objects: a selection mask, a set of channels, a set of paths, "
-"an \"undo\" history, etc. In this section we are going to take a detailed "
-"look at all of the components of an image, and the things you can do with "
-"them."
+"<link linkend=\"file-jpeg-load\">JPEG</link> file, but really a "
+"<acronym>GIMP</acronym> image is a rather complicated structure, containing "
+"a stack of layers plus several other types of objects: a selection mask, a "
+"set of channels, a set of paths, an \"undo\" history, etc. In this section "
+"we are going to take a detailed look at all of the components of an image, "
+"and the things you can do with them."
 msgstr ""
 
-#: src/concepts/image-types.xml:29(para)
+#: src/concepts/image-types.xml:30(para)
 msgid ""
 "The most basic property of an image is its <emphasis>mode</emphasis>. There "
 "are three possible modes: RGB, grayscale, and indexed. RGB stands for Red-"
@@ -4153,24 +4260,24 @@ msgid ""
 "linkend=\"glossary-colormodel\"> Color Models</link>"
 msgstr ""
 
-#: src/concepts/image-types.xml:42(para)
+#: src/concepts/image-types.xml:43(para)
 msgid ""
 "In a grayscale image, each point is represented by a brightness value, "
 "ranging from 0 (black) to 255 (white), with intermediate values representing "
 "different levels of gray."
 msgstr ""
 
-#: src/concepts/image-types.xml:49(phrase)
+#: src/concepts/image-types.xml:50(phrase)
 msgid "Components of the RGB and CMY Color Model"
 msgstr ""
 
-#: src/concepts/image-types.xml:56(para)
+#: src/concepts/image-types.xml:57(para)
 msgid ""
 "In the RGB Color Model, mixing Red, Green and Blue gives White. That's what "
 "happens on your screen."
 msgstr ""
 
-#: src/concepts/image-types.xml:67(para)
+#: src/concepts/image-types.xml:68(para)
 msgid ""
 "In the CMY(K) color model, mixing Cyan, Magenta and Yellow gives Black. "
 "That's what happens when you print on a white paper. The printer will "
@@ -4178,7 +4285,7 @@ msgid ""
 "rendering."
 msgstr ""
 
-#: src/concepts/image-types.xml:76(para)
+#: src/concepts/image-types.xml:77(para)
 msgid ""
 "Essentially the difference between a grayscale image and an RGB image is the "
 "number of <quote>color channels</quote>: a grayscale image has one; an RGB "
@@ -4186,7 +4293,7 @@ msgid ""
 "grayscale images, one colored red, one green, and one blue."
 msgstr ""
 
-#: src/concepts/image-types.xml:83(para)
+#: src/concepts/image-types.xml:84(para)
 msgid ""
 "Actually, both RGB and grayscale images have one additional color channel, "
 "called the <emphasis>alpha</emphasis> channel, representing opacity. When "
@@ -4198,56 +4305,57 @@ msgid ""
 "a proportional mixture of color from the layer and color from underneath."
 msgstr ""
 
-#: src/concepts/image-types.xml:97(phrase)
+#: src/concepts/image-types.xml:98(phrase)
 msgid "Example of an image in RGB and Grayscale mode"
 msgstr ""
 
-#: src/concepts/image-types.xml:106(para)
+#: src/concepts/image-types.xml:107(para)
 msgid ""
 "An image in RGB mode, with the channels corresponding to Red, Green and Blue."
 msgstr ""
 
-#: src/concepts/image-types.xml:117(para)
+#: src/concepts/image-types.xml:118(para)
 msgid ""
 "An image in Grayscale mode, with the channel corresponding to Luminosity."
 msgstr ""
 
-#: src/concepts/image-types.xml:124(para)
+#: src/concepts/image-types.xml:125(para)
 msgid ""
-"In GIMP, every color channel, including the alpha channel, has a range of "
-"possible values from 0 to 255; in computing terminology, a depth of 8 bits. "
-"Some digital cameras can produce image files with a depth of 16 bits per "
-"color channel. GIMP cannot load such a file without losing resolution. In "
-"most cases the effects are too subtle to be detected by the human eye, but "
-"in some cases, mainly where there are large areas with slowly varying color "
-"gradients, the difference may be perceptible."
+"In <acronym>GIMP</acronym>, every color channel, including the alpha "
+"channel, has a range of possible values from 0 to 255; in computing "
+"terminology, a depth of 8 bits. Some digital cameras can produce image files "
+"with a depth of 16 bits per color channel. <acronym>GIMP</acronym> cannot "
+"load such a file without losing resolution. In most cases the effects are "
+"too subtle to be detected by the human eye, but in some cases, mainly where "
+"there are large areas with slowly varying color gradients, the difference "
+"may be perceptible."
 msgstr ""
 
-#: src/concepts/image-types.xml:135(phrase)
+#: src/concepts/image-types.xml:138(phrase)
 msgid "Example of an image with alpha channel"
 msgstr ""
 
-#: src/concepts/image-types.xml:142(para)
+#: src/concepts/image-types.xml:145(para)
 msgid "Red channel"
 msgstr ""
 
-#: src/concepts/image-types.xml:150(para)
+#: src/concepts/image-types.xml:153(para)
 msgid "Green channel"
 msgstr ""
 
-#: src/concepts/image-types.xml:158(para)
+#: src/concepts/image-types.xml:161(para)
 msgid "Blue channel"
 msgstr ""
 
-#: src/concepts/image-types.xml:166(para)
+#: src/concepts/image-types.xml:169(para)
 msgid "The Alpha channel shows the image area which is transparent."
 msgstr ""
 
-#: src/concepts/image-types.xml:176(para)
+#: src/concepts/image-types.xml:179(para)
 msgid "A color image in RGB mode with an Alpha channel."
 msgstr ""
 
-#: src/concepts/image-types.xml:182(para)
+#: src/concepts/image-types.xml:185(para)
 msgid ""
 "The third type, <emphasis>indexed</emphasis> images, is a bit more "
 "complicated to understand. In an indexed image, only a limited set of "
@@ -4257,32 +4365,34 @@ msgid ""
 "they can be represented inside a computer in a way which consumes relatively "
 "little memory, and back in the dark ages (say, ten years ago), they were "
 "very commonly used. As time goes on, they are used less and less, but they "
-"are still important enough to be worth supporting in GIMP. (Also, there are "
-"a few important kinds of image manipulation that are easier to implement "
-"with indexed images than with continuous-color RGB images.)"
+"are still important enough to be worth supporting in <acronym>GIMP</"
+"acronym>. (Also, there are a few important kinds of image manipulation that "
+"are easier to implement with indexed images than with continuous-color RGB "
+"images.)"
 msgstr ""
 
-#: src/concepts/image-types.xml:196(para)
+#: src/concepts/image-types.xml:200(para)
 msgid ""
 "Some very commonly used types of files (including <link linkend=\"file-gif-"
 "load\">GIF</link> and <link linkend=\"file-png-load\">PNG</link>) produce "
-"indexed images when they are opened in GIMP. Many of GIMP's tools don't work "
-"very well on indexed imagesâ??and many filters don't work at allâ??because of "
-"the limited number of colors available. Because of this, it is usually best "
-"to convert an image to RGB mode before working on it. If necessary, you can "
-"convert it back to indexed mode when you are ready to save it"
+"indexed images when they are opened in <acronym>GIMP</acronym>. Many of "
+"<acronym>GIMP</acronym>'s tools don't work very well on indexed imagesâ??and "
+"many filters don't work at allâ??because of the limited number of colors "
+"available. Because of this, it is usually best to convert an image to RGB "
+"mode before working on it. If necessary, you can convert it back to indexed "
+"mode when you are ready to save it"
 msgstr ""
 
-#: src/concepts/image-types.xml:207(para)
+#: src/concepts/image-types.xml:212(para)
 msgid ""
-"GIMP makes it easy to convert from one image type to another, using the "
-"<link linkend=\"gimp-image-mode\">Mode</link> command in the Image menu. "
-"Some types of conversions, of course (RGB to grayscale or indexed, for "
-"example) lose information that cannot be regained by converting back in the "
-"other direction."
+"<acronym>GIMP</acronym> makes it easy to convert from one image type to "
+"another, using the <link linkend=\"gimp-image-mode\">Mode</link> command in "
+"the Image menu. Some types of conversions, of course (RGB to grayscale or "
+"indexed, for example) lose information that cannot be regained by converting "
+"back in the other direction."
 msgstr ""
 
-#: src/concepts/image-types.xml:215(para)
+#: src/concepts/image-types.xml:221(para)
 msgid ""
 "If you are trying to use a filter on an image, and it appears grayed out in "
 "the menu, usually the cause is that the image (or, more specifically, the "
@@ -4544,14 +4654,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/grid-and-guides.xml:46(None)
+#: src/concepts/grid-and-guides.xml:45(None)
 msgid ""
 "@@image: 'images/using/wilber-simple-nogrid.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/grid-and-guides.xml:61(None)
+#: src/concepts/grid-and-guides.xml:57(None)
 msgid ""
 "@@image: 'images/using/wilber-simple-defaultgrid.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -4559,7 +4669,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/grid-and-guides.xml:101(None)
+#: src/concepts/grid-and-guides.xml:97(None)
 msgid ""
 "@@image: 'images/using/wilber-simple-othergrid.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -4567,12 +4677,12 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/grid-and-guides.xml:134(None)
+#: src/concepts/grid-and-guides.xml:127(None)
 msgid ""
 "@@image: 'images/using/wilber-simple-guides.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:16(phrase)
+#: src/concepts/grid-and-guides.xml:16(title)
 msgid "Grids and Guides"
 msgstr ""
 
@@ -4589,7 +4699,7 @@ msgid "Grid"
 msgstr ""
 
 #: src/concepts/grid-and-guides.xml:27(primary)
-#: src/concepts/grid-and-guides.xml:126(phrase)
+#: src/concepts/grid-and-guides.xml:121(title)
 msgid "Guides"
 msgstr ""
 
@@ -4599,23 +4709,24 @@ msgid ""
 "in an image very precisely, and find that it is not easy to do using a "
 "mouse. Often you can get better results by using the arrow keys on the "
 "keyboard (which move the affected object one pixel at a time, or 25 pixels "
-"if you hold down the <keycap>Shift</keycap> key), but GIMP also provides you "
-"with two other aids to make positioning easier: grids and guides."
+"if you hold down the <keycap>Shift</keycap> key), but <acronym>GIMP</"
+"acronym> also provides you with two other aids to make positioning easier: "
+"grids and guides."
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:42(phrase)
+#: src/concepts/grid-and-guides.xml:41(title)
 msgid "Image used for examples below"
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:53(phrase)
+#: src/concepts/grid-and-guides.xml:51(title)
 msgid "The Image Grid"
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:57(phrase)
+#: src/concepts/grid-and-guides.xml:53(title)
 msgid "Image with default grid"
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:65(para)
+#: src/concepts/grid-and-guides.xml:61(para)
 msgid ""
 "Each image has a grid. It is always present, but by default it is not "
 "visible until you activate it by toggling <menuchoice><guimenu>View</"
@@ -4627,24 +4738,25 @@ msgid ""
 "and Fullscreen Mode.)"
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:80(para)
+#: src/concepts/grid-and-guides.xml:76(para)
 msgid ""
-"The default grid appearance, set up when you install GIMP, consists of plus-"
-"shaped black crosshairs at the grid line intersections, with grid lines "
-"spaced every 10 pixels both vertically and horizontally. You can customize "
-"the default grid using the <link linkend=\"gimp-prefs-default-grid\">Default "
-"Image Grid</link> page of the Preferences dialog. If you only want to change "
-"the grid appearance for the current image, you can do so by choosing "
-"<menuchoice><guimenu>Image</guimenu><guimenuitem>Configure Grid</"
-"guimenuitem></menuchoice> from the image menu: this brings up the <link "
-"linkend=\"gimp-configure-grid-dialog\">Configure Grid</link> dialog."
+"The default grid appearance, set up when you install <acronym>GIMP</"
+"acronym>, consists of plus-shaped black crosshairs at the grid line "
+"intersections, with grid lines spaced every 10 pixels both vertically and "
+"horizontally. You can customize the default grid using the <link linkend="
+"\"gimp-prefs-default-grid\">Default Image Grid</link> page of the "
+"Preferences dialog. If you only want to change the grid appearance for the "
+"current image, you can do so by choosing <menuchoice><guimenu>Image</"
+"guimenu><guimenuitem>Configure Grid</guimenuitem></menuchoice> from the "
+"image menu: this brings up the <link linkend=\"gimp-configure-grid-dialog"
+"\">Configure Grid</link> dialog."
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:97(phrase)
+#: src/concepts/grid-and-guides.xml:93(title)
 msgid "A different grid style"
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:105(para)
+#: src/concepts/grid-and-guides.xml:101(para)
 msgid ""
 "Not only can a grid be helpful for judging distances and spatial "
 "relationships, it can also permit you to align things exactly with the grid, "
@@ -4659,24 +4771,58 @@ msgid ""
 "to do this, though.)"
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:130(phrase)
+#: src/concepts/grid-and-guides.xml:123(title)
 msgid "Image with four guides"
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:138(para)
+#: src/concepts/grid-and-guides.xml:131(para)
+msgid ""
+"In addition to the image grid, <acronym>GIMP</acronym> also gives you a more "
+"flexible type of positioning aid: <emphasis>guides</emphasis>. These are "
+"horizontal or vertical lines you can temporarily display on an image while "
+"you are working on it."
+msgstr ""
+
+#: src/concepts/grid-and-guides.xml:137(para)
 msgid ""
-"In addition to the image grid, GIMP also gives you a more flexible type of "
-"positioning aid: <emphasis>guides</emphasis>. These are horizontal or "
-"vertical lines that you create by clicking on one of the rulers and dragging "
-"into the image. You can create as many guides as you like, positioned "
-"wherever you like. To move a guide after you have created it, activate the "
-"Move tool in the Toolbox (or press the <keycap>M</keycap> key), you can then "
-"click and drag a guide. To delete a guide, simply drag it outside the image. "
-"Holding down the Shift key, you can move everything but a guide, using the "
+"To create a guide, simply click on one of the rulers in the image window and "
+"pull out a guide, while holding the <mousebutton>mouse&nbsp;button</"
+"mousebutton> pressed. The guide is then displayed as a blue, dashed line, "
+"which follows the pointer. As soon as you create a guide, the <quote>Move</"
+"quote> tool is activated and the mouse pointer changes to the Move icon."
+msgstr ""
+
+#: src/concepts/grid-and-guides.xml:145(para)
+msgid ""
+"You can also create a guide with the <link linkend=\"script-fu-guide-new"
+"\">New Guide</link> command, which allows you to precisely place the guide "
+"on the image, the <link linkend=\"script-fu-guide-new-percent\">New Guide "
+"(by Percent)</link> command, or the <link linkend=\"script-fu-guides-from-"
+"selection\">New Guides from Selection</link> command."
+msgstr ""
+
+#: src/concepts/grid-and-guides.xml:154(para)
+msgid ""
+"You can create as many guides as you like, positioned wherever you like. To "
+"move a guide after you have created it, activate the Move tool in the "
+"Toolbox (or press the <keycap>M</keycap> key), you can then click and drag a "
+"guide. To delete a guide, simply drag it outside the image. Holding down the "
+"<keycap>Shift</keycap> key, you can move everything but a guide, using the "
 "guides as an effective alignment aid."
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:150(para)
+#: src/concepts/grid-and-guides.xml:163(para)
+msgid ""
+"The behavior of the guides depends upon the <guilabel>Move</guilabel> "
+"(Affect) mode of the <quote>Move</quote> tool. When <emphasis>Layer</"
+"emphasis> mode is selected, the mouse pointer turns into a small hand as "
+"soon as it gets close to a guide. Then the guide is activated and it turns "
+"red, and you can move the guide or delete it by moving it back into the "
+"ruler. If <emphasis>Selection</emphasis> mode is selected, you can position "
+"a guide, but you cannot move it after that."
+msgstr ""
+
+#: src/concepts/grid-and-guides.xml:172(para)
 msgid ""
 "As with the grid, you can cause the pointer to snap to nearby guides, by "
 "toggling <menuchoice><guimenu>View</guimenu><guimenuitem>Snap to Guides</"
@@ -4688,22 +4834,26 @@ msgid ""
 "time you try to create a guide and don't see anything happening."
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:168(para)
+#: src/concepts/grid-and-guides.xml:190(para)
 msgid ""
 "If it makes things easier for you, you can change the default behavior for "
 "guides in the <link linkend=\"gimp-prefs-image-window-appearance\">Image "
-"Window Appearance</link> page of the Preferences dialog. Disabling \"Show "
-"guides\" is probably a bad idea, though, for the reason just given."
+"Windows Appearance</link> page of the Preferences dialog. Disabling "
+"<guilabel>Show&nbsp;guides</guilabel> is probably a bad idea, though, for "
+"the reason just given."
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:176(para)
+#: src/concepts/grid-and-guides.xml:198(para)
 msgid ""
-"Another use for guides: the <link linkend=\"plug-in-guillotine\">Guillotine</"
-"link> plugin can use guides to slice an image into a set of sub-images."
+"You can remove the guides with the <menuchoice><guimenu>Image</"
+"guimenu><guisubmenu>Guides</guisubmenu><guimenuitem>Remove all Guides</"
+"guimenuitem></menuchoice> command."
 msgstr ""
 
-#: src/concepts/grid-and-guides.xml:182(para)
-msgid "See also <link linkend=\"glossary-guides\">Guides</link> in Glossary."
+#: src/concepts/grid-and-guides.xml:208(para)
+msgid ""
+"Another use for guides: the <link linkend=\"plug-in-guillotine\">Guillotine</"
+"link> plugin can use guides to slice an image into a set of sub-images."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -4715,13 +4865,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/gradients.xml:120(None)
+#: src/concepts/gradients.xml:122(None)
 msgid "@@image: 'images/using/gradient-draw.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/gradients.xml:142(None)
+#: src/concepts/gradients.xml:144(None)
 msgid ""
 "@@image: 'images/using/color-gradient-pencil.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -4729,7 +4879,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/gradients.xml:155(None)
+#: src/concepts/gradients.xml:157(None)
 msgid "@@image: 'images/using/gradient-usage.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
@@ -4768,16 +4918,16 @@ msgstr ""
 
 #: src/concepts/gradients.xml:52(para)
 msgid ""
-"Each of GIMP's basic painting tools allows you the option of using colors "
-"from a gradient. This enables you to create brushstrokes that change color "
-"from one end to the other."
+"Each of <acronym>GIMP</acronym>'s basic painting tools allows you the option "
+"of using colors from a gradient. This enables you to create brushstrokes "
+"that change color from one end to the other."
 msgstr ""
 
-#: src/concepts/gradients.xml:60(term)
+#: src/concepts/gradients.xml:61(term)
 msgid "The Gradient Map filter"
 msgstr ""
 
-#: src/concepts/gradients.xml:62(para)
+#: src/concepts/gradients.xml:63(para)
 msgid ""
 "This filter is now in the Colors menu, and allows you to <quote>colorize</"
 "quote> an image, using the color intensity of each point with the "
@@ -4787,54 +4937,54 @@ msgid ""
 "gradient. See <xref linkend=\"plug-in-gradmap\"/> for more information."
 msgstr ""
 
-#: src/concepts/gradients.xml:75(para)
+#: src/concepts/gradients.xml:76(para)
 msgid ""
-"When you install GIMP, it comes presupplied with a large number of "
-"interesting gradients, and you can add new ones that you create or download "
-"from other sources. You can access the full set of available gradients using "
-"the <link linkend=\"gimp-gradient-dialog\">Gradients dialog</link>, a "
-"dockable dialog that you can either activate when you need it, or keep "
-"around as a tab in a dock. The <quote>current gradient</quote>, used in most "
-"gradient-related operations, is shown in the Brush/Pattern/Gradient area of "
-"the Toolbox. Clicking on the gradient symbol in the Toolbox is an "
+"When you install <acronym>GIMP</acronym>, it comes presupplied with a large "
+"number of interesting gradients, and you can add new ones that you create or "
+"download from other sources. You can access the full set of available "
+"gradients using the <link linkend=\"gimp-gradient-dialog\">Gradients dialog</"
+"link>, a dockable dialog that you can either activate when you need it, or "
+"keep around as a tab in a dock. The <quote>current gradient</quote>, used in "
+"most gradient-related operations, is shown in the Brush/Pattern/Gradient "
+"area of the Toolbox. Clicking on the gradient symbol in the Toolbox is an "
 "alternative way of bringing up the Gradients dialog."
 msgstr ""
 
-#: src/concepts/gradients.xml:87(para)
+#: src/concepts/gradients.xml:89(para)
 msgid ""
 "Many quickly examples of working with gradient (for more information see "
 "<link linkend=\"gimp-tool-blend\">Blend Tool</link>):"
 msgstr ""
 
-#: src/concepts/gradients.xml:93(para)
+#: src/concepts/gradients.xml:95(para)
 msgid "Put a gradient in a selection:"
 msgstr ""
 
-#: src/concepts/gradients.xml:96(para)
+#: src/concepts/gradients.xml:98(para)
 msgid "Choose a gradient."
 msgstr ""
 
-#: src/concepts/gradients.xml:99(para)
+#: src/concepts/gradients.xml:101(para)
 msgid ""
 "With the Blend Tool click and drag with the mouse between two points of a "
 "selection."
 msgstr ""
 
-#: src/concepts/gradients.xml:105(para)
+#: src/concepts/gradients.xml:107(para)
 msgid ""
 "Colors will distributed perpendicularly to the direction of the drag of the "
 "mouse and according to the length of it."
 msgstr ""
 
-#: src/concepts/gradients.xml:114(phrase)
+#: src/concepts/gradients.xml:116(phrase)
 msgid "How to use rapidly a gradient in a selection"
 msgstr ""
 
-#: src/concepts/gradients.xml:126(para)
+#: src/concepts/gradients.xml:128(para)
 msgid "Use a gradient with a drawing tool:"
 msgstr ""
 
-#: src/concepts/gradients.xml:127(para)
+#: src/concepts/gradients.xml:129(para)
 msgid ""
 "You can also use a gradient with pencil, brush or airbrush tools if you "
 "check <guilabel>Use color from gradient</guilabel> In the example below the "
@@ -4842,19 +4992,19 @@ msgid ""
 "side the succession of the colors of the gradient (to infinity...)."
 msgstr ""
 
-#: src/concepts/gradients.xml:136(phrase)
+#: src/concepts/gradients.xml:138(phrase)
 msgid "How to use rapidly a gradient with a drawing tool"
 msgstr ""
 
-#: src/concepts/gradients.xml:148(para)
+#: src/concepts/gradients.xml:150(para)
 msgid "Different productions with the same gradient:"
 msgstr ""
 
-#: src/concepts/gradients.xml:151(phrase)
+#: src/concepts/gradients.xml:153(phrase)
 msgid "Gradient usage"
 msgstr ""
 
-#: src/concepts/gradients.xml:158(para)
+#: src/concepts/gradients.xml:160(para)
 msgid ""
 "Four ways of using the Tropical Colors gradient: a linear gradient fill, a "
 "shaped gradient fill, a stroke painted using colors from a gradient, and a "
@@ -4862,11 +5012,11 @@ msgid ""
 "\"plug-in-gradmap\">Gradient Map</link> filter."
 msgstr ""
 
-#: src/concepts/gradients.xml:169(para)
-msgid "A few useful things to know about GIMP's gradients:"
+#: src/concepts/gradients.xml:171(para)
+msgid "A few useful things to know about <acronym>GIMP</acronym>'s gradients:"
 msgstr ""
 
-#: src/concepts/gradients.xml:172(para)
+#: src/concepts/gradients.xml:175(para)
 msgid ""
 "The first four gradients in the list are special: they use the Foreground "
 "and Background colors from the Toolbox Color Area, instead of being fixed. "
@@ -4882,7 +5032,7 @@ msgid ""
 "colors you want."
 msgstr ""
 
-#: src/concepts/gradients.xml:189(para)
+#: src/concepts/gradients.xml:192(para)
 msgid ""
 "Gradients can involve not just color changes, but also changes in opacity. "
 "Some of the gradients are completely opaque; others include transparent or "
@@ -4890,37 +5040,37 @@ msgid ""
 "existing contents of the layer will show through behind it."
 msgstr ""
 
-#: src/concepts/gradients.xml:198(para)
+#: src/concepts/gradients.xml:201(para)
 msgid ""
 "You can create new <emphasis>custom</emphasis> gradients, using the <link "
 "linkend=\"gimp-gradient-editor-dialog\">Gradient Editor</link>. You cannot "
-"modify the gradients that are supplied with GIMP, but you can duplicate them "
-"or create new ones, and then edit those."
+"modify the gradients that are supplied with <acronym>GIMP</acronym>, but you "
+"can duplicate them or create new ones, and then edit those."
 msgstr ""
 
-#: src/concepts/gradients.xml:207(para)
+#: src/concepts/gradients.xml:210(para)
 msgid ""
-"The gradients that are supplied with GIMP are stored in a system "
-"<filename>gradients</filename> folder. By default, gradients that you create "
-"are stored in a folder called <filename>gradients</filename> in your "
-"personal GIMP directory. Any gradient files (ending with the extension "
-"<filename>.ggr</filename>) found in one of these folders, will automatically "
-"be loaded when you start GIMP. You can add more directories to the gradient "
-"search path, if you want to, in the Gradients tab of the <link linkend="
-"\"gimp-prefs-folders-data\">Data Folders</link> pages of the Preferences "
-"dialog."
+"The gradients that are supplied with <acronym>GIMP</acronym> are stored in a "
+"system <filename>gradients</filename> folder. By default, gradients that you "
+"create are stored in a folder called <filename>gradients</filename> in your "
+"personal <acronym>GIMP</acronym> directory. Any gradient files (ending with "
+"the extension <filename>.ggr</filename>) found in one of these folders, will "
+"automatically be loaded when you start <acronym>GIMP</acronym>. You can add "
+"more directories to the gradient search path, if you want to, in the "
+"Gradients tab of the <link linkend=\"gimp-prefs-folders-data\">Data Folders</"
+"link> pages of the Preferences dialog."
 msgstr ""
 
-#: src/concepts/gradients.xml:219(para)
+#: src/concepts/gradients.xml:223(para)
 msgid ""
-"New in GIMP 2.2 is the ability to load gradient files in SVG format, used by "
-"many vector graphics programs. To make GIMP load an SVG gradient file, all "
-"you need to do is place it in the <filename>gradients</filename> folder of "
-"your personal GIMP directory, or any other folder in your gradient search "
-"path."
+"New in <acronym>GIMP</acronym> 2.2 is the ability to load gradient files in "
+"SVG format, used by many vector graphics programs. To make <acronym>GIMP</"
+"acronym> load an SVG gradient file, all you need to do is place it in the "
+"<filename>gradients</filename> folder of your personal <acronym>GIMP</"
+"acronym> directory, or any other folder in your gradient search path."
 msgstr ""
 
-#: src/concepts/gradients.xml:227(para)
+#: src/concepts/gradients.xml:233(para)
 msgid ""
 "You can find a large number of interesting SVG gradients on the web, in "
 "particular at OpenClipArt Gradients <xref linkend=\"bibliography-online-"
@@ -4937,14 +5087,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/fonts-and-text.xml:65(None)
+#: src/concepts/fonts-and-text.xml:68(None)
 msgid ""
 "@@image: 'images/toolbox/tool-dialog-text.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/fonts-and-text.xml:98(None)
+#: src/concepts/fonts-and-text.xml:101(None)
 msgid "@@image: 'images/using/text-warning.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
@@ -4969,33 +5119,34 @@ msgstr ""
 #: src/concepts/fonts-and-text.xml:39(para)
 msgid ""
 "The Text tool is progressively improved. One of the greatest improvements of "
-"GIMP 2.0 over GIMP 1.2 is in the handling of text. In GIMP 2.0 and 2.2, each "
-"text item goes in a separate Text layer, and you can come back later to the "
-"layer and edit the text in it. You can also move the text around in the "
-"image, or change the font, or the font size. You can use any font available "
-"on your system. You can control justification, indentation, and line spacing."
+"<acronym>GIMP</acronym> 2.0 over <acronym>GIMP</acronym> 1.2 is in the "
+"handling of text. In <acronym>GIMP</acronym> 2.0 and 2.2, each text item "
+"goes in a separate Text layer, and you can come back later to the layer and "
+"edit the text in it. You can also move the text around in the image, or "
+"change the font, or the font size. You can use any font available on your "
+"system. You can control justification, indentation, and line spacing."
 msgstr ""
 
-#: src/concepts/fonts-and-text.xml:48(para)
+#: src/concepts/fonts-and-text.xml:50(para)
 msgid ""
-"With GIMP-2.6, you can draw a bounding box (a rectangular frame) for the "
-"text on your image and you can adjust this rectangle in the same way as a "
-"rectangular selection. The text goes on being edited in the Text Editor, but "
-"it is automatically wrapped within this box."
+"With <acronym>GIMP</acronym>-2.6, you can draw a bounding box (a rectangular "
+"frame) for the text on your image and you can adjust this rectangle in the "
+"same way as a rectangular selection. The text goes on being edited in the "
+"Text Editor, but it is automatically wrapped within this box."
 msgstr ""
 
-#: src/concepts/fonts-and-text.xml:54(para)
+#: src/concepts/fonts-and-text.xml:57(para)
 msgid ""
 "Actually, you can operate on a text layer in the same ways as any other "
 "layer, but doing so often means giving up the ability to edit the text "
 "without losing the results of your work."
 msgstr ""
 
-#: src/concepts/fonts-and-text.xml:61(phrase)
+#: src/concepts/fonts-and-text.xml:64(phrase)
 msgid "GIMP text editor"
 msgstr ""
 
-#: src/concepts/fonts-and-text.xml:69(para)
+#: src/concepts/fonts-and-text.xml:72(para)
 msgid ""
 "To understand some of the idiosyncrasies of text handling, it may help for "
 "you to realize that a text layer contains more information than the pixel "
@@ -5005,7 +5156,7 @@ msgid ""
 "is redrawn to reflect your changes."
 msgstr ""
 
-#: src/concepts/fonts-and-text.xml:77(para)
+#: src/concepts/fonts-and-text.xml:80(para)
 msgid ""
 "Now suppose you create a text layer, and then operate on it in some way that "
 "does not involve the Text tool: rotate it, for example. Suppose you then "
@@ -5014,7 +5165,7 @@ msgid ""
 "operations you performed in the meantime."
 msgstr ""
 
-#: src/concepts/fonts-and-text.xml:84(para)
+#: src/concepts/fonts-and-text.xml:87(para)
 msgid ""
 "Because this danger is not obvious, the Text tool tries to protect you from "
 "it. If you operate on a text layer, and then later try to edit the text, a "
@@ -5024,25 +5175,25 @@ msgid ""
 "existing layer unchanged."
 msgstr ""
 
-#: src/concepts/fonts-and-text.xml:94(phrase)
+#: src/concepts/fonts-and-text.xml:97(phrase)
 msgid "Warning lose modifications"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/docks.xml:86(None)
+#: src/concepts/docks.xml:87(None)
 msgid "@@image: 'images/using/dock-attached.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/docks.xml:95(None)
+#: src/concepts/docks.xml:96(None)
 msgid "@@image: 'images/using/dock-tab.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/docks.xml:126(None)
+#: src/concepts/docks.xml:127(None)
 msgid ""
 "@@image: 'images/using/dialog-highlight-dockbar.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -5050,7 +5201,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/docks.xml:170(None)
+#: src/concepts/docks.xml:171(None)
 msgid ""
 "@@image: 'images/using/dialog-highlight-handle.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -5058,7 +5209,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/docks.xml:227(None)
+#: src/concepts/docks.xml:235(None)
 msgid ""
 "@@image: 'images/using/dialog-highlight-imagemenu.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -5066,7 +5217,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/docks.xml:253(None)
+#: src/concepts/docks.xml:262(None)
 msgid ""
 "@@image: 'images/using/dialog-highlight-tabmenu.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -5074,20 +5225,20 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/docks.xml:268(None)
+#: src/concepts/docks.xml:277(None)
 msgid "@@image: 'images/using/tab-menu.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/docks.xml:310(None)
+#: src/concepts/docks.xml:319(None)
 msgid ""
 "@@image: 'images/using/tab-menu-add-tab.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/docks.xml:366(None)
+#: src/concepts/docks.xml:393(None)
 msgid ""
 "@@image: 'images/using/tab-menu-preview-size.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -5095,18 +5246,25 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/docks.xml:396(None)
+#: src/concepts/docks.xml:421(None)
 msgid ""
 "@@image: 'images/using/tab-menu-tab-style.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/docks.xml:502(None)
+#: src/concepts/docks.xml:527(None)
 msgid ""
 "@@image: 'images/using/list-search-field.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/concepts/docks.xml:566(None)
+msgid ""
+"@@image: 'images/using/dialog-button-bar.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr ""
+
 #: src/concepts/docks.xml:16(title)
 msgid "Dialogs and Docking"
 msgstr ""
@@ -5123,12 +5281,13 @@ msgstr ""
 msgid "Docking Areas"
 msgstr ""
 
-#: src/concepts/docks.xml:30(primary) src/concepts/docks.xml:111(primary)
-#: src/concepts/docks.xml:141(primary) src/concepts/docks.xml:209(primary)
-#: src/concepts/docks.xml:244(primary) src/concepts/docks.xml:280(primary)
-#: src/concepts/docks.xml:298(primary) src/concepts/docks.xml:322(primary)
-#: src/concepts/docks.xml:338(primary) src/concepts/docks.xml:372(primary)
-#: src/concepts/docks.xml:402(primary) src/concepts/docks.xml:473(primary)
+#: src/concepts/docks.xml:30(primary) src/concepts/docks.xml:112(primary)
+#: src/concepts/docks.xml:142(primary) src/concepts/docks.xml:213(primary)
+#: src/concepts/docks.xml:253(primary) src/concepts/docks.xml:289(primary)
+#: src/concepts/docks.xml:307(primary) src/concepts/docks.xml:331(primary)
+#: src/concepts/docks.xml:346(primary) src/concepts/docks.xml:366(primary)
+#: src/concepts/docks.xml:398(primary) src/concepts/docks.xml:426(primary)
+#: src/concepts/docks.xml:494(primary)
 msgid "Docks"
 msgstr ""
 
@@ -5138,428 +5297,468 @@ msgstr ""
 
 #: src/concepts/docks.xml:34(para)
 msgid ""
-"GIMP offers a lot of flexibility about the arrangement of dialog windows on "
-"your screen. Instead of placing each dialog in its own window, you can group "
-"them together using docks. A \"dock\" is a container window that can hold a "
+"<acronym>GIMP</acronym> has great flexibility for arranging dialog windows "
+"on your screen. Instead of placing each dialog in its own window, you can "
+"group dialogs using docks. A \"dock\" is a container window that can hold a "
 "collection of persistent dialogs, such as the Tool Options dialog, Brushes "
-"dialog, Palette dialog, etc. Docks cannot, however, hold image windows: each "
-"image always has its own separate window. They also can't hold non-"
-"persistent dialogs, such as the Preferences dialog or the New Image dialog."
+"dialog, Palette dialog, etc. Docks cannot, however, hold non-persistent "
+"dialogs such as the Preferences dialog or an Image window."
 msgstr ""
 
-#: src/concepts/docks.xml:48(para)
-msgid "The Layers, Channels and Paths dock"
+#: src/concepts/docks.xml:47(para)
+msgid "The Layers, Channels and Paths dock."
 msgstr ""
 
-#: src/concepts/docks.xml:53(para)
-msgid "The Brushes, Patterns and Gradients dock"
+#: src/concepts/docks.xml:52(para)
+msgid "The Brushes, Patterns and Gradients dock."
 msgstr ""
 
-#: src/concepts/docks.xml:44(para)
+#: src/concepts/docks.xml:43(para)
 msgid ""
-"<acronym>GIMP</acronym> is now supplied with two docks: <placeholder-1/> In "
-"these docks, every window is in its own tab."
+"<acronym>GIMP</acronym> has two default docks: <placeholder-1/> In these "
+"docks, each window is in its own tab."
 msgstr ""
 
-#: src/concepts/docks.xml:60(para)
+#: src/concepts/docks.xml:59(para)
 msgid ""
-"The Toolbox is now also a <emphasis>utility window</emphasis>. The Tool "
-"Options window is normally attached under the Toolbox and displays the "
-"options of the selected tool."
+"The Toolbox is a <emphasis>utility window</emphasis>. The Tool Options "
+"window is normally attached under the Toolbox and displays the options of "
+"the selected tool."
 msgstr ""
 
-#: src/concepts/docks.xml:65(para)
+#: src/concepts/docks.xml:64(para)
 msgid ""
-"A list of dockable windows is available in <menuchoice><guimenu>Windows</"
-"guimenu><guisubmenu>Dockable Windows</guisubmenu></menuchoice>. Click on the "
-"name of one of them to open it as an independent window."
+"Use <menuchoice><guimenu>Windows</guimenu><guisubmenu>Dockable Dialogs</"
+"guisubmenu></menuchoice>. view a list of dockable dialogs. Choose a dockable "
+"dialog from the list to view the dialog. If the dialog is available in a "
+"dock, then it is made visible. If the dialog is not in a dock, then it is "
+"displayed in its own window. Note that the Windows command is only available "
+"while an image is open for editing."
 msgstr ""
 
-#: src/concepts/docks.xml:73(para)
+#: src/concepts/docks.xml:76(para)
 msgid ""
-"Every dockable window has two types of docking areas: the docking bars and "
-"the docking-tab area. In an isolated window, the <emphasis>docking-tab area</"
-"emphasis> is the same as the drag handle area (see below). In a dock, the "
-"docking-tab area covers all the window."
+"Every dockable dialog has two types of docking areas: the docking bars and "
+"the docking-tab area. In a dock, the docking-tab area covers the entire "
+"window."
 msgstr ""
 
-#: src/concepts/docks.xml:82(title)
+#: src/concepts/docks.xml:83(title)
 msgid "The two docking types"
 msgstr ""
 
-#: src/concepts/docks.xml:89(para)
-msgid "The dockable window has been docked onto a dock bar."
+#: src/concepts/docks.xml:90(para)
+msgid "The dockable window is docked onto a dock bar."
 msgstr ""
 
-#: src/concepts/docks.xml:98(para)
+#: src/concepts/docks.xml:99(para)
 msgid ""
-"The dockable window has been docked onto the docking-tab area. A new tab has "
-"been created."
+"The dockable window is docked onto the docking-tab area. A new tab has been "
+"created."
 msgstr ""
 
-#: src/concepts/docks.xml:108(title)
+#: src/concepts/docks.xml:109(title)
 msgid "Docking Bars"
 msgstr ""
 
-#: src/concepts/docks.xml:112(secondary) src/concepts/docks.xml:122(title)
+#: src/concepts/docks.xml:113(secondary) src/concepts/docks.xml:123(title)
 msgid "Docking bars"
 msgstr ""
 
-#: src/concepts/docks.xml:115(para)
+#: src/concepts/docks.xml:116(para)
 msgid ""
 "Each dockable window has two <emphasis>docking bars</emphasis>. These bars "
-"are thin gray bars, very unobtrusive and easy not to notice: most people "
+"are thin gray bars, very unobtrusive and easy to not notice: most people "
 "don't realize that they exist until they are specifically pointed out."
 msgstr ""
 
-#: src/concepts/docks.xml:129(para)
+#: src/concepts/docks.xml:130(para)
 msgid "A window with <emphasis>docking bars</emphasis> highlighted."
 msgstr ""
 
-#: src/concepts/docks.xml:138(title)
+#: src/concepts/docks.xml:139(title)
 msgid "Docking Drag Handles"
 msgstr ""
 
-#: src/concepts/docks.xml:142(secondary)
+#: src/concepts/docks.xml:143(secondary)
 msgid "Docking drag handle"
 msgstr ""
 
 #: src/concepts/docks.xml:153(para)
 msgid ""
-"either one of the docking bars in a window: the dialog will be attached "
-"under this window,"
+"onto a docking bar so that the dialog is attached below the docking bar in "
+"the window,"
 msgstr ""
 
 #: src/concepts/docks.xml:159(para)
-msgid "or the docking-tab area: the dialog will be added as a tab."
+msgid "or into the docking-tab area so that the dialog is added as a tab."
 msgstr ""
 
-#: src/concepts/docks.xml:145(para)
+#: src/concepts/docks.xml:146(para)
 msgid ""
 "Each dockable window has a <emphasis>drag handle area</emphasis>, as "
-"highlighted in the figure below. You can recognize this by the fact that the "
-"cursor changes to a hand shape when the pointer is over the drag handle "
-"area. To dock a dialog, you simply click on its drag handle area, and drag "
-"it onto <placeholder-1/>"
+"highlighted in the figure below. The cursor changes to a hand shape when it "
+"is over a drag handle area. To dock a dialog, click in the drag handle area, "
+"and drag it: <placeholder-1/>"
 msgstr ""
 
-#: src/concepts/docks.xml:166(title)
+#: src/concepts/docks.xml:167(title)
 msgid "A dockable window, with the drag handle area highlighted"
 msgstr ""
 
-#: src/concepts/docks.xml:173(para)
+#: src/concepts/docks.xml:174(para)
 msgid ""
 "This screenshot shows the area that can be used to drag a dialog window onto "
 "a dock. It can also be used to take a dialog off the dock."
 msgstr ""
 
-#: src/concepts/docks.xml:182(para)
+#: src/concepts/docks.xml:183(para)
 msgid ""
-"You can drag more than one dialog onto the same docking bar. If you do, they "
-"will turn into tabs, represented by iconic symbols at the top. Clicking on "
-"the tab handle will bring a tab to the front, so that you can interact with "
-"it."
+"You can drag more than one dialog onto the same docking bar. If you do, the "
+"dialogs are displayed as tabs, represented by iconic symbols at the top. "
+"Click on the iconic symbol to bring the tab to the front."
 msgstr ""
 
 #: src/concepts/docks.xml:190(para)
 msgid ""
-"You can also add a new tab in a window, detach it, delete it by using the "
-"Tab menu. Please see below."
+"You can also add, detach, or delete a tab window using the Tab menu (see "
+"below)."
 msgstr ""
 
 #: src/concepts/docks.xml:197(para)
 msgid ""
-"Pressing <keycap>TAB</keycap> toggles the visibility of all present docks."
+"Press <keycap>TAB</keycap> in an Image window to toggle the visibility of "
+"the docks. This is useful if the docks hide a portion of the image Window. "
+"You can quickly hide all the docks, do your work, then display all the docs "
+"again. Pressing <keycap>TAB</keycap> inside a dock to navigate through the "
+"dock."
 msgstr ""
 
-#: src/concepts/docks.xml:205(title)
-msgid "Image Menu"
-msgstr ""
+#: src/concepts/docks.xml:209(title)
+#, fuzzy
+msgid "Image Selection"
+msgstr "é??å?º"
 
-#: src/concepts/docks.xml:210(secondary)
+#: src/concepts/docks.xml:214(secondary)
 msgid "Auto button"
 msgstr ""
 
-#: src/concepts/docks.xml:212(para)
+#: src/concepts/docks.xml:216(para)
 msgid ""
-"Some docks contain an <emphasis>Image Menu</emphasis>: a menu listing all of "
-"the images open in GIMP, and displaying the name of the image whose "
-"information is shown in the dock. You can use the Image Menu to select a "
-"different image (don't confuse this menu for the Image Menu that is the Menu "
-"of the active image on your screen). If the <guilabel>Auto</guilabel> button "
-"is depressed, then the menu always shows the name of GIMP's currently active "
-"image, that is, the image you are currently working on."
+"Some docks contain an <emphasis>Image Selection Menu</emphasis>: a menu "
+"listing all of the images open in <acronym>GIMP</acronym>. The Image Menu "
+"displays the name of the image whose information is shown in the dock. Use "
+"the <guilabel>Auto</guilabel> button to toggle the value of <guilabel>Auto "
+"Follow Active Image</guilabel>. Suppose you are using the Layers dialog and "
+"you want to see the layers for a different image. Select the desired image "
+"from the Image Selection Menu. Although this is convenient, do not forget "
+"that you changed the working image for the dock. Setting <guilabel>Auto "
+"Follow Active Image</guilabel> from the Tab menu helps to avoid this problem."
 msgstr ""
 
-#: src/concepts/docks.xml:223(title)
-msgid "A dock with an Image Menu highlighted"
+#: src/concepts/docks.xml:231(title)
+msgid "A dock with an Image Menu highlighted."
 msgstr ""
 
-#: src/concepts/docks.xml:231(para)
+#: src/concepts/docks.xml:239(para)
 msgid ""
 "By default, a <quote>Layers, Channels, and Paths</quote> dock shows an Image "
 "Menu at the top, and other types of docks do not. You can always add or "
-"remove an Image Menu, however, using the \"Show Image Menu\" toggle in the "
-"Tab menu, as described below. (Exception: you cannot add an Image Menu to "
-"the dock that contains the Toolbox.)"
+"remove an Image Menu, however, using the <quote>Show Image Menu</quote> "
+"toggle in the Tab menu, as described below. (Exception: you cannot add an "
+"Image Menu to the dock that contains the Toolbox.)"
 msgstr ""
 
-#: src/concepts/docks.xml:241(title)
+#: src/concepts/docks.xml:250(title)
 msgid "Tab Menu"
 msgstr ""
 
-#: src/concepts/docks.xml:245(secondary)
+#: src/concepts/docks.xml:254(secondary)
 msgid "Tab menu"
 msgstr ""
 
-#: src/concepts/docks.xml:249(title)
-msgid "A dialog in a dock, with the Tab menu button highlighted"
+#: src/concepts/docks.xml:258(title)
+msgid "A dialog in a dock, with the Tab menu button highlighted."
 msgstr ""
 
-#: src/concepts/docks.xml:257(para)
+#: src/concepts/docks.xml:266(para)
 msgid ""
 "In each dialog, you can access a special menu of tab-related operations by "
-"pressing the Tab Menu button, as highlighted in the figure on the right. "
-"Exactly which commands are shown in the menu varies a bit from dialog to "
-"dialog, but they always include operations for creating new tabs, or closing "
-"or detaching tabs."
+"pressing the Tab Menu button, as highlighted in the figure below. Exactly "
+"which commands are shown in the menu varies a bit from dialog to dialog, but "
+"they always include operations for creating new tabs, or closing or "
+"detaching tabs."
 msgstr ""
 
-#: src/concepts/docks.xml:265(title)
-msgid "Tab menu from the Layers dialog"
+#: src/concepts/docks.xml:274(title)
+msgid "Tab menu from the Layers dialog."
 msgstr ""
 
-#: src/concepts/docks.xml:272(para)
+#: src/concepts/docks.xml:281(para)
 msgid "The Tab menu gives you access to the following commands:"
 msgstr ""
 
-#: src/concepts/docks.xml:277(term)
+#: src/concepts/docks.xml:286(term) src/concepts/docks.xml:290(secondary)
 msgid "Context Menu"
 msgstr ""
 
-#: src/concepts/docks.xml:281(secondary)
-msgid "Context menu"
-msgstr ""
-
-#: src/concepts/docks.xml:283(para)
+#: src/concepts/docks.xml:292(para)
 msgid ""
 "At the top of each Tab menu is an entry that opens into the dialog's context "
 "menu, which contains operations specific to that particular type of dialog. "
-"For example, the context menu for the Patterns dialog contains a set of "
-"operations for manipulating patterns."
+"For example, the context menu for the Layers tab is <guilabel>Layers Menu</"
+"guilabel>, which contains a set of operations for manipulating layers."
 msgstr ""
 
-#: src/concepts/docks.xml:294(term) src/concepts/docks.xml:299(secondary)
+#: src/concepts/docks.xml:303(term) src/concepts/docks.xml:308(secondary)
 msgid "Add Tab"
 msgstr ""
 
-#: src/concepts/docks.xml:301(para)
+#: src/concepts/docks.xml:310(para)
 msgid ""
-"This entry opens into a submenu allowing you to add a large variety of "
-"dockable dialogs as new tabs."
+"<guilabel>Add Tab</guilabel> opens into a submenu allowing you to add a "
+"large variety of dockable dialogs as new tabs."
 msgstr ""
 
-#: src/concepts/docks.xml:306(title)
+#: src/concepts/docks.xml:315(title)
 msgid "<quote>Add tab</quote> sub-menu"
 msgstr ""
 
-#: src/concepts/docks.xml:318(term)
+#: src/concepts/docks.xml:327(term)
 msgid "Close Tab"
 msgstr ""
 
-#: src/concepts/docks.xml:323(secondary)
+#: src/concepts/docks.xml:332(secondary)
 msgid "Close tab"
 msgstr ""
 
-#: src/concepts/docks.xml:325(para)
+#: src/concepts/docks.xml:334(para)
 msgid ""
-"This entry closes the dialog. Closing the last dialog in a dock causes the "
-"dock itself to close. Choosing this menu entry has the same effect as "
-"pressing the \"Close Tab\" button."
+"Close the dialog. Closing the last dialog in a dock causes the dock itself "
+"to close."
 msgstr ""
 
-#: src/concepts/docks.xml:334(term)
+#: src/concepts/docks.xml:342(term)
 msgid "Detach Tab"
 msgstr ""
 
-#: src/concepts/docks.xml:339(secondary)
+#: src/concepts/docks.xml:347(secondary)
 msgid "Detach tab"
 msgstr ""
 
-#: src/concepts/docks.xml:341(para)
+#: src/concepts/docks.xml:349(para)
+msgid ""
+"Detach the dialog from the dock, creating a new dock with the detached "
+"dialog as its only member. It has the same effect as dragging the tab out of "
+"the dock and releasing it at a location where it cannot be docked."
+msgstr ""
+
+#: src/concepts/docks.xml:355(para)
 msgid ""
-"This entry detaches the dialog from the dock, creating a new dock with the "
-"detached dialog as its only member. It has the same effect as dragging the "
-"tab out of the dock and releasing it at a location where it cannot be docked."
+"If the tab is <link linkend=\"gimp-dock-tab-lock\">locked</link>, this menu "
+"item is insensitive and grayed out."
 msgstr ""
 
-#: src/concepts/docks.xml:351(term)
+#: src/concepts/docks.xml:363(term)
+msgid "Lock Tab to Dock"
+msgstr ""
+
+#: src/concepts/docks.xml:367(secondary)
+msgid "Lock tab"
+msgstr ""
+
+#: src/concepts/docks.xml:369(para)
+msgid ""
+"Prevent the dialog from being moved or detached. When activated, "
+"<guimenuitem>Detach Tab</guimenuitem> is insensitive and grayed out."
+msgstr ""
+
+#: src/concepts/docks.xml:378(term)
 msgid "Preview Size"
 msgstr ""
 
-#: src/concepts/docks.xml:354(primary)
+#: src/concepts/docks.xml:381(primary)
 msgid "Previews"
 msgstr ""
 
-#: src/concepts/docks.xml:355(secondary)
+#: src/concepts/docks.xml:382(secondary)
 msgid "Tab preview size"
 msgstr ""
 
-#: src/concepts/docks.xml:359(secondary) src/concepts/docks.xml:373(secondary)
+#: src/concepts/docks.xml:386(secondary) src/concepts/docks.xml:399(secondary)
 msgid "Preview size"
 msgstr ""
 
-#: src/concepts/docks.xml:362(title)
-msgid "Preview Size submenu of a Tab menu"
+#: src/concepts/docks.xml:389(title)
+msgid "Preview Size submenu of a Tab menu."
 msgstr ""
 
-#: src/concepts/docks.xml:375(para)
+#: src/concepts/docks.xml:401(para)
 msgid ""
 "Many, but not all, dialogs have Tab menus containing a <guilabel>Preview "
 "Size</guilabel> option, which opens into a submenu giving a list of sizes "
-"for the items in the dialog (cf. <xref linkend=\"figure-gimp-dock-preview-"
-"size\"/> ). For example, the Brushes dialog shows pictures of all available "
-"brushes: the Preview Size determines how large the pictures are. The default "
-"is <guilabel>Medium</guilabel>."
+"for the items in the dialog (see the figure above). For example, the Brushes "
+"dialog shows pictures of all available brushes: the Preview Size determines "
+"how large the pictures are. The default is <guilabel>Medium</guilabel>."
 msgstr ""
 
-#: src/concepts/docks.xml:389(term)
+#: src/concepts/docks.xml:414(term)
 msgid "Tab Style"
 msgstr ""
 
-#: src/concepts/docks.xml:392(title)
-msgid "Tab Style submenu of a Tab menu"
+#: src/concepts/docks.xml:417(title)
+msgid "Tab Style submenu of a Tab menu."
 msgstr ""
 
-#: src/concepts/docks.xml:403(secondary)
+#: src/concepts/docks.xml:427(secondary)
 msgid "Tab style"
 msgstr ""
 
-#: src/concepts/docks.xml:405(para)
+#: src/concepts/docks.xml:429(para)
 msgid ""
-"This entry is available when multiple dialogs are in the same dock: it opens "
-"into a submenu allowing you to choose how the tabs at the top will appear "
-"(cf. <xref linkend=\"figure-gimp-dock-tab-style\"/>). There are five "
-"choices, not all of which will be available for all types of dialogs:"
+"Available only when multiple dialogs are in the same dock, <guilabel>Tab "
+"Style</guilabel> opens a submenu allowing you to choose the appearance of "
+"the tabs at the top (see the figure above). There are five choices, not all "
+"are available for every dialog:"
 msgstr ""
 
-#: src/concepts/docks.xml:418(para)
-msgid "This choice gives you an icon representing the dialog type."
+#: src/concepts/docks.xml:441(para)
+msgid "Use an icon to represent the dialog type."
 msgstr ""
 
-#: src/concepts/docks.xml:425(term)
+#: src/concepts/docks.xml:447(term)
 msgid "Current Status"
 msgstr ""
 
-#: src/concepts/docks.xml:427(para)
+#: src/concepts/docks.xml:449(para)
 msgid ""
-"This choice is only available for dialogs that allows you to select "
-"something, such as a brush, a pattern, a gradient, etc. It gives you a tab "
-"showing a representation of the item currently selected."
+"<guilabel>Current Status</guilabel> is only available for dialogs that "
+"allows you to select something, such as a brush, pattern, gradient, etc. "
+"<guilabel>Current Status</guilabel> shows a representation of the currently "
+"selected item in the tab top."
 msgstr ""
 
-#: src/concepts/docks.xml:436(term)
+#: src/concepts/docks.xml:460(term)
 msgid "Text"
 msgstr ""
 
-#: src/concepts/docks.xml:438(para)
-msgid "This choice gives you a tab showing the dialog type in text."
+#: src/concepts/docks.xml:462(para)
+msgid "Use text to display the dialog type."
 msgstr ""
 
-#: src/concepts/docks.xml:445(term)
+#: src/concepts/docks.xml:468(term)
 msgid "Icon and Text"
 msgstr ""
 
-#: src/concepts/docks.xml:447(para)
-msgid ""
-"This choice gives you wider tabs, containing both an icon and the type of "
-"dialog in text."
+#: src/concepts/docks.xml:470(para)
+msgid "Using both an icon and text results in wider tabs."
 msgstr ""
 
-#: src/concepts/docks.xml:454(term)
+#: src/concepts/docks.xml:476(term)
 msgid "Status and Text"
 msgstr ""
 
-#: src/concepts/docks.xml:456(para)
-msgid ""
-"This choice, where available, shows the item currently selected, as well as "
-"the type of dialog."
+#: src/concepts/docks.xml:478(para)
+msgid "Show the currently selected item and text with the dialog type."
 msgstr ""
 
-#: src/concepts/docks.xml:468(term)
+#: src/concepts/docks.xml:490(term)
 msgid "View as List; View as Grid"
 msgstr ""
 
-#: src/concepts/docks.xml:474(secondary)
+#: src/concepts/docks.xml:495(secondary)
 msgid "View as List/Grid"
 msgstr ""
 
-#: src/concepts/docks.xml:476(primary)
+#: src/concepts/docks.xml:497(primary)
 msgid "List search field"
 msgstr ""
 
-#: src/concepts/docks.xml:477(para)
+#: src/concepts/docks.xml:498(para)
 msgid ""
-"These entries are shown in dialogs that allows you to select an item from a "
-"set: brushes, patterns, fonts, etc. You can choose whether to view the items "
-"as a vertical list, with the name of each beside it, or as a grid, with "
+"These entries are shown in dialogs that allow you to select an item from a "
+"set: brushes, patterns, fonts, etc. You can choose to view the items as a "
+"vertical list, with the name of each beside it, or as a grid, with "
 "representations of the items but no names. Each has its advantages: viewing "
 "as a list gives you more information, but viewing as a grid allows you to "
-"see many more possibilities at once. The default for this varies across "
-"dialogs: for brushes and patterns, the default is a grid; for most other "
-"things, the default is a list."
+"see more possibilities at once. The default for this varies across dialogs: "
+"for brushes and patterns, the default is a grid; for most other things, the "
+"default is a list."
 msgstr ""
 
-#: src/concepts/docks.xml:489(para)
+#: src/concepts/docks.xml:510(para)
 msgid ""
-"When the treeview is <quote>as list</quote>, pressing "
+"When the treeview is <guilabel>View as List</guilabel>, pressing "
 "<keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo> (or "
-"<keycombo><keycap>Ctrl</keycap><keycap>S</keycap></keycombo> it depends on "
+"<keycombo><keycap>Ctrl</keycap><keycap>S</keycap></keycombo>, it depends on "
 "your GTK+ keybindings), opens a text box, a search field, where you can "
-"enter the first letter(s) of the name of the item you want."
+"enter the first letter(s) of the name of the item you want. The search field "
+"will not open with <guilabel>View as Grid</guilabel>."
 msgstr ""
 
-#: src/concepts/docks.xml:498(title)
-msgid "The list search field"
+#: src/concepts/docks.xml:523(title)
+msgid "The list search field."
 msgstr ""
 
-#: src/concepts/docks.xml:505(para)
-msgid "The list search field you get pressing Ctrl+F."
+#: src/concepts/docks.xml:530(para)
+msgid ""
+"Use <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo> to open the "
+"list search field."
 msgstr ""
 
-#: src/concepts/docks.xml:511(para)
-msgid "This search field lasts five seconds only if you do nothing."
+#: src/concepts/docks.xml:538(para)
+msgid ""
+"The list search field automatically closes after five seconds if you do "
+"nothing."
 msgstr ""
 
-#: src/concepts/docks.xml:514(para)
+#: src/concepts/docks.xml:543(para)
 msgid ""
-"This shortcut is also available for the treeview you get in the "
-"<quote>Brush</quote>, <quote>Font</quote> or <quote>Pattern </quote> option "
+"The search field shortcut is also available for the treeview you get in the "
+"<quote>Brush</quote>, <quote>Font</quote> or <quote>Pattern</quote> option "
 "of several tools."
 msgstr ""
 
-#: src/concepts/docks.xml:524(term)
-msgid "Show Image Menu"
+#: src/concepts/docks.xml:553(term)
+msgid "Show Button Bar"
 msgstr ""
 
-#: src/concepts/docks.xml:526(para)
+#: src/concepts/docks.xml:555(para)
+msgid ""
+"Some dialogs display a button bar on the bottom of the dialog; for example, "
+"the Patterns, Brushes, Gradients, and Images dialogs. This is a toggle. If "
+"it is checked, then the Button Bar is displayed."
+msgstr ""
+
+#: src/concepts/docks.xml:562(title)
+msgid "Button Bar on the Brushes dialog."
+msgstr ""
+
+#: src/concepts/docks.xml:574(term)
+#, fuzzy
+msgid "Show Image Selection"
+msgstr "é??å?º"
+
+#: src/concepts/docks.xml:576(para)
 msgid ""
 "This is a toggle. If it is checked, then an Image Menu is shown at the top "
-"of the dock. It is not available for dialogs docked below the Toolbox. Don't "
-"confuse this menu with the Image Menu, that is the menu of the active image "
-"on your screen."
+"of the dock (see <xref linkend=\"figure-highlight-imagemenu\"/>). It is not "
+"available for dialogs docked below the Toolbox. This option is interesting "
+"only if you have several open images on your screen."
 msgstr ""
 
-#: src/concepts/docks.xml:536(term)
+#: src/concepts/docks.xml:588(term)
 msgid "Auto Follow Active Image"
 msgstr ""
 
-#: src/concepts/docks.xml:538(para)
+#: src/concepts/docks.xml:590(para)
 msgid ""
-"If this option is checked, the related dialog will be that of the current "
-"image and will change if you select another image. For example, if you have "
-"two images and the Histogram dialog on your screen (and this option checked "
-"in this dialog), then the histogram of the activated image will be displayed."
+"This option is also interesting only if you have several images open on your "
+"screen. Then, the information displayed in a dock is always that of the "
+"selected image in the Image Selection drop-down list. If the <guilabel>Auto "
+"Follow Active Image </guilabel> is disabled, the image can be selected only "
+"in the Image Selection. If enabled, you can also select it by activating the "
+"image directly (clicking on its title bar)."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -5579,25 +5778,24 @@ msgstr ""
 #: src/concepts/concepts.xml:29(para)
 msgid ""
 "The Wilber_Construction_Kit (in src/images/) allows you to give the mascot a "
-"different appearence. It is the work of Tuomas Kuosmanen (tigertATgimp.org)."
+"different appearance. It is the work of Tuomas Kuosmanen (tigertATgimp.org)."
 msgstr ""
 
 #: src/concepts/concepts.xml:37(para)
 msgid ""
-"This section is intended to give you a brief introduction to the basic "
-"concepts and terminology you will need to understand in order to make sense "
-"of the rest of the documentation. Everything here is explained in much "
-"greater depth elsewhere. With a few exceptions, we have avoided cluttering "
-"this section with a lot of links and cross-references: everything mentioned "
-"here is so high-level that you should easily be able to locate it in the "
-"index."
+"This section provides a brief introduction to the basic concepts and "
+"terminology used in <acronym>GIMP</acronym>. The concepts presented here are "
+"explained in much greater depth elsewhere. With a few exceptions, we have "
+"avoided cluttering this section with a lot of links and cross-references: "
+"everything mentioned here is so high-level that you can easily locate it in "
+"the index."
 msgstr ""
 
 #: src/concepts/concepts.xml:50(para)
 msgid ""
-"Images are the basic entities that <acronym>GIMP</acronym> works with. "
-"Roughly speaking, an <quote>image</quote> corresponds to a single file, such "
-"as a TIFF or JPEG file. You can also think of an image as corresponding to a "
+"Images are the basic entities used by <acronym>GIMP</acronym>. Roughly "
+"speaking, an <quote>image</quote> corresponds to a single file, such as a "
+"TIFF or JPEG file. You can also think of an image as corresponding to a "
 "single display window, but this is not quite correct: it is possible to have "
 "multiple windows all displaying the same image. It is not possible to have a "
 "single window display more than one image, though, or for an image to have "
@@ -5607,30 +5805,30 @@ msgstr ""
 #: src/concepts/concepts.xml:60(para)
 msgid ""
 "A <acronym>GIMP</acronym> image may be quite a complicated thing. Instead of "
-"thinking of it as something like a sheet of paper with a picture on it, you "
-"should think of it as more like a book, whose pages are called "
-"<quote>layers</quote> In addition to a stack of layers, a <acronym>GIMP</"
-"acronym> image may contain a selection mask, a set of channels, and a set of "
-"paths. In fact, <acronym>GIMP</acronym> provides a mechanism for attaching "
-"arbitrary pieces of data, called <quote>parasites</quote>, to an image."
+"thinking of it as something like a sheet of paper with a picture on it, "
+"think of it as more like a book, whose pages are called <quote>layers</"
+"quote>. In addition to a stack of layers, a <acronym>GIMP</acronym> image "
+"may contain a selection mask, a set of channels, and a set of paths. In "
+"fact, <acronym>GIMP</acronym> provides a mechanism for attaching arbitrary "
+"pieces of data, called <quote>parasites</quote>, to an image."
 msgstr ""
 
 #: src/concepts/concepts.xml:70(para)
 msgid ""
 "In <acronym>GIMP</acronym>, it is possible to have many images open at the "
-"same time. If they are large, each image may use many megabytes of memory, "
-"but <acronym>GIMP</acronym> uses a sophisticated tile-based memory "
-"management system that allows it to handle even very large images "
-"gracefully. There are, however, limits, and having more memory available can "
-"help to improve the performance of the system."
+"same time. Although large images may use many megabytes of memory, "
+"<acronym>GIMP</acronym> uses a sophisticated tile-based memory management "
+"system that allows <acronym>GIMP</acronym> to handle very large images "
+"gracefully. There are limits, however, and having more memory available may "
+"improve system performance."
 msgstr ""
 
 #: src/concepts/concepts.xml:84(para)
 msgid ""
 "If an image is like a book, then a layer is like a page within the book. The "
-"simplest images only contain a single layer, and can be treated like single "
-"sheets of paper, but sophisticated <acronym>GIMP</acronym> users often deal "
-"with images containing many layers, even dozens of them. Layers need not be "
+"simplest images contain only a single layer, and can be treated like single "
+"sheets of paper. Sophisticated <acronym>GIMP</acronym> users often deal with "
+"images containing many layers, even dozens of them. Layers need not be "
 "opaque, and they need not cover the entire extent of an image, so when you "
 "look at an image's display, you may see more than just the top layer: you "
 "may see elements of many layers."
@@ -5644,26 +5842,26 @@ msgstr ""
 msgid ""
 "In <acronym>GIMP</acronym>, Channels are the smallest units of subdivision "
 "in the stack of layers from which the image is constructed. Every Channel in "
-"a layer has exactly the same size as the layer it belongs to and "
-"consequently consists of the same pixels. Every pixel can be regarded as a "
-"container which can be filled with a value ranging from 0 to 255. The exact "
-"meaning of this value depends on the type of channel, e.g. in the "
-"<acronym>RGB</acronym> color model the value in the <emphasis>R</emphasis>-"
-"channel means the amount of red which is added to the colour of the "
-"different pixels, in the selection channel the value denotes how strongly "
-"the pixels are selected and in the alpha channel the values denote how "
+"a layer has exactly the same size as the layer to which it belongs, and, "
+"consequently consists of the same number of pixels. Every pixel can be "
+"regarded as a container which can be filled with a value ranging from 0 to "
+"255.The exact meaning of this value depends on the type of channel, e.g. in "
+"the <acronym>RGB</acronym> color model the value in the <emphasis>R</"
+"emphasis>-channel means the amount of red which is added to the color of the "
+"different pixels, in the selection channel, the value denotes how strongly "
+"the pixels are selected, and in the alpha channel the values denote how "
 "transparent the corresponding pixels are."
 msgstr ""
 
 #: src/concepts/concepts.xml:119(para)
 msgid ""
-"Often when you do something to an image, you only want a part of it to be "
+"Often when modify an image, you only want a part of the image to be "
 "affected. The <quote>selection</quote> mechanism makes this possible. Each "
 "image has its own selection, which you normally see as a moving dashed line "
 "separating the selected parts from the unselected parts (the so-called "
 "<quote>marching ants</quote> ). Actually this is a bit misleading: selection "
-"in <acronym>GIMP</acronym> is really graded, not all-or-nothing, and really "
-"the selection is represented by a full-fledged grayscale channel. The dashed "
+"in <acronym>GIMP</acronym> is graded, not all-or-nothing, and really the "
+"selection is represented by a full-fledged grayscale channel. The dashed "
 "line that you normally see is simply a contour line at the 50%-selected "
 "level. At any time, though, you can visualize the selection channel in all "
 "its glorious detail by toggling the <link linkend=\"gimp-image-window-qmask-"
@@ -5675,11 +5873,11 @@ msgid ""
 "A large component of learning how to use <acronym>GIMP</acronym> effectively "
 "is acquiring the art of making good selectionsâ??selections that contain "
 "exactly what you need and nothing more. Because selection-handling is so "
-"centrally important, <acronym>GIMP</acronym> gives you a large number of "
-"tools for doing it: an assortment of selection-making tools, a menu of "
-"selection operations, and the ability to switch to Quick Mask mode, in which "
-"you can treat the selection channel as though it were a color channel, "
-"thereby <quote>painting the selection</quote>."
+"centrally important, <acronym>GIMP</acronym> provides many tools for doing "
+"it: an assortment of selection-making tools, a menu of selection operations, "
+"and the ability to switch to Quick Mask mode, in which you can treat the "
+"selection channel as though it were a color channel, thereby <quote>painting "
+"the selection</quote>."
 msgstr ""
 
 #: src/concepts/concepts.xml:151(para)
@@ -5706,16 +5904,16 @@ msgstr ""
 
 #: src/concepts/concepts.xml:173(para)
 msgid ""
-"Many, probably most, of the things you do to an image in <acronym>GIMP</"
+"Many, probably most, of the things that you do to an image in <acronym>GIMP</"
 "acronym> are done by the <acronym>GIMP</acronym> application itself. "
 "However, <acronym>GIMP</acronym> also makes extensive use of <quote>plug-"
 "ins</quote>, which are external programs that interact very closely with "
 "<acronym>GIMP</acronym>, and are capable of manipulating images and other "
 "<acronym>GIMP</acronym> objects in very sophisticated ways. Many important "
-"plug-ins come packaged together with <acronym>GIMP</acronym>, but there are "
-"also many available by other means. In fact, writing plug-ins (and scripts) "
-"is the easiest way for people not on the <acronym>GIMP</acronym> development "
-"team to add new capabilities to <acronym>GIMP</acronym>."
+"plug-ins are bundled with <acronym>GIMP</acronym>, but there are also many "
+"available by other means. In fact, writing plug-ins (and scripts) is the "
+"easiest way for people not on the <acronym>GIMP</acronym> development team "
+"to add new capabilities to <acronym>GIMP</acronym>."
 msgstr ""
 
 #: src/concepts/concepts.xml:187(para)
@@ -5730,19 +5928,21 @@ msgstr ""
 
 #: src/concepts/concepts.xml:196(para)
 msgid ""
-"In addition to plug-ins, which are programs written in the C language, GIMP "
-"can also make use of scripts. The largest number of existing scripts are "
-"written in a language called Script-Fu, which is unique to GIMP (for those "
-"who care, it is a dialect of the Lisp-like language called Scheme). It is "
-"also possible to write GIMP scripts in Python or Perl. These languages are "
-"more flexible and powerful than Script-Fu; their disadvantage is that they "
-"depend on software that does not automatically come packaged with GIMP, so "
-"they are not guaranteed to work correctly in every GIMP installation."
+"In addition to plug-ins, which are programs written in the C language, "
+"<acronym>GIMP</acronym> can also make use of scripts. The largest number of "
+"existing scripts are written in a language called Script-Fu, which is unique "
+"to <acronym>GIMP</acronym> (for those who care, it is a dialect of the Lisp-"
+"like language called Scheme). It is also possible to write <acronym>GIMP</"
+"acronym> scripts in Python or Perl. These languages are more flexible and "
+"powerful than Script-Fu; their disadvantage is that they depend on software "
+"that does not automatically come packaged with <acronym>GIMP</acronym>, so "
+"they are not guaranteed to work correctly in every <acronym>GIMP</acronym> "
+"installation."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/color-management.xml:31(None)
+#: src/concepts/color-management.xml:32(None)
 msgid ""
 "@@image: 'images/using/colormanagement-workflow1.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -5750,7 +5950,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/color-management.xml:40(None)
+#: src/concepts/color-management.xml:41(None)
 msgid ""
 "@@image: 'images/using/colormanagement-workflow2.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -5758,7 +5958,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/color-management.xml:112(None)
+#: src/concepts/color-management.xml:113(None)
 msgid "@@image: 'images/using/icc-apply.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
@@ -5776,51 +5976,51 @@ msgid ""
 "photo cameras, scanners, displays, printers etc., have their own color "
 "reproduction characteristics. If those are not taken into account during "
 "opening, editing and saving, harmful adjustments can be done to images. With "
-"GIMP you can have reliable output for both Web and print."
+"<acronym>GIMP</acronym> you can have reliable output for both Web and print."
 msgstr ""
 
-#: src/concepts/color-management.xml:27(title)
+#: src/concepts/color-management.xml:28(title)
 msgid "Image Processing Workflow"
 msgstr ""
 
-#: src/concepts/color-management.xml:34(para)
+#: src/concepts/color-management.xml:35(para)
 msgid "Workflow without Color management"
 msgstr ""
 
-#: src/concepts/color-management.xml:43(para)
+#: src/concepts/color-management.xml:44(para)
 msgid "Process with Color management"
 msgstr ""
 
-#: src/concepts/color-management.xml:49(title)
+#: src/concepts/color-management.xml:50(title)
 msgid "Problems of a non Color Managed Workflow"
 msgstr ""
 
-#: src/concepts/color-management.xml:50(para)
+#: src/concepts/color-management.xml:51(para)
 msgid ""
 "The basic problem of image manipulation without color management is that you "
 "do simply not see what you do. This affects two different areas:"
 msgstr ""
 
-#: src/concepts/color-management.xml:56(para)
+#: src/concepts/color-management.xml:57(para)
 msgid ""
 "There are differences in Colors caused by different color characteristics of "
 "different devices like cameras, scanners, displays or printers"
 msgstr ""
 
-#: src/concepts/color-management.xml:63(para)
+#: src/concepts/color-management.xml:64(para)
 msgid ""
 "There are differences in Colors caused by the limitations of the colorspace "
 "a specific device is able to handle"
 msgstr ""
 
-#: src/concepts/color-management.xml:69(para)
+#: src/concepts/color-management.xml:70(para)
 msgid ""
 "The main purpose of color management is to avoid such problems. The approach "
 "taken to do so involves the addition of a description of the color "
 "characteristic to an image or devices."
 msgstr ""
 
-#: src/concepts/color-management.xml:74(para)
+#: src/concepts/color-management.xml:75(para)
 msgid ""
 "These descriptions are called <emphasis>color profile</emphasis>. A color "
 "profile is basically a look-up table to translate the specific color "
@@ -5830,7 +6030,7 @@ msgid ""
 "used to simulate how colors would look on that device."
 msgstr ""
 
-#: src/concepts/color-management.xml:82(para)
+#: src/concepts/color-management.xml:83(para)
 msgid ""
 "The creation of color profiles is most often done by the manufacturer of the "
 "devices themselves. To make these profiles usable independent of platform "
@@ -5839,67 +6039,68 @@ msgid ""
 "files and embedded into images."
 msgstr ""
 
-#: src/concepts/color-management.xml:92(title)
+#: src/concepts/color-management.xml:93(title)
 msgid "Introduction to a Color Managed Workflow"
 msgstr ""
 
-#: src/concepts/color-management.xml:94(para)
+#: src/concepts/color-management.xml:95(para)
 msgid ""
-"Most of the parameters and profiles described here can be set in the GIMP "
-"preferences. Please see <xref linkend=\"gimp-prefs-color-management\"/> for "
-"details."
+"Most of the parameters and profiles described here can be set in the "
+"<acronym>GIMP</acronym> preferences. Please see <xref linkend=\"gimp-prefs-"
+"color-management\"/> for details."
 msgstr ""
 
-#: src/concepts/color-management.xml:102(title)
+#: src/concepts/color-management.xml:103(title)
 msgid "Input"
 msgstr ""
 
-#: src/concepts/color-management.xml:103(para)
+#: src/concepts/color-management.xml:104(para)
 msgid ""
 "Most digital cameras embed a color profile to individual photo files without "
 "user interaction. Digital scanners usually come with a color profile, which "
 "they also attach to the scanned images."
 msgstr ""
 
-#: src/concepts/color-management.xml:109(title)
+#: src/concepts/color-management.xml:110(title)
 msgid "Applying the ICC-profile"
 msgstr ""
 
-#: src/concepts/color-management.xml:116(para)
+#: src/concepts/color-management.xml:117(para)
 msgid ""
-"When opening an image with an embedded color profile, GIMP offers to convert "
-"the file to the RGB working color space. This is sRGB by default and it is "
-"recommended that all work is done in that color space. Should you however "
-"decide to keep the embedded color profile, the image will however still be "
-"displayed correctly."
+"When opening an image with an embedded color profile, <acronym>GIMP</"
+"acronym> offers to convert the file to the RGB working color space. This is "
+"sRGB by default and it is recommended that all work is done in that color "
+"space. Should you however decide to keep the embedded color profile, the "
+"image will however still be displayed correctly."
 msgstr ""
 
-#: src/concepts/color-management.xml:123(para)
+#: src/concepts/color-management.xml:125(para)
 msgid ""
 "In case for some reason a color profile is not embedded in the image and you "
 "know (or have a good guess) which one it should be, you can manually assign "
 "it to that image."
 msgstr ""
 
-#: src/concepts/color-management.xml:131(title)
+#: src/concepts/color-management.xml:133(title)
 msgid "Display"
 msgstr ""
 
-#: src/concepts/color-management.xml:132(para)
+#: src/concepts/color-management.xml:134(para)
 msgid ""
 "For the best results, you need a color profile for your monitor. If a "
 "monitor profile is configured, either system-wide or in the Color Management "
-"section of the GIMP Preferences dialog, the image colors will be displayed "
-"most accurately."
+"section of the <acronym>GIMP</acronym> Preferences dialog, the image colors "
+"will be displayed most accurately."
 msgstr ""
 
-#: src/concepts/color-management.xml:138(para)
+#: src/concepts/color-management.xml:140(para)
 msgid ""
-"One of the most important GIMP commands to work with color management is "
-"described in <xref linkend=\"gimp-display-filter-dialog\"/>."
+"One of the most important <acronym>GIMP</acronym> commands to work with "
+"color management is described in <xref linkend=\"gimp-display-filter-dialog"
+"\"/>."
 msgstr ""
 
-#: src/concepts/color-management.xml:143(para)
+#: src/concepts/color-management.xml:145(para)
 msgid ""
 "If you do not have a color profile for your monitor, you can create it using "
 "hardware calibration and measurement tools. On UNIX systems you will need "
@@ -5909,19 +6110,19 @@ msgid ""
 "profiles."
 msgstr ""
 
-#: src/concepts/color-management.xml:155(title)
+#: src/concepts/color-management.xml:157(title)
 msgid "Display Calibration and Profiling"
 msgstr ""
 
-#: src/concepts/color-management.xml:157(primary)
+#: src/concepts/color-management.xml:159(primary)
 msgid "Color management"
 msgstr ""
 
-#: src/concepts/color-management.xml:160(primary)
+#: src/concepts/color-management.xml:162(primary)
 msgid "Color profile"
 msgstr ""
 
-#: src/concepts/color-management.xml:162(para)
+#: src/concepts/color-management.xml:164(para)
 msgid ""
 "For displays there are two steps involved. One is called calibration and the "
 "other is called profiling. Also, calibration generally involves two steps. "
@@ -5938,27 +6139,28 @@ msgid ""
 "load a gamma value.)"
 msgstr ""
 
-#: src/concepts/color-management.xml:178(para)
+#: src/concepts/color-management.xml:180(para)
 msgid ""
-"The second step, profiling, derives a set of rules which allow GIMP to "
-"translate RGB values in the image file into appropriate colors on the "
-"screen. This is also stored in the monitor profile. It doesn't change the "
-"RGB values in the image, but it does change which values are sent to the "
-"video card (which already contains the vgct LUT)."
+"The second step, profiling, derives a set of rules which allow "
+"<acronym>GIMP</acronym> to translate RGB values in the image file into "
+"appropriate colors on the screen. This is also stored in the monitor "
+"profile. It doesn't change the RGB values in the image, but it does change "
+"which values are sent to the video card (which already contains the vgct "
+"LUT)."
 msgstr ""
 
-#: src/concepts/color-management.xml:189(title)
+#: src/concepts/color-management.xml:192(title)
 msgid "Print Simulation"
 msgstr ""
 
-#: src/concepts/color-management.xml:190(para)
+#: src/concepts/color-management.xml:193(para)
 msgid ""
-"Using GIMP, you can easily get a preview of what your image will look like "
-"on paper. Given a color profile for your printer, the display can be "
-"switched into Soft Proof mode. In such a simulated printout, colors that "
-"cannot be reproduced will optionally be marked with neutral gray color, "
-"allowing you to correct such mistakes before sending your images to the "
-"printer."
+"Using <acronym>GIMP</acronym>, you can easily get a preview of what your "
+"image will look like on paper. Given a color profile for your printer, the "
+"display can be switched into Soft Proof mode. In such a simulated printout, "
+"colors that cannot be reproduced will optionally be marked with neutral gray "
+"color, allowing you to correct such mistakes before sending your images to "
+"the printer."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -5969,14 +6171,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/brushes.xml:131(None)
+#: src/concepts/brushes.xml:135(None)
 msgid ""
 "@@image: 'images/using/select-to-brush.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #: src/concepts/brushes.xml:15(title) src/concepts/brushes.xml:18(primary)
-#: src/concepts/brushes.xml:75(primary) src/concepts/brushes.xml:98(primary)
-#: src/concepts/brushes.xml:141(primary) src/concepts/brushes.xml:169(primary)
+#: src/concepts/brushes.xml:78(primary) src/concepts/brushes.xml:102(primary)
+#: src/concepts/brushes.xml:145(primary) src/concepts/brushes.xml:174(primary)
 msgid "Brushes"
 msgstr ""
 
@@ -5987,77 +6189,81 @@ msgstr ""
 #: src/concepts/brushes.xml:29(para)
 msgid ""
 "A number of examples of brushstrokes painted using different brushes from "
-"the set supplied with GIMP. All were painted using the Paintbrush tool."
+"the set supplied with <acronym>GIMP</acronym>. All were painted using the "
+"Paintbrush tool."
 msgstr ""
 
 #: src/concepts/brushes.xml:37(para)
 msgid ""
 "A <emphasis>brush</emphasis> is a pixmap or set of pixmaps used for "
-"painting. GIMP includes a set of 10 <quote>paint tools</quote>, which not "
-"only perform operations that you would normally think of as painting, but "
-"also operations such as erasing, copying, smudging, lightening or darkening, "
-"etc. All of the paint tools, except the ink tool, use the same set of "
-"brushes. The brush pixmaps represent the marks that are made by single "
-"<quote>touches</quote> of the brush to the image. A brush stroke, usually "
-"made by moving the pointer across the image with the mouse button held down, "
-"produces a series of marks spaced along the trajectory, in a way specified "
-"by the characteristics of the brush and the paint tool being used."
+"painting. <acronym>GIMP</acronym> includes a set of 10 <quote>paint tools</"
+"quote>, which not only perform operations that you would normally think of "
+"as painting, but also operations such as erasing, copying, smudging, "
+"lightening or darkening, etc. All of the paint tools, except the ink tool, "
+"use the same set of brushes. The brush pixmaps represent the marks that are "
+"made by single <quote>touches</quote> of the brush to the image. A brush "
+"stroke, usually made by moving the pointer across the image with the mouse "
+"button held down, produces a series of marks spaced along the trajectory, in "
+"a way specified by the characteristics of the brush and the paint tool being "
+"used."
 msgstr ""
 
-#: src/concepts/brushes.xml:50(para)
+#: src/concepts/brushes.xml:51(para)
 msgid ""
 "Brushes can be selected by clicking on an icon in the <link linkend=\"gimp-"
-"brush-dialog\">Brushes dialog</link>. GIMP's <emphasis>current brush</"
-"emphasis> is shown in the Brush/Pattern/Gradient area of the Toolbox. "
-"Clicking on the brush symbol there is one way of activating the Brushes "
-"dialog."
+"brush-dialog\">Brushes dialog</link>. <acronym>GIMP</acronym>'s "
+"<emphasis>current brush</emphasis> is shown in the Brush/Pattern/Gradient "
+"area of the Toolbox. Clicking on the brush symbol there is one way of "
+"activating the Brushes dialog."
 msgstr ""
 
-#: src/concepts/brushes.xml:57(para)
+#: src/concepts/brushes.xml:59(para)
 msgid ""
-"When you install GIMP, it comes with a number of basic brushes, plus a few "
-"bizarre ones that serve mainly to give you examples of what is possible (i. "
-"e., the \"green pepper\" brush in the illustration). You can also create new "
-"brushes, or download them and install them so that GIMP will recognize them."
+"When you install <acronym>GIMP</acronym>, it comes with a number of basic "
+"brushes, plus a few bizarre ones that serve mainly to give you examples of "
+"what is possible (i. e., the \"green pepper\" brush in the illustration). "
+"You can also create new brushes, or download them and install them so that "
+"<acronym>GIMP</acronym> will recognize them."
 msgstr ""
 
-#: src/concepts/brushes.xml:64(para)
+#: src/concepts/brushes.xml:66(para)
 msgid ""
-"GIMP can use several different types of brushes. All of them, however, are "
-"used in the same way, and for most purposes you don't need to worry about "
-"the differences when you paint with them. Here are the available types of "
-"brushes:"
+"<acronym>GIMP</acronym> can use several different types of brushes. All of "
+"them, however, are used in the same way, and for most purposes you don't "
+"need to worry about the differences when you paint with them. Here are the "
+"available types of brushes:"
 msgstr ""
 
-#: src/concepts/brushes.xml:72(term)
+#: src/concepts/brushes.xml:75(term)
 msgid "Ordinary brushes"
 msgstr ""
 
-#: src/concepts/brushes.xml:76(secondary)
+#: src/concepts/brushes.xml:79(secondary)
 msgid "Ordinary"
 msgstr ""
 
-#: src/concepts/brushes.xml:78(para)
+#: src/concepts/brushes.xml:81(para)
 msgid ""
-"Most of the brushes supplied with GIMP fall into this category. They are "
-"represented in the Brushes dialog by grayscale pixmaps. When you paint using "
-"them, the current foreground color (as shown in the Color Area of the "
-"Toolbox) is substituted for black, and the pixmap shown in the brushes "
-"dialog represents the mark that the brush makes on the image."
+"Most of the brushes supplied with <acronym>GIMP</acronym> fall into this "
+"category. They are represented in the Brushes dialog by grayscale pixmaps. "
+"When you paint using them, the current foreground color (as shown in the "
+"Color Area of the Toolbox) is substituted for black, and the pixmap shown in "
+"the brushes dialog represents the mark that the brush makes on the image."
 msgstr ""
 
-#: src/concepts/brushes.xml:86(para)
+#: src/concepts/brushes.xml:90(para)
 msgid ""
 "To create such a brush: Create a small image in gray levels using zoom. Save "
 "it with the .gbr extension. Click on Refresh button in the Brush Dialog to "
-"get it in preview without it being necessary to restart GIMP."
+"get it in preview without it being necessary to restart <acronym>GIMP</"
+"acronym>."
 msgstr ""
 
-#: src/concepts/brushes.xml:95(term)
+#: src/concepts/brushes.xml:99(term)
 msgid "Color brushes"
 msgstr ""
 
-#: src/concepts/brushes.xml:101(para)
+#: src/concepts/brushes.xml:105(para)
 msgid ""
 "Brushes in this category are represented by colored images in the Brushes "
 "dialog. They can be pictures or text. When you paint with them, the colors "
@@ -6065,40 +6271,40 @@ msgid ""
 "Otherwise they work the same way as ordinary brushes."
 msgstr ""
 
-#: src/concepts/brushes.xml:108(para)
+#: src/concepts/brushes.xml:112(para)
 msgid ""
 "To create such a brush: Create a small RGBA image. For this, open New Image, "
 "select RGB for image type and Transparent for fill type. Draw your image and "
 "and firs save it as a .xcf file to keep its properties. Then save it in "
 "<emphasis>.gbr</emphasis> format. Click on the <emphasis>Refresh</emphasis> "
 "button in Brush Dialog to get your brush without it being necessary to "
-"restart GIMP."
+"restart <acronym>GIMP</acronym>."
 msgstr ""
 
-#: src/concepts/brushes.xml:117(para)
+#: src/concepts/brushes.xml:121(para)
 msgid ""
 "When you do a Copy or a Cut on a selection, you see the contents of the "
 "clipboard (that is the selection) at the first position in the brushes "
 "dialog. And you can use it for painting."
 msgstr ""
 
-#: src/concepts/brushes.xml:125(phrase)
+#: src/concepts/brushes.xml:129(phrase)
 msgid "Selection to Brush after Copy or Cut"
 msgstr ""
 
-#: src/concepts/brushes.xml:138(term)
+#: src/concepts/brushes.xml:142(term)
 msgid "Image hoses / Image pipes"
 msgstr ""
 
-#: src/concepts/brushes.xml:142(secondary)
+#: src/concepts/brushes.xml:146(secondary)
 msgid "Animated brushes"
 msgstr ""
 
-#: src/concepts/brushes.xml:146(primary)
+#: src/concepts/brushes.xml:150(primary)
 msgid "Image hoses"
 msgstr ""
 
-#: src/concepts/brushes.xml:148(para)
+#: src/concepts/brushes.xml:152(para)
 msgid ""
 "Brushes in this category can make more than one kind of mark on an image. "
 "They are indicated by small red triangles at the lower right corner of the "
@@ -6107,24 +6313,25 @@ msgid ""
 "principle, image hose brushes can be very sophisticated, especially if you "
 "use a tablet, changing shape as a function of pressure, angle, etc. These "
 "possibilities have never really been exploited, however; and the ones "
-"supplied with GIMP are relatively simple (but still quite useful)."
+"supplied with <acronym>GIMP</acronym> are relatively simple (but still quite "
+"useful)."
 msgstr ""
 
-#: src/concepts/brushes.xml:159(para)
+#: src/concepts/brushes.xml:164(para)
 msgid ""
 "You will find an example on how to create such brushes in <link linkend="
 "\"gimp-using-brushes\">Animated brushes</link>"
 msgstr ""
 
-#: src/concepts/brushes.xml:166(term)
+#: src/concepts/brushes.xml:171(term)
 msgid "Parametric brushes"
 msgstr ""
 
-#: src/concepts/brushes.xml:170(secondary)
+#: src/concepts/brushes.xml:175(secondary)
 msgid "Parametric"
 msgstr ""
 
-#: src/concepts/brushes.xml:172(para)
+#: src/concepts/brushes.xml:177(para)
 msgid ""
 "These are brushes created using the <link linkend=\"gimp-brush-editor-dialog"
 "\">Brush Editor</link>, which allows you to generate a wide variety of brush "
@@ -6135,7 +6342,7 @@ msgid ""
 "if it is a parametric brush."
 msgstr ""
 
-#: src/concepts/brushes.xml:185(para)
+#: src/concepts/brushes.xml:190(para)
 msgid ""
 "Now, all brushes have a variable size. In fact, in the option box of all "
 "painting tools there is a slider to enlarge or reduce the size of the active "
@@ -6144,13 +6351,13 @@ msgid ""
 "brush\">Varying brush size</link>."
 msgstr ""
 
-#: src/concepts/brushes.xml:199(para)
+#: src/concepts/brushes.xml:204(para)
 msgid ""
-"In addition to the brush pixmap, each GIMP brush has one other important "
-"property: the brush <emphasis>Spacing</emphasis>. This represents the "
-"distance between consecutive brush-marks when a continuous brushstroke is "
-"painted. Each brush has an assigned default value for this, which can be "
-"modified using the Brushes dialog."
+"In addition to the brush pixmap, each <acronym>GIMP</acronym> brush has one "
+"other important property: the brush <emphasis>Spacing</emphasis>. This "
+"represents the distance between consecutive brush-marks when a continuous "
+"brushstroke is painted. Each brush has an assigned default value for this, "
+"which can be modified using the Brushes dialog."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -6161,7 +6368,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/concepts/basic-setup.xml:115(None)
+#: src/concepts/basic-setup.xml:131(None)
 msgid "@@image: 'images/using/tab-icon.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
@@ -6184,116 +6391,123 @@ msgstr ""
 
 #: src/concepts/basic-setup.xml:36(para)
 msgid ""
-"The screenshot above shows the most basic arrangement of GIMP windows that "
-"can be used effectively."
+"The screenshot above shows the most basic arrangement of <acronym>GIMP</"
+"acronym> windows that can be used effectively."
 msgstr ""
 
 #: src/concepts/basic-setup.xml:41(para)
 msgid ""
-"<emphasis>The Main Toolbox:</emphasis> This is the heart of GIMP. It "
-"contains the highest level menu, plus a set of icon buttons that can be used "
-"to select tools, and more."
+"<emphasis>The Main Toolbox:</emphasis> Contains a set of icon buttons used "
+"to select tools. May also contain the foreground and background colors; "
+"brush, pattern, and Gradient; and an icon of the active image. Use "
+"<menuchoice><guimenu>Edit</guimenu><guisubmenu>Preferences</"
+"guisubmenu><guisubmenu>Toolbox</guisubmenu></menuchoice> to enable, or "
+"disable the extra items."
 msgstr ""
 
-#: src/concepts/basic-setup.xml:48(para)
+#: src/concepts/basic-setup.xml:56(para)
 msgid ""
 "<emphasis>Tool options:</emphasis> Docked below the main Toolbox is a Tool "
 "Options dialog, showing options for the currently selected tool (in this "
-"case, the Rectangle Select tool)."
+"case, the Smudge tool)."
 msgstr ""
 
-#: src/concepts/basic-setup.xml:56(para)
+#: src/concepts/basic-setup.xml:64(para)
 msgid ""
-"<emphasis>An image window:</emphasis> Each image open in GIMP is displayed "
-"in a separate window. A lot of images can be open at the same time, only "
-"limited by the system resources. Before you can do anything useful in GIMP, "
-"you need to have at least one image window open. The image window holds the "
-"Menu of the main commands of GIMP (File, Edit, Select...), which you can "
-"also get by right-clicking on the window."
+"<emphasis>An image window:</emphasis> Each image open in <acronym>GIMP</"
+"acronym> is displayed in a separate window. Many images can be open at the "
+"same time, limited by only the system resources. Before you can do anything "
+"useful in <acronym>GIMP</acronym>, you need to have at least one image "
+"window open. The image window holds the Menu of the main commands of "
+"<acronym>GIMP</acronym> (File, Edit, Select...), which you can also get by "
+"right-clicking on the window."
 msgstr ""
 
-#: src/concepts/basic-setup.xml:67(para)
+#: src/concepts/basic-setup.xml:77(para)
 msgid ""
 "The <emphasis>Layers, Channels, Paths</emphasis> dock with the Layers Dialog "
-"open. This dialog window shows the layer structure of the currently active "
+"open; note that the <quote>dialogs</quote> in the <quote>dock</quote> are "
+"tabs. This dialog window shows the layer structure of the currently active "
 "image, and allows it to be manipulated in a variety of ways. It is possible "
 "to do a few very basic things without using the Layers dialog, but even "
-"moderately sophisticated GIMP users find it indispensable to have the Layers "
-"dialog available at all times."
+"moderately sophisticated <acronym>GIMP</acronym> users find it indispensable "
+"to have the Layers dialog available at all times."
 msgstr ""
 
-#: src/concepts/basic-setup.xml:78(para)
+#: src/concepts/basic-setup.xml:90(para)
 msgid ""
 "<emphasis>Brushes/Patterns/Gradients:</emphasis> The docked dialog below the "
-"layer dialog shows the dialogs for managing brushes, patterns and gradients."
+"layer dialog shows the dialogs (tabs) for managing brushes, patterns and "
+"gradients."
 msgstr ""
 
-#: src/concepts/basic-setup.xml:85(para)
+#: src/concepts/basic-setup.xml:97(para)
 msgid ""
 "This is a minimal setup. There are over a dozen other types of dialogs used "
-"by GIMP for various purposes, but users typically open them when they need "
-"them and close them when they are done. Knowledgeable users generally keep "
-"the Toolbox (with Tool Options) and Layers dialog around at all times. The "
-"Toolbox is essential to many GIMP operations; in fact, if you close it, GIMP "
-"will exit after confirming that that is actually what you want to do. The "
-"Tool Options section is actually a separate dialog, shown docked to the Main "
-"Toolbox in the screenshot. Knowledgeable users almost always have it set up "
-"this way: it is very difficult to use tools effectively without being able "
-"to see how their options are set. The Layers dialog comes into play whenever "
-"you work with an image that has multiple layers: once you advance beyond the "
-"very most basic stages of GIMP expertise, this means <emphasis>almost "
+"by <acronym>GIMP</acronym> for various purposes, but users typically open "
+"them when they need them and close them when they are done. Knowledgeable "
+"users generally keep the Toolbox (with Tool Options) and Layers dialog open "
+"at all times. The Toolbox is essential to many <acronym>GIMP</acronym> "
+"operations; in fact, if you close it, <acronym>GIMP</acronym> will exit "
+"after confirming that that is actually what you want to do. The Tool Options "
+"section is actually a separate dialog, shown docked to the Main Toolbox in "
+"the screenshot. Knowledgeable users almost always have it set up this way: "
+"it is very difficult to use tools effectively without being able to see how "
+"their options are set. The Layers dialog comes into play when you work with "
+"an image with multiple layers: after you advance beyond the most basic "
+"stages of <acronym>GIMP</acronym> expertise, this means <emphasis>almost "
 "always</emphasis>. And of course it helps to display the images you're "
 "editing on the screen; if you close the image window before saving your "
-"work, GIMP will ask you whether you want to close the file."
+"work, <acronym>GIMP</acronym> will ask you whether you want to close the "
+"file."
 msgstr ""
 
-#: src/concepts/basic-setup.xml:104(para)
+#: src/concepts/basic-setup.xml:119(para)
 msgid ""
-"If your GIMP layout gets trashed, fortunately your arrangement is pretty "
-"easy to recover by using <menuchoice><guimenu>Windows</"
-"guimenu><guisubmenu>Recently Closed Docks</guisubmenu></menuchoice> To add, "
-"close or detach a tab from a dock, click on <placeholder-1/> in the upper "
-"right corner of a dialog. This opens the Tab menu. Select <guimenuitem>Add "
-"Tab</guimenuitem>,<guimenuitem> Close Tab </guimenuitem> or "
-"<guimenuitem>Detach Tab</guimenuitem>."
+"If your <acronym>GIMP</acronym> layout is lost, your arrangement is easy to "
+"recover using <menuchoice><guimenu>Windows</guimenu><guisubmenu>Recently "
+"Closed Docks</guisubmenu></menuchoice> ; the Windows menu command is only "
+"available while an image is open. To add, close, or detach a tab from a "
+"dock, click <placeholder-1/> in the upper right corner of a dialog. This "
+"opens the Tab menu. Select <guimenuitem>Add Tab</guimenuitem>,<guimenuitem> "
+"Close Tab </guimenuitem>, or <guimenuitem>Detach Tab</guimenuitem>."
 msgstr ""
 
-#: src/concepts/basic-setup.xml:124(para)
+#: src/concepts/basic-setup.xml:140(para)
 msgid ""
-"Unlike some other programs, GIMP does not give you the option of putting all "
-"your controls and image displays into a single comprehensive window. The "
-"GIMP developers have always felt that this is a poor way of working, because "
-"it forces the program to do the work of a dedicated window manager. Not only "
-"would this waste a lot of programmer time, it is almost impossible to do in "
-"a way that works correctly across all of the operating systems GIMP is "
-"intended to run on."
+"<acronym>GIMP</acronym> does not support placing all controls and images "
+"into a single comprehensive window. The consensus in the <acronym>GIMP</"
+"acronym> community, is that multiple windows offers a better user "
+"experience&mdash;and a single window is difficult to do in a way that works "
+"correctly across all of the operating systems on which <acronym>GIMP</"
+"acronym> runs."
 msgstr ""
 
-#: src/concepts/basic-setup.xml:134(para)
+#: src/concepts/basic-setup.xml:149(para)
 msgid ""
-"Earlier versions of GIMP (up to GIMP 1.2.5) were very profligate with "
-"dialogs: advanced users often had half a dozen or more dialogs open at once, "
-"scattered all over the screen and very difficult to keep track of. GIMP 2.0 "
-"is much better in this respect, because it allows dialogs to be docked "
-"together in a flexible way. (The Layers dialog in the screenshot actually "
-"contains four dialogs, represented by tabs: Layers, Channels, Paths, and "
-"Undo.) The system takes a little while to learn, but once you learn it, we "
-"hope that you will like it."
+"Earlier versions of <acronym>GIMP</acronym> (up to <acronym>GIMP</acronym> "
+"1.2.5) used many dialogs: advanced users often had half a dozen or more "
+"dialogs open at once, scattered all over the screen and very difficult to "
+"track. <acronym>GIMP</acronym> 2.0 is much better in this respect, because "
+"it allows dialogs to be docked together in a flexible way. (The Layers "
+"dialog in the screenshot actually contains four dialogs, represented by "
+"tabs: Layers, Channels, Paths, and Undo.) The system takes a little while to "
+"learn, but once you learn it, we hope that you will like it."
 msgstr ""
 
-#: src/concepts/basic-setup.xml:144(para)
+#: src/concepts/basic-setup.xml:161(para)
 msgid ""
-"The following sections will walk you through the components of each of the "
+"The following sections walk you through the components of each of the "
 "windows shown in the screenshot, explaining what they are and how they work. "
 "Once you have read them, plus the section describing the basic structure of "
-"GIMP images, you should have learned enough to use GIMP for a wide variety "
-"of basic image manipulations. You can then look through the rest of the "
-"manual at your leisure (or just experiment) to learn the almost limitless "
-"number of more subtle and specialized things that are possible. Have fun!"
+"<acronym>GIMP</acronym> images, you should have learned enough to use "
+"<acronym>GIMP</acronym> for a wide variety of basic image manipulations. You "
+"can then look through the rest of the manual at your leisure (or just "
+"experiment) to learn the almost limitless number of more subtle and "
+"specialized things that are possible. Have fun!"
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
 #: src/concepts/basic-setup.xml:0(None)
 msgid "translator-credits"
-msgstr ""
-"Aron Xu <aronxu gnome org>"
+msgstr "Aron Xu <aronxu gnome org>"
diff --git a/po/zh_CN/dialogs.po b/po/zh_CN/dialogs.po
index 697e431..44ccae7 100644
--- a/po/zh_CN/dialogs.po
+++ b/po/zh_CN/dialogs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:07+0800\n"
 "PO-Revision-Date: 2009-06-23 19:34+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -27,25 +27,25 @@ msgid "Undo History Dialog"
 msgstr ""
 
 #: src/dialogs/undo-history-dialog.xml:13(primary)
-#: src/dialogs/tools-dialog.xml:13(primary)
+#: src/dialogs/tools-dialog.xml:15(primary)
 #: src/dialogs/templates-dialog.xml:17(primary)
 #: src/dialogs/pointer-dialog.xml:15(primary)
 #: src/dialogs/patterns-dialog.xml:16(primary)
-#: src/dialogs/path-dialog.xml:12(primary)
+#: src/dialogs/path-dialog.xml:14(primary)
 #: src/dialogs/palettes-dialog.xml:18(primary)
 #: src/dialogs/layer-dialog.xml:17(primary)
 #: src/dialogs/indexed-palette-dialog.xml:16(primary)
 #: src/dialogs/images-dialog.xml:17(primary)
 #: src/dialogs/histogram-dialog.xml:14(primary)
-#: src/dialogs/gradient-dialog.xml:14(primary)
+#: src/dialogs/gradient-dialog.xml:16(primary)
 #: src/dialogs/fonts-dialog.xml:13(primary)
 #: src/dialogs/document-dialog.xml:16(primary)
 #: src/dialogs/dialogs_introduction.xml:11(primary)
 #: src/dialogs/device-status-dialog.xml:14(primary)
 #: src/dialogs/color-dialog.xml:18(primary)
 #: src/dialogs/channel-dialog.xml:13(primary)
-#: src/dialogs/buffers-dialog.xml:16(primary)
-#: src/dialogs/brushes-dialog.xml:21(primary)
+#: src/dialogs/buffers-dialog.xml:17(primary)
+#: src/dialogs/brushes-dialog.xml:23(primary)
 msgid "Dialogs"
 msgstr ""
 
@@ -69,12 +69,12 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/undo-history-dialog.xml:38(title)
-#: src/dialogs/tools-dialog.xml:45(title)
+#: src/dialogs/tools-dialog.xml:46(title)
 #: src/dialogs/templates-dialog.xml:43(title)
 #: src/dialogs/sample-points.xml:31(phrase) src/dialogs/qmask.xml:36(title)
 #: src/dialogs/pointer-dialog.xml:41(phrase)
 #: src/dialogs/patterns-dialog.xml:46(title)
-#: src/dialogs/path-dialog.xml:39(title)
+#: src/dialogs/path-dialog.xml:41(title)
 #: src/dialogs/palettes-dialog.xml:54(title)
 #: src/dialogs/navigation-dialog.xml:39(phrase)
 #: src/dialogs/layer-dialog.xml:63(title)
@@ -91,26 +91,26 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/undo-history-dialog.xml:44(para)
-#: src/dialogs/tools-dialog.xml:51(para)
+#: src/dialogs/tools-dialog.xml:52(para)
 #: src/dialogs/templates-dialog.xml:49(para)
 #: src/dialogs/sample-points.xml:38(para)
 #: src/dialogs/pointer-dialog.xml:48(para)
 #: src/dialogs/patterns-dialog.xml:52(para)
-#: src/dialogs/path-dialog.xml:45(para)
+#: src/dialogs/path-dialog.xml:47(para)
 #: src/dialogs/palettes-dialog.xml:59(para)
 #: src/dialogs/navigation-dialog.xml:46(para)
 #: src/dialogs/layer-dialog.xml:69(para)
 #: src/dialogs/indexed-palette-dialog.xml:53(para)
 #: src/dialogs/images-dialog.xml:45(para)
 #: src/dialogs/histogram-dialog.xml:46(para)
-#: src/dialogs/gradient-dialog.xml:77(para)
+#: src/dialogs/gradient-dialog.xml:81(para)
 #: src/dialogs/fonts-dialog.xml:42(para)
 #: src/dialogs/error-console.xml:32(para)
 #: src/dialogs/document-dialog.xml:44(para)
 #: src/dialogs/color-dialog.xml:68(para)
 #: src/dialogs/channel-dialog.xml:128(para)
-#: src/dialogs/buffers-dialog.xml:92(para)
-#: src/dialogs/brushes-dialog.xml:56(para)
+#: src/dialogs/buffers-dialog.xml:93(para)
+#: src/dialogs/brushes-dialog.xml:60(para)
 msgid "You can access it:"
 msgstr ""
 
@@ -142,15 +142,15 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/undo-history-dialog.xml:82(para)
-#: src/dialogs/tools-dialog.xml:91(para)
+#: src/dialogs/tools-dialog.xml:92(para)
 #: src/dialogs/patterns-dialog.xml:194(para)
 #: src/dialogs/palettes-dialog.xml:145(para)
 #: src/dialogs/images-dialog.xml:111(para)
-#: src/dialogs/gradient-dialog.xml:163(para)
+#: src/dialogs/gradient-dialog.xml:167(para)
 #: src/dialogs/fonts-dialog.xml:127(para)
 #: src/dialogs/document-dialog.xml:99(para)
-#: src/dialogs/buffers-dialog.xml:174(para)
-#: src/dialogs/brushes-dialog.xml:206(para)
+#: src/dialogs/buffers-dialog.xml:175(para)
+#: src/dialogs/brushes-dialog.xml:211(para)
 msgid ""
 "<keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo> opens a search "
 "field. See <xref linkend=\"gimp-dock-view-as-list\"/>"
@@ -210,48 +210,47 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/tools-dialog.xml:30(None)
+#: src/dialogs/tools-dialog.xml:31(None)
 msgid "@@image: 'images/dialogs/tools-dialog.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:11(title)
-msgid "<quote>Tools</quote> Dialog"
+#: src/dialogs/tools-dialog.xml:12(title)
+msgid "Tools Dialog"
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:14(secondary)
-#: src/dialogs/tools-dialog.xml:17(primary)
-#: src/dialogs/tools-dialog.xml:26(quote)
+#: src/dialogs/tools-dialog.xml:16(secondary)
+#: src/dialogs/tools-dialog.xml:19(primary)
 msgid "Tools"
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:18(secondary)
+#: src/dialogs/tools-dialog.xml:20(secondary)
 #: src/dialogs/sample-points.xml:15(primary)
 #: src/dialogs/patterns-dialog.xml:21(secondary)
-#: src/dialogs/path-dialog.xml:17(secondary)
+#: src/dialogs/path-dialog.xml:19(secondary)
 #: src/dialogs/palettes-dialog.xml:23(secondary)
 #: src/dialogs/navigation-dialog.xml:16(secondary)
 #: src/dialogs/layer-dialog.xml:22(secondary)
-#: src/dialogs/gradient-dialog.xml:19(secondary)
+#: src/dialogs/gradient-dialog.xml:21(secondary)
 #: src/dialogs/fonts-dialog.xml:18(secondary)
 #: src/dialogs/channel-dialog.xml:18(secondary)
-#: src/dialogs/buffers-dialog.xml:21(secondary)
-#: src/dialogs/brushes-dialog.xml:26(secondary)
+#: src/dialogs/buffers-dialog.xml:22(secondary)
+#: src/dialogs/brushes-dialog.xml:28(secondary)
 msgid "Dialog"
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:21(primary)
+#: src/dialogs/tools-dialog.xml:23(primary)
 msgid "Customize"
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:22(secondary)
+#: src/dialogs/tools-dialog.xml:24(secondary)
 msgid "Toolbox"
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:26(phrase)
-msgid "The <placeholder-1/> dialog"
+#: src/dialogs/tools-dialog.xml:28(title)
+msgid "The Tools dialog"
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:34(para)
+#: src/dialogs/tools-dialog.xml:35(para)
 msgid ""
 "The <quote>Tools</quote> dialog is used mainly to control the appearance of "
 "the Toolbox. It allows you to customize the set of tools for which icons are "
@@ -262,20 +261,20 @@ msgid ""
 "use the Toolbox."
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:46(para)
+#: src/dialogs/tools-dialog.xml:47(para)
 msgid ""
 "The <quote>Tools</quote> dialog is a dockable dialog; see the section <xref "
 "linkend=\"gimp-concepts-docks\"/> for help on manipulating it."
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:56(para)
+#: src/dialogs/tools-dialog.xml:57(para)
 msgid ""
 "from the image menu: <menuchoice><guimenu>Windows</"
 "guimenu><guisubmenu>Dockable Dialogs</guisubmenu><guimenuitem>Tools</"
 "guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:66(para)
+#: src/dialogs/tools-dialog.xml:67(para)
 msgid ""
 "from the Tab menu in any dockable dialog by clicking on "
 "<guiicon><inlinegraphic fileref=\"images/dialogs/stock-menu-left-12.png\"/></"
@@ -283,16 +282,16 @@ msgid ""
 "guimenu><guimenuitem>Tools</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:81(title)
+#: src/dialogs/tools-dialog.xml:82(title)
 #: src/dialogs/templates-dialog.xml:86(title)
 #: src/dialogs/patterns-dialog.xml:109(term)
 #: src/dialogs/palettes-dialog.xml:107(term)
-#: src/dialogs/gradient-dialog.xml:150(term)
+#: src/dialogs/gradient-dialog.xml:154(term)
 #: src/dialogs/fonts-dialog.xml:101(term)
 msgid "Grid/List modes"
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:82(para)
+#: src/dialogs/tools-dialog.xml:83(para)
 msgid ""
 "In the Tab menu, you can choose between <guimenuitem>View as Grid</"
 "guimenuitem> and <guimenuitem>View as List</guimenuitem>. In Grid mode, the "
@@ -301,11 +300,11 @@ msgid ""
 "<quote>eye</quote> icon if the tool is currently visible in the Toolbox."
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:100(title)
-msgid "Using the <quote>Tools</quote> dialog"
+#: src/dialogs/tools-dialog.xml:101(title)
+msgid "Using the Tools dialog"
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:101(para)
+#: src/dialogs/tools-dialog.xml:102(para)
 msgid ""
 "The most basic thing you can do is to select a tool by clicking on its icon: "
 "this has the same effect as clicking on an icon in the Toolbox. You can do "
@@ -313,7 +312,7 @@ msgid ""
 "available only in List mode."
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:107(para)
+#: src/dialogs/tools-dialog.xml:108(para)
 msgid ""
 "The most important function of the <quote>Tools</quote> dialog is to let you "
 "choose which tools to make visible in the Toolbox, by toggling the "
@@ -322,7 +321,7 @@ msgid ""
 "toggling visibility on for them here."
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:114(para)
+#: src/dialogs/tools-dialog.xml:115(para)
 msgid ""
 "You can also change the order of tools in the Toolbox, by clicking on an "
 "item in the <quote>Tools</quote> dialog, in List mode, and dragging it up or "
@@ -331,7 +330,7 @@ msgid ""
 "defaults for order and visibility."
 msgstr ""
 
-#: src/dialogs/tools-dialog.xml:121(para)
+#: src/dialogs/tools-dialog.xml:122(para)
 msgid ""
 "Right-clicking inside the dialog produces the <quote>Tools</quote> menu, "
 "which gives you an alternative way of toggling visibility or restoring the "
@@ -346,7 +345,7 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/templates-dialog.xml:14(title)
-msgid "<quote>Templates</quote> Dialog"
+msgid "Templates Dialog"
 msgstr ""
 
 #: src/dialogs/templates-dialog.xml:18(secondary)
@@ -355,7 +354,7 @@ msgid "Templates"
 msgstr ""
 
 #: src/dialogs/templates-dialog.xml:25(title)
-msgid "The <quote>Templates</quote> dialog"
+msgid "The Templates dialog"
 msgstr ""
 
 #: src/dialogs/templates-dialog.xml:34(para)
@@ -388,7 +387,7 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/templates-dialog.xml:79(title)
-msgid "Using the <quote>Templates</quote> dialog"
+msgid "Using the Templates dialog"
 msgstr ""
 
 #: src/dialogs/templates-dialog.xml:80(para)
@@ -421,8 +420,8 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/templates-dialog.xml:111(title)
-#: src/dialogs/buffers-dialog.xml:186(title)
-#: src/dialogs/brushes-dialog.xml:259(title)
+#: src/dialogs/buffers-dialog.xml:187(title)
+#: src/dialogs/brushes-dialog.xml:266(title)
 msgid "Buttons at the bottom"
 msgstr ""
 
@@ -487,7 +486,7 @@ msgstr ""
 #: src/dialogs/pointer-dialog.xml:68(None)
 #: src/dialogs/navigation-dialog.xml:66(None)
 #: src/dialogs/error-console.xml:52(None)
-#: src/dialogs/error-console.xml:132(None)
+#: src/dialogs/error-console.xml:128(None)
 msgid ""
 "@@image: 'images/dialogs/stock-menu-left-12.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -618,7 +617,7 @@ msgid "In the drop-down list, you can choose between:"
 msgstr ""
 
 #: src/dialogs/sample-points.xml:145(phrase)
-#: src/dialogs/pointer-dialog.xml:135(phrase)
+#: src/dialogs/pointer-dialog.xml:130(phrase)
 msgid "Pixel"
 msgstr ""
 
@@ -630,7 +629,7 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/sample-points.xml:158(phrase)
-#: src/dialogs/pointer-dialog.xml:149(phrase)
+#: src/dialogs/pointer-dialog.xml:144(phrase)
 #: src/dialogs/histogram-dialog.xml:187(term)
 msgid "RGB"
 msgstr ""
@@ -644,7 +643,7 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/sample-points.xml:171(phrase)
-#: src/dialogs/pointer-dialog.xml:164(phrase)
+#: src/dialogs/pointer-dialog.xml:159(phrase)
 msgid "HSV"
 msgstr ""
 
@@ -656,7 +655,7 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/sample-points.xml:184(phrase)
-#: src/dialogs/pointer-dialog.xml:178(phrase)
+#: src/dialogs/pointer-dialog.xml:173(phrase)
 #: src/dialogs/color-dialog.xml:133(term)
 #: src/dialogs/color-dialog.xml:137(title)
 msgid "CMYK"
@@ -909,41 +908,34 @@ msgstr ""
 msgid "<placeholder-1/> dialog options"
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:85(para)
-msgid ""
-"As in every dialog that contains preview icons, you can control the preview "
-"images in the tab menu. To get more informations about that topic read <xref "
-"linkend=\"gimp-concepts-docks\"/>."
-msgstr ""
-
-#: src/dialogs/pointer-dialog.xml:92(phrase)
+#: src/dialogs/pointer-dialog.xml:87(phrase)
 msgid "Pointer Information"
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:96(phrase)
+#: src/dialogs/pointer-dialog.xml:91(phrase)
 msgid "Pixels"
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:99(para)
+#: src/dialogs/pointer-dialog.xml:94(para)
 msgid ""
 "Shows the position of the pointed pixel, in X (horizontal) and Y (vertical) "
 "coordinates, stated in pixels from the origin (the upper left corner of the "
 "canvas)."
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:108(phrase)
+#: src/dialogs/pointer-dialog.xml:103(phrase)
 msgid "Units"
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:111(para)
+#: src/dialogs/pointer-dialog.xml:106(para)
 msgid "Shows the distance from the origin, in inches."
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:118(phrase)
+#: src/dialogs/pointer-dialog.xml:113(phrase)
 msgid "Channel values"
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:122(para)
+#: src/dialogs/pointer-dialog.xml:117(para)
 msgid ""
 "The channel values for the selected <link linkend=\"glossary-colormodel"
 "\">color model</link> are shown below. Both pulldown menus contain the same "
@@ -954,7 +946,7 @@ msgid ""
 "(<guilabel>Pixel</guilabel> is the default):"
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:138(para)
+#: src/dialogs/pointer-dialog.xml:133(para)
 msgid ""
 "The <link linkend=\"glossary-rgb\">RGB</link> channel values. This choice "
 "displays the <emphasis>Red</emphasis>, <emphasis>Green</emphasis>, "
@@ -962,7 +954,7 @@ msgid ""
 "pixel, as numbers between 0 and 255."
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:152(para)
+#: src/dialogs/pointer-dialog.xml:147(para)
 msgid ""
 "The <link linkend=\"glossary-rgb\">RGB</link> channel values. This choice "
 "displays the <emphasis>Red</emphasis>, <emphasis>Green</emphasis>, "
@@ -971,7 +963,7 @@ msgid ""
 "color."
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:167(para)
+#: src/dialogs/pointer-dialog.xml:162(para)
 msgid ""
 "The <link linkend=\"glossary-hsv\">HSV</link> components. This choice "
 "displays the <emphasis>Hue</emphasis>, in degrees, as well as the "
@@ -979,7 +971,7 @@ msgid ""
 "<emphasis>Alpha</emphasis> of the pixel, as percentages."
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:181(para)
+#: src/dialogs/pointer-dialog.xml:176(para)
 msgid ""
 "The <link linkend=\"glossary-cmyk\">CMYK</link> channel values. This choice "
 "displays the <emphasis>Cyan</emphasis>, <emphasis>Magenta</emphasis>, "
@@ -987,11 +979,11 @@ msgid ""
 "emphasis> values of the pixel, as percentages."
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:195(phrase)
+#: src/dialogs/pointer-dialog.xml:190(phrase)
 msgid "Sample Merged"
 msgstr ""
 
-#: src/dialogs/pointer-dialog.xml:198(para)
+#: src/dialogs/pointer-dialog.xml:193(para)
 msgid ""
 "If this option is checked (default), sampling is performed on all layers. If "
 "it is unchecked, sampling is performed on the active layer only."
@@ -1133,7 +1125,7 @@ msgid "List view"
 msgstr ""
 
 #: src/dialogs/patterns-dialog.xml:156(para)
-#: src/dialogs/brushes-dialog.xml:174(term)
+#: src/dialogs/brushes-dialog.xml:179(term)
 msgid "Grid mode"
 msgstr ""
 
@@ -1260,62 +1252,62 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/path-dialog.xml:28(None)
+#: src/dialogs/path-dialog.xml:30(None)
 msgid "@@image: 'images/dialogs/paths-dialog.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/path-dialog.xml:105(None)
+#: src/dialogs/path-dialog.xml:107(None)
 msgid ""
 "@@image: 'images/dialogs/path-list-entry.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/path-dialog.xml:304(None)
+#: src/dialogs/path-dialog.xml:306(None)
 msgid "@@image: 'images/dialogs/paths-menu.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:10(title)
-msgid "<quote>Paths</quote> Dialog"
+#: src/dialogs/path-dialog.xml:12(title)
+msgid "Paths Dialog"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:13(secondary)
-#: src/dialogs/path-dialog.xml:16(primary)
+#: src/dialogs/path-dialog.xml:15(secondary)
+#: src/dialogs/path-dialog.xml:18(primary)
 msgid "Paths"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:19(para)
+#: src/dialogs/path-dialog.xml:21(para)
 msgid ""
 "Please see <xref linkend=\"gimp-using-paths\"/> if you don't know what a "
 "path is."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:25(title)
+#: src/dialogs/path-dialog.xml:27(title)
 msgid "The <quote>Paths</quote> dialog"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:33(para)
+#: src/dialogs/path-dialog.xml:35(para)
 msgid ""
 "The <quote>Paths</quote> dialog is used to manage paths, allowing you to "
 "create or delete them, save them, convert them to and from selections, etc."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:40(para)
+#: src/dialogs/path-dialog.xml:42(para)
 msgid ""
 "The <quote>Paths</quote> dialog is a dockable dialog; see the section <xref "
 "linkend=\"gimp-concepts-docks\"/> for help on manipulating it."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:50(para)
+#: src/dialogs/path-dialog.xml:52(para)
 msgid ""
 "from the image menu: <menuchoice><guimenu>Windows</"
 "guimenu><guisubmenu>Dockable Dialogs</guisubmenu><guimenuitem>Paths</"
 "guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:60(para)
+#: src/dialogs/path-dialog.xml:62(para)
 msgid ""
 "from the Tab menu in any dockable dialog by clicking on "
 "<guiicon><inlinegraphic format=\"PNG\" fileref=\"images/dialogs/stock-menu-"
@@ -1323,7 +1315,7 @@ msgid ""
 "guimenu><guimenuitem>Paths</guimenuitem></menuchoice>,"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:73(para)
+#: src/dialogs/path-dialog.xml:75(para)
 msgid ""
 "In the <guimenu>Windows</guimenu> menu, there is a list of <link linkend="
 "\"gimp-dockable-menu\">detached windows</link> which exists only if at least "
@@ -1332,11 +1324,11 @@ msgid ""
 "guimenu><guimenuitem>Paths</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:86(title)
+#: src/dialogs/path-dialog.xml:88(title)
 msgid "Using the Paths dialog"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:87(para)
+#: src/dialogs/path-dialog.xml:89(para)
 msgid ""
 "Each path belongs to one image: paths are components of images just like "
 "layers. The Paths dialog shows you a list of all paths belonging to the "
@@ -1348,18 +1340,18 @@ msgid ""
 "menu.)"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:97(para)
+#: src/dialogs/path-dialog.xml:99(para)
 msgid ""
 "If you are familiar with the Layers dialog, you have a head start, because "
 "the Paths dialog is in several ways similar. It shows a list of all paths "
 "that exist in the image, with four items for each path:"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:113(phrase)
+#: src/dialogs/path-dialog.xml:115(phrase)
 msgid "Path visibility"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:116(para)
+#: src/dialogs/path-dialog.xml:118(para)
 msgid ""
 "An <quote>open eye</quote> icon if the path is visible, or a blank space if "
 "it is not. <quote>Visible</quote> means that a trace of the path is drawn on "
@@ -1368,11 +1360,11 @@ msgid ""
 "space toggles the visibility of the path."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:131(phrase)
+#: src/dialogs/path-dialog.xml:133(phrase)
 msgid "Chain paths"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:134(para)
+#: src/dialogs/path-dialog.xml:136(para)
 msgid ""
 "A <quote>chain</quote> symbol is shown to the right of the eye-symbol-space "
 "if the path is transform-locked, or a blank space if it is not. "
@@ -1383,22 +1375,22 @@ msgid ""
 "path."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:148(term)
+#: src/dialogs/path-dialog.xml:150(term)
 #: src/dialogs/channel-dialog.xml:244(term)
 msgid "Preview image"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:150(para)
+#: src/dialogs/path-dialog.xml:152(para)
 msgid ""
 "A small preview-icon showing a sketch of the path. If you click on the icon "
 "and drag it into an image, this will create a copy of the path in that image."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:158(term)
+#: src/dialogs/path-dialog.xml:160(term)
 msgid "Path Name"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:160(para)
+#: src/dialogs/path-dialog.xml:162(para)
 msgid ""
 "The name of the path, which must be unique within the image. Double-clicking "
 "on the name will allow you to edit it. If the name you create already "
@@ -1406,7 +1398,7 @@ msgid ""
 "unique."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:169(para)
+#: src/dialogs/path-dialog.xml:171(para)
 msgid ""
 "If the list is non-empty, at any given moment one of the members is the "
 "image's <emphasis>active path</emphasis>, which will be the subject of any "
@@ -1415,20 +1407,20 @@ msgid ""
 "entries will make it the active path."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:177(para)
+#: src/dialogs/path-dialog.xml:179(para)
 msgid ""
 "Right-clicking on any entry in the list brings up the <link linkend=\"gimp-"
 "concepts-paths-menu\">Paths Menu</link>. You can also access the Paths Menu "
 "from the dialog Tab menu."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:185(title)
+#: src/dialogs/path-dialog.xml:187(title)
 #: src/dialogs/images-dialog.xml:126(term)
 #: src/dialogs/gradient-editor-dialog.xml:172(term)
 msgid "Buttons"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:186(para)
+#: src/dialogs/path-dialog.xml:188(para)
 msgid ""
 "The buttons at the bottom of the Paths dialog all correspond to entries in "
 "the Paths menu (accessed by right-clicking on a path list entry), but some "
@@ -1436,46 +1428,46 @@ msgid ""
 "you press the button."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:194(term) src/dialogs/path-dialog.xml:338(term)
+#: src/dialogs/path-dialog.xml:196(term) src/dialogs/path-dialog.xml:340(term)
 msgid "New Path"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:196(para)
+#: src/dialogs/path-dialog.xml:198(para)
 msgid ""
 "See <link linkend=\"gimp-path-new\">New Path</link>. Holding down the "
 "<keycap>Shift</keycap> key brings up a dialog that allows you to assign a "
 "name to the new (empty) path."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:204(term) src/dialogs/path-dialog.xml:351(term)
+#: src/dialogs/path-dialog.xml:206(term) src/dialogs/path-dialog.xml:353(term)
 msgid "Raise Path"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:206(para)
+#: src/dialogs/path-dialog.xml:208(para)
 msgid "See <link linkend=\"gimp-path-raise\">Raise Path</link>."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:212(term) src/dialogs/path-dialog.xml:362(term)
+#: src/dialogs/path-dialog.xml:214(term) src/dialogs/path-dialog.xml:364(term)
 msgid "Lower Path"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:214(para)
+#: src/dialogs/path-dialog.xml:216(para)
 msgid "See <link linkend=\"gimp-path-lower\">Lower Path</link>."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:220(term) src/dialogs/path-dialog.xml:373(term)
+#: src/dialogs/path-dialog.xml:222(term) src/dialogs/path-dialog.xml:375(term)
 msgid "Duplicate Path"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:222(para)
+#: src/dialogs/path-dialog.xml:224(para)
 msgid "See <link linkend=\"gimp-path-duplicate\">Duplicate Path</link>."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:228(term)
+#: src/dialogs/path-dialog.xml:230(term)
 msgid "Path to Selection"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:230(para)
+#: src/dialogs/path-dialog.xml:232(para)
 msgid ""
 "Converts the path into a selection; see <link linkend=\"gimp-path-selection-"
 "replace\"> Path to Selection </link> for a full explanation. You can use "
@@ -1483,76 +1475,76 @@ msgid ""
 "selection:"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:239(segtitle)
+#: src/dialogs/path-dialog.xml:241(segtitle)
 msgid "Modifiers"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:240(segtitle)
+#: src/dialogs/path-dialog.xml:242(segtitle)
 msgid "Action"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:242(seg)
+#: src/dialogs/path-dialog.xml:244(seg)
 msgid "None"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:243(seg)
+#: src/dialogs/path-dialog.xml:245(seg)
 msgid "Replace existing selection"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:247(keycap)
-#: src/dialogs/path-dialog.xml:260(keycap)
+#: src/dialogs/path-dialog.xml:249(keycap)
+#: src/dialogs/path-dialog.xml:262(keycap)
 msgid "Shift"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:249(seg)
+#: src/dialogs/path-dialog.xml:251(seg)
 msgid "Add to selection"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:253(keycap)
-#: src/dialogs/path-dialog.xml:261(keycap)
+#: src/dialogs/path-dialog.xml:255(keycap)
+#: src/dialogs/path-dialog.xml:263(keycap)
 msgid "Ctrl"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:255(seg)
+#: src/dialogs/path-dialog.xml:257(seg)
 msgid "Subtract from selection"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:264(seg)
+#: src/dialogs/path-dialog.xml:266(seg)
 msgid "Intersect with selection."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:270(term) src/dialogs/path-dialog.xml:430(term)
+#: src/dialogs/path-dialog.xml:272(term) src/dialogs/path-dialog.xml:432(term)
 msgid "Selection to Path"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:272(para)
+#: src/dialogs/path-dialog.xml:274(para)
 msgid ""
 "Holding down the <keycap>Shift</keycap> key brings up the <guilabel>Advanced "
 "Options</guilabel> dialog, which probably is only useful to GIMP developers."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:280(term) src/dialogs/path-dialog.xml:489(term)
+#: src/dialogs/path-dialog.xml:282(term) src/dialogs/path-dialog.xml:485(term)
 msgid "Stroke Path"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:282(para)
+#: src/dialogs/path-dialog.xml:284(para)
 msgid "See <link linkend=\"gimp-path-stroke\">Stroke Path</link>."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:288(term) src/dialogs/path-dialog.xml:385(term)
+#: src/dialogs/path-dialog.xml:290(term) src/dialogs/path-dialog.xml:387(term)
 msgid "Delete Path"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:290(para) src/dialogs/path-dialog.xml:388(para)
+#: src/dialogs/path-dialog.xml:292(para) src/dialogs/path-dialog.xml:390(para)
 msgid "<guilabel>Delete Path</guilabel> deletes the current selected path."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:299(title)
 #: src/dialogs/path-dialog.xml:301(title)
+#: src/dialogs/path-dialog.xml:303(title)
 msgid "The <quote>Paths</quote> context menu"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:308(para)
+#: src/dialogs/path-dialog.xml:310(para)
 msgid ""
 "The Paths menu can be brought up by right-clicking on a path entry in the "
 "list in the Paths dialog, or by choosing the top entry (\"Paths Menu\") from "
@@ -1560,11 +1552,11 @@ msgid ""
 "operations that affect paths."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:316(term)
+#: src/dialogs/path-dialog.xml:318(term)
 msgid "Path Tool"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:318(para)
+#: src/dialogs/path-dialog.xml:320(para)
 msgid ""
 "<guilabel>Path Tool</guilabel> is an alternative way to activate the <link "
 "linkend=\"gimp-tool-path\">Path tool</link>, used for creating and "
@@ -1572,18 +1564,18 @@ msgid ""
 "the keyboard shortcut <keycap>B</keycap> (for <emphasis>Bézier</emphasis>)."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:327(term)
+#: src/dialogs/path-dialog.xml:329(term)
 msgid "Edit Path Attributes"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:330(para)
+#: src/dialogs/path-dialog.xml:332(para)
 msgid ""
 "<guilabel>Edit Path Attributes</guilabel> brings up a small dialog that "
 "allows you to change the name of the path. You can also do this by double-"
 "clicking on the name in the list in the Paths dialog."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:341(para)
+#: src/dialogs/path-dialog.xml:343(para)
 msgid ""
 "<guilabel>New Path</guilabel>creates a new path, adds it to the list in the "
 "Paths dialog, and makes it the active path for the image. It brings up a "
@@ -1592,7 +1584,7 @@ msgid ""
 "before you can use it for anything."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:354(para)
+#: src/dialogs/path-dialog.xml:356(para)
 msgid ""
 "<guilabel>Raise Path</guilabel> moves the path one slot higher in the list "
 "in the Paths dialog. The position of a path in the list has no functional "
@@ -1600,7 +1592,7 @@ msgid ""
 "organized."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:365(para)
+#: src/dialogs/path-dialog.xml:367(para)
 msgid ""
 "<guilabel>Lower Path</guilabel>moves the path one slot lower in the list in "
 "the Paths dialog. The position of a path in the list has no functional "
@@ -1608,7 +1600,7 @@ msgid ""
 "organized."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:376(para)
+#: src/dialogs/path-dialog.xml:378(para)
 msgid ""
 "<quote>Duplicate Path</quote> creates a copy of the active path, assigns it "
 "a unique name, adds it to the list in the Paths dialog, and makes it the "
@@ -1616,11 +1608,11 @@ msgid ""
 "path was visible."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:394(term)
+#: src/dialogs/path-dialog.xml:396(term)
 msgid "Merge Visible Paths"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:396(para)
+#: src/dialogs/path-dialog.xml:398(para)
 msgid ""
 "<guilabel>Merge Visible Paths</guilabel> takes all the paths in the image "
 "that are visible (that is, all that show <quote>open eye</quote> symbols in "
@@ -1628,13 +1620,13 @@ msgid ""
 "be convenient if you want to stroke them all in the same way, etc."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:405(term)
+#: src/dialogs/path-dialog.xml:407(term)
 msgid ""
 "Path to Selection; Add to Selection; Subtract from Selection; Intersect with "
 "Selection"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:415(para)
+#: src/dialogs/path-dialog.xml:417(para)
 msgid ""
 "These commands all convert the active path into a selection, and then "
 "combine it with the existing selection in the specified ways. (<quote>Path "
@@ -1646,34 +1638,28 @@ msgid ""
 "correspondence to be perfect."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:433(para) src/dialogs/path-dialog.xml:492(para)
+#: src/dialogs/path-dialog.xml:435(para) src/dialogs/path-dialog.xml:488(para)
 msgid "This operation can be accessed in several ways:"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:438(para)
+#: src/dialogs/path-dialog.xml:440(para)
 msgid ""
 "From an image menubar, as <menuchoice><guimenu>Select</"
 "guimenu><guimenuitem>To Path</guimenuitem></menuchoice>"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:447(para)
+#: src/dialogs/path-dialog.xml:449(para)
 msgid ""
 "From the Paths dialog menu, as <guimenuitem>Selection to Path</guimenuitem>."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:453(para)
+#: src/dialogs/path-dialog.xml:455(para)
 msgid ""
 "From the <guilabel>Selection to Path</guilabel> button at the bottom of the "
 "Paths dialog."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:459(para)
-msgid ""
-"From the <guilabel>Selection to Path</guilabel> button in the Tool Options "
-"for the Path tool."
-msgstr ""
-
-#: src/dialogs/path-dialog.xml:465(para)
+#: src/dialogs/path-dialog.xml:461(para)
 msgid ""
 "<guilabel>Selection to Path</guilabel> creates a new path from the image's "
 "selection. In most cases the resulting path will closely follow the "
@@ -1681,7 +1667,7 @@ msgid ""
 "not usually be perfect."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:470(para)
+#: src/dialogs/path-dialog.xml:466(para)
 msgid ""
 "Converting a two-dimensional selection mask into a one-dimensional path "
 "involves some rather tricky algorithms: you can alter the way it is done "
@@ -1696,29 +1682,29 @@ msgid ""
 "you don't need to worry about how it is done (unless you want to)."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:497(para)
+#: src/dialogs/path-dialog.xml:493(para)
 msgid ""
 "From an image menubar, as <menuchoice><guimenu>Edit</"
 "guimenu><guimenuitem>Stroke Path</guimenuitem></menuchoice>"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:506(para)
+#: src/dialogs/path-dialog.xml:502(para)
 msgid "From the Paths dialog menu, as <guimenuitem>Stroke Path</guimenuitem>."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:512(para)
+#: src/dialogs/path-dialog.xml:508(para)
 msgid ""
 "From the <guilabel>Stroke Path</guilabel> button at the bottom of the Paths "
 "dialog."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:518(para)
+#: src/dialogs/path-dialog.xml:514(para)
 msgid ""
 "From the <guilabel>Stroke Path</guilabel> button in the Tool Options for the "
 "Path tool."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:524(para)
+#: src/dialogs/path-dialog.xml:520(para)
 msgid ""
 "<quote>Stroke Path</quote> renders the active path on the active layer of "
 "the image, permitting a wide variety of line styles and stroking options. "
@@ -1726,33 +1712,33 @@ msgid ""
 "for more information."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:534(term)
+#: src/dialogs/path-dialog.xml:530(term)
 msgid "Copy Path"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:537(para)
+#: src/dialogs/path-dialog.xml:533(para)
 msgid ""
 "<guilabel>Copy Path</guilabel> copies the active path to the Paths "
 "Clipboard, enabling you to paste it into a different image."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:541(para)
+#: src/dialogs/path-dialog.xml:537(para)
 msgid ""
 "You can also copy and paste a path by dragging its icon from the Paths "
 "dialog into the target image's display."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:547(para)
+#: src/dialogs/path-dialog.xml:543(para)
 msgid ""
 "When you copy a path to an image, it is not visible. You have to make it "
 "visible in the Path dialog."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:555(term)
+#: src/dialogs/path-dialog.xml:551(term)
 msgid "Paste Path"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:558(para)
+#: src/dialogs/path-dialog.xml:554(para)
 msgid ""
 "<guilabel>Paste Path</guilabel> creates a new path from the contents of the "
 "Path Clipboard, adds it to the list in the Paths dialog, and makes it the "
@@ -1760,11 +1746,11 @@ msgid ""
 "clipboard, the menu entry will be insensitive."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:567(term)
+#: src/dialogs/path-dialog.xml:563(term)
 msgid "Import Path"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:570(para)
+#: src/dialogs/path-dialog.xml:566(para)
 msgid ""
 "<guilabel>Import Path</guilabel> creates a new path from an SVG file: it "
 "pops up a file chooser dialog that allows you to navigate to the file. See "
@@ -1772,11 +1758,11 @@ msgid ""
 "information on SVG files and how they relate to GIMP paths."
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:581(term)
+#: src/dialogs/path-dialog.xml:577(term)
 msgid "Export Path"
 msgstr ""
 
-#: src/dialogs/path-dialog.xml:583(para)
+#: src/dialogs/path-dialog.xml:579(para)
 msgid ""
 "<guilabel>Export Path</guilabel> allows you to save a path to a file: it "
 "pops up a file save dialog that allows you to specify the file name and "
@@ -1867,7 +1853,7 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/palettes-dialog.xml:15(title)
-msgid "<quote>Palettes</quote> Dialog"
+msgid "Palettes Dialog"
 msgstr ""
 
 #: src/dialogs/palettes-dialog.xml:19(secondary)
@@ -2287,7 +2273,7 @@ msgstr ""
 #: src/dialogs/palettes-dialog.xml:490(primary)
 #: src/dialogs/gradient-editor-dialog.xml:17(primary)
 #: src/dialogs/gradient-editor-dialog.xml:591(primary)
-#: src/dialogs/gradient-dialog.xml:18(primary)
+#: src/dialogs/gradient-dialog.xml:20(primary)
 msgid "Gradient"
 msgstr ""
 
@@ -2298,9 +2284,9 @@ msgstr ""
 #: src/dialogs/palettes-dialog.xml:493(para)
 msgid ""
 "With this command, all the colors of the palette are used to form the "
-"current gradient which is saved in the Gradient Dialog. The number of colors "
-"in the palette seems to be limited to 21. Above this value, an error message "
-"is emitted."
+"current gradient which is saved in the Gradient Dialog. The created gradient "
+"is build with segments just as much as the number of colors on the given "
+"palette."
 msgstr ""
 
 #: src/dialogs/palettes-dialog.xml:502(term)
@@ -2310,10 +2296,10 @@ msgstr ""
 #: src/dialogs/palettes-dialog.xml:506(para)
 msgid ""
 "This command creates a repeating gradient, using all the colors of the "
-"palette. Only the first color of the palette seems to be repeated. This "
-"gradient appears in the Gradient Dialog and becomes the current gradient. "
-"The number of colors in the palette seems to be limited to 20. Above this "
-"value, an error message is emitted."
+"palette. This gradient appears in the Gradient Dialog and becomes the "
+"current gradient. The gradient is created with segments one more than the "
+"number of colors on the given palette. The left side color at the leftmost "
+"segment will be the same color on the right side at the rightmost segment."
 msgstr ""
 
 #: src/dialogs/palettes-dialog.xml:515(title)
@@ -2729,7 +2715,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/layer-mask.xml:139(None)
+#: src/dialogs/layer-mask.xml:138(None)
 msgid ""
 "@@image: 'images/dialogs/examples/layer-mask-1.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2737,7 +2723,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/layer-mask.xml:158(None)
+#: src/dialogs/layer-mask.xml:157(None)
 msgid ""
 "@@image: 'images/dialogs/examples/layer-mask-2.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -2787,13 +2773,11 @@ msgstr ""
 #: src/dialogs/layer-mask.xml:46(para)
 msgid ""
 "To create a layer mask start with a right click on the layer to call the "
-"context menu and select <guilabel>Add layer mask</guilabel> in the menu. If "
-"the menu item is grayed first select <guilabel>Add Alpha channel</guilabel> "
-"in the same menu. A dialog appears where you can initialize the content of "
-"the mask:"
+"context menu and select <guilabel>Add layer mask</guilabel> in the menu. A "
+"dialog appears where you can initialize the content of the mask:"
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:55(para)
+#: src/dialogs/layer-mask.xml:54(para)
 msgid ""
 "<guilabel>White (full opacity)</guilabel>: the mask is white in the Layer "
 "Dialog. So, all pixels of the layer are visible in the image window since "
@@ -2801,7 +2785,7 @@ msgid ""
 "paint with black to make layer pixels transparent."
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:64(para)
+#: src/dialogs/layer-mask.xml:63(para)
 msgid ""
 "<guilabel>Black (full transparency)</guilabel>: the mask is black in the "
 "Layer Dialog. So, the layer is fully transparent since painting the mask "
@@ -2809,45 +2793,45 @@ msgid ""
 "the mask and make layer pixels visible."
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:72(para)
+#: src/dialogs/layer-mask.xml:71(para)
 msgid ""
 "<guilabel>Layer's alpha channel</guilabel>: the mask is initialized "
 "according to the content of layer Alpha channel. If the layer still contains "
 "transparency it's copied in the mask."
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:79(para)
+#: src/dialogs/layer-mask.xml:78(para)
 msgid ""
 "<guilabel>Transfer layer's alpha channel</guilabel>: Does the same thing as "
 "the previous option, except that it also resets the layer's alpha channel to "
 "full opacity."
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:85(para)
+#: src/dialogs/layer-mask.xml:84(para)
 msgid ""
 "<guilabel>Selection</guilabel> : the mask is initialized according to pixel "
 "values found in the selection."
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:90(para)
+#: src/dialogs/layer-mask.xml:89(para)
 msgid ""
 "<guilabel>Grayscale copy of layer</guilabel>: the mask is initialized "
 "according to pixel values of the layer."
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:95(para)
+#: src/dialogs/layer-mask.xml:94(para)
 msgid ""
 "<guilabel>Channel</guilabel>: The layer mask is initialized with a selection "
 "mask you have created before, stored in the Channel dialog."
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:101(para)
+#: src/dialogs/layer-mask.xml:100(para)
 msgid ""
 "<guilabel>Invert mask</guilabel> : This checkbox allows you to invert : "
 "black turns to white and white turns to black."
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:106(para)
+#: src/dialogs/layer-mask.xml:105(para)
 msgid ""
 "When the mask is created it appears as a thumbnail right to the layer "
 "thumbnail. By clicking alternatively on the layer and mask thumbnail you can "
@@ -2857,7 +2841,7 @@ msgid ""
 "looking at the canvas, which of the layer or the mask is active."
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:115(para)
+#: src/dialogs/layer-mask.xml:114(para)
 msgid ""
 "Pressing <keycap>Alt</keycap> (or <keycombo><keycap>Ctrl</"
 "keycap><keycap>Alt</keycap></keycombo> and click on the layer mask "
@@ -2869,15 +2853,15 @@ msgid ""
 "greater convenience in your work."
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:130(term)
+#: src/dialogs/layer-mask.xml:129(term)
 msgid "Layer Mask example"
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:134(phrase)
+#: src/dialogs/layer-mask.xml:133(phrase)
 msgid "A layer with layer mask"
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:142(para)
+#: src/dialogs/layer-mask.xml:141(para)
 msgid ""
 "This image has a background layer with a flower and another blue one, fully "
 "opaque. A white layer mask has been added to the blue layer. In the image "
@@ -2885,11 +2869,11 @@ msgid ""
 "pixels visible."
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:153(phrase)
+#: src/dialogs/layer-mask.xml:152(phrase)
 msgid "Painting the layer mask"
 msgstr ""
 
-#: src/dialogs/layer-mask.xml:161(para)
+#: src/dialogs/layer-mask.xml:160(para)
 msgid ""
 "The layer mask is active. You paint with black color, which makes the layer "
 "transparent : the underlying layer becomes visible."
@@ -3644,7 +3628,7 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/images-dialog.xml:14(title)
-msgid "<quote>Images</quote> Dialog"
+msgid "Images Dialog"
 msgstr ""
 
 #: src/dialogs/images-dialog.xml:18(secondary)
@@ -3698,7 +3682,7 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/images-dialog.xml:85(title)
-msgid "Using the <quote>Images</quote> dialog"
+msgid "Using the Images dialog"
 msgstr ""
 
 #: src/dialogs/images-dialog.xml:86(para)
@@ -4711,38 +4695,38 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/gradient-dialog.xml:25(None)
+#: src/dialogs/gradient-dialog.xml:28(None)
 msgid ""
 "@@image: 'images/dialogs/gradient-dialog.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/gradient-dialog.xml:252(None)
+#: src/dialogs/gradient-dialog.xml:254(None)
 msgid ""
 "@@image: 'images/dialogs/gradient-menu.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:12(title)
-msgid "<quote>Gradients</quote> Dialog"
+#: src/dialogs/gradient-dialog.xml:13(title)
+msgid "Gradients Dialog"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:15(secondary)
+#: src/dialogs/gradient-dialog.xml:17(secondary)
 msgid "Gradient Dialog"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:22(title)
+#: src/dialogs/gradient-dialog.xml:25(title)
 msgid "The screenshot illustrates the Gradients dialog"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:29(para)
+#: src/dialogs/gradient-dialog.xml:32(para)
 msgid ""
 "The <quote>Gradients</quote> dialog offers a gradient palette which is used "
-"to select a gradient -- a set of colors arranged in a linear scale -- for "
-"use with the <link linkend=\"gimp-tool-blend\">Blend tool</link> and "
-"numerous other operations. It also gives you access to several functions for "
-"manipulating gradients. You can select a gradient by clicking on it in the "
-"list: it will then be shown in the Brush/Pattern/Gradient area of the "
+"to select a gradient &mdash; a set of colors arranged in a linear scale "
+"&mdash; for use with the <link linkend=\"gimp-tool-blend\">Blend tool</link> "
+"and numerous other operations. It also gives you access to several functions "
+"for manipulating gradients. You can select a gradient by clicking on it in "
+"the list: it will then be shown in the Brush/Pattern/Gradient area of the "
 "Toolbox. A few dozen nice gradients come pre-installed with GIMP. You can "
 "create more using the <link linkend=\"gimp-gradient-editor-dialog\">Gradient "
 "Editor</link>. General information about gradients and how they are used in "
@@ -4750,58 +4734,58 @@ msgid ""
 "\">Gradients</link> section."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:44(para)
+#: src/dialogs/gradient-dialog.xml:48(para)
 msgid ""
 "The first four gradients are particular: they reproduce the gradient between "
 "Foreground and background colors of toolbox in different ways."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:49(para)
+#: src/dialogs/gradient-dialog.xml:53(para)
 msgid ""
 "<guilabel>FG to BG (RGB)</guilabel>: default gradient, between the "
 "Foreground and the background colors of the Toolbox, in the RGB mode."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:54(para)
+#: src/dialogs/gradient-dialog.xml:58(para)
 msgid ""
 "<guilabel>FG to BG (HSV clock-wise/counter-clockwise Hue)</guilabel>: all "
 "hues in the color circle between the Foreground and the background color, "
 "clockwise or counter-clockwise."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:61(para)
+#: src/dialogs/gradient-dialog.xml:65(para)
 msgid ""
 "<guilabel>FG to Transparent</guilabel>: only uses one color (the Foreground "
 "color) from complete opacity to complete transparency. This gradient is very "
 "useful when you work with softly blended collages or fog effects."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:71(title)
+#: src/dialogs/gradient-dialog.xml:75(title)
 #: src/dialogs/fonts-dialog.xml:37(title)
 #: src/dialogs/error-console.xml:25(phrase)
 #: src/dialogs/document-dialog.xml:38(title)
 #: src/dialogs/device-status-dialog.xml:47(phrase)
 #: src/dialogs/color-dialog.xml:62(title)
 #: src/dialogs/channel-dialog.xml:122(title)
-#: src/dialogs/buffers-dialog.xml:86(title)
-#: src/dialogs/brushes-dialog.xml:50(title)
+#: src/dialogs/buffers-dialog.xml:87(title)
+#: src/dialogs/brushes-dialog.xml:54(title)
 msgid "Activating the Dialog"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:72(para)
+#: src/dialogs/gradient-dialog.xml:76(para)
 msgid ""
 "The <quote>Gradients</quote> dialog is a dockable dialog; see the section "
 "<xref linkend=\"gimp-concepts-docks\"/> for help on manipulating it."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:82(para)
+#: src/dialogs/gradient-dialog.xml:86(para)
 msgid ""
 "from an image menu: <menuchoice><guimenu>Windows</"
 "guimenu><guisubmenu>Dockable Dialogs</guisubmenu><guimenuitem>Gradients</"
 "guimenuitem></menuchoice>;"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:92(para)
+#: src/dialogs/gradient-dialog.xml:96(para)
 msgid ""
 "from the Tab menu in any dockable dialog by clicking on "
 "<guiicon><inlinegraphic fileref=\"images/dialogs/stock-menu-left-12.png\"/></"
@@ -4809,17 +4793,17 @@ msgid ""
 "guimenu><guimenuitem>Gradients</guimenuitem></menuchoice>,"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:105(para)
+#: src/dialogs/gradient-dialog.xml:109(para)
 msgid ""
 "from the Toolbox, by clicking on the current gradient in the Brush/Pattern/"
 "Gradient area,"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:111(para)
+#: src/dialogs/gradient-dialog.xml:115(para)
 msgid "From the image by using the <keycap>Ctrl+G</keycap> shortcut."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:116(para)
+#: src/dialogs/gradient-dialog.xml:120(para)
 msgid ""
 "In the <guimenu>Windows</guimenu> menu, there is a list of <link linkend="
 "\"gimp-dockable-menu\">detached windows</link> which exists only if at least "
@@ -4828,11 +4812,11 @@ msgid ""
 "guimenu><guimenuitem>Gradients</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:129(title)
+#: src/dialogs/gradient-dialog.xml:133(title)
 msgid "Using the <quote>Gradients</quote> dialog"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:130(para)
+#: src/dialogs/gradient-dialog.xml:134(para)
 msgid ""
 "The most basic, and most commonly used, operation with the dialog is simply "
 "to click on one of the gradients in the scrollable list, in order to make it "
@@ -4840,7 +4824,7 @@ msgid ""
 "involves a gradient."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:136(para)
+#: src/dialogs/gradient-dialog.xml:140(para)
 msgid ""
 "If you <emphasis>double-click</emphasis> on a gradient, you open the "
 "Gradient Editor where you will be able to edit its name. Note, however, that "
@@ -4853,7 +4837,7 @@ msgid ""
 "that you create yourself."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:152(para)
+#: src/dialogs/gradient-dialog.xml:156(para)
 msgid ""
 "In the Tab menu, you can choose between <guimenuitem>View as Grid</"
 "guimenuitem> and <guimenuitem>View as List</guimenuitem>. In Grid mode, the "
@@ -4864,33 +4848,33 @@ msgid ""
 "its name."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:169(para)
+#: src/dialogs/gradient-dialog.xml:173(para)
 msgid ""
 "In the Tab menu, the option <guilabel>Preview Size</guilabel> allows you to "
 "adapt the size of gradient previews to your liking."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:177(para)
+#: src/dialogs/gradient-dialog.xml:181(para)
 msgid ""
 "The buttons at the bottom of the dialog allow you to operate on gradients in "
 "several ways:"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:183(term)
+#: src/dialogs/gradient-dialog.xml:187(term)
 msgid "Edit Gradient"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:185(para)
+#: src/dialogs/gradient-dialog.xml:189(para)
 msgid ""
 "This button activates the <link linkend=\"gimp-gradient-editor-dialog"
 "\">Gradient Editor</link>."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:192(term)
+#: src/dialogs/gradient-dialog.xml:196(term)
 msgid "New Gradient"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:195(para)
+#: src/dialogs/gradient-dialog.xml:199(para)
 msgid ""
 "This creates a new gradient, initialized as a simple grayscale, and "
 "activates the Gradient Editor so that you can alter it. Gradients that you "
@@ -4900,77 +4884,77 @@ msgid ""
 "Preferences dialog.)"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:207(term)
+#: src/dialogs/gradient-dialog.xml:211(term)
 msgid "Duplicate Gradient"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:210(para)
+#: src/dialogs/gradient-dialog.xml:214(para)
 msgid ""
 "This creates a copy of the currently selected gradient. You will be able to "
 "edit the copy even if you cannot edit the original."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:217(term)
+#: src/dialogs/gradient-dialog.xml:221(term)
 msgid "Delete Gradient"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:220(para)
+#: src/dialogs/gradient-dialog.xml:224(para)
 msgid ""
 "This removes all traces of the gradient, if you have permission to do so. It "
 "asks for confirmation before doing anything."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:227(term)
+#: src/dialogs/gradient-dialog.xml:231(term)
 msgid "Refresh Gradients"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:230(para)
+#: src/dialogs/gradient-dialog.xml:234(para)
 msgid ""
 "If you add gradients to your personal <filename>gradients</filename> folder "
 "by some means other than this dialog, this button causes the list to be "
 "reloaded, so that the new entries will be available."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:240(para)
+#: src/dialogs/gradient-dialog.xml:244(para)
 msgid ""
 "The functions performed by these buttons can also be accessed from the "
 "dialog pop-up menu, activated by right-clicking anywhere in the gradient "
 "list, or via <guisubmenu>Gradient Menu</guisubmenu> in the Tab menu:"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:248(phrase)
+#: src/dialogs/gradient-dialog.xml:251(title)
 msgid "The Gradients Menu"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:256(para)
+#: src/dialogs/gradient-dialog.xml:258(para)
 msgid "The gradient menu also gives you some additional functions:"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:261(term)
+#: src/dialogs/gradient-dialog.xml:263(term)
 msgid "Save as POV-Ray..."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:263(para)
+#: src/dialogs/gradient-dialog.xml:265(para)
 msgid ""
 "This allows you to save the gradient in the format used by the "
 "<application>POV-Ray</application> 3D ray-tracing program."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:271(term)
+#: src/dialogs/gradient-dialog.xml:273(term)
 msgid "Copy Gradient Location"
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:273(para)
+#: src/dialogs/gradient-dialog.xml:275(para)
 msgid ""
 "This command allows you to copy the gradient file location to the clipboard. "
 "You can then use it in a text editor."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:280(term)
+#: src/dialogs/gradient-dialog.xml:282(term)
 msgid "Custom Gradient..."
 msgstr ""
 
-#: src/dialogs/gradient-dialog.xml:282(para)
+#: src/dialogs/gradient-dialog.xml:284(para)
 msgid ""
 "This command creates a sample image filled with the selected gradient. You "
 "can select width and height of the image as well as the gradient direction "
@@ -4992,7 +4976,7 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/fonts-dialog.xml:10(title)
-msgid "<quote>Fonts</quote> Dialog"
+msgid "Fonts Dialog"
 msgstr ""
 
 #: src/dialogs/fonts-dialog.xml:14(secondary)
@@ -5001,7 +4985,8 @@ msgid "Fonts"
 msgstr ""
 
 #: src/dialogs/fonts-dialog.xml:21(title)
-msgid "The <quote>Fonts</quote> dialog"
+#: src/dialogs/fonts-dialog.xml:105(phrase)
+msgid "The Fonts dialog"
 msgstr ""
 
 #: src/dialogs/fonts-dialog.xml:29(para)
@@ -5062,10 +5047,6 @@ msgid ""
 "example will pop up (<quote>Pack my box with five dozen liquor jugs</quote>)."
 msgstr ""
 
-#: src/dialogs/fonts-dialog.xml:105(phrase)
-msgid "The Fonts dialog"
-msgstr ""
-
 #: src/dialogs/fonts-dialog.xml:113(para)
 msgid "Dialog in Grid View"
 msgstr ""
@@ -5275,7 +5256,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/error-console.xml:121(None)
+#: src/dialogs/error-console.xml:117(None)
 msgid ""
 "@@image: 'images/dialogs/error-console-record.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -5324,7 +5305,7 @@ msgid "The <placeholder-1/> Dialog"
 msgstr ""
 
 #: src/dialogs/error-console.xml:73(phrase)
-#: src/dialogs/error-console.xml:116(phrase)
+#: src/dialogs/error-console.xml:112(phrase)
 msgid "<placeholder-1/> Dialog window"
 msgstr ""
 
@@ -5354,17 +5335,16 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/error-console.xml:106(para)
-#: src/dialogs/error-console.xml:110(para)
 msgid ""
-"A dialog window <guilabel>Save Error Log to File </guilabel> lets you choose "
+"A dialog window <guilabel>Save Error Log to File</guilabel> lets you choose "
 "the name and the destination directory of this file:"
 msgstr ""
 
-#: src/dialogs/error-console.xml:116(quote)
+#: src/dialogs/error-console.xml:112(quote)
 msgid "Save Error Log to file"
 msgstr ""
 
-#: src/dialogs/error-console.xml:129(para)
+#: src/dialogs/error-console.xml:125(para)
 msgid ""
 "You will as well find these button actions in the dialog tab menu by "
 "clicking on <placeholder-1/>, or in the context menu you get by right-"
@@ -5616,7 +5596,7 @@ msgstr ""
 msgid ""
 "In the Tab menu for the <quote>Document History</quote> dialog, you can "
 "choose between <guimenuitem>View as Grid</guimenuitem> and <guimenuitem>View "
-"as List</guimenuitem>. In Grid mode, the ducuments are laid out in a "
+"as List</guimenuitem>. In Grid mode, the documents are laid out in a "
 "rectangular array. In List mode, they are lined up vertically, with each row "
 "showing a thumbnail of the contents of the image, its name, and its pixel "
 "dimensions."
@@ -5797,7 +5777,7 @@ msgstr ""
 
 #: src/dialogs/color-dialog.xml:15(title)
 #: src/dialogs/color-dialog.xml:26(title)
-msgid "The <quote>FG/BG Color</quote> Dialog"
+msgid "The FG/BG Color Dialog"
 msgstr ""
 
 #: src/dialogs/color-dialog.xml:19(secondary)
@@ -6011,10 +5991,10 @@ msgstr ""
 #: src/dialogs/color-dialog.xml:307(para)
 msgid ""
 "Right up you find a symbol, consisting of two arrows, with which you can "
-"exchange the foreground and background colour. At the bottom left of the "
+"exchange the foreground and background color. At the bottom left of the "
 "dialog, just below the foreground color block, you find a switching surface "
 "with two small, one black and the other white, partially overlapping "
-"squares. If you click on these, the front and background colour are put back "
+"squares. If you click on these, the front and background color are put back "
 "to black and white respectively."
 msgstr ""
 
@@ -6266,7 +6246,7 @@ msgid ""
 msgstr ""
 
 #: src/dialogs/channel-dialog.xml:10(title)
-msgid "<quote>Channels</quote> Dialog"
+msgid "Channels Dialog"
 msgstr ""
 
 #: src/dialogs/channel-dialog.xml:22(title)
@@ -6604,15 +6584,15 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/buffers-dialog.xml:49(None)
-#: src/dialogs/buffers-dialog.xml:138(None)
+#: src/dialogs/buffers-dialog.xml:50(None)
+#: src/dialogs/buffers-dialog.xml:139(None)
 msgid ""
 "@@image: 'images/dialogs/buffers-dialog.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/buffers-dialog.xml:160(None)
+#: src/dialogs/buffers-dialog.xml:161(None)
 msgid ""
 "@@image: 'images/dialogs/buffers-dialog-grid.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -6620,53 +6600,53 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/buffers-dialog.xml:253(None)
+#: src/dialogs/buffers-dialog.xml:254(None)
 msgid ""
 "@@image: 'images/dialogs/buffers-context-menu.png'; md5=THIS FILE DOESN'T "
 "EXIST"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:13(title)
-msgid "<quote>Buffers</quote> Dialog"
+#: src/dialogs/buffers-dialog.xml:14(title)
+msgid "Buffers Dialog"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:17(secondary)
-#: src/dialogs/buffers-dialog.xml:20(primary)
-#: src/dialogs/buffers-dialog.xml:24(primary)
-#: src/dialogs/buffers-dialog.xml:28(primary)
-#: src/dialogs/buffers-dialog.xml:32(primary)
+#: src/dialogs/buffers-dialog.xml:18(secondary)
+#: src/dialogs/buffers-dialog.xml:21(primary)
+#: src/dialogs/buffers-dialog.xml:25(primary)
+#: src/dialogs/buffers-dialog.xml:29(primary)
+#: src/dialogs/buffers-dialog.xml:33(primary)
 msgid "Buffers"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:25(secondary)
+#: src/dialogs/buffers-dialog.xml:26(secondary)
 msgid "Cut named"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:29(secondary)
+#: src/dialogs/buffers-dialog.xml:30(secondary)
 msgid "Copy named"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:33(secondary)
+#: src/dialogs/buffers-dialog.xml:34(secondary)
 msgid "Paste named"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:36(primary)
+#: src/dialogs/buffers-dialog.xml:37(primary)
 msgid "Cut Named"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:39(primary)
+#: src/dialogs/buffers-dialog.xml:40(primary)
 msgid "Copy Named"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:42(primary)
+#: src/dialogs/buffers-dialog.xml:43(primary)
 msgid "Paste Named"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:46(title)
-msgid "The <quote>Buffers</quote> dialog (as a list)"
+#: src/dialogs/buffers-dialog.xml:47(title)
+msgid "The Buffers dialog (as a list)"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:53(para)
+#: src/dialogs/buffers-dialog.xml:54(para)
 msgid ""
 "Buffers are temporary repositories for image data, created when you cut or "
 "copy part of a drawable (a layer, layer mask, etc.). You can save a document "
@@ -6679,7 +6659,7 @@ msgid ""
 "although, of course, each one consumes a share of memory."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:72(para)
+#: src/dialogs/buffers-dialog.xml:73(para)
 msgid ""
 "The <quote>Buffers</quote> dialog shows you the contents of all existing "
 "named buffers, and allows you to operate on them in several ways. It also "
@@ -6687,26 +6667,26 @@ msgid ""
 "a display: you can't do anything with it."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:79(para)
+#: src/dialogs/buffers-dialog.xml:80(para)
 msgid ""
 "Named buffers are not saved across sessions. The only way to save their "
 "contents is to paste them into images."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:87(para)
+#: src/dialogs/buffers-dialog.xml:88(para)
 msgid ""
 "This dialog is a dockable dialog; see the section <xref linkend=\"gimp-"
 "concepts-docks\"/> for help on manipulating it."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:97(para)
+#: src/dialogs/buffers-dialog.xml:98(para)
 msgid ""
 "from an image menu: <menuchoice><guimenu>Windows</"
 "guimenu><guisubmenu>Dockable Dialogs</guisubmenu><guimenuitem>Buffers</"
 "guimenuitem></menuchoice>;"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:107(para)
+#: src/dialogs/buffers-dialog.xml:108(para)
 msgid ""
 "from the Tab menu in any dockable dialog by clicking on "
 "<guiicon><inlinegraphic format=\"PNG\" fileref=\"images/dialogs/stock-menu-"
@@ -6714,7 +6694,7 @@ msgid ""
 "guimenu><guimenuitem>Buffers</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:120(para)
+#: src/dialogs/buffers-dialog.xml:121(para)
 msgid ""
 "In the <guimenu>Windows</guimenu> menu, there is a list of <link linkend="
 "\"gimp-dockable-menu\">detached windows</link> which exists only if at least "
@@ -6723,15 +6703,15 @@ msgid ""
 "guimenu><guimenuitem>Buffers</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:133(title)
-msgid "Using the <quote>Buffers</quote> dialog"
+#: src/dialogs/buffers-dialog.xml:134(title)
+msgid "Using the Buffers dialog"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:135(title)
-msgid "The <quote>Buffers</quote> Menu"
+#: src/dialogs/buffers-dialog.xml:136(title)
+msgid "The Buffers Menu"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:142(para)
+#: src/dialogs/buffers-dialog.xml:143(para)
 msgid ""
 "Clicking on a buffer in the display area makes it the active buffer, i. e., "
 "the one that will be used for paste commands executed with the Buffers Menu "
@@ -6741,18 +6721,18 @@ msgid ""
 "command."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:150(para)
+#: src/dialogs/buffers-dialog.xml:151(para)
 msgid ""
 "At the bottom of the dialog are four buttons. The operations they perform "
 "can also be accessed from the Buffers Menu that you get by right clicking on "
 "the active buffer."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:156(title)
-msgid "The <quote>Buffers</quote> dialog (Grid View)"
+#: src/dialogs/buffers-dialog.xml:157(title)
+msgid "The Buffers dialog (Grid View)"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:164(para)
+#: src/dialogs/buffers-dialog.xml:165(para)
 msgid ""
 "In the Tab menu for the <quote>Buffers</quote> dialog, you can choose "
 "between <guimenuitem>View as Grid</guimenuitem> and <guimenuitem>View as "
@@ -6761,21 +6741,21 @@ msgid ""
 "thumbnail of the contents of the buffer, its name, and its pixel dimensions."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:180(para)
+#: src/dialogs/buffers-dialog.xml:181(para)
 msgid ""
 "You can change the size of the buffer previews in the dialog using the "
 "<quote>Preview Size</quote> submenu of the dialog's Tab menu."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:187(para)
+#: src/dialogs/buffers-dialog.xml:188(para)
 msgid "At the bottom of the dialog you find a couple of buttons:"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:192(term)
+#: src/dialogs/buffers-dialog.xml:193(term)
 msgid "Paste Buffer"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:195(para)
+#: src/dialogs/buffers-dialog.xml:196(para)
 msgid ""
 "This command pastes the contents of the selected buffer into the active "
 "image, as a floating selection. The only difference between this and the "
@@ -6783,11 +6763,11 @@ msgid ""
 "uses the selected buffer rather than the global clipboard buffer."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:206(term)
+#: src/dialogs/buffers-dialog.xml:207(term)
 msgid "Paste Buffer Into"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:209(para)
+#: src/dialogs/buffers-dialog.xml:210(para)
 msgid ""
 "This command pastes the contents of the selected buffer into the active "
 "image's selection, as a floating selection. The only difference between this "
@@ -6796,11 +6776,11 @@ msgid ""
 "buffer."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:220(term)
+#: src/dialogs/buffers-dialog.xml:221(term)
 msgid "Paste Buffer as New"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:223(para)
+#: src/dialogs/buffers-dialog.xml:224(para)
 msgid ""
 "This command creates a new single-layer image out of the contents of the "
 "selected buffer. The only difference between this and the ordinary <link "
@@ -6809,39 +6789,39 @@ msgid ""
 "buffer."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:234(term)
+#: src/dialogs/buffers-dialog.xml:235(term)
 msgid "Delete Buffer"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:237(para)
+#: src/dialogs/buffers-dialog.xml:238(para)
 msgid ""
 "This command deletes the selected named buffer, no questions asked. You "
 "cannot delete the Global Buffer."
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:247(title)
+#: src/dialogs/buffers-dialog.xml:248(title)
 msgid "Context menu"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:249(title)
+#: src/dialogs/buffers-dialog.xml:250(title)
 msgid "The <quote>Buffers</quote> context menu"
 msgstr ""
 
-#: src/dialogs/buffers-dialog.xml:257(para)
+#: src/dialogs/buffers-dialog.xml:258(para)
 msgid "These commands are explained above with Buttons."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/brushes-dialog.xml:32(None)
-#: src/dialogs/brushes-dialog.xml:222(None)
+#: src/dialogs/brushes-dialog.xml:35(None)
+#: src/dialogs/brushes-dialog.xml:228(None)
 msgid ""
 "@@image: 'images/dialogs/brushes-dialog.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/brushes-dialog.xml:99(None)
+#: src/dialogs/brushes-dialog.xml:103(None)
 msgid ""
 "@@image: 'images/dialogs/brushes-dialog-simple.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -6849,28 +6829,28 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/brushes-dialog.xml:156(None)
+#: src/dialogs/brushes-dialog.xml:161(None)
 msgid ""
 "@@image: 'images/dialogs/brushes-grid-view.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/brushes-dialog.xml:165(None)
+#: src/dialogs/brushes-dialog.xml:170(None)
 msgid ""
 "@@image: 'images/dialogs/brushes-list-view.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/brushes-dialog.xml:267(None)
+#: src/dialogs/brushes-dialog.xml:274(None)
 msgid ""
 "@@image: 'images/dialogs/brushes-buttons.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/brushes-dialog.xml:361(None)
+#: src/dialogs/brushes-dialog.xml:367(None)
 msgid ""
 "@@image: 'images/dialogs/brushes-context-menu.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -6878,7 +6858,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/brushes-dialog.xml:392(None)
+#: src/dialogs/brushes-dialog.xml:398(None)
 msgid ""
 "@@image: 'images/dialogs/brushes-editor-dialog.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -6886,30 +6866,28 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/dialogs/brushes-dialog.xml:507(None)
+#: src/dialogs/brushes-dialog.xml:511(None)
 msgid ""
 "@@image: 'images/dialogs/brushes-dialog-clipboard.png'; md5=THIS FILE "
 "DOESN'T EXIST"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:16(title)
-msgid "<quote>Brushes</quote> Dialog"
+#: src/dialogs/brushes-dialog.xml:17(title)
+msgid "Brushes Dialog"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:18(primary)
-#: src/dialogs/brushes-dialog.xml:22(secondary)
-#: src/dialogs/brushes-dialog.xml:25(primary)
-#: src/dialogs/brushes-dialog.xml:353(quote)
-#: src/dialogs/brushes-dialog.xml:493(primary)
+#: src/dialogs/brushes-dialog.xml:20(primary)
+#: src/dialogs/brushes-dialog.xml:24(secondary)
+#: src/dialogs/brushes-dialog.xml:27(primary)
+#: src/dialogs/brushes-dialog.xml:497(primary)
 msgid "Brushes"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:29(title)
-#: src/dialogs/brushes-dialog.xml:219(title)
-msgid "The <quote>Brushes</quote> dialog"
+#: src/dialogs/brushes-dialog.xml:32(title)
+msgid "The Brushes dialog"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:36(para)
+#: src/dialogs/brushes-dialog.xml:39(para)
 msgid ""
 "The <quote>Brushes</quote> dialog is used to select a brush, for use with "
 "painting tools: see the <link linkend=\"gimp-concepts-brushes\">Brushes</"
@@ -6923,26 +6901,26 @@ msgid ""
 "in a special brush file format."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:51(para)
+#: src/dialogs/brushes-dialog.xml:55(para)
 msgid ""
 "The <quote>Brushes</quote> dialog is a dockable dialog; see the section "
 "<xref linkend=\"gimp-concepts-docks\"/> for help on manipulating it."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:61(para)
+#: src/dialogs/brushes-dialog.xml:65(para)
 msgid ""
 "from the Toolbox, by clicking on the brush symbol in Brush/Pattern/Gradient "
 "area."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:67(para)
+#: src/dialogs/brushes-dialog.xml:71(para)
 msgid ""
 "From an image menu: <menuchoice><guimenu>Windows</"
 "guimenu><guisubmenu>Dockable Dialogs</guisubmenu><guimenuitem>Brushes</"
 "guimenuitem></menuchoice>;"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:77(para)
+#: src/dialogs/brushes-dialog.xml:81(para)
 msgid ""
 "from the Tab menu in any dockable dialog by clicking on "
 "<guiicon><inlinegraphic format=\"PNG\" fileref=\"images/dialogs/stock-menu-"
@@ -6950,7 +6928,7 @@ msgid ""
 "guimenu><guimenuitem>Brushes</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:90(para)
+#: src/dialogs/brushes-dialog.xml:94(para)
 msgid ""
 "from the Tool Options dialog for any of the paint tools, by clicking on the "
 "Brush icon button, you get a popup with similar functionality that permits "
@@ -6958,36 +6936,36 @@ msgid ""
 "present on the right bottom of the popup, you open the real brush dialog."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:102(para)
+#: src/dialogs/brushes-dialog.xml:106(para)
 msgid "The simplified <quote>Brushes</quote> dialog"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:106(para)
+#: src/dialogs/brushes-dialog.xml:110(para)
 msgid "This window has five buttons, clearly explained by help pop-ups:"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:110(para)
+#: src/dialogs/brushes-dialog.xml:114(para)
 msgid "Smaller previews"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:113(para)
+#: src/dialogs/brushes-dialog.xml:117(para)
 msgid "Larger previews"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:116(para)
+#: src/dialogs/brushes-dialog.xml:120(para)
 msgid "View as list"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:119(para)
-#: src/dialogs/brushes-dialog.xml:159(para)
+#: src/dialogs/brushes-dialog.xml:123(para)
+#: src/dialogs/brushes-dialog.xml:164(para)
 msgid "View as Grid"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:122(para)
+#: src/dialogs/brushes-dialog.xml:126(para)
 msgid "Open the brush selection dialog"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:125(para)
+#: src/dialogs/brushes-dialog.xml:129(para)
 msgid ""
 "Note that, depending on your Preferences, a brush selected with the popup "
 "may only apply to the currently active tool, not to other paint tools. See "
@@ -6995,15 +6973,15 @@ msgid ""
 "section for more information."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:136(title)
+#: src/dialogs/brushes-dialog.xml:140(title)
 msgid "Using the <quote>Brushes</quote> dialog"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:138(title)
+#: src/dialogs/brushes-dialog.xml:143(title)
 msgid "Grid/List mode"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:139(para)
+#: src/dialogs/brushes-dialog.xml:144(para)
 msgid ""
 "In the Tab menu, you can choose between <guimenuitem>View as Grid</"
 "guimenuitem> and <guimenuitem>View as List</guimenuitem>. In Grid mode, the "
@@ -7012,43 +6990,43 @@ msgid ""
 "lined up in a list, with the names beside them."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:147(para)
+#: src/dialogs/brushes-dialog.xml:152(para)
 msgid ""
 "In the Tab menu, the option <guilabel>Preview Size</guilabel> allows you to "
 "adapt the size of brush previews to your liking."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:152(title)
+#: src/dialogs/brushes-dialog.xml:157(title)
 msgid "Grid/List view"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:168(para)
+#: src/dialogs/brushes-dialog.xml:173(para)
 msgid "View as List"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:176(para)
+#: src/dialogs/brushes-dialog.xml:181(para)
 msgid ""
 "At the top of the dialog appears the name of the currently selected brush, "
 "and its size in pixels."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:180(para)
+#: src/dialogs/brushes-dialog.xml:185(para)
 msgid ""
 "In the center a grid view of all available brushes appears, with the "
 "currently selected one outlined."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:187(term)
+#: src/dialogs/brushes-dialog.xml:192(term)
 msgid "List mode"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:189(para)
+#: src/dialogs/brushes-dialog.xml:194(para)
 msgid ""
 "For the most part, the dialog works the same way in List mode as in Grid "
 "mode, with one exception:"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:193(para)
+#: src/dialogs/brushes-dialog.xml:198(para)
 msgid ""
 "If you double-click on the <emphasis>name</emphasis> of a brush, you will be "
 "able to edit it. Note, however, that you are only allowed to change the "
@@ -7060,11 +7038,15 @@ msgid ""
 "you: brushes, patterns, gradients, etc; only ones that you create yourself."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:217(title)
+#: src/dialogs/brushes-dialog.xml:223(title)
 msgid "Brush previews"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:226(para)
+#: src/dialogs/brushes-dialog.xml:225(title)
+msgid "The <quote>Brushes</quote> dialog"
+msgstr ""
+
+#: src/dialogs/brushes-dialog.xml:232(para)
 msgid ""
 "When you click on a brush preview, it becomes the current brush and it gets "
 "selected in the brush area of Toolbox and the Brush option of painting "
@@ -7073,49 +7055,49 @@ msgid ""
 "on buttons at the bottom of the dialog to perform various actions."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:234(para)
+#: src/dialogs/brushes-dialog.xml:240(para)
 msgid ""
 "Meaning of the small symbols at the bottom right corner of every brush "
 "preview:"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:240(para)
+#: src/dialogs/brushes-dialog.xml:246(para)
 msgid "A blue corner is for brushes in normal size. You can duplicate them."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:245(para)
+#: src/dialogs/brushes-dialog.xml:251(para)
 msgid ""
 "A small cross means that the brush is in a reduced size. You can get it in "
 "normal size by maintaining left click on it."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:251(para)
+#: src/dialogs/brushes-dialog.xml:257(para)
 msgid ""
 "A red corner is for animated brushes. If you maintain left click on the "
 "thumbnail, the animation is played."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:260(para)
+#: src/dialogs/brushes-dialog.xml:267(para)
 msgid "At the bottom of the dialog you find a slider and some buttons:"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:271(term)
-#: src/dialogs/brushes-dialog.xml:473(term)
+#: src/dialogs/brushes-dialog.xml:278(term)
+#: src/dialogs/brushes-dialog.xml:479(term)
 msgid "Spacing"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:273(para)
+#: src/dialogs/brushes-dialog.xml:280(para)
 msgid ""
 "This slider lets you set the distance between consecutive brush marks when "
 "you trace out a brushstroke with the mouse pointer. Spacing is a percentage "
 "of the brush width and varies from 1 to 200."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:282(term)
+#: src/dialogs/brushes-dialog.xml:289(term)
 msgid "Edit Brush"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:284(para)
+#: src/dialogs/brushes-dialog.xml:291(para)
 msgid ""
 "This activates the <link linkend=\"gimp-brush-editor-dialog\">Brush Editor</"
 "link>. Pressing the button will open the Editor for any brush. It only "
@@ -7124,22 +7106,22 @@ msgid ""
 "only</quote>)."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:295(term)
+#: src/dialogs/brushes-dialog.xml:302(term)
 msgid "New Brush"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:298(para)
+#: src/dialogs/brushes-dialog.xml:305(para)
 msgid ""
 "This creates a new parametric brush, initializes it with a small fuzzy round "
 "shape, and opens the Brush Editor so that you can modify it. The new brush "
 "is automatically saved in your personal <filename>brushes</filename> folder."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:307(term)
+#: src/dialogs/brushes-dialog.xml:314(term)
 msgid "Duplicate Brush"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:310(para)
+#: src/dialogs/brushes-dialog.xml:317(para)
 msgid ""
 "This button is only enabled if the currently selected brush is a parametric "
 "brush. If so, the brush is duplicated, and the Brush Editor is opened so "
@@ -7147,22 +7129,22 @@ msgid ""
 "personal <filename>brushes</filename> folder."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:320(term)
+#: src/dialogs/brushes-dialog.xml:327(term)
 msgid "Delete Brush"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:323(para)
+#: src/dialogs/brushes-dialog.xml:330(para)
 msgid ""
 "This removes all traces of the brush, both from the dialog and the folder "
 "where its file is stored, if you have permission to do so. It asks for "
 "confirmation before doing anything."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:331(term)
+#: src/dialogs/brushes-dialog.xml:338(term)
 msgid "Refresh Brushes"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:334(para)
+#: src/dialogs/brushes-dialog.xml:341(para)
 msgid ""
 "If you add brushes to your personal <filename>brushes</filename> folder or "
 "any other folder in your brush search path, by some means other than the "
@@ -7170,7 +7152,7 @@ msgid ""
 "entries will be available in the dialog."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:344(para)
+#: src/dialogs/brushes-dialog.xml:351(para)
 msgid ""
 "The functions performed by these buttons can also be accessed from the "
 "dialog pop-up menu, activated by right-clicking anywhere in the brush grid/"
@@ -7178,22 +7160,19 @@ msgid ""
 "from the dialog Tab menu."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:353(phrase)
-msgid "The <placeholder-1/> context menu"
-msgstr ""
-
-#: src/dialogs/brushes-dialog.xml:357(title)
+#: src/dialogs/brushes-dialog.xml:360(title)
+#: src/dialogs/brushes-dialog.xml:363(title)
 msgid "The <quote>Brushes</quote> context menu"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:366(para)
+#: src/dialogs/brushes-dialog.xml:372(para)
 msgid ""
 "Right clicking on a brush preview opens a context menu. This menu has now "
 "some options which let you create elliptical and rectangular brushes. These "
 "brushed can be feathered, but they are not parametric brushes."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:372(para)
+#: src/dialogs/brushes-dialog.xml:378(para)
 msgid ""
 "The other commands of this submenu are described with the Buttons, except "
 "for <guilabel>Copy Brush Location</guilabel> which allows to copy brush path "
@@ -7202,15 +7181,15 @@ msgid ""
 "can open the brush as a new image."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:386(title)
+#: src/dialogs/brushes-dialog.xml:392(title)
 msgid "Brush Editor"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:388(title)
+#: src/dialogs/brushes-dialog.xml:394(title)
 msgid "The <quote>Brushes</quote> Editor dialog"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:396(para)
+#: src/dialogs/brushes-dialog.xml:402(para)
 msgid ""
 "The Brush Editor allows you either to view the brush parameters of a brush "
 "supplied by GIMP, and you can't change them, or to create a custom brush "
@@ -7218,110 +7197,110 @@ msgid ""
 "several elements:"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:402(para)
+#: src/dialogs/brushes-dialog.xml:408(para)
 msgid ""
 "<emphasis>The dialog bar</emphasis>: As with all dialog windows, a click on "
 "the small triangle prompts a menu allowing you to set the aspect of the "
 "Brush Editor."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:406(para)
+#: src/dialogs/brushes-dialog.xml:412(para)
 msgid "<emphasis>The title bar</emphasis>: To give a name to your brush."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:408(para)
+#: src/dialogs/brushes-dialog.xml:414(para)
 msgid ""
 "<emphasis>The preview area</emphasis>: Brush changes appear in real time in "
 "this preview."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:412(para)
+#: src/dialogs/brushes-dialog.xml:418(para)
 msgid "<emphasis>Settings</emphasis>:"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:414(term)
+#: src/dialogs/brushes-dialog.xml:420(term)
 msgid "Shape"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:416(para)
+#: src/dialogs/brushes-dialog.xml:422(para)
 msgid ""
 "A circle, a square and a diamond are available. You will modify them by "
 "using the following options:"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:423(term)
+#: src/dialogs/brushes-dialog.xml:429(term)
 msgid "Radius"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:425(para)
+#: src/dialogs/brushes-dialog.xml:431(para)
 msgid ""
 "Distance between brush center and edge, in the width direction. A square "
 "with a 10 pixels radius will have a 20 pixels side. A diamond with a 5 "
 "pixels radius will have a 10 pixels width."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:433(term)
+#: src/dialogs/brushes-dialog.xml:439(term)
 msgid "Spikes"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:435(para)
+#: src/dialogs/brushes-dialog.xml:441(para)
 msgid ""
 "This parameter is useful only for square and diamond. With a square, "
 "increasing spikes results in a polygon. With a diamond, you get a star."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:443(term)
+#: src/dialogs/brushes-dialog.xml:449(term)
 msgid "Hardness"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:445(para)
+#: src/dialogs/brushes-dialog.xml:451(para)
 msgid ""
 "This parameter controls the feathering of the brush border. Value = 1.00 "
 "gives a brush with a sharp border (0.00-1.00)."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:452(term)
+#: src/dialogs/brushes-dialog.xml:458(term)
 msgid "Aspect ratio"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:454(para)
+#: src/dialogs/brushes-dialog.xml:460(para)
 msgid ""
 "This parameter controls the brush Width/Height ratio. A diamond with a 5 "
 "pixels radius and an Aspect Ratio = 2, will be flattened with a 10 pixels "
 "width and a 5 pixels height (1.0-20.0)."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:462(term)
+#: src/dialogs/brushes-dialog.xml:468(term)
 msgid "Angle"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:464(para)
+#: src/dialogs/brushes-dialog.xml:470(para)
 msgid ""
 "This angle is the angle between the brush width direction, which is normally "
 "horizontal, and the horizontal direction, counter-clock-wise. When this "
 "value increases, the brush width turns counter-clock-wise (0° to 180°)."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:475(para)
+#: src/dialogs/brushes-dialog.xml:481(para)
 msgid ""
 "When the brush draws a line, it actually stamps the brush icon repeatedly. "
 "If brush stamps are very close, you get the impression of a solid line: you "
 "get that with Spacing = 1. (1.00 to 200.0)."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:487(phrase)
+#: src/dialogs/brushes-dialog.xml:492(title)
 msgid "The Clipboard Brush"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:490(primary)
+#: src/dialogs/brushes-dialog.xml:494(primary)
 msgid "Clipboard Brush"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:494(secondary)
+#: src/dialogs/brushes-dialog.xml:498(secondary)
 msgid "Clipboard brush"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:496(para)
+#: src/dialogs/brushes-dialog.xml:500(para)
 msgid ""
 "When you use the Copy or Cut command on an image or a selection of it, a "
 "copy appears as a new brush in the upper left corner of the <quote>Brushes</"
@@ -7329,11 +7308,11 @@ msgid ""
 "It disappears when you close GIMP."
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:503(title)
+#: src/dialogs/brushes-dialog.xml:507(title)
 msgid "A new <quote>Clipboard Brush</quote>"
 msgstr ""
 
-#: src/dialogs/brushes-dialog.xml:512(para)
+#: src/dialogs/brushes-dialog.xml:516(para)
 msgid ""
 "You can save this clipboard brush by using the <menuchoice><guimenu>Edit</"
 "guimenu><guisubmenu>Paste as</guisubmenu><guimenuitem>New brush</"
diff --git a/po/zh_CN/filters.po b/po/zh_CN/filters.po
index d959fbd..e388f23 100644
--- a/po/zh_CN/filters.po
+++ b/po/zh_CN/filters.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:34+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/filters/alpha-to-logo.po b/po/zh_CN/filters/alpha-to-logo.po
index b6fa482..3c3c8d7 100644
--- a/po/zh_CN/filters/alpha-to-logo.po
+++ b/po/zh_CN/filters/alpha-to-logo.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:38+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/filters/animation.po b/po/zh_CN/filters/animation.po
index bbfb72a..7c986dc 100644
--- a/po/zh_CN/filters/animation.po
+++ b/po/zh_CN/filters/animation.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:39+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -166,7 +166,7 @@ msgstr ""
 #: src/filters/animation/optimize.xml:61(para)
 msgid ""
 "<emphasis>Optimize (GIF)</emphasis>: File size moved to 154 Kb, a bit bigger "
-"in the present example, bur layer size has been reduced. Layers held only a "
+"in the present example, but layer size has been reduced. Layers held only a "
 "rectangular selection which includes the part of the background which will "
 "be used to remove the trace of the red ball. The common part of layers is "
 "transparent."
diff --git a/po/zh_CN/filters/artistic.po b/po/zh_CN/filters/artistic.po
index 2a84314..0f900e3 100644
--- a/po/zh_CN/filters/artistic.po
+++ b/po/zh_CN/filters/artistic.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:39+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -108,7 +108,7 @@ msgstr ""
 #: src/filters/artistic/photocopy.xml:15(primary)
 #: src/filters/artistic/oilify.xml:15(primary)
 #: src/filters/artistic/introduction.xml:13(primary)
-#: src/filters/artistic/GIMPressionist.xml:24(primary)
+#: src/filters/artistic/GIMPressionist.xml:15(primary)
 #: src/filters/artistic/GIMPressionist-sizemap.xml:16(primary)
 #: src/filters/artistic/GIMPressionist-orientmap.xml:17(primary)
 #: src/filters/artistic/cubism.xml:24(primary)
@@ -123,7 +123,7 @@ msgstr ""
 #: src/filters/artistic/photocopy.xml:16(secondary)
 #: src/filters/artistic/oilify.xml:16(secondary)
 #: src/filters/artistic/introduction.xml:14(secondary)
-#: src/filters/artistic/GIMPressionist.xml:25(secondary)
+#: src/filters/artistic/GIMPressionist.xml:16(secondary)
 #: src/filters/artistic/GIMPressionist-sizemap.xml:17(secondary)
 #: src/filters/artistic/GIMPressionist-orientmap.xml:18(secondary)
 #: src/filters/artistic/cubism.xml:25(secondary)
@@ -141,8 +141,8 @@ msgstr ""
 #: src/filters/artistic/predator.xml:32(phrase)
 #: src/filters/artistic/photocopy.xml:24(phrase)
 #: src/filters/artistic/oilify.xml:24(phrase)
-#: src/filters/artistic/GIMPressionist.xml:33(phrase)
-#: src/filters/artistic/GIMPressionist-sizemap.xml:25(phrase)
+#: src/filters/artistic/GIMPressionist.xml:24(title)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:25(title)
 #: src/filters/artistic/GIMPressionist-orientmap.xml:26(title)
 #: src/filters/artistic/cubism.xml:33(phrase)
 #: src/filters/artistic/cartoon.xml:32(phrase)
@@ -182,7 +182,6 @@ msgstr ""
 #: src/filters/artistic/vangogh-lic.xml:66(phrase)
 #: src/filters/artistic/predator.xml:73(phrase)
 #: src/filters/artistic/oilify.xml:64(phrase)
-#: src/filters/artistic/GIMPressionist.xml:67(phrase)
 #: src/filters/artistic/cubism.xml:72(phrase)
 #: src/filters/artistic/cartoon.xml:66(phrase)
 #: src/filters/artistic/applycanvas.xml:58(title)
@@ -416,7 +415,7 @@ msgstr ""
 #: src/filters/artistic/predator.xml:42(None)
 #: src/filters/artistic/photocopy.xml:34(None)
 #: src/filters/artistic/oilify.xml:34(None)
-#: src/filters/artistic/GIMPressionist.xml:43(None)
+#: src/filters/artistic/GIMPressionist.xml:33(None)
 #: src/filters/artistic/cubism.xml:43(None)
 #: src/filters/artistic/cartoon.xml:42(None)
 #: src/filters/artistic/applycanvas.xml:35(None)
@@ -455,7 +454,6 @@ msgstr ""
 #: src/filters/artistic/predator.xml:36(phrase)
 #: src/filters/artistic/photocopy.xml:28(phrase)
 #: src/filters/artistic/oilify.xml:28(phrase)
-#: src/filters/artistic/GIMPressionist.xml:37(phrase)
 #: src/filters/artistic/cartoon.xml:36(phrase)
 msgid "Example for the <placeholder-1/> filter"
 msgstr ""
@@ -464,7 +462,7 @@ msgstr ""
 #: src/filters/artistic/predator.xml:45(para)
 #: src/filters/artistic/photocopy.xml:37(para)
 #: src/filters/artistic/oilify.xml:37(para)
-#: src/filters/artistic/GIMPressionist.xml:46(para)
+#: src/filters/artistic/GIMPressionist.xml:36(para)
 #: src/filters/artistic/cubism.xml:46(para)
 #: src/filters/artistic/cartoon.xml:45(para)
 #: src/filters/artistic/applycanvas.xml:38(para)
@@ -495,9 +493,9 @@ msgstr ""
 
 #: src/filters/artistic/softglow.xml:79(term)
 #: src/filters/artistic/photocopy.xml:92(term)
-#: src/filters/artistic/GIMPressionist.xml:80(term)
-#: src/filters/artistic/GIMPressionist-sizemap.xml:94(term)
-#: src/filters/artistic/GIMPressionist-orientmap.xml:108(term)
+#: src/filters/artistic/GIMPressionist.xml:75(term)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:91(term)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:109(term)
 #: src/filters/artistic/cubism.xml:96(term)
 #: src/filters/artistic/applycanvas.xml:82(term)
 msgid "Preview"
@@ -1001,7 +999,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/artistic/GIMPressionist.xml:51(None)
+#: src/filters/artistic/GIMPressionist.xml:41(None)
 msgid ""
 "@@image: 'images/filters/examples/artistic-taj-gimpressionist.jpg'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -1009,7 +1007,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/artistic/GIMPressionist.xml:102(None)
+#: src/filters/artistic/GIMPressionist.xml:96(None)
 msgid ""
 "@@image: 'images/filters/options-artistic-gimpressionist1.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -1017,7 +1015,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/artistic/GIMPressionist.xml:148(None)
+#: src/filters/artistic/GIMPressionist.xml:141(None)
 msgid ""
 "@@image: 'images/filters/options-artistic-gimpressionist2.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -1025,7 +1023,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/artistic/GIMPressionist.xml:208(None)
+#: src/filters/artistic/GIMPressionist.xml:200(None)
 msgid ""
 "@@image: 'images/filters/options-artistic-gimpressionist3.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -1033,7 +1031,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/artistic/GIMPressionist.xml:279(None)
+#: src/filters/artistic/GIMPressionist.xml:270(None)
 msgid ""
 "@@image: 'images/filters/options-artistic-gimpressionist4.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -1041,7 +1039,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/artistic/GIMPressionist.xml:390(None)
+#: src/filters/artistic/GIMPressionist.xml:380(None)
 msgid ""
 "@@image: 'images/filters/options-artistic-gimpressionist5.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -1049,7 +1047,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/artistic/GIMPressionist.xml:490(None)
+#: src/filters/artistic/GIMPressionist.xml:479(None)
 msgid ""
 "@@image: 'images/filters/options-artistic-gimpressionist6.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -1057,7 +1055,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/artistic/GIMPressionist.xml:549(None)
+#: src/filters/artistic/GIMPressionist.xml:537(None)
 msgid ""
 "@@image: 'images/filters/options-artistic-gimpressionist7.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -1065,16 +1063,15 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/artistic/GIMPressionist.xml:600(None)
+#: src/filters/artistic/GIMPressionist.xml:587(None)
 msgid ""
 "@@image: 'images/filters/options-artistic-gimpressionist8.png'; md5=THIS "
 "FILE DOESN'T EXIST"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:21(phrase)
-#: src/filters/artistic/GIMPressionist.xml:26(tertiary)
-#: src/filters/artistic/GIMPressionist.xml:29(primary)
-#: src/filters/artistic/GIMPressionist.xml:38(quote)
+#: src/filters/artistic/GIMPressionist.xml:11(title)
+#: src/filters/artistic/GIMPressionist.xml:17(tertiary)
+#: src/filters/artistic/GIMPressionist.xml:20(primary)
 #: src/filters/artistic/GIMPressionist-sizemap.xml:18(tertiary)
 #: src/filters/artistic/GIMPressionist-sizemap.xml:21(primary)
 #: src/filters/artistic/GIMPressionist-orientmap.xml:19(tertiary)
@@ -1082,11 +1079,15 @@ msgstr ""
 msgid "GIMPressionist"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:54(para)
+#: src/filters/artistic/GIMPressionist.xml:28(title)
+msgid "Example for the <quote>GIMPressionist</quote> filter"
+msgstr ""
+
+#: src/filters/artistic/GIMPressionist.xml:44(para)
 msgid "Filter <quote>GIMPressionist</quote> applied"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:58(para)
+#: src/filters/artistic/GIMPressionist.xml:48(para)
 msgid ""
 "It's the king of Artistic filters. It can do what Cubism and Apply Canvas do "
 "and much more. It gives your image the look of a painting. All is going as "
@@ -1094,20 +1095,24 @@ msgid ""
 "chosen. It works on the active layer or selection."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:69(para)
+#: src/filters/artistic/GIMPressionist.xml:56(title)
+msgid "Activating the filter"
+msgstr ""
+
+#: src/filters/artistic/GIMPressionist.xml:59(para)
 msgid ""
 "You can find this filter via the image menu through "
 "<menuchoice><guimenu>Filters</guimenu><guisubmenu>Artistic</"
 "guisubmenu><guimenuitem>GIMPressionist</guimenuitem></menuchoice>"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:76(phrase)
-#: src/filters/artistic/GIMPressionist-sizemap.xml:37(phrase)
+#: src/filters/artistic/GIMPressionist.xml:70(title)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:36(title)
 #: src/filters/artistic/GIMPressionist-orientmap.xml:37(title)
 msgid "Parameter Settings"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:82(para)
+#: src/filters/artistic/GIMPressionist.xml:77(para)
 msgid ""
 "All your setting changes will appear in the Preview without affecting the "
 "image until you click on <guibutton>OK</guibutton>. The <guibutton>Update</"
@@ -1116,23 +1121,15 @@ msgid ""
 "guibutton> button reverts to the original image."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:93(term)
-#: src/filters/artistic/GIMPressionist.xml:97(quote)
+#: src/filters/artistic/GIMPressionist.xml:88(term)
 msgid "Presets"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:97(phrase)
-#: src/filters/artistic/GIMPressionist.xml:143(phrase)
-#: src/filters/artistic/GIMPressionist.xml:203(phrase)
-#: src/filters/artistic/GIMPressionist.xml:274(phrase)
-#: src/filters/artistic/GIMPressionist.xml:385(phrase)
-#: src/filters/artistic/GIMPressionist.xml:485(phrase)
-#: src/filters/artistic/GIMPressionist.xml:544(phrase)
-#: src/filters/artistic/GIMPressionist.xml:595(phrase)
-msgid "<placeholder-1/> tab options"
+#: src/filters/artistic/GIMPressionist.xml:91(title)
+msgid "<quote>Presets</quote> tab options"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:106(para)
+#: src/filters/artistic/GIMPressionist.xml:100(para)
 msgid ""
 "GIMPressionist has a lot of parameters. When combined, they give an "
 "astronomical number of possibilities. So, it is important, when an "
@@ -1141,38 +1138,38 @@ msgid ""
 "parameters makes difficult understanding and foreseeing how each one works."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:116(para)
+#: src/filters/artistic/GIMPressionist.xml:110(para)
 msgid ""
 "<guilabel>Save Current</guilabel>: Save current parameters. You can give a "
 "name in the input box on the left and a short description in the dialog that "
 "appear."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:122(para)
+#: src/filters/artistic/GIMPressionist.xml:116(para)
 msgid ""
 "<guilabel>Apply</guilabel>: Load the parameters of the selected preset in "
 "the list."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:127(para)
+#: src/filters/artistic/GIMPressionist.xml:121(para)
 msgid ""
 "<guilabel>Delete</guilabel>: Delete the selected preset. You can delete only "
 "the presets you have created."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:132(para)
+#: src/filters/artistic/GIMPressionist.xml:126(para)
 msgid "<guilabel>Refresh</guilabel>: Update the preset list."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:139(term)
+#: src/filters/artistic/GIMPressionist.xml:133(term)
 msgid "Paper tab"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:143(quote)
-msgid "Paper"
+#: src/filters/artistic/GIMPressionist.xml:136(title)
+msgid "<quote>Paper</quote> tab options"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:152(para)
+#: src/filters/artistic/GIMPressionist.xml:145(para)
 msgid ""
 "This tab concerns the texture of the canvas your image will be painted on. "
 "You have a list of textures and a <guilabel>Preview</guilabel> for the "
@@ -1180,74 +1177,74 @@ msgid ""
 "when selected."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:161(term)
+#: src/filters/artistic/GIMPressionist.xml:154(term)
 msgid "Invert"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:163(para)
+#: src/filters/artistic/GIMPressionist.xml:156(para)
 msgid ""
 "Inverts the paper texture: what was a hollow turns to a bump and vice-versa."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:170(term)
+#: src/filters/artistic/GIMPressionist.xml:163(term)
 msgid "Overlay"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:172(para)
+#: src/filters/artistic/GIMPressionist.xml:165(para)
 msgid ""
 "Apply the paper as it, without embossing it. It looks like if a transparent "
 "paper has been overlayed on the image."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:179(term)
+#: src/filters/artistic/GIMPressionist.xml:172(term)
 msgid "Scale"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:181(para)
+#: src/filters/artistic/GIMPressionist.xml:174(para)
 msgid ""
 "Specifies the scale of the texture (in % of the original file): controls the "
 "graininess of the texture."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:188(term)
-#: src/filters/artistic/GIMPressionist.xml:258(term)
+#: src/filters/artistic/GIMPressionist.xml:181(term)
+#: src/filters/artistic/GIMPressionist.xml:250(term)
 msgid "Relief"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:190(para)
+#: src/filters/artistic/GIMPressionist.xml:183(para)
 msgid "Specifies the amount of embossing to apply (3-150)."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:199(term)
+#: src/filters/artistic/GIMPressionist.xml:192(term)
 msgid "Brush tab"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:203(quote)
-msgid "Brush"
+#: src/filters/artistic/GIMPressionist.xml:195(title)
+msgid "<quote>Brush</quote> tab options"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:212(para)
+#: src/filters/artistic/GIMPressionist.xml:204(para)
 msgid ""
-"\"Brush\" is a general term for any material used to paint. A list of "
-"brushes is available with a <guilabel>Preview</guilabel> for the selected "
-"one."
+"<quote>Brush</quote> is a general term for any material used to paint. A "
+"list of brushes is available with a <guilabel>Preview</guilabel> for the "
+"selected one."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:219(term)
+#: src/filters/artistic/GIMPressionist.xml:211(term)
 msgid "Gamma"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:221(para)
+#: src/filters/artistic/GIMPressionist.xml:213(para)
 msgid ""
 "Changes the gamma (luminosity) of the selected brush. The gamma correction "
 "brightens or darkens midtones."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:228(term)
+#: src/filters/artistic/GIMPressionist.xml:220(term)
 msgid "Select"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:230(para)
+#: src/filters/artistic/GIMPressionist.xml:222(para)
 msgid ""
 "You can also use a brush pattern you have created by selecting its image "
 "(arrow button on the Select line). This image must be on your screen before "
@@ -1255,537 +1252,551 @@ msgid ""
 "images."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:236(para)
+#: src/filters/artistic/GIMPressionist.xml:228(para)
 msgid ""
 "If your image has several layers, they also will be displayed in the Select "
 "list and can be used as a brush. When selected, the layer appears in the "
 "brush preview and the normal brush is deselected."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:242(para)
+#: src/filters/artistic/GIMPressionist.xml:234(para)
 msgid ""
 "The <guibutton>Save as</guibutton> button allows you to save the selected "
 "brush."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:249(term)
+#: src/filters/artistic/GIMPressionist.xml:241(term)
 msgid "Aspect ratio"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:251(para)
+#: src/filters/artistic/GIMPressionist.xml:243(para)
 msgid "Specifies the brush proportions, height (0 -1) and width (0 +1)."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:260(para)
+#: src/filters/artistic/GIMPressionist.xml:252(para)
 msgid ""
 "Specifies the amount of paint used for each stroke. This may evoke painting "
 "with a palette knife."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:270(term)
+#: src/filters/artistic/GIMPressionist.xml:262(term)
 msgid "Orientation tab"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:274(quote)
-#: src/filters/artistic/GIMPressionist.xml:318(term)
-msgid "Orientation"
+#: src/filters/artistic/GIMPressionist.xml:265(title)
+msgid "<quote>Orientation</quote> tab options"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:283(para)
+#: src/filters/artistic/GIMPressionist.xml:274(para)
 msgid ""
 "This tab allows to set the orientation of the brush strokes. A painter is "
 "not obliged to go over with the same paintbrush angle. To perform some "
 "effects, he can vary their orientation."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:290(term)
+#: src/filters/artistic/GIMPressionist.xml:281(term)
 msgid "Directions"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:292(para)
+#: src/filters/artistic/GIMPressionist.xml:283(para)
 msgid ""
 "With this option, you can set how many times the brush will pass through a "
 "same place, with each time a different direction, resulting in a more and "
 "more thick paint."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:300(term)
+#: src/filters/artistic/GIMPressionist.xml:291(term)
 msgid "Start Angle"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:302(para)
+#: src/filters/artistic/GIMPressionist.xml:293(para)
 msgid ""
 "Specifies the general direction of the strokes, the angle that the angle "
 "range will start from. Directions are often chosen to give some movement to "
 "the image."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:310(term)
+#: src/filters/artistic/GIMPressionist.xml:301(term)
 msgid "Angle Span"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:312(para)
+#: src/filters/artistic/GIMPressionist.xml:303(para)
 msgid "Specifies the angle, the sector, of the stroke \"fan\"."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:320(para)
+#: src/filters/artistic/GIMPressionist.xml:309(term)
+msgid "Orientation"
+msgstr ""
+
+#: src/filters/artistic/GIMPressionist.xml:311(para)
 msgid "Specifies the direction of the brush strokes."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:325(para)
+#: src/filters/artistic/GIMPressionist.xml:316(para)
 msgid ""
 "<guilabel>Value</guilabel> : Let the Value (luminosity) of the region "
 "determine the direction of the stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:331(para)
+#: src/filters/artistic/GIMPressionist.xml:322(para)
 msgid ""
 "<guilabel>Radius</guilabel> : The distance from the center of the image "
 "determines the direction of the stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:337(para)
+#: src/filters/artistic/GIMPressionist.xml:328(para)
 msgid ""
 "<guilabel>Random</guilabel> : Select a random direction for each stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:342(para)
+#: src/filters/artistic/GIMPressionist.xml:333(para)
 msgid ""
 "<guilabel>Radial</guilabel> : Let the direction from the center determine "
 "the direction of the stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:348(para)
+#: src/filters/artistic/GIMPressionist.xml:339(para)
 msgid ""
 "<guilabel>Flowing</guilabel> : Not a direction question here: the strokes "
 "follow a \"flowing\" pattern."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:354(para)
+#: src/filters/artistic/GIMPressionist.xml:345(para)
 msgid ""
 "<guilabel>Hue</guilabel> : Let the hue of the region determine the direction "
 "of the stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:360(para)
+#: src/filters/artistic/GIMPressionist.xml:351(para)
 msgid ""
 "<guilabel>Adaptive</guilabel> : The brush direction that matches the "
 "original image the closest is selected."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:366(para)
+#: src/filters/artistic/GIMPressionist.xml:357(para)
 msgid ""
 "<guilabel>Manual</guilabel> : The <guilabel>Edit</guilabel> button opens the "
 "<link linkend=\"gimpressionist-orient-map-editor\"> Edit orientation Map "
 "dialog </link> that allows you to set the directions manually."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:381(term)
+#: src/filters/artistic/GIMPressionist.xml:372(term)
 msgid "Size tab"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:385(quote)
-#: src/filters/artistic/GIMPressionist-sizemap.xml:104(term)
-msgid "Size"
+#: src/filters/artistic/GIMPressionist.xml:375(title)
+msgid "<quote>Size</quote> tab options"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:394(para)
+#: src/filters/artistic/GIMPressionist.xml:384(para)
 msgid ""
 "This tab allows you to set the number of brush sizes that will be used to "
 "paint, the limits of variation of these sizes and the criterion used to "
 "determine them."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:401(term)
+#: src/filters/artistic/GIMPressionist.xml:391(term)
 msgid "Three Sliders"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:403(para)
+#: src/filters/artistic/GIMPressionist.xml:393(para)
 msgid "You can specify how many brush sizes are to be used and their sizes."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:409(para)
+#: src/filters/artistic/GIMPressionist.xml:399(para)
 msgid "<guilabel>Sizes</guilabel>: The number of brush sizes to use."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:414(para)
+#: src/filters/artistic/GIMPressionist.xml:404(para)
 msgid ""
 "<guilabel>Minimum Size</guilabel> and <guilabel>Maximum Size </guilabel>: "
 "The brush sizes are between these two values. Greater the size, greater the "
 "length and width of strokes."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:424(term)
+#: src/filters/artistic/GIMPressionist.xml:414(term)
 msgid "Sizes"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:426(para)
+#: src/filters/artistic/GIMPressionist.xml:416(para)
 msgid ""
 "You have there options to specify how the size of strokes will be determined."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:432(para)
+#: src/filters/artistic/GIMPressionist.xml:422(para)
 msgid ""
 "<guilabel>Value</guilabel>: Let the Value (luminosity) of the region "
 "determine the size of the stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:437(para)
+#: src/filters/artistic/GIMPressionist.xml:427(para)
 msgid ""
 "<guilabel>Radius</guilabel> : The distance from the center of the image "
 "determines the size of the stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:442(para)
+#: src/filters/artistic/GIMPressionist.xml:432(para)
 msgid "<guilabel>Random</guilabel> : Select a random size for each stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:447(para)
+#: src/filters/artistic/GIMPressionist.xml:437(para)
 msgid ""
 "<guilabel>Radial</guilabel> : Let the direction from the center determine "
 "the size of the stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:452(para)
+#: src/filters/artistic/GIMPressionist.xml:442(para)
 msgid ""
 "<guilabel>Flowing</guilabel> : Not a length question here: the strokes "
-"follow a \"flowing\" pattern."
+"follow a <quote>flowing</quote> pattern."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:457(para)
+#: src/filters/artistic/GIMPressionist.xml:447(para)
 msgid ""
 "<guilabel>Hue</guilabel> : Let the hue of the region determine the size of "
 "the stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:462(para)
+#: src/filters/artistic/GIMPressionist.xml:452(para)
 msgid ""
 "<guilabel>Adaptive</guilabel> : The brush size that matches the original "
 "image the closest is selected."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:467(para)
+#: src/filters/artistic/GIMPressionist.xml:457(para)
 msgid ""
 "<guilabel>Manual</guilabel> : The <guilabel>Edit</guilabel> button opens the "
 "<link linkend=\"gimpressionist-size-map-editor\">Size Map Editor</link>. "
 "That allows you to specify the size of strokes by yourself."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:481(term)
+#: src/filters/artistic/GIMPressionist.xml:471(term)
 msgid "Placement tab"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:485(quote)
-#: src/filters/artistic/GIMPressionist.xml:499(term)
-msgid "Placement"
+#: src/filters/artistic/GIMPressionist.xml:474(title)
+msgid "<quote>Placement</quote> tab options"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:494(para)
+#: src/filters/artistic/GIMPressionist.xml:483(para)
 msgid "In this tab you can set how strokes will be distributed."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:501(para)
+#: src/filters/artistic/GIMPressionist.xml:488(term)
+msgid "Placement"
+msgstr ""
+
+#: src/filters/artistic/GIMPressionist.xml:490(para)
 msgid ""
 "In the preview of the Orientation Map Editor, all small arrows look like a "
 "flow around objects. Inside this flow, strokes may be placed in two "
 "different ways:"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:508(para)
+#: src/filters/artistic/GIMPressionist.xml:497(para)
 msgid ""
 "<guilabel>Randomly</guilabel>: Places strokes randomly. This produces a more "
 "realistic paint."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:513(para)
+#: src/filters/artistic/GIMPressionist.xml:502(para)
 msgid ""
 "<guilabel>Evenly</guilabel>: Strokes are evenly distributed across the image."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:521(term)
+#: src/filters/artistic/GIMPressionist.xml:510(term)
 msgid "Stroke Density"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:523(para)
+#: src/filters/artistic/GIMPressionist.xml:512(para)
 msgid ""
 "The greater the density the closer the strokes. With a low density, the "
 "paper or background may be visible in unstroke areas."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:531(term)
+#: src/filters/artistic/GIMPressionist.xml:520(term)
 msgid "Centerize"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:533(para)
+#: src/filters/artistic/GIMPressionist.xml:522(para)
 msgid "Focus brush strokes around center."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:540(term)
+#: src/filters/artistic/GIMPressionist.xml:529(term)
 msgid "Color tab"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:544(quote)
-#: src/filters/artistic/GIMPressionist.xml:558(term)
-msgid "Color"
+#: src/filters/artistic/GIMPressionist.xml:532(title)
+msgid "<quote>Color</quote> tab options"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:553(para)
+#: src/filters/artistic/GIMPressionist.xml:541(para)
 msgid "In this tab, you can set what the stroke color will be."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:560(para)
+#: src/filters/artistic/GIMPressionist.xml:546(term)
+msgid "Color"
+msgstr ""
+
+#: src/filters/artistic/GIMPressionist.xml:548(para)
 msgid "You can set the stroke color in two ways:"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:565(para)
+#: src/filters/artistic/GIMPressionist.xml:553(para)
 msgid ""
 "<guilabel>Average under brush</guilabel>: Stroke color is computed from the "
 "the average of all pixels under the brush."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:571(para)
+#: src/filters/artistic/GIMPressionist.xml:559(para)
 msgid ""
 "<guilabel>Center of brush</guilabel>: Samples the color from the pixel in "
 "the center of the brush."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:579(term)
+#: src/filters/artistic/GIMPressionist.xml:567(term)
 msgid "Color Noise"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:581(para)
+#: src/filters/artistic/GIMPressionist.xml:569(para)
 msgid ""
 "This slider, and its input box, allow you to introduce noise in the stroke "
 "color, that will look less homogeneous."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:591(term)
+#: src/filters/artistic/GIMPressionist.xml:579(term)
 msgid "General tab"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:595(quote)
-msgid "General"
+#: src/filters/artistic/GIMPressionist.xml:582(title)
+msgid "<quote>General</quote> tab options"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:604(para)
+#: src/filters/artistic/GIMPressionist.xml:591(para)
 msgid ""
 "In this tab you can set what will be the background and the relief of brush "
 "strokes."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:610(term)
+#: src/filters/artistic/GIMPressionist.xml:597(term)
 msgid "Background"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:614(para)
+#: src/filters/artistic/GIMPressionist.xml:601(para)
 msgid ""
 "<guilabel>Keep Original</guilabel>: The original image will be used as a "
 "background."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:619(para)
+#: src/filters/artistic/GIMPressionist.xml:606(para)
 msgid ""
 "<guilabel>From Paper</guilabel>: Copy the texture of the selected paper as a "
 "background."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:624(para)
+#: src/filters/artistic/GIMPressionist.xml:611(para)
 msgid ""
 "<guilabel>Solid</guilabel>: By clicking on the color dwell you can select a "
 "solid colored background."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:629(para)
+#: src/filters/artistic/GIMPressionist.xml:616(para)
 msgid ""
 "<guilabel>Transparent</guilabel>: Use a transparent background. Only the "
 "painted strokes will be visible. This option is available only if your image "
 "has an Alpha channel."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:639(term)
+#: src/filters/artistic/GIMPressionist.xml:626(term)
 msgid "Paint Edges"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:641(para)
+#: src/filters/artistic/GIMPressionist.xml:628(para)
 msgid ""
 "If it is disabled, a thin border will not be painted around the outside "
 "border of the image."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:648(term)
+#: src/filters/artistic/GIMPressionist.xml:635(term)
 msgid "Tileable"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:650(para)
+#: src/filters/artistic/GIMPressionist.xml:637(para)
 msgid ""
 "If checked, the resulting image will be seamlessly tileable. The right side "
 "will match the left side and the top will match the bottom. This is "
 "interesting if your image will be repeatedly used in a Web background."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:659(term)
+#: src/filters/artistic/GIMPressionist.xml:646(term)
 msgid "Drop Shadow"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:661(para)
+#: src/filters/artistic/GIMPressionist.xml:648(para)
 msgid "Add a shadow effect to each brush stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:667(term)
+#: src/filters/artistic/GIMPressionist.xml:654(term)
 msgid "Edge Darken"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:669(para)
+#: src/filters/artistic/GIMPressionist.xml:656(para)
 msgid ""
 "How much to darken the edges of each brush stroke. This increases paint "
 "relief or thickness."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:676(term)
+#: src/filters/artistic/GIMPressionist.xml:663(term)
 msgid "Shadow Darken"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:678(para)
+#: src/filters/artistic/GIMPressionist.xml:665(para)
 msgid "How much to darken the brush shadow."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:682(term)
+#: src/filters/artistic/GIMPressionist.xml:669(term)
 msgid "Shadow Depth"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:684(para)
+#: src/filters/artistic/GIMPressionist.xml:671(para)
 msgid "How far apart from the object the drop shadow should be."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:690(term)
+#: src/filters/artistic/GIMPressionist.xml:677(term)
 msgid "Shadow Blur"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:692(para)
+#: src/filters/artistic/GIMPressionist.xml:679(para)
 msgid "How much to blur the drop shadow."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:696(term)
+#: src/filters/artistic/GIMPressionist.xml:683(term)
 msgid "Deviation Threshold"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist.xml:698(para)
+#: src/filters/artistic/GIMPressionist.xml:685(para)
 msgid "A bail-out value for adaptive selections of brush size."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/artistic/GIMPressionist-sizemap.xml:47(None)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:42(None)
 msgid ""
 "@@image: 'images/filters/options-artistic-gimpressionist-sizemap.png'; "
 "md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:13(phrase)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:13(title)
 msgid "GIMPressionist - Size Map Editor"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:27(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:26(para)
 msgid ""
 "The Size-map editor is an annexe of the <link linkend=\"plug-in-"
 "gimpressionist\">GIMPressionist</link> filter. You can get to it by clicking "
-"on the <guibutton>Edit</guibutton> button in the \"Size\" tab. With this "
-"editor, you can set the size that brush strokes given by filter will have."
+"on the <guibutton>Edit</guibutton> button in the <quote>Size</quote> tab. "
+"With this editor, you can set the size that brush strokes given by filter "
+"will have."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:42(quote)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:38(title)
 msgid "Size-map editor options"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:52(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:47(para)
 msgid ""
 "You can place one or several vectors. You can set their strength. They will "
 "act on the corresponding area of the image."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:57(term)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:52(term)
 msgid "Smvectors"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:59(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:54(para)
 msgid ""
 "In this window you can place your vectors. By clicking on the "
 "<guibutton>Add</guibutton> button, you add a vector at the center of the "
-"window, whereas clicking with the mouse <emphasis>Middle Button</emphasis> "
-"puts it where you click. Vectors are red when selected, and gray when they "
-"are not, with a white point at tip."
+"window, whereas clicking with the mouse <mousebutton>Middle&nbsp;Button</"
+"mousebutton> puts it where you click. Vectors are red when selected, and "
+"gray when they are not, with a white point at tip."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:67(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:62(para)
 #: src/filters/artistic/GIMPressionist-orientmap.xml:72(para)
 msgid ""
-"Clicking with the mouse <emphasis>Left Button</emphasis> displaces the "
-"selected vector to the clicked point."
+"Clicking with the mouse <mousebutton>Left&nbsp;Button</mousebutton> "
+"displaces the selected vector to the clicked point."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:71(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:67(para)
 msgid ""
-"Clicking on the mouse <emphasis>Right Button</emphasis>, has no evident "
-"action."
+"Clicking on the mouse <mousebutton>Right&nbsp;Button</mousebutton>, has no "
+"evident action."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:75(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:72(para)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:86(para)
 msgid ""
-"Clicking on <guibutton>&lt;&lt;</guibutton> et <guibutton>&gt;&gt;</"
+"Clicking on <guibutton>&lt;&lt;</guibutton> and <guibutton>&gt;&gt;</"
 "guibutton> buttons displaces focus from a vector to another."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:80(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:77(para)
 msgid ""
 "The <guibutton>Kill</guibutton> button allows you to delete the selected "
 "vector."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:85(para)
-#: src/filters/artistic/GIMPressionist-orientmap.xml:99(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:82(para)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:100(para)
 msgid ""
 "With the scroll bar on the right of the Vectors panel, you can set the image "
 "brightness. This can be very useful if the image is very dark/bright and you "
 "can't see vectors well."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:96(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:93(para)
 msgid ""
 "This Preview gives you an idea of the action of the different vectors. The "
 "size of squares represent the size of the brushes and their strength."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:106(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:101(term)
+msgid "Size"
+msgstr ""
+
+#: src/filters/artistic/GIMPressionist-sizemap.xml:103(para)
 msgid "Change the size of the brush strokes in the selected vector domain."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:113(term)
-#: src/filters/artistic/GIMPressionist-orientmap.xml:169(term)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:110(term)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:171(term)
 msgid "Strength"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:115(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:112(para)
 msgid ""
 "This slider acts on the influence domain of the selected vector. This "
 "influence lowers with distance."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:122(term)
-#: src/filters/artistic/GIMPressionist-orientmap.xml:179(term)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:119(term)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:181(term)
 msgid "Strength Exp."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:124(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:121(para)
 msgid "Change the exponent of the stroke."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:128(term)
-#: src/filters/artistic/GIMPressionist-orientmap.xml:128(term)
-#: src/filters/artistic/GIMPressionist-orientmap.xml:131(primary)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:125(term)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:129(term)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:132(primary)
 msgid "Voronoi"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-sizemap.xml:130(para)
+#: src/filters/artistic/GIMPressionist-sizemap.xml:127(para)
 msgid ""
 "See <link linkend=\"gimpressionist-orient-map-editor\"> Orientation Map "
 "Editor</link> for an explanation."
@@ -1801,7 +1812,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/artistic/GIMPressionist-orientmap.xml:144(None)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:145(None)
 msgid ""
 "@@image: 'images/filters/examples/voronoi.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -1843,46 +1854,40 @@ msgstr ""
 #: src/filters/artistic/GIMPressionist-orientmap.xml:64(para)
 msgid ""
 "By clicking on the <guibutton>Add</guibutton> button, you add a vector at "
-"center of the window, whereas clicking with the mouse <emphasis>Middle "
-"Button</emphasis> puts it where you click."
+"center of the window, whereas clicking with the mouse "
+"<mousebutton>Middle&nbsp;Button</mousebutton> puts it where you click."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:78(para)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:79(para)
 msgid ""
-"When clicking with the mouse <emphasis>Right Button</emphasis>, the selected "
-"vector points to where you have clicked."
+"When clicking with the mouse <mousebutton>Right&nbsp;Button</mousebutton>, "
+"the selected vector points to where you have clicked."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:85(para)
-msgid ""
-"Clicking on <guibutton>&lt;&lt;</guibutton> and <guibutton>&gt;&gt;</"
-"guibutton> buttons displaces focus from a vector to another."
-msgstr ""
-
-#: src/filters/artistic/GIMPressionist-orientmap.xml:92(para)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:93(para)
 msgid ""
 "The <guilabel>Delete</guilabel> button allows you to delete the selected "
 "vector."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:110(para)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:111(para)
 msgid ""
 "This Preview gives you an idea of the action of the various vectors. The "
 "slider on the right border lets you change the luminosity of this preview."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:118(term)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:119(term)
 msgid "Type"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:120(para)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:121(para)
 msgid ""
 "You have there some types to arrange the brush strokes within the selected "
 "vector domain. Describing them is difficult, but you can see the result in "
 "the Preview."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:133(para)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:134(para)
 msgid ""
 "A Voronoi's diagram consists in partitioning a plane with n master points "
 "into n polygons where each polygon has only one of these n master points and "
@@ -1893,31 +1898,31 @@ msgid ""
 "influences this point."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:153(term)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:154(term)
 msgid "Angle"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:155(para)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:156(para)
 msgid ""
-"<guilabel>Angle</guilabel>: Direction of the selected vector. This slider "
-"has the same action as right-clicking (see above)."
+"Direction of the selected vector. This slider has the same action as right-"
+"clicking (see above)."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:161(term)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:163(term)
 msgid "Angle Offset"
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:163(para)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:165(para)
 msgid "This slider allows you to change the angle of ALL vectors."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:171(para)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:173(para)
 msgid ""
 "This slider acts on the influence domain of the selected vector. This "
 "influence lowers with distance. Strength is showed with the vector length."
 msgstr ""
 
-#: src/filters/artistic/GIMPressionist-orientmap.xml:181(para)
+#: src/filters/artistic/GIMPressionist-orientmap.xml:183(para)
 msgid ""
 "This slider acts on the length of ALL vectors, and so changes the strength "
 "of all brush strokes."
@@ -2158,6 +2163,7 @@ msgid "Apply Canvas"
 msgstr ""
 
 #: src/filters/artistic/applycanvas.xml:18(tertiary)
+#: src/filters/artistic/applycanvas.xml:25(primary)
 msgid "Canvas effect"
 msgstr ""
 
@@ -2169,10 +2175,6 @@ msgstr ""
 msgid "effect"
 msgstr ""
 
-#: src/filters/artistic/applycanvas.xml:25(primary)
-msgid "Canvas effekt"
-msgstr ""
-
 #: src/filters/artistic/applycanvas.xml:31(title)
 msgid "Example for the <quote>Apply Canvas</quote> filter"
 msgstr ""
diff --git a/po/zh_CN/filters/blur.po b/po/zh_CN/filters/blur.po
index 44f39fa..ff13be4 100644
--- a/po/zh_CN/filters/blur.po
+++ b/po/zh_CN/filters/blur.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:40+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/filters/combine.po b/po/zh_CN/filters/combine.po
index 7878218..5053f4b 100644
--- a/po/zh_CN/filters/combine.po
+++ b/po/zh_CN/filters/combine.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:40+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/filters/decor.po b/po/zh_CN/filters/decor.po
index fd964ec..9793768 100644
--- a/po/zh_CN/filters/decor.po
+++ b/po/zh_CN/filters/decor.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:41+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -50,7 +50,7 @@ msgstr ""
 #: src/filters/decor/introduction.xml:24(primary)
 #: src/filters/decor/fuzzyborder.xml:23(primary)
 #: src/filters/decor/coffee.xml:23(primary)
-#: src/filters/decor/carve-it.xml:24(primary)
+#: src/filters/decor/carve-it.xml:16(primary)
 #: src/filters/decor/addborder.xml:25(primary)
 #: src/filters/decor/add-bevel.xml:25(primary)
 msgid "Filters"
@@ -63,7 +63,7 @@ msgstr ""
 #: src/filters/decor/introduction.xml:29(primary)
 #: src/filters/decor/fuzzyborder.xml:24(secondary)
 #: src/filters/decor/coffee.xml:24(secondary)
-#: src/filters/decor/carve-it.xml:25(secondary)
+#: src/filters/decor/carve-it.xml:17(secondary)
 msgid "Decor"
 msgstr ""
 
@@ -72,7 +72,7 @@ msgstr ""
 #: src/filters/decor/old-photo.xml:32(phrase)
 #: src/filters/decor/fuzzyborder.xml:32(phrase)
 #: src/filters/decor/coffee.xml:32(phrase)
-#: src/filters/decor/carve-it.xml:33(phrase)
+#: src/filters/decor/carve-it.xml:25(title)
 #: src/filters/decor/addborder.xml:33(phrase)
 #: src/filters/decor/add-bevel.xml:33(phrase)
 msgid "Overview"
@@ -83,7 +83,6 @@ msgstr ""
 #: src/filters/decor/old-photo.xml:36(phrase)
 #: src/filters/decor/fuzzyborder.xml:36(phrase)
 #: src/filters/decor/coffee.xml:36(phrase)
-#: src/filters/decor/carve-it.xml:37(phrase)
 #: src/filters/decor/addborder.xml:37(phrase)
 #: src/filters/decor/add-bevel.xml:37(phrase)
 msgid "Example for the <placeholder-1/> filter"
@@ -94,7 +93,7 @@ msgstr ""
 #: src/filters/decor/old-photo.xml:45(para)
 #: src/filters/decor/fuzzyborder.xml:45(para)
 #: src/filters/decor/coffee.xml:45(para)
-#: src/filters/decor/carve-it.xml:46(para)
+#: src/filters/decor/carve-it.xml:34(para)
 #: src/filters/decor/addborder.xml:46(para)
 #: src/filters/decor/add-bevel.xml:75(para)
 msgid "Original image"
@@ -131,7 +130,6 @@ msgstr ""
 #: src/filters/decor/old-photo.xml:65(phrase)
 #: src/filters/decor/fuzzyborder.xml:65(phrase)
 #: src/filters/decor/coffee.xml:70(phrase)
-#: src/filters/decor/carve-it.xml:68(phrase)
 #: src/filters/decor/addborder.xml:70(phrase)
 #: src/filters/decor/add-bevel.xml:98(phrase)
 msgid "Activate the filter"
@@ -149,7 +147,7 @@ msgstr ""
 #: src/filters/decor/old-photo.xml:74(phrase)
 #: src/filters/decor/fuzzyborder.xml:74(phrase)
 #: src/filters/decor/coffee.xml:79(phrase)
-#: src/filters/decor/carve-it.xml:77(phrase)
+#: src/filters/decor/carve-it.xml:76(title)
 #: src/filters/decor/addborder.xml:79(phrase)
 #: src/filters/decor/add-bevel.xml:107(phrase)
 msgid "Options"
@@ -160,7 +158,6 @@ msgstr ""
 #: src/filters/decor/old-photo.xml:78(phrase)
 #: src/filters/decor/fuzzyborder.xml:78(phrase)
 #: src/filters/decor/coffee.xml:83(phrase)
-#: src/filters/decor/carve-it.xml:81(phrase)
 #: src/filters/decor/addborder.xml:83(phrase)
 #: src/filters/decor/add-bevel.xml:111(phrase)
 msgid "<placeholder-1/> options"
@@ -885,7 +882,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/decor/carve-it.xml:43(None)
+#: src/filters/decor/carve-it.xml:31(None)
 msgid ""
 "@@image: 'images/filters/examples/taj_grayscale.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -893,7 +890,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/decor/carve-it.xml:51(None)
+#: src/filters/decor/carve-it.xml:40(None)
 msgid ""
 "@@image: 'images/filters/examples/decor-taj-carve-it.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -901,7 +898,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/decor/carve-it.xml:85(None)
+#: src/filters/decor/carve-it.xml:82(None)
 msgid ""
 "@@image: 'images/filters/options-decor-carve-it.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -909,7 +906,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/decor/carve-it.xml:114(None)
+#: src/filters/decor/carve-it.xml:110(None)
 msgid ""
 "@@image: 'images/filters/examples/carve-it-mask.jpg'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -917,7 +914,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/decor/carve-it.xml:122(None)
+#: src/filters/decor/carve-it.xml:119(None)
 msgid ""
 "@@image: 'images/filters/examples/carve-it-invmask.jpg'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -925,7 +922,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/decor/carve-it.xml:146(None)
+#: src/filters/decor/carve-it.xml:147(None)
 msgid ""
 "@@image: 'images/filters/examples/carve-it-normal.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -933,7 +930,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/decor/carve-it.xml:154(None)
+#: src/filters/decor/carve-it.xml:156(None)
 msgid ""
 "@@image: 'images/filters/examples/carve-it-stencil.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -941,101 +938,133 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/decor/carve-it.xml:162(None)
+#: src/filters/decor/carve-it.xml:165(None)
 msgid ""
 "@@image: 'images/filters/examples/carve-it-invers.png'; md5=THIS FILE "
 "DOESN'T EXIST"
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:21(phrase)
-#: src/filters/decor/carve-it.xml:26(tertiary)
-#: src/filters/decor/carve-it.xml:29(primary)
-#: src/filters/decor/carve-it.xml:38(quote)
-#: src/filters/decor/carve-it.xml:81(quote)
+#: src/filters/decor/carve-it.xml:13(title)
+#: src/filters/decor/carve-it.xml:18(tertiary)
+#: src/filters/decor/carve-it.xml:21(primary)
 msgid "Stencil Carve"
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:54(para)
+#: src/filters/decor/carve-it.xml:27(title)
+msgid "Example for the <quote>Stencil Carve</quote> filter"
+msgstr ""
+
+#: src/filters/decor/carve-it.xml:43(para)
 msgid "<quote>Stencil Carve</quote> applied"
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:58(para)
+#: src/filters/decor/carve-it.xml:47(para)
 msgid ""
-"This filter works on grayscale images containing a single layer. The layer "
-"is used as selection mask and will work as stencil for the carving effect. "
-"The image to be carved (the target image) must be an RGB color or grayscale "
-"image, also with a single layer. This image should have the same size as the "
-"source image."
+"This filter works with two images, source and target. The source image must "
+"be a grayscale image containing a single layer and no Alpha channel. This "
+"layer is used as selection mask and will work as stencil for the carving "
+"effect. The image to be carved (the target image) can be an RGB color or "
+"grayscale image, also with a single layer. This target image must have the "
+"same size as the source image."
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:70(para)
+#: src/filters/decor/carve-it.xml:58(title)
+msgid "Activating the filter"
+msgstr ""
+
+#: src/filters/decor/carve-it.xml:59(para)
 msgid ""
 "This filter is found in the image window menu under "
 "<menuchoice><guimenu>Filters</guimenu><guisubmenu>Decor</"
 "guisubmenu><guimenuitem>Stencil Carve</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:91(term)
+#: src/filters/decor/carve-it.xml:68(para)
+msgid ""
+"If this command remains grayed out although the image is grayscale, check "
+"for an Alpha channel and delete it."
+msgstr ""
+
+#: src/filters/decor/carve-it.xml:78(title)
+msgid "<quote>Stencil Carve</quote> options"
+msgstr ""
+
+#: src/filters/decor/carve-it.xml:88(term)
 msgid "Image to carve"
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:93(para)
+#: src/filters/decor/carve-it.xml:90(para)
 msgid ""
 "Here you may select the target image, i.e. the image the carving effect is "
 "applied to. The drop-down list will show you a list of opened images which "
 "may be carved."
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:101(term)
-#: src/filters/decor/carve-it.xml:141(quote)
+#: src/filters/decor/carve-it.xml:98(term)
 msgid "Carve white areas"
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:103(para)
+#: src/filters/decor/carve-it.xml:100(para)
 msgid ""
 "If checked (default), the source image is used as stencil as described "
 "above. If unchecked, the <emphasis>inverted</emphasis> source image is used "
 "as stencil, e.g.:"
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:110(phrase)
+#: src/filters/decor/carve-it.xml:106(title)
 msgid "Engraving Masks"
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:117(para)
+#: src/filters/decor/carve-it.xml:113(para)
 msgid "Normal mask"
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:125(para)
+#: src/filters/decor/carve-it.xml:122(para)
 msgid "Inverted mask"
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:129(para)
+#: src/filters/decor/carve-it.xml:126(para)
 msgid ""
-"In the example below, the target is a plain light yellow image. Note that, "
-"when <guilabel>Carve white areas</guilabel> is enabled (left image), the "
-"rectangular area is not carved, since it corresponds to a black area of the "
-"stencil. If this option is disabled (right image), the elliptical area, "
-"corresponding to the black area of the <emphasis>inverted</emphasis> "
-"stencil, is unchanged."
+"In the example below, the source is a grayscale image. The target is an "
+"image with a wood pattern."
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:140(phrase)
-msgid "Example for <placeholder-1/>"
+#: src/filters/decor/carve-it.xml:130(para)
+msgid ""
+"On the left, <guilabel>Carve white areas</guilabel> is enabled. The pixels "
+"of the target image corresponding to white pixels in the stencil (around the "
+"text) have been carved. The result is an embossed text."
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:149(para)
+#: src/filters/decor/carve-it.xml:136(para)
+msgid ""
+"On the right, <guilabel>Carve white areas</guilabel> is disabled. The pixels "
+"of the target image corresponding to the black pixels in the stencil (the "
+"text) have been carved. The result is a hollow text."
+msgstr ""
+
+#: src/filters/decor/carve-it.xml:143(title)
+msgid "Example for <quote>Carve white areas</quote>"
+msgstr ""
+
+#: src/filters/decor/carve-it.xml:150(para)
 msgid "White areas carved"
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:157(para)
+#: src/filters/decor/carve-it.xml:159(para)
 msgid "Stencil"
 msgstr ""
 
-#: src/filters/decor/carve-it.xml:165(para)
+#: src/filters/decor/carve-it.xml:168(para)
 msgid "Black areas carved"
 msgstr ""
 
+#: src/filters/decor/carve-it.xml:172(para)
+msgid ""
+"Information about the many layers created by this filter can be found in "
+"<xref linkend=\"bibliography-books-grokking\"/>."
+msgstr ""
+
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: src/filters/decor/addborder.xml:51(None)
diff --git a/po/zh_CN/filters/distort.po b/po/zh_CN/filters/distort.po
index 7d6cdd1..02cb800 100644
--- a/po/zh_CN/filters/distort.po
+++ b/po/zh_CN/filters/distort.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:41+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -1493,7 +1493,7 @@ msgstr ""
 #: src/filters/distort/newsprint.xml:47(para)
 msgid ""
 "This filter halftones the image using a clustered-dot dither. Halftoning is "
-"the process of rendering an image with multiple levels of grey or colour (i."
+"the process of rendering an image with multiple levels of grey or color (i."
 "e. a continuous tone image) on a device with fewer tones; often a bi-level "
 "device such as a printer or typesetter."
 msgstr ""
@@ -1620,9 +1620,9 @@ msgid ""
 "<guilabel>Separate To RGB, CMYK, Intensity</guilabel>: Select which "
 "colorspace you wish to operate in. In <emphasis>RGB</emphasis> mode, no "
 "colorspace conversion is performed. In <emphasis>CMYK</emphasis>, the image "
-"is first internally converted to CMYK, then each colour channel is "
-"separately halftoned, before finally being recombined back to an RGB image. "
-"In <emphasis>Intensity</emphasis> mode, the image is internally converted to "
+"is first internally converted to CMYK, then each color channel is separately "
+"halftoned, before finally being recombined back to an RGB image. In "
+"<emphasis>Intensity</emphasis> mode, the image is internally converted to "
 "grayscale, halftoned, then the result used as the alpha channel for the "
 "input image. This is good for special effects, but requires a little "
 "experimentation to achieve best results. Hint: try CMYK if you don't know "
@@ -1679,12 +1679,12 @@ msgstr ""
 
 #: src/filters/distort/newsprint.xml:235(para)
 msgid ""
-"Proper halftoning does not need antialiasing: the aim is to reduce the "
-"colour depth after all! However, since this plugin is mainly for special "
-"effects, the results are displayed on screen rather than by a black/white "
-"printer. So it is often useful to apply a little anti-aliasing to simulate "
-"ink smearing on paper. If you do want to print the resulting image then set "
-"the antialising to 1 (ie, off)."
+"Proper halftoning does not need antialiasing: the aim is to reduce the color "
+"depth after all! However, since this plugin is mainly for special effects, "
+"the results are displayed on screen rather than by a black/white printer. So "
+"it is often useful to apply a little anti-aliasing to simulate ink smearing "
+"on paper. If you do want to print the resulting image then set the "
+"antialising to 1 (ie, off)."
 msgstr ""
 
 #: src/filters/distort/newsprint.xml:246(term)
diff --git a/po/zh_CN/filters/edge-detect.po b/po/zh_CN/filters/edge-detect.po
index 5884ed0..f1c9008 100644
--- a/po/zh_CN/filters/edge-detect.po
+++ b/po/zh_CN/filters/edge-detect.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:41+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/filters/enhance.po b/po/zh_CN/filters/enhance.po
index b68c106..44bac01 100644
--- a/po/zh_CN/filters/enhance.po
+++ b/po/zh_CN/filters/enhance.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:42+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -155,7 +155,7 @@ msgstr ""
 #: src/filters/enhance/NL_filter.xml:66(title)
 #: src/filters/enhance/destripe.xml:40(title)
 #: src/filters/enhance/despeckle.xml:35(title)
-#: src/filters/enhance/deinterlace.xml:49(title)
+#: src/filters/enhance/deinterlace.xml:48(title)
 msgid "Activating the filter"
 msgstr ""
 
@@ -172,7 +172,7 @@ msgstr ""
 #: src/filters/enhance/NL_filter.xml:82(title)
 #: src/filters/enhance/destripe.xml:52(title)
 #: src/filters/enhance/despeckle.xml:49(title)
-#: src/filters/enhance/deinterlace.xml:63(title)
+#: src/filters/enhance/deinterlace.xml:60(title)
 msgid "Options"
 msgstr ""
 
@@ -186,7 +186,7 @@ msgstr ""
 #: src/filters/enhance/NL_filter.xml:94(term)
 #: src/filters/enhance/destripe.xml:67(term)
 #: src/filters/enhance/despeckle.xml:64(term)
-#: src/filters/enhance/deinterlace.xml:78(term)
+#: src/filters/enhance/deinterlace.xml:74(term)
 msgid "Preview"
 msgstr ""
 
@@ -849,7 +849,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/enhance/deinterlace.xml:72(None)
+#: src/filters/enhance/deinterlace.xml:68(None)
 msgid ""
 "@@image: 'images/filters/options-enhance-deinterlace.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -857,7 +857,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/enhance/deinterlace.xml:108(None)
+#: src/filters/enhance/deinterlace.xml:101(None)
 msgid ""
 "@@image: 'images/filters/examples/interlaced.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -865,7 +865,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/enhance/deinterlace.xml:120(None)
+#: src/filters/enhance/deinterlace.xml:114(None)
 msgid ""
 "@@image: 'images/filters/examples/deinterlaced-1.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -873,19 +873,19 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/enhance/deinterlace.xml:132(None)
+#: src/filters/enhance/deinterlace.xml:128(None)
 msgid ""
 "@@image: 'images/filters/examples/deinterlaced-2.png'; md5=THIS FILE DOESN'T "
 "EXIST"
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:11(title)
+#: src/filters/enhance/deinterlace.xml:12(title)
 #: src/filters/enhance/deinterlace.xml:17(tertiary)
 #: src/filters/enhance/deinterlace.xml:20(primary)
 msgid "Deinterlace"
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:27(para)
+#: src/filters/enhance/deinterlace.xml:25(para)
 msgid ""
 "Images captured by videocards, especially when fast movement is recorded, "
 "may look blurred and stripped, with split objects. This is due to how "
@@ -896,7 +896,7 @@ msgid ""
 "between the two images, objects will appear split, shifted, stripped."
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:37(para)
+#: src/filters/enhance/deinterlace.xml:35(para)
 msgid ""
 "The Deinterlace filter keeps only one of both images and replaces missing "
 "lines by a gradient between previous and following lines. The resulting "
@@ -904,64 +904,64 @@ msgid ""
 "enhance filters"
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:43(para)
+#: src/filters/enhance/deinterlace.xml:41(para)
 msgid ""
-"You can find interlaced images at <ulink url=\"http://en.wikipedia.org/wiki/";
-"Deinterlace\">Wikipedia</ulink>."
+"You can find interlaced images at <xref linkend=\"bibliography-online-wkpd-"
+"deinterlace\"/>."
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:52(para)
+#: src/filters/enhance/deinterlace.xml:49(para)
 msgid ""
 "You can find this filter through <menuchoice><guimenu>Filters</"
 "guimenu><guisubmenu>Enhance</guisubmenu><guimenuitem>Deinterlace</"
 "guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:67(title)
+#: src/filters/enhance/deinterlace.xml:62(title)
 msgid "Deinterlace filter options"
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:80(para)
+#: src/filters/enhance/deinterlace.xml:76(para)
 msgid ""
 "When <guilabel>Do preview</guilabel> is checked, parameter setting results "
 "are interactively displayed in preview."
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:87(term)
+#: src/filters/enhance/deinterlace.xml:83(term)
 msgid "Mode"
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:89(para)
+#: src/filters/enhance/deinterlace.xml:85(para)
 msgid ""
 "<guilabel>Keep odd lines</guilabel> and <guilabel>Keep even lines</"
 "guilabel>: One of them may render a better result. You must try both."
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:99(title)
+#: src/filters/enhance/deinterlace.xml:95(title)
 msgid "Example"
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:103(title)
+#: src/filters/enhance/deinterlace.xml:97(title)
 msgid "Simple applying example for the Deinterlace filter"
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:111(para)
+#: src/filters/enhance/deinterlace.xml:104(para)
 msgid ""
-"Top : even lines pixels are shifted by one pixel to the right. Bottom : one "
+"Top: even lines pixels are shifted by one pixel to the right. Bottom: one "
 "line is missing. These images are zoomed to show pixels."
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:123(para)
+#: src/filters/enhance/deinterlace.xml:117(para)
 msgid ""
-"<quote>Keep even fields checked</quote>. Top : odd lines have been shifted "
-"to the right, to align themselves with the even lines. Bottom: the empty "
-"line has been filled with red."
+"<quote>Keep even fields checked</quote>. Top: odd lines have been shifted to "
+"the right, to align themselves with the even lines. Bottom: the empty line "
+"has been filled with red."
 msgstr ""
 
-#: src/filters/enhance/deinterlace.xml:135(para)
+#: src/filters/enhance/deinterlace.xml:131(para)
 msgid ""
-"<quote>Keep odd fields</quote> checked. Top : even lines have been shifted "
-"to the left, to align themselves with the odd lines. Bottom: the empty line "
+"<quote>Keep odd fields</quote> checked. Top: even lines have been shifted to "
+"the left, to align themselves with the odd lines. Bottom: the empty line "
 "persists, but joins up and down through a gradient."
 msgstr ""
 
diff --git a/po/zh_CN/filters/generic.po b/po/zh_CN/filters/generic.po
index 049764f..ab87cfa 100644
--- a/po/zh_CN/filters/generic.po
+++ b/po/zh_CN/filters/generic.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:42+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/filters/light_effects.po b/po/zh_CN/filters/light_effects.po
index 265e0fc..a837d94 100644
--- a/po/zh_CN/filters/light_effects.po
+++ b/po/zh_CN/filters/light_effects.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:42+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -58,7 +58,7 @@ msgstr ""
 
 #: src/filters/light_effects/xach-effect.xml:22(primary)
 #: src/filters/light_effects/sparkle.xml:25(primary)
-#: src/filters/light_effects/perspective-shadow.xml:22(primary)
+#: src/filters/light_effects/perspective-shadow.xml:13(primary)
 #: src/filters/light_effects/nova.xml:26(primary)
 #: src/filters/light_effects/lighting.xml:17(primary)
 #: src/filters/light_effects/introduction.xml:23(primary)
@@ -74,7 +74,7 @@ msgstr ""
 
 #: src/filters/light_effects/xach-effect.xml:23(secondary)
 #: src/filters/light_effects/sparkle.xml:26(secondary)
-#: src/filters/light_effects/perspective-shadow.xml:23(secondary)
+#: src/filters/light_effects/perspective-shadow.xml:14(secondary)
 #: src/filters/light_effects/nova.xml:27(secondary)
 #: src/filters/light_effects/lighting.xml:18(secondary)
 #: src/filters/light_effects/introduction.xml:24(secondary)
@@ -88,7 +88,7 @@ msgstr ""
 
 #: src/filters/light_effects/xach-effect.xml:31(phrase)
 #: src/filters/light_effects/sparkle.xml:34(phrase)
-#: src/filters/light_effects/perspective-shadow.xml:31(phrase)
+#: src/filters/light_effects/perspective-shadow.xml:22(title)
 #: src/filters/light_effects/nova.xml:35(phrase)
 #: src/filters/light_effects/lighting.xml:26(title)
 #: src/filters/light_effects/glasstile.xml:36(phrase)
@@ -100,14 +100,13 @@ msgid "Overview"
 msgstr ""
 
 #: src/filters/light_effects/xach-effect.xml:35(phrase)
-#: src/filters/light_effects/perspective-shadow.xml:35(phrase)
 #: src/filters/light_effects/drop-shadow.xml:36(phrase)
 msgid "Example for the <placeholder-1/> filter"
 msgstr ""
 
 #: src/filters/light_effects/xach-effect.xml:44(para)
 #: src/filters/light_effects/sparkle.xml:45(para)
-#: src/filters/light_effects/perspective-shadow.xml:44(para)
+#: src/filters/light_effects/perspective-shadow.xml:31(para)
 #: src/filters/light_effects/nova.xml:46(para)
 #: src/filters/light_effects/lighting.xml:35(para)
 #: src/filters/light_effects/glasstile.xml:49(para)
@@ -161,7 +160,7 @@ msgstr ""
 
 #: src/filters/light_effects/xach-effect.xml:99(phrase)
 #: src/filters/light_effects/sparkle.xml:66(phrase)
-#: src/filters/light_effects/perspective-shadow.xml:69(phrase)
+#: src/filters/light_effects/perspective-shadow.xml:57(title)
 #: src/filters/light_effects/nova.xml:66(phrase)
 #: src/filters/light_effects/lighting.xml:56(title)
 #: src/filters/light_effects/glasstile.xml:68(phrase)
@@ -179,7 +178,7 @@ msgid ""
 msgstr ""
 
 #: src/filters/light_effects/xach-effect.xml:108(phrase)
-#: src/filters/light_effects/perspective-shadow.xml:78(phrase)
+#: src/filters/light_effects/perspective-shadow.xml:69(title)
 #: src/filters/light_effects/lighting.xml:68(title)
 #: src/filters/light_effects/glasstile.xml:77(phrase)
 #: src/filters/light_effects/gflare.xml:70(title)
@@ -196,7 +195,6 @@ msgid ""
 msgstr ""
 
 #: src/filters/light_effects/xach-effect.xml:116(phrase)
-#: src/filters/light_effects/perspective-shadow.xml:82(phrase)
 #: src/filters/light_effects/lighting.xml:379(phrase)
 msgid "<placeholder-1/> options"
 msgstr ""
@@ -443,7 +441,7 @@ msgid ""
 msgstr ""
 
 #: src/filters/light_effects/sparkle.xml:163(term)
-#: src/filters/light_effects/perspective-shadow.xml:253(term)
+#: src/filters/light_effects/perspective-shadow.xml:242(term)
 #: src/filters/light_effects/drop-shadow.xml:153(term)
 msgid "Opacity"
 msgstr ""
@@ -517,7 +515,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/light_effects/perspective-shadow.xml:41(None)
+#: src/filters/light_effects/perspective-shadow.xml:28(None)
 msgid ""
 "@@image: 'images/filters/examples/perspective-shadow-orig.jpg'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -525,7 +523,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/light_effects/perspective-shadow.xml:49(None)
+#: src/filters/light_effects/perspective-shadow.xml:37(None)
 msgid ""
 "@@image: 'images/filters/examples/perspective-shadow-applied.jpg'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -533,7 +531,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/light_effects/perspective-shadow.xml:86(None)
+#: src/filters/light_effects/perspective-shadow.xml:75(None)
 msgid ""
 "@@image: 'images/filters/options-light-perspective-shadow.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -541,7 +539,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/light_effects/perspective-shadow.xml:109(None)
+#: src/filters/light_effects/perspective-shadow.xml:97(None)
 msgid ""
 "@@image: 'images/filters/examples/perspective-shadow-angle15.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -549,9 +547,9 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/light_effects/perspective-shadow.xml:117(None)
-#: src/filters/light_effects/perspective-shadow.xml:194(None)
-#: src/filters/light_effects/perspective-shadow.xml:225(None)
+#: src/filters/light_effects/perspective-shadow.xml:106(None)
+#: src/filters/light_effects/perspective-shadow.xml:181(None)
+#: src/filters/light_effects/perspective-shadow.xml:213(None)
 msgid ""
 "@@image: 'images/filters/examples/perspective-shadow-default.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -559,7 +557,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/light_effects/perspective-shadow.xml:125(None)
+#: src/filters/light_effects/perspective-shadow.xml:115(None)
 msgid ""
 "@@image: 'images/filters/examples/perspective-shadow-angle105.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -567,7 +565,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/light_effects/perspective-shadow.xml:155(None)
+#: src/filters/light_effects/perspective-shadow.xml:143(None)
 msgid ""
 "@@image: 'images/filters/examples/perspective-shadow-distance.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -575,7 +573,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/light_effects/perspective-shadow.xml:202(None)
+#: src/filters/light_effects/perspective-shadow.xml:190(None)
 msgid ""
 "@@image: 'images/filters/examples/perspective-shadow-length15.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -583,7 +581,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/light_effects/perspective-shadow.xml:233(None)
+#: src/filters/light_effects/perspective-shadow.xml:222(None)
 msgid ""
 "@@image: 'images/filters/examples/perspective-shadow-noblur.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -591,7 +589,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/light_effects/perspective-shadow.xml:295(None)
+#: src/filters/light_effects/perspective-shadow.xml:287(None)
 msgid ""
 "@@image: 'images/filters/examples/perspective-shadow-resize.png'; md5=THIS "
 "FILE DOESN'T EXIST"
@@ -599,50 +597,55 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/filters/light_effects/perspective-shadow.xml:303(None)
+#: src/filters/light_effects/perspective-shadow.xml:296(None)
 msgid ""
 "@@image: 'images/filters/examples/perspective-shadow-noresize.png'; md5=THIS "
 "FILE DOESN'T EXIST"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:19(phrase)
-#: src/filters/light_effects/perspective-shadow.xml:24(tertiary)
-#: src/filters/light_effects/perspective-shadow.xml:27(primary)
-#: src/filters/light_effects/perspective-shadow.xml:36(quote)
-#: src/filters/light_effects/perspective-shadow.xml:82(quote)
+#: src/filters/light_effects/perspective-shadow.xml:10(title)
+#: src/filters/light_effects/perspective-shadow.xml:15(tertiary)
+#: src/filters/light_effects/perspective-shadow.xml:18(primary)
 msgid "Perspective"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:52(para)
+#: src/filters/light_effects/perspective-shadow.xml:24(title)
+msgid "Example for the <quote>Perspective</quote> filter"
+msgstr ""
+
+#: src/filters/light_effects/perspective-shadow.xml:40(para)
 msgid "<quote>Perspective</quote> applied"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:56(para)
+#: src/filters/light_effects/perspective-shadow.xml:44(para)
 msgid ""
 "This filter adds a perspective shadow to the selected region or alpha-"
 "channel as a layer below the active layer. You may select color, length and "
 "direction of the shadow as well as the distance of the horizon."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:62(para)
+#: src/filters/light_effects/perspective-shadow.xml:50(para)
 msgid ""
 "If necessary, the filter may resize the image. But it will not add a "
 "background to make the shadow visible."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:71(para)
+#: src/filters/light_effects/perspective-shadow.xml:58(para)
 msgid ""
 "You can access this filter in the image window menu through "
 "<menuchoice><guimenu>Filters</guimenu><guisubmenu>Light and Shadow</"
 "guisubmenu><guimenuitem>Perspective</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:92(term)
-#: src/filters/light_effects/perspective-shadow.xml:105(quote)
+#: src/filters/light_effects/perspective-shadow.xml:71(title)
+msgid "<quote>Perspective</quote> options"
+msgstr ""
+
+#: src/filters/light_effects/perspective-shadow.xml:81(term)
 msgid "Angle"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:94(para)
+#: src/filters/light_effects/perspective-shadow.xml:83(para)
 msgid ""
 "The angle determines the direction of the shadow or the imaginary source of "
 "light, respectively. Values range from 0° to 180°, where 90° represents a "
@@ -652,30 +655,27 @@ msgid ""
 "slider's handle as source of light."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:105(phrase)
-#: src/filters/light_effects/perspective-shadow.xml:150(phrase)
-#: src/filters/light_effects/perspective-shadow.xml:190(phrase)
-#: src/filters/light_effects/perspective-shadow.xml:291(phrase)
-msgid "<placeholder-1/> example"
+#: src/filters/light_effects/perspective-shadow.xml:93(title)
+msgid "<quote>Angle</quote> example"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:112(para)
+#: src/filters/light_effects/perspective-shadow.xml:100(para)
 msgid "Angle 15°"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:120(para)
+#: src/filters/light_effects/perspective-shadow.xml:109(para)
 msgid "Angle 45° (default)"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:128(para)
+#: src/filters/light_effects/perspective-shadow.xml:118(para)
 msgid "Angle 105° (90° + 15°)"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:135(term)
+#: src/filters/light_effects/perspective-shadow.xml:125(term)
 msgid "Relative distance of horizon"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:137(para)
+#: src/filters/light_effects/perspective-shadow.xml:127(para)
 msgid ""
 "This option determines how far away the imaginary horizon is. The "
 "<guilabel>relative distance</guilabel> is the distance from the ground-line "
@@ -683,22 +683,22 @@ msgid ""
 "height of the selection or layer."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:143(para)
+#: src/filters/light_effects/perspective-shadow.xml:133(para)
 msgid ""
 "Value range is from 0.1 to 24.1, where 24.1 means (nearly) <quote>infinite</"
 "quote>. Note that the <guilabel>relative length of shadow</guilabel> must "
 "not exceed the distance of horizon."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:150(quote)
-msgid "Distance of horizon"
+#: src/filters/light_effects/perspective-shadow.xml:139(title)
+msgid "<quote>Distance of horizon</quote> example"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:158(para)
+#: src/filters/light_effects/perspective-shadow.xml:146(para)
 msgid "Angle = 45°. Distance = 2.4. Length = 1.8."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:164(para)
+#: src/filters/light_effects/perspective-shadow.xml:152(para)
 msgid ""
 "In the example above, the yellow area is the selection the filter is applied "
 "to. The blue line at the top represents the imaginary horizon. The angle "
@@ -707,11 +707,11 @@ msgid ""
 "the horizon, the length is 2.4 times the selection's height."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:175(term)
+#: src/filters/light_effects/perspective-shadow.xml:163(term)
 msgid "Relative length of shadow"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:177(para)
+#: src/filters/light_effects/perspective-shadow.xml:165(para)
 msgid ""
 "With this option you can set the length of shadow with respect to the height "
 "of the selection or layer. In the above example, the red line represents the "
@@ -719,62 +719,62 @@ msgid ""
 "selection."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:183(para)
+#: src/filters/light_effects/perspective-shadow.xml:171(para)
 msgid ""
 "Value range is from 0.1 to 24.1, although the length of shadow must not "
 "exceed the <guilabel>relative distance of horizon</guilabel> - you can't go "
 "beyond the horizon."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:190(quote)
-msgid "Length of Shadow"
+#: src/filters/light_effects/perspective-shadow.xml:177(title)
+msgid "<quote>Length of Shadow</quote> example"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:197(para)
+#: src/filters/light_effects/perspective-shadow.xml:184(para)
 msgid "Length = 1.0 (default)"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:205(para)
+#: src/filters/light_effects/perspective-shadow.xml:193(para)
 msgid "Length = 1.5"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:212(term)
+#: src/filters/light_effects/perspective-shadow.xml:200(term)
 #: src/filters/light_effects/drop-shadow.xml:121(term)
 msgid "Blur radius"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:214(para)
+#: src/filters/light_effects/perspective-shadow.xml:202(para)
 msgid ""
 "After creating the shadow, a <link linkend=\"plug-in-gauss\">Gaussian blur</"
 "link> with the specified radius is applied to the shadow layer, resulting in "
 "the realistic appearance of the shadow."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:221(phrase)
+#: src/filters/light_effects/perspective-shadow.xml:209(title)
 msgid "Blur example"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:228(para)
+#: src/filters/light_effects/perspective-shadow.xml:216(para)
 msgid "Blur radius = 3 (default)"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:236(para)
+#: src/filters/light_effects/perspective-shadow.xml:225(para)
 msgid "Without blur (blur radius = 0)"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:243(term)
+#: src/filters/light_effects/perspective-shadow.xml:232(term)
 #: src/filters/light_effects/nova.xml:124(term)
 #: src/filters/light_effects/drop-shadow.xml:133(term)
 msgid "Color"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:245(para)
+#: src/filters/light_effects/perspective-shadow.xml:234(para)
 msgid ""
 "Of course, the default color of the shadow is black. But a click on the "
 "button opens the the color selector, where you may select any other color."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:255(para)
+#: src/filters/light_effects/perspective-shadow.xml:244(para)
 msgid ""
 "The shadow's opacity is the opacity of the new layer containing the shadow "
 "(see <xref linkend=\"gimp-layer-properties\"/>). It defaults to 80%, but you "
@@ -783,11 +783,11 @@ msgid ""
 "the <link linkend=\"gimp-layer-dialog\">layers dialog</link>."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:265(term)
+#: src/filters/light_effects/perspective-shadow.xml:255(term)
 msgid "Interpolation"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:267(para)
+#: src/filters/light_effects/perspective-shadow.xml:257(para)
 msgid ""
 "This drop-down list lets you choose the method of <link linkend=\"glossary-"
 "interpolation\">interpolation</link> used when the shadow layer is "
@@ -797,27 +797,31 @@ msgid ""
 "<guilabel>Linear</guilabel> is a good choice."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:278(term)
-#: src/filters/light_effects/perspective-shadow.xml:291(quote)
-#: src/filters/light_effects/perspective-shadow.xml:298(para)
+#: src/filters/light_effects/perspective-shadow.xml:269(term)
+#: src/filters/light_effects/perspective-shadow.xml:282(quote)
+#: src/filters/light_effects/perspective-shadow.xml:290(para)
 #: src/filters/light_effects/drop-shadow.xml:164(term)
 msgid "Allow resizing"
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:280(para)
+#: src/filters/light_effects/perspective-shadow.xml:271(para)
 msgid ""
 "If enabled, the filter will resize the image if that is needed to make place "
 "for the shadow."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:284(para)
+#: src/filters/light_effects/perspective-shadow.xml:275(para)
 msgid ""
 "In the example below, the yellow area is the active selection, background is "
 "light blue. The white area has been added after resizing to make the shadow "
 "visible."
 msgstr ""
 
-#: src/filters/light_effects/perspective-shadow.xml:306(para)
+#: src/filters/light_effects/perspective-shadow.xml:282(phrase)
+msgid "<placeholder-1/> example"
+msgstr ""
+
+#: src/filters/light_effects/perspective-shadow.xml:299(para)
 msgid "Don't allow resizing"
 msgstr ""
 
@@ -917,8 +921,7 @@ msgstr ""
 
 #: src/filters/light_effects/nova.xml:156(para)
 msgid ""
-"Colours rays at random. (0-360) value seems to be a range in HSV color "
-"circle."
+"Color rays at random. (0-360) value seems to be a range in HSV color circle."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
diff --git a/po/zh_CN/filters/map.po b/po/zh_CN/filters/map.po
index df28855..50319f3 100644
--- a/po/zh_CN/filters/map.po
+++ b/po/zh_CN/filters/map.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:42+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/filters/noise.po b/po/zh_CN/filters/noise.po
index 267c086..ff6fb4a 100644
--- a/po/zh_CN/filters/noise.po
+++ b/po/zh_CN/filters/noise.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:43+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/filters/render.po b/po/zh_CN/filters/render.po
index ae8b5ac..a360caa 100644
--- a/po/zh_CN/filters/render.po
+++ b/po/zh_CN/filters/render.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:43+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/filters/web.po b/po/zh_CN/filters/web.po
index 56af751..9ce18cf 100644
--- a/po/zh_CN/filters/web.po
+++ b/po/zh_CN/filters/web.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:44+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/gimp.po b/po/zh_CN/gimp.po
index 0d6ecea..42f92ff 100644
--- a/po/zh_CN/gimp.po
+++ b/po/zh_CN/gimp.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:43+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-07-17 23:01+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
@@ -1074,7 +1074,8 @@ msgid ""
 msgstr ""
 "<acronym>GIMP</acronym> æ?¯è·¨å¹³å?°ç??å?¾å??å¤?ç??ç¨?åº?ã??<acronym>GIMP</acronym> æ?¯"
 "<acronym>GNU</acronym> å?¾å??å¤?ç??ç¨?åº?(GNU Image Manipulation Program)ç??缩å??ã??"
-"<acronym>GIMP</acronym> é??ç?¨äº?å¤?ç§?å?¾å??å¤?ç??ä»»å?¡ï¼?å??æ?¬ç?§ç??润饰ã??å?¾å??å??æ??å??å??建å?¾å??ã??"
+"<acronym>GIMP</acronym> é??ç?¨äº?å¤?ç§?å?¾å??å¤?ç??ä»»å?¡ï¼?å??æ?¬ç?§ç??润饰ã??å?¾å??å??æ??å??å??建"
+"å?¾å??ã??"
 
 #: src/introduction.xml:29(para)
 msgid ""
@@ -1082,8 +1083,9 @@ msgid ""
 "paint program, an expert quality photo retouching program, an online batch "
 "processing system, a mass production image renderer, an image format "
 "converter, etc."
-msgstr "<acronym>GIMP</acronym> æ??许å¤?å??è?½ï¼?å®?æ?¢å?¯ä»¥ä½?为ç®?å??ç??ç?»å?¾ç¨?åº?ï¼?ä¹?è?½ä½?为ä¸?家级"
-"ç??ç?§ç??å¤?ç??ç¨?åº?ï¼?æ??å?¨çº¿æ?¹å¤?ç??ç³»ç»?ã??æ?¹é??å?¾å??渲æ??å?¨ï¼?以å??å?¾å??æ ¼å¼?转æ?¢å·¥å?·ç­?ã??"
+msgstr ""
+"<acronym>GIMP</acronym> æ??许å¤?å??è?½ï¼?å®?æ?¢å?¯ä»¥ä½?为ç®?å??ç??ç?»å?¾ç¨?åº?ï¼?ä¹?è?½ä½?为ä¸?家"
+"级ç??ç?§ç??å¤?ç??ç¨?åº?ï¼?æ??å?¨çº¿æ?¹å¤?ç??ç³»ç»?ã??æ?¹é??å?¾å??渲æ??å?¨ï¼?以å??å?¾å??æ ¼å¼?转æ?¢å·¥å?·ç­?ã??"
 
 #: src/introduction.xml:35(para)
 msgid ""
@@ -1091,10 +1093,13 @@ msgid ""
 "augmented with plug-ins and extensions to do just about anything. The "
 "advanced scripting interface allows everything from the simplest task to the "
 "most complex image manipulation procedures to be easily scripted."
-msgstr "<acronym>GIMP</acronym> å?·æ??å?¯å»¶ä¼¸æ?§å??å?¯æ?©å±?æ?§ï¼?å®?è?½é??è¿?æ?©å±?æ??件 å®?æ??å??ç§?äº?æ??ã??"
-"å?¶é«?级è??æ?¬æ?¥å?£å??许ç?¨æ?·é??è¿?ç¼?å??ç®?å??ç??è??æ?¬å®?æ??ä»?æ??ç®?å??å?°æ??å¤?æ??ç??å??ç§?å?¾å??å¤?ç??è¿?ç¨?ã?? "
+msgstr ""
+"<acronym>GIMP</acronym> å?·æ??å?¯å»¶ä¼¸æ?§å??å?¯æ?©å±?æ?§ï¼?å®?è?½é??è¿?æ?©å±?æ??件 å®?æ??å??ç§?äº?"
+"æ??ã??å?¶é«?级è??æ?¬æ?¥å?£å??许ç?¨æ?·é??è¿?ç¼?å??ç®?å??ç??è??æ?¬å®?æ??ä»?æ??ç®?å??å?°æ??å¤?æ??ç??å??ç§?å?¾å??å¤?"
+"ç??è¿?ç¨?ã?? "
 
 #: src/introduction.xml:42(para)
+#, fuzzy
 msgid ""
 "One of The <acronym>GIMP</acronym>'s strengths is its free availability from "
 "many sources for many operating systems. Most <acronym>GNU</acronym>/"
@@ -1103,129 +1108,137 @@ msgid ""
 "available for other operating systems such as <productname>Microsoft "
 "Windows</productname> or Apple's <productname>Mac OS X</productname> "
 "(<application>Darwin</application>). The <acronym>GIMP</acronym> is a Free "
-"Software application covered by the General Public License ( <ulink url="
-"\"http://www.fsf.org/licensing/licenses/gpl.html\";><acronym>GPL</acronym> "
-"license</ulink>). The <acronym>GPL</acronym> provides users with the freedom "
-"to access and alter the source code that makes up computer programs."
-msgstr "<acronym>GIMP</acronym> ç??ä¼?å?¿å?¨äº?å?¶è?·å??æ?¥æº?ç??å¤?æ ·æ?§å??对大é??æ??ä½?ç³»ç»?ç??æ?¯æ??ã??许å¤?"
-" <acronym>GNU</acronym>/<application>Linux</application> å??è¡?ç??é?½å°? GIMP ä½?为å?¶ä¸­"
-"ç??ä¸?个æ ?å??ç»?件ã??å½?ç?¶ï¼?<acronym>GIMP</acronym> ä¹?æ?¯æ??å?¶å®?æ??ä½?ç³»ç»?å¦? <productname>Microsoft "
-"Windows</productname> æ?? Apple ç?? <productname>Mac OS X</productname> (<application>Darwin</application>)ã??GIMP æ?¯é?µå¾ª GNU é??ç?¨å?¬å?±è®¸å?¯è¯? (<ulink url="
-"\"http://www.fsf.org/licensing/licenses/gpl.html\";><acronym>GPL</acronym></ulink>)"
-" ç??è?ªç?±è½¯ä»¶ã??<acronym>GPL</acronym> 让使ç?¨è??享æ??è?·å??å??æ?´æ?¹ç?µè??ç¨?åº?æº?代ç ?ç??è?ªç?±ã??"
-
-#: src/introduction.xml:59(title)
+"Software application covered by the General Public License <xref linkend="
+"\"bibliography-online-gpl\"/>. The <acronym>GPL</acronym> provides users "
+"with the freedom to access and alter the source code that makes up computer "
+"programs."
+msgstr ""
+"<acronym>GIMP</acronym> ç??ä¼?å?¿å?¨äº?å?¶è?·å??æ?¥æº?ç??å¤?æ ·æ?§å??对大é??æ??ä½?ç³»ç»?ç??æ?¯æ??ã??"
+"许å¤? <acronym>GNU</acronym>/<application>Linux</application> å??è¡?ç??é?½å°? GIMP "
+"ä½?为å?¶ä¸­ç??ä¸?个æ ?å??ç»?件ã??å½?ç?¶ï¼?<acronym>GIMP</acronym> ä¹?æ?¯æ??å?¶å®?æ??ä½?ç³»ç»?å¦? "
+"<productname>Microsoft Windows</productname> æ?? Apple ç?? <productname>Mac OS "
+"X</productname> (<application>Darwin</application>)ã??GIMP æ?¯é?µå¾ª GNU é??ç?¨å?¬å?±"
+"许�� (<ulink url=\"http://www.fsf.org/licensing/licenses/gpl.html";
+"\"><acronym>GPL</acronym></ulink>) ç??è?ªç?±è½¯ä»¶ã??<acronym>GPL</acronym> 让使ç?¨"
+"è??享æ??è?·å??å??æ?´æ?¹ç?µè??ç¨?åº?æº?代ç ?ç??è?ªç?±ã??"
+
+#: src/introduction.xml:58(title)
 msgid "Authors"
 msgstr "ä½?è??"
 
-#: src/introduction.xml:60(para)
+#: src/introduction.xml:59(para)
 msgid ""
 "The first version of the <acronym>GIMP</acronym> was written by Peter Mattis "
 "and Spencer Kimball. Many other developers have contributed more recently, "
 "and thousands have provided support and testing. <acronym>GIMP</acronym> "
 "releases are currently being orchestrated by Sven Neumann and Mitch Natterer "
 "and the other members of the <acronym>GIMP</acronym>-Team."
-msgstr "<acronym>GIMP</acronym> æ?¯ç?± Peter Mattis å?? Spencer Kimball æ??å??建ç??ã??å¦?ä»?ï¼?"
-"æ??许许å¤?å¤?å¼?å??è??é?½ä¸ºå?¶å??è¿?è´¡ç?®ï¼?æ?´æ??æ??å??ä¸?ä¸?ç??ç?¨æ?·å¯¹å?¶è¿?è¡?æµ?è¯?ã??æ??交é??误æ?¥å??å??建议ã?? ç?®å??å??è¡?å·¥ä½?"
-"æ?¯ç?± Sven Neumann å?? Mitch Natterer 以å??å?¶ä»? <acronym>GIMP</acronym> å°?ç»?æ??å??è´?è´£ã??"
+msgstr ""
+"<acronym>GIMP</acronym> æ?¯ç?± Peter Mattis å?? Spencer Kimball æ??å??建ç??ã??å¦?ä»?ï¼?"
+"æ??许许å¤?å¤?å¼?å??è??é?½ä¸ºå?¶å??è¿?è´¡ç?®ï¼?æ?´æ??æ??å??ä¸?ä¸?ç??ç?¨æ?·å¯¹å?¶è¿?è¡?æµ?è¯?ã??æ??交é??误æ?¥å??"
+"å??建议ã?? ç?®å??å??è¡?å·¥ä½?æ?¯ç?± Sven Neumann å?? Mitch Natterer 以å??å?¶ä»? "
+"<acronym>GIMP</acronym> å°?ç»?æ??å??è´?è´£ã??"
 
-#: src/introduction.xml:72(title)
+#: src/introduction.xml:71(title)
 msgid "The GIMP Help system"
 msgstr "GIMP 帮�系�"
 
-#: src/introduction.xml:73(para)
+#: src/introduction.xml:72(para)
+#, fuzzy
 msgid ""
 "The <acronym>GIMP</acronym> Documentation Team and other users have provided "
 "you with the information necessary to understand how to use <acronym>GIMP</"
 "acronym>. The User Manual is an important part of this help. The current "
-"version is on the <ulink url=\"http://docs.gimp.org\";>web site</ulink> of "
-"the Documentation Team in HTML format. The HTML version is also available as "
-"context sensitive help (if you installed it) while using <acronym>GIMP</"
-"acronym> by pressing the <keycap>F1</keycap> key. Help on specific menu "
-"items can be accessed by pressing the <keycap>F1</keycap> key while the "
-"mouse pointer is focused on the menu item. Read on to begin your "
+"version is on the web site of the Documentation Team <xref linkend="
+"\"bibliography-online-gimp-docs\"/> in HTML format. The HTML version is also "
+"available as context sensitive help (if you installed it) while using "
+"<acronym>GIMP</acronym> by pressing the <keycap>F1</keycap> key. Help on "
+"specific menu items can be accessed by pressing the <keycap>F1</keycap> key "
+"while the mouse pointer is focused on the menu item. Read on to begin your "
 "<acronym>GIMP</acronym> journey."
 msgstr ""
-"<acronym>GIMP</acronym> æ??档项ç?®å??å?¶ä»?ç?¨æ?·ä¸ºæ?¨æ??ä¾?äº?使ç?¨ <acronym>GIMP</acronym> ç??"
-"å¿?须信æ?¯ã??ã??ç?¨æ?·æ??å??ã??æ­£æ?¯è¿?äº?帮å?©ç??é??è¦?ç»?æ??é?¨å??ï¼?å?¶å½?å??ç??æ?¬æ­£ä»¥ HTML å½¢å¼?æ??ä¾?å?¨æ??档项ç?®ç??"
-"<ulink url=\"http://docs.gimp.org\";>ç½?ç«?</ulink> ä¸?ã??å¦?æ??æ?¨å®?è£?äº?帮å?©ï¼?æ­¤ HTML ç??æ?¬ä¹?"
-"å°?å?¨æ?¨ä½¿ç?¨ <acronym>GIMP</acronym> æ?¶é??è¿?æ?? <keycap>F1</keycap> é?®è?·å¾?ä¸?ä¸?æ??ç?¸å?³å¸®å?©æ?¶"
-"æ?¾ç¤ºã??å½?é¼ æ ?æ??é??å°?ç?¦ç?¹æ??å??ç?¹å®?è??å??ç??æ?¶å??æ??ä¸? <keycap>F1</keycap> é?®ï¼?å?¯ä»¥å¾?å?°æ??å®?è??å??ç??帮å?©ã??"
-"é??读ä¸?å?»ï¼?让æ??们å¼?å§? <acronym>GIMP</acronym> ä¹?æ??ï¼?"
+"<acronym>GIMP</acronym> æ??档项ç?®å??å?¶ä»?ç?¨æ?·ä¸ºæ?¨æ??ä¾?äº?使ç?¨ <acronym>GIMP</"
+"acronym> ç??å¿?须信æ?¯ã??ã??ç?¨æ?·æ??å??ã??æ­£æ?¯è¿?äº?帮å?©ç??é??è¦?ç»?æ??é?¨å??ï¼?å?¶å½?å??ç??æ?¬æ­£ä»¥ "
+"HTML å½¢å¼?æ??ä¾?å?¨æ??档项ç?®ç??<ulink url=\"http://docs.gimp.org\";>ç½?ç«?</ulink> "
+"ä¸?ã??å¦?æ??æ?¨å®?è£?äº?帮å?©ï¼?æ­¤ HTML ç??æ?¬ä¹?å°?å?¨æ?¨ä½¿ç?¨ <acronym>GIMP</acronym> æ?¶é??è¿?"
+"æ?? <keycap>F1</keycap> é?®è?·å¾?ä¸?ä¸?æ??ç?¸å?³å¸®å?©æ?¶æ?¾ç¤ºã??å½?é¼ æ ?æ??é??å°?ç?¦ç?¹æ??å??ç?¹å®?è??"
+"å??ç??æ?¶å??æ??ä¸? <keycap>F1</keycap> é?®ï¼?å?¯ä»¥å¾?å?°æ??å®?è??å??ç??帮å?©ã??é??读ä¸?å?»ï¼?让æ??们"
+"å¼?å§? <acronym>GIMP</acronym> ä¹?æ??ï¼?"
 
-#: src/introduction.xml:90(title)
+#: src/introduction.xml:89(title)
 msgid "Features and Capabilities"
 msgstr "ç?¹æ?§å??å??è?½"
 
-#: src/introduction.xml:91(para)
+#: src/introduction.xml:90(para)
 msgid ""
 "The following list is a short overview of some of the features and "
 "capabilities which <acronym>GIMP</acronym> offers you:"
 msgstr "<acronym>GIMP</acronym> ç?¹æ?§ä¸?å??è?½é¢?è§?ï¼?"
 
-#: src/introduction.xml:97(para)
+#: src/introduction.xml:96(para)
 msgid ""
 "A full suite of painting tools including brushes, a pencil, an airbrush, "
 "cloning, etc."
-msgstr ""
-"å®?æ?´ç??å?¾å??å·¥å?·å¥?件ï¼?å??æ?¬ç?»ç¬?ã??é??ç¬?ã??å?·æ?ªã??å??é??ç­?å·¥å?·ã??"
+msgstr "å®?æ?´ç??å?¾å??å·¥å?·å¥?件ï¼?å??æ?¬ç?»ç¬?ã??é??ç¬?ã??å?·æ?ªã??å??é??ç­?å·¥å?·ã??"
 
-#: src/introduction.xml:103(para)
+#: src/introduction.xml:102(para)
 msgid ""
 "Tile-based memory management, so image size is limited only by available "
 "disk space"
-msgstr ""
-"å?ºäº?å¹³é?º(Tile-based)ç??å??å­?管ç??使å?¾å??大å°?é??å?¶å?¨å?¯ç?¨ç??ç£?ç??空é?´å??ã??"
+msgstr "å?ºäº?å¹³é?º(Tile-based)ç??å??å­?管ç??使å?¾å??大å°?é??å?¶å?¨å?¯ç?¨ç??ç£?ç??空é?´å??ã??"
 
-#: src/introduction.xml:109(para)
+#: src/introduction.xml:108(para)
 msgid "Sub-pixel sampling for all paint tools for high-quality anti-aliasing"
-msgstr "对æ??æ??æ¶?ç?»å·¥å?·é?½ä½¿ç?¨æ¬¡å??ç´ (Sub-pixel)å??æ ·ï¼?å? è??è?½äº§ç??é«?å??è´¨ç??å??é?¯é½¿æ??æ??ã??"
+msgstr ""
+"对æ??æ??æ¶?ç?»å·¥å?·é?½ä½¿ç?¨æ¬¡å??ç´ (Sub-pixel)å??æ ·ï¼?å? è??è?½äº§ç??é«?å??è´¨ç??å??é?¯é½¿æ??æ??ã??"
 
-#: src/introduction.xml:115(para)
+#: src/introduction.xml:114(para)
 msgid "Full Alpha channel support for working with transparency"
 msgstr "å®?å?¨å?° Alpha é??é??æ?¯æ??ã??"
 
-#: src/introduction.xml:120(para)
+#: src/introduction.xml:119(para)
 msgid "Layers and channels"
 msgstr "æ?¯æ??å?¾å±?å??é??é??ã??"
 
-#: src/introduction.xml:123(para)
+#: src/introduction.xml:122(para)
 msgid ""
 "A procedural database for calling internal <acronym>GIMP</acronym> functions "
 "from external programs, such as Script-Fu"
-msgstr "æ?¥æ??ç¨?åº?å??ç??æ?°æ?®åº?ï¼?å?¯ä»¥ä»?å¤?é?¨ç¨?åº?(å¦? Script-Fu) è°?ç?¨ <acronym>GIMP</acronym> å??é?¨å?½ä»¤ã??"
+msgstr ""
+"æ?¥æ??ç¨?åº?å??ç??æ?°æ?®åº?ï¼?å?¯ä»¥ä»?å¤?é?¨ç¨?åº?(å¦? Script-Fu) è°?ç?¨ <acronym>GIMP</"
+"acronym> å??é?¨å?½ä»¤ã??"
 
-#: src/introduction.xml:129(para)
+#: src/introduction.xml:128(para)
 msgid "Advanced scripting capabilities"
 msgstr "å??è¿?ç??è??æ?¬å??å¤?ç??è?½å??ã?? "
 
-#: src/introduction.xml:132(para)
+#: src/introduction.xml:131(para)
 msgid "Multiple undo/redo (limited only by disk space)"
 msgstr "å¤?级æ?¤æ¶?/é??å??(å?ªå??ç£?ç??空é?´å¤§å°?é??å?¶)ã??"
 
-#: src/introduction.xml:135(para)
+#: src/introduction.xml:134(para)
 msgid "Transformation tools including rotate, scale, shear and flip"
 msgstr "å??æ?¢å·¥å?·å??æ?¬æ??转ï¼?缩æ?¾ï¼?å??å??å??翻转ã?? "
 
-#: src/introduction.xml:140(para)
+#: src/introduction.xml:139(para)
 msgid ""
 "Support for a wide range of file formats, including GIF, JPEG, PNG, XPM, "
 "TIFF, TGA, MPEG, PS, PDF, PCX, BMP and many others"
-msgstr "æ?¯æ??å??æ?¬ GIFã??JPEGã??PNGã??XPMã??TIFFã??TGAã??MPEGã??PSã??PDFã??PCXã??BMP å?¨å??ç??å¤?ç§?æ??件格å¼?ã??"
+msgstr ""
+"æ?¯æ??å??æ?¬ GIFã??JPEGã??PNGã??XPMã??TIFFã??TGAã??MPEGã??PSã??PDFã??PCXã??BMP å?¨å??ç??å¤?ç§?æ??"
+"件格å¼?ã??"
 
-#: src/introduction.xml:146(para)
+#: src/introduction.xml:145(para)
 msgid ""
 "Selection tools, including rectangle, ellipse, free, fuzzy, bezier and "
 "intelligent scissors"
-msgstr ""
-"é??æ?©å·¥å?·å??æ?¬ç?©å½¢ã??椭å??ã??è?ªç?±ã??模ç³?ã??è´?èµ?å°?æ?²çº¿å??æ?ºè?½å?ªå??ã??"
+msgstr "é??æ?©å·¥å?·å??æ?¬ç?©å½¢ã??椭å??ã??è?ªç?±ã??模ç³?ã??è´?èµ?å°?æ?²çº¿å??æ?ºè?½å?ªå??ã??"
 
-#: src/introduction.xml:152(para)
+#: src/introduction.xml:151(para)
 msgid ""
 "Plug-ins that allow for the easy addition of new file formats and new effect "
 "filters."
-msgstr ""
-"é??è¿?æ??件è?½è®©æ?¨è½»æ?¾å?°æ·»å? å¯¹æ?°æ??件格å¼?ç??æ?¯æ??å??æ??æ??滤é??ã?? "
+msgstr "é??è¿?æ??件è?½è®©æ?¨è½»æ?¾å?°æ·»å? å¯¹æ?°æ??件格å¼?ç??æ?¯æ??å??æ??æ??滤é??ã?? "
 
 #: src/help-missing.xml:18(phrase)
 msgid "Eeek! There is Missing Help"
@@ -1237,8 +1250,8 @@ msgid ""
 "may be able to find it in the online version of the help at the <ulink url="
 "\"http://docs.gimp.org/en\";><acronym>GIMP</acronym> docs</ulink> website."
 msgstr ""
-"æ?±æ­?ï¼?没æ??æ?¨æ??è¦?ç??å??è?½ç??帮å?©ã??æ?¨å?¯è?½å?¨æ??们ç??<ulink url=\"http://docs.gimp.org/en";
-"\"><acronym>GIMP</acronym> æ??æ¡£</ulink>ç«?ç?¹ä¸?æ?¾å?°å?¨çº¿ç??æ?¬ç??帮å?©ã??"
+"æ?±æ­?ï¼?没æ??æ?¨æ??è¦?ç??å??è?½ç??帮å?©ã??æ?¨å?¯è?½å?¨æ??们ç??<ulink url=\"http://docs.gimp.";
+"org/en\"><acronym>GIMP</acronym> æ??æ¡£</ulink>ç«?ç?¹ä¸?æ?¾å?°å?¨çº¿ç??æ?¬ç??帮å?©ã??"
 
 #: src/help-missing.xml:25(para)
 msgid ""
@@ -1250,11 +1263,12 @@ msgid ""
 "Generally, it's a good idea to check the <ulink url=\"http://www.gimp.org";
 "\"><acronym>GIMP</acronym> project page</ulink>."
 msgstr ""
-"æ??们é??æ?¶æ¬¢è¿?å? å?¥å¹¶ä¸º <acronym>GIMP</acronym> å¡«è¡¥æ??æ¡£ç??空ç?½ã??è¦?è?·å??æ?´å¤?ä¿¡æ?¯ï¼?请访é?®æ??们项ç?®ä¸?ç??"
-"<ulink url=\"http://wiki.gimp.org/gimp/GimpDocs\";><acronym>GIMP</acronym> Wiki</ulink>"
-"以å??<ulink url=\"https://lists.xcf.berkeley.edu/mailman/listinfo/gimp-docs/\";>é?®ä»¶å??表"
-"</ulink>ã??ä¸?è?¬æ?¥è¯´ï¼?æ?¥ç?? <ulink url=\"http://www.gimp.org\";><acronym>GIMP</acronym> 项ç?®"
-"主页</ulink>ä¹?æ?¯ä¸?个好æ?³æ³?ã??"
+"æ??们é??æ?¶æ¬¢è¿?å? å?¥å¹¶ä¸º <acronym>GIMP</acronym> å¡«è¡¥æ??æ¡£ç??空ç?½ã??è¦?è?·å??æ?´å¤?ä¿¡æ?¯ï¼?"
+"请访é?®æ??们项ç?®ä¸?ç??<ulink url=\"http://wiki.gimp.org/gimp/GimpDocs";
+"\"><acronym>GIMP</acronym> Wiki</ulink>以å??<ulink url=\"https://lists.xcf.";
+"berkeley.edu/mailman/listinfo/gimp-docs/\">é?®ä»¶å??表</ulink>ã??ä¸?è?¬æ?¥è¯´ï¼?æ?¥ç?? "
+"<ulink url=\"http://www.gimp.org\";><acronym>GIMP</acronym> 项�主页</ulink>�"
+"æ?¯ä¸?个好æ?³æ³?ã??"
 
 #: src/gimp.xml:23(title)
 msgid "GNU Image Manipulation Program"
diff --git a/po/zh_CN/glossary.po b/po/zh_CN/glossary.po
index ccdd04f..409f1bf 100644
--- a/po/zh_CN/glossary.po
+++ b/po/zh_CN/glossary.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help-2 glossary\n"
-"POT-Creation-Date: 2009-06-23 18:43+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:35+0800\n"
 "Last-Translator: Aron Xu <aronxu gnome org>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
@@ -16,19 +16,19 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:95(None)
+#: src/glossary/glossary.xml:88(None)
 msgid "@@image: 'images/glossary/alias.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr "@@image: 'images/glossary/alias.png'; md5=THIS FILE DOESN'T EXIST"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:100(None)
+#: src/glossary/glossary.xml:93(None)
 msgid "@@image: 'images/glossary/antialias.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr "@@image: 'images/glossary/antialias.png'; md5=THIS FILE DOESN'T EXIST"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:140(None)
+#: src/glossary/glossary.xml:135(None)
 msgid ""
 "@@image: 'images/glossary/bezier-curve.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -36,15 +36,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:155(None)
-msgid ""
-"@@image: 'images/using/path-with-anchors.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-"@@image: 'images/using/path-with-anchors.png'; md5=THIS FILE DOESN'T EXIST"
-
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:380(None)
+#: src/glossary/glossary.xml:365(None)
 msgid ""
 "@@image: 'images/glossary/color-model-subtractive.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -54,13 +46,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:578(None)
+#: src/glossary/glossary.xml:567(None)
 msgid "@@image: 'images/glossary/feather.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr "@@image: 'images/glossary/feather.png'; md5=THIS FILE DOESN'T EXIST"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:1101(None)
+#: src/glossary/glossary.xml:1065(None)
 msgid ""
 "@@image: 'images/glossary/tool-opt-increment.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -70,7 +62,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:1106(None)
+#: src/glossary/glossary.xml:1071(None)
 msgid ""
 "@@image: 'images/glossary/tool-opt-nonincrement.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -80,7 +72,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:1303(None)
+#: src/glossary/glossary.xml:1248(None)
 msgid ""
 "@@image: 'images/dialogs/layers_overview.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -88,7 +80,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:1312(None)
+#: src/glossary/glossary.xml:1257(None)
 msgid ""
 "@@image: 'images/dialogs/layers_example.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -96,7 +88,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:1764(None)
+#: src/glossary/glossary.xml:1720(None)
 msgid ""
 "@@image: 'images/glossary/color-model-additive.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -106,9 +98,10 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/glossary/glossary.xml:1815(None)
+#: src/glossary/glossary.xml:1770(None)
 msgid "@@image: 'images/glossary/colorcircle.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr "@@image: 'images/glossary/colorcircle.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr ""
+"@@image: 'images/glossary/colorcircle.png'; md5=THIS FILE DOESN'T EXIST"
 
 #: src/glossary/glossary.xml:5(title) src/glossary/glossary.xml:8(primary)
 msgid "Glossary"
@@ -129,63 +122,54 @@ msgstr ""
 
 #: src/glossary/glossary.xml:26(para)
 msgid ""
-"There is no grayscale representation of the alpha of a layer. The Alpha "
-"Channel you can see in the Channel Dialog is that of the whole composite "
-"image. If a pixel is opaque only in a layer and transparent in all other "
-"layers, it will be white in the Alpha Channel."
-msgstr ""
-
-#: src/glossary/glossary.xml:33(para)
-msgid ""
 "With some image <link linkend=\"glossary-fileformat\">file formats</link>, "
 "you can only specify that a pixel is completely transparent or completely "
 "opaque. Other file formats allow a variable level of transparency."
 msgstr ""
 
-#: src/glossary/glossary.xml:44(phrase) src/glossary/glossary.xml:52(primary)
+#: src/glossary/glossary.xml:37(phrase)
 msgid "Alpha Channel"
 msgstr "Alpha é??é??"
 
-#: src/glossary/glossary.xml:48(primary)
+#: src/glossary/glossary.xml:41(primary)
 msgid "Transparency"
 msgstr "é??æ??度"
 
-#: src/glossary/glossary.xml:49(secondary)
+#: src/glossary/glossary.xml:42(secondary)
+#: src/glossary/glossary.xml:45(primary)
 msgid "Alpha channel"
 msgstr "Alpha é??é??"
 
-#: src/glossary/glossary.xml:54(para)
+#: src/glossary/glossary.xml:47(para)
 msgid ""
-"An Alpha Channel represents the transparency of the image. Imagine you can "
-"see through the image. This Alpha Channel is automatically added to the "
-"image as soon as you add a second layer. You can see it in the Channels "
-"Dialog. It gives the possibility to be transparent to layers. But this "
-"possibility is not given to the background layer : for this, you must use "
-"the <quote>Add an Alpha Channel</quote> command."
+"An alpha <link linkend=\"glossary-channels\">channel</link> of a layer is a "
+"grayscale image of the same size as the layer representing its transparency. "
+"For each pixel the gray level (a value between 0 and 255) represents the "
+"pixels's <link linkend=\"glossary-alpha\">Alpha</link> value. An alpha "
+"channel can make areas of the layer to appear partially transparent. That's "
+"why the background layer has no alpha channel by default."
 msgstr ""
 
-#: src/glossary/glossary.xml:63(para)
+#: src/glossary/glossary.xml:56(para)
 msgid ""
-"You can also consider that an Alpha channel, although not visible, is added "
-"to every layer, except to the background layer. The image Alpha channel is "
-"the sum of the Alpha channels of layers."
+"The image alpha channel, which is displayed in the channels dialog, can be "
+"considered as the alpha channel of the final layer when all layers have been "
+"merged."
 msgstr ""
 
-#: src/glossary/glossary.xml:68(para)
-msgid ""
-"See also <link linkend=\"alpha-channel-example\">Alpha channel example </"
-"link>."
+#: src/glossary/glossary.xml:61(para)
+msgid "See also <xref linkend=\"alpha-channel-example\"/>."
 msgstr ""
 
-#: src/glossary/glossary.xml:76(phrase) src/glossary/glossary.xml:79(primary)
+#: src/glossary/glossary.xml:69(phrase) src/glossary/glossary.xml:72(primary)
 msgid "Antialiasing"
 msgstr "æ??æ??齿"
 
-#: src/glossary/glossary.xml:80(secondary)
+#: src/glossary/glossary.xml:73(secondary)
 msgid "Explanation"
 msgstr ""
 
-#: src/glossary/glossary.xml:83(para)
+#: src/glossary/glossary.xml:76(para)
 msgid ""
 "Antialiasing is the process of reversing an alias, that is, reducing the "
 "<quote>jaggies</quote>. Antialiasing produces smoother curves by adjusting "
@@ -195,103 +179,95 @@ msgid ""
 "opacity of the edge of the selection is appropriately reduced."
 msgstr ""
 
-#: src/glossary/glossary.xml:108(phrase)
-msgid "Bezier curve"
+#: src/glossary/glossary.xml:102(phrase)
+#, fuzzy
+msgid "B&eacute;zier curve"
 msgstr "����线"
 
-#: src/glossary/glossary.xml:111(para)
+#: src/glossary/glossary.xml:105(para)
 msgid ""
 "A spline is a curve which is defined mathematically and has a set of control "
-"points. A Bezier spline is a cubic spline which has four control points, "
-"where the first and last control points (knots or anchors) are the endpoints "
-"of the curve and the inner two control points (handles) determine the "
-"direction of the curve at the endpoints."
+"points. A B&eacute;zier spline is a cubic spline which has four control "
+"points, where the first and last control points (knots or anchors) are the "
+"endpoints of the curve and the inner two control points (handles) determine "
+"the direction of the curve at the endpoints."
 msgstr ""
 
-#: src/glossary/glossary.xml:119(para)
+#: src/glossary/glossary.xml:113(para)
 msgid ""
 "In the non-mathematical sense, a spline is a flexible strip of wood or metal "
 "used for drawing curves. Using this type of spline for drawing curves dates "
 "back to shipbuilding, where weights were hung on splines to bend them. The "
-"outer control points of a Bezier spline are similar to the places where the "
-"splines are fastened down and the inner control points are where weights are "
-"attached to modify the curve."
+"outer control points of a B&eacute;zier spline are similar to the places "
+"where the splines are fastened down and the inner control points are where "
+"weights are attached to modify the curve."
 msgstr ""
 
-#: src/glossary/glossary.xml:128(para)
+#: src/glossary/glossary.xml:122(para)
 msgid ""
-"Bezier splines are only one way of mathematically representing curves. They "
-"were developed in the 1960s by Pierre Bezier, who worked for Renault."
+"B&eacute;zier splines are only one way of mathematically representing "
+"curves. They were developed in the 1960s by Pierre B&eacute;zier, who worked "
+"for Renault."
 msgstr ""
 
-#: src/glossary/glossary.xml:133(para)
+#: src/glossary/glossary.xml:127(para)
 msgid ""
-"Bezier curves are used in <acronym>GIMP</acronym> as component parts of "
-"<link linkend=\"glossary-path\">Paths</link>."
+"B&eacute;zier curves are used in <acronym>GIMP</acronym> as component parts "
+"of <link linkend=\"glossary-path\">Paths</link>."
 msgstr ""
 
-#: src/glossary/glossary.xml:144(para)
+#: src/glossary/glossary.xml:139(para)
 msgid ""
-"The image above shows a Bezier curve. Points P0 and P3 are points on the "
-"Path, which are created by clicking with the mouse. Points P1 and P2 are "
+"The image above shows a B&eacute;zier curve. Points P0 and P3 are points on "
+"the Path, which are created by clicking with the mouse. Points P1 and P2 are "
 "handles, which are automatically created by <acronym>GIMP</acronym> when you "
-"click on the line between P0 and P3 and stretch it. They change position "
-"when you stretch the curve in different ways."
-msgstr ""
-
-#: src/glossary/glossary.xml:159(para)
-msgid ""
-"The image above shows a path which consists of two components, having both "
-"straight and curved segments, being worked on with the <link linkend=\"gimp-"
-"tool-path\">Path tool</link>. Here, the open circle indicates the selected "
-"anchor and the two open squares are the two handles which are associated "
-"with this anchor from the curves on either side of it."
+"stretch the line."
 msgstr ""
 
-#: src/glossary/glossary.xml:172(phrase)
+#: src/glossary/glossary.xml:150(phrase)
 msgid "Bitmap"
 msgstr "ä½?å?¾"
 
-#: src/glossary/glossary.xml:180(para)
+#: src/glossary/glossary.xml:158(para)
 msgid ""
 "bitmap &mdash; A data file or structure which corresponds bit for bit with "
 "an image displayed on a screen, probably in the same format as it would be "
 "stored in the display's video memory or maybe as a device independent "
 "bitmap. A bitmap is characterised by the width and height of the image in "
 "pixels and the number of bits per pixel which determines the number of "
-"shades of grey or colours it can represent. A bitmap representing a coloured "
+"shades of grey or colors it can represent. A bitmap representing a colored "
 "image (a <quote>pixmap</quote>) will usually have pixels with between one "
 "and eight bits for each of the red, green, and blue components, though other "
-"colour encodings are also used. The green component sometimes has more bits "
+"color encodings are also used. The green component sometimes has more bits "
 "than the other two to cater for the human eye's greater discrimination in "
 "this component."
 msgstr ""
 
-#: src/glossary/glossary.xml:175(para)
+#: src/glossary/glossary.xml:153(para)
 msgid ""
 "From <emphasis> The Free Online Dictionary of Computing (13 Mar 01) </"
 "emphasis>: <placeholder-1/>"
 msgstr ""
-"��<emphasis>���线计������ (The Free Online Dictionary of Computing)"
-"(2001-03-13)</emphasis>ï¼?<placeholder-1/>"
+"��<emphasis>���线计������ (The Free Online Dictionary of "
+"Computing)(2001-03-13)</emphasis>ï¼?<placeholder-1/>"
 
-#: src/glossary/glossary.xml:202(phrase)
-#: src/glossary/glossary.xml:205(primary)
-#: src/glossary/glossary.xml:209(secondary)
+#: src/glossary/glossary.xml:180(phrase)
+#: src/glossary/glossary.xml:183(primary)
+#: src/glossary/glossary.xml:187(secondary)
 msgid "BMP"
 msgstr "BMP"
 
-#: src/glossary/glossary.xml:208(primary)
-#: src/glossary/glossary.xml:1505(primary)
-#: src/glossary/glossary.xml:1584(primary)
-#: src/glossary/glossary.xml:1621(primary)
-#: src/glossary/glossary.xml:1939(primary)
-#: src/glossary/glossary.xml:1966(primary)
-#: src/glossary/glossary.xml:2106(primary)
+#: src/glossary/glossary.xml:186(primary)
+#: src/glossary/glossary.xml:1459(primary)
+#: src/glossary/glossary.xml:1541(primary)
+#: src/glossary/glossary.xml:1574(primary)
+#: src/glossary/glossary.xml:1907(primary)
+#: src/glossary/glossary.xml:1931(primary)
+#: src/glossary/glossary.xml:2075(primary)
 msgid "Formats"
 msgstr "格�"
 
-#: src/glossary/glossary.xml:212(para)
+#: src/glossary/glossary.xml:190(para)
 msgid ""
 "BMP is an uncompressed image <link linkend=\"glossary-fileformat\">file "
 "format</link> designed by Microsoft and mainly used in Windows. Colors are "
@@ -299,15 +275,16 @@ msgid ""
 "more. Because it is not compressed and the files are large, it is not very "
 "well suited for use in the internet."
 msgstr ""
-"BMP æ?¯ Microsoft 设计ç??ä¸?ç§?æ?ªå??缩å?¾å?? <link linkend=\"glossary-fileformat\">æ??件"
-"æ ¼å¼?</link>ï¼?å¤?被ç?¨å?¨ Windows æ??ä½?ç³»ç»?ä¸?ã??尽管格å¼?ä¸?æ?¯æ??æ?´å¤?ä½?æ?°ï¼?ä¹?é??常使ç?¨1ï¼?4æ??8ä½?表示"
-"è?²å½©ã??å? ä¸ºå®?没æ??å??缩导è?´æ??件ä½?积åº?大ï¼?ä¸?é??ç?¨äº? Internet åº?ç?¨ã??"
+"BMP æ?¯ Microsoft 设计ç??ä¸?ç§?æ?ªå??缩å?¾å?? <link linkend=\"glossary-fileformat\">"
+"æ??件格å¼?</link>ï¼?å¤?被ç?¨å?¨ Windows æ??ä½?ç³»ç»?ä¸?ã??尽管格å¼?ä¸?æ?¯æ??æ?´å¤?ä½?æ?°ï¼?ä¹?é??常"
+"使ç?¨1ï¼?4æ??8ä½?表示è?²å½©ã??å? ä¸ºå®?没æ??å??缩导è?´æ??件ä½?积åº?大ï¼?ä¸?é??ç?¨äº? Internet åº?"
+"ç?¨ã??"
 
-#: src/glossary/glossary.xml:224(phrase)
+#: src/glossary/glossary.xml:203(phrase)
 msgid "Bump mapping"
 msgstr "��贴�"
 
-#: src/glossary/glossary.xml:227(para)
+#: src/glossary/glossary.xml:206(para)
 msgid ""
 "Bump mapping is a technique for displaying extremely detailed objects "
 "without increasing the geometrical complexity of the objects. It is "
@@ -316,36 +293,36 @@ msgid ""
 "on the surface of the object."
 msgstr ""
 
-#: src/glossary/glossary.xml:234(para)
+#: src/glossary/glossary.xml:213(para)
 msgid ""
 "Bump mapping is only one (very effective) way of simulating surface "
 "irregularities which are not actually contained in the geometry of the model."
 msgstr ""
 
-#: src/glossary/glossary.xml:243(phrase)
+#: src/glossary/glossary.xml:223(phrase)
 msgid "Channel Mask"
 msgstr "é??é??è??ç??"
 
-#: src/glossary/glossary.xml:246(para)
+#: src/glossary/glossary.xml:226(para)
 msgid ""
 "A channel masks is a special type of mask which determines the transparency "
 "of a selection. See <xref linkend=\"glossary-masks\"/> for a detailed "
 "description."
 msgstr ""
 
-#: src/glossary/glossary.xml:255(phrase)
+#: src/glossary/glossary.xml:236(phrase)
 msgid "Channels"
 msgstr "é??é??"
 
-#: src/glossary/glossary.xml:258(primary)
+#: src/glossary/glossary.xml:239(primary)
 msgid "Channel"
 msgstr "é??é??"
 
-#: src/glossary/glossary.xml:259(secondary)
+#: src/glossary/glossary.xml:240(secondary)
 msgid "Introduction"
 msgstr "ä»?ç»?"
 
-#: src/glossary/glossary.xml:262(para)
+#: src/glossary/glossary.xml:243(para)
 msgid ""
 "A Channel is a single component of a pixel's color. For a colored pixel in "
 "<acronym>GIMP</acronym>, these components are usually Red, Green, Blue and "
@@ -355,14 +332,14 @@ msgid ""
 "Alpha."
 msgstr ""
 
-#: src/glossary/glossary.xml:271(para)
+#: src/glossary/glossary.xml:252(para)
 msgid ""
 "The entire rectangular array of any one of the color components for all of "
 "the pixels in an image is also referred to as a Channel. You can see these "
 "color channels with the Channels dialog."
 msgstr ""
 
-#: src/glossary/glossary.xml:276(para)
+#: src/glossary/glossary.xml:257(para)
 msgid ""
 "When the image is displayed, <acronym>GIMP</acronym> puts these components "
 "together to form the pixel colors for the screen, printer, or other output "
@@ -371,14 +348,14 @@ msgid ""
 "appropriate ones for the device when the image is displayed."
 msgstr ""
 
-#: src/glossary/glossary.xml:284(para)
+#: src/glossary/glossary.xml:265(para)
 msgid ""
 "Channels can be useful when you are working on an image which needs "
 "adjustment in one particular color. For example, if you want to remove "
 "<quote>red eye</quote> from a photograph, you might work on the Red channel."
 msgstr ""
 
-#: src/glossary/glossary.xml:290(para)
+#: src/glossary/glossary.xml:271(para)
 msgid ""
 "You can look at channels as masks which allow or restrict the output of the "
 "color that the channel represents. By using Filters on the channel "
@@ -387,7 +364,7 @@ msgid ""
 "\"plug-in-colors-channel-mixer\">Channel Mixer</link> filter."
 msgstr ""
 
-#: src/glossary/glossary.xml:299(para)
+#: src/glossary/glossary.xml:280(para)
 msgid ""
 "In addition to these channels, <acronym>GIMP</acronym> also allows you to "
 "create other channels (or more correctly, Channel Masks), which are "
@@ -400,20 +377,20 @@ msgid ""
 "Masks."
 msgstr ""
 
-#: src/glossary/glossary.xml:313(phrase)
+#: src/glossary/glossary.xml:297(phrase)
 msgid "Clipboard"
 msgstr "�贴�"
 
-#: src/glossary/glossary.xml:316(para)
+#: src/glossary/glossary.xml:300(para)
 msgid ""
 "The Clipboard is a temporary area of memory which is used to transfer data "
 "between applications or documents. It is used when you Cut, Copy or Paste "
 "data in <acronym>GIMP</acronym>."
 msgstr ""
-"å?ªè´´æ?¿æ?¯ç?¨äº?å?¨åº?ç?¨ç¨?åº?æ´»æ??æ¡£é?´ä¼ é??æ?°æ?®ç??ä¸?å??临æ?¶å??å­?å?ºå??ã??å½?æ?¨å?¨ <acronym>GIMP</acronym> 中"
-"å?ªå??ã??å¤?å?¶æ??è??ç²?è´´æ?°æ?®æ?¶ï¼?æ?¨ä¾¿ç?¨å?°äº?å®?ã??"
+"å?ªè´´æ?¿æ?¯ç?¨äº?å?¨åº?ç?¨ç¨?åº?æ´»æ??æ¡£é?´ä¼ é??æ?°æ?®ç??ä¸?å??临æ?¶å??å­?å?ºå??ã??å½?æ?¨å?¨ "
+"<acronym>GIMP</acronym> 中å?ªå??ã??å¤?å?¶æ??è??ç²?è´´æ?°æ?®æ?¶ï¼?æ?¨ä¾¿ç?¨å?°äº?å®?ã??"
 
-#: src/glossary/glossary.xml:321(para)
+#: src/glossary/glossary.xml:305(para)
 msgid ""
 "The clipboard is implemented slightly differently under different operating "
 "systems. Under Linux/XFree, <acronym>GIMP</acronym> uses the XFree clipboard "
@@ -422,12 +399,14 @@ msgid ""
 "the clipboard may work somewhat differently. See the <acronym>GIMP</acronym> "
 "documentation for your operating system for further information."
 msgstr ""
-"ä¸?å??æ??ä½?ç³»ç»?ä¸?å?ªè´´æ?¿ç??å®?ç?°æ??äº?许ç??ä¸?å??ã??å?¨ Linux/XFree ç?¯å¢?ä¸?ï¼?<acronym>GIMP</acronym> 使ç?¨ "
-"XFree å?ªè´´æ?¿å¤?ç??æ??æ?¬ï¼?使ç?¨ <acronym>GIMP</acronym> å??é?¨å?¾å??å?ªè´´æ?¿å?¨å?¾å??é?´ä¼ é??æ?°æ?®ã??å?¨å?¶ä»?æ??ä½?"
-"ç³»ç»?中ï¼?å?ªè´´æ?¿ç??å·¥ä½?æ?¹å¼?å?¯è?½å¤?å°?æ??äº?ä¸?å??ã??请æ?¥ç?? <acronym>GIMP</acronym> æ??档以äº?件å?³äº?æ?¨ä½¿ç?¨"
-"ç??æ??ä½?ç³»ç»?ç?¯å¢?中ç??æ?´å¤?ä¿¡æ?¯ã??"
+"ä¸?å??æ??ä½?ç³»ç»?ä¸?å?ªè´´æ?¿ç??å®?ç?°æ??äº?许ç??ä¸?å??ã??å?¨ Linux/XFree ç?¯å¢?ä¸?ï¼?"
+"<acronym>GIMP</acronym> 使ç?¨ XFree å?ªè´´æ?¿å¤?ç??æ??æ?¬ï¼?使ç?¨ <acronym>GIMP</"
+"acronym> å??é?¨å?¾å??å?ªè´´æ?¿å?¨å?¾å??é?´ä¼ é??æ?°æ?®ã??å?¨å?¶ä»?æ??ä½?ç³»ç»?中ï¼?å?ªè´´æ?¿ç??å·¥ä½?æ?¹å¼?å?¯"
+"è?½å¤?å°?æ??äº?ä¸?å??ã??请æ?¥ç?? <acronym>GIMP</acronym> æ??档以äº?件å?³äº?æ?¨ä½¿ç?¨ç??æ??ä½?ç³»ç»?"
+"ç?¯å¢?中ç??æ?´å¤?ä¿¡æ?¯ã??"
 
-#: src/glossary/glossary.xml:330(para)
+#. TODO: this para should go to concepts/using
+#: src/glossary/glossary.xml:315(para)
 msgid ""
 "The basic operations provided by the clipboard are <quote>Cut</quote>, "
 "<quote>Copy</quote>, and <quote>Paste</quote>. Cut means that the item is "
@@ -438,34 +417,35 @@ msgid ""
 "target is a canvas, the Paste operation uses the image clipboard. If the "
 "target is a text entry box, the paste operation uses the text clipboard."
 msgstr ""
-"å?ªè´´æ?¿æ??æ??ä¾?ç??å?ºæ?¬æ??ä½?æ?¯ <quote>å?ªå??</quote>ã??<quote>å¤?å?¶</quote>å??<quote>ç²?è´´</quote>ã??"
-"å?ªå??æ?¯æ??ä»?æ??档中移é?¤ç?®æ ?项ç?®å¹¶å°?å?¶å¤?å?¶å?°å?ªè´´æ?¿ï¼?å¤?å?¶å??æ??ç?®æ ?项ç?®ä¿?ç??å?¨å??ä½?å??æ?¶å¤?å?¶å?°å?ªè´´æ?¿ï¼?ç²?è´´å??"
-"æ?¯æ??å?ªè´´ç??ç??å??容å¤?å?¶å?°æ??档中ã??<acronym>GIMP</acronym> ä¼?æ ¹æ?®ç?®æ ?ä½?ç½®æ?ºè?½é??æ?©ç²?è´´å??容ã??å¦?æ??ç?®æ ?"
-"æ?¯ä¸?个ç?»å¸?ï¼?ç²?è´´æ??ä½?å°?使ç?¨å?¾å??å?ªè´´æ?¿ï¼?å¦?æ??ç?®æ ?æ?¯ä¸?个æ??æ?¬è¾?å?¥æ¡?ï¼?å??使ç?¨æ??æ?¬å?ªè´´æ?¿ã??"
+"å?ªè´´æ?¿æ??æ??ä¾?ç??å?ºæ?¬æ??ä½?æ?¯ <quote>å?ªå??</quote>ã??<quote>å¤?å?¶</quote>å??<quote>ç²?"
+"è´´</quote>ã??å?ªå??æ?¯æ??ä»?æ??档中移é?¤ç?®æ ?项ç?®å¹¶å°?å?¶å¤?å?¶å?°å?ªè´´æ?¿ï¼?å¤?å?¶å??æ??ç?®æ ?项ç?®"
+"ä¿?ç??å?¨å??ä½?å??æ?¶å¤?å?¶å?°å?ªè´´æ?¿ï¼?ç²?è´´å??æ?¯æ??å?ªè´´ç??ç??å??容å¤?å?¶å?°æ??档中ã??"
+"<acronym>GIMP</acronym> ä¼?æ ¹æ?®ç?®æ ?ä½?ç½®æ?ºè?½é??æ?©ç²?è´´å??容ã??å¦?æ??ç?®æ ?æ?¯ä¸?个ç?»å¸?ï¼?"
+"ç²?è´´æ??ä½?å°?使ç?¨å?¾å??å?ªè´´æ?¿ï¼?å¦?æ??ç?®æ ?æ?¯ä¸?个æ??æ?¬è¾?å?¥æ¡?ï¼?å??使ç?¨æ??æ?¬å?ªè´´æ?¿ã??"
 
-#: src/glossary/glossary.xml:345(phrase)
+#: src/glossary/glossary.xml:331(phrase)
 msgid "CMY, CMYK"
 msgstr "CMY, CMYK"
 
-#: src/glossary/glossary.xml:348(primary)
+#: src/glossary/glossary.xml:334(primary)
 msgid "CMYK"
 msgstr "CMYK"
 
-#: src/glossary/glossary.xml:351(primary)
-#: src/glossary/glossary.xml:500(primary)
-#: src/glossary/glossary.xml:1033(primary)
-#: src/glossary/glossary.xml:1132(primary)
-#: src/glossary/glossary.xml:1754(primary)
-#: src/glossary/glossary.xml:1883(primary)
-#: src/glossary/glossary.xml:2080(primary)
+#: src/glossary/glossary.xml:337(primary)
+#: src/glossary/glossary.xml:487(primary)
+#: src/glossary/glossary.xml:995(primary)
+#: src/glossary/glossary.xml:1098(primary)
+#: src/glossary/glossary.xml:1709(primary)
+#: src/glossary/glossary.xml:1849(primary)
+#: src/glossary/glossary.xml:2048(primary)
 msgid "Color"
 msgstr "�彩"
 
-#: src/glossary/glossary.xml:352(secondary)
+#: src/glossary/glossary.xml:338(secondary)
 msgid "Subtractive color synthesis"
 msgstr ""
 
-#: src/glossary/glossary.xml:355(para)
+#: src/glossary/glossary.xml:341(para)
 msgid ""
 "CMYK is a <link linkend=\"glossary-colormodel\">color model</link> which has "
 "components for Cyan, Magenta, Yellow and Black. It is a subtractive color "
@@ -473,32 +453,32 @@ msgid ""
 "complementary to the <link linkend=\"glossary-rgb\">RGB</link> color model."
 msgstr ""
 
-#: src/glossary/glossary.xml:362(para)
+#: src/glossary/glossary.xml:348(para)
 msgid ""
 "The values of the individual colors vary between 0% and 100%, where 0% "
 "corresponds to an unprinted color, and 100% corresponds to a completely "
 "printed area of color. Colors are formed by mixing the three basic colors."
 msgstr ""
 
-#: src/glossary/glossary.xml:368(para)
+#: src/glossary/glossary.xml:354(para)
 msgid ""
 "The last of these values, K (Black), doesn't contribute to the color, but "
 "merely serves to darken the other colors. The letter K is used for Black to "
 "prevent confusion, since B usually stands for Blue."
 msgstr ""
 
-#: src/glossary/glossary.xml:376(phrase)
+#: src/glossary/glossary.xml:361(title)
 msgid "Subtractive color model"
 msgstr ""
 
-#: src/glossary/glossary.xml:384(para)
+#: src/glossary/glossary.xml:369(para)
 msgid ""
 "<acronym>GIMP</acronym> does not currently support the CMYK model. (An "
 "experimental plug-in providing rudimentary CMYK support can be found <xref "
 "linkend=\"bibliography-online-plugin-separate\"/>.)"
 msgstr ""
 
-#: src/glossary/glossary.xml:388(para)
+#: src/glossary/glossary.xml:374(para)
 msgid ""
 "This is the mode used in printing. These are the colors in the ink "
 "cartridges in your printer. It is the mode used in painting and in all the "
@@ -512,7 +492,7 @@ msgid ""
 "if you add Magenta, you decrease Green."
 msgstr ""
 
-#: src/glossary/glossary.xml:401(para)
+#: src/glossary/glossary.xml:387(para)
 msgid ""
 "It would be logical to think that by mixing Cyan, Magenta and Yellow, you "
 "would subtract Red, Green and Blue, and the eye would see no light at all, "
@@ -523,39 +503,39 @@ msgid ""
 "just has to add Black."
 msgstr ""
 
-#: src/glossary/glossary.xml:415(phrase)
-#: src/glossary/glossary.xml:418(primary)
+#: src/glossary/glossary.xml:401(phrase)
+#: src/glossary/glossary.xml:404(primary)
 msgid "Color depth"
 msgstr "�深"
 
-#: src/glossary/glossary.xml:421(primary)
+#: src/glossary/glossary.xml:407(primary)
 msgid "bpp"
 msgstr "bpp"
 
-#: src/glossary/glossary.xml:424(para)
+#: src/glossary/glossary.xml:410(para)
 msgid ""
 "Color depth is simply the number of bits used to represent a color (bits per "
 "pixel : bpp). There are 3 channels for a pixel (for Red, Green and Blue). "
-"<acronym>GIMP</acronym> can supprt 8 bits per channel, referred as "
+"<acronym>GIMP</acronym> can support 8 bits per channel, referred as "
 "<emphasis>eight-bit color</emphasis>. So, <acronym>GIMP</acronym> color "
 "depth is 8&nbsp;*&nbsp;3&nbsp;=&nbsp;24, which allows 256&nbsp;"
 "*&nbsp;256&nbsp;*&nbsp;256&nbsp;=&nbsp;16,777,216 possible colors (8 bits "
 "allow 256 colors)."
 msgstr ""
 
-#: src/glossary/glossary.xml:439(phrase)
-#: src/glossary/glossary.xml:442(primary)
+#: src/glossary/glossary.xml:425(phrase)
+#: src/glossary/glossary.xml:428(primary)
 msgid "Color model"
 msgstr "è?²å½©æ¨¡å??"
 
-#: src/glossary/glossary.xml:445(para)
+#: src/glossary/glossary.xml:431(para)
 msgid ""
 "A color model is a way of describing and specifying a color. The term is "
 "often used loosely to refer to both a color space system and the color space "
 "on which it is based."
 msgstr ""
 
-#: src/glossary/glossary.xml:451(para)
+#: src/glossary/glossary.xml:437(para)
 msgid ""
 "A color space is a set of colors which can be displayed or recognized by an "
 "input or output device (such as a scanner, monitor, printer, etc.). The "
@@ -568,36 +548,36 @@ msgid ""
 "color space systems in use. Some important examples are:"
 msgstr ""
 
-#: src/glossary/glossary.xml:466(link) src/glossary/glossary.xml:1748(phrase)
-#: src/glossary/glossary.xml:1751(primary)
+#: src/glossary/glossary.xml:452(link) src/glossary/glossary.xml:1703(phrase)
+#: src/glossary/glossary.xml:1706(primary)
 msgid "RGB"
 msgstr "RGB"
 
-#: src/glossary/glossary.xml:471(link) src/glossary/glossary.xml:958(phrase)
+#: src/glossary/glossary.xml:457(link) src/glossary/glossary.xml:920(phrase)
 msgid "HSV"
 msgstr "HSV"
 
-#: src/glossary/glossary.xml:476(link)
+#: src/glossary/glossary.xml:462(link)
 msgid "CMY(K)"
 msgstr "CMY(K)"
 
-#: src/glossary/glossary.xml:481(link) src/glossary/glossary.xml:2206(phrase)
-#: src/glossary/glossary.xml:2209(primary)
+#: src/glossary/glossary.xml:467(link) src/glossary/glossary.xml:2177(phrase)
+#: src/glossary/glossary.xml:2180(primary)
 msgid "YUV"
 msgstr "YUV"
 
-#: src/glossary/glossary.xml:486(link) src/glossary/glossary.xml:2153(phrase)
-#: src/glossary/glossary.xml:2156(primary)
+#: src/glossary/glossary.xml:472(link) src/glossary/glossary.xml:2123(phrase)
+#: src/glossary/glossary.xml:2126(primary)
 msgid "YCbCr"
 msgstr "YCbCr"
 
-#: src/glossary/glossary.xml:494(phrase)
-#: src/glossary/glossary.xml:497(primary)
-#: src/glossary/glossary.xml:501(secondary)
+#: src/glossary/glossary.xml:481(phrase)
+#: src/glossary/glossary.xml:484(primary)
+#: src/glossary/glossary.xml:488(secondary)
 msgid "Dithering"
 msgstr "æ??å?¨"
 
-#: src/glossary/glossary.xml:504(para)
+#: src/glossary/glossary.xml:491(para)
 msgid ""
 "Dithering is a technique used in computer graphics to create the illusion of "
 "more colors when displaying an image which has a low <link linkend="
@@ -606,7 +586,7 @@ msgid ""
 "colors. The human eye perceives this as a mixture of the individual colors."
 msgstr ""
 
-#: src/glossary/glossary.xml:512(para)
+#: src/glossary/glossary.xml:499(para)
 msgid ""
 "The <link linkend=\"gimp-tool-blend\">Gradient</link> tool uses dithering. "
 "You may also choose to use dithering when you convert an image to <link "
@@ -616,7 +596,7 @@ msgid ""
 "the colormap."
 msgstr ""
 
-#: src/glossary/glossary.xml:520(para)
+#: src/glossary/glossary.xml:507(para)
 msgid ""
 "The <link linkend=\"plug-in-newsprint\">Newsprint</link> filter uses "
 "dithering as well. You can use the <link linkend=\"plug-in-nlfilt\">NL "
@@ -624,7 +604,7 @@ msgid ""
 "your image."
 msgstr ""
 
-#: src/glossary/glossary.xml:526(para)
+#: src/glossary/glossary.xml:513(para)
 msgid ""
 "Also note that although <acronym>GIMP</acronym> itself uses 24-bit colors, "
 "your system may not actually be able to display that many colors. If it "
@@ -632,19 +612,19 @@ msgid ""
 "system may also dither colors while displaying them."
 msgstr ""
 
-#: src/glossary/glossary.xml:533(para)
+#: src/glossary/glossary.xml:520(para)
 msgid ""
 "See also the glossary entry on <link linkend=\"glossary-floyd-steinberg-"
 "dithering\">Floyd-Steinberg dithering</link>, which is used in "
 "<acronym>GIMP</acronym>."
 msgstr ""
 
-#: src/glossary/glossary.xml:542(phrase)
-#: src/glossary/glossary.xml:545(primary)
+#: src/glossary/glossary.xml:530(phrase)
+#: src/glossary/glossary.xml:533(primary)
 msgid "EXIF"
 msgstr "EXIF"
 
-#: src/glossary/glossary.xml:548(para)
+#: src/glossary/glossary.xml:536(para)
 msgid ""
 "Exchangeable image file format (official abbreviation Exif, not EXIF) is a "
 "specification for the image file format used by digital cameras. It was "
@@ -658,36 +638,32 @@ msgid ""
 "wkpd-exif\"/>."
 msgstr ""
 
-#: src/glossary/glossary.xml:565(phrase)
+#: src/glossary/glossary.xml:554(phrase)
+#: src/glossary/glossary.xml:557(primary)
 msgid "Feathering"
 msgstr "ç¾½å??"
 
-#: src/glossary/glossary.xml:568(primary)
-msgid "Feathering selection border"
-msgstr ""
-
-#: src/glossary/glossary.xml:571(para)
+#: src/glossary/glossary.xml:560(para)
 msgid ""
-"<acronym>GIMP</acronym> uses the process of Feathering to make a smooth "
-"transition between a region and the background by softly blending the edges "
-"of the region."
+"The process of Feathering makes a smooth transition between a region and the "
+"background by softly blending the edges of the region."
 msgstr ""
 
-#: src/glossary/glossary.xml:582(para)
+#: src/glossary/glossary.xml:571(para)
 msgid ""
 "In <acronym>GIMP</acronym>, you can feather the edges of a selection. "
 "Brushes can also have feathered edges."
 msgstr ""
 
-#: src/glossary/glossary.xml:590(phrase)
+#: src/glossary/glossary.xml:580(phrase)
 msgid "File Format"
 msgstr "æ??件格å¼?"
 
-#: src/glossary/glossary.xml:593(primary)
+#: src/glossary/glossary.xml:583(primary)
 msgid "File format"
 msgstr "æ??件格å¼?"
 
-#: src/glossary/glossary.xml:596(para)
+#: src/glossary/glossary.xml:586(para)
 msgid ""
 "A file format or file type is the form in which computer data is stored. "
 "Since a file is stored by an operating system as a linear series of bytes, "
@@ -697,7 +673,7 @@ msgid ""
 "file constitute a file format."
 msgstr ""
 
-#: src/glossary/glossary.xml:605(para)
+#: src/glossary/glossary.xml:595(para)
 msgid ""
 "Some typical file formats for saving images are JPEG, TIFF, PNG and GIF. The "
 "best file format for saving an image depends upon how the image is intended "
@@ -707,19 +683,19 @@ msgid ""
 "\"gimp-using-fileformats\">Format types</link>."
 msgstr ""
 
-#: src/glossary/glossary.xml:618(glossterm)
+#: src/glossary/glossary.xml:608(glossterm)
 msgid "Floating Selection"
 msgstr "æµ®å?¨é??å?º"
 
-#: src/glossary/glossary.xml:620(primary)
+#: src/glossary/glossary.xml:610(primary)
 msgid "Selection"
 msgstr "é??å?º"
 
-#: src/glossary/glossary.xml:621(secondary)
+#: src/glossary/glossary.xml:611(secondary)
 msgid "Floating selection"
 msgstr "æµ®å?¨é??å?º"
 
-#: src/glossary/glossary.xml:624(para)
+#: src/glossary/glossary.xml:614(para)
 msgid ""
 "A floating selection (sometimes called a <quote>floating layer</quote>) is a "
 "type of temporary layer which is similar in function to a normal layer, "
@@ -728,7 +704,7 @@ msgid ""
 "image."
 msgstr ""
 
-#: src/glossary/glossary.xml:631(para)
+#: src/glossary/glossary.xml:621(para)
 msgid ""
 "In early versions of <acronym>GIMP</acronym>, when <acronym>GIMP</acronym> "
 "did not use layers, floating selections were used for performing operations "
@@ -737,15 +713,15 @@ msgid ""
 "have to do with them."
 msgstr ""
 
-#: src/glossary/glossary.xml:643(phrase)
+#: src/glossary/glossary.xml:633(phrase)
 msgid "Floyd-Steinberg Dithering"
 msgstr ""
 
-#: src/glossary/glossary.xml:646(primary)
+#: src/glossary/glossary.xml:636(primary)
 msgid "Floyd-Steinberg"
 msgstr ""
 
-#: src/glossary/glossary.xml:649(para)
+#: src/glossary/glossary.xml:639(para)
 msgid ""
 "Floyd-Steinberg dithering is a method of <link linkend=\"glossary-dithering"
 "\">dithering</link> which was first published in 1976 by Robert W. Floyd and "
@@ -758,19 +734,19 @@ msgid ""
 "processing, the procedure can be done in a single pass over the image."
 msgstr ""
 
-#: src/glossary/glossary.xml:662(para)
+#: src/glossary/glossary.xml:652(para)
 msgid ""
 "When you convert an image to <link linkend=\"gimp-image-convert-indexed"
 "\">Indexed</link> mode, you can choose between two variants of Floyd-"
 "Steinberg dithering."
 msgstr ""
 
-#: src/glossary/glossary.xml:673(phrase)
-#: src/glossary/glossary.xml:676(primary)
+#: src/glossary/glossary.xml:663(phrase)
+#: src/glossary/glossary.xml:666(primary)
 msgid "Gamma"
 msgstr "伽马"
 
-#: src/glossary/glossary.xml:679(para)
+#: src/glossary/glossary.xml:669(para)
 msgid ""
 "Gamma or gamma correction is a non-linear operation which is used to encode "
 "and decode luminance or color values in video or still image systems. It is "
@@ -783,7 +759,7 @@ msgid ""
 "in each RGB signal) is better optimized perceptually."
 msgstr ""
 
-#: src/glossary/glossary.xml:691(para)
+#: src/glossary/glossary.xml:681(para)
 msgid ""
 "Gamma is used as an exponent (power) in the correction equation. Gamma "
 "compression (where gamma &lt; 1) is used to encode linear luminance or RGB "
@@ -792,7 +768,7 @@ msgid ""
 "to-voltage function for a CRT is non-linear."
 msgstr ""
 
-#: src/glossary/glossary.xml:698(para)
+#: src/glossary/glossary.xml:688(para)
 msgid ""
 "For PC video, images are encoded with a gamma of about 0.45 and decoded with "
 "a gamma of 2.2. For Mac systems, images are typically encoded with a gamma "
@@ -801,7 +777,7 @@ msgid ""
 "equation, but has a decoding gamma value near 2.2 over much of its range."
 msgstr ""
 
-#: src/glossary/glossary.xml:706(para)
+#: src/glossary/glossary.xml:696(para)
 msgid ""
 "In <acronym>GIMP</acronym>, gamma is an option used in the brush tab of the "
 "<link linkend=\"plug-in-gimpressionist\">GIMPressionist</link> filter and in "
@@ -811,12 +787,12 @@ msgid ""
 "where you can use the middle slider to change the gamma value."
 msgstr ""
 
-#: src/glossary/glossary.xml:719(phrase)
-#: src/glossary/glossary.xml:722(primary)
+#: src/glossary/glossary.xml:710(phrase)
+#: src/glossary/glossary.xml:713(primary)
 msgid "Gamut"
 msgstr "��"
 
-#: src/glossary/glossary.xml:725(para)
+#: src/glossary/glossary.xml:716(para)
 msgid ""
 "In color reproduction, including computer graphics and photography, the "
 "gamut, or color gamut (pronounced /Ë?gæmÉ?t/), is a certain complete subset of "
@@ -831,12 +807,12 @@ msgid ""
 "linkend=\"bibliography-online-wkpd-gamut\"/>"
 msgstr ""
 
-#: src/glossary/glossary.xml:743(phrase)
-#: src/glossary/glossary.xml:746(primary)
+#: src/glossary/glossary.xml:735(phrase)
+#: src/glossary/glossary.xml:738(primary)
 msgid "GIF"
 msgstr "GIF"
 
-#: src/glossary/glossary.xml:749(para)
+#: src/glossary/glossary.xml:741(para)
 msgid ""
 "<trademark class=\"trade\">GIF</trademark> stands for Graphics Interchange "
 "Format. It is a <link linkend=\"glossary-fileformat\">file format</link> "
@@ -848,7 +824,7 @@ msgid ""
 "some rarely-used features."
 msgstr ""
 
-#: src/glossary/glossary.xml:758(para)
+#: src/glossary/glossary.xml:753(para)
 msgid ""
 "GIF was introduced by CompuServe in 1987. It became popular mostly because "
 "of its efficient, LZW compression. The size of the image files required "
@@ -860,7 +836,7 @@ msgid ""
 "notice was attached to them."
 msgstr ""
 
-#: src/glossary/glossary.xml:769(para)
+#: src/glossary/glossary.xml:764(para)
 msgid ""
 "Colors in GIF are stored in a color table which can hold up to 256 different "
 "entries, chosen from 16.7 million different color values. When the image "
@@ -872,7 +848,7 @@ msgid ""
 "the format is not considered to be suitable for those purposes."
 msgstr ""
 
-#: src/glossary/glossary.xml:780(para)
+#: src/glossary/glossary.xml:775(para)
 msgid ""
 "One color entry in the palette can be defined to be transparent. With "
 "transparency, the GIF image can look like it is non-rectangular in shape. "
@@ -881,7 +857,7 @@ msgid ""
 "or completely transparent."
 msgstr ""
 
-#: src/glossary/glossary.xml:788(para)
+#: src/glossary/glossary.xml:783(para)
 msgid ""
 "The first version of GIF was 87a. In 1989, CompuServe published an expanded "
 "version, called 89a. Among other things, this made it possible to save "
@@ -891,21 +867,21 @@ msgid ""
 "or <quote>GIF89a</quote>."
 msgstr ""
 
-#: src/glossary/glossary.xml:800(phrase)
+#: src/glossary/glossary.xml:796(phrase)
 msgid "GNU"
 msgstr "GNU"
 
-#: src/glossary/glossary.xml:803(para)
+#: src/glossary/glossary.xml:799(para)
 msgid ""
 "The GNU project was started in 1983 by Richard Stallman with the goal of "
 "developing a completely free operating system. It is especially well-known "
 "from the GNU General Public License (GPL) and GNU/Linux, a GNU-variant with "
 "a Linux kernel."
 msgstr ""
-"GNU 项ç?®ç?± Richard Stallman å?¨ 1983 年建ç«?ï¼?å?¶ç?®æ ?æ?¯å»ºç«?ä¸?个å®?æ?´ç??è?ªç?±æ??ä½?ç³»ç»?ã??å®?å¾?å¾?æ?¯"
-"å?  GNU é??ç?¨å?¬å?±è®¸å?¯è¯? (GPL) 以å?? GNU/Linux è??被å?¨ç?¥ã??"
+"GNU 项ç?®ç?± Richard Stallman å?¨ 1983 年建ç«?ï¼?å?¶ç?®æ ?æ?¯å»ºç«?ä¸?个å®?æ?´ç??è?ªç?±æ??ä½?ç³»"
+"ç»?ã??å®?å¾?å¾?æ?¯å?  GNU é??ç?¨å?¬å?±è®¸å?¯è¯? (GPL) 以å?? GNU/Linux è??被å?¨ç?¥ã??"
 
-#: src/glossary/glossary.xml:809(para)
+#: src/glossary/glossary.xml:805(para)
 msgid ""
 "The name came about from the naming conventions which were in practice at "
 "MIT, where Stallman worked at the time. For programs which were similar to "
@@ -925,30 +901,31 @@ msgid ""
 "Window System. The missing parts were newly written from the ground up."
 msgstr ""
 
-#: src/glossary/glossary.xml:830(para)
+#: src/glossary/glossary.xml:826(para)
 msgid ""
 "<acronym>GIMP</acronym> (GNU Image Manipulation Program) is an official GNU "
 "application <xref linkend=\"bibliography-online-wkpd-gnu\"/>."
 msgstr ""
-"<acronym>GIMP</acronym> æ?¯ä¸?个 GNU å®?æ?¹å®?ä¹?ç??ç¨?åº? <xref linkend=\"bibliography-online-wkpd-gnu\"/>ã??"
+"<acronym>GIMP</acronym> æ?¯ä¸?个 GNU å®?æ?¹å®?ä¹?ç??ç¨?åº? <xref linkend="
+"\"bibliography-online-wkpd-gnu\"/>ã??"
 
-#: src/glossary/glossary.xml:839(phrase)
-#: src/glossary/glossary.xml:842(primary)
+#: src/glossary/glossary.xml:837(phrase)
+#: src/glossary/glossary.xml:840(primary)
 msgid "Grayscale"
 msgstr "�度"
 
-#: src/glossary/glossary.xml:843(secondary)
-#: src/glossary/glossary.xml:1344(secondary)
+#: src/glossary/glossary.xml:841(secondary)
+#: src/glossary/glossary.xml:1295(secondary)
 msgid "Overview"
 msgstr "��"
 
-#: src/glossary/glossary.xml:846(para)
+#: src/glossary/glossary.xml:844(para)
 msgid ""
 "Grayscale is a mode for encoding the colors of an image which contains only "
 "black, white and shades of gray."
 msgstr ""
 
-#: src/glossary/glossary.xml:850(para)
+#: src/glossary/glossary.xml:848(para)
 msgid ""
 "When you create a new image, you can choose to create it in Grayscale mode "
 "(which you can colorize later, by changing it to RGB mode). You can also "
@@ -961,7 +938,7 @@ msgid ""
 "a color model, in the true sense of the word."
 msgstr ""
 
-#: src/glossary/glossary.xml:862(para)
+#: src/glossary/glossary.xml:860(para)
 msgid ""
 "As explained in <link linkend=\"glossary-rgb\">RGB mode</link>, 24-bit "
 "<acronym>GIMP</acronym> images can have up to 256 levels of gray. If you "
@@ -969,20 +946,20 @@ msgid ""
 "with three color channels, but of course, it will still be gray."
 msgstr ""
 
-#: src/glossary/glossary.xml:869(para)
+#: src/glossary/glossary.xml:867(para)
 msgid "Grayscale image files (8-bit) are smaller than RGB files."
 msgstr ""
 
-#: src/glossary/glossary.xml:876(phrase)
-#: src/glossary/glossary.xml:879(primary)
+#: src/glossary/glossary.xml:875(phrase)
+#: src/glossary/glossary.xml:878(primary)
 msgid "Guides"
 msgstr "æ??å??"
 
-#: src/glossary/glossary.xml:880(secondary)
+#: src/glossary/glossary.xml:879(secondary)
 msgid "Using"
 msgstr ""
 
-#: src/glossary/glossary.xml:883(para)
+#: src/glossary/glossary.xml:882(para)
 msgid ""
 "Guides are lines you can temporarily display on an image while you are "
 "working on it. You can display as many guides as you would like, in either "
@@ -991,62 +968,17 @@ msgid ""
 "printed."
 msgstr ""
 
-#. TODO: a glossary entry should tell what a guide *is*, how to create
-#.                 or use a guide should be described somewhere else!
-#: src/glossary/glossary.xml:893(para)
+#: src/glossary/glossary.xml:889(para)
 msgid ""
-"To create a guide, simply click on one of the rulers in the image window and "
-"pull out a guide, while holding the <mousebutton moreinfo=\"none\">mouse "
-"button</mousebutton> pressed. The guide is then displayed as a blue, dashed "
-"line, which follows the pointer. As soon as you create a guide, the "
-"<quote>Move</quote> tool is activated and the mouse pointer changes to the "
-"Move icon."
+"For more information see <xref linkend=\"gimp-concepts-image-guides\"/>."
 msgstr ""
 
-#: src/glossary/glossary.xml:901(para)
-msgid ""
-"You can also create a guide with the <link linkend=\"gimp-image-guides-add"
-"\">New Guide</link> command, which allows you to precisely place the guide "
-"on the image, the <link linkend=\"gimp-image-guides-percent\">New Guide (by "
-"Percent)</link> command, or the <link linkend=\"gimp-image-guides-selection"
-"\">New Guides from Selection</link> command."
-msgstr ""
-
-#: src/glossary/glossary.xml:907(para)
-msgid ""
-"The behavior of the guides depends upon the <guilabel moreinfo=\"none"
-"\">Affect</guilabel> mode of the <quote>Move</quote> tool. When "
-"<emphasis>Transform Layer</emphasis> mode is selected, the mouse pointer "
-"turns into a small hand as soon as it gets close to a guide. Then the guide "
-"is activated and it turns red, and you can move the guide or delete it by "
-"moving it back into the ruler. If <emphasis>Transform Selection</emphasis> "
-"mode is selected, you can position a guide, but you cannot move it after "
-"that."
-msgstr ""
-
-#: src/glossary/glossary.xml:917(para)
-msgid ""
-"To make it easier for you to position image elements, you can "
-"<quote>magnetize</quote> the guides with the <link linkend=\"gimp-view-snap-"
-"to-guides\">Snap to Guides</link> command. You can remove the guides with "
-"the <link linkend=\"gimp-image-guides-remove\">Remove all guides</link> "
-"command. You can enable and disable displaying the guides without removing "
-"them by using the <link linkend=\"gimp-view-show-guides\">Show Guides</link> "
-"command."
-msgstr ""
-
-#: src/glossary/glossary.xml:927(para)
-msgid ""
-"For more information about guides, see the <link linkend=\"gimp-concepts-"
-"image-grid\">Grids and Guides</link> section."
-msgstr ""
-
-#: src/glossary/glossary.xml:936(phrase)
-#: src/glossary/glossary.xml:939(primary)
+#: src/glossary/glossary.xml:898(phrase)
+#: src/glossary/glossary.xml:901(primary)
 msgid "Histogram"
 msgstr "���"
 
-#: src/glossary/glossary.xml:942(para)
+#: src/glossary/glossary.xml:904(para)
 msgid ""
 "In digital image processing, a histogram is a graph representing the "
 "statistical frequency of the gray values or the color values in an image. "
@@ -1058,14 +990,14 @@ msgid ""
 "images and therefore further processing is immediately possible."
 msgstr ""
 
-#: src/glossary/glossary.xml:961(para)
+#: src/glossary/glossary.xml:923(para)
 msgid ""
 "HSV is a <link linkend=\"glossary-colormodel\">color model</link> which has "
 "components for Hue (the color, such as blue or red), Saturation (how strong "
 "the color is) and Value (the brightness)."
 msgstr ""
 
-#: src/glossary/glossary.xml:966(para)
+#: src/glossary/glossary.xml:928(para)
 msgid ""
 "The RGB mode is very well suited to computer screens, but it doesn't let us "
 "describe what we see in everyday life; a light green, a pale pink, a "
@@ -1076,15 +1008,15 @@ msgid ""
 "the GIMP</emphasis>, which explains their interrelationship."
 msgstr ""
 
-#: src/glossary/glossary.xml:978(para)
+#: src/glossary/glossary.xml:940(para)
 msgid "Brief description of the HSV components:"
 msgstr ""
 
-#: src/glossary/glossary.xml:980(term)
+#: src/glossary/glossary.xml:942(term)
 msgid "Hue"
 msgstr "��"
 
-#: src/glossary/glossary.xml:982(para)
+#: src/glossary/glossary.xml:944(para)
 msgid ""
 "This is the color itself, which results from the combination of primary "
 "colors. All shades (except for the gray levels) are represented in a "
@@ -1095,14 +1027,14 @@ msgid ""
 "quote>.)"
 msgstr ""
 
-#: src/glossary/glossary.xml:995(term) src/glossary/glossary.xml:1725(term)
-#: src/glossary/glossary.xml:1877(phrase)
-#: src/glossary/glossary.xml:1880(primary)
-#: src/glossary/glossary.xml:1884(secondary)
+#: src/glossary/glossary.xml:957(term) src/glossary/glossary.xml:1680(term)
+#: src/glossary/glossary.xml:1843(phrase)
+#: src/glossary/glossary.xml:1846(primary)
+#: src/glossary/glossary.xml:1850(secondary)
 msgid "Saturation"
 msgstr "饱å??度"
 
-#: src/glossary/glossary.xml:997(para)
+#: src/glossary/glossary.xml:959(para)
 msgid ""
 "This value describes how pale the color is. A completely unsaturated color "
 "is a shade of gray. As the saturation increases, the color becomes a pastel "
@@ -1110,13 +1042,13 @@ msgid ""
 "100, from white to the purest color."
 msgstr ""
 
-#: src/glossary/glossary.xml:1007(term) src/glossary/glossary.xml:2074(phrase)
-#: src/glossary/glossary.xml:2077(primary)
-#: src/glossary/glossary.xml:2081(secondary)
+#: src/glossary/glossary.xml:969(term) src/glossary/glossary.xml:2042(phrase)
+#: src/glossary/glossary.xml:2045(primary)
+#: src/glossary/glossary.xml:2049(secondary)
 msgid "Value"
 msgstr ""
 
-#: src/glossary/glossary.xml:1009(para)
+#: src/glossary/glossary.xml:971(para)
 msgid ""
 "This value describes the luminosity, the luminous intensity. It is the "
 "amount of light emitted by a color. You can see a change of luminosity when "
@@ -1127,13 +1059,13 @@ msgid ""
 "the RGB space (scaled to 0-100)."
 msgstr ""
 
-#: src/glossary/glossary.xml:1027(phrase)
-#: src/glossary/glossary.xml:1030(primary)
-#: src/glossary/glossary.xml:1034(secondary)
+#: src/glossary/glossary.xml:989(phrase)
+#: src/glossary/glossary.xml:992(primary)
+#: src/glossary/glossary.xml:996(secondary)
 msgid "HTML notation"
 msgstr "HTML æ ?è®°"
 
-#: src/glossary/glossary.xml:1037(para)
+#: src/glossary/glossary.xml:999(para)
 msgid ""
 "A hex triplet is a way of encoding a color for a computer. The <quote>#</"
 "quote> symbol indicates that the numbers which follow it are encoded in "
@@ -1143,12 +1075,12 @@ msgid ""
 "green and <quote>bb</quote> represents blue."
 msgstr ""
 
-#: src/glossary/glossary.xml:1050(phrase)
-#: src/glossary/glossary.xml:1053(primary)
+#: src/glossary/glossary.xml:1013(phrase)
+#: src/glossary/glossary.xml:1016(primary)
 msgid "Image Hose"
 msgstr ""
 
-#: src/glossary/glossary.xml:1056(para)
+#: src/glossary/glossary.xml:1019(para)
 msgid ""
 "An image hose in <acronym>GIMP</acronym> is a special type of brush which "
 "consists of several images. For example, you could have a brush with "
@@ -1158,7 +1090,7 @@ msgid ""
 "very powerful."
 msgstr ""
 
-#: src/glossary/glossary.xml:1064(para)
+#: src/glossary/glossary.xml:1027(para)
 msgid ""
 "An image hose is also sometimes called an <quote>image pipe</quote> or "
 "<quote>animated brush</quote>. An image hose is indicated in the Brushes "
@@ -1166,29 +1098,29 @@ msgid ""
 "symbol."
 msgstr ""
 
-#: src/glossary/glossary.xml:1070(para)
+#: src/glossary/glossary.xml:1033(para)
 msgid ""
-"For information concerning creating an image hose, please see the <link "
-"linkend=\"gimp-using-animated-brushes\">Using Animated Brushes</link> and "
-"<link linkend=\"gimp-using-brushes\">Using Brushes</link> sections."
+"For information concerning creating an image hose, please see the <xref "
+"linkend=\"gimp-using-animated-brushes\"/> and <xref linkend=\"gimp-using-"
+"brushes\"/>."
 msgstr ""
 
-#: src/glossary/glossary.xml:1080(phrase)
+#: src/glossary/glossary.xml:1043(phrase)
 msgid "Incremental, paint mode"
 msgstr ""
 
-#: src/glossary/glossary.xml:1083(primary)
+#: src/glossary/glossary.xml:1046(primary)
 msgid "Incremental"
 msgstr ""
 
-#: src/glossary/glossary.xml:1086(para)
+#: src/glossary/glossary.xml:1049(para)
 msgid ""
 "Incremental mode is a paint mode where each brush stroke is drawn directly "
 "on the active layer. When it is set, each additional stroke of the brush "
 "increases the effect of the brush, up to the maximum opacity for the brush."
 msgstr ""
 
-#: src/glossary/glossary.xml:1092(para)
+#: src/glossary/glossary.xml:1055(para)
 msgid ""
 "If incremental mode is not set, brush strokes are drawn on a canvas buffer, "
 "which is then combined with the active layer. The maximum effect of a brush "
@@ -1196,32 +1128,32 @@ msgid ""
 "does not increase the effect beyond this limit."
 msgstr ""
 
-#: src/glossary/glossary.xml:1110(para)
+#: src/glossary/glossary.xml:1075(para)
 msgid ""
 "The two images above were created using a brush with spacing set to 60 "
-"pixels. The image on the left shows non-incremental painting and the image "
+"percent. The image on the left shows non-incremental painting and the image "
 "on the right shows the difference with incremental painting."
 msgstr ""
 
-#: src/glossary/glossary.xml:1115(para)
+#: src/glossary/glossary.xml:1080(para)
 msgid ""
 "Incremental mode is a tool option that is shared by several brush tools, "
 "except those which have a <quote>rate</quote> control, which automatically "
 "implies an incremental effect. You can set it by checking the <guilabel "
-"moreinfo=\"none\">Incremental</guilabel> checkbox in the toolbox for the "
-"tool (Paintbrush, Pencil and Eraser)."
+"moreinfo=\"none\">Incremental</guilabel> checkbox in the tool option dialog "
+"for the tool (Paintbrush, Pencil and Eraser)."
 msgstr ""
 
-#: src/glossary/glossary.xml:1126(phrase)
-#: src/glossary/glossary.xml:1129(primary)
+#: src/glossary/glossary.xml:1092(phrase)
+#: src/glossary/glossary.xml:1095(primary)
 msgid "Indexed Colors"
 msgstr ""
 
-#: src/glossary/glossary.xml:1133(secondary)
+#: src/glossary/glossary.xml:1099(secondary)
 msgid "Indexed colors"
 msgstr ""
 
-#: src/glossary/glossary.xml:1136(para)
+#: src/glossary/glossary.xml:1102(para)
 msgid ""
 "Indexed color mode is a mode for encoding colors in an image where each "
 "pixel in the image is assigned an 8-bit color number. The color which "
@@ -1232,18 +1164,18 @@ msgid ""
 "linkend=\"glossary-colormodel\">color model</link>."
 msgstr ""
 
-#: src/glossary/glossary.xml:1146(para)
+#: src/glossary/glossary.xml:1112(para)
 msgid ""
 "See also the <link linkend=\"gimp-indexed-palette-dialog\">Indexed Palette</"
 "link> section and the <link linkend=\"gimp-image-convert-indexed\">Convert "
 "Image to Indexed Colors</link> command."
 msgstr ""
 
-#: src/glossary/glossary.xml:1156(phrase)
+#: src/glossary/glossary.xml:1123(phrase)
 msgid "Interpolation"
 msgstr "æ??å?¥"
 
-#: src/glossary/glossary.xml:1159(para)
+#: src/glossary/glossary.xml:1126(para)
 msgid ""
 "Interpolation means calculating intermediate values. When you enlarge "
 "(<quote>digitally zoom</quote>) or otherwise transform (rotate, shear or "
@@ -1251,106 +1183,81 @@ msgid ""
 "compute the colors of the pixels in the transformed image. <acronym>GIMP</"
 "acronym> offers three interpolation methods, which differ in quality and "
 "speed. In general, the better the quality, the more time the interpolation "
-"takes. The methods are:"
+"takes (see <link linkend=\"gimp-tool-interpolation-methods\">Interpolation "
+"methods</link>)."
 msgstr ""
 
-#: src/glossary/glossary.xml:1171(para)
-msgid ""
-"<emphasis>None</emphasis> (sometimes called <quote>Nearest Neighbor</"
-"quote>): The color of each pixel is copied from its closest neighboring "
-"pixel in the original image. This often results in aliasing (the "
-"<quote>stair-step</quote> effect) and a coarse image, but it is the fastest "
-"method."
-msgstr ""
-
-#: src/glossary/glossary.xml:1179(para)
-msgid ""
-"<emphasis>Linear</emphasis> (sometimes called <quote>Bilinear</quote>): The "
-"color of each pixel is computed as the average color of the four closest "
-"pixels in the original image. This gives a satisfactory result for most "
-"images and is a good compromise between speed and quality."
-msgstr ""
-
-#: src/glossary/glossary.xml:1187(para)
-msgid ""
-"<emphasis>Cubic</emphasis> (sometimes called <quote>Bicubic</quote>): The "
-"color of each pixel is computed as the average color of the eight closest "
-"pixels in the original image. This usually gives the best result, but it "
-"naturally takes more time."
-msgstr ""
-
-#: src/glossary/glossary.xml:1195(para)
+#: src/glossary/glossary.xml:1138(para)
 msgid ""
 "<acronym>GIMP</acronym> uses interpolation when you <link linkend=\"gimp-"
 "image-scale\">Scale</link> an image, <link linkend=\"gimp-layer-scale"
 "\">Scale</link> a layer, and when you <link linkend=\"gimp-tools-transform"
-"\">Transform</link> an image. You can also set the default interpolation "
-"method in the <link linkend=\"gimp-prefs-tool-options\">Tools Options "
-"Preferences</link> dialog."
+"\">Transform</link> an image."
 msgstr ""
 
-#: src/glossary/glossary.xml:1206(phrase)
-#: src/glossary/glossary.xml:1209(primary)
+#: src/glossary/glossary.xml:1149(phrase)
+#: src/glossary/glossary.xml:1152(primary)
 msgid "JPEG"
 msgstr "JPEG"
 
-#: src/glossary/glossary.xml:1212(para)
+#: src/glossary/glossary.xml:1155(para)
 msgid ""
 "JPEG is a <link linkend=\"glossary-fileformat\">file format</link> which "
 "supports compression and works at all color depths. The image compression is "
 "adjustable, but beware: Too high a compression could severely reduce image "
 "quality, since JPEG compression is lossy."
 msgstr ""
-"JPEG æ?¯ä¸?ç§?æ?¯æ??å??缩å??å??ç§?è?²æ·±ç??<link linkend=\"glossary-fileformat\">æ??件格å¼?</link>ã??"
-"å?¾å??å??缩级å?«æ?¯å?¯è°?ç??ï¼?ä½?æ?¯å¿?é¡»æ¸?æ¥?ï¼?è¿?é«?ç??å??缩级å?«å?¯è?½ä¸¥é??æ??害å?¾å??è´¨é??ï¼?å? ä¸º JPEG æ?¯æ??æ??å??缩ç??ã??"
+"JPEG æ?¯ä¸?ç§?æ?¯æ??å??缩å??å??ç§?è?²æ·±ç??<link linkend=\"glossary-fileformat\">æ??件格å¼?"
+"</link>ã??å?¾å??å??缩级å?«æ?¯å?¯è°?ç??ï¼?ä½?æ?¯å¿?é¡»æ¸?æ¥?ï¼?è¿?é«?ç??å??缩级å?«å?¯è?½ä¸¥é??æ??害å?¾å??è´¨"
+"é??ï¼?å? ä¸º JPEG æ?¯æ??æ??å??缩ç??ã??"
 
-#: src/glossary/glossary.xml:1218(para)
+#: src/glossary/glossary.xml:1161(para)
 msgid ""
 "Use JPEG to create web graphics or if you don't want your image to take up a "
 "lot of space. JPEG is a good format for photographs and for computer-"
 "generated images (CGI). It is not well suited for:"
 msgstr ""
-"使ç?¨ JPEG æ?¥å??建ç½?ç»?å?¾å½¢ï¼?æ??è??æ?¯ä¿?å­?é?£äº?ä¸?æ?³ç?¨å¤ªå¤?空é?´å?¨å­?ç??å?¾å??ã??JPEG é??ç?¨äº?ç?§ç??å??计ç®?æ?ºç??æ?? "
-"(CGI) ç??å?¾å??ï¼?ä½?ä¸?é??ç?¨äº?以ä¸?æ??å?µï¼?"
+"使ç?¨ JPEG æ?¥å??建ç½?ç»?å?¾å½¢ï¼?æ??è??æ?¯ä¿?å­?é?£äº?ä¸?æ?³ç?¨å¤ªå¤?空é?´å?¨å­?ç??å?¾å??ã??JPEG é??ç?¨äº?"
+"ç?§ç??å??计ç®?æ?ºç??æ?? (CGI) ç??å?¾å??ï¼?ä½?ä¸?é??ç?¨äº?以ä¸?æ??å?µï¼?"
 
-#: src/glossary/glossary.xml:1226(para)
+#: src/glossary/glossary.xml:1169(para)
 msgid ""
 "digital line drawings (for example, screenshots or vector graphics), in "
 "which there are many neighboring pixels with the same color values, few "
 "colors and hard edges,"
 msgstr ""
 
-#: src/glossary/glossary.xml:1233(para)
+#: src/glossary/glossary.xml:1176(para)
 msgid "Black and white images (only black and white, one bit per pixel) or"
 msgstr "é»?ç?½å?¾å??(ä»?é»?æ??ç?½ï¼?æ¯?å??ç´ ä»?ä¸?å­?è??)æ??è??"
 
-#: src/glossary/glossary.xml:1239(para)
+#: src/glossary/glossary.xml:1182(para)
 msgid "half-toned images (newsprint)."
 msgstr ""
 
-#: src/glossary/glossary.xml:1242(para)
+#: src/glossary/glossary.xml:1185(para)
 msgid ""
 "Other formats, such as GIF, PNG or JBIG, are far better for these kinds of "
 "images."
-msgstr ""
-"对äº?以ä¸?æ??å?µï¼?å?¶ä»?诸å¦? GIFï¼?PNG æ??è?? JBIG å?¯è?½è¿?è¿?ä¼?äº? JPEGã??"
+msgstr "对äº?以ä¸?æ??å?µï¼?å?¶ä»?诸å¦? GIFï¼?PNG æ??è?? JBIG å?¯è?½è¿?è¿?ä¼?äº? JPEGã??"
 
-#: src/glossary/glossary.xml:1246(para)
+#: src/glossary/glossary.xml:1189(para)
 msgid ""
 "In general, JPEG transformations are not reversible. Opening and then saving "
 "a JPEG file causes a new, lossy compression. Increasing the quality factor "
 "later will not bring back the image information which was lost."
 msgstr ""
-"ä¸?è?¬è??è¨?ï¼?JPEG é??æ??度æ?¯ä¸?å?¯é??ç??ã??æ??å¼?å??ä¿?å­?ä¸?个 JPEG æ??件å°?导è?´ä¸?次æ?°ç??æ??æ??å??缩ã??丢失ç??å?¾å??ä¿¡æ?¯"
-"æ? æ³?å?¨å??æ?¥è¡¥å?¿ã??"
+"ä¸?è?¬è??è¨?ï¼?JPEG é??æ??度æ?¯ä¸?å?¯é??ç??ã??æ??å¼?å??ä¿?å­?ä¸?个 JPEG æ??件å°?导è?´ä¸?次æ?°ç??æ??æ??å??"
+"缩ã??丢失ç??å?¾å??ä¿¡æ?¯æ? æ³?å?¨å??æ?¥è¡¥å?¿ã??"
 
-#: src/glossary/glossary.xml:1256(phrase)
-msgid "L*a*b"
+#: src/glossary/glossary.xml:1200(phrase)
+#, fuzzy
+msgid "L*a*b*"
 msgstr "L*a*b"
 
-#: src/glossary/glossary.xml:1259(para)
+#: src/glossary/glossary.xml:1203(para)
 msgid ""
-"The Lab color space (also called the L*a*b color space) is a <link linkend="
+"The Lab color space (also called the L*a*b* color space) is a <link linkend="
 "\"glossary-colormodel\">color model</link> developed in the beginning of the "
 "1930s by the Commission Internationale d`Eclairage (CIE). It includes all "
 "the colors that the human eye can perceive. That contains the colors of the "
@@ -1360,19 +1267,19 @@ msgid ""
 "blue-yellow parts of the color, respectively."
 msgstr ""
 
-#: src/glossary/glossary.xml:1271(para)
+#: src/glossary/glossary.xml:1215(para)
 msgid ""
 "In contrast to RGB or CMYK, Lab is not dependent upon the various input and "
 "output devices. For that reason, it is used as an exchange format between "
 "devices. Lab is also the internal color model of PostScript Level II."
 msgstr ""
 
-#: src/glossary/glossary.xml:1281(phrase)
-#: src/glossary/glossary.xml:1284(primary)
+#: src/glossary/glossary.xml:1226(phrase)
+#: src/glossary/glossary.xml:1229(primary)
 msgid "Layer"
 msgstr "��"
 
-#: src/glossary/glossary.xml:1287(para)
+#: src/glossary/glossary.xml:1232(para)
 msgid ""
 "You can think of layers as being a stack of slides which are more or less "
 "transparent. Each layer represents an aspect of the image and the image is "
@@ -1380,51 +1287,41 @@ msgid ""
 "background layer. The layers above it are the components of the foreground."
 msgstr ""
 
-#: src/glossary/glossary.xml:1294(para)
+#: src/glossary/glossary.xml:1239(para)
 msgid ""
 "You can view and manage the layers of the image through the <link linkend="
 "\"gimp-layer-dialog\">Layers dialog</link>."
 msgstr ""
 
-#: src/glossary/glossary.xml:1299(title)
+#: src/glossary/glossary.xml:1244(title)
 msgid "Example image with layers"
 msgstr "带å?¾å±?å?¾å??æ ·ä¾?"
 
-#: src/glossary/glossary.xml:1306(para)
+#: src/glossary/glossary.xml:1251(para)
 msgid "Representation of an image with layers"
 msgstr "å??å?¾å±?表示ç??ä¸?å¹?å?¾å??"
 
-#: src/glossary/glossary.xml:1314(para)
+#: src/glossary/glossary.xml:1259(para)
 msgid "The final image"
 msgstr "æ??ç»?å?¾å??"
 
-#: src/glossary/glossary.xml:1322(phrase)
+#: src/glossary/glossary.xml:1267(phrase)
 msgid "Marching Ants"
 msgstr ""
 
-#: src/glossary/glossary.xml:1325(para)
+#: src/glossary/glossary.xml:1270(para)
 msgid ""
 "Marching ants is a term which describes the dotted line which surrounds a "
 "selection. The line is animated, so it looks as if little ants are running "
 "around behind each other."
 msgstr ""
 
-#: src/glossary/glossary.xml:1330(para)
-msgid ""
-"You can disable the marching ants by unchecking the <menuchoice moreinfo="
-"\"none\"><guimenu moreinfo=\"none\"><accel>V</accel>iew</"
-"guimenu><guimenuitem moreinfo=\"none\">Show <accel>S</accel>election</"
-"guimenuitem></menuchoice> option or by using the keyboard shortcut <keycombo "
-"moreinfo=\"none\"><keycap moreinfo=\"none\">Ctrl</keycap><keycap moreinfo="
-"\"none\">T</keycap></keycombo>."
-msgstr ""
-
-#: src/glossary/glossary.xml:1340(phrase)
-#: src/glossary/glossary.xml:1343(primary)
+#: src/glossary/glossary.xml:1291(phrase)
+#: src/glossary/glossary.xml:1294(primary)
 msgid "Masks"
 msgstr "è??ç??"
 
-#: src/glossary/glossary.xml:1347(para)
+#: src/glossary/glossary.xml:1298(para)
 msgid ""
 "A mask is like a veil put over a layer (layer mask) or all the layers of an "
 "image (selection mask). You can remove this mask by painting with white "
@@ -1433,13 +1330,13 @@ msgid ""
 "will be transparent) or will be selected, according to the type of mask."
 msgstr ""
 
-#: src/glossary/glossary.xml:1355(para)
+#: src/glossary/glossary.xml:1306(para)
 msgid "There are two types of masks:"
 msgstr ""
 
-#: src/glossary/glossary.xml:1358(para)
+#: src/glossary/glossary.xml:1309(para)
 msgid ""
-"<emphasis>Layer Mask</emphasis> : Every layer can have its own mask. The "
+"<emphasis>Layer Mask</emphasis>: Every layer can have its own mask. The "
 "layer mask represents the Alpha channel of the layer and allows you to "
 "manage its transparency. By painting on the layer mask, you can make parts "
 "of the layer opaque or transparent: painting with black makes the layer "
@@ -1451,7 +1348,7 @@ msgid ""
 "link> section for more details."
 msgstr ""
 
-#: src/glossary/glossary.xml:1373(para)
+#: src/glossary/glossary.xml:1325(para)
 msgid ""
 "<emphasis>Channel Mask</emphasis>, also called <emphasis>Selection Mask</"
 "emphasis>: Channel Masks determine the transparency of a selection. By "
@@ -1467,32 +1364,33 @@ msgid ""
 "selection-masks\">Selection mask</link> section for more details."
 msgstr ""
 
-#: src/glossary/glossary.xml:1396(phrase)
-msgid "Moiré Effect"
+#: src/glossary/glossary.xml:1350(phrase)
+#, fuzzy
+msgid "Moir&eacute; Effect"
 msgstr "è?«å°?æ??æ??"
 
-#: src/glossary/glossary.xml:1399(primary)
-msgid "Moiré"
-msgstr "è?«å°?"
+#: src/glossary/glossary.xml:1353(primary)
+msgid "Moir&eacute;"
+msgstr ""
 
-#: src/glossary/glossary.xml:1402(para)
+#: src/glossary/glossary.xml:1356(para)
 msgid ""
-"The moiré effect (pronounce <quote>Moa-ray</quote>)is an unintended pattern "
-"which appears when a regular pattern of grids or lines interferes with "
-"another regular pattern placed over it. This can happen, for example, when "
-"you are scanning an image with a periodic structure (such as a checkered "
-"shirt or a half-toned image), scanning a digital image, taking a digital "
-"photograph of a periodic pattern, or even when silkscreening."
+"The moir&eacute; effect (pronounce <quote>Moa-ray</quote>) is an unintended "
+"pattern which appears when a regular pattern of grids or lines interferes "
+"with another regular pattern placed over it. This can happen, for example, "
+"when you are scanning an image with a periodic structure (such as a "
+"checkered shirt or a half-toned image), scanning a digital image, taking a "
+"digital photograph of a periodic pattern, or even when silkscreening."
 msgstr ""
 
-#: src/glossary/glossary.xml:1411(para)
+#: src/glossary/glossary.xml:1365(para)
 msgid ""
 "If you discover the problem in time, the best solution is to move the "
 "original image a little bit in the scanner or to change the camera angle "
 "slightly."
 msgstr ""
 
-#: src/glossary/glossary.xml:1416(para)
+#: src/glossary/glossary.xml:1370(para)
 msgid ""
 "If you cannot re-create the image file, <acronym>GIMP</acronym> offers some "
 "filters which may help you with the problem. For more information, see the "
@@ -1500,31 +1398,31 @@ msgid ""
 "\"plug-in-nlfilt\">NL Filter</link> (Non-Linear) filters."
 msgstr ""
 
-#: src/glossary/glossary.xml:1428(phrase)
-#: src/glossary/glossary.xml:1437(primary)
+#: src/glossary/glossary.xml:1383(phrase)
+#: src/glossary/glossary.xml:1392(primary)
 msgid "Parasite"
 msgstr ""
 
-#: src/glossary/glossary.xml:1431(primary)
-#: src/glossary/glossary.xml:2092(phrase)
-#: src/glossary/glossary.xml:2097(primary)
-#: src/glossary/glossary.xml:2107(secondary)
+#: src/glossary/glossary.xml:1386(primary)
+#: src/glossary/glossary.xml:2061(phrase)
+#: src/glossary/glossary.xml:2066(primary)
+#: src/glossary/glossary.xml:2076(secondary)
 msgid "XCF"
 msgstr "XCF"
 
-#: src/glossary/glossary.xml:1434(primary)
-#: src/glossary/glossary.xml:2100(primary)
+#: src/glossary/glossary.xml:1389(primary)
+#: src/glossary/glossary.xml:2069(primary)
 msgid ".xcf"
 msgstr ".xcf"
 
-#: src/glossary/glossary.xml:1440(para)
+#: src/glossary/glossary.xml:1395(para)
 msgid ""
 "A Parasite is additional data which may be written to an XCF file. A "
 "parasite is identified by a name, and can be thought of as an extension to "
 "the other information in an XCF file."
 msgstr ""
 
-#: src/glossary/glossary.xml:1445(para)
+#: src/glossary/glossary.xml:1400(para)
 msgid ""
 "Parasites of an image component may be read by <acronym>GIMP</acronym> plug-"
 "ins. Plug-ins may also define their own parasite names, which are ignored by "
@@ -1533,11 +1431,11 @@ msgid ""
 "and EXIF data."
 msgstr ""
 
-#: src/glossary/glossary.xml:1457(phrase)
+#: src/glossary/glossary.xml:1413(phrase)
 msgid "Path"
 msgstr "路�"
 
-#: src/glossary/glossary.xml:1460(para)
+#: src/glossary/glossary.xml:1416(para)
 msgid ""
 "A Path is a contour composed of straight lines, curves, or both. In "
 "<acronym>GIMP</acronym>, it is used to form the boundary of a selection, or "
@@ -1546,7 +1444,7 @@ msgid ""
 "is not saved when the image is written to a file (unless you use XCF format)."
 msgstr ""
 
-#: src/glossary/glossary.xml:1468(para)
+#: src/glossary/glossary.xml:1424(para)
 msgid ""
 "See the <link linkend=\"gimp-concepts-paths\">Paths Concepts</link> and "
 "<link linkend=\"gimp-using-paths\">Using Paths</link> sections for basic "
@@ -1556,11 +1454,11 @@ msgid ""
 "\">Paths dialog</link>."
 msgstr ""
 
-#: src/glossary/glossary.xml:1481(phrase)
+#: src/glossary/glossary.xml:1438(phrase)
 msgid "PDB"
 msgstr "PBD"
 
-#: src/glossary/glossary.xml:1484(para)
+#: src/glossary/glossary.xml:1441(para)
 msgid ""
 "All of the functions which <acronym>GIMP</acronym> and its extensions make "
 "available are registered in the Procedure Database (PDB). Developers can "
@@ -1568,13 +1466,13 @@ msgid ""
 "using the <link linkend=\"plug-in-dbbrowser\">Procedure Browser</link>."
 msgstr ""
 
-#: src/glossary/glossary.xml:1495(phrase)
-#: src/glossary/glossary.xml:1502(primary)
-#: src/glossary/glossary.xml:1506(secondary)
+#: src/glossary/glossary.xml:1453(phrase)
+#: src/glossary/glossary.xml:1456(primary)
+#: src/glossary/glossary.xml:1460(secondary)
 msgid "PDF"
 msgstr "PDF"
 
-#: src/glossary/glossary.xml:1509(para)
+#: src/glossary/glossary.xml:1463(para)
 msgid ""
 "PDF (Portable Document Format) is a <link linkend=\"glossary-fileformat"
 "\">file format</link> which was developed by Adobe to address some of the "
@@ -1584,12 +1482,12 @@ msgid ""
 "libraries."
 msgstr ""
 
-#: src/glossary/glossary.xml:1522(phrase)
-#: src/glossary/glossary.xml:1525(primary)
+#: src/glossary/glossary.xml:1477(phrase)
+#: src/glossary/glossary.xml:1480(primary)
 msgid "Pixel"
 msgstr "å??ç´ "
 
-#: src/glossary/glossary.xml:1528(para)
+#: src/glossary/glossary.xml:1483(para)
 msgid ""
 "A pixel is a single dot, or <quote>picture element</quote>, of an image. A "
 "rectangular image may be composed of thousands of pixels, each representing "
@@ -1599,38 +1497,39 @@ msgid ""
 "Alpha (transparency)."
 msgstr ""
 
-#: src/glossary/glossary.xml:1542(phrase)
+#: src/glossary/glossary.xml:1498(phrase)
 msgid "Plugin"
 msgstr "æ??件"
 
-#: src/glossary/glossary.xml:1545(primary)
+#: src/glossary/glossary.xml:1501(primary)
 msgid "Plugins"
 msgstr "æ??件"
 
-#: src/glossary/glossary.xml:1546(secondary)
+#: src/glossary/glossary.xml:1502(secondary)
 msgid "Definition"
 msgstr "å??辨ç??"
 
-#: src/glossary/glossary.xml:1549(para)
+#: src/glossary/glossary.xml:1505(para)
 msgid ""
 "Optional extensions for the <acronym>GIMP</acronym>. Plugins are external "
 "programs that run under the control of the main GIMP application and provide "
 "specific functions on-demand. See <xref linkend=\"gimp-concepts-plugins\"/> "
 "for further information."
 msgstr ""
-"å?¯é??ç?? <acronym>GIMP</acronym> æ?©å±?ã??æ??件æ?¯ä¸?äº?å?¨ GIMP 主ç¨?åº?æ?§å?¶ä¸?è¿?è¡?ç??æ??ä¾?ç?®æ ?å??è?½ç??å¤?é?¨"
-"ç¨?åº?ï¼?æ?¥ç??<xref linkend=\"gimp-concepts-plugins\"/>以è?·å¾?æ?´å¤?ä¿¡æ?¯ã??"
+"å?¯é??ç?? <acronym>GIMP</acronym> æ?©å±?ã??æ??件æ?¯ä¸?äº?å?¨ GIMP 主ç¨?åº?æ?§å?¶ä¸?è¿?è¡?ç??æ??ä¾?"
+"ç?®æ ?å??è?½ç??å¤?é?¨ç¨?åº?ï¼?æ?¥ç??<xref linkend=\"gimp-concepts-plugins\"/>以è?·å¾?æ?´å¤?ä¿¡"
+"æ?¯ã??"
 
-#: src/glossary/glossary.xml:1559(phrase)
-#: src/glossary/glossary.xml:1562(primary)
+#: src/glossary/glossary.xml:1516(phrase)
+#: src/glossary/glossary.xml:1519(primary)
 msgid "PNG"
 msgstr "PNG"
 
-#: src/glossary/glossary.xml:1565(primary)
+#: src/glossary/glossary.xml:1522(primary)
 msgid ".png"
 msgstr ".png"
 
-#: src/glossary/glossary.xml:1568(para)
+#: src/glossary/glossary.xml:1525(para)
 msgid ""
 "PNG is the acronym of <quote>Portable Network Graphic</quote> (pronounce "
 "<quote>ping</quote>. This recent format offers many advantages and a few "
@@ -1640,17 +1539,17 @@ msgid ""
 "True Colors (several millions of colors), indexed images (256 colors like "
 "GIF), and 256 transparency levels (while GIF supports only two levels)."
 msgstr ""
-"PNG æ?¯<quote>便æ?ºå¼?ç½?ç»?å?¾å½¢ (Portable Network Graphic)</quote> ç??æ??å??ã??è¿?ç§?æ ¼å¼?带æ?¥"
-"äº?许å¤?ä¼?ç?¹å??ä¸?äº?缺ç?¹ï¼?å®?æ?¯æ? æ??ç??ä½?æ?¯æ??件ä½?积æ¯? JPEG æ ¼å¼?æ?´å¤§ï¼?ä½?æ?¯å®?å?¯ä»¥å?¨æ?¨å¤?次å­?å?¨å?¾å??ç??æ?¶å??"
-"ä¸?ä¼?丢失任ä½?æ?°æ?®ã??å®?æ?¯æ??â??ç??彩è?²â??(æ?°ç?¾ä¸?è?²å½©)ï¼?ç´¢å¼?å?¾å??(å?? GIF ä¸?æ ·ç??256è?²) å?? 256 级é??æ??度 "
-"(GIF ä»?æ?¯æ??两å±?)ã??"
+"PNG æ?¯<quote>便æ?ºå¼?ç½?ç»?å?¾å½¢ (Portable Network Graphic)</quote> ç??æ??å??ã??è¿?ç§?æ ¼"
+"å¼?带æ?¥äº?许å¤?ä¼?ç?¹å??ä¸?äº?缺ç?¹ï¼?å®?æ?¯æ? æ??ç??ä½?æ?¯æ??件ä½?积æ¯? JPEG æ ¼å¼?æ?´å¤§ï¼?ä½?æ?¯å®?å?¯"
+"以å?¨æ?¨å¤?次å­?å?¨å?¾å??ç??æ?¶å??ä¸?ä¼?丢失任ä½?æ?°æ?®ã??å®?æ?¯æ??â??ç??彩è?²â??(æ?°ç?¾ä¸?è?²å½©)ï¼?ç´¢å¼?å?¾"
+"å??(å?? GIF ä¸?æ ·ç??256è?²) å?? 256 级é??æ??度 (GIF ä»?æ?¯æ??两å±?)ã??"
 
-#: src/glossary/glossary.xml:1582(glossterm)
-#: src/glossary/glossary.xml:1585(secondary)
+#: src/glossary/glossary.xml:1539(glossterm)
+#: src/glossary/glossary.xml:1542(secondary)
 msgid "PostScript"
 msgstr "PostScript"
 
-#: src/glossary/glossary.xml:1588(para)
+#: src/glossary/glossary.xml:1545(para)
 msgid ""
 "Created by Adobe, PostScript is a page description language mainly used by "
 "printers and other output devices. It's also an excellent way to distribute "
@@ -1658,7 +1557,7 @@ msgid ""
 "depends on a powerful free software program called Ghostscript."
 msgstr ""
 
-#: src/glossary/glossary.xml:1595(para)
+#: src/glossary/glossary.xml:1552(para)
 msgid ""
 "The great power of PostScript is its ability to represent vector graphicsâ??"
 "lines, curves, text, paths, etc.â??in a resolution-independent way. PostScript "
@@ -1668,17 +1567,17 @@ msgid ""
 "acronym> or another graphics program."
 msgstr ""
 
-#: src/glossary/glossary.xml:1608(phrase)
-#: src/glossary/glossary.xml:1615(primary)
-#: src/glossary/glossary.xml:1622(secondary)
+#: src/glossary/glossary.xml:1565(phrase)
+#: src/glossary/glossary.xml:1568(primary)
+#: src/glossary/glossary.xml:1575(secondary)
 msgid "PSD"
 msgstr "PSD"
 
-#: src/glossary/glossary.xml:1618(primary)
+#: src/glossary/glossary.xml:1571(primary)
 msgid ".psd"
 msgstr ".psd"
 
-#: src/glossary/glossary.xml:1625(para) src/glossary/glossary.xml:1640(para)
+#: src/glossary/glossary.xml:1578(para) src/glossary/glossary.xml:1593(para)
 msgid ""
 "PSD is Adobe Photoshop's native <link linkend=\"glossary-fileformat\">file "
 "format</link>, and it is therefore comparable to <link linkend=\"glossary-xcf"
@@ -1692,12 +1591,12 @@ msgid ""
 "it very difficult to maintain up-to-date support for PSD files."
 msgstr ""
 
-#: src/glossary/glossary.xml:1659(phrase)
-#: src/glossary/glossary.xml:1662(primary)
+#: src/glossary/glossary.xml:1613(phrase)
+#: src/glossary/glossary.xml:1616(primary)
 msgid "Quantization"
 msgstr ""
 
-#: src/glossary/glossary.xml:1665(para)
+#: src/glossary/glossary.xml:1619(para)
 msgid ""
 "Quantization is the process of reducing the color of a pixel into one of a "
 "number of fixed values by matching the color to the nearest color in the "
@@ -1709,7 +1608,7 @@ msgid ""
 "colors."
 msgstr ""
 
-#: src/glossary/glossary.xml:1675(para)
+#: src/glossary/glossary.xml:1629(para)
 msgid ""
 "One way to reduce quantization effects is to use <link linkend=\"glossary-"
 "dithering\">Dithering</link>. The operations in <acronym>GIMP</acronym> "
@@ -1719,15 +1618,15 @@ msgid ""
 "they only work on RGB images and not on Indexed images."
 msgstr ""
 
-#: src/glossary/glossary.xml:1690(phrase)
+#: src/glossary/glossary.xml:1645(phrase)
 msgid "Rendering Intent"
 msgstr ""
 
-#: src/glossary/glossary.xml:1693(primary)
+#: src/glossary/glossary.xml:1648(primary)
 msgid "Color Management"
 msgstr "è?²å½©ç®¡ç??"
 
-#: src/glossary/glossary.xml:1696(para)
+#: src/glossary/glossary.xml:1651(para)
 msgid ""
 "Rendering intents are ways of dealing with colors that are out-of-<xref "
 "linkend=\"glossary-gamut\"/> colors present in the source space that the "
@@ -1735,22 +1634,22 @@ msgid ""
 "intents defined by the ICC:"
 msgstr ""
 
-#: src/glossary/glossary.xml:1704(term)
+#: src/glossary/glossary.xml:1659(term)
 msgid "Perceptual"
 msgstr ""
 
-#: src/glossary/glossary.xml:1706(para)
+#: src/glossary/glossary.xml:1661(para)
 msgid ""
 "This rendering intent is typically used for photographic content. It scales "
 "one gamut to fit into the other while maintaining the relative position of "
 "colors."
 msgstr ""
 
-#: src/glossary/glossary.xml:1714(term)
+#: src/glossary/glossary.xml:1669(term)
 msgid "Relative colorimetric"
 msgstr ""
 
-#: src/glossary/glossary.xml:1716(para)
+#: src/glossary/glossary.xml:1671(para)
 msgid ""
 "This rendering intent is typically used for spot colors. Colors that are not "
 "out of gamut are left unchanged. Colors outside the gamut are converted to "
@@ -1758,28 +1657,28 @@ msgid ""
 "gamut."
 msgstr ""
 
-#: src/glossary/glossary.xml:1727(para)
+#: src/glossary/glossary.xml:1682(para)
 msgid ""
 "This method is typically used for business graphics. The relative saturation "
 "of colors is mostly maintained, but lightning is usually changed."
 msgstr ""
 
-#: src/glossary/glossary.xml:1735(term)
+#: src/glossary/glossary.xml:1690(term)
 msgid "Absolute colorimetric"
 msgstr ""
 
-#: src/glossary/glossary.xml:1737(para)
+#: src/glossary/glossary.xml:1692(para)
 msgid ""
 "This rendering intent is most often used in proofing. It preserves the "
 "native device white point of the source image."
 msgstr ""
 
-#: src/glossary/glossary.xml:1755(secondary)
-#: src/glossary/glossary.xml:1760(phrase)
+#: src/glossary/glossary.xml:1710(secondary)
+#: src/glossary/glossary.xml:1715(phrase)
 msgid "Additive color model"
 msgstr "è?²å½©å? å? æ¨¡å??"
 
-#: src/glossary/glossary.xml:1768(para)
+#: src/glossary/glossary.xml:1724(para)
 msgid ""
 "RGB is a <link linkend=\"glossary-colormodel\">color model</link> which has "
 "components for Red, Green and Blue. These colors are emitted by screen "
@@ -1791,14 +1690,14 @@ msgid ""
 "<emphasis>additive</emphasis>."
 msgstr ""
 
-#: src/glossary/glossary.xml:1779(para)
+#: src/glossary/glossary.xml:1735(para)
 msgid ""
 "<acronym>GIMP</acronym> uses eight bits per channel for each primary color. "
 "That means there are 256 intensities (Values) available, resulting in "
 "256Ã?256Ã?256 = 16,777,216 colors."
 msgstr ""
 
-#: src/glossary/glossary.xml:1783(para)
+#: src/glossary/glossary.xml:1739(para)
 msgid ""
 "It is not obvious why a given combination of primary colors produces a "
 "particular color. Why, for instance, does 229R+205G+229B give a shade of "
@@ -1810,7 +1709,7 @@ msgid ""
 "from these differences."
 msgstr ""
 
-#: src/glossary/glossary.xml:1793(para)
+#: src/glossary/glossary.xml:1749(para)
 msgid ""
 "It is easy to see that no light (0R+0G+0B) produces complete darkness, "
 "black, and that full light (255R+255G+255B) produces white. Equal intensity "
@@ -1818,7 +1717,7 @@ msgid ""
 "be 256 gray levels in <acronym>GIMP</acronym>."
 msgstr ""
 
-#: src/glossary/glossary.xml:1799(para)
+#: src/glossary/glossary.xml:1755(para)
 msgid ""
 "Mixing two <emphasis>Primary colors</emphasis> in RGB mode gives a "
 "<emphasis>Secondary color</emphasis>, that is, a color in the CMY model. "
@@ -1828,17 +1727,17 @@ msgid ""
 "primary color in the chromatic circle:"
 msgstr ""
 
-#: src/glossary/glossary.xml:1811(phrase)
+#: src/glossary/glossary.xml:1766(title)
 msgid "Colorcircle"
 msgstr "��"
 
-#: src/glossary/glossary.xml:1818(para)
+#: src/glossary/glossary.xml:1773(para)
 msgid ""
 "Mixing a primary color with its complementary color gives gray (a neutral "
 "color)."
 msgstr ""
 
-#: src/glossary/glossary.xml:1825(para)
+#: src/glossary/glossary.xml:1780(para)
 msgid ""
 "It is important to know what happens when you are dealing with colors in "
 "<acronym>GIMP</acronym>. The most important rule to remember is that "
@@ -1850,32 +1749,19 @@ msgid ""
 "is the complementary color of Green."
 msgstr ""
 
-#: src/glossary/glossary.xml:1836(para)
-msgid ""
-"<emphasis>Exercise</emphasis> : You can check this out. Create a new image "
-"with only a white background (255R+255G+255B). Open the <menuchoice moreinfo="
-"\"none\"><guimenu moreinfo=\"none\">Tools</guimenu><guisubmenu moreinfo="
-"\"none\">Color Tools</guisubmenu><guimenuitem moreinfo=\"none\">Levels</"
-"guimenuitem></menuchoice> dialog and select the Red channel. If necessary, "
-"check the preview box. Move the white slider to the left to decrease the Red "
-"value. You will notice that the background of your image gets closer and "
-"closer to Cyan. Now, decrease the Blue channel: only the Green will remain. "
-"For practice, go backwards, add a color and try to guess what hue will "
-"appear."
-msgstr ""
-
-#: src/glossary/glossary.xml:1847(para)
+#. probably this is off-topic too...
+#: src/glossary/glossary.xml:1811(para)
 msgid ""
 "The <link linkend=\"gimp-tool-color-picker\">Color Picker</link> tool lets "
 "you find out the RGB values of a pixel and the <link linkend=\"glossary-html-"
 "notation\">hextriplet</link> for the color."
 msgstr ""
 
-#: src/glossary/glossary.xml:1857(phrase)
+#: src/glossary/glossary.xml:1822(phrase)
 msgid "Sample Merge"
 msgstr ""
 
-#: src/glossary/glossary.xml:1860(para)
+#: src/glossary/glossary.xml:1825(para)
 msgid ""
 "Sample Merged is an option you can set when you use the <link linkend=\"gimp-"
 "tool-bucket-fill\">Bucket Fill</link> tool, the <link linkend=\"gimp-tool-"
@@ -1888,19 +1774,19 @@ msgid ""
 "not checked, the color used is the color of the active layer itself."
 msgstr ""
 
-#: src/glossary/glossary.xml:1887(para)
+#: src/glossary/glossary.xml:1853(para)
 msgid ""
 "This term refers to color purity. Imagine you add pigment to white paint. "
 "Saturation varies from 0 (white, fully toned down, fully diluted) to 100 "
 "(pure color)."
 msgstr ""
 
-#: src/glossary/glossary.xml:1896(phrase)
-#: src/glossary/glossary.xml:1899(primary)
+#: src/glossary/glossary.xml:1863(phrase)
+#: src/glossary/glossary.xml:1866(primary)
 msgid "Supersampling"
 msgstr "è¶?é??æ ·"
 
-#: src/glossary/glossary.xml:1902(para)
+#: src/glossary/glossary.xml:1869(para)
 msgid ""
 "Supersampling is a more sophisticated antialiasing technique, that is, a "
 "method of reducing jagged and stair-stepped edges along a slanted or curved "
@@ -1912,7 +1798,7 @@ msgid ""
 "pixels to another along the edges of objects."
 msgstr ""
 
-#: src/glossary/glossary.xml:1913(para)
+#: src/glossary/glossary.xml:1880(para)
 msgid ""
 "The quality of the result depends on the number of samples. Supersampling is "
 "often performed at a range of 2Ã? to 16Ã? the original size. It greatly "
@@ -1920,7 +1806,7 @@ msgid ""
 "space needed to store the image in memory."
 msgstr ""
 
-#: src/glossary/glossary.xml:1919(para)
+#: src/glossary/glossary.xml:1886(para)
 msgid ""
 "One way to reduce the space and time requirement is to use Adaptive "
 "Supersampling. This method takes advantage of the fact that very few pixels "
@@ -1932,31 +1818,31 @@ msgid ""
 "improves performance."
 msgstr ""
 
-#: src/glossary/glossary.xml:1933(phrase)
-#: src/glossary/glossary.xml:1936(primary)
-#: src/glossary/glossary.xml:1940(secondary)
+#: src/glossary/glossary.xml:1901(phrase)
+#: src/glossary/glossary.xml:1904(primary)
+#: src/glossary/glossary.xml:1908(secondary)
 msgid "SVG"
 msgstr "SVG"
 
-#: src/glossary/glossary.xml:1943(para)
+#: src/glossary/glossary.xml:1911(para)
 msgid ""
-"SVG stands for Scalable Vector Graphics. It a format for two-dimensional "
+"SVG stands for Scalable Vector Graphics. It is a format for two-dimensional "
 "vector graphics, both static and animated. You can export GIMP paths to SVG "
 "and you can import SVG documents into GIMP from a vector graphic software. "
 "See <xref linkend=\"bibliography-online-wkpd-svg\"/> for more details."
 msgstr ""
 
-#: src/glossary/glossary.xml:1954(phrase)
-#: src/glossary/glossary.xml:1960(primary)
-#: src/glossary/glossary.xml:1967(secondary)
+#: src/glossary/glossary.xml:1922(phrase)
+#: src/glossary/glossary.xml:1925(primary)
+#: src/glossary/glossary.xml:1932(secondary)
 msgid "TGA"
 msgstr "TGA"
 
-#: src/glossary/glossary.xml:1963(primary)
+#: src/glossary/glossary.xml:1928(primary)
 msgid "TARGA"
 msgstr "TARGA"
 
-#: src/glossary/glossary.xml:1970(para)
+#: src/glossary/glossary.xml:1935(para)
 msgid ""
 "TGA (TARGA Image File) is a <link linkend=\"glossary-fileformat\">file "
 "format</link> which supports 8, 16, 24 or 32 bits per pixel and optional RLE "
@@ -1965,12 +1851,12 @@ msgid ""
 "quote> stands for Truevision Advanced Raster Graphics Adapter."
 msgstr ""
 
-#: src/glossary/glossary.xml:1983(phrase)
-#: src/glossary/glossary.xml:1988(primary)
+#: src/glossary/glossary.xml:1949(phrase)
+#: src/glossary/glossary.xml:1952(primary)
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/glossary/glossary.xml:1991(para)
+#: src/glossary/glossary.xml:1955(para)
 msgid ""
 "TIFF (Tagged Image File Format) is a <link linkend=\"glossary-fileformat"
 "\">file format</link> which was developed primarily for scanned raster "
@@ -1984,11 +1870,11 @@ msgid ""
 "like FrameMaker or CorelDRAW."
 msgstr ""
 
-#: src/glossary/glossary.xml:2008(phrase)
+#: src/glossary/glossary.xml:1973(phrase)
 msgid "Tile"
 msgstr ""
 
-#: src/glossary/glossary.xml:2011(para)
+#: src/glossary/glossary.xml:1976(para)
 msgid ""
 "A Tile is a part of an image which <acronym>GIMP</acronym> currently has "
 "open. In order to avoid having to store an entire image in memory at the "
@@ -1997,7 +1883,7 @@ msgid ""
 "may be smaller than that."
 msgstr ""
 
-#: src/glossary/glossary.xml:2019(para)
+#: src/glossary/glossary.xml:1984(para)
 msgid ""
 "At any time, a tile may be in main memory, in the tile cache in RAM, or on "
 "disk. Tiles which are currently being worked on are in main memory. Tiles "
@@ -2007,18 +1893,18 @@ msgid ""
 "are needed."
 msgstr ""
 
-#: src/glossary/glossary.xml:2027(para)
+#: src/glossary/glossary.xml:1992(para)
 msgid ""
 "Do not confuse these tiles with those in the <link linkend=\"plug-in-tile"
 "\">Tile Filter</link>"
 msgstr ""
 
-#: src/glossary/glossary.xml:2035(phrase)
-#: src/glossary/glossary.xml:2038(primary)
+#: src/glossary/glossary.xml:2001(phrase)
+#: src/glossary/glossary.xml:2004(primary)
 msgid "URI"
 msgstr "URI"
 
-#: src/glossary/glossary.xml:2041(para)
+#: src/glossary/glossary.xml:2007(para)
 msgid ""
 "A Uniform Resource Identifier (URI) is a string of characters that serves to "
 "identify an abstract or a physical resource. URIs are used for the "
@@ -2027,12 +1913,12 @@ msgid ""
 "and they are especially used in the Worldwide Web."
 msgstr ""
 
-#: src/glossary/glossary.xml:2052(phrase)
-#: src/glossary/glossary.xml:2055(primary)
+#: src/glossary/glossary.xml:2019(phrase)
+#: src/glossary/glossary.xml:2022(primary)
 msgid "URL"
 msgstr "URL"
 
-#: src/glossary/glossary.xml:2058(para)
+#: src/glossary/glossary.xml:2025(para)
 msgid ""
 "URLs (Uniform Resource Locators) are one type of Uniform Resource "
 "Identifiers (URIs). URLs identify a resource by its primary access mechanism "
@@ -2042,23 +1928,23 @@ msgid ""
 "and mailto."
 msgstr ""
 
-#: src/glossary/glossary.xml:2066(para)
+#: src/glossary/glossary.xml:2033(para)
 msgid ""
 "Since URLs are the first and most common kinds of URIs, the terms are often "
 "used synonymously."
 msgstr ""
 
-#: src/glossary/glossary.xml:2084(para)
+#: src/glossary/glossary.xml:2052(para)
 msgid ""
 "This term often refers to the light intensity, the luminosity of a color. It "
 "varies from 0 (black) to 100 (full light)."
 msgstr ""
 
-#: src/glossary/glossary.xml:2103(primary)
+#: src/glossary/glossary.xml:2072(primary)
 msgid ".xcf.gz"
 msgstr ".xcf.gz"
 
-#: src/glossary/glossary.xml:2110(para)
+#: src/glossary/glossary.xml:2079(para)
 msgid ""
 "XCF is a <link linkend=\"glossary-fileformat\">file format</link> which is "
 "special because it is <acronym>GIMP</acronym>'s native file format: that is, "
@@ -2068,7 +1954,7 @@ msgid ""
 "that can read them."
 msgstr ""
 
-#: src/glossary/glossary.xml:2118(para)
+#: src/glossary/glossary.xml:2087(para)
 msgid ""
 "When an image is stored as an XCF file, the file encodes nearly everything "
 "there is to know about the image: the pixel data for each of the layers, the "
@@ -2077,7 +1963,7 @@ msgid ""
 "saved in an XCF file is the undo history."
 msgstr ""
 
-#: src/glossary/glossary.xml:2125(para)
+#: src/glossary/glossary.xml:2094(para)
 msgid ""
 "The pixel data in an XCF file is represented in a lossless compressed form: "
 "the image byte blocks are compressed using the lossless RLE algorithm. This "
@@ -2090,7 +1976,7 @@ msgid ""
 "more."
 msgstr ""
 
-#: src/glossary/glossary.xml:2137(para)
+#: src/glossary/glossary.xml:2106(para)
 msgid ""
 "The <acronym>GIMP</acronym> developers have made a great effort to keep the "
 "XCF file format compatible across versions. If you create a file using "
@@ -2102,7 +1988,7 @@ msgid ""
 "ordinary image layer if the file is opened in <acronym>GIMP</acronym> 1.2."
 msgstr ""
 
-#: src/glossary/glossary.xml:2159(para)
+#: src/glossary/glossary.xml:2129(para)
 msgid ""
 "YCbCr is a <link linkend=\"glossary-colormodel\">color model</link> which "
 "was developed for the PAL television standard as a simple modification to "
@@ -2116,7 +2002,7 @@ msgid ""
 "value."
 msgstr ""
 
-#: src/glossary/glossary.xml:2172(para)
+#: src/glossary/glossary.xml:2142(para)
 msgid ""
 "There are color models which do not express a color by the additive basic "
 "colors, red, green and blue (RGB), but by other properties, for example, the "
@@ -2132,12 +2018,12 @@ msgid ""
 "color models are called brightness-color models."
 msgstr ""
 
-#: src/glossary/glossary.xml:2188(para)
+#: src/glossary/glossary.xml:2158(para)
 msgid ""
 "The YCbCr model is a slight adaptation of such a brightness-color model. An "
-"RBG color value is divided into a basic brightness, Y, and two components, "
+"RGB color value is divided into a basic brightness, Y, and two components, "
 "Cb and Cr, where Cb is a measurement of the deviation from gray in the blue "
-"direction, or if it is less that 0.5, in the direction of yellow. Cr is the "
+"direction, or if it is less than 0.5, in the direction of yellow. Cr is the "
 "corresponding measurement for the difference in the direction of red or "
 "turquoise. This representation uses the peculiarity of the eye of being "
 "especially sensitive to green light. That is why most of the information "
@@ -2147,7 +2033,7 @@ msgid ""
 "practical applications, such as on DVDs."
 msgstr ""
 
-#: src/glossary/glossary.xml:2212(para)
+#: src/glossary/glossary.xml:2183(para)
 msgid ""
 "YUV is a <link linkend=\"glossary-colormodel\">color model</link> which uses "
 "two components to represent the color information, luma (the strength of the "
@@ -2164,7 +2050,7 @@ msgid ""
 "actually used. This often causes confusion."
 msgstr ""
 
-#: src/glossary/glossary.xml:2229(para)
+#: src/glossary/glossary.xml:2200(para)
 msgid ""
 "For the calculation of the luma signals, the underlying RGB data is first "
 "adjusted with the <link linkend=\"glossary-gamma\">gamma</link> value of the "
@@ -2174,11 +2060,11 @@ msgid ""
 "the black-and-white signal) for the old black and white televisions."
 msgstr ""
 
-#: src/glossary/glossary.xml:2238(para)
+#: src/glossary/glossary.xml:2209(para)
 msgid "Y=R+G+B"
 msgstr "Y=R+G+B"
 
-#: src/glossary/glossary.xml:2239(para)
+#: src/glossary/glossary.xml:2210(para)
 msgid ""
 "The exact calculation is more complicated, however, since some aspects of "
 "the color perception of the human eye have to be taken into account. For "
@@ -2187,40 +2073,40 @@ msgid ""
 "basic color is first performed."
 msgstr ""
 
-#: src/glossary/glossary.xml:2246(para)
+#: src/glossary/glossary.xml:2217(para)
 msgid ""
 "The chrominance signals, and the color difference signals also, contain the "
 "color information. They are formed by the difference of blue minus luma or "
 "red minus luma."
 msgstr ""
 
-#: src/glossary/glossary.xml:2251(para)
+#: src/glossary/glossary.xml:2222(para)
 msgid "U=B-Y"
 msgstr "U=B-Y"
 
-#: src/glossary/glossary.xml:2252(para)
+#: src/glossary/glossary.xml:2223(para)
 msgid "V=R-Y"
 msgstr "V=R-Y"
 
-#: src/glossary/glossary.xml:2253(para)
+#: src/glossary/glossary.xml:2224(para)
 msgid ""
 "From the three generated components, Y, U and V, the individual color "
 "proportions of the basic color can be calculated again later:"
 msgstr ""
 
-#: src/glossary/glossary.xml:2257(para)
+#: src/glossary/glossary.xml:2228(para)
 msgid "Y + U = Y + ( B - Y ) = Y - Y + B = B"
 msgstr "Y + U = Y + ( B - Y ) = Y - Y + B = B"
 
-#: src/glossary/glossary.xml:2258(para)
+#: src/glossary/glossary.xml:2229(para)
 msgid "Y + V = Y + ( R - Y ) = Y - Y + R = R"
 msgstr "Y + V = Y + ( R - Y ) = Y - Y + R = R"
 
-#: src/glossary/glossary.xml:2259(para)
+#: src/glossary/glossary.xml:2230(para)
 msgid "Y - B - R = ( R + G + B ) - B - R = G"
 msgstr "Y - B - R = ( R + G + B ) - B - R = G"
 
-#: src/glossary/glossary.xml:2260(para)
+#: src/glossary/glossary.xml:2231(para)
 msgid ""
 "Furthermore, because of the structure of the retina of the human eye, it "
 "turns out that the brightness information is perceived at a higher "
@@ -2231,5 +2117,12 @@ msgstr ""
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
 #: src/glossary/glossary.xml:0(None)
 msgid "translator-credits"
-msgstr ""
-"Aron Xu <aronxu gnome org>, 2009."
+msgstr "Aron Xu <aronxu gnome org>, 2009."
+
+#~ msgid ""
+#~ "@@image: 'images/using/path-with-anchors.png'; md5=THIS FILE DOESN'T EXIST"
+#~ msgstr ""
+#~ "@@image: 'images/using/path-with-anchors.png'; md5=THIS FILE DOESN'T EXIST"
+
+#~ msgid "Moiré"
+#~ msgstr "è?«å°?"
diff --git a/po/zh_CN/introduction.po b/po/zh_CN/introduction.po
index 245347e..c004757 100644
--- a/po/zh_CN/introduction.po
+++ b/po/zh_CN/introduction.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:35+0800\n"
 "Last-Translator: Aron Xu <aronxu gnome org>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -40,21 +40,20 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/introduction/whats-new.xml:171(None)
+#: src/introduction/whats-new.xml:172(None)
 msgid "@@image: 'images/using/brush-dynamics.jpg'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 "@@image: 'images/using/brush-dynamics.jpg'; md5=THIS FILE DOESN'T EXIST"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/introduction/whats-new.xml:202(None)
+#: src/introduction/whats-new.xml:204(None)
 msgid "@@image: 'images/using/text-tool.png'; md5=THIS FILE DOESN'T EXIST"
-msgstr ""
-"@@image: 'images/using/text-tool.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr "@@image: 'images/using/text-tool.png'; md5=THIS FILE DOESN'T EXIST"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/introduction/whats-new.xml:218(None)
+#: src/introduction/whats-new.xml:220(None)
 msgid ""
 "@@image: 'images/using/rectangle-handles.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -62,7 +61,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/introduction/whats-new.xml:308(None)
+#: src/introduction/whats-new.xml:310(None)
 msgid ""
 "@@image: 'images/using/gimp-curves-tool-2-4-vs-2-6.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -72,7 +71,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/introduction/whats-new.xml:346(None)
+#: src/introduction/whats-new.xml:348(None)
 msgid ""
 "@@image: 'images/using/experimental-gegl-tool.png'; md5=THIS FILE DOESN'T "
 "EXIST"
@@ -122,11 +121,11 @@ msgstr ""
 
 #: src/introduction/whats-new.xml:55(para)
 msgid ""
-"With the empty image window acting as a natural main window, the default "
-"window hints for the Toolbox and Docks have been changed to Utility window. "
-"This enables window managers to do a much better job of managing the GIMP "
-"windows, including omitting the Toolbox and Docks from the taskbar and "
-"ensuring that the Toolbox and Docks always are above image windows."
+"With the empty image window acting as a natural main window, the Toolbox and "
+"Docks windows are now utility windows rather than main windows. This enables "
+"window managers to do a much better job of managing the GIMP windows, "
+"including omitting the Toolbox and Docks from the taskbar and ensuring that "
+"the Toolbox and Docks always are above image windows."
 msgstr ""
 
 #: src/introduction/whats-new.xml:67(term)
@@ -135,10 +134,10 @@ msgstr ""
 
 #: src/introduction/whats-new.xml:69(para)
 msgid ""
-"It is now possible to pan beyond the image border, making image window "
-"navigation much less constrained. It is no longer a problem to use the edge "
-"of a brush on the edge of an image while being zoomed in, and one can adapt "
-"the canvas to any utility windows covering parts of the image window."
+"The Navigation dialog now allows panning beyond the image border; so it is "
+"no longer a problem to use a brush on the edge of an image that fills the "
+"entire display window. Also, if a utility window covers the image, you can "
+"pan the image to view or edit the portion covered by the utility window."
 msgstr ""
 
 #: src/introduction/whats-new.xml:77(title)
@@ -146,8 +145,8 @@ msgid "Scrolling beyond border"
 msgstr ""
 
 #: src/introduction/whats-new.xml:89(term)
-#: src/introduction/whats-new.xml:189(term)
-#: src/introduction/whats-new.xml:354(term)
+#: src/introduction/whats-new.xml:191(term)
+#: src/introduction/whats-new.xml:356(term)
 msgid "Minor changes"
 msgstr ""
 
@@ -191,9 +190,9 @@ msgid ""
 "The freehand select tool has been enhanced to support polygonal selections. "
 "It also allows mixing free hand segments with polygonal segments, editing of "
 "existing segments, applying angle-constraints to segments, and of course the "
-"normal selection tool operations like add and subtract. Altoghether this "
-"ends up making the Free Select Tool a very versatile, powerful and easy-to-"
-"use selection tool."
+"normal selection tool operations like add and subtract. Altogether this ends "
+"up making the Free Select Tool a very versatile, powerful and easy-to-use "
+"selection tool."
 msgstr ""
 
 #: src/introduction/whats-new.xml:145(title)
@@ -201,147 +200,147 @@ msgid "Polygonal Selection"
 msgstr ""
 
 #: src/introduction/whats-new.xml:157(term)
-#: src/introduction/whats-new.xml:167(title)
+#: src/introduction/whats-new.xml:168(title)
 msgid "Brush Dynamics"
 msgstr ""
 
 #: src/introduction/whats-new.xml:159(para)
 msgid ""
-"Brush dynamics let you map different brush parameters, commonly at least "
-"size and opacity, to one or more of three input dynamics: pressure, velocity "
-"and random. Velocity and random are usable with a mouse. The Ink tool, that "
-"supported velocity before, has been overhauled and now handles velocity-"
-"dependent painting much better."
+"Brush dynamics uses an input dynamic such as pressure, velocity, or random, "
+"to modify brush parameters such as opacity, hardness, size, or color; every "
+"brush supports size and opacity, most support more. Velocity and random are "
+"usable with a mouse. The Ink tool, that supported velocity, has been "
+"overhauled to better handle velocity-dependent painting."
 msgstr ""
 
-#: src/introduction/whats-new.xml:175(para)
+#: src/introduction/whats-new.xml:176(para)
 msgid ""
 "Brush dynamics have enabled a new feature in stroking paths. There is now a "
 "check box under the <quote>paint tool</quote> option, for emulating brush "
 "dynamics if you stroke using a paint tool. What this means is that when your "
-"stroke is being painted by GIMP, it tells the brush that its pressure and "
-"velocity are varying along the length of the stroke. Pressure starts with "
-"zero, ramps up to full pressure and then ramps down again to no pressure. "
+"stroke is painted, GIMP tells the brush that the pressure and velocity are "
+"varying along the length of the stroke. Pressure starts with no pressure, "
+"ramps up to full pressure, and then ramps down again to no pressure. "
 "Velocity starts from zero and ramps up to full speed by the end of the "
 "stroke."
 msgstr ""
 
-#: src/introduction/whats-new.xml:193(para)
+#: src/introduction/whats-new.xml:195(para)
 msgid ""
 "Added a bounding box for the Text Tool that supports automatic wrapping of "
 "text within that bounding box."
 msgstr ""
 
-#: src/introduction/whats-new.xml:198(title)
+#: src/introduction/whats-new.xml:200(title)
 msgid "Text tool bounding box"
 msgstr ""
 
-#: src/introduction/whats-new.xml:208(para)
+#: src/introduction/whats-new.xml:210(para)
 msgid ""
 "Move handles for rectangle based tools like Crop and Rectangle Select to the "
 "outside of the rectangle when the rectangle is narrow."
 msgstr ""
 
-#: src/introduction/whats-new.xml:214(title)
+#: src/introduction/whats-new.xml:216(title)
 msgid "Rectangle handles"
 msgstr ""
 
-#: src/introduction/whats-new.xml:224(para)
+#: src/introduction/whats-new.xml:226(para)
 msgid "Added motion constraints to the Move Tool."
 msgstr ""
 
-#: src/introduction/whats-new.xml:229(para)
+#: src/introduction/whats-new.xml:231(para)
 msgid "Improved event smoothing for paint tools."
 msgstr ""
 
-#: src/introduction/whats-new.xml:234(para)
+#: src/introduction/whats-new.xml:236(para)
 msgid ""
 "Mark the center of rectangles while they are moved, and snap the center to "
 "grid and rulers."
 msgstr ""
 
-#: src/introduction/whats-new.xml:240(para)
+#: src/introduction/whats-new.xml:242(para)
 msgid "Enable brush scaling for the Smudge tool."
 msgstr ""
 
-#: src/introduction/whats-new.xml:245(para)
+#: src/introduction/whats-new.xml:247(para)
 msgid ""
 "Added ability to save presets in all color tools for color adjustments you "
 "use frequently."
 msgstr ""
 
-#: src/introduction/whats-new.xml:251(para)
+#: src/introduction/whats-new.xml:253(para)
 msgid ""
 "Allow to transfer settings from <emphasis>Brightness-Contrast </emphasis> to "
 "<emphasis>Levels</emphasis>, and from <emphasis>Levels</emphasis> to "
 "<emphasis>Curves</emphasis>."
 msgstr ""
 
-#: src/introduction/whats-new.xml:258(para)
+#: src/introduction/whats-new.xml:260(para)
 msgid "Allow changing opacity on transform tool previews."
 msgstr ""
 
-#: src/introduction/whats-new.xml:263(para)
+#: src/introduction/whats-new.xml:265(para)
 msgid ""
 "The Screenshot plug-in has been given the ability to capture the mouse "
 "cursor (using Xfixes)."
 msgstr ""
 
-#: src/introduction/whats-new.xml:269(para)
+#: src/introduction/whats-new.xml:271(para)
 msgid ""
 "Display aspect ratio of the Crop and Rectangle Select Tool rectangles in the "
 "status bar."
 msgstr ""
 
-#: src/introduction/whats-new.xml:275(para)
+#: src/introduction/whats-new.xml:277(para)
 msgid "Desaturate has been given an on-canvas preview."
 msgstr ""
 
-#: src/introduction/whats-new.xml:280(para)
+#: src/introduction/whats-new.xml:282(para)
 msgid "The Flame plug-in has been extended with 22 new variations."
 msgstr ""
 
-#: src/introduction/whats-new.xml:285(para)
+#: src/introduction/whats-new.xml:287(para)
 msgid ""
 "Data file folders like brush folders are searched recursively for files."
 msgstr ""
 
-#: src/introduction/whats-new.xml:291(para)
+#: src/introduction/whats-new.xml:293(para)
 msgid ""
 "Replaced the PSD import plug-in with a rewritten version that does what the "
 "old version did plus some other things, for example reading of ICC color "
 "profiles."
 msgstr ""
 
-#: src/introduction/whats-new.xml:298(para)
+#: src/introduction/whats-new.xml:300(para)
 msgid "Several displays use Cairo library."
 msgstr ""
 
-#: src/introduction/whats-new.xml:303(phrase)
+#: src/introduction/whats-new.xml:305(phrase)
 msgid "Comparing 2.6 display vs 2.4"
 msgstr ""
 
-#: src/introduction/whats-new.xml:319(title)
+#: src/introduction/whats-new.xml:321(title)
 msgid "Under the Hood"
 msgstr ""
 
-#: src/introduction/whats-new.xml:321(term)
+#: src/introduction/whats-new.xml:323(term)
 msgid "GEGL"
 msgstr "GEGL"
 
-#: src/introduction/whats-new.xml:323(para)
+#: src/introduction/whats-new.xml:325(para)
 msgid ""
 "Important progress towards high bit-depth and non-destructive editing in "
 "GIMP has been made. Most color operations in GIMP are now ported to the "
 "powerful graph based image processing framework GEGL <xref linkend="
-"\"bibliography-online-gegl\"/>, meaning that the internal processing is "
-"being done in 32bit floating point linear light RGBA. By default the legacy "
-"8bit code paths are still used, but a curious user can turn on the use of "
-"GEGL for the color operations with <link linkend=\"gimp-config-use-gegl"
-"\">Colors / Use GEGL</link>."
+"\"bibliography-online-gegl\"/>, meaning that the internal processing is done "
+"in 32bit floating point linear light RGBA. By default the legacy 8bit code "
+"paths are still used, but a curious user can turn on the use of GEGL for the "
+"color operations with <link linkend=\"gimp-config-use-gegl\">Colors / Use "
+"GEGL</link>."
 msgstr ""
 
-#: src/introduction/whats-new.xml:334(para)
+#: src/introduction/whats-new.xml:336(para)
 msgid ""
 "In addition to porting color operations to GEGL, an experimental GEGL "
 "Operation tool has been added, found in the Tools menu. It enables applying "
@@ -349,11 +348,11 @@ msgid ""
 "The screenshot below shows this for a Gaussian Blur."
 msgstr ""
 
-#: src/introduction/whats-new.xml:342(title)
+#: src/introduction/whats-new.xml:344(title)
 msgid "GEGL operation"
 msgstr ""
 
-#: src/introduction/whats-new.xml:356(para)
+#: src/introduction/whats-new.xml:358(para)
 msgid ""
 "Ported many widgets to use the 2D graphics library cairo <xref linkend="
 "\"bibliography-online-cairo\"/> for drawing. See this <link linkend=\"gimp-"
@@ -361,22 +360,22 @@ msgid ""
 "looks."
 msgstr ""
 
-#: src/introduction/whats-new.xml:367(title)
+#: src/introduction/whats-new.xml:369(title)
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/introduction/whats-new.xml:369(term)
+#: src/introduction/whats-new.xml:371(term)
 msgid "Plug-in Development"
 msgstr ""
 
-#: src/introduction/whats-new.xml:371(para)
+#: src/introduction/whats-new.xml:373(para)
 msgid ""
 "There are new things for a plug-in developer to enjoy as well. For example, "
 "procedures can now give a detailed error description in case of an error, "
 "and the error can be propagated to the user."
 msgstr ""
 
-#: src/introduction/whats-new.xml:377(para)
+#: src/introduction/whats-new.xml:379(para)
 msgid ""
 "GIMP 2.6 also further enhances its scripting abilities. In particular there "
 "is now a much richer API for the creation and manipulation of text layers. "
@@ -384,33 +383,33 @@ msgid ""
 "online-gimp-dev-new\"/>."
 msgstr ""
 
-#: src/introduction/whats-new.xml:387(term)
+#: src/introduction/whats-new.xml:389(term)
 msgid "Backwards Compatibility"
 msgstr ""
 
-#: src/introduction/whats-new.xml:389(para)
+#: src/introduction/whats-new.xml:391(para)
 msgid ""
 "Some old scripts could not be used with GIMP-2.4. This has been improved and "
 "2.6 should run 2.0 and 2.2 scripts."
 msgstr ""
 
-#: src/introduction/whats-new.xml:397(term)
+#: src/introduction/whats-new.xml:399(term)
 msgid "Known Problems"
 msgstr ""
 
-#: src/introduction/whats-new.xml:401(para)
+#: src/introduction/whats-new.xml:403(para)
 msgid ""
 "The Utility window hint is currently only known to work well in the Linux "
 "GNOME desktop environment and on Windows starting with GIMP 2.6.1."
 msgstr ""
 
-#: src/introduction/whats-new.xml:408(para)
+#: src/introduction/whats-new.xml:410(para)
 msgid ""
 "Using the Text Tool is currently not an optimal experience. Making it work "
 "better is a goal for GIMP 2.8."
 msgstr ""
 
-#: src/introduction/whats-new.xml:414(para)
+#: src/introduction/whats-new.xml:416(para)
 msgid ""
 "If you build GIMP yourself and don't have GVfs support on your platform you "
 "need to explicitly pass <option>--without-gvfs</option> to "
@@ -421,5 +420,4 @@ msgstr ""
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
 #: src/introduction/whats-new.xml:0(None)
 msgid "translator-credits"
-msgstr ""
-"Aron Xu <aronxu gnome org>"
+msgstr "Aron Xu <aronxu gnome org>"
diff --git a/po/zh_CN/menus.po b/po/zh_CN/menus.po
index ca6b061..e8b2aa9 100644
--- a/po/zh_CN/menus.po
+++ b/po/zh_CN/menus.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:36+0800\n"
 "Last-Translator: Aron Xu <aronxu gnome org>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -905,20 +905,21 @@ msgid "The <quote>File</quote> Menu"
 msgstr "<quote>æ??件</quote>è??å??"
 
 #: src/menus/file.xml:19(secondary)
-msgid "The File menu of the image window"
-msgstr ""
-
-#: src/menus/file.xml:23(title)
 msgid "File menu"
 msgstr "æ??件è??å??"
 
+#: src/menus/file.xml:23(title)
+msgid "Overview"
+msgstr ""
+
 #: src/menus/file.xml:26(secondary)
 msgid "File"
 msgstr "æ??件"
 
 #: src/menus/file.xml:29(title)
-msgid "The <quote>File</quote> menu"
-msgstr "<quote>æ??件</quote>è??å??"
+#, fuzzy
+msgid "The File menu"
+msgstr "æ??件è??å??"
 
 #: src/menus/edit.xml:14(title)
 msgid "The <quote>Edit</quote> Menu"
@@ -943,5 +944,7 @@ msgstr ""
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
 #: src/menus/about-plugin-menuitems.xml:0(None)
 msgid "translator-credits"
-msgstr ""
-"Aron Xu <aronxu gnome org>"
+msgstr "Aron Xu <aronxu gnome org>"
+
+#~ msgid "The <quote>File</quote> menu"
+#~ msgstr "<quote>æ??件</quote>è??å??"
diff --git a/po/zh_CN/menus/colors.po b/po/zh_CN/menus/colors.po
index 05db074..f7e914e 100644
--- a/po/zh_CN/menus/colors.po
+++ b/po/zh_CN/menus/colors.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:45+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/menus/colors/auto.po b/po/zh_CN/menus/colors/auto.po
index 3a03318..ad8fb3a 100644
--- a/po/zh_CN/menus/colors/auto.po
+++ b/po/zh_CN/menus/colors/auto.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:50+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/menus/colors/components.po b/po/zh_CN/menus/colors/components.po
index 37f2a72..0bed4c9 100644
--- a/po/zh_CN/menus/colors/components.po
+++ b/po/zh_CN/menus/colors/components.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:50+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -194,7 +194,7 @@ msgid ""
 msgstr ""
 
 #: src/menus/colors/components/decompose.xml:97(phrase)
-msgid "Decomposition to layers (RVB)"
+msgid "Decomposition to layers (RGB)"
 msgstr ""
 
 #: src/menus/colors/components/decompose.xml:112(para)
diff --git a/po/zh_CN/menus/colors/info.po b/po/zh_CN/menus/colors/info.po
index 1061cd2..8a421d1 100644
--- a/po/zh_CN/menus/colors/info.po
+++ b/po/zh_CN/menus/colors/info.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:50+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/menus/colors/map.po b/po/zh_CN/menus/colors/map.po
index 7dc8eb7..734cc87 100644
--- a/po/zh_CN/menus/colors/map.po
+++ b/po/zh_CN/menus/colors/map.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:51+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -582,7 +582,7 @@ msgstr ""
 msgid ""
 "You can select here the angle unit used to locate colors in the Hue/"
 "Saturation circle. This choice is valid only for the current filter session: "
-"don't click on Valid just after selecting unit, return to the wanted tab!"
+"don't click on OK just after selecting unit, return to the wanted tab!"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
diff --git a/po/zh_CN/menus/edit.po b/po/zh_CN/menus/edit.po
index 938cee2..10824d6 100644
--- a/po/zh_CN/menus/edit.po
+++ b/po/zh_CN/menus/edit.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:43+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:46+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -51,7 +51,6 @@ msgstr ""
 #: src/menus/edit/paste-as-new.xml:37(title)
 #: src/menus/edit/paste-as-layer.xml:42(phrase)
 #: src/menus/edit/paste-as-brush.xml:90(phrase)
-#: src/menus/edit/module-manager.xml:37(phrase)
 #: src/menus/edit/fill-pattern.xml:54(phrase)
 #: src/menus/edit/fill-fg.xml:51(phrase) src/menus/edit/fill-bg.xml:51(phrase)
 #: src/menus/edit/cut.xml:50(phrase) src/menus/edit/copy.xml:39(phrase)
@@ -72,7 +71,6 @@ msgstr ""
 
 #: src/menus/edit/units.xml:60(phrase)
 #: src/menus/edit/stroke-path.xml:65(phrase)
-#: src/menus/edit/module-manager.xml:59(phrase)
 msgid "The <placeholder-1/> dialog window"
 msgstr ""
 
@@ -245,6 +243,7 @@ msgstr ""
 #: src/menus/edit/undo-history.xml:48(phrase)
 #: src/menus/edit/stroke-path.xml:42(phrase)
 #: src/menus/edit/redo.xml:42(phrase)
+#: src/menus/edit/module-manager.xml:28(title)
 #: src/menus/edit/copy-visible.xml:49(phrase)
 msgid "Activating the Command"
 msgstr ""
@@ -920,35 +919,33 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/edit/module-manager.xml:65(None)
+#: src/menus/edit/module-manager.xml:53(None)
 msgid "@@image: 'images/menus/module-manager.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/edit/module-manager.xml:102(None)
+#: src/menus/edit/module-manager.xml:88(None)
 msgid ""
 "@@image: 'images/menus/module-manager-ex1.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/edit/module-manager.xml:110(None)
+#: src/menus/edit/module-manager.xml:96(None)
 msgid ""
 "@@image: 'images/menus/module-manager-ex2.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:20(phrase)
+#: src/menus/edit/module-manager.xml:11(title)
 msgid "The Module Manager"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:23(primary)
-#: src/menus/edit/module-manager.xml:54(quote)
-#: src/menus/edit/module-manager.xml:60(quote)
+#: src/menus/edit/module-manager.xml:15(primary)
 msgid "Module Manager"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:25(para)
+#: src/menus/edit/module-manager.xml:17(para)
 msgid ""
 "With the <guimenuitem>Module Manager</guimenuitem> command, you can show the "
 "various extension modules which are available and control which of them "
@@ -959,37 +956,41 @@ msgid ""
 "capabilities, its size in memory and its start-up time."
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:41(para)
+#: src/menus/edit/module-manager.xml:33(para)
 msgid ""
 "You can access this command from the image menubar through "
 "<menuchoice><guimenu>Edit</guimenu><guimenuitem>Modules</guimenuitem></"
 "menuchoice>"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:53(phrase)
-msgid "Description of the <placeholder-1/> Dialog"
+#: src/menus/edit/module-manager.xml:44(title)
+msgid "Description of the <quote>Module Manager</quote> Dialog"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:71(phrase)
+#: src/menus/edit/module-manager.xml:48(title)
+msgid "The <quote>Module Manager</quote> dialog window"
+msgstr ""
+
+#: src/menus/edit/module-manager.xml:58(title)
 msgid "Modules list"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:73(para)
+#: src/menus/edit/module-manager.xml:61(para)
 msgid "The scrolled window of the Module Manager shows the loadable modules."
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:78(phrase)
+#: src/menus/edit/module-manager.xml:65(term)
 msgid "Autoload"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:81(para)
+#: src/menus/edit/module-manager.xml:69(para)
 msgid ""
 "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."
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:86(para)
+#: src/menus/edit/module-manager.xml:74(para)
 msgid ""
 "You will notice the difference only when you try to use the modules. For "
 "example, there are several <link linkend=\"gimp-color-dialog\">color "
@@ -998,64 +999,41 @@ msgid ""
 "respective option in the module manager:"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:96(phrase)
+#: src/menus/edit/module-manager.xml:83(title)
 msgid "Autoload example: Color selector modules"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:105(para)
+#: src/menus/edit/module-manager.xml:91(para)
 msgid "Color selector modules loaded"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:113(para)
+#: src/menus/edit/module-manager.xml:99(para)
 msgid "Color selector modules not loaded"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:117(para)
+#: src/menus/edit/module-manager.xml:103(para)
 msgid ""
 "For automatically loaded modules, information about the selected module is "
 "displayed at the bottom of the dialog."
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:125(phrase)
+#: src/menus/edit/module-manager.xml:110(term)
 msgid "Module path"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:128(para)
+#: src/menus/edit/module-manager.xml:114(para)
 msgid "In this column, the directory path for each module is shown."
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:136(phrase)
+#: src/menus/edit/module-manager.xml:121(title)
 msgid "Buttons"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:140(phrase)
-msgid "Query"
-msgstr ""
-
-#: src/menus/edit/module-manager.xml:143(para)
-msgid ""
-"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>."
-msgstr ""
-
-#: src/menus/edit/module-manager.xml:153(phrase)
-msgid "Load; Unload"
-msgstr ""
-
-#: src/menus/edit/module-manager.xml:156(para)
-msgid ""
-"Loading modules manually does not work properly. The buttons are useless "
-"(<quote>Unload</quote> is even disabled) and will probably removed in future "
-"versions."
-msgstr ""
-
-#: src/menus/edit/module-manager.xml:165(phrase)
+#: src/menus/edit/module-manager.xml:125(term)
 msgid "Refresh"
 msgstr ""
 
-#: src/menus/edit/module-manager.xml:168(para)
+#: src/menus/edit/module-manager.xml:129(para)
 msgid ""
 "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."
diff --git a/po/zh_CN/menus/file.po b/po/zh_CN/menus/file.po
index 80b88c3..eebc193 100644
--- a/po/zh_CN/menus/file.po
+++ b/po/zh_CN/menus/file.po
@@ -1,9 +1,14 @@
+# Simplified Chinese translation of gimp-help-2-glossary.
+# Copyright (C) 2009 Free Software Foundation, Inc.
+# This file is distributed under the same licenses as the gimp-help-2 package.
+# Aron Xu <aronxu gnome org>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:46+0800\n"
-"Last-Translator: Aron Xu <aronmalache 163 com>\n"
+"Last-Translator: Aron Xu <aronxu gnome org>\n"
 "Language-Team: Chinese (simplified)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -12,7 +17,7 @@ msgstr ""
 #: src/menus/file/save.xml:19(phrase) src/menus/file/save.xml:26(tertiary)
 #: src/menus/file/save.xml:29(primary)
 msgid "Save"
-msgstr ""
+msgstr "ä¿?å­?"
 
 #: src/menus/file/save.xml:24(primary) src/menus/file/save-as.xml:15(primary)
 #: src/menus/file/save-as-template.xml:23(primary)
@@ -21,8 +26,8 @@ msgstr ""
 #: src/menus/file/open-recent.xml:23(primary)
 #: src/menus/file/open-location.xml:15(primary)
 #: src/menus/file/open-as-layer.xml:15(primary)
-#: src/menus/file/new.xml:27(primary) src/menus/file/new.xml:85(primary)
-#: src/menus/file/new.xml:192(primary) src/menus/file/new.xml:323(primary)
+#: src/menus/file/new.xml:17(primary) src/menus/file/new.xml:72(primary)
+#: src/menus/file/new.xml:173(primary) src/menus/file/new.xml:307(primary)
 #: src/menus/file/create.xml:13(primary) src/menus/file/close.xml:23(primary)
 msgid "Image"
 msgstr ""
@@ -32,7 +37,7 @@ msgstr ""
 #: src/menus/file/save-as-template.xml:24(secondary)
 #: src/menus/file/save-as-copy.xml:24(secondary)
 msgid "Save image"
-msgstr ""
+msgstr "ä¿?å­?å?¾å??"
 
 #: src/menus/file/save.xml:32(para)
 msgid ""
@@ -44,6 +49,10 @@ msgid ""
 "the <guimenuitem>File Save</guimenuitem> dialog, so that you can choose the "
 "data format, the path and the filename of the new image file."
 msgstr ""
+"<guimenuitem>ä¿?å­?</guimenuitem>å?½ä»¤å°?æ?¨ç??å?¾å??ä¿?å­?å?°ç£?ç??ã??å¦?æ??æ?¨å·²ç»?ä¿?å­?è¿?æ­¤å?¾å??ï¼?ä¸?次ä¿?å­?ç??"
+"å?¾å??å°?被å½?å??ç??æ?¬è¦?ç??ã??å¦?æ??æ?¨æ²¡æ??ä¿?å­?è¿?ï¼?<guimenuitem>ä¿?å­?</guimenuitem>便å??"
+"<guimenuitem>å?¦å­?为</guimenuitem>å?½ä»¤ç?¸å??ï¼?<acronym>GIMP</acronym> æ??å¼?"
+"<guimenuitem>ä¿?å­?æ??件</guimenuitem>对è¯?æ¡?ï¼?ç?¶å??æ?¨å?¯ä»¥é??æ?©æ?°æ?®æ ¼å¼?ã??æ??件路å¾?å??æ??件å??称ã??"
 
 #: src/menus/file/save.xml:42(para)
 msgid ""
@@ -53,6 +62,9 @@ msgid ""
 "\">Save As</link> or <link linkend=\"gimp-file-save-a-copy\">Save A Copy</"
 "link>."
 msgstr ""
+"å¦?æ??å?¾å??å?¨ä¹?å??被ä¿?å­?è¿?ï¼?å®?å°?被è?ªå?¨ä¿?å­?å?¨ç?¸å??ç??ä½?ç½®ï¼?使ç?¨ç?¸å??ç??æ??件å??ã??æ??件类å??å??é??项ã??å¦?æ??è¦?使ç?¨"
+"ä¸?å??ç??æ?¹å¼?ï¼?使ç?¨<link linkend=\"gimp-file-save-as\">å?¦å­?为</link>æ??è??"
+"<link linkend=\"gimp-file-save-a-copy\">ä¿?å­?ä¸?个å?¯æ?¬</link>ã??"
 
 #: src/menus/file/save.xml:49(para)
 msgid ""
@@ -61,10 +73,13 @@ msgid ""
 "images</quote> option is checked in the <link linkend=\"gimp-prefs-"
 "environment\">Environment</link> page of the Preferences dialog."
 msgstr ""
+"å½?æ?¨å?¨<link linkend=\"gimp-prefs-environment\">ç?¯å¢?</link>é??项页中é??中äº?"
+"<quote>å?³é?­æ?¶ç¡®è®¤æ?ªä¿?å­?å?¾å??</quote>ï¼?å?¨æ?¨é??å?ºæ?¶æ??å°?æ?ªä¿?å­?ç??å?¾å??ï¼?<acronym>GIMP"
+"</acronym> å°?询é?®æ?¨æ?¯å?¦ç??ç??è¦?è¿?æ ·å??ã??"
 
 #: src/menus/file/save.xml:58(phrase)
 msgid "Activate the Dialog"
-msgstr ""
+msgstr "�活对��"
 
 #: src/menus/file/save.xml:62(para)
 msgid ""
@@ -271,10 +286,9 @@ msgid "Save as template"
 msgstr ""
 
 #: src/menus/file/save-as-template.xml:31(primary)
-#: src/menus/file/new.xml:81(primary) src/menus/file/new.xml:93(term)
-#: src/menus/file/new.xml:98(quote)
+#: src/menus/file/new.xml:68(primary) src/menus/file/new.xml:80(term)
 msgid "Template"
-msgstr ""
+msgstr "模�"
 
 #: src/menus/file/save-as-template.xml:35(para)
 msgid ""
@@ -381,7 +395,7 @@ msgstr ""
 
 #: src/menus/file/quit.xml:23(primary)
 msgid "Quit GIMP"
-msgstr ""
+msgstr "é??å?º GIMP"
 
 #: src/menus/file/quit.xml:25(para)
 msgid ""
@@ -580,11 +594,11 @@ msgstr ""
 
 #: src/menus/file/open.xml:71(phrase)
 msgid "File browsing"
-msgstr ""
+msgstr "æ??件æµ?è§?"
 
 #: src/menus/file/open.xml:77(phrase)
 msgid "Open Dialog"
-msgstr ""
+msgstr "æ??å¼?对è¯?æ¡?"
 
 #: src/menus/file/open.xml:87(para)
 msgid ""
@@ -594,7 +608,7 @@ msgstr ""
 
 #: src/menus/file/open.xml:93(para)
 msgid ""
-"The <guibutton>Type a file name</guibutton> toggles beetwen add and remove "
+"The <guibutton>Type a file name</guibutton> toggles between add and remove "
 "the <guilabel>Location</guilabel> text box where you can type a path to an "
 "image file. If you don't type any path, the name of the selected file will "
 "be displayed. You can also type the first letters of the name: it will be "
@@ -877,14 +891,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/file/new.xml:75(None)
+#: src/menus/file/new.xml:62(None)
 msgid ""
 "@@image: 'images/dialogs/dialogs-new-image.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/file/new.xml:103(None)
+#: src/menus/file/new.xml:87(None)
 msgid ""
 "@@image: 'images/dialogs/dialogs-new-image-templates.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -892,7 +906,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/file/new.xml:180(None)
+#: src/menus/file/new.xml:161(None)
 msgid ""
 "@@image: 'images/dialogs/dialogs-new-image-advanced.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -900,7 +914,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/file/new.xml:238(None)
+#: src/menus/file/new.xml:221(None)
 msgid ""
 "@@image: 'images/dialogs/dialogs-new-image-colorspace.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -908,69 +922,73 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/file/new.xml:278(None)
+#: src/menus/file/new.xml:262(None)
 msgid ""
 "@@image: 'images/dialogs/dialogs-new-image-fill.png'; md5=THIS FILE DOESN'T "
 "EXIST"
 msgstr ""
 
-#: src/menus/file/new.xml:24(phrase) src/menus/file/new.xml:31(primary)
+#: src/menus/file/new.xml:14(title) src/menus/file/new.xml:21(primary)
 msgid "New"
 msgstr ""
 
-#: src/menus/file/new.xml:28(secondary)
+#: src/menus/file/new.xml:18(secondary)
 msgid "New image"
 msgstr ""
 
-#: src/menus/file/new.xml:34(primary) src/menus/file/new.xml:71(quote)
+#: src/menus/file/new.xml:24(primary)
 msgid "New Image"
 msgstr ""
 
-#: src/menus/file/new.xml:36(para)
+#: src/menus/file/new.xml:27(para)
 msgid ""
 "Using the <guimenuitem>New Image</guimenuitem> dialog, you can create a new "
 "empty image and set its properties. The image is shown in a new image "
 "window. You may have more than one image on your screen at the same time."
 msgstr ""
 
-#: src/menus/file/new.xml:44(phrase)
+#: src/menus/file/new.xml:35(title)
 msgid "Activate the command"
 msgstr ""
 
-#: src/menus/file/new.xml:48(para)
+#: src/menus/file/new.xml:38(para)
 msgid ""
-"You can access the command from either the Toolbox menubar or the Image "
-"menubar through: <menuchoice><guimenu>File</guimenu><guimenuitem>New</"
-"guimenuitem></menuchoice>,"
+"You can access the command the Image menubar through: "
+"<menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem></"
+"menuchoice>,"
 msgstr ""
 
-#: src/menus/file/new.xml:58(para)
+#: src/menus/file/new.xml:47(para)
 msgid ""
 "or by using the keyboard shortcut <keycombo><keycap>Ctrl</keycap><keycap>N</"
 "keycap></keycombo>."
 msgstr ""
 
-#: src/menus/file/new.xml:67(phrase)
+#: src/menus/file/new.xml:56(title)
 msgid "Basic Options"
 msgstr ""
 
-#: src/menus/file/new.xml:71(phrase) src/menus/file/new.xml:97(phrase)
-msgid "The <placeholder-1/> dialog"
+#: src/menus/file/new.xml:58(title)
+msgid "The <quote>New Image</quote> dialog"
 msgstr ""
 
-#: src/menus/file/new.xml:82(secondary)
+#: src/menus/file/new.xml:69(secondary)
 msgid "Menu"
 msgstr ""
 
-#: src/menus/file/new.xml:86(secondary) src/menus/file/new.xml:90(primary)
+#: src/menus/file/new.xml:73(secondary) src/menus/file/new.xml:77(primary)
 msgid "Image size"
 msgstr ""
 
-#: src/menus/file/new.xml:87(tertiary)
+#: src/menus/file/new.xml:74(tertiary)
 msgid "When creating"
 msgstr ""
 
-#: src/menus/file/new.xml:107(para)
+#: src/menus/file/new.xml:83(title)
+msgid "The <quote>Template</quote> dialog"
+msgstr ""
+
+#: src/menus/file/new.xml:91(para)
 msgid ""
 "Rather than entering all the values by hand, you can select some predefined "
 "values for your image from a menu of templates, which represent image types "
@@ -980,11 +998,11 @@ msgid ""
 "using the <link linkend=\"gimp-template-dialog\">Templates</link> dialog."
 msgstr ""
 
-#: src/menus/file/new.xml:119(term)
+#: src/menus/file/new.xml:103(term)
 msgid "Image Size"
 msgstr ""
 
-#: src/menus/file/new.xml:121(para)
+#: src/menus/file/new.xml:105(para)
 msgid ""
 "Here you set the <guilabel>Width</guilabel> and <guilabel>Height</guilabel> "
 "of the new image. The default units are pixels, but you can choose a "
@@ -994,31 +1012,30 @@ msgid ""
 "<quote>Dot for Dot</quote> in the <guimenu>View</guimenu> menu."
 msgstr ""
 
-#: src/menus/file/new.xml:132(para)
+#: src/menus/file/new.xml:116(para)
 msgid ""
 "If no image is open, the <quote>New</quote> image is opened in the empty "
-"image window, with the default size you have determined in Edit/Preferences/"
-"Default Image. If you open the <quote>New</quote>image when another is open "
-"(or has been), then it is opened in another window, with the same size as "
-"the first image."
+"image window, with the default size you have determined. If you open the "
+"<quote>New</quote>image when another is open (or has been), then it is "
+"opened in another window, with the same size as the first image."
 msgstr ""
 
-#: src/menus/file/new.xml:141(para)
+#: src/menus/file/new.xml:124(para)
 msgid ""
 "Keep in mind that every pixel of an image is stored in memory. If you create "
 "large files with a high pixel density, <acronym>GIMP</acronym> will need a "
 "lot of time and memory for every function you apply to the image."
 msgstr ""
 
-#: src/menus/file/new.xml:152(term)
+#: src/menus/file/new.xml:135(term)
 msgid "Portrait/Landscape buttons"
 msgstr ""
 
-#: src/menus/file/new.xml:155(primary)
+#: src/menus/file/new.xml:138(primary)
 msgid "Portrait/Landscape mode"
 msgstr ""
 
-#: src/menus/file/new.xml:157(para)
+#: src/menus/file/new.xml:140(para)
 msgid ""
 "There are two buttons which toggle between Portrait and Landscape mode. What "
 "they actually do is to exchange the values for Width and Height. (If the "
@@ -1028,34 +1045,34 @@ msgid ""
 "size, screen resolution and color space are displayed."
 msgstr ""
 
-#: src/menus/file/new.xml:172(phrase)
+#: src/menus/file/new.xml:155(title)
 msgid "Advanced Options"
 msgstr ""
 
-#: src/menus/file/new.xml:176(phrase)
+#: src/menus/file/new.xml:157(title)
 msgid "New Image dialog (Advanced Options)"
 msgstr ""
 
-#: src/menus/file/new.xml:184(para)
+#: src/menus/file/new.xml:165(para)
 msgid ""
 "The <guilabel>Advanced Options</guilabel> are mostly of interest to more "
 "advanced <acronym>GIMP</acronym> users. You can display these options by "
 "clicking on the small triangle on the lower edge of the dialog window."
 msgstr ""
 
-#: src/menus/file/new.xml:193(secondary) src/menus/file/new.xml:197(primary)
+#: src/menus/file/new.xml:174(secondary) src/menus/file/new.xml:178(primary)
 msgid "Resolution"
 msgstr ""
 
-#: src/menus/file/new.xml:194(tertiary) src/menus/file/new.xml:198(secondary)
+#: src/menus/file/new.xml:175(tertiary) src/menus/file/new.xml:179(secondary)
 msgid "Setting when creating"
 msgstr ""
 
-#: src/menus/file/new.xml:201(term)
+#: src/menus/file/new.xml:182(term)
 msgid "X and Y resolution"
 msgstr ""
 
-#: src/menus/file/new.xml:203(para)
+#: src/menus/file/new.xml:184(para)
 msgid ""
 "The values in the <guilabel>X resolution</guilabel> and <guilabel>Y "
 "resolution</guilabel> fields relate mainly to printing: they do not affect "
@@ -1064,7 +1081,7 @@ msgid ""
 "are translated into other measurement units, such as millimeters or inches."
 msgstr ""
 
-#: src/menus/file/new.xml:213(para)
+#: src/menus/file/new.xml:194(para)
 msgid ""
 "If you want to display the image on the screen at the correct dimensions, "
 "select <menuchoice><guimenu>View</guimenu><guimenuitem>Dot for Dot</"
@@ -1076,27 +1093,27 @@ msgid ""
 "display\">Preferences</link> dialog."
 msgstr ""
 
-#: src/menus/file/new.xml:230(term)
+#: src/menus/file/new.xml:214(term)
 msgid "Colorspace"
 msgstr ""
 
-#: src/menus/file/new.xml:234(phrase)
+#: src/menus/file/new.xml:217(title)
 msgid "Colorspace menu"
 msgstr ""
 
-#: src/menus/file/new.xml:242(para)
+#: src/menus/file/new.xml:225(para)
 msgid ""
 "You can create the new image as either an RGB image or a grayscale image."
 msgstr ""
 
-#: src/menus/file/new.xml:246(para)
+#: src/menus/file/new.xml:229(para)
 msgid ""
 "<guilabel>RGB color</guilabel>: The image is created in the Red, Green, Blue "
 "color system, which is the one used by your monitor or your television "
 "screen."
 msgstr ""
 
-#: src/menus/file/new.xml:250(para)
+#: src/menus/file/new.xml:234(para)
 msgid ""
 "<guilabel>Grayscale</guilabel>: The image is created in black and white, "
 "with various shades of gray. Aside from your artistic interests, this type "
@@ -1105,7 +1122,7 @@ msgid ""
 "you would like."
 msgstr ""
 
-#: src/menus/file/new.xml:257(para)
+#: src/menus/file/new.xml:242(para)
 msgid ""
 "You cannot create an indexed image directly with this menu, but of course "
 "you can always convert the image to indexed mode after it has been created. "
@@ -1113,15 +1130,15 @@ msgid ""
 "guisubmenu><guimenuitem>Indexed</guimenuitem></menuchoice> command."
 msgstr ""
 
-#: src/menus/file/new.xml:270(term)
+#: src/menus/file/new.xml:255(term)
 msgid "Fill"
 msgstr ""
 
-#: src/menus/file/new.xml:274(phrase)
+#: src/menus/file/new.xml:258(title)
 msgid "Fill menu"
 msgstr ""
 
-#: src/menus/file/new.xml:282(para)
+#: src/menus/file/new.xml:266(para)
 msgid ""
 "Here, you specify the background color that is used for your new image. It "
 "is certainly possible to change the background of an image later, too. You "
@@ -1129,23 +1146,23 @@ msgid ""
 "dialog\">Layer dialog</link>."
 msgstr ""
 
-#: src/menus/file/new.xml:291(para)
+#: src/menus/file/new.xml:275(para)
 msgid ""
 "Fill the image with the current <guilabel>Foreground color</guilabel>, shown "
 "in the Toolbox."
 msgstr ""
 
-#: src/menus/file/new.xml:297(para)
+#: src/menus/file/new.xml:281(para)
 msgid ""
 "Fill the image with the current <guilabel>Background color</guilabel>, shown "
 "in the Toolbox."
 msgstr ""
 
-#: src/menus/file/new.xml:303(para)
+#: src/menus/file/new.xml:287(para)
 msgid "Fill the image with <guilabel>White</guilabel>."
 msgstr ""
 
-#: src/menus/file/new.xml:308(para)
+#: src/menus/file/new.xml:292(para)
 msgid ""
 "Fill the image with <guilabel>Transparency</guilabel>. If you choose this "
 "option, the image is created with an alpha channel and the background is "
@@ -1153,19 +1170,19 @@ msgid ""
 "checkered pattern, to indicate the transparency."
 msgstr ""
 
-#: src/menus/file/new.xml:320(term) src/menus/file/new.xml:324(secondary)
-#: src/menus/file/new.xml:327(primary)
+#: src/menus/file/new.xml:304(term) src/menus/file/new.xml:308(secondary)
+#: src/menus/file/new.xml:311(primary)
 msgid "Comment"
 msgstr ""
 
-#: src/menus/file/new.xml:329(para)
+#: src/menus/file/new.xml:313(para)
 msgid ""
 "You can write a descriptive comment here. The text is attached to the image "
 "as a <quote>parasite</quote>, and is saved with the image by some file "
 "formats (PNG, JPEG, GIF)."
 msgstr ""
 
-#: src/menus/file/new.xml:335(para)
+#: src/menus/file/new.xml:319(para)
 msgid ""
 "You can view and edit this comment in the <link linkend=\"gimp-image-"
 "properties\">Image Properties</link> dialog."
@@ -1446,3 +1463,4 @@ msgstr ""
 #: src/menus/file/close-all.xml:0(None)
 msgid "translator-credits"
 msgstr ""
+"Aron Xu <aronxu gnome org>"
diff --git a/po/zh_CN/menus/help.po b/po/zh_CN/menus/help.po
index a560439..8603b87 100644
--- a/po/zh_CN/menus/help.po
+++ b/po/zh_CN/menus/help.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:47+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/menus/image.po b/po/zh_CN/menus/image.po
index 69775b2..df2f6f4 100644
--- a/po/zh_CN/menus/image.po
+++ b/po/zh_CN/menus/image.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:43+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:47+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -100,9 +100,9 @@ msgstr ""
 #: src/menus/image/scale.xml:49(title)
 #: src/menus/image/properties.xml:31(phrase)
 #: src/menus/image/merge-layers.xml:46(phrase)
-#: src/menus/image/guides-remove.xml:34(phrase)
-#: src/menus/image/guides-add.xml:41(phrase)
-#: src/menus/image/guides-add-percent.xml:43(phrase)
+#: src/menus/image/guides-remove.xml:28(title)
+#: src/menus/image/guides-new.xml:33(title)
+#: src/menus/image/guides-new-percent.xml:37(title)
 #: src/menus/image/flatten.xml:46(phrase)
 #: src/menus/image/autocrop.xml:46(phrase)
 #: src/menus/image/align-layers.xml:77(phrase)
@@ -936,8 +936,6 @@ msgid "Description of the <placeholder-1/> Dialog"
 msgstr ""
 
 #: src/menus/image/merge-layers.xml:74(phrase)
-#: src/menus/image/guides-add.xml:63(phrase)
-#: src/menus/image/guides-add-percent.xml:65(phrase)
 msgid "The <placeholder-1/> Dialog"
 msgstr ""
 
@@ -1034,10 +1032,8 @@ msgstr ""
 
 #: src/menus/image/guides.xml:11(title) src/menus/image/guides.xml:14(primary)
 #: src/menus/image/guides.xml:18(secondary)
-#: src/menus/image/guides-remove.xml:23(primary)
-#: src/menus/image/guides-add.xml:24(primary)
-#: src/menus/image/guides-add-selection.xml:23(primary)
-#: src/menus/image/guides-add-percent.xml:25(primary)
+#: src/menus/image/guides-remove.xml:16(primary)
+#: src/menus/image/guides-new-selection.xml:16(primary)
 msgid "Guides"
 msgstr ""
 
@@ -1067,46 +1063,23 @@ msgid ""
 "The <guilabel>Guides</guilabel> submenu contains the following commands:"
 msgstr ""
 
-#: src/menus/image/guides.xml:60(link)
-#: src/menus/image/guides-add.xml:21(phrase)
-#: src/menus/image/guides-add.xml:58(quote)
-#: src/menus/image/guides-add.xml:64(quote)
-msgid "New Guide"
-msgstr ""
-
-#: src/menus/image/guides.xml:65(link)
-#: src/menus/image/guides-add-percent.xml:22(phrase)
-#: src/menus/image/guides-add-percent.xml:60(quote)
-#: src/menus/image/guides-add-percent.xml:66(quote)
-msgid "New Guide (by Percent)"
-msgstr ""
-
-#: src/menus/image/guides.xml:72(link)
-#: src/menus/image/guides-add-selection.xml:20(phrase)
-msgid "New Guides from Selection"
-msgstr ""
-
-#: src/menus/image/guides.xml:79(link)
-msgid "Remove all Guides"
-msgstr ""
-
-#: src/menus/image/guides-remove.xml:20(phrase)
+#: src/menus/image/guides-remove.xml:13(title)
 msgid "Remove all guides"
 msgstr ""
 
-#: src/menus/image/guides-remove.xml:24(secondary)
+#: src/menus/image/guides-remove.xml:17(secondary)
 msgid "Remove"
 msgstr ""
 
-#: src/menus/image/guides-remove.xml:26(para)
+#: src/menus/image/guides-remove.xml:20(para)
 msgid ""
 "The <guilabel>Remove all Guides</guilabel> command removes all guides from "
 "the image. Clicking-and-dragging one or two guides onto a ruler is a quicker "
-"way to remove them. This command is interesting if you have positioned "
-"several guides."
+"way to remove them. This command is useful if you have positioned several "
+"guides."
 msgstr ""
 
-#: src/menus/image/guides-remove.xml:38(para)
+#: src/menus/image/guides-remove.xml:29(para)
 msgid ""
 "You can access this command from the image menubar through "
 "<menuchoice><guimenu>Image</guimenu><guisubmenu>Guides</"
@@ -1115,61 +1088,93 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/image/guides-add.xml:69(None)
+#: src/menus/image/guides-new.xml:57(None)
 msgid ""
 "@@image: 'images/menus/menus-image-new-guide.png'; md5=THIS FILE DOESN'T "
 "EXIST"
 msgstr ""
 
-#: src/menus/image/guides-add.xml:25(secondary)
-msgid "Add a guide"
+#: src/menus/image/guides-new.xml:13(title)
+msgid "New Guide"
 msgstr ""
 
-#: src/menus/image/guides-add.xml:27(para)
+#: src/menus/image/guides-new.xml:16(primary)
+#: src/menus/image/guides-new-percent.xml:18(primary)
+msgid "Guide"
+msgstr ""
+
+#: src/menus/image/guides-new.xml:17(secondary)
+msgid "Add"
+msgstr ""
+
+#: src/menus/image/guides-new.xml:20(para)
 msgid ""
-"The <guimenuitem>New Guide</guimenuitem> command adds a guide to the image. "
-"For more information about guides, see the glossary entry on <link linkend="
-"\"glossary-guides\">Guides</link>."
+"The <guimenuitem>New Guide</guimenuitem> command adds a guide to the image."
 msgstr ""
 
-#: src/menus/image/guides-add.xml:33(para)
+#: src/menus/image/guides-new.xml:25(para)
 msgid ""
 "You can add guides to the image more quickly, but less accurately, by simply "
 "clicking and dragging guides from the image rulers and positioning them "
 "where you would like."
 msgstr ""
 
-#: src/menus/image/guides-add.xml:45(para)
+#: src/menus/image/guides-new.xml:34(para)
 msgid ""
 "You can access this command from the image menubar through "
 "<menuchoice><guimenu>Image</guimenu><guisubmenu>Guides</"
 "guisubmenu><guimenuitem>New Guide</guimenuitem></menuchoice>"
 msgstr ""
 
-#: src/menus/image/guides-add.xml:58(phrase)
-#: src/menus/image/guides-add-percent.xml:60(phrase)
-msgid "<placeholder-1/> Options"
-msgstr ""
-
-#: src/menus/image/guides-add.xml:75(term)
-msgid "Direction ; Position"
+#: src/menus/image/guides-new.xml:45(title)
+msgid "<quote>New Guide</quote> Options"
 msgstr ""
 
-#: src/menus/image/guides-add.xml:77(para)
+#: src/menus/image/guides-new.xml:46(para)
 msgid ""
 "When you select <guimenuitem>New Guide</guimenuitem>, a dialog opens, which "
 "allows you to set the <guilabel>Direction</guilabel> and <guilabel>Position</"
 "guilabel>, in pixels, of the new guide more precisely than by using click-"
-"and-drag. The <guilabel>Direction</guilabel> may be <guilabel>Horizontal</"
-"guilabel> or <guilabel>Vertical</guilabel>. The coordinate origin for the "
-"<guilabel>Position</guilabel> is the upper left corner of the canvas."
+"and-drag."
+msgstr ""
+
+#: src/menus/image/guides-new.xml:53(title)
+msgid "The <quote>New Guide</quote> Dialog"
+msgstr ""
+
+#: src/menus/image/guides-new.xml:63(term)
+#: src/menus/image/guides-new-percent.xml:66(term)
+msgid "Direction"
 msgstr ""
 
-#: src/menus/image/guides-add-selection.xml:24(secondary)
-msgid "Add guides from Selection"
+#: src/menus/image/guides-new.xml:65(para)
+#: src/menus/image/guides-new-percent.xml:68(para)
+msgid ""
+"You can choose the <guilabel>Direction</guilabel> of the guide, either "
+"<guilabel>Horizontal</guilabel> or <guilabel>Vertical</guilabel>, by using "
+"the drop-down list."
+msgstr ""
+
+#: src/menus/image/guides-new.xml:73(term)
+#: src/menus/image/guides-new-percent.xml:76(term)
+msgid "Position"
 msgstr ""
 
-#: src/menus/image/guides-add-selection.xml:26(para)
+#: src/menus/image/guides-new.xml:75(para)
+msgid ""
+"The coordinate origin for the <guilabel>Position</guilabel> is the upper "
+"left corner of the canvas."
+msgstr ""
+
+#: src/menus/image/guides-new-selection.xml:13(title)
+msgid "New Guides from Selection"
+msgstr ""
+
+#: src/menus/image/guides-new-selection.xml:17(secondary)
+msgid "Add from selection"
+msgstr ""
+
+#: src/menus/image/guides-new-selection.xml:20(para)
 msgid ""
 "The <guimenuitem>New Guides from Selection</guimenuitem> command adds four "
 "guide lines, one for each of the upper, lower, left and right edges of the "
@@ -1177,7 +1182,7 @@ msgid ""
 "are drawn."
 msgstr ""
 
-#: src/menus/image/guides-add-selection.xml:34(phrase)
+#: src/menus/image/guides-new-selection.xml:28(title)
 #: src/menus/image/duplicate.xml:47(phrase)
 #: src/menus/image/convert-indexed.xml:34(title)
 #: src/menus/image/convert-grayscale.xml:32(title)
@@ -1186,7 +1191,7 @@ msgstr ""
 msgid "Activating the Command"
 msgstr ""
 
-#: src/menus/image/guides-add-selection.xml:38(para)
+#: src/menus/image/guides-new-selection.xml:29(para)
 msgid ""
 "You can access this command from the image menubar through "
 "<menuchoice><guimenu>Image</guimenu><guisubmenu>Guides</"
@@ -1195,24 +1200,28 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/image/guides-add-percent.xml:71(None)
+#: src/menus/image/guides-new-percent.xml:60(None)
 msgid ""
 "@@image: 'images/menus/image-new-guide-percent.png'; md5=THIS FILE DOESN'T "
 "EXIST"
 msgstr ""
 
-#: src/menus/image/guides-add-percent.xml:26(secondary)
-msgid "Add a guide (by Percent)"
+#: src/menus/image/guides-new-percent.xml:15(title)
+msgid "New Guide (by Percent)"
+msgstr ""
+
+#: src/menus/image/guides-new-percent.xml:19(secondary)
+msgid "Add by percent"
 msgstr ""
 
-#: src/menus/image/guides-add-percent.xml:28(para)
+#: src/menus/image/guides-new-percent.xml:22(para)
 msgid ""
 "The <guimenuitem>New Guide (by Percent)</guimenuitem> command adds a guide "
 "to the image. The position of the guide is specified as a percentage of the "
 "canvas Height and Width."
 msgstr ""
 
-#: src/menus/image/guides-add-percent.xml:34(para)
+#: src/menus/image/guides-new-percent.xml:28(para)
 msgid ""
 "You can add guides to the image more quickly by simply clicking and dragging "
 "guides from the image rulers and positioning them where you would like. "
@@ -1220,29 +1229,29 @@ msgid ""
 "you draw with this command, however."
 msgstr ""
 
-#: src/menus/image/guides-add-percent.xml:47(para)
+#: src/menus/image/guides-new-percent.xml:38(para)
 msgid ""
 "You can access this command from the image menubar through "
 "<menuchoice><guimenu>Image</guimenu><guisubmenu>Guides</"
 "guisubmenu><guimenuitem>New Guide (by Percent)</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/menus/image/guides-add-percent.xml:77(term)
-msgid "Direction"
+#: src/menus/image/guides-new-percent.xml:49(title)
+msgid "<quote>New Guide (by Percent)</quote> Options"
 msgstr ""
 
-#: src/menus/image/guides-add-percent.xml:79(para)
+#: src/menus/image/guides-new-percent.xml:50(para)
 msgid ""
-"You can choose the <guilabel>Direction</guilabel> of the guide, either "
-"<guilabel>Horizontal</guilabel> or <guilabel>Vertical</guilabel>, by using "
-"the drop-down list."
+"When you select this menu item, a dialog opens, which allows you to set the "
+"<guilabel>Direction</guilabel> and <guilabel>Position</guilabel>, by "
+"percent, of the new guide."
 msgstr ""
 
-#: src/menus/image/guides-add-percent.xml:87(term)
-msgid "Position"
+#: src/menus/image/guides-new-percent.xml:56(title)
+msgid "The <quote>New Guide (by Percent)</quote> Dialog"
 msgstr ""
 
-#: src/menus/image/guides-add-percent.xml:89(para)
+#: src/menus/image/guides-new-percent.xml:78(para)
 msgid ""
 "You can also choose the <guilabel>Position</guilabel> of the new guide. The "
 "coordinate origin is in the upper left corner of the canvas."
diff --git a/po/zh_CN/menus/layer.po b/po/zh_CN/menus/layer.po
index c8dcc62..dd05076 100644
--- a/po/zh_CN/menus/layer.po
+++ b/po/zh_CN/menus/layer.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:48+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -55,7 +55,7 @@ msgstr ""
 #: src/menus/layer/mask-edit.xml:22(primary)
 #: src/menus/layer/mask-disable.xml:22(primary)
 #: src/menus/layer/mask-delete.xml:13(primary)
-#: src/menus/layer/mask-apply.xml:22(primary)
+#: src/menus/layer/mask-apply.xml:13(primary)
 #: src/menus/layer/mask-add.xml:14(primary)
 #: src/menus/layer/lower.xml:13(primary)
 #: src/menus/layer/lower-to-bottom.xml:13(primary)
@@ -238,8 +238,8 @@ msgstr ""
 #: src/menus/layer/mask-edit.xml:45(phrase)
 #: src/menus/layer/mask-disable.xml:43(phrase)
 #: src/menus/layer/mask-delete.xml:31(title)
-#: src/menus/layer/mask-apply.xml:45(phrase)
-#: src/menus/layer/mask-add.xml:39(title) src/menus/layer/lower.xml:26(title)
+#: src/menus/layer/mask-apply.xml:36(title)
+#: src/menus/layer/mask-add.xml:38(title) src/menus/layer/lower.xml:26(title)
 #: src/menus/layer/lower-to-bottom.xml:26(title)
 #: src/menus/layer/flip-vertical.xml:29(title)
 #: src/menus/layer/flip-horizontal.xml:29(title)
@@ -639,34 +639,45 @@ msgstr ""
 msgid "Interpolation"
 msgstr ""
 
-#: src/menus/layer/scale.xml:130(para)
-msgid ""
-"<guilabel>None</guilabel>: No interpolation is used. Pixels are simply "
-"enlarged or removed, as they are when zooming. This method is low in "
-"quality, but very fast."
+#: src/menus/layer/scale.xml:130(term)
+msgid "None"
 msgstr ""
 
-#: src/menus/layer/scale.xml:137(para)
+#: src/menus/layer/scale.xml:132(para)
 msgid ""
-"<guilabel>Linear</guilabel>: This method is a good compromise between speed "
-"and quality."
+"No interpolation is used. Pixels are simply enlarged or removed, as they are "
+"when zooming. This method is low in quality, but very fast."
 msgstr ""
 
-#: src/menus/layer/scale.xml:143(para)
-msgid ""
-"<guilabel>Cubic</guilabel>: This method takes a lot of time, but it produces "
-"the best results."
+#: src/menus/layer/scale.xml:140(term)
+msgid "Linear"
+msgstr ""
+
+#: src/menus/layer/scale.xml:142(para)
+msgid "This method is a good compromise between speed and quality."
+msgstr ""
+
+#: src/menus/layer/scale.xml:149(term)
+msgid "Cubic"
 msgstr ""
 
-#: src/menus/layer/scale.xml:152(para)
+#: src/menus/layer/scale.xml:151(para)
+msgid "This method takes a lot of time, but it produces the best results."
+msgstr ""
+
+#: src/menus/layer/scale.xml:158(term)
+msgid "Sinc (Lanczos3)"
+msgstr ""
+
+#: src/menus/layer/scale.xml:163(para)
 msgid "Sinus cardinalis"
 msgstr ""
 
-#: src/menus/layer/scale.xml:149(para)
+#: src/menus/layer/scale.xml:160(para)
 msgid ""
-"<guilabel>Sinc (Lanczos-3)</guilabel>: The Lanczos (pronounce "
-"<quote>lanzosh</quote>) method uses the Sinc<placeholder-1/> mathematical "
-"function to perform a high quality interpolation."
+"The Lanczos (pronounce <quote>lanzosh</quote>) method uses the "
+"Sinc<placeholder-1/> mathematical function to perform a high quality "
+"interpolation."
 msgstr ""
 
 #: src/menus/layer/rotate-arbitrary.xml:10(title)
@@ -1305,7 +1316,7 @@ msgstr ""
 #: src/menus/layer/mask-edit.xml:23(secondary)
 #: src/menus/layer/mask-disable.xml:23(secondary)
 #: src/menus/layer/mask-delete.xml:14(secondary)
-#: src/menus/layer/mask-apply.xml:23(secondary)
+#: src/menus/layer/mask-apply.xml:14(secondary)
 #: src/menus/layer/mask-add.xml:15(secondary)
 msgid "Mask managing"
 msgstr ""
@@ -1322,7 +1333,7 @@ msgstr ""
 #: src/menus/layer/mask-edit.xml:27(primary)
 #: src/menus/layer/mask-disable.xml:27(primary)
 #: src/menus/layer/mask-delete.xml:18(primary)
-#: src/menus/layer/mask-apply.xml:27(primary)
+#: src/menus/layer/mask-apply.xml:18(primary)
 #: src/menus/layer/mask-add.xml:19(primary)
 msgid "Masks"
 msgstr ""
@@ -1335,7 +1346,7 @@ msgstr ""
 #: src/menus/layer/mask-edit.xml:28(secondary)
 #: src/menus/layer/mask-disable.xml:28(secondary)
 #: src/menus/layer/mask-delete.xml:19(secondary)
-#: src/menus/layer/mask-apply.xml:28(secondary)
+#: src/menus/layer/mask-apply.xml:19(secondary)
 #: src/menus/layer/mask-add.xml:20(secondary)
 msgid "Layer mask"
 msgstr ""
@@ -1467,8 +1478,8 @@ msgstr ""
 
 #: src/menus/layer/mask-selection-replace.xml:48(para)
 #: src/menus/layer/mask-delete.xml:44(para)
-#: src/menus/layer/mask-apply.xml:59(para)
-#: src/menus/layer/mask-add.xml:52(para)
+#: src/menus/layer/mask-apply.xml:51(para)
+#: src/menus/layer/mask-add.xml:51(para)
 msgid ""
 "or from the pop-up menu you get by right-clicking on the active layer in the "
 "Layers Dialog."
@@ -1558,7 +1569,7 @@ msgid "Add to selection"
 msgstr ""
 
 #: src/menus/layer/mask-selection-add.xml:25(primary)
-#: src/menus/layer/mask-add.xml:131(term)
+#: src/menus/layer/mask-add.xml:130(term)
 #: src/menus/layer/anchor.xml:22(primary)
 #: src/menus/layer/alpha-selection-subtract.xml:22(primary)
 #: src/menus/layer/alpha-selection-replace.xml:22(primary)
@@ -1701,30 +1712,30 @@ msgid ""
 "guisubmenu><guimenuitem>Delete Layer Mask</guimenuitem></menuchoice>,"
 msgstr ""
 
-#: src/menus/layer/mask-apply.xml:19(phrase)
+#: src/menus/layer/mask-apply.xml:9(title)
 msgid "Apply Layer Mask"
 msgstr ""
 
-#: src/menus/layer/mask-apply.xml:24(tertiary)
-#: src/menus/layer/mask-apply.xml:29(tertiary)
+#: src/menus/layer/mask-apply.xml:15(tertiary)
+#: src/menus/layer/mask-apply.xml:20(tertiary)
 msgid "Apply"
 msgstr ""
 
-#: src/menus/layer/mask-apply.xml:32(primary)
+#: src/menus/layer/mask-apply.xml:23(primary)
 msgid "Apply Layer Mask (command)"
 msgstr ""
 
-#: src/menus/layer/mask-apply.xml:34(para)
+#: src/menus/layer/mask-apply.xml:26(para)
 msgid ""
 "The <guimenuitem>Apply Layer Mask</guimenuitem> command merges the layer "
 "mask with the current layer. The transparency information in the layer mask "
-"is transferred to the alpha channel and the layer mask is removed. If the "
-"active layer does not have a layer mask, the menu entry is insensitive and "
-"grayed out. See the <link linkend=\"gimp-layer-mask\">Layer Masks</link> "
-"section for more information."
+"is transferred to the alpha channel, that is created if it doesn't exist, "
+"and the layer mask is removed. If the active layer does not have a layer "
+"mask, the menu entry is insensitive and grayed out. See the <link linkend="
+"\"gimp-layer-mask\">Layer Masks</link> section for more information."
 msgstr ""
 
-#: src/menus/layer/mask-apply.xml:49(para)
+#: src/menus/layer/mask-apply.xml:41(para)
 msgid ""
 "You can access this command from the image menubar through "
 "<menuchoice><guimenu>Layer</guimenu><guisubmenu>Mask</"
@@ -1733,7 +1744,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/menus/layer/mask-add.xml:66(None)
+#: src/menus/layer/mask-add.xml:65(None)
 msgid ""
 "@@image: 'images/dialogs/layer-mask-add.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -1754,81 +1765,80 @@ msgstr ""
 msgid ""
 "The <guimenuitem>Add Layer Mask</guimenuitem> command adds a layer mask to "
 "the active layer. It displays a dialog in which you can set the initial "
-"properties of the mask. If the layer already has a layer mask, or if it "
-"cannot have one because it does not have an alpha channel, the menu entry is "
-"insensitive and grayed out."
+"properties of the mask. If the layer already has a layer mask, the menu "
+"entry is insensitive and grayed out."
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:31(para)
+#: src/menus/layer/mask-add.xml:30(para)
 msgid ""
 "A layer mask lets you define which parts of the layer are opaque, semi-"
 "transparent or transparent. See the <link linkend=\"gimp-layer-mask\">Layer "
 "Mask</link> section for more information."
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:42(para)
+#: src/menus/layer/mask-add.xml:41(para)
 msgid ""
 "You can access this command from the image menubar through "
 "<menuchoice><guimenu>Layer</guimenu><guisubmenu>Mask</"
 "guisubmenu><guimenuitem>Add Layer Mask</guimenuitem></menuchoice>"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:61(title)
+#: src/menus/layer/mask-add.xml:60(title)
 msgid "Description of the <quote>Add Layer Mask</quote> Dialog"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:63(title)
+#: src/menus/layer/mask-add.xml:62(title)
 msgid "The <quote>Add Layer Mask</quote> dialog"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:72(term)
+#: src/menus/layer/mask-add.xml:71(term)
 msgid "Initialize Layer Mask to"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:74(para)
+#: src/menus/layer/mask-add.xml:73(para)
 msgid ""
 "This dialog allows you several choices for the initial contents of the layer "
 "mask:"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:80(term)
+#: src/menus/layer/mask-add.xml:79(term)
 msgid "White (full opacity)"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:82(para)
+#: src/menus/layer/mask-add.xml:81(para)
 msgid ""
 "With this option, the layer mask will make all of the layer fully opaque. "
 "That means that you will not notice any difference in the appearance of the "
 "layer until you paint on the layer mask."
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:91(term)
+#: src/menus/layer/mask-add.xml:90(term)
 msgid "Black (full transparency)"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:93(para)
+#: src/menus/layer/mask-add.xml:92(para)
 msgid ""
 "With this option, the layer mask will make all of the layer fully "
 "transparent. This is represented in the image by a checkered pattern on "
 "which you will need to paint to make any part of the layer visible."
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:102(term)
+#: src/menus/layer/mask-add.xml:101(term)
 msgid "Layer's alpha channel"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:104(para)
+#: src/menus/layer/mask-add.xml:103(para)
 msgid ""
 "With this option, the contents of the alpha channel are used to fill the "
 "layer mask. The alpha channel itself is not altered, so the transparency of "
 "partially visible areas is increased, leading to a more transparent layer."
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:114(term)
+#: src/menus/layer/mask-add.xml:113(term)
 msgid "Transfer layer's alpha channel"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:116(para)
+#: src/menus/layer/mask-add.xml:115(para)
 msgid ""
 "This option sets the layer mask as the previous option, but resets the "
 "layer's alpha channel to full opacity afterwards. The effect is to transfer "
@@ -1839,7 +1849,7 @@ msgid ""
 "channel</quote>, because it will leave the appearance unaltered."
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:133(para)
+#: src/menus/layer/mask-add.xml:132(para)
 msgid ""
 "This option converts the current selection into a layer mask, so that "
 "selected areas are opaque, and unselected areas are transparent. If any "
@@ -1848,38 +1858,38 @@ msgid ""
 "the effects will be."
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:144(term)
+#: src/menus/layer/mask-add.xml:143(term)
 msgid "Grayscale copy of layer"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:146(para)
+#: src/menus/layer/mask-add.xml:145(para)
 msgid ""
 "This option converts the layer itself into a layer mask. It is particularly "
 "useful when you plan to add new contents to the layer afterwards."
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:154(term)
+#: src/menus/layer/mask-add.xml:153(term)
 msgid "Channel"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:156(para)
+#: src/menus/layer/mask-add.xml:155(para)
 msgid ""
 "With this option the layer mask is initialized with a selection mask you "
 "have created before, stored in the Channel dialog."
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:167(term)
+#: src/menus/layer/mask-add.xml:166(term)
 msgid "Invert Mask"
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:169(para)
+#: src/menus/layer/mask-add.xml:168(para)
 msgid ""
 "If you check the <guilabel>Invert Mask</guilabel> box at the bottom of the "
 "dialog, the resulting mask is inverted, so that transparent areas become "
 "opaque and vice versa."
 msgstr ""
 
-#: src/menus/layer/mask-add.xml:177(para)
+#: src/menus/layer/mask-add.xml:176(para)
 msgid ""
 "When you click on the <guibutton>OK</guibutton> button, a thumbnail of the "
 "layer mask appears to the right of the thumbnail of the layer in the Layers "
diff --git a/po/zh_CN/menus/select.po b/po/zh_CN/menus/select.po
index 9ae43cd..0ddd8c6 100644
--- a/po/zh_CN/menus/select.po
+++ b/po/zh_CN/menus/select.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:49+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/menus/view.po b/po/zh_CN/menus/view.po
index c0f7d7b..92db285 100644
--- a/po/zh_CN/menus/view.po
+++ b/po/zh_CN/menus/view.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:42+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:49+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
diff --git a/po/zh_CN/preface.po b/po/zh_CN/preface.po
index 224449a..7db2b61 100644
--- a/po/zh_CN/preface.po
+++ b/po/zh_CN/preface.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help-2 preface\n"
-"POT-Creation-Date: 2009-05-11 19:29+0800\n"
+"POT-Creation-Date: 2009-07-22 12:07+0800\n"
 "PO-Revision-Date: 2009-05-05 03:19+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
@@ -78,264 +78,268 @@ msgstr "Patrycja Stawiarska (波�语)"
 msgid "Kolbjørn Stuestøl (Norwegian)"
 msgstr "Kolbjørn Stuestøl (��语)"
 
-#: src/preface/authors.xml:60(term)
+#: src/preface/authors.xml:57(phrase)
+#, fuzzy
+msgid "Andrew Pitonyak (English)"
+msgstr "Jan Smith (�语)"
+
+#: src/preface/authors.xml:63(term)
 msgid "Proof Reading"
 msgstr "校对"
 
-#: src/preface/authors.xml:64(phrase)
+#: src/preface/authors.xml:67(phrase)
 msgid "Jakub Friedl (Czech, English)"
 msgstr "Jakub Friedl (æ?·å??语, è?±è¯­)"
 
-#: src/preface/authors.xml:67(phrase)
+#: src/preface/authors.xml:70(phrase)
 msgid "Hans De Jonge (Dutch)"
 msgstr "Hans De Jonge (��语)"
 
-#: src/preface/authors.xml:70(phrase)
+#: src/preface/authors.xml:73(phrase)
 msgid "Raymon Van Wanrooij (Dutch)"
 msgstr "Raymon Van Wanrooij (��语)"
 
-#: src/preface/authors.xml:73(phrase)
+#: src/preface/authors.xml:76(phrase)
 msgid "Semka Kuloviæ-Debals (Croatian)"
 msgstr "Semka Kuloviæ-Debals (å??ç½?å?°äº?语)"
 
-#: src/preface/authors.xml:76(phrase)
+#: src/preface/authors.xml:79(phrase)
 msgid "Sally C. Barry (English)"
 msgstr "Sally C. Barry (�语)"
 
-#: src/preface/authors.xml:79(phrase)
+#: src/preface/authors.xml:82(phrase)
 msgid "Daniel Egger (English)"
 msgstr "Daniel Egger (�语)"
 
-#: src/preface/authors.xml:82(phrase)
+#: src/preface/authors.xml:85(phrase)
 msgid "Sven Neumann (English, German)"
 msgstr "Sven Neumann (�语, 德语)"
 
-#: src/preface/authors.xml:85(phrase)
+#: src/preface/authors.xml:88(phrase)
 msgid "Domingo Stephan (German)"
 msgstr "Domingo Stephan (德语)"
 
-#: src/preface/authors.xml:88(phrase)
+#: src/preface/authors.xml:91(phrase)
 msgid "Thomas Lotze (German)"
 msgstr "Thomas Lotze (德语)"
 
-#: src/preface/authors.xml:91(phrase)
+#: src/preface/authors.xml:94(phrase)
 msgid "Thomas Güttler (German)"
 msgstr "Thomas Güttler (德语)"
 
-#: src/preface/authors.xml:94(phrase)
+#: src/preface/authors.xml:97(phrase)
 msgid "Zhong Yaotang (Chinese)"
 msgstr "Zhong Yaotang (中æ??)"
 
-#: src/preface/authors.xml:97(phrase)
+#: src/preface/authors.xml:100(phrase)
 msgid "Calum Mackay (English)"
 msgstr "Calum Mackay (�语)"
 
-#: src/preface/authors.xml:100(phrase)
+#: src/preface/authors.xml:103(phrase)
 msgid "Thomas S Lendo (German)"
 msgstr "Thomas S Lendo (德语)"
 
-#: src/preface/authors.xml:103(phrase)
+#: src/preface/authors.xml:106(phrase)
 msgid "Mel Boyce (syngin) (English)"
 msgstr "Mel Boyce (syngin) (�语)"
 
-#: src/preface/authors.xml:106(phrase)
+#: src/preface/authors.xml:109(phrase)
 msgid "Oliver Ellis (Red Haze) (English)"
 msgstr "Oliver Ellis (Red Haze) (�语)"
 
-#: src/preface/authors.xml:109(phrase)
+#: src/preface/authors.xml:112(phrase)
 msgid "Markus Reinhardt (German)"
 msgstr "Markus Reinhardt (德语)"
 
-#: src/preface/authors.xml:112(phrase)
+#: src/preface/authors.xml:115(phrase)
 msgid "Alexander Weiher (German)"
 msgstr "Alexander Weiher (德语)"
 
-#: src/preface/authors.xml:115(phrase)
+#: src/preface/authors.xml:118(phrase)
 msgid "Michael Hölzen (German)"
 msgstr "Michael Hölzen (德语)"
 
-#: src/preface/authors.xml:118(phrase)
+#: src/preface/authors.xml:121(phrase)
 msgid "Raymond Ostertag (French)"
 msgstr "Raymond Ostertag (�语)"
 
-#: src/preface/authors.xml:121(phrase)
+#: src/preface/authors.xml:124(phrase)
 msgid "Cédric Gémy (French)"
 msgstr "Cédric Gémy (�语)"
 
-#: src/preface/authors.xml:124(phrase)
+#: src/preface/authors.xml:127(phrase)
 msgid "Sébastien Barre (French)"
 msgstr "Sébastien Barre (�语)"
 
-#: src/preface/authors.xml:127(phrase)
+#: src/preface/authors.xml:130(phrase)
 msgid "Niklas Mattison (Swedish)"
 msgstr "Niklas Mattison (ç??å?¸è¯­)"
 
-#: src/preface/authors.xml:130(phrase)
+#: src/preface/authors.xml:133(phrase)
 msgid "Daryl Lee (English)"
 msgstr "Daryl Lee (�语)"
 
-#: src/preface/authors.xml:133(phrase)
+#: src/preface/authors.xml:136(phrase)
 msgid "William Skaggs (English)"
 msgstr "William Skaggs (�语)"
 
-#: src/preface/authors.xml:136(phrase)
+#: src/preface/authors.xml:139(phrase)
 msgid "Cai Qian (è?¡è??) (Chinese)"
 msgstr "Cai Qian (è?¡è??) (中æ??)"
 
-#: src/preface/authors.xml:139(phrase)
+#: src/preface/authors.xml:142(phrase)
 msgid "Yang Hong (�红) (Chinese)"
 msgstr "Yang Hong (æ?¨çº¢) (中æ??)"
 
-#: src/preface/authors.xml:142(phrase)
+#: src/preface/authors.xml:145(phrase)
 msgid "Xceals (Chinese)"
 msgstr "Xceals (中æ??)"
 
-#: src/preface/authors.xml:145(phrase)
+#: src/preface/authors.xml:148(phrase)
 msgid "Eric Lamarque (Chinese)"
 msgstr "Eric Lamarque (中æ??)"
 
-#: src/preface/authors.xml:148(phrase)
+#: src/preface/authors.xml:151(phrase)
 msgid "Robert van Drunen (Dutch)"
 msgstr "Robert van Drunen (��语)"
 
-#: src/preface/authors.xml:151(phrase)
+#: src/preface/authors.xml:154(phrase)
 msgid "Marco Marega (Italian)"
 msgstr "Marco Marega (æ??大å?©è¯­)"
 
-#: src/preface/authors.xml:154(phrase)
+#: src/preface/authors.xml:157(phrase)
 msgid "Mike Vargas (Italian)"
 msgstr "Mike Vargas (æ??大å?©è¯­)"
 
-#: src/preface/authors.xml:157(phrase)
+#: src/preface/authors.xml:160(phrase)
 msgid "Andrea Zito (Italian)"
 msgstr "Andrea Zito (æ??大å?©è¯­)"
 
-#: src/preface/authors.xml:160(phrase)
+#: src/preface/authors.xml:163(phrase)
 msgid "Karine Delvare (French)"
 msgstr "Karine Delvare (�语)"
 
-#: src/preface/authors.xml:163(phrase)
+#: src/preface/authors.xml:166(phrase)
 msgid "David 'Ilicz' Klementa (Czech)"
 msgstr "David 'Ilicz' Klementa (æ?·å??语)"
 
-#: src/preface/authors.xml:166(phrase)
+#: src/preface/authors.xml:169(phrase)
 msgid "Jan Smith (English)"
 msgstr "Jan Smith (�语)"
 
-#: src/preface/authors.xml:169(phrase)
+#: src/preface/authors.xml:172(phrase)
 msgid "Adolf Gerold (German)"
 msgstr "Adolf Gerold (德语)"
 
-#: src/preface/authors.xml:172(phrase)
+#: src/preface/authors.xml:175(phrase)
 msgid "Roxana Chernogolova (Russian)"
 msgstr "Roxana Chernogolova (�语)"
 
-#: src/preface/authors.xml:175(phrase)
+#: src/preface/authors.xml:178(phrase)
 msgid "Alexandre Prokoudine (Russian)"
 msgstr "Alexandre Prokoudine (�语)"
 
-#: src/preface/authors.xml:178(phrase)
+#: src/preface/authors.xml:181(phrase)
 msgid "Grigory Bakunov (Russian)"
 msgstr "Grigory Bakunov (�语)"
 
-#: src/preface/authors.xml:181(phrase)
+#: src/preface/authors.xml:184(phrase)
 msgid "Oleg Fritz (Russian)"
 msgstr "Oleg Fritz (�语)"
 
-#: src/preface/authors.xml:184(phrase)
+#: src/preface/authors.xml:187(phrase)
 msgid "Mick Curtis (English)"
 msgstr "Mick Curtis (�语)"
 
-#: src/preface/authors.xml:187(phrase)
+#: src/preface/authors.xml:190(phrase)
 msgid "Vitaly Lomov (Russian)"
 msgstr "Vitaly Lomov (�语)"
 
-#: src/preface/authors.xml:190(phrase)
+#: src/preface/authors.xml:193(phrase)
 msgid "Pierre PERRIER (French)"
 msgstr "Pierre PERRIER (�语)"
 
-#: src/preface/authors.xml:193(phrase)
+#: src/preface/authors.xml:196(phrase)
 msgid "Oliver Heesakke (Dutch)"
 msgstr "Oliver Heesakke (��语)"
 
-#: src/preface/authors.xml:196(phrase)
+#: src/preface/authors.xml:199(phrase)
 msgid "Susanne Schmidt (English, German)"
 msgstr "Susanne Schmidt (�语, 德语)"
 
-#: src/preface/authors.xml:199(phrase)
+#: src/preface/authors.xml:202(phrase)
 msgid "Ben (German)"
 msgstr "Ben (德语)"
 
-#: src/preface/authors.xml:202(phrase)
+#: src/preface/authors.xml:205(phrase)
 msgid "Daniel Hornung (English)"
 msgstr "Daniel Hornung (�语)"
 
-#: src/preface/authors.xml:208(term)
+#: src/preface/authors.xml:211(term)
 msgid "Graphics, Stylesheets"
 msgstr "å?¾ç??å??æ ·å¼?设计"
 
-#: src/preface/authors.xml:212(phrase)
+#: src/preface/authors.xml:215(phrase)
 msgid "Jakub Steiner"
 msgstr "Jakub Steiner"
 
-#: src/preface/authors.xml:215(phrase)
+#: src/preface/authors.xml:218(phrase)
 msgid "�yvind Kolås"
 msgstr "�yvind Kolås"
 
-#: src/preface/authors.xml:221(term)
+#: src/preface/authors.xml:224(term)
 msgid "Build System, Technical Contributions"
 msgstr "ç¼?è¯?ç³»ç»?ï¼?æ??æ?¯è´¡ç?®è??"
 
-#: src/preface/authors.xml:225(phrase)
+#: src/preface/authors.xml:228(phrase)
 msgid "Axel Wernicke"
 msgstr "Axel Wernicke"
 
-#: src/preface/authors.xml:228(phrase)
+#: src/preface/authors.xml:231(phrase)
 msgid "Róman Joost"
 msgstr "Róman Joost"
 
-#: src/preface/authors.xml:231(phrase)
+#: src/preface/authors.xml:234(phrase)
 msgid "Nickolay V. Shmyrev"
 msgstr "Nickolay V. Shmyrev"
 
-#: src/preface/authors.xml:234(phrase)
+#: src/preface/authors.xml:237(phrase)
 msgid "Daniel Egger"
 msgstr "Daniel Egger"
 
-#: src/preface/authors.xml:237(phrase)
+#: src/preface/authors.xml:240(phrase)
 msgid "Sven Neumann"
 msgstr "Sven Neumann"
 
-#: src/preface/authors.xml:240(phrase)
+#: src/preface/authors.xml:243(phrase)
 msgid "Michael Natterer (mitch)"
 msgstr "Michael Natterer (mitch)"
 
-#: src/preface/authors.xml:243(phrase)
+#: src/preface/authors.xml:246(phrase)
 msgid "Henrik Brix Andersen (brix)"
 msgstr "Henrik Brix Andersen (brix)"
 
-#: src/preface/authors.xml:246(phrase)
+#: src/preface/authors.xml:249(phrase)
 msgid "Thomas Schraitle"
 msgstr "Thomas Schraitle"
 
-#: src/preface/authors.xml:249(phrase)
+#: src/preface/authors.xml:252(phrase)
 msgid "Chris Hübsch"
 msgstr "Chris Hübsch"
 
-#: src/preface/authors.xml:252(phrase)
+#: src/preface/authors.xml:255(phrase)
 msgid "Anne Schneider"
 msgstr "Anne Schneider"
 
-#: src/preface/authors.xml:255(phrase)
+#: src/preface/authors.xml:258(phrase)
 msgid "Peter Volkov"
 msgstr "Peter Volkov"
 
-#: src/preface/authors.xml:258(phrase)
+#: src/preface/authors.xml:261(phrase)
 msgid "Daniel Richard"
 msgstr "Daniel Richard"
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
 #: src/preface/authors.xml:0(None)
 msgid "translator-credits"
-msgstr ""
-"Aron Xu <aronmalache 163 com>, 2009."
+msgstr "Aron Xu <aronmalache 163 com>, 2009."
diff --git a/po/zh_CN/toolbox.po b/po/zh_CN/toolbox.po
index b8ea969..3cf80e8 100644
--- a/po/zh_CN/toolbox.po
+++ b/po/zh_CN/toolbox.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:43+0800\n"
+"POT-Creation-Date: 2009-07-22 12:08+0800\n"
 "PO-Revision-Date: 2009-06-23 19:36+0800\n"
 "Last-Translator: Aron Xu <aronmalache 163 com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -33,9 +33,9 @@ msgid "Zoom"
 msgstr ""
 
 #: src/toolbox/tool-zoom.xml:20(primary)
-#: src/toolbox/tool-transform.xml:20(primary)
+#: src/toolbox/tool-transform.xml:21(primary)
 #: src/toolbox/tool-threshold.xml:18(primary)
-#: src/toolbox/tool-text.xml:17(primary)
+#: src/toolbox/tool-text.xml:20(primary)
 #: src/toolbox/tools-painting.xml:16(primary)
 #: src/toolbox/tool-smudge.xml:16(primary)
 #: src/toolbox/tool-shear.xml:16(primary)
@@ -96,7 +96,7 @@ msgstr ""
 
 #: src/toolbox/tool-zoom.xml:47(title)
 #: src/toolbox/tool-threshold.xml:43(title)
-#: src/toolbox/tool-text.xml:70(title) src/toolbox/tool-smudge.xml:38(title)
+#: src/toolbox/tool-text.xml:72(title) src/toolbox/tool-smudge.xml:38(title)
 #: src/toolbox/tool-shear.xml:60(title) src/toolbox/tool-scale.xml:60(title)
 #: src/toolbox/tool-rotate.xml:47(title)
 #: src/toolbox/tool-posterize.xml:27(title)
@@ -157,6 +157,7 @@ msgid "Key modifiers (Defaults)"
 msgstr ""
 
 #: src/toolbox/tool-zoom.xml:75(keycap) src/toolbox/tool-zoom.xml:87(keycap)
+#: src/toolbox/tool-text.xml:419(keycap)
 #: src/toolbox/tools-painting.xml:63(keycap)
 #: src/toolbox/tool-smudge.xml:91(keycap)
 #: src/toolbox/tool-select.xml:111(keycap)
@@ -202,7 +203,7 @@ msgstr ""
 
 #: src/toolbox/tool-zoom.xml:102(title)
 #: src/toolbox/tool-threshold.xml:82(title)
-#: src/toolbox/tool-text.xml:102(title) src/toolbox/tool-smudge.xml:105(title)
+#: src/toolbox/tool-text.xml:104(title) src/toolbox/tool-smudge.xml:105(title)
 #: src/toolbox/tool-shear.xml:96(title) src/toolbox/tool-select.xml:246(title)
 #: src/toolbox/tool-rotate.xml:99(title)
 #: src/toolbox/tool-posterize.xml:50(title)
@@ -275,14 +276,14 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:28(None)
+#: src/toolbox/tool-transform.xml:29(None)
 msgid ""
 "@@image: 'images/toolbox/transform-tools.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:46(None)
+#: src/toolbox/tool-transform.xml:47(None)
 msgid ""
 "@@image: 'images/toolbox/transform-tools-common-options.png'; md5=THIS FILE "
 "DOESN'T EXIST"
@@ -290,57 +291,57 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:155(None)
+#: src/toolbox/tool-transform.xml:204(None)
 msgid "@@image: 'images/toolbox/clip-orig.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:164(None)
+#: src/toolbox/tool-transform.xml:213(None)
 msgid "@@image: 'images/toolbox/clip-adjust.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:175(None)
+#: src/toolbox/tool-transform.xml:224(None)
 msgid "@@image: 'images/toolbox/clip-adjust2.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:205(None)
+#: src/toolbox/tool-transform.xml:254(None)
 msgid "@@image: 'images/toolbox/clip-crop.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:225(None)
+#: src/toolbox/tool-transform.xml:274(None)
 msgid "@@image: 'images/toolbox/clip-3.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-transform.xml:234(None)
+#: src/toolbox/tool-transform.xml:283(None)
 msgid "@@image: 'images/toolbox/clip-3b.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:17(title)
+#: src/toolbox/tool-transform.xml:18(title)
 #: src/toolbox/tool-select.xml:17(title)
 #: src/toolbox/tool-select.xml:21(secondary)
 #: src/toolbox/tool-brush.xml:20(title)
 msgid "Common Features"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:21(secondary)
+#: src/toolbox/tool-transform.xml:22(secondary)
 #: src/toolbox/tools-transform.xml:9(title)
 msgid "Transform Tools"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:25(title)
+#: src/toolbox/tool-transform.xml:26(title)
 msgid "An overview of the transform tools"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:32(para)
+#: src/toolbox/tool-transform.xml:33(para)
 msgid ""
 "Inside the Transformation tool dialog, you will find eight tools to modify "
 "the presentation of the image or the presentation of an element of the "
@@ -348,7 +349,7 @@ msgid ""
 "and an Information dialog to set parameters."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:40(title)
+#: src/toolbox/tool-transform.xml:41(title)
 #: src/toolbox/tool-scale.xml:112(title)
 #: src/toolbox/tool-rect-select.xml:262(title)
 #: src/toolbox/tool-eraser.xml:171(title) src/toolbox/tool-crop.xml:146(title)
@@ -357,31 +358,31 @@ msgstr ""
 msgid "Tool Options"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:42(title)
+#: src/toolbox/tool-transform.xml:43(title)
 msgid "Common options of transform tools"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:50(para)
+#: src/toolbox/tool-transform.xml:51(para)
 msgid ""
 "Some options are shared by several transform tools. We will describe them "
 "here. More specific options will be described with their tool."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:56(term)
+#: src/toolbox/tool-transform.xml:57(term)
 msgid "Transform"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:58(para)
+#: src/toolbox/tool-transform.xml:59(para)
 msgid ""
 "<acronym>GIMP</acronym> offers you three buttons which let you select which "
 "image element the transform tool will work on."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:63(para)
+#: src/toolbox/tool-transform.xml:64(para)
 msgid "Remember that the Transform option persists when you quit the tool."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:70(para)
+#: src/toolbox/tool-transform.xml:71(para)
 msgid ""
 "When you activate the first button <guiicon><inlinegraphic fileref=\"images/"
 "tool-options/rotate-affect-layer.png\"/></guiicon> the tool works on the "
@@ -389,31 +390,31 @@ msgid ""
 "transformed."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:81(para)
+#: src/toolbox/tool-transform.xml:82(para)
 msgid ""
 "When you activate the second button <guiicon><inlinegraphic fileref=\"images/"
 "tool-options/rotate-affect-selection.png\"/></guiicon> the tool works on the "
 "selection contour only (the whole layer contour if no selection)."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:92(para)
+#: src/toolbox/tool-transform.xml:93(para)
 msgid ""
 "When you activate the third button, <guiicon><inlinegraphic fileref=\"images/"
 "tool-options/rotate-affect-path.png\"/></guiicon> the tool works on the path "
 "only."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:105(term)
+#: src/toolbox/tool-transform.xml:106(term)
 msgid "Direction"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:107(para)
+#: src/toolbox/tool-transform.xml:108(para)
 msgid ""
 "<guilabel>Direction</guilabel> sets which way or direction a layer is "
 "transformed:"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:111(para)
+#: src/toolbox/tool-transform.xml:112(para)
 msgid ""
 "The <quote>Normal (Forward)</quote> mode will transform the image or layer "
 "as one might expect. You just use the handles to perform the transformation "
@@ -421,7 +422,7 @@ msgid ""
 "according to the shape and position you put the grid into."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:118(para)
+#: src/toolbox/tool-transform.xml:119(para)
 msgid ""
 "<quote>Corrective (Backward)</quote> inverts the direction. Primarily used "
 "with the Rotation tool to repair digital images that have some geometric "
@@ -429,41 +430,93 @@ msgid ""
 "\"gimp-tool-rotate\"/>."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:127(term)
+#: src/toolbox/tool-transform.xml:128(term)
 msgid "Interpolation"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:129(para)
+#: src/toolbox/tool-transform.xml:130(para)
 msgid ""
-"The <guilabel>Interpolation</guilabel> drop-down list lets you choose the "
-"quality of the transformation. For more information about the different "
-"methods that can be employed, see the glossary entry <link linkend="
-"\"glossary-interpolation\">Interpolation</link>."
+"This drop-down list lets you choose the method and thus the quality of the "
+"transformation:"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:139(term)
+#: src/toolbox/tool-transform.xml:136(term)
+#: src/toolbox/tool-clone.xml:265(term) src/toolbox/tool-brush.xml:563(para)
+msgid "None"
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:138(para)
+msgid ""
+"The color of each pixel is copied from its closest neighboring pixel in the "
+"original image. This often results in aliasing (the <quote>stair-step</"
+"quote> effect) and a coarse image, but it is the fastest method. Sometimes "
+"this method is called <quote>Nearest Neighbor</quote>."
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:148(term)
+#: src/toolbox/tool-blend.xml:210(para) src/toolbox/tool-blend.xml:232(term)
+msgid "Linear"
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:150(para)
+msgid ""
+"The color of each pixel is computed as the average color of the four closest "
+"pixels in the original image. This gives a satisfactory result for most "
+"images and is a good compromise between speed and quality. Sometimes this "
+"method is called <quote>Bilinear</quote>."
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:160(term)
+msgid "Cubic"
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:162(para)
+msgid ""
+"The color of each pixel is computed as the average color of the eight "
+"closest pixels in the original image. This usually gives the best result, "
+"but it naturally takes more time. Sometimes this method is called "
+"<quote>Bicubic</quote>."
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:171(term)
+msgid "Sinc (Lanczos3)"
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:173(para)
+msgid ""
+"The Lanczos3 method uses the Sinc mathematical function and performs a high "
+"quality interpolation."
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:180(para)
+msgid ""
+"You can set the default interpolation method in the <link linkend=\"gimp-"
+"prefs-tool-options\">Tools Options Preferences</link> dialog."
+msgstr ""
+
+#: src/toolbox/tool-transform.xml:188(term)
 msgid "Clipping"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:141(para)
+#: src/toolbox/tool-transform.xml:190(para)
 msgid ""
 "After transformation, the image can be bigger. This option will clip the "
 "transformed image to the original image size."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:145(para)
+#: src/toolbox/tool-transform.xml:194(para)
 msgid "You can choose between several ways to clip:"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:148(term)
+#: src/toolbox/tool-transform.xml:197(term)
 msgid "Adjust"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:151(title)
+#: src/toolbox/tool-transform.xml:200(title)
 msgid "Original image for examples"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:158(para)
+#: src/toolbox/tool-transform.xml:207(para)
 #: src/toolbox/tool-levels.xml:265(para) src/toolbox/tool-levels.xml:545(para)
 #: src/toolbox/tool-desaturate.xml:139(para)
 #: src/toolbox/tool-bucket-fill.xml:314(para)
@@ -471,16 +524,16 @@ msgstr ""
 msgid "Original image"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:167(para)
+#: src/toolbox/tool-transform.xml:216(para)
 msgid "Rotation applied with <quote>Adjust</quote>"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:178(para)
+#: src/toolbox/tool-transform.xml:227(para)
 msgid ""
 "Rotation applied with <quote>Adjust</quote> and canvas enlarged to layer size"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:185(para)
+#: src/toolbox/tool-transform.xml:234(para)
 msgid ""
 "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 "
@@ -488,43 +541,43 @@ msgid ""
 "guimenuitem></menuchoice> command."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:198(term)
-#: src/toolbox/tool-transform.xml:208(para)
+#: src/toolbox/tool-transform.xml:247(term)
+#: src/toolbox/tool-transform.xml:257(para)
 msgid "Clip"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:201(title)
+#: src/toolbox/tool-transform.xml:250(title)
 msgid "Example for Clip"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:212(para)
+#: src/toolbox/tool-transform.xml:261(para)
 msgid "With Clip: all what exceeds image limits is deleted."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:218(term)
+#: src/toolbox/tool-transform.xml:267(term)
 msgid "Crop to result"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:221(title)
+#: src/toolbox/tool-transform.xml:270(title)
 msgid "Example for Crop to result"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:228(para)
+#: src/toolbox/tool-transform.xml:277(para)
 msgid "Rotation 45° with Crop to result"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:237(para)
+#: src/toolbox/tool-transform.xml:286(para)
 msgid "The crop limit is marked with red. No transparent area is included."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:244(para)
+#: src/toolbox/tool-transform.xml:293(para)
 msgid ""
 "If this option is selected, the image is cropped so that the transparent "
 "area, created by the transform operation in corners, will not be included in "
 "the resulting image."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:252(term)
+#: src/toolbox/tool-transform.xml:301(term)
 msgid "Crop with aspect"
 msgstr ""
 
@@ -540,14 +593,14 @@ msgstr ""
 #.                   </mediaobject>
 #.                 </figure>
 #. Commented until somebody finds a valid example
-#: src/toolbox/tool-transform.xml:266(para)
+#: src/toolbox/tool-transform.xml:315(para)
 msgid ""
 "This option works like the one described before, but makes sure, that the "
 "aspect ratio is maintained."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:276(term)
-#: src/toolbox/tool-transform.xml:279(primary)
+#: src/toolbox/tool-transform.xml:325(term)
+#: src/toolbox/tool-transform.xml:328(primary)
 #: src/toolbox/tool-threshold.xml:153(term)
 #: src/toolbox/tool-posterize.xml:73(term)
 #: src/toolbox/tool-levels.xml:484(term)
@@ -559,20 +612,20 @@ msgstr ""
 msgid "Preview"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:280(secondary)
+#: src/toolbox/tool-transform.xml:329(secondary)
 msgid "Transformation tools"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:283(para)
+#: src/toolbox/tool-transform.xml:332(para)
 msgid ""
 "<acronym>GIMP</acronym> lets you select among four Preview possibilities:"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:288(term)
+#: src/toolbox/tool-transform.xml:337(term)
 msgid "Outline"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:290(para)
+#: src/toolbox/tool-transform.xml:339(para)
 msgid ""
 "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 "
@@ -580,11 +633,11 @@ msgid ""
 "selection according to the selected Affect mode."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:300(term)
+#: src/toolbox/tool-transform.xml:349(term)
 msgid "Grid"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:302(para)
+#: src/toolbox/tool-transform.xml:351(para)
 msgid ""
 "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 "
@@ -592,26 +645,26 @@ msgid ""
 "selected Transform mode."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:312(term)
+#: src/toolbox/tool-transform.xml:361(term)
 #: src/toolbox/tool-crop.xml:28(primary) src/toolbox/tool-clone.xml:191(term)
 msgid "Image"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:314(para)
+#: src/toolbox/tool-transform.xml:363(para)
 msgid ""
 "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."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:322(term)
+#: src/toolbox/tool-transform.xml:371(term)
 msgid "Grid+Image"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:324(para)
+#: src/toolbox/tool-transform.xml:373(para)
 msgid "Both turn at the same time."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:328(para)
+#: src/toolbox/tool-transform.xml:377(para)
 msgid ""
 "Options with grid activate a drop-list with two options: <guilabel>Number of "
 "Grid Lines</guilabel> will allow control over the total number of displayed "
@@ -620,18 +673,18 @@ msgid ""
 "lines. Use the slider to set the distance."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:340(term)
+#: src/toolbox/tool-transform.xml:389(term)
 #: src/toolbox/tool-eraser.xml:194(term) src/toolbox/tool-brush.xml:267(term)
 #: src/toolbox/tool-brush.xml:274(primary)
 #: src/toolbox/tool-brush.xml:368(term)
 msgid "Opacity"
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:342(para)
+#: src/toolbox/tool-transform.xml:391(para)
 msgid "This slider lets you set the preview opacity."
 msgstr ""
 
-#: src/toolbox/tool-transform.xml:349(para)
+#: src/toolbox/tool-transform.xml:398(para)
 msgid ""
 "When rotating a path, Preview options are not valid: only Outline is active."
 msgstr ""
@@ -958,70 +1011,98 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:29(None)
+#: src/toolbox/tool-text.xml:32(None)
 msgid "@@image: 'images/toolbox/toolbox-text.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:54(None)
+#: src/toolbox/tool-text.xml:56(None)
 msgid "@@image: 'images/using/text-tool.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:107(None)
+#: src/toolbox/tool-text.xml:109(None)
 msgid ""
 "@@image: 'images/toolbox/tool-options-text.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:279(None)
+#: src/toolbox/tool-text.xml:307(None)
 msgid ""
 "@@image: 'images/menus/layer-text-commands.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:304(None)
+#: src/toolbox/tool-text.xml:332(None)
 msgid ""
 "@@image: 'images/toolbox/text-along-path.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:309(None)
+#: src/toolbox/tool-text.xml:337(None)
 msgid "@@image: 'images/toolbox/text-path.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-text.xml:342(None)
+#: src/toolbox/tool-text.xml:373(None)
 msgid ""
 "@@image: 'images/toolbox/tool-dialog-text.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:14(title) src/toolbox/tool-text.xml:18(secondary)
-#: src/toolbox/tool-text.xml:21(primary)
-#: src/toolbox/tool-text.xml:335(primary)
-#: src/toolbox/tool-text.xml:348(primary)
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/toolbox/tool-text.xml:414(None)
+msgid ""
+"@@image: 'images/using/enter-unicode-char1.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/toolbox/tool-text.xml:429(None)
+msgid ""
+"@@image: 'images/using/enter-unicode-char2.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/toolbox/tool-text.xml:442(None)
+msgid ""
+"@@image: 'images/using/enter-unicode-char3.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/toolbox/tool-text.xml:460(None)
+msgid ""
+"@@image: 'images/using/enter-unicode-char4.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:17(title) src/toolbox/tool-text.xml:21(secondary)
+#: src/toolbox/tool-text.xml:24(primary)
+#: src/toolbox/tool-text.xml:364(primary)
+#: src/toolbox/tool-text.xml:472(primary)
 #: src/toolbox/tool-move.xml:272(primary)
 msgid "Text"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:22(secondary)
+#: src/toolbox/tool-text.xml:25(secondary)
 #: src/toolbox/tool-path.xml:25(secondary)
 #: src/toolbox/tool-crop.xml:30(tertiary)
 #: src/toolbox/tool-blend.xml:27(secondary)
 msgid "Tool"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:26(title)
+#: src/toolbox/tool-text.xml:29(title)
 msgid "The Text tool in Toolbox"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:34(para)
+#: src/toolbox/tool-text.xml:37(para)
 msgid ""
 "The Text tool places text into an image. When you click on an image with "
 "this tool the <emphasis>Text Editor dialog</emphasis> is opened where you "
@@ -1030,20 +1111,20 @@ msgid ""
 "size of your text, and justify it, interactively."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:41(para)
+#: src/toolbox/tool-text.xml:44(para)
 msgid ""
-"A new possibility appeared with GIMP-2.6: click-dragging the mouse pointer "
-"on the canvas draws a rectangular frame that you can enlarge and move as you "
-"do with rectangular selections. The text you type in the Text Editor is "
-"displayed in this frame and automatically adapted to the frame size. You can "
-"adjust this frame whenever you like."
+"A new possibility appeared with <acronym>GIMP</acronym>-2.6: click-dragging "
+"the mouse pointer on the canvas draws a rectangular frame that you can "
+"enlarge and move as you do with rectangular selections. The text you type in "
+"the Text Editor is displayed in this frame and automatically adapted to the "
+"frame size. You can adjust this frame whenever you like."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:50(title)
+#: src/toolbox/tool-text.xml:53(title)
 msgid "Text tool bounding box"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:58(para)
+#: src/toolbox/tool-text.xml:60(para)
 msgid ""
 "When the mouse pointer is around the center of the frame, it comes with a "
 "small crosshair <guiicon><inlinegraphic fileref=\"images/toolbox/stock-tool-"
@@ -1052,31 +1133,31 @@ msgid ""
 "the same place in the frame."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:71(para)
+#: src/toolbox/tool-text.xml:73(para)
 msgid "You can access this tool in several ways:"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:76(para)
+#: src/toolbox/tool-text.xml:78(para)
 msgid ""
 "In the image menu through <menuchoice><guimenu>Tools</"
 "guimenu><guisubmenu>Text</guisubmenu></menuchoice>,"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:85(para)
+#: src/toolbox/tool-text.xml:87(para)
 msgid ""
 "by clicking the tool icon <guiicon><inlinegraphic fileref=\"images/toolbox/"
 "stock-tool-text-22.png\"/></guiicon> in Toolbox,"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:94(para)
+#: src/toolbox/tool-text.xml:96(para)
 msgid "or by using the <keycap>T</keycap> keyboard shortcut."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:104(title)
+#: src/toolbox/tool-text.xml:106(title)
 msgid "Text tool options"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:112(para) src/toolbox/tool-path.xml:124(para)
+#: src/toolbox/tool-text.xml:114(para) src/toolbox/tool-path.xml:124(para)
 #: src/toolbox/tool-clone.xml:156(para)
 #: src/toolbox/about-common-options-display.xml:5(para)
 msgid ""
@@ -1087,62 +1168,86 @@ msgid ""
 "guimenuitem></menuchoice> which opens the option window of the selected tool."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:125(term)
+#: src/toolbox/tool-text.xml:127(term)
 msgid "Font"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:127(para)
+#: src/toolbox/tool-text.xml:129(para)
 msgid ""
-"There are two ways of selecting fonts in GIMP. The first is from the image "
-"Dialogs/Fonts menu. The second is with the Font selector in this tool. Both "
-"methods select from the installed X fonts. When you select a font it is "
+"Click on the fonts button <guibutton>A&alpha;</guibutton> to open the font "
+"selector of this tool, which offers you a list of installed X fonts."
+msgstr ""
+
+#: src/toolbox/tool-text.xml:135(para)
+msgid ""
+"At the bottom of the font selector you find some icons which act as buttoms "
+"for:"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:140(para)
+msgid "resizing the font previews,"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:143(para)
+msgid ""
+"selecting <emphasis>list view</emphasis> or <emphasis>grid view</emphasis>,"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:149(para)
+msgid "opening the <link linkend=\"gimp-font-dialog\">font dialog</link>."
+msgstr ""
+
+#: src/toolbox/tool-text.xml:155(para)
+msgid ""
+"Choose a font from the installed fonts. When you select a font it is "
 "interactively applied to your text."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:134(para)
+#. cf. bug #585823 (2009-06-15)
+#: src/toolbox/tool-text.xml:161(para)
 msgid ""
-"You can get special characters in the same way as you get them in other text "
-"editors: <keycap>AltGr</keycap> + key in Linux, <keycap>Alt</keycap> + "
-"number key pad in Windows."
+"You can use the scroll wheel of your pointing device (usually your mouse) on "
+"the fonts button in order to quickly change the font of your text (move the "
+"pointer on the fonts button, and don't click, just use the wheel button)."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:144(term)
+#: src/toolbox/tool-text.xml:172(term)
 #: src/toolbox/tool-rect-select.xml:343(term)
 #: src/toolbox/tool-ink.xml:99(term) src/toolbox/tool-ink.xml:124(term)
 #: src/toolbox/tool-crop.xml:273(term) src/toolbox/tool-brush.xml:396(term)
 msgid "Size"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:146(para)
+#: src/toolbox/tool-text.xml:174(para)
 msgid ""
 "This control sets the size of the font in any of several selectable units."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:154(term)
+#: src/toolbox/tool-text.xml:182(term)
 msgid "Hinting"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:156(para)
+#: src/toolbox/tool-text.xml:184(para)
 msgid ""
 "Uses the indices of adjustment to modify the characters in order to produce "
 "clear letters in small font sizes."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:163(term)
+#: src/toolbox/tool-text.xml:191(term)
 msgid "Force Auto-Hinter"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:165(para)
+#: src/toolbox/tool-text.xml:193(para)
 msgid ""
 "<guilabel>Auto Hinter</guilabel> tries to automatically compute information "
 "for better representation of the character font."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:173(term) src/toolbox/tool-select.xml:352(term)
+#: src/toolbox/tool-text.xml:201(term) src/toolbox/tool-select.xml:352(term)
 msgid "Antialiasing"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:175(para)
+#: src/toolbox/tool-text.xml:203(para)
 msgid ""
 "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 "
@@ -1151,7 +1256,7 @@ msgid ""
 "color space."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:186(term) src/toolbox/tool-levels.xml:22(primary)
+#: src/toolbox/tool-text.xml:214(term) src/toolbox/tool-levels.xml:22(primary)
 #: src/toolbox/tool-color-picker.xml:28(primary)
 #: src/toolbox/tool-colorize.xml:20(primary)
 #: src/toolbox/tool-color-balance.xml:20(primary)
@@ -1160,46 +1265,46 @@ msgstr ""
 msgid "Color"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:188(para)
+#: src/toolbox/tool-text.xml:216(para)
 msgid ""
 "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."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:194(para)
+#: src/toolbox/tool-text.xml:222(para)
 msgid ""
 "You can also click-and-drag the color from the Toolbox color area onto the "
 "text."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:203(term) src/toolbox/tool-text.xml:206(primary)
+#: src/toolbox/tool-text.xml:231(term) src/toolbox/tool-text.xml:234(primary)
 msgid "Justify"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:208(para)
+#: src/toolbox/tool-text.xml:236(para)
 msgid ""
 "Causes the text to be justified according to any of four rules selectable "
 "from the associated icons."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:216(term) src/toolbox/tool-text.xml:219(primary)
+#: src/toolbox/tool-text.xml:244(term) src/toolbox/tool-text.xml:247(primary)
 msgid "Indent"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:221(para)
+#: src/toolbox/tool-text.xml:249(para)
 msgid "Controls the indent spacing from the left margin, for the fist line."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:229(term)
+#: src/toolbox/tool-text.xml:257(term)
 msgid "Line Spacing"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:232(primary)
+#: src/toolbox/tool-text.xml:260(primary)
 msgid "Line spacing"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:234(para)
+#: src/toolbox/tool-text.xml:262(para)
 msgid ""
 "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 "
@@ -1207,22 +1312,22 @@ msgid ""
 "subtracted from this space (the value can be negative)."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:245(term)
+#: src/toolbox/tool-text.xml:273(term)
 msgid "Letter Spacing"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:247(para)
+#: src/toolbox/tool-text.xml:275(para)
 msgid ""
 "Controls the spacing between letters. Also in this case the number is not "
 "the space itself between letters, but how many pixels must be added to or "
 "substracted from this space (the value can be negative)."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:257(term) src/toolbox/tool-text.xml:260(primary)
+#: src/toolbox/tool-text.xml:285(term) src/toolbox/tool-text.xml:288(primary)
 msgid "Text along Path"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:262(para)
+#: src/toolbox/tool-text.xml:290(para)
 msgid ""
 "This option is enabled only if a <link linkend=\"gimp-using-paths\">path</"
 "link> exists. When your text is created, then create or import a path and "
@@ -1230,26 +1335,26 @@ msgid ""
 "invisible and you have to make it visible in the Path Dialog."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:269(para)
+#: src/toolbox/tool-text.xml:297(para)
 msgid "This command is also available from the <quote>Layer</quote> menu:"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:273(title)
+#: src/toolbox/tool-text.xml:301(title)
 msgid "The Text to Path command among text commands in the Layer menu"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:282(para)
+#: src/toolbox/tool-text.xml:310(para)
 msgid "This group of options appears only if a layer text exists."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:288(para)
+#: src/toolbox/tool-text.xml:316(para)
 msgid ""
 "If you want to use a text which already exists, make it active in the <link "
 "linkend=\"gimp-layer-dialog\">Layer dialog</link>, select the Text tool and "
 "click on the text in the image window."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:293(para)
+#: src/toolbox/tool-text.xml:321(para)
 msgid ""
 "Click on the <guibutton>Text along Path</guibutton> button. The text is bent "
 "along the path. Letters are represented with their outline. Each of them is "
@@ -1257,69 +1362,61 @@ msgid ""
 "dialog\">Path dialog</link>. All path options should apply to this new path."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:301(title)
+#: src/toolbox/tool-text.xml:329(title)
 msgid "<quote>Text along Path</quote> example"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:317(term)
-msgid "Create Path from Text"
+#: src/toolbox/tool-text.xml:345(term)
+msgid "Path from Text"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:320(primary)
+#: src/toolbox/tool-text.xml:348(primary)
 msgid "Text to Path"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:322(para)
+#: src/toolbox/tool-text.xml:350(para)
 msgid ""
 "This tool creates a selection path from the selected text. Every letter is "
 "surrounded with a path component. So you can modify the shape of letters by "
 "moving path control points."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:333(title)
+#: src/toolbox/tool-text.xml:361(title)
 msgid "Text Editor"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:336(secondary)
+#: src/toolbox/tool-text.xml:365(secondary)
 msgid "Editor"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:339(title)
-msgid "The Text Editor options"
+#: src/toolbox/tool-text.xml:369(title)
+msgid "The Text Editor"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:349(secondary)
-msgid "Load text from file"
-msgstr ""
-
-#: src/toolbox/tool-text.xml:352(term) src/toolbox/tool-smudge.xml:120(term)
-#: src/toolbox/tool-scale.xml:43(title) src/toolbox/tool-rotate.xml:35(title)
-msgid "Overview"
-msgstr ""
-
-#: src/toolbox/tool-text.xml:354(para)
+#: src/toolbox/tool-text.xml:378(para)
 msgid ""
 "This dialog window is opened when you click on the image with the Text Tool. "
 "There, you can enter the text which shows up in real time in the frame on "
 "top of the canvas."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:359(para)
+#: src/toolbox/tool-text.xml:383(para)
 msgid ""
 "You can correct the text you are writing and you can change the text font "
 "with the Font Editor."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:363(para)
+#: src/toolbox/tool-text.xml:387(para)
 msgid ""
 "As soon as you start writing, a Text layer is created in the Layer Dialog. "
-"On an image with such a layer (the image you are working on, or a .xcf "
-"image), you can resume text editing by activating this text layer then "
-"clicking on it (double click). Of course, you can apply to this text layer "
-"the same functions you use with other layers."
+"On an image with such a layer (the image you are working on, or a <filename "
+"class=\"extension\">.xcf</filename> image), you can resume text editing by "
+"activating this text layer then clicking on it (double click). Of course, "
+"you can apply to this text layer the same functions you use with other "
+"layers."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:371(para)
+#: src/toolbox/tool-text.xml:395(para)
 msgid ""
 "To add another text to your image click on a non-text layer: a new Text "
 "Editor will appear and a new text layer will be created. To pass from a text "
@@ -1327,56 +1424,126 @@ msgid ""
 "activate the editor."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:380(term)
-msgid "Load Text from File"
+#. cf. bug #580532 (2009-06-15)
+#: src/toolbox/tool-text.xml:402(para)
+msgid ""
+"You can get Unicode characters with <keycombo><keycap>Ctrl</"
+"keycap><keycap>Shift</keycap><keycap>U</keycap></keycombo> plus hexadecimal "
+"Unicode code of the desired char, for example:"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:410(title)
+msgid "Entering Unicode characters"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:420(keycap)
+#: src/toolbox/tool-smudge.xml:77(keycap)
+#: src/toolbox/tool-select.xml:157(keycap)
+#: src/toolbox/tool-select.xml:190(keycap)
+#: src/toolbox/tool-rect-select.xml:109(keycap)
+#: src/toolbox/tool-rect-select.xml:136(keycap)
+#: src/toolbox/tool-perspective-clone.xml:83(keycap)
+#: src/toolbox/tool-pencil.xml:100(keycap) src/toolbox/tool-path.xml:88(term)
+#: src/toolbox/tool-paintbrush.xml:79(keycap)
+#: src/toolbox/tool-measure.xml:107(term)
+#: src/toolbox/tool-iscissors.xml:111(keycap)
+#: src/toolbox/tool-heal.xml:106(keycap)
+#: src/toolbox/tool-ellipse-select.xml:129(keycap)
+#: src/toolbox/tool-ellipse-select.xml:146(keycap)
+#: src/toolbox/tool-dodge-burn.xml:87(keycap)
+#: src/toolbox/tool-color-picker.xml:115(term)
+#: src/toolbox/tool-brush.xml:181(keycap)
+#: src/toolbox/tool-brush.xml:206(keycap)
+#: src/toolbox/tool-align.xml:79(keycap)
+#: src/toolbox/tool-airbrush.xml:83(keycap)
+msgid "Shift"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:421(keycap)
+msgid "U"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:434(keycap)
+msgid "4"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:434(keycap)
+msgid "7"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:446(keycap)
+msgid "Enter"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:451(para)
+msgid ""
+"Of course this feature is more useful for entering special (even exotic) "
+"characters, provided that the required glyphs for these characters are "
+"supplied by the selected font &mdash; only few fonts support Klingon. ;-)"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:463(para)
+msgid "Unicode 0x47 (<quote>G</quote>), 0x2665, 0x0271, 0x03C0"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:470(title)
+msgid "The Text Editor options"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:473(secondary)
+msgid "Load from file"
+msgstr ""
+
+#: src/toolbox/tool-text.xml:476(term)
+msgid "Load Text from file"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:382(para)
+#: src/toolbox/tool-text.xml:478(para)
 msgid ""
 "Text can be loaded from a text file by clicking the folder icon in the text "
 "editor. All the text in the file is loaded."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:389(term)
-msgid "Clear all Text"
+#: src/toolbox/tool-text.xml:485(term)
+msgid "Clear all text"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:391(para)
+#: src/toolbox/tool-text.xml:487(para)
 msgid ""
 "Clicking this icon clears the editor and the associated text on the image."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:398(term)
-msgid "From Left to Right"
+#: src/toolbox/tool-text.xml:494(term)
+msgid "From left to right"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:400(para)
+#: src/toolbox/tool-text.xml:496(para)
 msgid ""
 "This option causes text to be entered from left to right, as is the case "
 "with most Western languages and may Eastern languages."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:408(term)
-msgid "From Right to Left"
+#: src/toolbox/tool-text.xml:504(term)
+msgid "From right to left"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:410(para)
+#: src/toolbox/tool-text.xml:506(para)
 msgid ""
 "This option allows text to be entered from right to left, as is the case "
 "with some Eastern languages, such as Arabic (illustrated in the icon)."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:418(term)
-msgid "Use Selected Font"
+#: src/toolbox/tool-text.xml:514(term)
+msgid "Use selected font"
 msgstr ""
 
-#: src/toolbox/tool-text.xml:420(para)
+#: src/toolbox/tool-text.xml:516(para)
 msgid ""
 "Default doesn't use the font you have selected in the Options dialog. If you "
 "want to use it, check this option."
 msgstr ""
 
-#: src/toolbox/tool-text.xml:425(para)
+#: src/toolbox/tool-text.xml:521(para)
 msgid "See also <xref linkend=\"gimp-using-text\"/>."
 msgstr ""
 
@@ -1518,28 +1685,6 @@ msgstr ""
 msgid "or by pressing the <keycap>S</keycap> key on keyboard."
 msgstr ""
 
-#: src/toolbox/tool-smudge.xml:77(keycap)
-#: src/toolbox/tool-select.xml:157(keycap)
-#: src/toolbox/tool-select.xml:190(keycap)
-#: src/toolbox/tool-rect-select.xml:109(keycap)
-#: src/toolbox/tool-rect-select.xml:136(keycap)
-#: src/toolbox/tool-perspective-clone.xml:83(keycap)
-#: src/toolbox/tool-pencil.xml:100(keycap) src/toolbox/tool-path.xml:88(term)
-#: src/toolbox/tool-paintbrush.xml:79(keycap)
-#: src/toolbox/tool-measure.xml:107(term)
-#: src/toolbox/tool-iscissors.xml:111(keycap)
-#: src/toolbox/tool-heal.xml:106(keycap)
-#: src/toolbox/tool-ellipse-select.xml:129(keycap)
-#: src/toolbox/tool-ellipse-select.xml:146(keycap)
-#: src/toolbox/tool-dodge-burn.xml:87(keycap)
-#: src/toolbox/tool-color-picker.xml:115(term)
-#: src/toolbox/tool-brush.xml:181(keycap)
-#: src/toolbox/tool-brush.xml:206(keycap)
-#: src/toolbox/tool-align.xml:79(keycap)
-#: src/toolbox/tool-airbrush.xml:83(keycap)
-msgid "Shift"
-msgstr ""
-
 #: src/toolbox/tool-smudge.xml:80(para)
 msgid ""
 "The <keycap>Shift</keycap> key places the smudge tool into straight line "
@@ -1558,6 +1703,11 @@ msgstr ""
 msgid "The Smudge tool in Toolbox"
 msgstr ""
 
+#: src/toolbox/tool-smudge.xml:120(term) src/toolbox/tool-scale.xml:43(title)
+#: src/toolbox/tool-rotate.xml:35(title)
+msgid "Overview"
+msgstr ""
+
 #: src/toolbox/tool-smudge.xml:122(para)
 msgid ""
 "The available tool options for the Smudge Tool can be accessed by double "
@@ -6278,8 +6428,8 @@ msgstr ""
 #: src/toolbox/tool-desaturate.xml:34(para)
 msgid ""
 "This command only works on layers of <link linkend=\"glossary-rgb\">RGB</"
-"link> images. If the image is in Grayscale or Indexed mode, the menu entry "
-"is insensitive and grayed out."
+"link> images. If the image is in Grayscale or Indexed mode, it can do "
+"nothing."
 msgstr ""
 
 #: src/toolbox/tool-desaturate.xml:42(title)
@@ -7804,10 +7954,6 @@ msgid ""
 "successively."
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:265(term) src/toolbox/tool-brush.xml:563(para)
-msgid "None"
-msgstr ""
-
 #: src/toolbox/tool-clone.xml:267(para)
 msgid ""
 "In this mode, each brushstroke is treated separately. For each stroke, the "
@@ -7899,7 +8045,7 @@ msgstr ""
 msgid "<quote>Fixed</quote> clone alignment"
 msgstr ""
 
-#: src/toolbox/tool-clone.xml:386(title) src/toolbox/tool-brush.xml:833(title)
+#: src/toolbox/tool-clone.xml:386(title) src/toolbox/tool-brush.xml:842(title)
 msgid "Further Information"
 msgstr ""
 
@@ -8517,7 +8663,7 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:689(None) src/toolbox/tool-brush.xml:758(None)
+#: src/toolbox/tool-brush.xml:689(None) src/toolbox/tool-brush.xml:767(None)
 msgid ""
 "@@image: 'images/glossary/modes-normal2.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
@@ -8525,26 +8671,32 @@ msgstr ""
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: src/toolbox/tool-brush.xml:698(None)
+msgid "@@image: 'images/using/wilber-layers.png'; md5=THIS FILE DOESN'T EXIST"
+msgstr ""
+
+#. When image changes, this message will be marked fuzzy or untranslated for you.
+#. It doesn't matter what you translate it to: it's not used at all.
+#: src/toolbox/tool-brush.xml:707(None)
 msgid ""
 "@@image: 'images/glossary/modes-behind.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:731(None)
+#: src/toolbox/tool-brush.xml:740(None)
 msgid "@@image: 'images/toolbox/mode-behind.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:767(None)
+#: src/toolbox/tool-brush.xml:776(None)
 msgid ""
 "@@image: 'images/glossary/modes-colorerase.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: src/toolbox/tool-brush.xml:818(None)
+#: src/toolbox/tool-brush.xml:827(None)
 msgid "@@image: 'images/toolbox/mode-erase.png'; md5=THIS FILE DOESN'T EXIST"
 msgstr ""
 
@@ -9071,7 +9223,7 @@ msgid "Behind"
 msgstr ""
 
 #: src/toolbox/tool-brush.xml:678(primary)
-#: src/toolbox/tool-brush.xml:747(primary)
+#: src/toolbox/tool-brush.xml:756(primary)
 msgid "Paint Modes"
 msgstr ""
 
@@ -9083,15 +9235,19 @@ msgstr ""
 msgid "Example for layer mode <quote>Behind</quote>"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:692(para) src/toolbox/tool-brush.xml:761(para)
+#: src/toolbox/tool-brush.xml:692(para) src/toolbox/tool-brush.xml:770(para)
 msgid "Wilber over a blue background layer"
 msgstr ""
 
 #: src/toolbox/tool-brush.xml:701(para)
+msgid "Layers dialog"
+msgstr ""
+
+#: src/toolbox/tool-brush.xml:710(para)
 msgid "Filled with pattern"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:705(para)
+#: src/toolbox/tool-brush.xml:714(para)
 msgid ""
 "This mode applies paint only to transparent areas of the layer: the lower "
 "the opacity, the more paint is applied. Thus, painting opaque areas has no "
@@ -9100,7 +9256,7 @@ msgid ""
 "meaningful for layers that lack an alpha channel."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:713(para)
+#: src/toolbox/tool-brush.xml:722(para)
 msgid ""
 "In the above example image, Wilber is on the top layer, surrounded by "
 "transparency. The lower layer is solid light blue. The Bucket Fill tool was "
@@ -9109,39 +9265,39 @@ msgid ""
 "Fill tool."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:721(para)
+#: src/toolbox/tool-brush.xml:730(para)
 msgid ""
 "The next image (below) has two layers. The upper layer is active. Three "
 "brushtrokes with pencil, red color at 100%, 50%, 25%: only transparent or "
 "semi-transparent pixels of the layer are painted."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:727(title)
+#: src/toolbox/tool-brush.xml:736(title)
 msgid "Painting in <quote>Behind</quote> mode"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:734(para)
+#: src/toolbox/tool-brush.xml:743(para)
 msgid "Painting with 100%, 50%, 25% transparency (from left to right)"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:744(term)
-#: src/toolbox/tool-brush.xml:748(secondary)
+#: src/toolbox/tool-brush.xml:753(term)
+#: src/toolbox/tool-brush.xml:757(secondary)
 msgid "Color Erase"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:751(primary)
+#: src/toolbox/tool-brush.xml:760(primary)
 msgid "Color Erase (paint mode)"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:754(title)
+#: src/toolbox/tool-brush.xml:763(title)
 msgid "Example for layer mode <quote>Color erase</quote>"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:770(para)
+#: src/toolbox/tool-brush.xml:779(para)
 msgid "White foreground color erased"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:774(para)
+#: src/toolbox/tool-brush.xml:783(para)
 msgid ""
 "This mode erases the foreground color, replacing it with partial "
 "transparency. It acts like the <link linkend=\"plug-in-colortoalpha\">Color "
@@ -9150,42 +9306,42 @@ msgid ""
 "mode is identical to Normal."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:782(para)
+#: src/toolbox/tool-brush.xml:791(para)
 msgid ""
 "In the above example image, the color of the Bucket Fill tool was white, so "
 "white parts of Wilber were erased and the blue background shows through."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:787(para)
+#: src/toolbox/tool-brush.xml:796(para)
 msgid ""
 "This image below has only one layer, the background layer. Background color "
 "is sky blue. Three brushtrokes with pencil:"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:794(para)
+#: src/toolbox/tool-brush.xml:803(para)
 msgid "With the exact color of the blue area: only this blue color is erased."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:800(para)
+#: src/toolbox/tool-brush.xml:809(para)
 msgid ""
 "With the exact color of the red area. Only this red color is erased, "
 "whatever its transparency. Erased areas are made transparent."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:807(para)
+#: src/toolbox/tool-brush.xml:816(para)
 msgid ""
 "With the sky blue color of the layer background: only this color is erased."
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:814(title)
+#: src/toolbox/tool-brush.xml:823(title)
 msgid "Painting in <quote>Color Erase</quote> mode"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:821(para)
+#: src/toolbox/tool-brush.xml:830(para)
 msgid "Painted with 1. blue; 2. red; 3. background color"
 msgstr ""
 
-#: src/toolbox/tool-brush.xml:834(para)
+#: src/toolbox/tool-brush.xml:843(para)
 msgid ""
 "Advanced users may be interested to know that brush tools actually operate "
 "at a sub-pixel level, in order to avoid producing jagged-looking results. "
@@ -9664,10 +9820,6 @@ msgstr ""
 msgid "Examples of gradient shapes"
 msgstr ""
 
-#: src/toolbox/tool-blend.xml:210(para) src/toolbox/tool-blend.xml:232(term)
-msgid "Linear"
-msgstr ""
-
 #: src/toolbox/tool-blend.xml:218(para) src/toolbox/tool-blend.xml:242(term)
 msgid "Bi-Linear"
 msgstr ""
diff --git a/po/zh_CN/tutorial.po b/po/zh_CN/tutorial.po
index c6741c6..3c90fd2 100644
--- a/po/zh_CN/tutorial.po
+++ b/po/zh_CN/tutorial.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2009-06-23 18:43+0800\n"
+"POT-