[gimp-help/gimp-help-2-10] fix markup issue in zh_CN translation



commit a5ef7a8ee833e23fc7c8024477d8647df6985809
Author: Jacob Boerema <jgboerema gmail com>
Date:   Tue Aug 24 09:43:57 2021 -0400

    fix markup issue in zh_CN translation
    
    Typo in id: file-png-save-default should be file-png-save-defaults
    
    (cherry picked from commit 55c5a91325b9f993bdce3e0eff6b626591d09f1c)

 po/zh_CN/using.po | 1442 +++++++++++++++++++++++++++++------------------------
 1 file changed, 782 insertions(+), 660 deletions(-)
---
diff --git a/po/zh_CN/using.po b/po/zh_CN/using.po
index 964399474..f0a31fbc8 100644
--- a/po/zh_CN/using.po
+++ b/po/zh_CN/using.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-help 2-pot\n"
-"POT-Creation-Date: 2016-04-16 06:29+0000\n"
+"POT-Creation-Date: 2021-08-23 16:23-0400\n"
 "PO-Revision-Date: 2016-04-19 09:15-0400\n"
 "Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 gmail com>\n"
 "Language-Team: Chinese (simplified)\n"
@@ -134,14 +134,15 @@ msgid ""
 "\">export the image</link> in the <link linkend=\"file-png-save-defaults"
 "\">PNG format</link> for your web site."
 msgstr ""
-"在合并图层后,以<link linkend=\"file-png-save-default\">sPNG格式</link><link "
+"在合并图层后,以<link linkend=\"file-png-save-defaults\">sPNG格式</link><link "
 "linkend=\"gimp-file-export\">导出图像</link>作为网络图片。"
 
 #: src/using/web.xml:91(para)
+#, fuzzy
 msgid ""
 "You can export your image in the PNG format with the default settings. "
 "Always using maximum compression when creating the image. Maximum "
-"compression has no affect on image quality or the time required to display "
+"compression has no effect on image quality or the time required to display "
 "the image, but it does take longer to export. A <link linkend=\"file-jpeg-"
 "save\">JPEG</link> image, however, loses quality as the compression is "
 "increased. If your image is a photograph with lots of colors, you should use "
@@ -195,7 +196,7 @@ msgid ""
 "linkend=\"gimp-file-export\">export</link> the image in <link linkend=\"file-"
 "png-save-defaults\">PNG format</link>."
 msgstr ""
-"在合并图层后,以<link linkend=\"file-png-save-default\">sPNG格式</link><link "
+"在合并图层后,以<link linkend=\"file-png-save-defaults\">sPNG格式</link><link "
 "linkend=\"gimp-file-export\">导出图像</link>作为网络图片。"
 
 #: src/using/web.xml:152(title)
@@ -270,7 +271,7 @@ msgid ""
 "\">export</link> it in <link linkend=\"file-png-save-defaults\">PNG format</"
 "link>."
 msgstr ""
-"在合并图层后,以<link linkend=\"file-png-save-default\">sPNG格式</link><link "
+"在合并图层后,以<link linkend=\"file-png-save-defaults\">sPNG格式</link><link "
 "linkend=\"gimp-file-export\">导出图像</link>作为网络图片。"
 
 #: src/using/web.xml:229(title)
@@ -286,7 +287,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/using/variable-size-brush.xml:42(None)
+#: src/using/variable-size-brush.xml:36(None)
 msgid ""
 "@@image: 'images/using/stretch-shrink-cursor.png'; "
 "md5=edadb8b7d447b4f283c904702df0f125"
@@ -294,7 +295,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/using/variable-size-brush.xml:206(None)
+#: src/using/variable-size-brush.xml:240(None)
 msgid ""
 "@@image: 'images/using/select-to-brush.png'; "
 "md5=ee2f4dd55ec8221baacb5184f952efdc"
@@ -302,7 +303,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/using/variable-size-brush.xml:249(None)
+#: src/using/variable-size-brush.xml:283(None)
 msgid ""
 "@@image: 'images/using/create-brush1.png'; "
 "md5=04bdf0569fe27c94aac81cedd2fe7a1c"
@@ -310,7 +311,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/using/variable-size-brush.xml:258(None)
+#: src/using/variable-size-brush.xml:292(None)
 msgid ""
 "@@image: 'images/using/create-brush2.png'; "
 "md5=937190f69002ba6542c178388fdd171a"
@@ -318,135 +319,175 @@ 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/using/variable-size-brush.xml:267(None)
+#: src/using/variable-size-brush.xml:301(None)
 msgid ""
 "@@image: 'images/using/create-brush3.png'; "
 "md5=aac61f023cbd31e279920995eadbbbdf"
 msgstr ""
 
-#: src/using/variable-size-brush.xml:15(title)
-#: src/using/variable-size-brush.xml:18(secondary)
-msgid "Varying brush size"
-msgstr ""
+#: src/using/variable-size-brush.xml:8(title)
+#: src/using/variable-size-brush.xml:11(secondary)
+#, fuzzy
+msgid "Changing brush size"
+msgstr "创建新笔刷"
 
-#: src/using/variable-size-brush.xml:17(primary)
-#: src/using/brushes.xml:12(primary) src/using/brushes.xml:27(primary)
+#: src/using/variable-size-brush.xml:10(primary)
+#: src/using/brushes.xml:10(primary) src/using/brushes.xml:32(primary)
 msgid "Brushes"
 msgstr "笔刷"
 
-#: src/using/variable-size-brush.xml:20(para)
-msgid "From <acronym>GIMP</acronym>-2.4, all brushes have a variable size."
+#: src/using/variable-size-brush.xml:13(para)
+msgid ""
+"Since <acronym>GIMP</acronym> 2.4, all brushes have a variable size that can "
+"be changed."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:25(title)
+#: src/using/variable-size-brush.xml:19(title)
 #, fuzzy
-msgid "How to vary the height of a brush"
+msgid "How to change the size of a brush"
 msgstr "每一笔的边缘处加深多少"
 
-#: src/using/variable-size-brush.xml:26(para)
-msgid "You can get the brush size varying in three ways:"
+#: src/using/variable-size-brush.xml:20(para)
+msgid "You can change the brush size in several ways:"
 msgstr ""
 
-#: src/using/variable-size-brush.xml:31(para)
+#: src/using/variable-size-brush.xml:25(para)
 msgid ""
 "Using the <guilabel>Size</guilabel> slider of the tool options. Pencil, "
 "Paintbrush, Eraser, Airbrush, Clone, Heal, Perspective Clone, Blur/Sharpen "
 "and Dodge/Burn tools have a slider to vary the brush size."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:38(title)
+#: src/using/variable-size-brush.xml:32(title)
 msgid "The Size slider"
 msgstr ""
 
+#: src/using/variable-size-brush.xml:42(para)
+msgid "By using the default shortcut keys for changing a tool's size:"
+msgstr ""
+
+#: src/using/variable-size-brush.xml:46(para)
+msgid "Decrease size by 1: <keycombo><keycap>[</keycap></keycombo>"
+msgstr ""
+
 #: src/using/variable-size-brush.xml:49(para)
+msgid "Increase size by 1: <keycombo><keycap>]</keycap></keycombo>"
+msgstr ""
+
+#: src/using/variable-size-brush.xml:52(para)
+msgid "Decrease size by 10: <keycombo><keycap>{</keycap></keycombo>"
+msgstr ""
+
+#: src/using/variable-size-brush.xml:55(para)
+msgid "Increase size by 10: <keycombo><keycap>}</keycap></keycombo>"
+msgstr ""
+
+#: src/using/variable-size-brush.xml:61(para)
+msgid ""
+"By using the default mouse scrollwheel actions for changing a tool's size:"
+msgstr ""
+
+#: src/using/variable-size-brush.xml:65(para)
+msgid ""
+"Decrease size by 1: <keycombo><keycap>Ctrl</keycap><keycap>Alt</"
+"keycap><keycap>Scrollwheel Down</keycap></keycombo>"
+msgstr ""
+
+#: src/using/variable-size-brush.xml:69(para)
+msgid ""
+"Increase size by 1: <keycombo><keycap>Ctrl</keycap><keycap>Alt</"
+"keycap><keycap>Scrollwheel Up</keycap></keycombo>"
+msgstr ""
+
+#: src/using/variable-size-brush.xml:77(para)
 msgid "By programming the mouse wheel:"
 msgstr ""
 
-#: src/using/variable-size-brush.xml:51(para)
+#: src/using/variable-size-brush.xml:79(para)
 msgid ""
 "In the main window of GIMP, click on <menuchoice><guimenu>Edit</"
 "guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:60(para)
+#: src/using/variable-size-brush.xml:88(para)
 msgid ""
 "In the left column of the new window, select <menuchoice><guimenu>Input "
 "Devices</guimenu><guimenuitem>Input Controllers</guimenuitem></menuchoice>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:69(para)
+#: src/using/variable-size-brush.xml:97(para)
 msgid ""
 "You can see <guibutton>Additional Input Controllers</guibutton>, with two "
 "columns: <guibutton>Available Controllers</guibutton> and <guibutton>Active "
 "Controllers</guibutton>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:76(para)
+#: src/using/variable-size-brush.xml:104(para)
 msgid ""
 "In the column <guibutton>Active Controllers</guibutton>, double-click the "
 "<guibutton>Main Mouse Wheel</guibutton> button."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:83(para)
+#: src/using/variable-size-brush.xml:111(para)
 msgid ""
 "Then, you see a new window: <guibutton>Configure Input Controller</"
 "guibutton>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:87(para)
+#: src/using/variable-size-brush.xml:115(para)
 msgid ""
-"In the left column <guibutton>Event</guibutton>, click <guibutton>Scroll Up</"
+"In the left column <guibutton>Event</guibutton>, click <guibutton>Scroll Up</"
 "guibutton> to get it highlighted."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:93(para)
+#: src/using/variable-size-brush.xml:121(para)
 msgid ""
 "Click the <guibutton>Edit</guibutton> button (at the bottom middle of the "
 "list)."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:99(para)
+#: src/using/variable-size-brush.xml:127(para)
 msgid ""
 "You can see the window <guibutton>Select Controller Event Action</guibutton>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:103(para)
+#: src/using/variable-size-brush.xml:131(para)
 msgid ""
 "Drop-down the <guibutton>Tools</guibutton> item, by clicking the small "
 "triangle on its left."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:110(para)
+#: src/using/variable-size-brush.xml:138(para)
 msgid ""
-"In the left column <guibutton>Action</guibutton>, click "
-"<guibutton>Increase Brush Scale</guibutton> to highlight it, then click the "
-"<guibutton>OK</guibutton> button."
+"In the left column <guibutton>Action</guibutton>, click <guibutton>Increase "
+"Brush Scale</guibutton> to highlight it, then click the <guibutton>OK</"
+"guibutton> button."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:117(para)
+#: src/using/variable-size-brush.xml:145(para)
 msgid ""
-"Now, in front of <guibutton>Scroll Up</guibutton> is display "
+"Now, in front of <guibutton>Scroll Up</guibutton> is display "
 "<guibutton>tools-paint-brush-scale-increase</guibutton>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:124(para)
+#: src/using/variable-size-brush.xml:152(para)
 #, fuzzy
 msgid "Close the window."
 msgstr "关闭窗口"
 
-#: src/using/variable-size-brush.xml:129(para)
+#: src/using/variable-size-brush.xml:157(para)
 msgid ""
-"With the same method, program <guibutton>Scroll Down</guibutton> with "
-"<guibutton>Decrease Brush Scale</guibutton>."
+"With the same method, program <guibutton>Scroll Down</guibutton> with "
+"<guibutton>Decrease Brush Scale</guibutton>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:136(para)
+#: src/using/variable-size-brush.xml:164(para)
 msgid ""
 "Don't forget to click the <guibutton>OK</guibutton> button of the main "
 "window of <guibutton>Preferences</guibutton>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:143(para)
+#: src/using/variable-size-brush.xml:171(para)
 msgid ""
 "After these somewhat long explanations, you can use your mouse wheel to vary "
 "size brush. For example, choose the pencil tool with the <quote>Circle</"
@@ -455,46 +496,46 @@ msgid ""
 "stretching."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:153(para)
+#: src/using/variable-size-brush.xml:181(para)
 msgid ""
 "You can program the <quote>Up</quote> and <quote>Down</quote> arrow keys of "
 "the keyboard."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:157(para)
+#: src/using/variable-size-brush.xml:185(para)
 msgid ""
 "The method is similar to that of the mouse wheel. The only differences are:"
 msgstr ""
 
-#: src/using/variable-size-brush.xml:163(para)
+#: src/using/variable-size-brush.xml:191(para)
 msgid ""
 "In the column <guibutton>Active Controllers</guibutton>, double-click "
 "<guibutton>Main Keyboard</guibutton>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:170(para)
+#: src/using/variable-size-brush.xml:198(para)
 msgid ""
 "In the column <guibutton>Event</guibutton>, click <guibutton>Cursor Up</"
 "guibutton> for the first key, and <guibutton>Cursor Down</guibutton> for the "
 "second key."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:177(para)
+#: src/using/variable-size-brush.xml:205(para)
 msgid ""
 "Then, use the two keys (Up arrow and Down arrow) and the result is the same "
 "as you got with the mouse wheel."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:188(title)
+#: src/using/variable-size-brush.xml:216(title)
 #, fuzzy
 msgid "Creating a brush quickly"
 msgstr "创建新笔刷"
 
-#: src/using/variable-size-brush.xml:189(para)
+#: src/using/variable-size-brush.xml:217(para)
 msgid "Two methods to create a new brush easily:"
 msgstr ""
 
-#: src/using/variable-size-brush.xml:192(para)
+#: src/using/variable-size-brush.xml:220(para)
 msgid ""
 "First, the <quote>superfast</quote> method. You have an image area you want "
 "make a brush from it, to be used with a tool like pencil, airbrush... Select "
@@ -504,15 +545,22 @@ msgid ""
 "<quote>Clipboard</quote>. It is immediately usable."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:202(title)
+#: src/using/variable-size-brush.xml:229(para)
+msgid ""
+"This brush is temporary: it disappears when you close GIMP. With GIMP-2.10, "
+"you can make it permanent by clicking on the <guibutton>Duplicate this "
+"brush</guibutton> at the bottom of the brush panel."
+msgstr ""
+
+#: src/using/variable-size-brush.xml:236(title)
 msgid "Selection becomes a brush after copying"
 msgstr ""
 
-#: src/using/variable-size-brush.xml:212(para)
+#: src/using/variable-size-brush.xml:246(para)
 msgid "The second method is more elaborate."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:213(para)
+#: src/using/variable-size-brush.xml:247(para)
 msgid ""
 "Do <menuchoice><guimenu>File</guimenu><guimenuitem>New</guimenuitem></"
 "menuchoice> with, for example, a width and a length of 35 pixels and in the "
@@ -520,45 +568,45 @@ msgid ""
 "guilabel> and <guilabel>Fill with: white</guilabel>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:225(para)
+#: src/using/variable-size-brush.xml:259(para)
 msgid ""
 "Zoom on this new image to enlarge it and draw on it with a black pencil."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:229(para)
+#: src/using/variable-size-brush.xml:263(para)
 msgid ""
 "Save it with a <guilabel>.gbr</guilabel> extension in the directory "
-"<guilabel>/home/name_of_user/.gimp-2.8/brushes/</guilabel>."
+"<guilabel>/home/name_of_user/.config/GIMP/2.10/brushes/</guilabel>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:233(para)
+#: src/using/variable-size-brush.xml:267(para)
 msgid ""
 "In the Brushes dialog window, click on the button <guilabel>Refresh brushes</"
 "guilabel><guiicon><inlinegraphic fileref=\"images/dialogs/stock-reload-16.png"
 "\"/></guiicon>."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:240(para)
+#: src/using/variable-size-brush.xml:274(para)
 msgid ""
 "And your marvellous brush appears right in the middle of the other brushes. "
 "You can use it immediately, without starting GIMP again."
 msgstr ""
 
-#: src/using/variable-size-brush.xml:245(title)
+#: src/using/variable-size-brush.xml:279(title)
 #, fuzzy
 msgid "Steps to create a brush"
 msgstr "创建新笔刷"
 
-#: src/using/variable-size-brush.xml:252(para)
+#: src/using/variable-size-brush.xml:286(para)
 msgid "Draw image, save as brush"
 msgstr ""
 
-#: src/using/variable-size-brush.xml:261(para)
+#: src/using/variable-size-brush.xml:295(para)
 #, fuzzy
 msgid "Refresh brushes"
 msgstr "刷新笔刷"
 
-#: src/using/variable-size-brush.xml:270(para)
+#: src/using/variable-size-brush.xml:304(para)
 #, fuzzy
 msgid "Use the brush"
 msgstr "删除此笔刷"
@@ -810,28 +858,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/using/shortcuts.xml:73(None)
+#: src/using/shortcuts.xml:74(None)
 msgid ""
 "@@image: 'images/dialogs/dialogs-shortcuts.png'; "
 "md5=62a4f9a4fb99b6b96d26c0882b192bff"
 msgstr ""
 
-#: src/using/shortcuts.xml:10(title)
+#: src/using/shortcuts.xml:11(title)
 msgid "Creating Shortcuts to Menu Functions"
 msgstr ""
 
-#: src/using/shortcuts.xml:13(primary) src/using/shortcuts.xml:17(secondary)
+#: src/using/shortcuts.xml:14(primary) src/using/shortcuts.xml:18(secondary)
 #, fuzzy
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/using/shortcuts.xml:16(primary)
+#: src/using/shortcuts.xml:17(primary)
 #: src/using/customize-splashscreen.xml:16(primary)
 #, fuzzy
 msgid "Customize"
 msgstr "自定义"
 
-#: src/using/shortcuts.xml:20(para)
+#: src/using/shortcuts.xml:21(para)
 msgid ""
 "Many functions which are accessible via the image menu have a default "
 "keyboard shortcut. You may want to create a new shortcut for a command that "
@@ -839,12 +887,12 @@ msgid ""
 "shortcut. There are two methods for doing this."
 msgstr ""
 
-#: src/using/shortcuts.xml:28(title)
+#: src/using/shortcuts.xml:29(title)
 #, fuzzy
 msgid "Using dynamic keyboard shortcuts"
 msgstr "使用动态快捷键(_U)"
 
-#: src/using/shortcuts.xml:30(para)
+#: src/using/shortcuts.xml:31(para)
 msgid ""
 "First, you have to activate this capability by checking the <guilabel>Use "
 "dynamic keyboard shortcuts</guilabel> option in the <guilabel>Interface</"
@@ -853,13 +901,13 @@ msgid ""
 "presses from creating an unwanted shortcut."
 msgstr ""
 
-#: src/using/shortcuts.xml:40(para)
+#: src/using/shortcuts.xml:41(para)
 msgid ""
 "While you're doing that, also check the <guilabel>Save keyboard shortcuts on "
 "exit</guilabel> option so that your shortcut will be saved."
 msgstr ""
 
-#: src/using/shortcuts.xml:47(para)
+#: src/using/shortcuts.xml:48(para)
 msgid ""
 "To create a keyboard shortcut, simply place the mouse pointer on a command "
 "in the menu: it will then be highlighted. Be careful that the mouse pointer "
@@ -867,29 +915,29 @@ msgid ""
 "You will see this sequence appear on the right of the command."
 msgstr ""
 
-#: src/using/shortcuts.xml:56(para)
+#: src/using/shortcuts.xml:57(para)
 msgid ""
 "It is best to use the <keycombo><keycap>Ctrl</keycap><keycap>Alt</"
 "keycap><keycap>Key</keycap></keycombo> sequence for your custom shortcuts."
 msgstr ""
 
-#: src/using/shortcuts.xml:69(title)
+#: src/using/shortcuts.xml:70(title)
 msgid "Configure Keyboard Shortcuts"
 msgstr "配置快捷键"
 
-#: src/using/shortcuts.xml:79(title)
+#: src/using/shortcuts.xml:80(title)
 #, fuzzy
 msgid "Using the Keyboard Shortcut Editor"
 msgstr "打开快捷键编辑器"
 
-#: src/using/shortcuts.xml:81(para)
+#: src/using/shortcuts.xml:82(para)
 msgid ""
 "You get to this Editor by clicking on <guibutton>Configure keyboard "
 "shortcuts</guibutton> in the <quote>Interface</quote> item of the <link "
 "linkend=\"gimp-prefs-interface\">Preferences</link> menu."
 msgstr ""
 
-#: src/using/shortcuts.xml:88(para)
+#: src/using/shortcuts.xml:89(para)
 msgid ""
 "As shown in this dialog, you can select the command you want to create a "
 "shortcut for, in the <quote>Action</quote> area. Then you type your key "
@@ -897,7 +945,7 @@ msgid ""
 "practice, it clears it, but doesn't delete it.)"
 msgstr ""
 
-#: src/using/shortcuts.xml:96(para)
+#: src/using/shortcuts.xml:97(para)
 msgid ""
 "This shortcut editor also allows you to <emphasis>control the tool parameter "
 "settings</emphasis> with the keyboard. At the top of this dialog, you can "
@@ -905,40 +953,31 @@ msgid ""
 "parameters. To make your work easier, tool types are marked with small icons."
 msgstr ""
 
-#: src/using/shortcuts.xml:107(para)
+#: src/using/shortcuts.xml:108(para)
 msgid ""
 "Custom Keyboard shortcuts are stored in one of Gimp's hidden directory "
-"(<filename class=\"directory\">/home/[username]/.gimp-2.8/menurc</filename>) "
-"under Linux. Under Windows, path varies according to version:"
+"(<filename class=\"directory\">/home/[username]/.config/GIMP/2.10/menurc</"
+"filename>) under Linux. Under Windows, local and global location are, "
+"respectively:"
 msgstr ""
 
-#: src/using/shortcuts.xml:114(para)
+#: src/using/shortcuts.xml:116(filename)
 msgid ""
-"<filename class=\"directory\">C:\\Documents and Settings\\[Username]\\."
-"gimp-2.8\\menurc</filename> under Windows XP."
+"C:\\Documents and Settings\\[Username]\\AppData\\Roaming\\GIMP\\2.10\\menurc"
 msgstr ""
 
-#: src/using/shortcuts.xml:120(para)
-msgid ""
-"<filename class=\"directory\">C:\\Program Files\\GIMP 2\\etc\\gimp"
-"\\2.0\\menurc</filename> under Windows 7."
+#: src/using/shortcuts.xml:121(filename)
+msgid "C:\\Program Files\\GIMP 2\\etc\\gimp\\2.0\\menurc"
 msgstr ""
 
-#: src/using/shortcuts.xml:126(para)
+#: src/using/shortcuts.xml:125(para)
 msgid ""
-"<filename class=\"directory\">C:\\Programmes\\GIMP 2\\etc\\gimp"
-"\\2.0\\menurc</filename> under Windows 10."
+"This location may change if GIMP is installed after having already installed "
+"Git Bash or Cygwin. In this case, they will appear in <filename class="
+"\"directory\">C:\\Program Files\\Git\\.gimp-[version]\\menurc</filename>."
 msgstr ""
 
-#: src/using/shortcuts.xml:132(para)
-msgid ""
-"More, this location may change if GIMP is installed after having already "
-"installed Git Bash or Cygwin. In this case, they will appear in <filename "
-"class=\"directory\">C:\\Program Files\\Git\\.gimp-[version]\\menurc</"
-"filename>."
-msgstr ""
-
-#: src/using/shortcuts.xml:137(para)
+#: src/using/shortcuts.xml:130(para)
 msgid ""
 "<quote>menu.rc</quote> is a simple text file that you can transport from one "
 "computer to another."
@@ -1390,7 +1429,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/using/script-fu-tutorial.xml:882(None)
+#: src/using/script-fu-tutorial.xml:883(None)
 msgid ""
 "@@image: 'images/using/script-fu-menu.png'; "
 "md5=29cddb5794c7d4fb988e6fa9b0141f52"
@@ -1398,7 +1437,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/using/script-fu-tutorial.xml:1535(None)
+#: src/using/script-fu-tutorial.xml:1536(None)
 msgid ""
 "@@image: 'images/using/script-fu-screen.png'; "
 "md5=67ea87d7bba780963438781008e4ec49"
@@ -2325,37 +2364,37 @@ msgstr ""
 
 #: src/using/script-fu-tutorial.xml:658(para)
 msgid ""
-"In the <filename class=\"directory\">.gimp-2.8</filename> directory that "
-"<acronym>GIMP</acronym> made off of your home directory, you should find a "
-"directory called <filename class=\"directory\">scripts</filename>. "
-"<acronym>GIMP</acronym> will automatically look in your <filename class="
-"\"directory\">.gimp-2.8</filename> directory for a <filename class="
-"\"directory\">scripts</filename> directory, and add the scripts in this "
-"directory to the Script-Fu database. You should place your personal scripts "
-"here."
+"In the <filename class=\"directory\">~/.config/GIMP/2.10/</filename> "
+"directory that <acronym>GIMP</acronym> made off of your home directory, you "
+"should find a directory called <filename class=\"directory\">scripts</"
+"filename>. <acronym>GIMP</acronym> will automatically look in your <filename "
+"class=\"directory\">~/.config/GIMP/2.10/</filename> directory for a "
+"<filename class=\"directory\">scripts</filename> directory, and add the "
+"scripts in this directory to the Script-Fu database. You should place your "
+"personal scripts here."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:671(title)
+#: src/using/script-fu-tutorial.xml:672(title)
 msgid "The Bare Essentials"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:672(para)
+#: src/using/script-fu-tutorial.xml:673(para)
 msgid ""
 "Every Script-Fu script defines at least one function, which is the script's "
 "main function. This is where you do the work."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:676(para)
+#: src/using/script-fu-tutorial.xml:677(para)
 msgid ""
 "Every script must also register with the procedural database, so you can "
 "access it within <acronym>GIMP</acronym>."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:680(para)
+#: src/using/script-fu-tutorial.xml:681(para)
 msgid "We'll define the main function first:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:681(programlisting)
+#: src/using/script-fu-tutorial.xml:682(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2363,7 +2402,7 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:684(para)
+#: src/using/script-fu-tutorial.xml:685(para)
 msgid ""
 "Here, we've defined a new function called <function>script-fu-text-box</"
 "function> that takes four parameters, which will later correspond to some "
@@ -2372,11 +2411,11 @@ msgid ""
 "fancy."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:695(title)
+#: src/using/script-fu-tutorial.xml:696(title)
 msgid "Naming Conventions"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:696(para)
+#: src/using/script-fu-tutorial.xml:697(para)
 msgid ""
 "Scheme's naming conventions seem to prefer lowercase letters with hyphens, "
 "which I've followed in the naming of the function. However, I've departed "
@@ -2387,7 +2426,7 @@ msgid ""
 "defined within the script."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:705(para)
+#: src/using/script-fu-tutorial.xml:706(para)
 msgid ""
 "It's <acronym>GIMP</acronym> convention to name your script functions "
 "<function>script-fu-abc</function>, because then when they're listed in the "
@@ -2395,11 +2434,11 @@ msgid ""
 "the functions. This also helps distinguish them from plug-ins."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:715(title)
+#: src/using/script-fu-tutorial.xml:716(title)
 msgid "Registering The Function"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:716(para)
+#: src/using/script-fu-tutorial.xml:717(para)
 msgid ""
 "Now, let's register the function with <acronym>GIMP</acronym>. This is done "
 "by calling the function <function>script-fu-register</function>. When "
@@ -2409,13 +2448,13 @@ msgid ""
 "the end, after all my other code."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:725(para)
+#: src/using/script-fu-tutorial.xml:726(para)
 msgid ""
 "Here's the listing for registering this function (I will explain all its "
 "parameters in a minute):"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:749(para)
+#: src/using/script-fu-tutorial.xml:750(para)
 msgid ""
 "If you save these functions in a text file with a <filename class=\"extension"
 "\">.scm</filename> suffix in your script directory, then choose "
@@ -2426,25 +2465,25 @@ msgid ""
 "menuchoice>."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:766(para)
+#: src/using/script-fu-tutorial.xml:767(para)
 msgid ""
 "If you invoke this new script, it won't do anything, of course, but you can "
 "view the prompts you created when registering the script (more information "
 "about what we did is covered next)."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:771(para)
+#: src/using/script-fu-tutorial.xml:772(para)
 msgid ""
 "Finally, if you invoke the Procedure Browser ( <menuchoice><guimenu>Help</"
 "guimenu><guimenuitem>Procedure Browser</guimenuitem></menuchoice>), you'll "
 "notice that our script now appears in the database."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:782(title)
+#: src/using/script-fu-tutorial.xml:783(title)
 msgid "Steps For Registering The Script"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:783(para)
+#: src/using/script-fu-tutorial.xml:784(para)
 msgid ""
 "To register our script with <acronym>GIMP</acronym>, we call the function "
 "<function>script-fu-register</function>, fill in the seven required "
@@ -2452,12 +2491,12 @@ msgid ""
 "default value for each parameter."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:790(title)
+#: src/using/script-fu-tutorial.xml:791(title)
 #, fuzzy
 msgid "The Required Parameters"
 msgstr "通道无关参数"
 
-#: src/using/script-fu-tutorial.xml:792(para)
+#: src/using/script-fu-tutorial.xml:793(para)
 msgid ""
 "The <emphasis>name</emphasis> of the function we defined. This is the "
 "function called when our script is invoked (the entry-point into our "
@@ -2467,13 +2506,13 @@ msgid ""
 "which we registered."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:807(para)
+#: src/using/script-fu-tutorial.xml:808(para)
 msgid ""
 "Before version 2.6, <code>&lt;Toolbox&gt;</code> could be also used, but now "
 "the toolbox menu is removed, so don't use it."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:803(para)
+#: src/using/script-fu-tutorial.xml:804(para)
 msgid ""
 "The <emphasis>location</emphasis> in the menu where the script will be "
 "inserted. The exact location of the script is specified like a path in Unix, "
@@ -2481,7 +2520,7 @@ msgid ""
 "<placeholder-1/>"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:812(para)
+#: src/using/script-fu-tutorial.xml:813(para)
 msgid ""
 "If your script does not operate on an existing image (and thus creates a new "
 "image, like our Text Box script will), you'll want to insert it in the image "
@@ -2490,14 +2529,14 @@ msgid ""
 "corner of the image window, or by pressing <keycap>F10</keycap>."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:827(para)
+#: src/using/script-fu-tutorial.xml:828(para)
 msgid ""
 "The original, written by Mike, says put the menu entry in the Script-Fu menu "
 "of the <guimenu>Xtns</guimenu> menu at the Toolbox, but since version 2.6, "
 "the Toolbox menu had been removed and merged with the image window menubar."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:820(para)
+#: src/using/script-fu-tutorial.xml:821(para)
 msgid ""
 "If your script is intended to work on an image being edited, you'll want to "
 "insert it in the image window menu. The rest of the path points to the menu "
@@ -2509,35 +2548,35 @@ msgid ""
 "menuchoice>)."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:840(para)
+#: src/using/script-fu-tutorial.xml:841(para)
 msgid ""
 "If you notice, the Text sub-menu in the File/Create menu wasn't there when "
 "we began &mdash;<acronym>GIMP</acronym> automatically creates any menus not "
 "already existing."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:847(para)
+#: src/using/script-fu-tutorial.xml:848(para)
 msgid ""
 "A <emphasis>description</emphasis> of your script, to be displayed in the "
 "Procedure Browser."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:853(para)
+#: src/using/script-fu-tutorial.xml:854(para)
 msgid "<emphasis>Your name</emphasis> (the author of the script)."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:858(para)
+#: src/using/script-fu-tutorial.xml:859(para)
 #, fuzzy
 msgid "<emphasis>Copyright</emphasis> information."
 msgstr "输入版权信息。"
 
-#: src/using/script-fu-tutorial.xml:861(para)
+#: src/using/script-fu-tutorial.xml:862(para)
 msgid ""
 "The <emphasis>date</emphasis> the script was made, or the last revision of "
 "the script."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:867(para)
+#: src/using/script-fu-tutorial.xml:868(para)
 msgid ""
 "The <emphasis>types</emphasis> of images the script works on. This may be "
 "any of the following: RGB, RGBA, GRAY, GRAYA, INDEXED, INDEXEDA. Or it may "
@@ -2545,15 +2584,15 @@ msgid ""
 "need to define the type of image on which we work."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:878(title)
+#: src/using/script-fu-tutorial.xml:879(title)
 msgid "The menu of our script."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:889(title)
+#: src/using/script-fu-tutorial.xml:890(title)
 msgid "Registering The Script's Parameters"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:890(para)
+#: src/using/script-fu-tutorial.xml:891(para)
 msgid ""
 "Once we have listed the required parameters, we then need to list the "
 "parameters that correspond to the parameters our script needs. When we list "
@@ -2562,17 +2601,17 @@ msgid ""
 "default value."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:897(para)
+#: src/using/script-fu-tutorial.xml:898(para)
 msgid "This section of the registration process has the following format:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:905(para)
+#: src/using/script-fu-tutorial.xml:906(para)
 #: src/using/script-fu-gui-api.xml:31(para)
 #, fuzzy
 msgid "Param Type"
 msgstr "分形类型"
 
-#: src/using/script-fu-tutorial.xml:908(para)
+#: src/using/script-fu-tutorial.xml:909(para)
 #: src/using/script-fu-gui-api.xml:34(para)
 #: src/using/script-fu-gui-api.xml:54(segtitle)
 #: src/using/script-fu-gui-api.xml:98(segtitle)
@@ -2581,31 +2620,31 @@ msgstr "分形类型"
 msgid "Description"
 msgstr "描述"
 
-#: src/using/script-fu-tutorial.xml:911(para)
+#: src/using/script-fu-tutorial.xml:912(para)
 #, fuzzy
 msgid "Example"
 msgstr "示例"
 
-#: src/using/script-fu-tutorial.xml:918(constant)
+#: src/using/script-fu-tutorial.xml:919(constant)
 msgid "SF-IMAGE"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:921(para)
+#: src/using/script-fu-tutorial.xml:922(para)
 msgid ""
 "If your script operates on an open image, this should be the first parameter "
 "after the required parameters. <acronym>GIMP</acronym> will pass in a "
 "reference to the image in this parameter."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:929(para)
+#: src/using/script-fu-tutorial.xml:930(para)
 msgid "3"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:934(constant)
+#: src/using/script-fu-tutorial.xml:935(constant)
 msgid "SF-DRAWABLE"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:937(para)
+#: src/using/script-fu-tutorial.xml:938(para)
 msgid ""
 "If your script operates on an open image, this should be the second "
 "parameter after the <constant>SF-IMAGE</constant> param. It refers to the "
@@ -2613,77 +2652,77 @@ msgid ""
 "layer in this parameter."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:946(para)
+#: src/using/script-fu-tutorial.xml:947(para)
 msgid "17"
 msgstr "17"
 
-#: src/using/script-fu-tutorial.xml:951(constant)
+#: src/using/script-fu-tutorial.xml:952(constant)
 #, fuzzy
 msgid "SF-VALUE"
 msgstr "VALUE"
 
-#: src/using/script-fu-tutorial.xml:954(para)
+#: src/using/script-fu-tutorial.xml:955(para)
 msgid ""
 "Accepts numbers and strings. Note that quotes must be escaped for default "
 "text, so better use <constant>SF-STRING</constant>."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:961(para)
+#: src/using/script-fu-tutorial.xml:962(para)
 msgid "42"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:966(constant)
+#: src/using/script-fu-tutorial.xml:967(constant)
 msgid "SF-STRING"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:969(para)
+#: src/using/script-fu-tutorial.xml:970(para)
 msgid "Accepts strings."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:972(para)
+#: src/using/script-fu-tutorial.xml:973(para)
 msgid "\"Some text\""
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:977(constant)
+#: src/using/script-fu-tutorial.xml:978(constant)
 #: src/using/script-fu-gui-api.xml:88(constant)
 msgid "SF-COLOR"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:980(para)
+#: src/using/script-fu-tutorial.xml:981(para)
 msgid "Indicates that a color is requested in this parameter."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:985(para)
+#: src/using/script-fu-tutorial.xml:986(para)
 msgid "'(0 102 255)"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:990(constant)
+#: src/using/script-fu-tutorial.xml:991(constant)
 msgid "SF-TOGGLE"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:993(para)
+#: src/using/script-fu-tutorial.xml:994(para)
 msgid "A checkbox is displayed, to get a Boolean value."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:998(para)
+#: src/using/script-fu-tutorial.xml:999(para)
 msgid "TRUE or FALSE"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1009(title)
+#: src/using/script-fu-tutorial.xml:1010(title)
 msgid "Giving Our Script Some Guts"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1010(para)
+#: src/using/script-fu-tutorial.xml:1011(para)
 msgid ""
 "Let us continue with our training and add some functionality to our script."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1016(title)
+#: src/using/script-fu-tutorial.xml:1017(title)
 #, fuzzy
 msgid "Creating A New Image"
 msgstr "新建图像"
 
-#: src/using/script-fu-tutorial.xml:1017(para)
+#: src/using/script-fu-tutorial.xml:1018(para)
 msgid ""
 "In the previous lesson, we created an empty function and registered it with "
 "<acronym>GIMP</acronym>. In this lesson, we want to provide functionality to "
@@ -2691,7 +2730,7 @@ msgid ""
 "and resize the image to fit the text exactly."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1023(para)
+#: src/using/script-fu-tutorial.xml:1024(para)
 msgid ""
 "Once you know how to set variables, define functions and access list "
 "members, the rest is all downhill &mdash; all you need to do is familiarize "
@@ -2700,14 +2739,14 @@ msgid ""
 "linkend=\"plug-in-dbbrowser\"/> and let's get cookin'!"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1031(para)
+#: src/using/script-fu-tutorial.xml:1032(para)
 msgid ""
 "Let's begin by making a new image. We'll create a new variable, "
 "<varname>theImage</varname>, set to the result of calling <acronym>GIMP</"
 "acronym>'s built-in function <function>gimp-image-new</function>."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1037(para)
+#: src/using/script-fu-tutorial.xml:1038(para)
 msgid ""
 "As you can see from the DB Browser, the function <function>gimp-image-new</"
 "function> takes three parameters &mdash; the image's width, height and the "
@@ -2717,7 +2756,7 @@ msgid ""
 "them later in the script."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1047(programlisting)
+#: src/using/script-fu-tutorial.xml:1048(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2741,14 +2780,14 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1066(para)
+#: src/using/script-fu-tutorial.xml:1067(para)
 msgid ""
 "Note: We used the value <code>RGB</code> to specify that the image is an "
 "<acronym>RGB</acronym> image. We could have also used <code>0</code>, but "
 "<acronym>RGB</acronym> is more descriptive when we glance at the code."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1072(para)
+#: src/using/script-fu-tutorial.xml:1073(para)
 msgid ""
 "You should also notice that we took the head of the result of the function "
 "call. This may seem strange, because the database explicitly tells us that "
@@ -2757,12 +2796,12 @@ msgid ""
 "is only one element in the list, so we need to get the head of the list."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1083(title)
+#: src/using/script-fu-tutorial.xml:1084(title)
 #, fuzzy
 msgid "Adding A New Layer To The Image"
 msgstr "对齐图像的所有可见图层"
 
-#: src/using/script-fu-tutorial.xml:1084(para)
+#: src/using/script-fu-tutorial.xml:1085(para)
 msgid ""
 "Now that we have an image, we need to add a layer to it. We'll call the "
 "<function>gimp-layer-new</function> function to create the layer, passing in "
@@ -2774,7 +2813,7 @@ msgid ""
 "declarations:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1096(programlisting)
+#: src/using/script-fu-tutorial.xml:1097(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2788,7 +2827,7 @@ msgid ""
 "                           RGB-IMAGE\n"
 "                           \"layer 1\"\n"
 "                           100\n"
-"                           NORMAL\n"
+"                           LAYER-MODE-NORMAL\n"
 "                          )\n"
 "                      )\n"
 "            )\n"
@@ -2796,12 +2835,12 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1113(para)
+#: src/using/script-fu-tutorial.xml:1114(para)
 #, fuzzy
 msgid "Once we have the new layer, we need to add it to the image:"
 msgstr "创建新图层并将其添加到图像"
 
-#: src/using/script-fu-tutorial.xml:1114(programlisting)
+#: src/using/script-fu-tutorial.xml:1115(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2809,18 +2848,18 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1117(para)
+#: src/using/script-fu-tutorial.xml:1118(para)
 msgid ""
 "Now, just for fun, let's see the fruits of our labors up until this point, "
 "and add this line to show the new, empty image:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1121(programlisting)
+#: src/using/script-fu-tutorial.xml:1122(programlisting)
 #, no-wrap
 msgid "(gimp-display-new theImage)"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1122(para)
+#: src/using/script-fu-tutorial.xml:1123(para)
 msgid ""
 "Save your work, select <menuchoice><guimenu>Filters</"
 "guimenu><guisubmenu>Script-Fu</guisubmenu><guimenuitem>Refresh Scripts</"
@@ -2829,25 +2868,25 @@ msgid ""
 "We'll get to that in a second."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1136(title)
+#: src/using/script-fu-tutorial.xml:1137(title)
 #, fuzzy
 msgid "Adding The Text"
 msgstr "替代文字 (ALT)"
 
-#: src/using/script-fu-tutorial.xml:1137(para)
+#: src/using/script-fu-tutorial.xml:1138(para)
 msgid ""
 "Go ahead and remove the line to display the image (or comment it out with a "
 "(<code>;</code>) as the first character of the line)."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1141(para)
+#: src/using/script-fu-tutorial.xml:1142(para)
 msgid ""
 "Before we add text to the image, we need to set the background and "
 "foreground colors so that the text appears in the color the user specified. "
 "We'll use the gimp-context-set-back/foreground functions:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1147(programlisting)
+#: src/using/script-fu-tutorial.xml:1148(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2856,13 +2895,13 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1151(para)
+#: src/using/script-fu-tutorial.xml:1152(para)
 msgid ""
 "With the colors properly set, let's now clean out the garbage currently in "
 "the image by filling the drawable with the background color:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1156(programlisting)
+#: src/using/script-fu-tutorial.xml:1157(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2870,11 +2909,11 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1159(para)
+#: src/using/script-fu-tutorial.xml:1160(para)
 msgid "With the image cleared, we're ready to add some text:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1160(programlisting)
+#: src/using/script-fu-tutorial.xml:1161(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2893,7 +2932,7 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1174(para)
+#: src/using/script-fu-tutorial.xml:1175(para)
 msgid ""
 "Although a long function call, it's fairly straightforward if you go over "
 "the parameters while looking at the function's entry in the DB Browser. "
@@ -2901,13 +2940,13 @@ msgid ""
 "<varname>theText</varname>."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1181(para)
+#: src/using/script-fu-tutorial.xml:1182(para)
 msgid ""
 "Now that we have the text, we can grab its width and height and resize the "
 "image and the image's layer to the text's size:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1185(programlisting)
+#: src/using/script-fu-tutorial.xml:1186(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2920,7 +2959,7 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1193(para)
+#: src/using/script-fu-tutorial.xml:1194(para)
 msgid ""
 "If you're like me, you're probably wondering what a drawable is when "
 "compared to a layer. The difference between the two is that a drawable is "
@@ -2929,11 +2968,11 @@ msgid ""
 "In most cases, the distinction is not important."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1201(para)
+#: src/using/script-fu-tutorial.xml:1202(para)
 msgid "With the image ready to go, we can now re-add our display line:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1204(programlisting)
+#: src/using/script-fu-tutorial.xml:1205(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2941,15 +2980,15 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1207(para)
+#: src/using/script-fu-tutorial.xml:1208(para)
 msgid "Save your work, refresh the database and give your first script a run!"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1213(title)
+#: src/using/script-fu-tutorial.xml:1214(title)
 msgid "Clearing The Dirty Flag"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1214(para)
+#: src/using/script-fu-tutorial.xml:1215(para)
 msgid ""
 "If you try to close the image created without first saving the file, "
 "<acronym>GIMP</acronym> will ask you if you want to save your work before "
@@ -2960,11 +2999,11 @@ msgid ""
 "script, so it makes sense to get rid of this dirty flag."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1224(para)
+#: src/using/script-fu-tutorial.xml:1225(para)
 msgid "To do this, we can clear the dirty flag after displaying the image:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1227(programlisting)
+#: src/using/script-fu-tutorial.xml:1228(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -2972,13 +3011,13 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1230(para)
+#: src/using/script-fu-tutorial.xml:1231(para)
 msgid ""
 "This will set dirty count to 0, making it appear to be a <quote>clean</"
 "quote> image."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1234(para)
+#: src/using/script-fu-tutorial.xml:1235(para)
 msgid ""
 "Whether to add this line or not is a matter of personal taste. I use it in "
 "scripts that produce new images, where the results are trivial, as in this "
@@ -2986,15 +3025,15 @@ msgid ""
 "image, you will probably not want to use this function."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1244(title)
+#: src/using/script-fu-tutorial.xml:1245(title)
 msgid "Extending The Text Box Script"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1246(title)
+#: src/using/script-fu-tutorial.xml:1247(title)
 msgid "Handling Undo Correctly"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1247(para)
+#: src/using/script-fu-tutorial.xml:1248(para)
 msgid ""
 "When creating a script, you want to give your users the ability to undo "
 "their actions, should they make a mistake. This is easily accomplished by "
@@ -3005,28 +3044,28 @@ msgid ""
 "on the image, so that those manipulations can later be undone."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1258(para)
+#: src/using/script-fu-tutorial.xml:1259(para)
 msgid ""
 "If you are creating a new image entirely, it doesn't make sense to use these "
 "functions because you're not changing an existing image. However, when you "
 "are changing an existing image, you most surely want to use these functions."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1264(para)
+#: src/using/script-fu-tutorial.xml:1265(para)
 msgid "Undoing a script works nearly flawlessly when using these functions."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1270(title)
+#: src/using/script-fu-tutorial.xml:1271(title)
 msgid "Extending The Script A Little More"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1271(para)
+#: src/using/script-fu-tutorial.xml:1272(para)
 msgid ""
 "Now that we have a very handy-dandy script to create text boxes, let's add "
 "two features to it:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1277(para)
+#: src/using/script-fu-tutorial.xml:1278(para)
 msgid ""
 "Currently, the image is resized to fit exactly around the text &mdash; "
 "there's no room for anything, like drop shadows or special effects (even "
@@ -3035,24 +3074,24 @@ msgid ""
 "to add as a percentage of the size of the resultant text."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1287(para)
+#: src/using/script-fu-tutorial.xml:1288(para)
 msgid ""
 "This script could easily be used in other scripts that work with text. Let's "
 "extend it so that it returns the image and the layers, so other scripts can "
 "call this script and use the image and layers we create."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1298(title)
+#: src/using/script-fu-tutorial.xml:1299(title)
 msgid "Modifying The Parameters And The Registration Function"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1301(para)
+#: src/using/script-fu-tutorial.xml:1302(para)
 msgid ""
 "To let the user specify the amount of buffer, we'll add a parameter to our "
 "function and the registration function:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1305(programlisting)
+#: src/using/script-fu-tutorial.xml:1306(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3085,7 +3124,7 @@ msgid ""
 "                          RGB-IMAGE\n"
 "                          \"layer 1\"\n"
 "                          100\n"
-"                          NORMAL\n"
+"                          LAYER-MODE-NORMAL\n"
 "                         )\n"
 "                     )\n"
 "           )\n"
@@ -3096,18 +3135,18 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1369(title)
+#: src/using/script-fu-tutorial.xml:1370(title)
 #, fuzzy
 msgid "Adding The New Code"
 msgstr "添加棋盘"
 
-#: src/using/script-fu-tutorial.xml:1370(para)
+#: src/using/script-fu-tutorial.xml:1371(para)
 msgid ""
 "We're going to add code in two places: right before we resize the image, and "
 "at the end of the script (to return the new image, the layer and the text)."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1375(para)
+#: src/using/script-fu-tutorial.xml:1376(para)
 msgid ""
 "After we get the text's height and width, we need to resize these values "
 "based on the buffer amount specified by the user. We won't do any error "
@@ -3116,7 +3155,7 @@ msgid ""
 "like <quote>200</quote> as the percent of buffer to add."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1383(programlisting)
+#: src/using/script-fu-tutorial.xml:1384(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3127,7 +3166,7 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1389(para)
+#: src/using/script-fu-tutorial.xml:1390(para)
 msgid ""
 "All we're doing here is setting the buffer based on the height of the text, "
 "and adding it twice to both the height and width of our new image. (We add "
@@ -3135,7 +3174,7 @@ msgid ""
 "sides of the text.)"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1395(para)
+#: src/using/script-fu-tutorial.xml:1396(para)
 msgid ""
 "Now that we have resized the image to allow for a buffer, we need to center "
 "the text within the image. This is done by moving it to the (x, y) "
@@ -3143,7 +3182,7 @@ msgid ""
 "I added this line after resizing the layer and the image:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1402(programlisting)
+#: src/using/script-fu-tutorial.xml:1403(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3151,35 +3190,35 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1405(para)
+#: src/using/script-fu-tutorial.xml:1406(para)
 msgid ""
 "Go ahead and save your script, and try it out after refreshing the database."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1409(para)
+#: src/using/script-fu-tutorial.xml:1410(para)
 msgid ""
 "All that is left to do is return our image, the layer, and the text layer. "
 "After displaying the image, we add this line:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1413(programlisting)
+#: src/using/script-fu-tutorial.xml:1414(programlisting)
 #, no-wrap
 msgid "(list theImage theLayer theText)"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1414(para)
+#: src/using/script-fu-tutorial.xml:1415(para)
 msgid ""
 "This is the last line of the function, making this list available to other "
 "scripts that want to use it."
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1418(para)
+#: src/using/script-fu-tutorial.xml:1419(para)
 msgid ""
 "To use our new text box script in another script, we could write something "
 "like the following:"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1422(programlisting)
+#: src/using/script-fu-tutorial.xml:1423(programlisting)
 #, no-wrap
 msgid ""
 "\n"
@@ -3194,28 +3233,28 @@ msgid ""
 "      "
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1432(para)
+#: src/using/script-fu-tutorial.xml:1433(para)
 msgid "Congratulations, you are on your way to your Black Belt of Script-Fu!"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1439(title)
+#: src/using/script-fu-tutorial.xml:1440(title)
 msgid "Your script and its working"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1441(title)
+#: src/using/script-fu-tutorial.xml:1442(title)
 msgid "What you write"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1442(para)
+#: src/using/script-fu-tutorial.xml:1443(para)
 #, fuzzy
 msgid "Below the complete script:"
 msgstr "单击以完成选区"
 
-#: src/using/script-fu-tutorial.xml:1529(title)
+#: src/using/script-fu-tutorial.xml:1530(title)
 msgid "What you obtain"
 msgstr ""
 
-#: src/using/script-fu-tutorial.xml:1531(title)
+#: src/using/script-fu-tutorial.xml:1532(title)
 #, fuzzy
 msgid "And the result on the screen."
 msgstr "当前选区圆角化"
@@ -3587,7 +3626,7 @@ msgid ""
 "It will create a widget in the control dialog. The widget is a combo-box "
 "showing all enum values for the given enum type. This has to be the name of "
 "a registered enum, without the \"Gimp\" prefix. The second parameter "
-"speficies the default value, using the enum value's nick."
+"specifies the default value, using the enum value's nick."
 msgstr ""
 
 #: src/using/script-fu-gui-api.xml:312(para)
@@ -3651,7 +3690,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/using/photography.xml:807(None)
+#: src/using/photography.xml:805(None)
 msgid ""
 "@@image: 'images/dialogs/stock-vchain-24.png'; "
 "md5=7c1f223b72d0d77f316a2ee9b96a08fb"
@@ -4143,40 +4182,32 @@ msgstr ""
 #: src/using/photography.xml:479(para)
 msgid ""
 "The most generally useful technique for sharpening a fuzzy image is called "
-"the <link linkend=\"plug-in-unsharp-mask\">Unsharp Mask</link>. In spite of "
-"the rather confusing name, which derives from its origins as a technique "
-"used by film developers, its result is to make the image sharper, not "
-"<quote>unsharp</quote>. It is a plug-in, and you can access it as Filters-"
-"&gt;Enhance-&gt;Unsharp Mask in the image menu. There are two parameters, "
-"<quote>Radius</quote> and <quote>Amount</quote>. The default values often "
-"work pretty well, so you should try them first. Increasing either the radius "
-"or the amount increases the strength of the effect. Don't get carried away, "
-"though: if you make the unsharp mask too strong, it will amplify noise in "
-"the image and also give rise to visible artifacts where there are sharp "
-"edges."
+"the <link linkend=\"gimp-filter-unsharp-mask\">Sharpen (Unsharp Mask</link>. "
+"In spite of the rather confusing name, which derives from its origins as a "
+"technique used by film developers, its result is to make the image sharper, "
+"not <quote>unsharp</quote>. It is a plug-in, and you can access it as "
+"Filters-&gt;Enhance-&gt;Sharpen (Unsharp Mask) in the image menu. There are "
+"two parameters, <quote>Radius</quote> and <quote>Amount</quote>. The default "
+"values often work pretty well, so you should try them first. Increasing "
+"either the radius or the amount increases the strength of the effect. Don't "
+"get carried away, though: if you make the unsharp mask too strong, it will "
+"amplify noise in the image and also give rise to visible artifacts where "
+"there are sharp edges."
 msgstr ""
 
-#: src/using/photography.xml:495(para)
+#: src/using/photography.xml:497(para)
 msgid ""
-"Sometimes using Unsharp Mask can cause color distortion where there are "
-"strong contrasts in an image. When this happens, you can often get better "
-"results by decomposing the image into separate Hue-Saturation-Value (HSV) "
-"layers, and running Unsharp Mask on the Value layer only, then recomposing. "
-"This works because the human eye has much finer resolution for brightness "
-"than for color. See the sections on <link linkend=\"plug-in-decompose-"
-"registered\">Decompose</link> and <link linkend=\"plug-in-compose\">Compose</"
-"link> for more information."
+"Sometimes using Sharpen (Unsharp Mask) can cause color distortion where "
+"there are strong contrasts in an image. When this happens, you can often get "
+"better results by decomposing the image into separate Hue-Saturation-Value "
+"(HSV) layers, and running Sharpen (Unsharp Mask) on the Value layer only, "
+"then recomposing. This works because the human eye has much finer resolution "
+"for brightness than for color. See the sections on <link linkend=\"plug-in-"
+"decompose-registered\">Decompose</link> and <link linkend=\"plug-in-compose"
+"\">Compose</link> for more information."
 msgstr ""
 
-#: src/using/photography.xml:507(para)
-msgid ""
-"Next to \"Unsharp Mask\" in the Filters menu is another filter called <link "
-"linkend=\"plug-in-sharpen\">Sharpen</link>, which does similar things. It is "
-"a little easier to use but not nearly as effective: our recommendation is "
-"that you ignore it and go straight to Unsharp Mask."
-msgstr ""
-
-#: src/using/photography.xml:514(para)
+#: src/using/photography.xml:511(para)
 msgid ""
 "In some situations, you may be able to get useful results by selectively "
 "sharpening specific parts of an image using the <link linkend=\"gimp-tool-"
@@ -4187,12 +4218,12 @@ msgid ""
 "sharpness of edges in the image, but also amplifies noise."
 msgstr ""
 
-#: src/using/photography.xml:527(title)
+#: src/using/photography.xml:524(title)
 #, fuzzy
 msgid "Reducing Graininess"
 msgstr "重新扫描渐变"
 
-#: src/using/photography.xml:528(para)
+#: src/using/photography.xml:525(para)
 msgid ""
 "When you take pictures in low-light conditions or with a very fast exposure "
 "time, the camera does not get enough data to make good estimates of the true "
@@ -4200,21 +4231,21 @@ msgid ""
 "can <quote>smooth out</quote> the graininess by blurring the image, but then "
 "you will also lose sharpness. There are a couple of approaches that may give "
 "better results. Probably the best, if the graininess is not too bad, is to "
-"use the filter called <link linkend=\"plug-in-sel-gauss\">Selective Blur</"
-"link>, setting the blurring radius to 1 or 2 pixels. The other approach is "
-"to use the <link linkend=\"plug-in-despeckle\">Despeckle</link> filter. This "
-"has a nice preview, so you can play with the settings and try to find some "
-"that give good results. When graininess is really bad, though, it is often "
-"very difficult to fix by anything except heroic measures (i.e., retouching "
-"with paint tools)."
+"use the filter called <link linkend=\"gimp-filter-gaussian-blur-selective"
+"\">Selective Blur</link>, setting the blurring radius to 1 or 2 pixels. The "
+"other approach is to use the <link linkend=\"plug-in-despeckle\">Despeckle</"
+"link> filter. This has a nice preview, so you can play with the settings and "
+"try to find some that give good results. When graininess is really bad, "
+"though, it is often very difficult to fix by anything except heroic measures "
+"(i.e., retouching with paint tools)."
 msgstr ""
 
-#: src/using/photography.xml:548(title)
+#: src/using/photography.xml:546(title)
 #, fuzzy
 msgid "Softening"
 msgstr "锐化"
 
-#: src/using/photography.xml:549(para)
+#: src/using/photography.xml:547(para)
 msgid ""
 "Every so often you have the opposite problem: an image is <emphasis>too</"
 "emphasis> crisp. The solution is to blur it a bit: fortunately blurring an "
@@ -4225,12 +4256,12 @@ msgid ""
 "just repeat until you get the result you desire."
 msgstr ""
 
-#: src/using/photography.xml:564(title)
+#: src/using/photography.xml:562(title)
 #, fuzzy
 msgid "Removing Unwanted Objects from an Image"
 msgstr "从图像删除内嵌信息"
 
-#: src/using/photography.xml:565(para)
+#: src/using/photography.xml:563(para)
 msgid ""
 "There are two kinds of objects you might want to remove from an image: "
 "first, artifacts caused by junk such as dust or hair on the lens; second, "
@@ -4238,12 +4269,12 @@ msgid ""
 "a telephone wire running across the edge of a beautiful mountain landscape."
 msgstr ""
 
-#: src/using/photography.xml:573(title)
+#: src/using/photography.xml:571(title)
 #, fuzzy
 msgid "Despeckling"
 msgstr "去除斑点"
 
-#: src/using/photography.xml:574(para)
+#: src/using/photography.xml:572(para)
 msgid ""
 "A good tool for removing dust and other types of lens grunge is the <link "
 "linkend=\"plug-in-despeckle\">Despeckle</link> filter, accessed as Filters-"
@@ -4261,18 +4292,18 @@ msgid ""
 "filter, create a different selection, and then try again."
 msgstr ""
 
-#: src/using/photography.xml:592(para)
+#: src/using/photography.xml:590(para)
 msgid ""
 "If you have more than one artifact in the image, it is necessary to use "
 "Despeckle on each individually."
 msgstr ""
 
-#: src/using/photography.xml:599(title)
+#: src/using/photography.xml:597(title)
 #, fuzzy
 msgid "Garbage Removal"
 msgstr "去红眼"
 
-#: src/using/photography.xml:600(para)
+#: src/using/photography.xml:598(para)
 msgid ""
 "The most useful method for removing unwanted <quote>clutter</quote> from an "
 "image is the <link linkend=\"gimp-tool-clone\">Clone</"
@@ -4290,7 +4321,7 @@ msgid ""
 "can look when this technique works well."
 msgstr ""
 
-#: src/using/photography.xml:620(para)
+#: src/using/photography.xml:618(para)
 msgid ""
 "Consult the <link linkend=\"gimp-tool-clone\">Clone Tool Help</link> for "
 "more detailed instructions. Cloning is as much an art as a science, and the "
@@ -4299,7 +4330,7 @@ msgid ""
 "pay off."
 msgstr ""
 
-#: src/using/photography.xml:628(para)
+#: src/using/photography.xml:626(para)
 msgid ""
 "Another tool looking very much as the clone tool, but smarter, is the <link "
 "linkend=\"gimp-tool-heal\">healing tool</link> which also takes the area "
@@ -4307,7 +4338,7 @@ msgid ""
 "of wrinkles and other minor errors in images."
 msgstr ""
 
-#: src/using/photography.xml:634(para)
+#: src/using/photography.xml:632(para)
 msgid ""
 "In some cases you may be able to get good results by simply cutting out the "
 "offending object from the image, and then using a plug-in called "
@@ -4317,15 +4348,15 @@ msgid ""
 ">. As with many things, your mileage may vary."
 msgstr ""
 
-#: src/using/photography.xml:646(title)
+#: src/using/photography.xml:644(title)
 msgid "Removing Red-eye"
 msgstr ""
 
-#: src/using/photography.xml:648(primary)
+#: src/using/photography.xml:646(primary)
 msgid "Red-eyes"
 msgstr ""
 
-#: src/using/photography.xml:650(para)
+#: src/using/photography.xml:648(para)
 msgid ""
 "When you take a flash picture of somebody who is looking directly toward the "
 "camera, the iris of the eye can bounce the light of the flash back toward "
@@ -4337,32 +4368,32 @@ msgid ""
 "as other colors, such as green."
 msgstr ""
 
-#: src/using/photography.xml:661(para)
+#: src/using/photography.xml:659(para)
 msgid ""
-"From version 2.4, GIMP incorporated a special <link linkend=\"plug-in-red-"
-"eye-removal\">remove red eye</link> filter. Make a selection with one of the "
-"selection tools of the red part of the eye and then choose the <quote>Remove "
-"Red Eye</quote> filter. Perhaps you have to fiddle around a bit with the "
-"threshold slider to get the right color."
+"From version 2.4, GIMP incorporated a special <link linkend=\"gimp-filter-"
+"red-eye-removal\">remove red eye</link> filter. Make a selection with one of "
+"the selection tools of the red part of the eye and then choose the "
+"<quote>Remove Red Eye</quote> filter. Perhaps you have to fiddle around a "
+"bit with the threshold slider to get the right color."
 msgstr ""
 
-#: src/using/photography.xml:672(title)
+#: src/using/photography.xml:670(title)
 msgid "Saving Your Results"
 msgstr ""
 
-#: src/using/photography.xml:674(title) src/using/fileformats.xml:14(title)
-#: src/using/fileformats.xml:17(primary)
+#: src/using/photography.xml:672(title) src/using/fileformats.xml:12(title)
+#: src/using/fileformats.xml:15(primary)
 #, fuzzy
 msgid "Files"
 msgstr "文件"
 
-#: src/using/photography.xml:675(para)
+#: src/using/photography.xml:673(para)
 msgid ""
 "What file format should you use to save the results of your work, and should "
 "you resize it? The answers depend on what you intend to use the image for."
 msgstr ""
 
-#: src/using/photography.xml:682(para)
+#: src/using/photography.xml:680(para)
 msgid ""
 "If you intend to open the image in GIMP again for further work, you should "
 "save it in GIMP's native XCF format (i. e., name it something.xcf), because "
@@ -4370,7 +4401,7 @@ msgid ""
 "image is lost."
 msgstr ""
 
-#: src/using/photography.xml:690(para)
+#: src/using/photography.xml:688(para)
 msgid ""
 "If you intend to print the image on paper, you should avoid shrinking the "
 "image, except by cropping it. The reason is that printers are capable of "
@@ -4387,7 +4418,7 @@ msgid ""
 "use a lossless format such as TIFF instead."
 msgstr ""
 
-#: src/using/photography.xml:709(para)
+#: src/using/photography.xml:707(para)
 msgid ""
 "If you intend to display the image on screen or project it with a video "
 "projector, bear in mind that the highest screen resolution for most commonly "
@@ -4396,7 +4427,7 @@ msgid ""
 "good choice."
 msgstr ""
 
-#: src/using/photography.xml:718(para)
+#: src/using/photography.xml:716(para)
 msgid ""
 "If you want to put the image on a web page or send it by email, it is a good "
 "idea to make every effort to keep the file size as small as possible. First, "
@@ -4410,34 +4441,34 @@ msgid ""
 "at 1:1 while you do this, so you are not misled by the effects of zooming."
 msgstr ""
 
-#: src/using/photography.xml:735(para)
+#: src/using/photography.xml:733(para)
 msgid ""
 "See the <link linkend=\"gimp-using-fileformats\">File Formats</link> section "
 "for more information."
 msgstr ""
 
-#: src/using/photography.xml:742(title)
+#: src/using/photography.xml:740(title)
 msgid "Printing Your Photos"
 msgstr ""
 
-#: src/using/photography.xml:744(primary)
+#: src/using/photography.xml:742(primary)
 msgid "Printing"
 msgstr "打印"
 
-#: src/using/photography.xml:745(secondary)
+#: src/using/photography.xml:743(secondary)
 msgid "Printing your photos"
 msgstr ""
 
-#: src/using/photography.xml:747(para)
+#: src/using/photography.xml:745(para)
 msgid ""
-"As in most softwares, in GIMP, printing needs to go to main menu "
+"As in most applications, in GIMP, printing needs to go to main menu "
 "<menuchoice><guimenu>File</guimenu><guisubmenu>Print</guisubmenu></"
 "menuchoice>. However it is very useful to keep in mind some elementary "
 "concepts to prevent some unpleasant surprises when looking at result, or to "
-"cure them if that occurs. You always must remember:"
+"cure them if that occurs. You must always remember:"
 msgstr ""
 
-#: src/using/photography.xml:759(para)
+#: src/using/photography.xml:757(para)
 msgid ""
 "that image displayed on the screen is in RGB mode and printing will be in "
 "CMYK mode; consequently color feature you'll get on printed sheet will not "
@@ -4446,19 +4477,19 @@ msgid ""
 "click on these useful Wikipedia links:"
 msgstr ""
 
-#: src/using/photography.xml:769(para)
+#: src/using/photography.xml:767(para)
 msgid "ICC-Profile <xref linkend=\"bibliography-online-wkpd-icc\"/>"
 msgstr ""
 
-#: src/using/photography.xml:774(para)
+#: src/using/photography.xml:772(para)
 msgid "CMYK <xref linkend=\"bibliography-online-wkpd-cmyk\"/>"
 msgstr ""
 
-#: src/using/photography.xml:779(para)
+#: src/using/photography.xml:777(para)
 msgid "Gamut <xref linkend=\"bibliography-online-wkpd-gamut\"/>"
 msgstr ""
 
-#: src/using/photography.xml:786(para)
+#: src/using/photography.xml:784(para)
 msgid ""
 "that a screen resolution is roughly within a range from 75 up to 100 dpi; a "
 "printer resolution is about 10x higher (or more) than a screen one; printed "
@@ -4467,20 +4498,20 @@ msgid ""
 "available sheet size."
 msgstr ""
 
-#: src/using/photography.xml:795(para)
+#: src/using/photography.xml:793(para)
 msgid ""
 "Consequently, before any printing it is relevant to go to: "
 "<menuchoice><guimenu>Image</guimenu><guisubmenu>Print size</guisubmenu></"
-"menuchoice> and choose here your convenient output size in "
-"<quote>print size</quote> box adjusting either sizes or resolution. The "
-"<placeholder-1/> symbol shows that the both values are linked. You can "
-"dissociate x and y resolution by clicking on that symbol, but it is risky! "
-"Probably this possibility is open because printers are built with different "
-"x vs. y resolutions. Nevertheless if you unlinked them you can be very "
-"surprised! You can try this in special effects."
+"menuchoice> and choose here your convenient output size in <quote>print "
+"size</quote> box adjusting either sizes or resolution. The <placeholder-1/> "
+"symbol shows that the both values are linked. You can dissociate x and y "
+"resolution by clicking on that symbol, but it is risky! Probably this "
+"possibility is open because printers are built with different x vs. y "
+"resolutions. Nevertheless if you unlinked them you can be very surprised! "
+"You can try this in special effects."
 msgstr ""
 
-#: src/using/photography.xml:817(para)
+#: src/using/photography.xml:815(para)
 msgid ""
 "Last recommendation: think of checking your margins as well as centering. It "
 "would be a pity if a too much large margin cuts off some part of your image "
@@ -4488,11 +4519,11 @@ msgid ""
 "special photo paper."
 msgstr ""
 
-#: src/using/photography.xml:826(title)
+#: src/using/photography.xml:824(title)
 msgid "EXIF Data"
 msgstr ""
 
-#: src/using/photography.xml:827(para)
+#: src/using/photography.xml:825(para)
 msgid ""
 "Modern digital cameras, when you take a picture, add information to the data "
 "file about the camera settings and the circumstances under which the picture "
@@ -4507,14 +4538,11 @@ msgid ""
 "which is what earlier versions of GIMP did."
 msgstr ""
 
-#: src/using/photography.xml:841(para)
+#: src/using/photography.xml:839(para)
 msgid ""
-"If you would like to see the contents of the EXIF data, you can download "
-"from the registry an Exif Browser plug-in <xref linkend=\"bibliography-"
-"online-gimp-plugin-exifbrowser\"/>. If you are able to build and install it "
-"on your system, you can access it as Filters-&gt;Generic-&gt;Exif Browser "
-"from the image menu. (See <link linkend=\"gimp-plugins-install\">Installing "
-"New Plug-ins</link> for help.)"
+"If you would like to see the contents of the EXIF data, you can use the "
+"<link linkend=\"plug-in-metadata-viewer\">metadata-viewer</link> plug-in. "
+"you can access it as Image-&gt;Metadata-&gt;View metadata from the menu."
 msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
@@ -5031,8 +5059,8 @@ msgstr "正在渲染第 %d 帧"
 msgid ""
 "How can you create a grid that is actually part of the image? You can't do "
 "this using the image grid: that is only an aid, and is only visible on the "
-"monitor or in a screenshot. You can, however, use the <link linkend=\"plug-"
-"in-grid\">Grid</link> plugin to render a grid very similar to the image "
+"monitor or in a screenshot. You can, however, use the <link linkend=\"gimp-"
+"filter-grid\">Grid</link> plugin to render a grid very similar to the image "
 "grid. (Actually, the plugin has substantially more options.)"
 msgstr ""
 
@@ -5148,7 +5176,7 @@ msgstr ""
 msgid ""
 "<emphasis>How to solve:</emphasis> Either anchor the floating selection, or "
 "convert it into an ordinary (non-floating) layer. If you need help on how to "
-"do this, see <link linkend=\"glossary-floatingselection\"> Floating "
+"do this, see <link linkend=\"anchor-floating-selection\"> Floating "
 "Selections </link>."
 msgstr ""
 
@@ -5353,7 +5381,7 @@ msgstr ""
 #: src/using/fonts-and-text.xml:12(title)
 #: src/using/fonts-and-text.xml:16(secondary)
 #: src/using/fonts-and-text.xml:22(primary)
-#: src/using/fonts-and-text.xml:67(primary)
+#: src/using/fonts-and-text.xml:74(primary)
 msgid "Text"
 msgstr "文字"
 
@@ -5377,6 +5405,13 @@ msgid ""
 "Default settings were used for everything except font size."
 msgstr ""
 
+#: src/using/fonts-and-text.xml:54(para)
+msgid ""
+"This Logos item no longer exists in GIMP-2.10.10. But many scripts are still "
+"available in <ulink url=\"https://download.gimp.org/mirror/pub/gimp/extras\"/";
+">."
+msgstr ""
+
 #: src/using/fonts-and-text.xml:41(para)
 msgid ""
 "There are many things you can do to vary the appearance of text beyond just "
@@ -5386,32 +5421,32 @@ msgid ""
 "interesting effects. As a demonstration of some of the possibilities, try "
 "out the \"logo\" scripts at <menuchoice><guimenu>File</"
 "guimenu><guisubmenu>Create</guisubmenu><guisubmenu>Logos</guisubmenu></"
-"menuchoice>. Each of these scripts allows you to enter some text, and then "
-"creates a new image showing a logo constructed out of that text. If you "
-"would like to modify one of these scripts, or construct a logo script of "
-"your own, the <link linkend=\"gimp-concepts-script-fu\">Using Script-Fu</"
-"link> and <link linkend=\"gimp-using-script-fu-tutorial\">Script-Fu "
-"Tutorial</link> sections should help you get started. Of course, you don't "
-"need Script-Fu to create these sorts of effects, only to automate them."
+"menuchoice>. <placeholder-1/> Each of these scripts allows you to enter some "
+"text, and then creates a new image showing a logo constructed out of that "
+"text. If you would like to modify one of these scripts, or construct a logo "
+"script of your own, the <link linkend=\"gimp-concepts-script-fu\">Using "
+"Script-Fu</link> and <link linkend=\"gimp-using-script-fu-tutorial\">Script-"
+"Fu Tutorial</link> sections should help you get started. Of course, you "
+"don't need Script-Fu to create these sorts of effects, only to automate them."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:65(title)
+#: src/using/fonts-and-text.xml:72(title)
 #, fuzzy
 msgid "Adding Fonts"
 msgstr "添加百叶窗"
 
-#: src/using/fonts-and-text.xml:68(secondary)
-#: src/using/fonts-and-text.xml:71(primary)
-#: src/using/fonts-and-text.xml:231(primary)
+#: src/using/fonts-and-text.xml:75(secondary)
+#: src/using/fonts-and-text.xml:78(primary)
+#: src/using/fonts-and-text.xml:238(primary)
 msgid "Fonts"
 msgstr "字体"
 
-#: src/using/fonts-and-text.xml:72(secondary)
+#: src/using/fonts-and-text.xml:79(secondary)
 #, fuzzy
 msgid "Add"
 msgstr "添加(_D)"
 
-#: src/using/fonts-and-text.xml:74(para)
+#: src/using/fonts-and-text.xml:81(para)
 msgid ""
 "For the most authoritative and up-to-date information on fonts in GIMP, "
 "consult the <quote>Fonts in GIMP 2.0</quote> page <xref linkend="
@@ -5419,7 +5454,7 @@ msgid ""
 "attempts to give you a helpful overview."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:81(para)
+#: src/using/fonts-and-text.xml:88(para)
 msgid ""
 "GIMP uses the FreeType 2 font engine to render fonts, and a system called "
 "Fontconfig to manage them. GIMP will let you use any font in Fontconfig's "
@@ -5432,73 +5467,73 @@ msgid ""
 "path if it is more convenient for you."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:93(para)
+#: src/using/fonts-and-text.xml:100(para)
 msgid ""
 "FreeType 2 is a very powerful and flexible system. By default, it supports "
 "the following font file formats:"
 msgstr ""
 
-#: src/using/fonts-and-text.xml:99(para)
+#: src/using/fonts-and-text.xml:106(para)
 msgid "TrueType fonts (and collections)"
 msgstr ""
 
-#: src/using/fonts-and-text.xml:102(para)
+#: src/using/fonts-and-text.xml:109(para)
 #, fuzzy
 msgid "Type 1 fonts"
 msgstr "类型 1"
 
-#: src/using/fonts-and-text.xml:105(para)
+#: src/using/fonts-and-text.xml:112(para)
 msgid "CID-keyed Type 1 fonts"
 msgstr ""
 
-#: src/using/fonts-and-text.xml:108(para)
+#: src/using/fonts-and-text.xml:115(para)
 #, fuzzy
 msgid "CFF fonts"
 msgstr "字体"
 
-#: src/using/fonts-and-text.xml:111(para)
+#: src/using/fonts-and-text.xml:118(para)
 msgid "OpenType fonts (both TrueType and CFF variants)"
 msgstr ""
 
-#: src/using/fonts-and-text.xml:114(para)
+#: src/using/fonts-and-text.xml:121(para)
 msgid "SFNT-based bitmap fonts"
 msgstr ""
 
-#: src/using/fonts-and-text.xml:117(para)
+#: src/using/fonts-and-text.xml:124(para)
 msgid "X11 PCF fonts"
 msgstr ""
 
-#: src/using/fonts-and-text.xml:120(para)
+#: src/using/fonts-and-text.xml:127(para)
 #, fuzzy
 msgid "Windows FNT fonts"
 msgstr "Windows 图标"
 
-#: src/using/fonts-and-text.xml:123(para)
+#: src/using/fonts-and-text.xml:130(para)
 msgid "BDF fonts (including anti-aliased ones)"
 msgstr ""
 
-#: src/using/fonts-and-text.xml:126(para)
+#: src/using/fonts-and-text.xml:133(para)
 #, fuzzy
 msgid "PFR fonts"
 msgstr "字体"
 
-#: src/using/fonts-and-text.xml:129(para)
+#: src/using/fonts-and-text.xml:136(para)
 #, fuzzy
 msgid "Type42 fonts (limited support)"
 msgstr "颜色表类型不支持"
 
-#: src/using/fonts-and-text.xml:132(para)
+#: src/using/fonts-and-text.xml:139(para)
 msgid ""
 "You can also add modules to support other types of font files. See FREETYPE "
 "2 <xref linkend=\"bibliography-online-freetype\"/> for more information."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:138(title)
+#: src/using/fonts-and-text.xml:145(title)
 #, fuzzy
 msgid "Linux"
 msgstr "Linux 输入"
 
-#: src/using/fonts-and-text.xml:139(para)
+#: src/using/fonts-and-text.xml:146(para)
 msgid ""
 "On a Linux system, if the Fontconfig utility is set up as usual, all you "
 "need to do to add a new font is to place the file in the directory "
@@ -5514,11 +5549,11 @@ msgid ""
 "dialog</link>."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:158(title)
+#: src/using/fonts-and-text.xml:165(title)
 msgid "Windows"
 msgstr "窗口"
 
-#: src/using/fonts-and-text.xml:159(para)
+#: src/using/fonts-and-text.xml:166(para)
 msgid ""
 "The easiest way to install a font is to drag the file onto the Fonts "
 "directory and let the shell do its magic. Unless you've done something "
@@ -5531,13 +5566,13 @@ msgid ""
 "acronym>, but also to other Windows applications."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:175(title)
+#: src/using/fonts-and-text.xml:182(title)
 #, fuzzy
 msgid "Mac OS X"
 msgstr "Mac OS X"
 
 #. http://docs.info.apple.com/article.html?path=FontBook/2.0/en/fb680.html
-#: src/using/fonts-and-text.xml:177(para)
+#: src/using/fonts-and-text.xml:184(para)
 msgid ""
 "There are several ways to install fonts on your system. You can drag-and-"
 "drop them to the <quote>Fonts</quote> folder in <quote>Libraries</quote> "
@@ -5553,7 +5588,7 @@ msgid ""
 "Book</application>."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:193(para)
+#: src/using/fonts-and-text.xml:200(para)
 msgid ""
 "To install a Type 1 file, you need both the <filename>.pfb</filename> and "
 "<filename>.pfm</filename> files. Drag the one that gets an icon into the "
@@ -5563,7 +5598,7 @@ msgid ""
 "directory does no harm."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:202(para)
+#: src/using/fonts-and-text.xml:209(para)
 msgid ""
 "In principle, GIMP can use any type of font on Windows that FreeType can "
 "handle; however, for fonts that Windows can't handle natively, you should "
@@ -5576,7 +5611,7 @@ msgid ""
 "support Windows ME, although it may work anyway)."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:216(para)
+#: src/using/fonts-and-text.xml:223(para)
 msgid ""
 "GIMP uses Fontconfig to manage fonts on Windows as well as Linux. The "
 "instructions above work because Fontconfig by default uses the Windows fonts "
@@ -5587,16 +5622,16 @@ msgid ""
 "work."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:229(title)
+#: src/using/fonts-and-text.xml:236(title)
 #, fuzzy
 msgid "Font Problems"
 msgstr "字体文件夹"
 
-#: src/using/fonts-and-text.xml:232(secondary)
+#: src/using/fonts-and-text.xml:239(secondary)
 msgid "Problems"
 msgstr ""
 
-#: src/using/fonts-and-text.xml:234(para)
+#: src/using/fonts-and-text.xml:241(para)
 msgid ""
 "Problems with fonts have probably been responsible for more GIMP 2 bug "
 "reports than any other single cause, although they have become much less "
@@ -5609,7 +5644,7 @@ msgid ""
 "tool."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:245(para)
+#: src/using/fonts-and-text.xml:252(para)
 msgid ""
 "Another known problem is that Pango 1.2 cannot load fonts that don't provide "
 "an Unicode character mapping. (Pango is the text layout library used by "
@@ -5618,7 +5653,7 @@ msgid ""
 "problem and makes symbol fonts available in GIMP."
 msgstr ""
 
-#: src/using/fonts-and-text.xml:252(para)
+#: src/using/fonts-and-text.xml:259(para)
 msgid ""
 "A frequent source of confusion occurs on Windows systems, when GIMP "
 "encounters a malformed font file and generates an error message: this causes "
@@ -5634,7 +5669,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/using/fileformats.xml:102(None)
+#: src/using/fileformats.xml:100(None)
 msgid ""
 "@@image: 'images/using/close-warning.png'; "
 "md5=daf43dc485b063912be438bd8196b348"
@@ -5642,7 +5677,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/using/fileformats.xml:136(None)
+#: src/using/fileformats.xml:134(None)
 msgid ""
 "@@image: 'images/using/export-gif-dialog.png'; "
 "md5=6c0effc027a23e667a6da56e007eda6d"
@@ -5650,37 +5685,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/using/fileformats.xml:296(None)
+#: src/using/fileformats.xml:284(None)
+msgid ""
+"@@image: 'images/using/export-heif-dialog.png'; "
+"md5=30eb3ca8884ae62eba4771e8260dc5e4"
+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/using/fileformats.xml:326(None)
 msgid ""
 "@@image: 'images/using/export-jpeg-dialog.png'; "
-"md5=9e3cb45071a45a4b1fbd43de66079830"
+"md5=5e9475ee040e869023545dde08cca2f0"
 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/using/fileformats.xml:609(None)
+#: src/using/fileformats.xml:624(None)
 msgid ""
 "@@image: 'images/using/export-png-dialog.png'; "
-"md5=a7e763ba4e72b4a8be0c207d91781a70"
+"md5=784d75c526dfe651477c0601b6c3151f"
 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/using/fileformats.xml:771(None)
+#: src/using/fileformats.xml:792(None)
 msgid ""
 "@@image: 'images/using/export-tiff-dialog.png'; "
-"md5=1911ab89ff8b7b2ddd1ba3228c6ef94c"
+"md5=0eb69982cec72381d6ea822a9606ef01"
 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/using/fileformats.xml:886(None)
+#: src/using/fileformats.xml:924(None)
 msgid ""
 "@@image: 'images/using/export-mng-dialog.png'; "
 "md5=77f5b2f7624bbfe11d26c730ad28d6a7"
 msgstr ""
 
-#: src/using/fileformats.xml:20(para)
+#: src/using/fileformats.xml:18(para)
 msgid ""
 "<acronym>GIMP</acronym> is capable of reading and writing a large variety of "
 "graphics file formats. With the exception of <acronym>GIMP</acronym>'s "
@@ -5689,22 +5732,22 @@ msgid ""
 "when the need arises."
 msgstr ""
 
-#: src/using/fileformats.xml:29(title)
+#: src/using/fileformats.xml:27(title)
 #, fuzzy
 msgid "Save / Export Images"
 msgstr "导出图像"
 
-#: src/using/fileformats.xml:31(primary)
+#: src/using/fileformats.xml:29(primary)
 #, fuzzy
 msgid "Save/Export Images"
 msgstr "导出图像"
 
-#: src/using/fileformats.xml:34(primary)
+#: src/using/fileformats.xml:32(primary)
 #, fuzzy
 msgid "Export Images"
 msgstr "导出图像"
 
-#: src/using/fileformats.xml:37(para)
+#: src/using/fileformats.xml:35(para)
 msgid ""
 "In former <acronym>GIMP</acronym> releases, when you loaded an image in some "
 "format, let us say JPG or PNG, the image kept its format and was saved in "
@@ -5718,7 +5761,7 @@ msgid ""
 "command>."
 msgstr ""
 
-#: src/using/fileformats.xml:51(para)
+#: src/using/fileformats.xml:49(para)
 msgid ""
 "When you are finished working with an image, you will want to save the "
 "results. (In fact, it is often a good idea to save at intermediate stages "
@@ -5737,19 +5780,19 @@ msgid ""
 "etc."
 msgstr ""
 
-#: src/using/fileformats.xml:72(title)
+#: src/using/fileformats.xml:70(title)
 #, fuzzy
 msgid "File Formats"
 msgstr "文件格式"
 
-#: src/using/fileformats.xml:73(para)
+#: src/using/fileformats.xml:71(para)
 msgid ""
 "There are several commands for <emphasis>saving</emphasis> images. A list, "
 "and information on how to use them, can be found in the section covering the "
 "<link linkend=\"gimp-file-menu\">File Menu</link>."
 msgstr ""
 
-#: src/using/fileformats.xml:78(para)
+#: src/using/fileformats.xml:76(para)
 msgid ""
 "<acronym>GIMP</acronym> allows you to <emphasis>export</emphasis> the images "
 "you create in a wide variety of formats. It is important to realize that the "
@@ -5759,77 +5802,78 @@ msgid ""
 "up to you to understand the capabilities of the format you choose."
 msgstr ""
 
-#: src/using/fileformats.xml:86(para)
+#: src/using/fileformats.xml:84(para)
 msgid ""
 "Exporting an image does not modify the image itself, so you do not lose "
 "anything by exporting. See <link linkend=\"gimp-export-dialog\">Export file</"
 "link>."
 msgstr ""
 
-#: src/using/fileformats.xml:92(para)
+#: src/using/fileformats.xml:90(para)
 msgid ""
 "When you close an image (possibly by quitting GIMP), you are warned if the "
 "image is \"dirty\"; that is, if it has been changed without subsequently "
 "being saved (an asterisk is in front of the image name)."
 msgstr ""
 
-#: src/using/fileformats.xml:98(title)
+#: src/using/fileformats.xml:96(title)
 msgid "Closing warning"
 msgstr ""
 
-#: src/using/fileformats.xml:106(para)
+#: src/using/fileformats.xml:104(para)
 msgid ""
 "Saving an image in any file format will cause the image to be considered "
 "\"not dirty\", even if the file format does not represent all of the "
 "information from the image."
 msgstr ""
 
-#: src/using/fileformats.xml:114(title) src/using/fileformats.xml:124(primary)
+#: src/using/fileformats.xml:112(title) src/using/fileformats.xml:122(primary)
 #, fuzzy
 msgid "Export Image as GIF"
 msgstr "图像导出为"
 
-#: src/using/fileformats.xml:115(anchor:xreflabel)
-#: src/using/fileformats.xml:118(primary)
-#: src/using/fileformats.xml:128(secondary)
+#: src/using/fileformats.xml:113(anchor:xreflabel)
+#: src/using/fileformats.xml:116(primary)
+#: src/using/fileformats.xml:126(secondary)
 msgid "GIF"
 msgstr "GIF"
 
-#: src/using/fileformats.xml:121(primary)
+#: src/using/fileformats.xml:119(primary)
 msgid ".gif"
 msgstr ""
 
-#: src/using/fileformats.xml:127(primary)
-#: src/using/fileformats.xml:280(primary)
-#: src/using/fileformats.xml:600(primary)
-#: src/using/fileformats.xml:763(primary)
-#: src/using/fileformats.xml:878(primary) src/using/brushes.xml:37(primary)
-#: src/using/brushes.xml:73(primary) src/using/brushes.xml:100(primary)
+#: src/using/fileformats.xml:125(primary)
+#: src/using/fileformats.xml:310(primary)
+#: src/using/fileformats.xml:615(primary)
+#: src/using/fileformats.xml:784(primary)
+#: src/using/fileformats.xml:916(primary) src/using/brushes.xml:42(primary)
+#: src/using/brushes.xml:78(primary) src/using/brushes.xml:105(primary)
+#: src/using/brushes.xml:123(primary)
 #, fuzzy
 msgid "Formats"
 msgstr "格式"
 
-#: src/using/fileformats.xml:132(title)
+#: src/using/fileformats.xml:130(title)
 #, fuzzy
 msgid "The GIF Export dialog"
 msgstr "带我到导出对话框"
 
-#: src/using/fileformats.xml:141(para)
+#: src/using/fileformats.xml:139(para)
 msgid ""
 "The GIF file format does not support some basic image properties such as "
 "<emphasis>print resolution</emphasis>. If you care for these properties, use "
 "a different file format like PNG."
 msgstr ""
 
-#: src/using/fileformats.xml:150(term)
+#: src/using/fileformats.xml:148(term)
 msgid "GIF Options"
 msgstr "GIF 选项"
 
-#: src/using/fileformats.xml:154(term)
+#: src/using/fileformats.xml:152(term)
 msgid "Interlace"
 msgstr "交错"
 
-#: src/using/fileformats.xml:156(para) src/using/fileformats.xml:617(para)
+#: src/using/fileformats.xml:154(para) src/using/fileformats.xml:632(para)
 msgid ""
 "Checking interlace allows an image on a web page to be progressively "
 "displayed as it is downloaded. Progressive image display is useful with slow "
@@ -5837,118 +5881,155 @@ msgid ""
 "interlace is of less use today with our faster connection speeds."
 msgstr ""
 
-#: src/using/fileformats.xml:167(term)
+#: src/using/fileformats.xml:165(term)
 #, fuzzy
 msgid "GIF comment"
 msgstr "GIF 注释(_G):"
 
-#: src/using/fileformats.xml:169(para)
+#: src/using/fileformats.xml:167(para)
 msgid ""
 "GIF comments support only 7-bit ASCII characters. If you use a character "
 "outside the 7-bit ASCII set, <acronym>GIMP</acronym> will export the image "
 "without a comment, and then inform you that the comment was not saved."
 msgstr ""
 
-#: src/using/fileformats.xml:183(term)
+#: src/using/fileformats.xml:181(term)
 msgid "Animated GIF Options"
 msgstr "GIF 动画选项"
 
-#: src/using/fileformats.xml:186(primary)
+#: src/using/fileformats.xml:184(primary)
 #: src/using/animated-brushes.xml:13(primary)
 #, fuzzy
 msgid "Animation"
 msgstr "动画"
 
-#: src/using/fileformats.xml:187(secondary)
+#: src/using/fileformats.xml:185(secondary)
 #, fuzzy
 msgid "Animated GIF options"
 msgstr "GIF 动画选项"
 
-#: src/using/fileformats.xml:191(term)
+#: src/using/fileformats.xml:189(term)
 #, fuzzy
 msgid "Loop forever"
 msgstr "反复循环(_L)"
 
-#: src/using/fileformats.xml:193(para)
+#: src/using/fileformats.xml:191(para)
 msgid ""
 "When this option is checked, the animation will play repeatedly until you "
 "stop it."
 msgstr ""
 
-#: src/using/fileformats.xml:200(term)
+#: src/using/fileformats.xml:198(term)
 #, fuzzy
 msgid "Delay between frames where unspecified"
 msgstr "没有指明的帧之间的延时(_D):"
 
-#: src/using/fileformats.xml:202(para)
+#: src/using/fileformats.xml:200(para)
 msgid ""
 "You can set the delay, in milliseconds, between frames if it has not been "
 "set before. In this case, you can modify every delay in the Layer Dialog."
 msgstr ""
 
-#: src/using/fileformats.xml:210(term)
+#: src/using/fileformats.xml:208(term)
 #, fuzzy
 msgid "Frame disposal where unspecified"
 msgstr "没有指明的帧的处理(_F):"
 
-#: src/using/fileformats.xml:212(para)
+#: src/using/fileformats.xml:210(para)
 msgid ""
 "If this has not been set before, you can set how frames will be "
 "superimposed. You can select among three options :"
 msgstr ""
 
-#: src/using/fileformats.xml:218(para)
+#: src/using/fileformats.xml:216(para)
 msgid ""
 "<guilabel>I don't care</guilabel>: you can use this option if all your "
 "layers are opaque. Layers will overwrite what is beneath."
 msgstr ""
 
-#: src/using/fileformats.xml:225(para)
+#: src/using/fileformats.xml:223(para)
 msgid ""
 "<guilabel>Cumulative Layers (combine)</guilabel>: previous frames will not "
 "be deleted when a new one is displayed."
 msgstr ""
 
-#: src/using/fileformats.xml:232(para)
+#: src/using/fileformats.xml:230(para)
 msgid ""
 "<guilabel>One frame per layer (replace)</guilabel>: previous frames will be "
 "deleted before displaying a new frame."
 msgstr ""
 
-#: src/using/fileformats.xml:242(term)
+#: src/using/fileformats.xml:240(term)
 #, fuzzy
 msgid "Use delay entered above for all frames"
 msgstr "上面输入的延迟用于所有帧(_U)"
 
-#: src/using/fileformats.xml:244(para) src/using/fileformats.xml:252(para)
+#: src/using/fileformats.xml:242(para) src/using/fileformats.xml:250(para)
 msgid "Self-explanatory."
 msgstr ""
 
-#: src/using/fileformats.xml:250(term)
+#: src/using/fileformats.xml:248(term)
 #, fuzzy
 msgid "Use disposal entered above for all frames"
 msgstr "上面输入的布置用于所有帧(_S)"
 
-#: src/using/fileformats.xml:264(title) src/using/fileformats.xml:277(primary)
+#: src/using/fileformats.xml:262(title)
+#, fuzzy
+msgid "Export Image as HEIF/HEIC"
+msgstr "图像导出为"
+
+#: src/using/fileformats.xml:264(primary)
+msgid "HEIF/HEIC"
+msgstr ""
+
+#: src/using/fileformats.xml:266(para)
+msgid ""
+"HEIF stands for High Efficiency Image File Format. Also known as HEIC High "
+"Efficiency Image Coding."
+msgstr ""
+
+#: src/using/fileformats.xml:270(para)
+msgid ""
+"Twice as much information can be stored in a HEIF image as in a JPEG image "
+"of the same size, resulting in a better quality. As of October 2019, no "
+"browser supports HEIF natively."
+msgstr ""
+
+#: src/using/fileformats.xml:275(para)
+msgid ""
+"More information in <ulink url=\"http://en.wikipedia.org/wiki/";
+"High_Efficiency_Image_File_Format\">Wikipedia</ulink>."
+msgstr ""
+
+#: src/using/fileformats.xml:280(title)
+#, fuzzy
+msgid "The HEIF/HEIC Export dialog"
+msgstr "带我到导出对话框"
+
+#: src/using/fileformats.xml:288(para)
+msgid "These options are self-explanatory."
+msgstr ""
+
+#: src/using/fileformats.xml:294(title) src/using/fileformats.xml:307(primary)
 #, fuzzy
 msgid "Export Image as JPEG"
 msgstr "图像导出为"
 
-#: src/using/fileformats.xml:265(anchor:xreflabel)
-#: src/using/fileformats.xml:268(primary)
-#: src/using/fileformats.xml:281(secondary)
+#: src/using/fileformats.xml:295(anchor:xreflabel)
+#: src/using/fileformats.xml:298(primary)
+#: src/using/fileformats.xml:311(secondary)
 msgid "JPEG"
 msgstr "JPEG"
 
-#: src/using/fileformats.xml:271(primary)
+#: src/using/fileformats.xml:301(primary)
 msgid ".jpg"
 msgstr ""
 
-#: src/using/fileformats.xml:274(primary)
+#: src/using/fileformats.xml:304(primary)
 msgid ".jpeg"
 msgstr ""
 
-#: src/using/fileformats.xml:284(para)
+#: src/using/fileformats.xml:314(para)
 msgid ""
 "JPEG files usually have an extension .jpg, .JPG, or .jpeg. It is a very "
 "widely used format, because it compresses images very efficiently, while "
@@ -5957,12 +6038,12 @@ msgid ""
 "transparency or multiple layers."
 msgstr ""
 
-#: src/using/fileformats.xml:292(title)
+#: src/using/fileformats.xml:322(title)
 #, fuzzy
 msgid "The JPEG Export dialog"
 msgstr "带我到导出对话框"
 
-#: src/using/fileformats.xml:300(para)
+#: src/using/fileformats.xml:330(para)
 msgid ""
 "The JPEG algorithm is quite complex, and involves a bewildering number of "
 "options, whose meaning is beyond the scope of this documentation. Unless you "
@@ -5970,11 +6051,11 @@ msgid ""
 "need to adjust."
 msgstr ""
 
-#: src/using/fileformats.xml:308(term)
+#: src/using/fileformats.xml:338(term)
 msgid "Quality"
 msgstr "质量"
 
-#: src/using/fileformats.xml:310(para)
+#: src/using/fileformats.xml:340(para)
 msgid ""
 "When you save a file in JPEG format, a dialog is displayed that allows you "
 "to set the Quality level, which ranges from 0 to 100. Values above 95 are "
@@ -5985,7 +6066,7 @@ msgid ""
 "image window</guilabel> in the JPEG dialog."
 msgstr ""
 
-#: src/using/fileformats.xml:322(para)
+#: src/using/fileformats.xml:352(para)
 msgid ""
 "Please note, that the numbers for the JPEG quality level have a different "
 "meaning in different applications. Saving with a quality level of 80 in GIMP "
@@ -5993,164 +6074,162 @@ msgid ""
 "different application."
 msgstr ""
 
-#: src/using/fileformats.xml:333(term)
+#: src/using/fileformats.xml:363(term)
 #, fuzzy
-msgid "Preview in image window"
-msgstr "在图像窗口中显示预览(_W)"
+msgid "Use quality settings from original image"
+msgstr "使用原图像的品质设定(_U)"
 
-#: src/using/fileformats.xml:335(para)
+#: src/using/fileformats.xml:367(para)
 msgid ""
-"Checking this option causes each change in quality (or any other JPEG "
-"parameter) to be shown in the image display. (This does not alter the image: "
-"the image reverts back to its original state when the JPEG dialog is closed.)"
+"If a particular quality setting (or <quote>quantization table</quote>) was "
+"attached to the image when it was loaded, then this option allows you to use "
+"them instead of the standard ones."
 msgstr ""
 
-#: src/using/fileformats.xml:344(term)
-#, fuzzy
-msgid "Advanced settings"
-msgstr "高级设置"
-
-#: src/using/fileformats.xml:346(para)
-#, fuzzy
-msgid "Some information about the advanced settings:"
-msgstr "选区到路径高级设置"
-
-#: src/using/fileformats.xml:351(term)
-msgid "Optimize"
-msgstr "优化"
-
-#: src/using/fileformats.xml:353(para)
+#: src/using/fileformats.xml:373(para)
 msgid ""
-"If you enable this option, the optimization of entropy encoding parameters "
-"will be used. The result is typically a smaller file, but it takes more time "
-"to generate."
+"If you have only made a few changes to the image, then re-using the same "
+"quality setting will give you almost the same quality and file size as the "
+"original image. This will minimize the losses caused by the quantization "
+"step, compared to what would happen if you used different quality setting."
 msgstr ""
 
-#: src/using/fileformats.xml:361(term)
-msgid "Progressive"
-msgstr "渐进"
-
-#: src/using/fileformats.xml:363(para)
+#: src/using/fileformats.xml:381(para)
 msgid ""
-"With this option enabled, the image chunks are stored in the file in an "
-"order that allows progressive image refinement during a slow connection web "
-"download. The progressive option for JPG has the same purpose as the "
-"interlace option for GIF. Unfortunately, the progressive option produces "
-"slightly larger JPG files (than without the progressive option)."
+"If the quality setting found in the original file are not better than your "
+"default quality settings, then the option <quote>Use quality settings from "
+"original image</quote> will be available but not enabled. This ensures that "
+"you always get at least the minimum quality specified in your defaults. If "
+"you did not make major changes to the image and you want to save it using "
+"the same quality as the original, then you can do it by enabling this option."
 msgstr ""
 
-#: src/using/fileformats.xml:377(term)
+#: src/using/fileformats.xml:394(term)
 #, fuzzy
-msgid "Save EXIF data"
-msgstr "保存 _XMP 数据"
-
-#: src/using/fileformats.xml:380(primary)
-msgid "EXIF"
-msgstr ""
+msgid "Show preview in image window"
+msgstr "在图像窗口中显示预览(_W)"
 
-#: src/using/fileformats.xml:382(para)
+#: src/using/fileformats.xml:396(para)
 msgid ""
-"JPEG files from many digital cameras contain extra information, called EXIF "
-"data. EXIF data provides information about the image such as camera make and "
-"model, image size, image date, etc. Although GIMP uses the <quote>libexif</"
-"quote> library to read and write EXIF data, the library is not automatically "
-"packaged with GIMP. If GIMP was built with libexif support, then EXIF data "
-"is preserved if you open a JPEG file, work with the resulting image, and "
-"then export it as JPEG. The EXIF data is not altered in any way when you do "
-"this. The EXIF data may indicate things such as image creation time and file "
-"name, which may no longer be correct. If GIMP was not built with EXIF "
-"support, you can still open JPG files containing EXIF data, but the EXIF "
-"data is ignored, and will not be saved when the resulting image is later "
-"exported."
+"Checking this option causes each change in quality (or any other JPEG "
+"parameter) to be shown in the image display. (This does not alter the image: "
+"the image reverts back to its original state when the JPEG dialog is closed.)"
 msgstr ""
 
-#: src/using/fileformats.xml:404(term)
-#, fuzzy
-msgid "Save thumbnail"
-msgstr "保存缩略图(_T)"
+#: src/using/fileformats.xml:405(term) src/using/fileformats.xml:738(term)
+#: src/using/fileformats.xml:896(term)
+msgid "Keep metadata"
+msgstr ""
 
-#: src/using/fileformats.xml:406(para)
+#: src/using/fileformats.xml:407(para)
 msgid ""
-"This option lets you save a thumbnail with the image. Many applications use "
-"the small thumbnail image as a quickly available small preview image."
+"If the image you loaded has Exif, XMP, IPTC metadata, they are preserved, "
+"and you can keep them or not when exporting to JPEG."
 msgstr ""
 
-#: src/using/fileformats.xml:412(para)
+#: src/using/fileformats.xml:414(term)
+msgid "Save thumbnail, Save color profile"
+msgstr ""
+
+#: src/using/fileformats.xml:416(para)
 msgid ""
-"This option is present only if <acronym>GIMP</acronym> was built with EXIF "
-"support."
+"Many applications use the small thumbnail image as a quickly available small "
+"preview image."
 msgstr ""
 
-#: src/using/fileformats.xml:420(term)
-#, fuzzy
-msgid "Save XMP data"
-msgstr "保存 _XMP 数据"
+#: src/using/fileformats.xml:423(term) src/using/fileformats.xml:887(term)
+msgid "Comment"
+msgstr "注释"
 
-#: src/using/fileformats.xml:422(para)
+#: src/using/fileformats.xml:425(para)
 msgid ""
-"XMP data is <quote>meta</quote> data about the image; it is a competing "
-"format with EXIF. If you enable this option, the meta data of the image is "
-"saved in an <acronym>XMP</acronym>-structure within the file."
+"You can edit the comment attached to the image you loaded or write a new one."
 msgstr ""
 
 #: src/using/fileformats.xml:432(term)
 #, fuzzy
-msgid "Use quality settings from original image"
-msgstr "使用原图像的品质设定(_U)"
+msgid "Advanced Options"
+msgstr "高级设置"
 
-#: src/using/fileformats.xml:436(para)
-msgid ""
-"If a particular quality setting (or <quote>quantization table</quote>) was "
-"attached to the image when it was loaded, then this option allows you to use "
-"them instead of the standard ones."
-msgstr ""
+#: src/using/fileformats.xml:434(para)
+#, fuzzy
+msgid "Some information about the advanced settings:"
+msgstr "选区到路径高级设置"
 
-#: src/using/fileformats.xml:442(para)
-msgid ""
-"If you have only made a few changes to the image, then re-using the same "
-"quality setting will give you almost the same quality and file size as the "
-"original image. This will minimize the losses caused by the quantization "
-"step, compared to what would happen if you used different quality setting."
-msgstr ""
+#: src/using/fileformats.xml:439(term)
+msgid "Optimize"
+msgstr "优化"
 
-#: src/using/fileformats.xml:450(para)
+#: src/using/fileformats.xml:441(para)
 msgid ""
-"If the quality setting found in the original file are not better than your "
-"default quality settings, then the option <quote>Use quality settings from "
-"original image</quote> will be available but not enabled. This ensures that "
-"you always get at least the minimum quality specified in your defaults. If "
-"you did not make major changes to the image and you want to save it using "
-"the same quality as the original, then you can do it by enabling this option."
+"If you enable this option, the optimization of entropy encoding parameters "
+"will be used. The result is typically a smaller file, but it takes more time "
+"to generate."
 msgstr ""
 
-#: src/using/fileformats.xml:463(term)
+#: src/using/fileformats.xml:449(term)
 msgid "Smoothing"
 msgstr "平滑"
 
-#: src/using/fileformats.xml:465(para)
+#: src/using/fileformats.xml:451(para)
 msgid ""
 "JPG compression creates artifacts. By using this option, you can smooth the "
 "image when saving, reducing them. But your image becomes somewhat blurred."
 msgstr ""
 
-#: src/using/fileformats.xml:473(term)
+#: src/using/fileformats.xml:459(term)
+msgid "Use arithmetic coding"
+msgstr ""
+
+#: src/using/fileformats.xml:461(para)
+msgid ""
+"<emphasis>Arithmetic encoding</emphasis> is a form of entropy encoding (a "
+"lossless data compression scheme) that, since GIMP-2.10 can be used in "
+"exporting as JPEG. Images using arithmetic encoding can be 5 - 10 % smaller. "
+"But older softwares may have trouble opening these images."
+msgstr ""
+
+#: src/using/fileformats.xml:471(term)
 #, fuzzy
-msgid "Restart markers"
+msgid "Use restart markers"
 msgstr "使用重新开始标记(_R)"
 
-#: src/using/fileformats.xml:475(para)
+#: src/using/fileformats.xml:473(para)
 msgid ""
 "The image file can include markers which allow the image to be loaded as "
 "segments. If a connection is broken while loading the image in a web page, "
 "loading can resume from the next marker."
 msgstr ""
 
-#: src/using/fileformats.xml:484(term)
+#: src/using/fileformats.xml:482(term)
+msgid "Interval (MCU rows)"
+msgstr ""
+
+#: src/using/fileformats.xml:484(para)
+msgid ""
+"JPEG images are stored as a series of compressed square tiles named MCU "
+"(Minimum Coding Unit). You can set the size of these tiles (in pixels)."
+msgstr ""
+
+#: src/using/fileformats.xml:492(term)
+msgid "Progressive"
+msgstr "渐进"
+
+#: src/using/fileformats.xml:494(para)
+msgid ""
+"With this option enabled, the image chunks are stored in the file in an "
+"order that allows progressive image refinement during a slow connection web "
+"download. The progressive option for JPG has the same purpose as the "
+"interlace option for GIF. Unfortunately, the progressive option produces "
+"slightly larger JPG files (than without the progressive option)."
+msgstr ""
+
+#: src/using/fileformats.xml:508(term)
 #, fuzzy
 msgid "Subsampling"
 msgstr "子采样(_B):"
 
-#: src/using/fileformats.xml:486(para)
+#: src/using/fileformats.xml:510(para)
 msgid ""
 "The human eye is not sensitive in the same way over the entire color "
 "spectrum. The compression can use this to treat slightly different colors "
@@ -6158,14 +6237,14 @@ msgid ""
 "available :"
 msgstr ""
 
-#: src/using/fileformats.xml:495(para)
+#: src/using/fileformats.xml:519(para)
 msgid ""
 "<guilabel>1x1,1x1,1x1 (best quality)</guilabel>: Commonly referred to as "
 "(4:4:4), this produces the best quality, preserving borders and contrasting "
 "colors, but compression is less."
 msgstr ""
 
-#: src/using/fileformats.xml:504(para)
+#: src/using/fileformats.xml:528(para)
 msgid ""
 "<guilabel>2x1,1x1,1x1 (4:2:2)</guilabel>: This is the standard subsampling, "
 "which usually provides a good ratio between image quality and file size. "
@@ -6175,26 +6254,26 @@ msgid ""
 "images with almost-flat colors."
 msgstr ""
 
-#: src/using/fileformats.xml:516(para)
+#: src/using/fileformats.xml:540(para)
 msgid ""
 "<guilabel>1x2,1x1,1x1</guilabel> This is similar to (2x1,1x1,1x1), but the "
 "chroma sampling is in the horizontal direction rather than the vertical "
 "direction; as if someone rotated an image."
 msgstr ""
 
-#: src/using/fileformats.xml:525(para)
+#: src/using/fileformats.xml:549(para)
 msgid ""
 "<guilabel>2x2,1x1,1x1 (smallest file)</guilabel>: Commonly referred to as "
 "(4:1:1), this produces the smallest files. This suits images with weak "
 "borders but tends to denature colors."
 msgstr ""
 
-#: src/using/fileformats.xml:536(term)
+#: src/using/fileformats.xml:560(term)
 #, fuzzy
 msgid "DCT Method"
 msgstr "_DCT 方法:"
 
-#: src/using/fileformats.xml:538(para)
+#: src/using/fileformats.xml:562(para)
 msgid ""
 "DCT is <quote>discrete cosine transform</quote>, and it is the first step in "
 "the JPEG algorithm going from the spatial to the frequency domain. The "
@@ -6202,7 +6281,7 @@ msgid ""
 "<quote>fast integer</quote>."
 msgstr ""
 
-#: src/using/fileformats.xml:547(para)
+#: src/using/fileformats.xml:571(para)
 msgid ""
 "<guilabel>float</guilabel>: The float method is very slightly more accurate "
 "than the integer method, but is much slower unless your machine has very "
@@ -6211,65 +6290,55 @@ msgid ""
 "should give the same results everywhere."
 msgstr ""
 
-#: src/using/fileformats.xml:558(para)
+#: src/using/fileformats.xml:582(para)
 msgid ""
 "<guilabel>integer</guilabel> (the default): This method is faster than "
 "<quote>float</quote>, but not as accurate."
 msgstr ""
 
-#: src/using/fileformats.xml:565(para)
+#: src/using/fileformats.xml:589(para)
 msgid ""
 "<guilabel>fast integer</guilabel>: The fast integer method is much less "
 "accurate than the other two."
 msgstr ""
 
-#: src/using/fileformats.xml:575(term)
-#, fuzzy
-msgid "Image comments"
-msgstr "保存注释(_N)"
-
-#: src/using/fileformats.xml:577(para)
-msgid ""
-"In this text box, you can enter a comment which is saved with the image."
-msgstr ""
-
-#: src/using/fileformats.xml:590(title) src/using/fileformats.xml:594(primary)
+#: src/using/fileformats.xml:605(title) src/using/fileformats.xml:609(primary)
 #, fuzzy
 msgid "Export Image as PNG"
 msgstr "图像导出为"
 
-#: src/using/fileformats.xml:591(anchor:xreflabel)
-#: src/using/fileformats.xml:592(anchor:xreflabel)
-#: src/using/fileformats.xml:597(primary)
-#: src/using/fileformats.xml:601(secondary)
+#: src/using/fileformats.xml:606(anchor:xreflabel)
+#: src/using/fileformats.xml:607(anchor:xreflabel)
+#: src/using/fileformats.xml:612(primary)
+#: src/using/fileformats.xml:616(secondary)
 msgid "PNG"
 msgstr "PNG"
 
-#: src/using/fileformats.xml:605(title)
+#: src/using/fileformats.xml:620(title)
 msgid "The <quote>Export Image as PNG</quote> dialog"
 msgstr ""
 
-#: src/using/fileformats.xml:615(term)
+#: src/using/fileformats.xml:630(term)
 #, fuzzy
 msgid "Interlacing"
 msgstr "交错"
 
-#: src/using/fileformats.xml:628(term)
+#: src/using/fileformats.xml:643(term)
 msgid "Save background color"
 msgstr "保存背景颜色"
 
-#: src/using/fileformats.xml:630(para)
+#: src/using/fileformats.xml:645(para)
 msgid ""
 "If your image has many transparency levels, the Internet browsers that "
 "recognize only two levels, will use the background color of your Toolbox "
-"instead. Internet Explorer up to version 6 did not use this information."
+"instead."
 msgstr ""
 
-#: src/using/fileformats.xml:639(term)
+#: src/using/fileformats.xml:653(term)
 msgid "Save gamma"
 msgstr "保存 Gamma"
 
-#: src/using/fileformats.xml:641(para)
+#: src/using/fileformats.xml:655(para)
 msgid ""
 "Gamma correction is the ability to correct for differences in how computers "
 "interpret color values. This saves gamma information in the PNG that "
@@ -6278,15 +6347,15 @@ msgid ""
 "too bright."
 msgstr ""
 
-#: src/using/fileformats.xml:652(term)
+#: src/using/fileformats.xml:666(term)
 #, fuzzy
 msgid "Save layer offset"
 msgstr "保存图层位移(_F)"
 
 #. Andrew Pitonyak (andrew pitonyak org)
-#. verified this with Alexia Death (alexiadeath gmail com)
-#. on August 17, 2009.
-#: src/using/fileformats.xml:657(para)
+#.             verified this with Alexia Death (alexiadeath gmail com)
+#.             on August 17, 2009.
+#: src/using/fileformats.xml:671(para)
 msgid ""
 "PNG supports an offset value called the <quote>oFFs chunk</quote>, which "
 "provides position data. Unfortunately, PNG offset support in <acronym>GIMP</"
@@ -6295,41 +6364,41 @@ msgid ""
 "acronym> flatten the layers before saving, and you will have no problems."
 msgstr ""
 
-#: src/using/fileformats.xml:670(term)
+#: src/using/fileformats.xml:684(term)
 #, fuzzy
 msgid "Save Resolution"
 msgstr "保存分辨率"
 
-#: src/using/fileformats.xml:672(para)
+#: src/using/fileformats.xml:686(para)
 msgid "Save the image resolution, in ppi (pixels per inch)."
 msgstr ""
 
-#: src/using/fileformats.xml:676(term)
+#: src/using/fileformats.xml:690(term)
 msgid "Save creation time"
 msgstr "保存创建时间"
 
-#: src/using/fileformats.xml:678(para)
+#: src/using/fileformats.xml:692(para)
 #, fuzzy
 msgid "Date the file was saved."
 msgstr "保存文件的路径。"
 
-#: src/using/fileformats.xml:684(term)
+#: src/using/fileformats.xml:698(term)
 #, fuzzy
 msgid "Save comment"
 msgstr "保存注释(_N)"
 
-#: src/using/fileformats.xml:686(para)
+#: src/using/fileformats.xml:700(para)
 msgid ""
 "You can read this comment in the <link linkend=\"gimp-image-properties"
 "\">Image Properties</link>."
 msgstr ""
 
-#: src/using/fileformats.xml:693(term) src/using/fileformats.xml:849(term)
+#: src/using/fileformats.xml:707(term) src/using/fileformats.xml:878(term)
 #, fuzzy
 msgid "Save color values from transparent pixels"
 msgstr "保存透明像素的颜色值(_V)"
 
-#: src/using/fileformats.xml:695(para)
+#: src/using/fileformats.xml:709(para)
 msgid ""
 "When this option is checked, the color values are saved even if the pixels "
 "are completely transparent. But this is possible only with a single layer, "
@@ -6338,12 +6407,21 @@ msgid ""
 "preserve the color values in the transparent pixels."
 msgstr ""
 
-#: src/using/fileformats.xml:706(term)
+#: src/using/fileformats.xml:720(term)
+#, fuzzy
+msgid "Pixelformat"
+msgstr "文件格式"
+
+#: src/using/fileformats.xml:722(para)
+msgid "TODO"
+msgstr ""
+
+#: src/using/fileformats.xml:726(term)
 #, fuzzy
 msgid "Compression level"
 msgstr "压缩级别"
 
-#: src/using/fileformats.xml:708(para)
+#: src/using/fileformats.xml:728(para)
 msgid ""
 "Since compression is not lossy, the only reason to use a compression level "
 "less than 9, is if it takes too long to compress a file on a slow computer. "
@@ -6351,25 +6429,31 @@ msgid ""
 "level."
 msgstr ""
 
-#: src/using/fileformats.xml:718(term)
+#: src/using/fileformats.xml:740(para)
+msgid ""
+"If the image you loaded has Exif, XMP, IPTC metadata, they are preserved, "
+"and you can keep them or not when exporting to PNG."
+msgstr ""
+
+#: src/using/fileformats.xml:747(term)
 #, fuzzy
 msgid "Save Defaults"
 msgstr "保存默认值(_A)"
 
-#: src/using/fileformats.xml:720(para)
+#: src/using/fileformats.xml:749(para)
 msgid ""
 "Click to save the current settings. Latter, you can use <guibutton>Load "
 "Defaults</guibutton> to load the saved settings."
 msgstr ""
 
-#: src/using/fileformats.xml:729(para)
+#: src/using/fileformats.xml:758(para)
 msgid ""
 "The PNG format supports indexed images. Using fewer colors, therefore, "
 "results in a smaller file; this is especially useful for creating web "
 "images; see <xref linkend=\"gimp-image-convert-indexed\"/>."
 msgstr ""
 
-#: src/using/fileformats.xml:735(para)
+#: src/using/fileformats.xml:764(para)
 msgid ""
 "Computers work on 8 bits blocks named <quote>Byte</quote>. A byte allows 256 "
 "colors. Reducing the number of colors below 256 is not useful: a byte will "
@@ -6378,46 +6462,37 @@ msgid ""
 "transparency levels are possible, transparent or opaque."
 msgstr ""
 
-#: src/using/fileformats.xml:743(para)
-msgid ""
-"If you want PNG transparency to be fully displayed by Internet Explorer, you "
-"can use the AlphaImageLoader DirectX filter in the code of your Web page. "
-"See Microsoft Knowledge Base <xref linkend=\"bibliography-online-microsoft-"
-"kb294714\"/>. Please note, that this is not necessary for InternetExplorer 7 "
-"and above."
-msgstr ""
-
-#: src/using/fileformats.xml:755(title) src/using/fileformats.xml:757(primary)
+#: src/using/fileformats.xml:776(title) src/using/fileformats.xml:778(primary)
 #, fuzzy
 msgid "Export Image as TIFF"
 msgstr "图像导出为"
 
-#: src/using/fileformats.xml:760(primary)
-#: src/using/fileformats.xml:764(secondary)
+#: src/using/fileformats.xml:781(primary)
+#: src/using/fileformats.xml:785(secondary)
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/using/fileformats.xml:767(title)
+#: src/using/fileformats.xml:788(title)
 #, fuzzy
 msgid "The TIFF Export dialog"
 msgstr "带我到导出对话框"
 
-#: src/using/fileformats.xml:777(term)
+#: src/using/fileformats.xml:798(term)
 msgid "Compression"
 msgstr "压缩方式"
 
-#: src/using/fileformats.xml:779(para)
+#: src/using/fileformats.xml:800(para)
 msgid ""
 "This option allows you to specify the algorithm used to compress the image."
 msgstr ""
 
-#: src/using/fileformats.xml:785(para)
+#: src/using/fileformats.xml:806(para)
 msgid ""
 "<guilabel>None</guilabel>: is fast, and lossless, but the resulting file is "
 "very large."
 msgstr ""
 
-#: src/using/fileformats.xml:791(para)
+#: src/using/fileformats.xml:812(para)
 msgid ""
 "<guilabel>LZW</guilabel>: The image is compressed using the <quote>Lempel-"
 "Ziv-Welch</quote> algorithm, a lossless compression technique. This is old, "
@@ -6425,7 +6500,7 @@ msgid ""
 "online-wkpd-lzw\"/>."
 msgstr ""
 
-#: src/using/fileformats.xml:800(para)
+#: src/using/fileformats.xml:821(para)
 msgid ""
 "<guilabel>Pack Bits</guilabel>: is a fast, simple compression scheme for run-"
 "length encoding of data. Apple introduced the PackBits format with the "
@@ -6434,7 +6509,7 @@ msgid ""
 "linkend=\"bibliography-online-wkpd-packbits\"/>)"
 msgstr ""
 
-#: src/using/fileformats.xml:811(para)
+#: src/using/fileformats.xml:832(para)
 msgid ""
 "<guilabel>Deflate</guilabel>: is a lossless data compression algorithm that "
 "uses a combination of the LZ77 algorithm and Huffman coding. It is also used "
@@ -6442,18 +6517,18 @@ msgid ""
 "online-wkpd-deflate\"/>."
 msgstr ""
 
-#: src/using/fileformats.xml:820(para)
+#: src/using/fileformats.xml:841(para)
 msgid ""
 "<guilabel>JPEG</guilabel>: is a very good compression algorithm but lossy."
 msgstr ""
 
-#: src/using/fileformats.xml:826(para)
+#: src/using/fileformats.xml:847(para)
 msgid ""
 "<guilabel>CCITT Group 3 fax</guilabel>; <guilabel>CCITT Group 4 fax</"
 "guilabel> is a black and white format developed to transfer images by FAX."
 msgstr ""
 
-#: src/using/fileformats.xml:832(para)
+#: src/using/fileformats.xml:853(para)
 msgid ""
 "These options can only be selected, if the image is in indexed mode and "
 "reduced to two colors. Use <menuchoice><guimenu>Image</"
@@ -6462,41 +6537,52 @@ msgid ""
 "black and white (1-bit) palette</quote>."
 msgstr ""
 
-#: src/using/fileformats.xml:851(para)
+#: src/using/fileformats.xml:870(term)
+#, fuzzy
+msgid "Save layers"
+msgstr "保存图层位移(_F)"
+
+#: src/using/fileformats.xml:872(para)
+msgid "Since GIMP-2.10.12, you can save layers when exporting to TIFF."
+msgstr ""
+
+#: src/using/fileformats.xml:880(para)
 msgid ""
 "With this option the color values are saved even if the pixels are "
 "completely transparent."
 msgstr ""
 
-#: src/using/fileformats.xml:858(term)
-msgid "Comment"
-msgstr "注释"
-
-#: src/using/fileformats.xml:860(para)
+#: src/using/fileformats.xml:889(para)
 msgid ""
 "In this text box, you can enter a comment that is associated with the image."
 msgstr ""
 
-#: src/using/fileformats.xml:870(title) src/using/fileformats.xml:872(primary)
+#: src/using/fileformats.xml:898(para)
+msgid ""
+"If the image you loaded has Exif, XMP, IPTC metadata, they are preserved, "
+"and you can keep them or not when exporting to TIFF."
+msgstr ""
+
+#: src/using/fileformats.xml:908(title) src/using/fileformats.xml:910(primary)
 #, fuzzy
 msgid "Export Image as MNG"
 msgstr "图像导出为"
 
-#: src/using/fileformats.xml:875(primary)
-#: src/using/fileformats.xml:879(secondary)
+#: src/using/fileformats.xml:913(primary)
+#: src/using/fileformats.xml:917(secondary)
 msgid "MNG"
 msgstr "MNG"
 
-#: src/using/fileformats.xml:882(title)
+#: src/using/fileformats.xml:920(title)
 #, fuzzy
 msgid "Export MNG File Dialog"
 msgstr "导出文件"
 
-#: src/using/fileformats.xml:890(para)
+#: src/using/fileformats.xml:928(para)
 msgid "MNG is acronym for <quote>Multiple-Image Network Graphics</quote>."
 msgstr ""
 
-#: src/using/fileformats.xml:893(para)
+#: src/using/fileformats.xml:931(para)
 msgid ""
 "The main problem is that Konqueror is the only Web navigator that recognizes "
 "the MNG animation format. Please see <ulink url=\"http://en.wikipedia.org/";
@@ -6523,12 +6609,15 @@ msgstr ""
 #: src/using/customize-splashscreen.xml:28(para)
 msgid ""
 "Of course, you can customize the splash-screen: Create a <filename class="
-"\"directory\">splashes</filename> directory in your in your personal "
-"<acronym>GIMP</acronym> folder (<filename class=\"directory\">/home/"
-"user_name/.gimp-2.8</filename> on Linux, <filename class=\"directory\" role="
-"\"html\">C:\\Documents&nbsp;and&nbsp;Settings\\user_name\\.gimp-2.8\\</"
-"filename><filename class=\"directory\" role=\"tex\">C:\\\\Documents&nbsp;"
-"and&nbsp;Settings\\\\user_name\\\\.gimp-2.8\\\\</filename> on Windows)."
+"\"directory\">splashes</filename> directory in your personal <acronym>GIMP</"
+"acronym> folder (<filename class=\"directory\">/home/user_name/.config/"
+"GIMP/2.10/</filename> on Linux, <filename class=\"directory\" role=\"html"
+"\">C:\\Documents&nbsp;and&nbsp;Settings\\user_name\\AppData\\Roaming\\GIMP"
+"\\2.10\\</filename><filename class=\"directory\" role=\"tex\">C:\\"
+"\\Documents&nbsp;and&nbsp;Settings\\\\user_name\\\\AppData\\\\Roaming\\\\GIMP"
+"\\\\2.10\\\\</filename> on Windows, <filename class=\"directory\" role=\"tex"
+"\">/Users/user_name/Library/Application&nbsp;Support/GIMP/2.10/</filename> "
+"on MacOS)."
 msgstr ""
 
 #: src/using/customize-splashscreen.xml:40(para)
@@ -6544,23 +6633,29 @@ 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/using/brushes.xml:60(None)
+#: src/using/brushes.xml:65(None)
 msgid ""
 "@@image: 'images/using/file-gbr-save.png'; "
 "md5=9dc83346c647c95e74234f0d30fdd263"
 msgstr ""
 
-#: src/using/brushes.xml:10(title)
+#: src/using/brushes.xml:8(title)
 #, fuzzy
 msgid "Adding New Brushes"
 msgstr "新建笔刷(_N)"
 
-#: src/using/brushes.xml:13(secondary)
+#: src/using/brushes.xml:11(secondary)
 #, fuzzy
 msgid "Add New"
 msgstr "新增"
 
-#: src/using/brushes.xml:16(para)
+#: src/using/brushes.xml:15(para)
+msgid ""
+"There is a quick method to add a new brush: <xref linkend=\"gimp-creating-"
+"brush-quickly\"/>."
+msgstr ""
+
+#: src/using/brushes.xml:21(para)
 msgid ""
 "To add a new brush, after either creating or downloading it, you need to "
 "save it in a format GIMP can use. The brush file needs to be placed in the "
@@ -6570,16 +6665,16 @@ msgid ""
 "brushes:"
 msgstr ""
 
-#: src/using/brushes.xml:28(secondary)
+#: src/using/brushes.xml:33(secondary)
 msgid "File formats"
 msgstr "文件格式"
 
-#: src/using/brushes.xml:31(term) src/using/brushes.xml:34(primary)
-#: src/using/brushes.xml:38(secondary)
+#: src/using/brushes.xml:36(term) src/using/brushes.xml:39(primary)
+#: src/using/brushes.xml:43(secondary)
 msgid "GBR"
 msgstr "RGB"
 
-#: src/using/brushes.xml:40(para)
+#: src/using/brushes.xml:45(para)
 msgid ""
 "The <filename>.gbr</filename> (\"<emphasis>g</emphasis>imp <emphasis>br</"
 "emphasis>ush\") format is used for ordinary and color brushes. You can "
@@ -6592,16 +6687,16 @@ msgid ""
 "directory of the GIMP source distribution."
 msgstr ""
 
-#: src/using/brushes.xml:54(title)
+#: src/using/brushes.xml:59(title)
 msgid "Save a <filename class=\"extension\">.gbr</filename> brush"
 msgstr ""
 
-#: src/using/brushes.xml:67(term) src/using/brushes.xml:70(primary)
-#: src/using/brushes.xml:74(secondary)
+#: src/using/brushes.xml:72(term) src/using/brushes.xml:75(primary)
+#: src/using/brushes.xml:79(secondary)
 msgid "GIH"
 msgstr "GIF"
 
-#: src/using/brushes.xml:76(para)
+#: src/using/brushes.xml:81(para)
 msgid ""
 "The <filename>.gih</filename> (\"<emphasis>g</emphasis>imp <emphasis>i</"
 "emphasis>mage <emphasis>h</emphasis>ose\") format is used for animated "
@@ -6616,19 +6711,30 @@ msgid ""
 "distribution."
 msgstr ""
 
-#: src/using/brushes.xml:94(term) src/using/brushes.xml:97(primary)
-#: src/using/brushes.xml:101(secondary)
+#: src/using/brushes.xml:99(term) src/using/brushes.xml:102(primary)
+#: src/using/brushes.xml:106(secondary)
 msgid "VBR"
 msgstr ""
 
-#: src/using/brushes.xml:103(para)
+#: src/using/brushes.xml:108(para)
 msgid ""
 "The <filename>.vbr</filename> format is used for parametric brushes, i. e., "
 "brushes created using the Brush Editor. There is really no other meaningful "
 "way of obtaining files in this format."
 msgstr ""
 
-#: src/using/brushes.xml:112(para)
+#: src/using/brushes.xml:117(term) src/using/brushes.xml:120(primary)
+#: src/using/brushes.xml:124(secondary)
+msgid "MYB"
+msgstr ""
+
+#: src/using/brushes.xml:126(para)
+msgid ""
+"The <filename>.myb</filename> format is used for MyPaint brushes. Please "
+"refer to <xref linkend=\"gimp-tool-mypaint-brush\"/> for more information."
+msgstr ""
+
+#: src/using/brushes.xml:134(para)
 msgid ""
 "To make a brush available, place it in one of the folders in GIMP's brush "
 "search path. By default, the brush search path includes two folders, the "
@@ -6642,13 +6748,13 @@ msgid ""
 "the Brushes dialog."
 msgstr ""
 
-#: src/using/brushes.xml:125(para)
+#: src/using/brushes.xml:147(para)
 msgid ""
 "When you create a new parametric brush using the Brush Editor, it is "
 "automatically saved in your personal <filename>brushes</filename> folder."
 msgstr ""
 
-#: src/using/brushes.xml:131(para)
+#: src/using/brushes.xml:153(para)
 msgid ""
 "There are a number of web sites with downloadable collections of GIMP "
 "brushes. Rather than supplying a list of links that will soon be out of "
@@ -7268,3 +7374,19 @@ msgstr ""
 #: src/using/animated-brushes.xml:0(None)
 msgid "translator-credits"
 msgstr "gmsft <27tower gmail com>,2016"
+
+#, fuzzy
+#~ msgid "Save EXIF data"
+#~ msgstr "保存 _XMP 数据"
+
+#, fuzzy
+#~ msgid "Save thumbnail"
+#~ msgstr "保存缩略图(_T)"
+
+#, fuzzy
+#~ msgid "Save XMP data"
+#~ msgstr "保存 _XMP 数据"
+
+#, fuzzy
+#~ msgid "Image comments"
+#~ msgstr "保存注释(_N)"


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