[gimp] Updated Traditional Chinese translation(Hong Kong and Taiwan)

From: Chao-Hsiung Liao <chliao src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp] Updated Traditional Chinese translation(Hong Kong and Taiwan)
Date: Sat, 1 Jan 2011 11:47:52 +0000 (UTC)
commit 386695fdf48560e3802448493f0d8752d6f46cb5
Author: Tryneeds-Chinese <tryneeds gmail com>
Date:   Sat Jan 1 19:47:51 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po-libgimp/zh_HK.po   |   42 +-
 po-libgimp/zh_TW.po   |   40 +-
 po-plug-ins/zh_HK.po  | 1060 ++++++++--------
 po-plug-ins/zh_TW.po  | 1056 ++++++++--------
 po-python/zh_HK.po    |   24 +-
 po-python/zh_TW.po    |   22 +-
 po-script-fu/zh_HK.po |   32 +-
 po-script-fu/zh_TW.po |   30 +-
 po-tags/zh_HK.po      |    4 +-
 po-tags/zh_TW.po      |    2 +-
 po/zh_HK.po           | 3196 ++++++++++++++++++++++++----------------------
 po/zh_TW.po           | 3406 ++++++++++++++++++++++++++-----------------------
 12 files changed, 4608 insertions(+), 4306 deletions(-)
---
diff --git a/po-libgimp/zh_HK.po b/po-libgimp/zh_HK.po
index 425a11c..9b58e5b 100644
--- a/po-libgimp/zh_HK.po
+++ b/po-libgimp/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-libgimp 2.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 19:47+0800\n"
-"PO-Revision-Date: 2010-10-30 19:47+0800\n"
+"POT-Creation-Date: 2011-01-01 19:42+0800\n"
+"PO-Revision-Date: 2011-01-01 19:42+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -275,7 +275,7 @@ msgstr "æ²?æ??ç¬¦å??ç??"
 
 #: ../libgimp/gimpprocbrowserdialog.c:397
 msgid "Search term invalid or incomplete"
-msgstr ""
+msgstr "ç?¡æ??æ??ä¸?å®?æ?´ç??æ??ç´¢å?è©?"
 
 #: ../libgimp/gimpprocbrowserdialog.c:406
 msgid "Searching"
@@ -390,28 +390,24 @@ msgid "C_hannel"
 msgstr "è?²ç??(_H)"
 
 #: ../libgimpbase/gimpbaseenums.c:65
-#, fuzzy
 msgctxt "blend-mode"
 msgid "FG to BG (RGB)"
 msgstr "å??æ?¯è?²è?³è??æ?¯è?²(RGB)"
 
 #: ../libgimpbase/gimpbaseenums.c:66
-#, fuzzy
 msgctxt "blend-mode"
 msgid "FG to BG (HSV)"
-msgstr "å??æ?¯è?²è?³è??æ?¯è?²(HSV é??æ??é??)"
+msgstr "å??æ?¯è?²è?³è??æ?¯è?²(HSV)"
 
 #: ../libgimpbase/gimpbaseenums.c:67
-#, fuzzy
 msgctxt "blend-mode"
 msgid "FG to transparent"
 msgstr "å??æ?¯è?²è?³é??æ??"
 
 #: ../libgimpbase/gimpbaseenums.c:68
-#, fuzzy
 msgctxt "blend-mode"
 msgid "Custom gradient"
-msgstr "äº?ä»¶æ¼¸è®?è?²æ??æ??"
+msgstr "è?ªå®?ç¾©æ¼¸è®?è?²"
 
 #: ../libgimpbase/gimpbaseenums.c:98
 msgctxt "bucket-fill-mode"
@@ -1192,11 +1188,11 @@ msgstr "ç¶²é ?æ¨?è¨?(_N):"
 
 #: ../libgimpwidgets/gimpfileentry.c:197
 msgid "Open a file selector to browse your folders"
-msgstr ""
+msgstr "æ??é??ä¸?å??æª?æ¡?é?¸å??å?¨ä¾?ç??è¦½ä½ ç??è³?æ??å¤¾ "
 
 #: ../libgimpwidgets/gimpfileentry.c:198
 msgid "Open a file selector to browse your files"
-msgstr ""
+msgstr "æ??é??ä¸?å??æª?æ¡?é?¸å??å?¨ä¾?ç??è¦½ä½ ç??æª?æ¡?"
 
 #: ../libgimpwidgets/gimpfileentry.c:358
 msgid "Select Folder"
@@ -1353,40 +1349,40 @@ msgstr "è¡?è·?(_I)"
 msgid "_Resize"
 msgstr "èª¿æ?´å°ºå¯¸(_R)"
 
-#: ../libgimpwidgets/gimpstock.c:205 ../libgimpwidgets/gimpstock.c:339
+#: ../libgimpwidgets/gimpstock.c:205 ../libgimpwidgets/gimpstock.c:340
 msgid "_Scale"
 msgstr "ç¸®æ?¾(_S)"
 
-#: ../libgimpwidgets/gimpstock.c:314
+#: ../libgimpwidgets/gimpstock.c:315
 #, fuzzy
 msgid "Cr_op"
 msgstr "é??æ??åº¦(_A)ï¼?"
 
-#: ../libgimpwidgets/gimpstock.c:334
+#: ../libgimpwidgets/gimpstock.c:335
 msgid "_Transform"
 msgstr "è®?æ??(_T)"
 
-#: ../libgimpwidgets/gimpstock.c:338
+#: ../libgimpwidgets/gimpstock.c:339
 msgid "_Rotate"
 msgstr "æ??è½?(_R)"
 
-#: ../libgimpwidgets/gimpstock.c:340
+#: ../libgimpwidgets/gimpstock.c:341
 msgid "_Shear"
 msgstr "æ?¨ç§»(_S)"
 
-#: ../libgimpwidgets/gimpunitmenu.c:290
+#: ../libgimpwidgets/gimpunitmenu.c:261
 msgid "More..."
 msgstr "å?¶å®?..."
 
-#: ../libgimpwidgets/gimpunitmenu.c:605
+#: ../libgimpwidgets/gimpunitmenu.c:487
 msgid "Unit Selection"
 msgstr "é?¸æ??å?®ä½?"
 
-#: ../libgimpwidgets/gimpunitmenu.c:654
+#: ../libgimpwidgets/gimpunitmenu.c:536
 msgid "Unit"
 msgstr "å?®ä½?"
 
-#: ../libgimpwidgets/gimpunitmenu.c:658
+#: ../libgimpwidgets/gimpunitmenu.c:540
 msgid "Factor"
 msgstr "æ¯?ä¾?"
 
@@ -1604,7 +1600,7 @@ msgstr "é»?è?² joker"
 
 #: ../modules/color-selector-cmyk.c:188
 msgid "The percentage of black to pull out of the colored inks."
-msgstr ""
+msgstr "æ?½å?ºä¾?ç??å½©è?²æ²¹å¢¨ä¸é»?è?²ç??ç?¾å??æ¯?ã??"
 
 #: ../modules/color-selector-water.c:81
 msgid "Watercolor style color selector"
@@ -1618,12 +1614,12 @@ msgstr "æ°´å½©"
 msgid "Pressure"
 msgstr "å£?å??"
 
-#: ../modules/color-selector-wheel.c:74
+#: ../modules/color-selector-wheel.c:71
 #, fuzzy
 msgid "HSV color wheel"
 msgstr "è?²ç?¸ç?°ç??ä½?ç½®ã??"
 
-#: ../modules/color-selector-wheel.c:105
+#: ../modules/color-selector-wheel.c:102
 msgid "Wheel"
 msgstr "è?²ç?°"
 
diff --git a/po-libgimp/zh_TW.po b/po-libgimp/zh_TW.po
index 8f3f67b..b984841 100644
--- a/po-libgimp/zh_TW.po
+++ b/po-libgimp/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-libgimp 2.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 19:47+0800\n"
+"POT-Creation-Date: 2011-01-01 19:42+0800\n"
 "PO-Revision-Date: 2010-10-04 19:57+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional) <community linuxhall org>\n"
@@ -275,7 +275,7 @@ msgstr "æ²?æ??ç¬¦å??ç??"
 
 #: ../libgimp/gimpprocbrowserdialog.c:397
 msgid "Search term invalid or incomplete"
-msgstr ""
+msgstr "ç?¡æ??æ??ä¸?å®?æ?´ç??æ??ç´¢å?è©?"
 
 #: ../libgimp/gimpprocbrowserdialog.c:406
 msgid "Searching"
@@ -390,28 +390,24 @@ msgid "C_hannel"
 msgstr "è?²ç??(_H)"
 
 #: ../libgimpbase/gimpbaseenums.c:65
-#, fuzzy
 msgctxt "blend-mode"
 msgid "FG to BG (RGB)"
 msgstr "å??æ?¯è?²è?³è??æ?¯è?²(RGB)"
 
 #: ../libgimpbase/gimpbaseenums.c:66
-#, fuzzy
 msgctxt "blend-mode"
 msgid "FG to BG (HSV)"
-msgstr "å??æ?¯è?²è?³è??æ?¯è?²(HSV é??æ??é??)"
+msgstr "å??æ?¯è?²è?³è??æ?¯è?²(HSV)"
 
 #: ../libgimpbase/gimpbaseenums.c:67
-#, fuzzy
 msgctxt "blend-mode"
 msgid "FG to transparent"
 msgstr "å??æ?¯è?²è?³é??æ??"
 
 #: ../libgimpbase/gimpbaseenums.c:68
-#, fuzzy
 msgctxt "blend-mode"
 msgid "Custom gradient"
-msgstr "äº?ä»¶æ¼¸å±¤æ??æ??"
+msgstr "è?ªå®?ç¾©æ¼¸å±¤"
 
 #: ../libgimpbase/gimpbaseenums.c:98
 msgctxt "bucket-fill-mode"
@@ -1194,11 +1190,11 @@ msgstr "ç¶²é ?æ¨?è¨?(_N):"
 
 #: ../libgimpwidgets/gimpfileentry.c:197
 msgid "Open a file selector to browse your folders"
-msgstr ""
+msgstr "æ??é??ä¸?å??æª?æ¡?é?¸å??å?¨ä¾?ç??è¦½æ?¨ç??è³?æ??å¤¾ "
 
 #: ../libgimpwidgets/gimpfileentry.c:198
 msgid "Open a file selector to browse your files"
-msgstr ""
+msgstr "æ??é??ä¸?å??æª?æ¡?é?¸å??å?¨ä¾?ç??è¦½æ?¨ç??æª?æ¡?"
 
 #: ../libgimpwidgets/gimpfileentry.c:358
 msgid "Select Folder"
@@ -1355,40 +1351,40 @@ msgstr "è¡?è·?(_I)"
 msgid "_Resize"
 msgstr "èª¿æ?´å°ºå¯¸(_R)"
 
-#: ../libgimpwidgets/gimpstock.c:205 ../libgimpwidgets/gimpstock.c:339
+#: ../libgimpwidgets/gimpstock.c:205 ../libgimpwidgets/gimpstock.c:340
 msgid "_Scale"
 msgstr "ç¸®æ?¾(_S)"
 
-#: ../libgimpwidgets/gimpstock.c:314
+#: ../libgimpwidgets/gimpstock.c:315
 #, fuzzy
 msgid "Cr_op"
 msgstr "é??æ??åº¦(_A)ï¼?"
 
-#: ../libgimpwidgets/gimpstock.c:334
+#: ../libgimpwidgets/gimpstock.c:335
 msgid "_Transform"
 msgstr "è®?æ??(_T)"
 
-#: ../libgimpwidgets/gimpstock.c:338
+#: ../libgimpwidgets/gimpstock.c:339
 msgid "_Rotate"
 msgstr "æ??è½?(_R)"
 
-#: ../libgimpwidgets/gimpstock.c:340
+#: ../libgimpwidgets/gimpstock.c:341
 msgid "_Shear"
 msgstr "æ?¨ç§»(_S)"
 
-#: ../libgimpwidgets/gimpunitmenu.c:290
+#: ../libgimpwidgets/gimpunitmenu.c:261
 msgid "More..."
 msgstr "å?¶å®?..."
 
-#: ../libgimpwidgets/gimpunitmenu.c:605
+#: ../libgimpwidgets/gimpunitmenu.c:487
 msgid "Unit Selection"
 msgstr "é?¸æ??å?®ä½?"
 
-#: ../libgimpwidgets/gimpunitmenu.c:654
+#: ../libgimpwidgets/gimpunitmenu.c:536
 msgid "Unit"
 msgstr "å?®ä½?"
 
-#: ../libgimpwidgets/gimpunitmenu.c:658
+#: ../libgimpwidgets/gimpunitmenu.c:540
 msgid "Factor"
 msgstr "æ¯?ä¾?"
 
@@ -1607,7 +1603,7 @@ msgstr "é»?è?² joker"
 
 #: ../modules/color-selector-cmyk.c:188
 msgid "The percentage of black to pull out of the colored inks."
-msgstr ""
+msgstr "æ?½å?ºä¾?ç??å½©è?²æ²¹å¢¨ä¸é»?è?²ç??ç?¾å??æ¯?ã??"
 
 #: ../modules/color-selector-water.c:81
 msgid "Watercolor style color selector"
@@ -1621,12 +1617,12 @@ msgstr "æ°´å½©"
 msgid "Pressure"
 msgstr "å£?å??"
 
-#: ../modules/color-selector-wheel.c:74
+#: ../modules/color-selector-wheel.c:71
 #, fuzzy
 msgid "HSV color wheel"
 msgstr "è?²ç?¸ç?°ç??ä½?ç½®ã??"
 
-#: ../modules/color-selector-wheel.c:105
+#: ../modules/color-selector-wheel.c:102
 msgid "Wheel"
 msgstr "è?²ç?°"
 
diff --git a/po-plug-ins/zh_HK.po b/po-plug-ins/zh_HK.po
index 09f69da..cddffed 100644
--- a/po-plug-ins/zh_HK.po
+++ b/po-plug-ins/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-std-plug-ins 2.1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 19:45+0800\n"
-"PO-Revision-Date: 2010-10-30 19:45+0800\n"
+"POT-Creation-Date: 2011-01-01 19:43+0800\n"
+"PO-Revision-Date: 2011-01-01 19:43+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -62,16 +62,14 @@ msgid "To:"
 msgstr "å?°ï¼?"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:375
-#, fuzzy
 msgctxt "color-rotate"
 msgid "From:"
-msgstr "å¯?ä»¶è??:"
+msgstr "å¾?ï¼?"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:376
-#, fuzzy
 msgctxt "color-rotate"
 msgid "To:"
-msgstr "å?°:"
+msgstr "å?°ï¼?"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:416
 #: ../plug-ins/common/file-ps.c:3228 ../plug-ins/imagemap/imap_menu.c:213
@@ -306,7 +304,7 @@ msgstr "å°?é½?å?¯è¦?å??å±¤"
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:998
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1039
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1080
-#: ../plug-ins/lighting/lighting-ui.c:415
+#: ../plug-ins/lighting/lighting-ui.c:414
 #: ../plug-ins/print/print-page-layout.c:461
 msgid "None"
 msgstr "ç?¡"
@@ -559,7 +557,7 @@ msgstr "ç?«å¸?æ??æ??"
 #. radio buttons for choosing LEFT or RIGHT
 #. *************************************************
 #: ../plug-ins/common/apply-canvas.c:1292 ../plug-ins/common/wind.c:945
-#: ../plug-ins/lighting/lighting-ui.c:517
+#: ../plug-ins/lighting/lighting-ui.c:516
 msgid "Direction"
 msgstr "æ?¹å??"
 
@@ -603,16 +601,16 @@ msgid "Blinds"
 msgstr "ç?¾è??çª?"
 
 #. Orientation toggle box
-#: ../plug-ins/common/blinds.c:257 ../plug-ins/common/ripple.c:554
+#: ../plug-ins/common/blinds.c:257 ../plug-ins/common/ripple.c:556
 msgid "Orientation"
 msgstr "æ?¹å??"
 
-#: ../plug-ins/common/blinds.c:261 ../plug-ins/common/ripple.c:558
+#: ../plug-ins/common/blinds.c:261 ../plug-ins/common/ripple.c:560
 #: ../plug-ins/common/tile-small.c:432 ../plug-ins/pagecurl/pagecurl.c:533
 msgid "_Horizontal"
 msgstr "æ°´å¹³(_H)"
 
-#: ../plug-ins/common/blinds.c:264 ../plug-ins/common/ripple.c:561
+#: ../plug-ins/common/blinds.c:264 ../plug-ins/common/ripple.c:563
 #: ../plug-ins/common/tile-small.c:442 ../plug-ins/pagecurl/pagecurl.c:532
 msgid "_Vertical"
 msgstr "å??ç?´(_V)"
@@ -621,21 +619,21 @@ msgstr "å??ç?´(_V)"
 #. * Create the "background" layer to hold the image...
 #.
 #: ../plug-ins/common/blinds.c:278 ../plug-ins/common/compose.c:934
-#: ../plug-ins/common/decompose.c:725 ../plug-ins/common/file-cel.c:361
-#: ../plug-ins/common/file-cel.c:364 ../plug-ins/common/file-dicom.c:609
+#: ../plug-ins/common/decompose.c:725 ../plug-ins/common/file-cel.c:362
+#: ../plug-ins/common/file-cel.c:365 ../plug-ins/common/file-dicom.c:613
 #: ../plug-ins/common/file-gif-load.c:927
-#: ../plug-ins/common/file-jp2-load.c:357 ../plug-ins/common/file-pcx.c:418
-#: ../plug-ins/common/file-pcx.c:424 ../plug-ins/common/file-pix.c:381
+#: ../plug-ins/common/file-jp2-load.c:357 ../plug-ins/common/file-pcx.c:424
+#: ../plug-ins/common/file-pcx.c:430 ../plug-ins/common/file-pix.c:381
 #: ../plug-ins/common/file-png.c:851 ../plug-ins/common/file-pnm.c:584
-#: ../plug-ins/common/file-raw.c:761 ../plug-ins/common/file-sunras.c:974
+#: ../plug-ins/common/file-raw.c:761 ../plug-ins/common/file-sunras.c:975
 #: ../plug-ins/common/file-tga.c:1063 ../plug-ins/common/file-tiff-load.c:998
 #: ../plug-ins/common/file-xbm.c:896 ../plug-ins/common/film.c:745
 #: ../plug-ins/common/smooth-palette.c:256 ../plug-ins/common/tile.c:266
-#: ../plug-ins/file-bmp/bmp-read.c:381 ../plug-ins/file-bmp/bmp-read.c:648
+#: ../plug-ins/file-bmp/bmp-read.c:382 ../plug-ins/file-bmp/bmp-read.c:649
 #: ../plug-ins/file-faxg3/faxg3.c:477 ../plug-ins/file-fits/fits.c:529
 #: ../plug-ins/file-jpeg/jpeg-load.c:248 ../plug-ins/file-jpeg/jpeg-load.c:760
-#: ../plug-ins/file-psd/psd-image-res-load.c:994
-#: ../plug-ins/file-psd/psd-load.c:1575 ../plug-ins/file-sgi/sgi.c:406
+#: ../plug-ins/file-psd/psd-image-res-load.c:997
+#: ../plug-ins/file-psd/psd-load.c:1576 ../plug-ins/file-sgi/sgi.c:406
 #: ../plug-ins/gfig/gfig-dialog.c:1284
 #: ../plug-ins/gimpressionist/general.c:139 ../plug-ins/twain/twain.c:567
 #: ../plug-ins/win-snap/winsnap.c:1155
@@ -742,63 +740,63 @@ msgstr "å??æ??æ¨¡ç³?å??(_M)..."
 msgid "Motion blurring"
 msgstr "å??æ??æ¨¡ç³?"
 
-#: ../plug-ins/common/blur-motion.c:1011
+#: ../plug-ins/common/blur-motion.c:1013
 msgid "Motion Blur"
 msgstr "å??æ??æ¨¡ç³?å??"
 
-#: ../plug-ins/common/blur-motion.c:1045
+#: ../plug-ins/common/blur-motion.c:1047
 msgid "Blur Type"
 msgstr "æ¨¡ç³?æ?¹å¼?"
 
-#: ../plug-ins/common/blur-motion.c:1049
+#: ../plug-ins/common/blur-motion.c:1051
 msgctxt "blur-type"
 msgid "_Linear"
 msgstr "ç·?æ?§(_L)"
 
-#: ../plug-ins/common/blur-motion.c:1050
+#: ../plug-ins/common/blur-motion.c:1052
 msgctxt "blur-type"
 msgid "_Radial"
-msgstr "æ?¾å°?ç??(_R)"
+msgstr "æ??è½?(_R)"
 
-#: ../plug-ins/common/blur-motion.c:1051
+#: ../plug-ins/common/blur-motion.c:1053
 msgctxt "blur-type"
 msgid "_Zoom"
 msgstr "ç¸®æ?¾(_Z)"
 
-#: ../plug-ins/common/blur-motion.c:1058
+#: ../plug-ins/common/blur-motion.c:1060
 msgid "Blur Center"
 msgstr "æ¨¡ç³?ä¸å¿?"
 
-#: ../plug-ins/common/blur-motion.c:1094 ../plug-ins/common/lens-flare.c:762
+#: ../plug-ins/common/blur-motion.c:1096 ../plug-ins/common/lens-flare.c:762
 #: ../plug-ins/common/nova.c:453 ../plug-ins/common/tile-paper.c:282
 #: ../plug-ins/flame/flame.c:1248
 #: ../plug-ins/gradient-flare/gradient-flare.c:2724
-#: ../plug-ins/lighting/lighting-ui.c:476
+#: ../plug-ins/lighting/lighting-ui.c:475
 msgid "_X:"
 msgstr "_Xï¼?"
 
-#: ../plug-ins/common/blur-motion.c:1099 ../plug-ins/common/lens-flare.c:767
+#: ../plug-ins/common/blur-motion.c:1101 ../plug-ins/common/lens-flare.c:767
 #: ../plug-ins/common/nova.c:458 ../plug-ins/common/tile-paper.c:291
 #: ../plug-ins/flame/flame.c:1262
 #: ../plug-ins/gradient-flare/gradient-flare.c:2728
-#: ../plug-ins/lighting/lighting-ui.c:491
+#: ../plug-ins/lighting/lighting-ui.c:490
 msgid "_Y:"
 msgstr "_Yï¼?"
 
-#: ../plug-ins/common/blur-motion.c:1101
+#: ../plug-ins/common/blur-motion.c:1103
 msgid "Blur _outward"
 msgstr "å??å¤?æ¨¡ç³?(_O)"
 
-#: ../plug-ins/common/blur-motion.c:1114
+#: ../plug-ins/common/blur-motion.c:1116
 msgid "Blur Parameters"
 msgstr "æ¨¡ç³?å??æ?¸"
 
-#: ../plug-ins/common/blur-motion.c:1125
+#: ../plug-ins/common/blur-motion.c:1127
 #: ../plug-ins/map-object/map-object-ui.c:1252
 msgid "L_ength:"
 msgstr "é?·åº¦(_E)ï¼?"
 
-#: ../plug-ins/common/blur-motion.c:1138 ../plug-ins/common/newsprint.c:991
+#: ../plug-ins/common/blur-motion.c:1140 ../plug-ins/common/newsprint.c:991
 msgid "_Angle:"
 msgstr "è§?åº¦(_A)ï¼?"
 
@@ -870,17 +868,17 @@ msgstr "å?¹å?¸è²¼å??(_B):"
 
 #. Map type menu
 #: ../plug-ins/common/bump-map.c:835 ../plug-ins/flame/flame.c:745
-#: ../plug-ins/lighting/lighting-ui.c:841
+#: ../plug-ins/lighting/lighting-ui.c:840
 msgid "Linear"
 msgstr "ç·?æ?§"
 
 #: ../plug-ins/common/bump-map.c:836 ../plug-ins/flame/flame.c:747
-#: ../plug-ins/lighting/lighting-ui.c:844
+#: ../plug-ins/lighting/lighting-ui.c:843
 msgid "Spherical"
 msgstr "ç??å½¢"
 
 #: ../plug-ins/common/bump-map.c:837 ../plug-ins/flame/flame.c:746
-#: ../plug-ins/lighting/lighting-ui.c:843
+#: ../plug-ins/lighting/lighting-ui.c:842
 msgid "Sinusoidal"
 msgstr "å¼¦æ³¢"
 
@@ -955,7 +953,7 @@ msgstr "é»?è?²ç?¾å??æ¯?(_P)ï¼?"
 
 #: ../plug-ins/common/channel-mixer.c:174
 msgid "Alter colors by mixing RGB Channels"
-msgstr "æ··å?? RGB é??é??ä»¥è®?æ??é¡?è?²"
+msgstr "æ··å?? RGB è?²ç??ä»¥è®?æ??é¡?è?²"
 
 #: ../plug-ins/common/channel-mixer.c:179
 msgid "Channel Mi_xer..."
@@ -1029,23 +1027,23 @@ msgstr "è¼?å?¥è?²ç??æ··å??å?¨è¨å®?"
 
 #. stat error (file does not exist)
 #: ../plug-ins/common/channel-mixer.c:982
-#: ../plug-ins/common/cml-explorer.c:2177 ../plug-ins/common/curve-bend.c:891
+#: ../plug-ins/common/cml-explorer.c:2207 ../plug-ins/common/curve-bend.c:891
 #: ../plug-ins/common/file-cel.c:311 ../plug-ins/common/file-compressor.c:497
-#: ../plug-ins/common/file-compressor.c:665
+#: ../plug-ins/common/file-compressor.c:666
 #: ../plug-ins/common/file-dicom.c:339 ../plug-ins/common/file-gbr.c:367
-#: ../plug-ins/common/file-gif-load.c:355 ../plug-ins/common/file-gih.c:643
+#: ../plug-ins/common/file-gif-load.c:355 ../plug-ins/common/file-gih.c:644
 #: ../plug-ins/common/file-jp2-load.c:197
 #: ../plug-ins/common/file-jp2-load.c:206 ../plug-ins/common/file-mng.c:1107
 #: ../plug-ins/common/file-pat.c:336 ../plug-ins/common/file-pcx.c:360
 #: ../plug-ins/common/file-pix.c:342 ../plug-ins/common/file-png.c:720
 #: ../plug-ins/common/file-pnm.c:493 ../plug-ins/common/file-ps.c:1036
-#: ../plug-ins/common/file-ps.c:3045 ../plug-ins/common/file-psp.c:1703
+#: ../plug-ins/common/file-ps.c:3045 ../plug-ins/common/file-psp.c:1704
 #: ../plug-ins/common/file-raw.c:255 ../plug-ins/common/file-raw.c:709
 #: ../plug-ins/common/file-sunras.c:390 ../plug-ins/common/file-svg.c:332
 #: ../plug-ins/common/file-svg.c:730 ../plug-ins/common/file-tga.c:441
 #: ../plug-ins/common/file-tiff-load.c:291 ../plug-ins/common/file-xbm.c:736
 #: ../plug-ins/common/file-xmc.c:666 ../plug-ins/common/file-xmc.c:853
-#: ../plug-ins/common/file-xwd.c:432 ../plug-ins/common/sphere-designer.c:2001
+#: ../plug-ins/common/file-xwd.c:432 ../plug-ins/common/sphere-designer.c:2003
 #: ../plug-ins/file-bmp/bmp-read.c:155 ../plug-ins/file-faxg3/faxg3.c:232
 #: ../plug-ins/file-fits/fits.c:357 ../plug-ins/file-fli/fli-gimp.c:458
 #: ../plug-ins/file-fli/fli-gimp.c:495 ../plug-ins/file-ico/ico-load.c:652
@@ -1059,7 +1057,7 @@ msgstr "è¼?å?¥è?²ç??æ··å??å?¨è¨å®?"
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:928
 #: ../plug-ins/gfig/gfig.c:434 ../plug-ins/help/gimphelplocale.c:222
 #: ../plug-ins/help/gimphelplocale.c:238
-#: ../plug-ins/lighting/lighting-ui.c:1353
+#: ../plug-ins/lighting/lighting-ui.c:1357
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "ç?¡æ³?é??å??â??%sâ??ä¾?è®?å??è³?æ??ï¼?%s"
@@ -1069,23 +1067,23 @@ msgid "Save Channel Mixer Settings"
 msgstr "å?²å?è?²ç??æ··å??å?¨è¨å®?"
 
 #: ../plug-ins/common/channel-mixer.c:1060
-#: ../plug-ins/common/cml-explorer.c:2004 ../plug-ins/common/curve-bend.c:839
-#: ../plug-ins/common/file-cel.c:582 ../plug-ins/common/file-compressor.c:425
+#: ../plug-ins/common/cml-explorer.c:2034 ../plug-ins/common/curve-bend.c:839
+#: ../plug-ins/common/file-cel.c:583 ../plug-ins/common/file-compressor.c:425
 #: ../plug-ins/common/file-compressor.c:507
 #: ../plug-ins/common/file-compressor.c:589
-#: ../plug-ins/common/file-compressor.c:676
-#: ../plug-ins/common/file-csource.c:406 ../plug-ins/common/file-dicom.c:1352
-#: ../plug-ins/common/file-gbr.c:661 ../plug-ins/common/file-gif-save.c:781
-#: ../plug-ins/common/file-gih.c:1261 ../plug-ins/common/file-html-table.c:235
+#: ../plug-ins/common/file-compressor.c:677
+#: ../plug-ins/common/file-csource.c:406 ../plug-ins/common/file-dicom.c:1356
+#: ../plug-ins/common/file-gbr.c:662 ../plug-ins/common/file-gif-save.c:781
+#: ../plug-ins/common/file-gih.c:1262 ../plug-ins/common/file-html-table.c:235
 #: ../plug-ins/common/file-mng.c:609 ../plug-ins/common/file-mng.c:943
-#: ../plug-ins/common/file-pat.c:484 ../plug-ins/common/file-pcx.c:672
+#: ../plug-ins/common/file-pat.c:484 ../plug-ins/common/file-pcx.c:709
 #: ../plug-ins/common/file-pix.c:523 ../plug-ins/common/file-png.c:1270
 #: ../plug-ins/common/file-pnm.c:976 ../plug-ins/common/file-ps.c:1213
 #: ../plug-ins/common/file-raw.c:589 ../plug-ins/common/file-raw.c:617
-#: ../plug-ins/common/file-sunras.c:562 ../plug-ins/common/file-tga.c:1169
+#: ../plug-ins/common/file-sunras.c:563 ../plug-ins/common/file-tga.c:1169
 #: ../plug-ins/common/file-tiff-save.c:683 ../plug-ins/common/file-xbm.c:1034
-#: ../plug-ins/common/file-xmc.c:1460 ../plug-ins/common/file-xwd.c:613
-#: ../plug-ins/common/sphere-designer.c:2110
+#: ../plug-ins/common/file-xmc.c:1460 ../plug-ins/common/file-xwd.c:617
+#: ../plug-ins/common/sphere-designer.c:2112
 #: ../plug-ins/file-bmp/bmp-write.c:295 ../plug-ins/file-fits/fits.c:475
 #: ../plug-ins/file-fli/fli-gimp.c:748 ../plug-ins/file-ico/ico-save.c:1007
 #: ../plug-ins/file-jpeg/jpeg-save.c:328 ../plug-ins/file-psd/psd-save.c:1637
@@ -1093,14 +1091,14 @@ msgstr "å?²å?è?²ç??æ··å??å?¨è¨å®?"
 #: ../plug-ins/file-xjt/xjt.c:1276 ../plug-ins/file-xjt/xjt.c:1711
 #: ../plug-ins/flame/flame.c:440
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1545
-#: ../plug-ins/gfig/gfig.c:794 ../plug-ins/ifs-compose/ifs-compose.c:2394
-#: ../plug-ins/lighting/lighting-ui.c:1210
+#: ../plug-ins/gfig/gfig.c:798 ../plug-ins/ifs-compose/ifs-compose.c:2394
+#: ../plug-ins/lighting/lighting-ui.c:1214
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "ç?¡æ³?é??å??â??%sâ??ä¾?å¯«å?¥è³?æ??ï¼?%s"
 
 #: ../plug-ins/common/channel-mixer.c:1068
-#: ../plug-ins/common/cml-explorer.c:2059
+#: ../plug-ins/common/cml-explorer.c:2089
 #, c-format
 msgid "Parameters were saved to '%s'"
 msgstr "å??æ?¸å·²å?²å?è?³â??%sâ??"
@@ -1241,7 +1239,7 @@ msgstr "Min (x-d, -)ï¼?x å°?æ?¼ 0.5"
 msgid "Min (x-d, -), (0.5 < x)"
 msgstr "Min (x-d, -)ï¼?x å¤§æ?¼ 0.5"
 
-#: ../plug-ins/common/cml-explorer.c:199 ../plug-ins/common/file-sunras.c:1636
+#: ../plug-ins/common/cml-explorer.c:199 ../plug-ins/common/file-sunras.c:1637
 msgid "Standard"
 msgstr "æ¨?æº?"
 
@@ -1349,83 +1347,83 @@ msgstr "äº®åº¦"
 msgid "(None)"
 msgstr "(ç?¡)"
 
-#: ../plug-ins/common/cml-explorer.c:454
+#: ../plug-ins/common/cml-explorer.c:459
 msgid "Create abstract Coupled-Map Lattice patterns"
 msgstr "å?µå»ºæ?½è±¡ç??è?¦å??æ? å??æ ¼å?å??æ¡?"
 
-#: ../plug-ins/common/cml-explorer.c:465
+#: ../plug-ins/common/cml-explorer.c:470
 msgid "CML _Explorer..."
 msgstr "CMLç??è¦½å?¨(_E)..."
 
-#: ../plug-ins/common/cml-explorer.c:755
+#: ../plug-ins/common/cml-explorer.c:760
 #, fuzzy
 msgid "CML Explorer: evoluting"
 msgstr "Accerciser ç?¡é??ç¤?å??è?½ç??è¦½å?¨"
 
-#: ../plug-ins/common/cml-explorer.c:1176
+#: ../plug-ins/common/cml-explorer.c:1181
 msgid "Coupled-Map-Lattice Explorer"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1223
+#: ../plug-ins/common/cml-explorer.c:1228
 msgid "New Seed"
 msgstr "æ?°ç¨®å?"
 
-#: ../plug-ins/common/cml-explorer.c:1234
+#: ../plug-ins/common/cml-explorer.c:1239
 msgid "Fix Seed"
 msgstr "å?ºå®?ç¨®å?"
 
-#: ../plug-ins/common/cml-explorer.c:1245
+#: ../plug-ins/common/cml-explorer.c:1250
 msgid "Random Seed"
 msgstr "é?¨æ©?æ?¸ç¨®å?"
 
-#: ../plug-ins/common/cml-explorer.c:1287 ../plug-ins/common/filter-pack.c:699
+#: ../plug-ins/common/cml-explorer.c:1292 ../plug-ins/common/filter-pack.c:699
 #: ../plug-ins/common/van-gogh-lic.c:671
 msgid "_Hue"
 msgstr "è?²ç?¸(_H)"
 
-#: ../plug-ins/common/cml-explorer.c:1291
+#: ../plug-ins/common/cml-explorer.c:1296
 msgid "Sat_uration"
 msgstr "é£½å??åº¦(_U)"
 
-#: ../plug-ins/common/cml-explorer.c:1295 ../plug-ins/common/filter-pack.c:707
+#: ../plug-ins/common/cml-explorer.c:1300 ../plug-ins/common/filter-pack.c:707
 msgid "_Value"
 msgstr "äº®åº¦(_V)"
 
-#: ../plug-ins/common/cml-explorer.c:1299
+#: ../plug-ins/common/cml-explorer.c:1304
 msgid "_Advanced"
 msgstr "é?²é??(_A)"
 
-#: ../plug-ins/common/cml-explorer.c:1314
+#: ../plug-ins/common/cml-explorer.c:1319
 #, fuzzy
 msgid "Channel Independent Parameters"
 msgstr "æ??ä»¤å??æ?¸"
 
-#: ../plug-ins/common/cml-explorer.c:1336
+#: ../plug-ins/common/cml-explorer.c:1341
 msgid "Initial value:"
 msgstr "èµ·å§?å?¼ï¼?"
 
-#: ../plug-ins/common/cml-explorer.c:1342
+#: ../plug-ins/common/cml-explorer.c:1347
 msgid "Zoom scale:"
 msgstr "ç¸®æ?¾æ¯?ä¾?ï¼?"
 
-#: ../plug-ins/common/cml-explorer.c:1351
+#: ../plug-ins/common/cml-explorer.c:1356
 #, fuzzy
 msgid "Start offset:"
 msgstr "æ?²å??å??ç§»"
 
-#: ../plug-ins/common/cml-explorer.c:1360
+#: ../plug-ins/common/cml-explorer.c:1365
 msgid "Seed of Random (only for \"From Seed\" Modes)"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1371 ../plug-ins/maze/maze-dialog.c:251
+#: ../plug-ins/common/cml-explorer.c:1376 ../plug-ins/maze/maze-dialog.c:251
 msgid "Seed:"
 msgstr "ç¨®å?:"
 
-#: ../plug-ins/common/cml-explorer.c:1384
+#: ../plug-ins/common/cml-explorer.c:1389
 msgid "Switch to \"From seed\" With the Last Seed"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1396
+#: ../plug-ins/common/cml-explorer.c:1401
 msgid ""
 "\"Fix seed\" button is an alias of me.\n"
 "The same seed produces the same image, if (1) the widths of images are same "
@@ -1433,143 +1431,143 @@ msgid ""
 "(2) all mutation rates equal to zero."
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1404
+#: ../plug-ins/common/cml-explorer.c:1409
 msgid "O_thers"
 msgstr "å?¶å®?(_T)"
 
-#: ../plug-ins/common/cml-explorer.c:1419
+#: ../plug-ins/common/cml-explorer.c:1424
 msgid "Copy Settings"
 msgstr "è¤?è£½è¨å®?"
 
-#: ../plug-ins/common/cml-explorer.c:1438
+#: ../plug-ins/common/cml-explorer.c:1443
 msgid "Source channel:"
 msgstr "ä¾?æº?è?²ç??:"
 
-#: ../plug-ins/common/cml-explorer.c:1453
-#: ../plug-ins/common/cml-explorer.c:1501
+#: ../plug-ins/common/cml-explorer.c:1458
+#: ../plug-ins/common/cml-explorer.c:1506
 msgid "Destination channel:"
 msgstr "ç?®ç??è?²ç??:"
 
-#: ../plug-ins/common/cml-explorer.c:1457
+#: ../plug-ins/common/cml-explorer.c:1462
 msgid "Copy Parameters"
 msgstr "è¤?è£½å??æ?¸"
 
-#: ../plug-ins/common/cml-explorer.c:1466
+#: ../plug-ins/common/cml-explorer.c:1471
 msgid "Selective Load Settings"
 msgstr "é?¸æ??æ?§è¼?å?¥è¨å®?å?¼"
 
-#: ../plug-ins/common/cml-explorer.c:1486
+#: ../plug-ins/common/cml-explorer.c:1491
 msgid "Source channel in file:"
 msgstr "æª?æ¡?å?§ä¾?æº?è?²ç??:"
 
-#: ../plug-ins/common/cml-explorer.c:1507
+#: ../plug-ins/common/cml-explorer.c:1512
 msgid "_Misc Ops."
 msgstr "å?¶å®?é?¸é ?(_M)"
 
-#: ../plug-ins/common/cml-explorer.c:1556
+#: ../plug-ins/common/cml-explorer.c:1571
 #, fuzzy
 msgid "Function type:"
 msgstr "é©?è?é¡?å??"
 
-#: ../plug-ins/common/cml-explorer.c:1572
+#: ../plug-ins/common/cml-explorer.c:1587
 #, fuzzy
 msgid "Composition:"
 msgstr "å¯«ä½?"
 
-#: ../plug-ins/common/cml-explorer.c:1586
+#: ../plug-ins/common/cml-explorer.c:1601
 #, fuzzy
 msgid "Misc arrange:"
 msgstr "æ??å??æª?æ¡?(_A)"
 
-#: ../plug-ins/common/cml-explorer.c:1590
+#: ../plug-ins/common/cml-explorer.c:1605
 msgid "Use cyclic range"
 msgstr "ä½¿ç?¨å¾ªç?°ç¯?å??"
 
-#: ../plug-ins/common/cml-explorer.c:1600
+#: ../plug-ins/common/cml-explorer.c:1615
 #, fuzzy
 msgid "Mod. rate:"
 msgstr "å??æ¨£ç??ï¼?"
 
-#: ../plug-ins/common/cml-explorer.c:1609
+#: ../plug-ins/common/cml-explorer.c:1624
 #, fuzzy
 msgid "Env. sensitivity:"
 msgstr "æ??é??æ??æ??åº¦"
 
-#: ../plug-ins/common/cml-explorer.c:1618
+#: ../plug-ins/common/cml-explorer.c:1633
 msgid "Diffusion dist.:"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1627
+#: ../plug-ins/common/cml-explorer.c:1642
 msgid "# of subranges:"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1636
+#: ../plug-ins/common/cml-explorer.c:1651
 #, fuzzy
 msgid "P(ower factor):"
 msgstr "æ?¾å¤§ç??(_F):"
 
-#: ../plug-ins/common/cml-explorer.c:1645
+#: ../plug-ins/common/cml-explorer.c:1660
 msgid "Parameter k:"
 msgstr "å??æ?¸ k:"
 
-#: ../plug-ins/common/cml-explorer.c:1654
+#: ../plug-ins/common/cml-explorer.c:1669
 #, fuzzy
 msgid "Range low:"
 msgstr "<ä½?å??ä»£ç??å??>"
 
-#: ../plug-ins/common/cml-explorer.c:1663
+#: ../plug-ins/common/cml-explorer.c:1678
 #, fuzzy
 msgid "Range high:"
 msgstr "é«?å??ä»£ç??å??"
 
-#: ../plug-ins/common/cml-explorer.c:1675
+#: ../plug-ins/common/cml-explorer.c:1690
 msgid "Plot a Graph of the Settings"
 msgstr "ç¹ªè£½è¨å®?ç??å??å½¢"
 
-#: ../plug-ins/common/cml-explorer.c:1720
+#: ../plug-ins/common/cml-explorer.c:1735
 #, fuzzy
 msgid "Ch. sensitivity:"
 msgstr "æ??é??æ??æ??åº¦"
 
-#: ../plug-ins/common/cml-explorer.c:1730
+#: ../plug-ins/common/cml-explorer.c:1745
 msgid "Mutation rate:"
 msgstr "çª?è®?ç??:"
 
-#: ../plug-ins/common/cml-explorer.c:1740
+#: ../plug-ins/common/cml-explorer.c:1755
 msgid "Mutation dist.:"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1818
+#: ../plug-ins/common/cml-explorer.c:1848
 msgid "Graph of the Current Settings"
 msgstr "ç?®å??è¨å®?ç??å??å½¢"
 
-#: ../plug-ins/common/cml-explorer.c:1889
+#: ../plug-ins/common/cml-explorer.c:1919
 msgid "Warning: the source and the destination are the same channel."
 msgstr "è¦å??ï¼?ä¾?æº?å??ç?®ç??é?½æ?¯ç?¸å??ç??è?²æ?¿ã??"
 
-#: ../plug-ins/common/cml-explorer.c:1948
+#: ../plug-ins/common/cml-explorer.c:1978
 msgid "Save CML Explorer Parameters"
 msgstr "å?²å? CML ç??è¦½å?¨å??æ?¸"
 
-#: ../plug-ins/common/cml-explorer.c:2081
+#: ../plug-ins/common/cml-explorer.c:2111
 msgid "Load CML Explorer Parameters"
 msgstr "è¼?å?¥ CML ç??è¦½å?¨å??æ?¸"
 
-#: ../plug-ins/common/cml-explorer.c:2199
+#: ../plug-ins/common/cml-explorer.c:2229
 msgid "Error: it's not CML parameter file."
 msgstr "é?¯èª¤ï¼?å®?ä¸?æ?¯ CML å??æ?¸æª?ã??"
 
-#: ../plug-ins/common/cml-explorer.c:2206
+#: ../plug-ins/common/cml-explorer.c:2236
 #, c-format
 msgid "Warning: '%s' is an old format file."
 msgstr "è¦å??ï¼?â??%sâ??æ?¯è??æ ¼å¼?ç??æª?æ¡?ã??"
 
-#: ../plug-ins/common/cml-explorer.c:2210
+#: ../plug-ins/common/cml-explorer.c:2240
 #, fuzzy, c-format
 msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer."
 msgstr "è¦å??ï¼?â??%sâ??é??å??å??æ?¸æª?ç??ç??æ?¬æ¯?æ?¬ç¨?å¼?è?½å¤ è¾¨èª?ç??é??è¦?æ?°ã??"
 
-#: ../plug-ins/common/cml-explorer.c:2273
+#: ../plug-ins/common/cml-explorer.c:2303
 msgid "Error: failed to load parameters"
 msgstr "é?¯èª¤ï¼?è¼?å?¥å??æ?¸å¤±æ??"
 
@@ -1632,9 +1630,8 @@ msgid "Color Exchange"
 msgstr "è?²å½©äº¤æ??"
 
 #: ../plug-ins/common/color-exchange.c:310
-#, fuzzy
 msgid "Middle-Click Inside Preview to Pick \"From Color\""
-msgstr "é ?è¦½ï¼?è«?æ??è£?é?¢é?¸å??ã??ä¾?æº?é¡?è?²ã??"
+msgstr "å?¨é ?è¦½å??ä¸ï¼?æ??æ»?é¼ ä¸é?µæ??é?¸ã??ä¾?æº?é¡?è?²ã??"
 
 #: ../plug-ins/common/color-exchange.c:355
 msgid "To Color"
@@ -1685,10 +1682,9 @@ msgid "Color to Alpha"
 msgstr "è?²å½©è½?ç?ºé??æ??"
 
 #: ../plug-ins/common/color-to-alpha.c:410
-#, fuzzy
 msgctxt "color-to-alpha"
 msgid "From:"
-msgstr "å¯?ä»¶è??:"
+msgstr "å¾?ï¼?"
 
 #: ../plug-ins/common/color-to-alpha.c:414
 msgid "Color to Alpha Color Picker"
@@ -1916,7 +1912,7 @@ msgstr "Redness_cr709f:"
 
 #: ../plug-ins/common/compose.c:403
 msgid "Create an image using multiple gray images as color channels"
-msgstr "å»ºç«?ä¸?å??å??ç??ï¼?å?¶ä½¿ç?¨å¤?å??ç?°é??å??ç??ä½?ç?ºè?²å½©è?²ç??"
+msgstr "å»ºç«?ä¸?å??å??ç??ï¼?å?¶ä½¿ç?¨å¤?å??ç?°é??å??ç??ä½?ç?ºé¡?è?²è?²ç??"
 
 #: ../plug-ins/common/compose.c:409
 msgid "C_ompose..."
@@ -1994,9 +1990,8 @@ msgstr "è?²å½©æ¨¡å¼?(_M)ï¼?"
 
 #. Channel representation table
 #: ../plug-ins/common/compose.c:1551
-#, fuzzy
 msgid "Channel Representations"
-msgstr "è¦?å??é??é??"
+msgstr "è?²ç??å±?ç?¾"
 
 #: ../plug-ins/common/compose.c:1614
 #, fuzzy
@@ -2010,11 +2005,11 @@ msgstr "ä¼¸å±?æ?´é«?äº®åº¦å?¼"
 #: ../plug-ins/common/contrast-normalize.c:91
 #: ../plug-ins/common/edge-dog.c:361
 msgid "_Normalize"
-msgstr "æ£è¦?å??(_N)"
+msgstr "æ??é«?å°?æ¯?åº¦(_N)"
 
 #: ../plug-ins/common/contrast-normalize.c:125
 msgid "Normalizing"
-msgstr "æ£è¦?å??"
+msgstr "æ??é«?å°?æ¯?åº¦"
 
 #: ../plug-ins/common/contrast-retinex.c:155
 msgid "Enhance contrast using the Retinex method"
@@ -2127,7 +2122,7 @@ msgstr "å»¶ä¼¸(_X)"
 
 #: ../plug-ins/common/convolution-matrix.c:73
 #: ../plug-ins/common/displace.c:472 ../plug-ins/common/edge.c:705
-#: ../plug-ins/common/fractal-trace.c:736 ../plug-ins/common/ripple.c:582
+#: ../plug-ins/common/fractal-trace.c:736 ../plug-ins/common/ripple.c:584
 msgid "_Wrap"
 msgstr "ç¹?å?°å?¦ä¸?é??(_W)"
 
@@ -2144,9 +2139,8 @@ msgid "_Convolution Matrix..."
 msgstr "ç?©é?£é??ç®?(_C)..."
 
 #: ../plug-ins/common/convolution-matrix.c:240
-#, fuzzy
 msgid "Convolution does not work on layers smaller than 3x3 pixels."
-msgstr "ç?©é?£é??ç®?ä¸?é?©ç?¨æ?¼å°?æ?¼ 3 å??å??ç´ ç??å??å±¤ã??"
+msgstr "å?·ç©?ä¸?èµ·ä½?ç?¨ï¼?ç?¶å??å±¤å°?æ?¼3x3å??ç´ ã??"
 
 #: ../plug-ins/common/convolution-matrix.c:313
 msgid "Applying convolution"
@@ -2277,13 +2271,13 @@ msgstr "è®?å??å½±ç?? DVD æ??ç?¼ç??é?¯èª¤ (%s)"
 
 #. Possibly retrieve data from a previous run
 #. The shell and main vbox
-#: ../plug-ins/common/curve-bend.c:1223 ../plug-ins/common/curve-bend.c:2963
+#: ../plug-ins/common/curve-bend.c:1224 ../plug-ins/common/curve-bend.c:2964
 msgid "Curve Bend"
 msgstr "æ ¹æ??æ?²ç·?æ?æ?²"
 
 #. Preview area, top of column
 #. preview
-#: ../plug-ins/common/curve-bend.c:1260
+#: ../plug-ins/common/curve-bend.c:1261
 #: ../plug-ins/gimpressionist/orientmap.c:591
 #: ../plug-ins/gimpressionist/sizemap.c:461
 #: ../plug-ins/print/print-page-layout.c:171
@@ -2291,117 +2285,117 @@ msgid "Preview"
 msgstr "é ?è¦½"
 
 #. The preview button
-#: ../plug-ins/common/curve-bend.c:1289
+#: ../plug-ins/common/curve-bend.c:1290
 msgid "_Preview Once"
 msgstr "é ?è¦½ä¸?æ¬¡(_P)"
 
 #. The preview toggle
-#: ../plug-ins/common/curve-bend.c:1298
+#: ../plug-ins/common/curve-bend.c:1299
 msgid "Automatic pre_view"
 msgstr "è?ªå??æ?´æ?°é ?è¦½(_V)"
 
 #. Options area, bottom of column
 #. Options section
-#: ../plug-ins/common/curve-bend.c:1308 ../plug-ins/common/ripple.c:520
+#: ../plug-ins/common/curve-bend.c:1309 ../plug-ins/common/ripple.c:522
 #: ../plug-ins/gfig/gfig-dialog.c:1206
 msgid "Options"
 msgstr "é?¸é ?"
 
 #. Rotate spinbutton
-#: ../plug-ins/common/curve-bend.c:1322
+#: ../plug-ins/common/curve-bend.c:1323
 msgid "Rotat_e:"
 msgstr "æ??è½?(_E)ï¼?"
 
 #. The smoothing toggle
-#: ../plug-ins/common/curve-bend.c:1341
+#: ../plug-ins/common/curve-bend.c:1342
 msgid "Smoo_thing"
 msgstr "å¹³æ»?å??(_T)"
 
 #. The antialiasing toggle
-#: ../plug-ins/common/curve-bend.c:1351 ../plug-ins/common/mosaic.c:731
-#: ../plug-ins/common/qbist.c:852 ../plug-ins/common/ripple.c:529
+#: ../plug-ins/common/curve-bend.c:1352 ../plug-ins/common/mosaic.c:731
+#: ../plug-ins/common/qbist.c:852 ../plug-ins/common/ripple.c:531
 msgid "_Antialiasing"
 msgstr "å??é?¸é½?(_A)"
 
 #. The work_on_copy toggle
-#: ../plug-ins/common/curve-bend.c:1361
+#: ../plug-ins/common/curve-bend.c:1362
 msgid "Work on cop_y"
 msgstr "å°?çµ?æ??é¡¯ç¤ºæ?¼å??ä»½å??å±¤ä¸(_Y)"
 
 #. The curves graph
-#: ../plug-ins/common/curve-bend.c:1371
+#: ../plug-ins/common/curve-bend.c:1372
 msgid "Modify Curves"
 msgstr "ä¿®æ?¹æ?²ç·?"
 
-#: ../plug-ins/common/curve-bend.c:1399
+#: ../plug-ins/common/curve-bend.c:1400
 msgid "Curve for Border"
 msgstr "é??ç·£ç??æ?²ç·?"
 
-#: ../plug-ins/common/curve-bend.c:1403
+#: ../plug-ins/common/curve-bend.c:1404
 msgid "_Upper"
 msgstr "é ?é?¨(_U)"
 
-#: ../plug-ins/common/curve-bend.c:1404
+#: ../plug-ins/common/curve-bend.c:1405
 msgid "_Lower"
 msgstr "åº?é?¨(_L)"
 
-#: ../plug-ins/common/curve-bend.c:1414
+#: ../plug-ins/common/curve-bend.c:1415
 msgid "Curve Type"
 msgstr "æ?²ç·?é¡?å??(_T)ï¼?"
 
-#: ../plug-ins/common/curve-bend.c:1418
+#: ../plug-ins/common/curve-bend.c:1419
 msgid "Smoot_h"
 msgstr "å¹³æ»?(_H)"
 
-#: ../plug-ins/common/curve-bend.c:1419
+#: ../plug-ins/common/curve-bend.c:1420
 msgid "_Free"
 msgstr "è?ªç?±(_F)"
 
 #. The Copy button
-#: ../plug-ins/common/curve-bend.c:1434
+#: ../plug-ins/common/curve-bend.c:1435
 msgid "_Copy"
 msgstr "è¤?è£½(_C)"
 
-#: ../plug-ins/common/curve-bend.c:1439
+#: ../plug-ins/common/curve-bend.c:1440
 msgid "Copy the active curve to the other border"
 msgstr "å°?ä½¿ç?¨ä¸ç??æ?²ç·?è¤?è£½è?³å?¦ä¸?é??"
 
 #. The CopyInv button
-#: ../plug-ins/common/curve-bend.c:1446
+#: ../plug-ins/common/curve-bend.c:1447
 msgid "_Mirror"
 msgstr "é?¡å??(_M)"
 
-#: ../plug-ins/common/curve-bend.c:1451
+#: ../plug-ins/common/curve-bend.c:1452
 msgid "Mirror the active curve to the other border"
 msgstr "å°?ä½¿ç?¨ä¸ç??æ?²ç·?ç??é?¡å??è¤?è£½è?³å?¦ä¸?é??"
 
 #. The Swap button
-#: ../plug-ins/common/curve-bend.c:1459
+#: ../plug-ins/common/curve-bend.c:1460
 msgid "S_wap"
 msgstr "äº¤æ??(_W)"
 
-#: ../plug-ins/common/curve-bend.c:1464
+#: ../plug-ins/common/curve-bend.c:1465
 msgid "Swap the two curves"
 msgstr "äº¤æ??å?©é??ç??æ?²ç·?"
 
-#: ../plug-ins/common/curve-bend.c:1476
+#: ../plug-ins/common/curve-bend.c:1477
 msgid "Reset the active curve"
 msgstr "é??æ?°è¨å®?ä½¿ç?¨ä¸ç??æ?²ç·?"
 
-#: ../plug-ins/common/curve-bend.c:1493
+#: ../plug-ins/common/curve-bend.c:1494
 msgid "Load the curves from a file"
 msgstr "å¾?æª?æ¡?è¼?å?¥æ?²ç·?"
 
-#: ../plug-ins/common/curve-bend.c:1505
+#: ../plug-ins/common/curve-bend.c:1506
 msgid "Save the curves to a file"
 msgstr "å°?æ?²ç·?å?²å?è?³æª?æ¡?"
 
-#: ../plug-ins/common/curve-bend.c:2061
+#: ../plug-ins/common/curve-bend.c:2062
 #, fuzzy
 msgid "Load Curve Points from File"
 msgstr "å¾?æª?æ¡?è¼?å?¥ WMS å??å±¤"
 
-#: ../plug-ins/common/curve-bend.c:2096
+#: ../plug-ins/common/curve-bend.c:2097
 #, fuzzy
 msgid "Save Curve Points to File"
 msgstr "ç?¡æ³?å?²å?æª?æ¡? %(filename)sã??"
@@ -2602,24 +2596,22 @@ msgid "Decompose"
 msgstr "å??è§£"
 
 #: ../plug-ins/common/decompose.c:1512
-#, fuzzy
 msgid "Extract Channels"
-msgstr "è?²é??æ?¸ç?®ï¼?"
+msgstr "æ??å??è?²ç??"
 
 #: ../plug-ins/common/decompose.c:1559
 msgid "_Decompose to layers"
 msgstr "å??è§£å?°æ?¸å??å??å±¤ä¸(_D)"
 
 #: ../plug-ins/common/decompose.c:1570
-#, fuzzy
 msgid "_Foreground as registration color"
-msgstr "ä»¥å?ä¸²æ?¹å¼?è¡¨é??ç??å??æ?¯é¡?è?²"
+msgstr "å??æ?¯é¡?è?²ç?¶ä½?ç?»è¨?é¡?è?²(_F)"
 
 #: ../plug-ins/common/decompose.c:1571
 msgid ""
 "Pixels in the foreground color will appear black in all output images.  This "
 "can be used for things like crop marks that have to show up on all channels."
-msgstr ""
+msgstr "å??æ?¯è?²ç??å??ç´ å°?å?ºç?¾é»?è?²å?¨æ??æ??è¼¸å?ºå??ç??ã??é??å?¯ä»¥ç?¨æ?¼è£?å??ç·?é¡?ç??æ?±è¥¿ï¼?æ?¯è¦?é¡¯ç¤ºå?¨æ??æ??è?²ç??ã??"
 
 #: ../plug-ins/common/deinterlace.c:90
 msgid "Fix images where every other row is missing"
@@ -2635,11 +2627,11 @@ msgstr "å?»äº¤é?¯"
 
 #: ../plug-ins/common/deinterlace.c:354
 msgid "Keep o_dd fields"
-msgstr "ä¿?æ??å¥?æ?¸æ¬?ä½?(_D)"
+msgstr "ä¿?ç??å¥?æ?¸å??å??(_D)"
 
 #: ../plug-ins/common/deinterlace.c:355
 msgid "Keep _even fields"
-msgstr "ä¿?æ??å?¶æ?¸æ¬?ä½?(_E)"
+msgstr "ä¿?ç??å?¶æ?¸å??å??(_E)"
 
 #: ../plug-ins/common/depth-merge.c:184
 msgid "Combine two images using depth maps (z-buffers)"
@@ -2737,7 +2729,7 @@ msgstr "æ£å?¨æ¶?å?»æ¢?ç´?..."
 msgid "Destripe"
 msgstr "å?»æ¢?ç´?"
 
-#: ../plug-ins/common/destripe.c:473 ../plug-ins/common/file-html-table.c:580
+#: ../plug-ins/common/destripe.c:473 ../plug-ins/common/file-html-table.c:581
 #: ../plug-ins/common/file-ps.c:3168 ../plug-ins/common/file-ps.c:3363
 #: ../plug-ins/common/file-raw.c:1132 ../plug-ins/common/smooth-palette.c:435
 #: ../plug-ins/common/tile-paper.c:302 ../plug-ins/common/tile.c:431
@@ -2861,7 +2853,7 @@ msgid "Edge Behavior"
 msgstr "é??ç·£è¡?ç?º"
 
 #: ../plug-ins/common/displace.c:474 ../plug-ins/common/edge.c:718
-#: ../plug-ins/common/ripple.c:583 ../plug-ins/common/waves.c:282
+#: ../plug-ins/common/ripple.c:585 ../plug-ins/common/waves.c:282
 msgid "_Smear"
 msgstr "å¡?æ±¡(_S)"
 
@@ -2932,7 +2924,7 @@ msgstr "é??è?¹ç??å?µæ¸¬"
 
 #: ../plug-ins/common/edge-neon.c:747 ../plug-ins/common/unsharp-mask.c:879
 msgid "_Amount:"
-msgstr "ç¨?åº¦(_A)ï¼?"
+msgstr "ç¸½é??(_A)ï¼?"
 
 #: ../plug-ins/common/edge-sobel.c:107
 msgid "Specialized direction-dependent edge detection"
@@ -2948,11 +2940,11 @@ msgstr "Sobel é??ç·£å?µæ¸¬"
 
 #: ../plug-ins/common/edge-sobel.c:260
 msgid "Sobel _horizontally"
-msgstr "Sobel æ°´å¹³ç??(_H)"
+msgstr "å?§å?¹æµ®é??æ??æ??(_H)"
 
 #: ../plug-ins/common/edge-sobel.c:272
 msgid "Sobel _vertically"
-msgstr "Sobel å??ç?´ç??(_V)"
+msgstr "å¤?å?¸æµ®é??æ??æ??(_V)"
 
 #: ../plug-ins/common/edge-sobel.c:284
 msgid "_Keep sign of result (one direction only)"
@@ -3005,7 +2997,7 @@ msgstr "æ¼?ç®?æ³?(_A)ï¼?"
 
 #: ../plug-ins/common/edge.c:686
 msgid "A_mount:"
-msgstr "æ?¸é??(_M):"
+msgstr "ç·?æ¢?é??åº¦(_M)ï¼?"
 
 #: ../plug-ins/common/emboss.c:124
 msgid "Simulate an image created by embossing"
@@ -3051,7 +3043,7 @@ msgstr "æ£å?¨é?²è¡?é??å?»..."
 msgid "Engrave"
 msgstr "é??å?»..."
 
-#: ../plug-ins/common/engrave.c:244 ../plug-ins/common/file-html-table.c:596
+#: ../plug-ins/common/engrave.c:244 ../plug-ins/common/file-html-table.c:597
 #: ../plug-ins/common/file-ps.c:3178 ../plug-ins/common/file-ps.c:3372
 #: ../plug-ins/common/file-raw.c:1145 ../plug-ins/common/film.c:1002
 #: ../plug-ins/common/smooth-palette.c:440 ../plug-ins/common/tile-paper.c:313
@@ -3093,19 +3085,19 @@ msgstr "è¼?å?¥ KISS èª¿è?²ç?¤"
 #. -1  assume there is no floating selection
 #: ../plug-ins/common/file-cel.c:316 ../plug-ins/common/file-dicom.c:344
 #: ../plug-ins/common/file-gbr.c:372 ../plug-ins/common/file-gif-load.c:360
-#: ../plug-ins/common/file-gih.c:648 ../plug-ins/common/file-jp2-load.c:190
+#: ../plug-ins/common/file-gih.c:649 ../plug-ins/common/file-jp2-load.c:190
 #: ../plug-ins/common/file-pat.c:341 ../plug-ins/common/file-pcx.c:365
-#: ../plug-ins/common/file-pix.c:347 ../plug-ins/common/file-png.c:727
-#: ../plug-ins/common/file-pnm.c:498 ../plug-ins/common/file-ps.c:1042
-#: ../plug-ins/common/file-raw.c:714 ../plug-ins/common/file-sunras.c:485
-#: ../plug-ins/common/file-tga.c:446 ../plug-ins/common/file-tiff-load.c:604
-#: ../plug-ins/common/file-wmf.c:993 ../plug-ins/common/file-xbm.c:741
-#: ../plug-ins/common/file-xmc.c:678 ../plug-ins/common/file-xpm.c:351
-#: ../plug-ins/common/file-xwd.c:519 ../plug-ins/file-bmp/bmp-read.c:160
-#: ../plug-ins/file-faxg3/faxg3.c:216 ../plug-ins/file-fli/fli-gimp.c:500
-#: ../plug-ins/file-ico/ico-load.c:645 ../plug-ins/file-jpeg/jpeg-load.c:114
-#: ../plug-ins/file-psd/psd-load.c:135 ../plug-ins/file-sgi/sgi.c:329
-#: ../plug-ins/file-xjt/xjt.c:3329
+#: ../plug-ins/common/file-pdf-load.c:601 ../plug-ins/common/file-pix.c:347
+#: ../plug-ins/common/file-png.c:727 ../plug-ins/common/file-pnm.c:498
+#: ../plug-ins/common/file-ps.c:1042 ../plug-ins/common/file-raw.c:714
+#: ../plug-ins/common/file-sunras.c:486 ../plug-ins/common/file-tga.c:446
+#: ../plug-ins/common/file-tiff-load.c:604 ../plug-ins/common/file-wmf.c:993
+#: ../plug-ins/common/file-xbm.c:741 ../plug-ins/common/file-xmc.c:678
+#: ../plug-ins/common/file-xpm.c:351 ../plug-ins/common/file-xwd.c:523
+#: ../plug-ins/file-bmp/bmp-read.c:160 ../plug-ins/file-faxg3/faxg3.c:216
+#: ../plug-ins/file-fli/fli-gimp.c:500 ../plug-ins/file-ico/ico-load.c:645
+#: ../plug-ins/file-jpeg/jpeg-load.c:114 ../plug-ins/file-psd/psd-load.c:135
+#: ../plug-ins/file-sgi/sgi.c:329 ../plug-ins/file-xjt/xjt.c:3329
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "æ£å?¨é??å??â??%sâ??"
@@ -3114,22 +3106,22 @@ msgstr "æ£å?¨é??å??â??%sâ??"
 msgid "Can't create a new image"
 msgstr "ç?¡æ³?ç?¢ç??æ?°ç??å??ç??"
 
-#: ../plug-ins/common/file-cel.c:442
+#: ../plug-ins/common/file-cel.c:443
 #, c-format
 msgid "Unsupported bit depth (%d)!"
 msgstr "ä¸?æ?¯æ?´ç??é¡?è?²ä½?å??æ?¸(%d)ï¼?"
 
 #. init the progress meter
 #. And let's begin the progress
-#: ../plug-ins/common/file-cel.c:587 ../plug-ins/common/file-gbr.c:666
-#: ../plug-ins/common/file-gif-save.c:788 ../plug-ins/common/file-gih.c:1266
-#: ../plug-ins/common/file-html-table.c:255 ../plug-ins/common/file-pat.c:489
-#: ../plug-ins/common/file-pcx.c:633 ../plug-ins/common/file-pix.c:528
+#: ../plug-ins/common/file-cel.c:588 ../plug-ins/common/file-gbr.c:667
+#: ../plug-ins/common/file-gif-save.c:788 ../plug-ins/common/file-gih.c:1267
+#: ../plug-ins/common/file-html-table.c:256 ../plug-ins/common/file-pat.c:489
+#: ../plug-ins/common/file-pcx.c:641 ../plug-ins/common/file-pix.c:528
 #: ../plug-ins/common/file-png.c:1277 ../plug-ins/common/file-pnm.c:981
-#: ../plug-ins/common/file-ps.c:1218 ../plug-ins/common/file-sunras.c:567
+#: ../plug-ins/common/file-ps.c:1218 ../plug-ins/common/file-sunras.c:568
 #: ../plug-ins/common/file-tga.c:1174 ../plug-ins/common/file-tiff-save.c:693
 #: ../plug-ins/common/file-xbm.c:1039 ../plug-ins/common/file-xmc.c:1465
-#: ../plug-ins/common/file-xpm.c:636 ../plug-ins/common/file-xwd.c:618
+#: ../plug-ins/common/file-xpm.c:636 ../plug-ins/common/file-xwd.c:622
 #: ../plug-ins/file-bmp/bmp-write.c:306 ../plug-ins/file-fits/fits.c:480
 #: ../plug-ins/file-fli/fli-gimp.c:716 ../plug-ins/file-ico/ico-save.c:1001
 #: ../plug-ins/file-jpeg/jpeg-save.c:285 ../plug-ins/file-psd/psd-save.c:1642
@@ -3161,50 +3153,50 @@ msgstr "æ²?æ??å??ç??ç??å»¶ä¼¸æª?å??ï¼?å??è©¦è?ªå??å?µæ¸¬æª?æ¡?é¡?å??ã??"
 msgid "C source code"
 msgstr "C æº?ä»£ç¢¼"
 
-#: ../plug-ins/common/file-csource.c:703
+#: ../plug-ins/common/file-csource.c:704
 #, fuzzy
 msgid "C-Source"
 msgstr "ä¾?æº?"
 
-#: ../plug-ins/common/file-csource.c:721
+#: ../plug-ins/common/file-csource.c:722
 msgid "_Prefixed name:"
 msgstr "å??ç½®å??ç¨±(_P)ï¼?"
 
-#: ../plug-ins/common/file-csource.c:730
+#: ../plug-ins/common/file-csource.c:731
 msgid "Co_mment:"
 msgstr "å??è¨»(_M)ï¼?"
 
 #. Use Comment
 #.
-#: ../plug-ins/common/file-csource.c:737
+#: ../plug-ins/common/file-csource.c:738
 msgid "_Save comment to file"
 msgstr "å°?å??è¨»æ??å?å?²å?å?°æª?æ¡?ä¸(_S)"
 
 #. GLib types
 #.
-#: ../plug-ins/common/file-csource.c:749
+#: ../plug-ins/common/file-csource.c:750
 msgid "_Use GLib types (guint8*)"
 msgstr "ä½¿ç?¨ _GLib è³?æ??é¡?å?? (guint8*)"
 
-#: ../plug-ins/common/file-csource.c:762
+#: ../plug-ins/common/file-csource.c:763
 msgid "Us_e macros instead of struct"
 msgstr "ä½¿ç?¨å·¨é??è??ä¸?ç?¨ _Struct"
 
-#: ../plug-ins/common/file-csource.c:775
+#: ../plug-ins/common/file-csource.c:776
 msgid "Use _1 byte Run-Length-Encoding"
 msgstr ""
 
-#: ../plug-ins/common/file-csource.c:788
+#: ../plug-ins/common/file-csource.c:789
 msgid "Sa_ve alpha channel (RGBA/RGB)"
 msgstr "å?²å?é??æ??è?²ç?? (_RGBA/RGB)"
 
 #. RGB-565
 #.
-#: ../plug-ins/common/file-csource.c:800
+#: ../plug-ins/common/file-csource.c:801
 msgid "Save as _RGB565 (16-bit)"
 msgstr ""
 
-#: ../plug-ins/common/file-csource.c:823
+#: ../plug-ins/common/file-csource.c:824
 msgid "Op_acity:"
 msgstr "ä¸?é??æ??åº¦(_A)ï¼?"
 
@@ -3226,18 +3218,18 @@ msgstr "DICOM å??ç??"
 msgid "Digital Imaging and Communications in Medicine image"
 msgstr ""
 
-#: ../plug-ins/common/file-dicom.c:366
+#: ../plug-ins/common/file-dicom.c:368
 #, c-format
 msgid "'%s' is not a DICOM file."
 msgstr "â??%sâ??ä¸?æ?¯ DICOM æ ¼å¼?æª?æ¡?ã??"
 
-#: ../plug-ins/common/file-dicom.c:1320 ../plug-ins/common/file-pcx.c:665
+#: ../plug-ins/common/file-dicom.c:1324 ../plug-ins/common/file-pcx.c:673
 #: ../plug-ins/common/file-pnm.c:966
 msgid "Cannot save images with alpha channel."
 msgstr "ç?¡æ³?å?²å?æ??é??æ??è?²ç??ç??å??ç??ã??"
 
-#: ../plug-ins/common/file-dicom.c:1335 ../plug-ins/common/file-ps.c:1203
-#: ../plug-ins/common/file-xwd.c:603 ../plug-ins/file-fits/fits.c:465
+#: ../plug-ins/common/file-dicom.c:1339 ../plug-ins/common/file-ps.c:1203
+#: ../plug-ins/common/file-xwd.c:607 ../plug-ins/file-fits/fits.c:465
 #: ../plug-ins/file-xjt/xjt.c:1687
 msgid "Cannot operate on unknown image types."
 msgstr "ç?¡æ³?è??ç??ä¸?æ??ç??å??ç??ã??"
@@ -3266,25 +3258,25 @@ msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "ç?å?·æª?æ¡?â??%sâ??ä¸å?«æ??ç?¡æ??ç?? UTF-8 æ??å?ã??"
 
 #: ../plug-ins/common/file-gbr.c:460 ../plug-ins/common/file-gih.c:491
-#: ../plug-ins/common/file-gih.c:1140
+#: ../plug-ins/common/file-gih.c:1141
 #: ../plug-ins/gradient-flare/gradient-flare.c:3062
 msgid "Unnamed"
 msgstr "æ?ªå?½å??"
 
-#: ../plug-ins/common/file-gbr.c:651
+#: ../plug-ins/common/file-gbr.c:652
 msgid "GIMP brushes are either GRAYSCALE or RGBA"
 msgstr "GIMP ç?å?·æª?å¿?é ?ç?ºç?°é??æ?? RGBA å??ç??"
 
-#: ../plug-ins/common/file-gbr.c:768
+#: ../plug-ins/common/file-gbr.c:769
 msgid "Brush"
 msgstr "ç?å?·"
 
 #. attach labels
-#: ../plug-ins/common/file-gbr.c:782 ../plug-ins/common/grid.c:790
+#: ../plug-ins/common/file-gbr.c:783 ../plug-ins/common/grid.c:790
 msgid "Spacing:"
 msgstr "é??é??ï¼?"
 
-#: ../plug-ins/common/file-gbr.c:793 ../plug-ins/common/file-gih.c:891
+#: ../plug-ins/common/file-gbr.c:794 ../plug-ins/common/file-gih.c:892
 #: ../plug-ins/common/file-pat.c:566 ../plug-ins/gimpressionist/presets.c:666
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
@@ -3300,7 +3292,7 @@ msgstr "é??å??ä¸?æ?¯ GIF æª?"
 
 #: ../plug-ins/common/file-gif-load.c:411
 msgid "Non-square pixels.  Image might look squashed."
-msgstr ""
+msgstr "é??æ?¹å½¢å??ç´ ã??å??ç??ç??èµ·ä¾?è¢«å£?æ??ç??ã??"
 
 #: ../plug-ins/common/file-gif-load.c:929
 #, c-format
@@ -3339,7 +3331,7 @@ msgstr "ç?¡æ³?å??å?ªæ¸?é¡?è?²æ?¸ç?®ã??ç?¾å?¨æ??å?²å?ç?ºä¸?é??æ??ç??å??ç??ã??"
 msgid ""
 "Unable to save '%s'.  The GIF file format does not support images that are "
 "more than %d pixels wide or tall."
-msgstr ""
+msgstr "ä¸?è?½å?²å?ã??%sã??ã??GIF æª?æ¡?æ ¼å¼?ä¸?æ?¯æ??è¶?é?? %d å??ç´ å¯¬æ??é«?ç??å??ç??ã??"
 
 #: ../plug-ins/common/file-gif-save.c:693
 msgid ""
@@ -3404,7 +3396,7 @@ msgstr "æ¯?å??å??å±¤ä½?ç?¨ä¸?å??ç?«æ ¼ (å??ä»£)"
 msgid ""
 "You can only export as animation when the image has more than one layer. The "
 "image you are trying to export only has one layer."
-msgstr ""
+msgstr "ç?¶å??ç??æ??ä¸?å?ªä¸?å??å??å±¤æ??ï¼?ä½ æ??å?¯ä»¥å°?å®?å?¯å?ºæ??ç?ºå??ç?«ã??ä½?æ?¯ä½ æ£å??è©¦å?¯å?ºç??å??ç??å?»å?ªæ??ä¸?å??å??å±¤ï¼?"
 
 #: ../plug-ins/common/file-gif-save.c:2349
 msgid "Error writing output file."
@@ -3429,61 +3421,61 @@ msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?å®?ä¸?æ?¯ GIMP ç?å?·
 msgid "GIMP brush file appears to be corrupted."
 msgstr "GIMP ç?å?·æª?ä¼¼ä¹?å£?äº?ã??"
 
-#: ../plug-ins/common/file-gih.c:699
+#: ../plug-ins/common/file-gih.c:700
 msgid "Couldn't load one brush in the pipe, giving up."
 msgstr ""
 
-#: ../plug-ins/common/file-gih.c:860
+#: ../plug-ins/common/file-gih.c:861
 #, fuzzy
 msgid "Brush Pipe"
 msgstr "ç®¡ç·?ä¸æ?·"
 
-#: ../plug-ins/common/file-gih.c:877
+#: ../plug-ins/common/file-gih.c:878
 msgid "Spacing (percent):"
 msgstr "é??é??(ç?¾å??æ¯?)ï¼?"
 
-#: ../plug-ins/common/file-gih.c:944
+#: ../plug-ins/common/file-gih.c:945
 msgid "Pixels"
 msgstr "å??ç´ "
 
-#: ../plug-ins/common/file-gih.c:949
+#: ../plug-ins/common/file-gih.c:950
 msgid "Cell size:"
 msgstr "å?®å??å°ºå¯¸:"
 
-#: ../plug-ins/common/file-gih.c:961
+#: ../plug-ins/common/file-gih.c:962
 #, fuzzy
 msgid "Number of cells:"
 msgstr "<b>å?²å?æ ¼æ?¸ï¼?</b>"
 
-#: ../plug-ins/common/file-gih.c:986
+#: ../plug-ins/common/file-gih.c:987
 #, fuzzy
 msgid " Rows of "
 msgstr "å??"
 
-#: ../plug-ins/common/file-gih.c:998
+#: ../plug-ins/common/file-gih.c:999
 #, fuzzy
 msgid " Columns on each layer"
 msgstr "æ?¨æ£?å?³é?¢æ¬?ä½?"
 
-#: ../plug-ins/common/file-gih.c:1002
+#: ../plug-ins/common/file-gih.c:1003
 msgid " (Width Mismatch!) "
 msgstr " (é??åº¦ä¸?ç¬¦ï¼?) "
 
-#: ../plug-ins/common/file-gih.c:1006
+#: ../plug-ins/common/file-gih.c:1007
 msgid " (Height Mismatch!) "
 msgstr " (é«?åº¦ä¸?ç¬¦ï¼?) "
 
-#: ../plug-ins/common/file-gih.c:1011
+#: ../plug-ins/common/file-gih.c:1012
 #, fuzzy
 msgid "Display as:"
 msgstr "é¡¯ç¤ºå??æ¨?ç?º"
 
-#: ../plug-ins/common/file-gih.c:1020
+#: ../plug-ins/common/file-gih.c:1021
 #, fuzzy
 msgid "Dimension:"
 msgstr "Dimension"
 
-#: ../plug-ins/common/file-gih.c:1095
+#: ../plug-ins/common/file-gih.c:1096
 #, fuzzy
 msgid "Ranks:"
 msgstr "ç?ç´? (%s)"
@@ -3493,15 +3485,15 @@ msgid "C source code header"
 msgstr "C æº?ä»£ç¢¼æª?é "
 
 #: ../plug-ins/common/file-html-table.c:155
-#: ../plug-ins/common/file-html-table.c:408
+#: ../plug-ins/common/file-html-table.c:409
 msgid "HTML table"
 msgstr "HTML è¡¨æ ¼"
 
-#: ../plug-ins/common/file-html-table.c:421
+#: ../plug-ins/common/file-html-table.c:422
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../plug-ins/common/file-html-table.c:432
+#: ../plug-ins/common/file-html-table.c:433
 msgid ""
 "You are about to create a huge\n"
 "HTML file which will most likely\n"
@@ -3509,100 +3501,100 @@ msgid ""
 msgstr "ä½ æ£è¦?å»ºç«?ä¸?å??å¾?å?¯è?½æ??è®?ç??è¦½å?¨æ??æ??ç??å·¨å¤§ HTML æª?ã??"
 
 #. HTML Page Options
-#: ../plug-ins/common/file-html-table.c:441
+#: ../plug-ins/common/file-html-table.c:442
 msgid "HTML Page Options"
 msgstr "HTML ç¶²é ?é?¸é ?"
 
-#: ../plug-ins/common/file-html-table.c:448
+#: ../plug-ins/common/file-html-table.c:449
 msgid "_Generate full HTML document"
 msgstr "ç?¢ç??å®?æ?´ç?? _HTML æ??ä»¶"
 
-#: ../plug-ins/common/file-html-table.c:454
+#: ../plug-ins/common/file-html-table.c:455
 msgid ""
 "If checked GTM will output a full HTML document with <HTML>, <BODY>, etc. "
 "tags instead of just the table html."
 msgstr "è?¥é?¸å??æ?¬é?¸é ?ï¼?GTM æ??è¼¸å?ºä¸?å??å??å?« <HTML>ã??<BODY> ç?æ¨?ç±¤ç??å®?æ?´ HTML æª?ï¼?è??é??å?ªæ??è¡¨æ ¼é?¨ä»½ç?? HTMLã??"
 
 #. HTML Table Creation Options
-#: ../plug-ins/common/file-html-table.c:467
+#: ../plug-ins/common/file-html-table.c:468
 msgid "Table Creation Options"
 msgstr "è¡¨æ ¼å»ºç«?é?¸é ?"
 
-#: ../plug-ins/common/file-html-table.c:475
+#: ../plug-ins/common/file-html-table.c:476
 msgid "_Use cellspan"
 msgstr "ä½¿ç?¨ _Cellspan"
 
-#: ../plug-ins/common/file-html-table.c:481
+#: ../plug-ins/common/file-html-table.c:482
 msgid ""
 "If checked GTM will replace any rectangular sections of identically colored "
 "blocks with one large cell with ROWSPAN and COLSPAN values."
 msgstr "è?¥é?¸ä¸?æ¤é?¸é ?ï¼?GTM æ??å°?ä»»ä½?æ??ç?©å??å??å??è??ä¸?é¡?è?²ç?¸å??ç??æ ¼å?å??æ??ä¸?å??æ?? ROWSPAN å?? COLSPAN å?¼ç??å¤§å??æ?¹æ ¼ã??"
 
-#: ../plug-ins/common/file-html-table.c:490
+#: ../plug-ins/common/file-html-table.c:491
 msgid "Co_mpress TD tags"
 msgstr "å£?ç¸® TD æ¨?ç±¤(_M)"
 
-#: ../plug-ins/common/file-html-table.c:496
+#: ../plug-ins/common/file-html-table.c:497
 msgid ""
 "Checking this tag will cause GTM to leave no whitespace between the TD tags "
 "and the cellcontent.  This is only necessary for pixel level positioning "
 "control."
 msgstr "è?¥é?¸ä¸?æ¤é?¸é ?ï¼?GTM å°?ä¸?æ??å?¨ TD æ¨?ç±¤å??æ ¼å?å?§å®¹ä¹?é??ç??ä¸?ä»»ä½?ç©ºç?½å?ç¬¦ã??é??å?ªå?¨é??è¦?ä»¥å??ç´ ç??ç¨?åº¦æ?§å?¶ä½?ç½®æ??æ??é??è¦?ä½¿ç?¨ã??"
 
-#: ../plug-ins/common/file-html-table.c:506
+#: ../plug-ins/common/file-html-table.c:507
 msgid "C_aption"
 msgstr "æ¨?é¡?(_A)"
 
-#: ../plug-ins/common/file-html-table.c:512
+#: ../plug-ins/common/file-html-table.c:513
 msgid "Check if you would like to have the table captioned."
 msgstr "è?¥è¡¨æ ¼è¦?æ??æ¨?é¡?è«?é?¸å??æ?¬é?¸é ?ã??"
 
-#: ../plug-ins/common/file-html-table.c:527
+#: ../plug-ins/common/file-html-table.c:528
 msgid "The text for the table caption."
 msgstr "è¡¨æ ¼ç??æ¨?é¡?ã??"
 
-#: ../plug-ins/common/file-html-table.c:540
+#: ../plug-ins/common/file-html-table.c:541
 msgid "C_ell content:"
 msgstr "æ ¼å?å?§å®¹(_E)ï¼?"
 
-#: ../plug-ins/common/file-html-table.c:544
+#: ../plug-ins/common/file-html-table.c:545
 msgid "The text to go into each cell."
 msgstr "æº?å??æ?¾å?°æ ¼å?§ç??æ??å?ã??"
 
 #. HTML Table Options
-#: ../plug-ins/common/file-html-table.c:554
+#: ../plug-ins/common/file-html-table.c:555
 msgid "Table Options"
 msgstr "è¡¨æ ¼é?¸é ?"
 
-#: ../plug-ins/common/file-html-table.c:565
+#: ../plug-ins/common/file-html-table.c:566
 msgid "_Border:"
 msgstr "é??æ¡?(_B)ï¼?"
 
-#: ../plug-ins/common/file-html-table.c:569
+#: ../plug-ins/common/file-html-table.c:570
 msgid "The number of pixels in the table border."
 msgstr "è¡¨æ ¼é??æ¡?ç??é??åº¦(å??ç´ )ã??"
 
-#: ../plug-ins/common/file-html-table.c:584
+#: ../plug-ins/common/file-html-table.c:585
 msgid "The width for each table cell.  Can be a number or a percent."
 msgstr "è¡¨æ ¼æ ¼å?ç??é??åº¦ã??å?¯ä»¥æ?¯æ?¸å?æ??æ?¯ç?¾å??æ¯?ã??"
 
-#: ../plug-ins/common/file-html-table.c:600
+#: ../plug-ins/common/file-html-table.c:601
 msgid "The height for each table cell.  Can be a number or a percent."
 msgstr "è¡¨æ ¼æ ¼å?ç??é«?åº¦ã??å?¯ä»¥æ?¯æ?¸å?æ??æ?¯ç?¾å??æ¯?ã??"
 
-#: ../plug-ins/common/file-html-table.c:611
+#: ../plug-ins/common/file-html-table.c:612
 msgid "Cell-_padding:"
 msgstr "æ ¼å?ç??é??(_P)ï¼?"
 
-#: ../plug-ins/common/file-html-table.c:615
+#: ../plug-ins/common/file-html-table.c:616
 msgid "The amount of cellpadding."
 msgstr "æ ¼å?ç??é??ç??é??åº¦ã??"
 
-#: ../plug-ins/common/file-html-table.c:624
+#: ../plug-ins/common/file-html-table.c:625
 msgid "Cell-_spacing:"
 msgstr "æ ¼å?é??é??(_S)ï¼?"
 
-#: ../plug-ins/common/file-html-table.c:628
+#: ../plug-ins/common/file-html-table.c:629
 msgid "The amount of cellspacing."
 msgstr "æ ¼å?é??é??ç??è·?é?¢ã??"
 
@@ -3817,33 +3809,33 @@ msgstr "PCX å??ç??æ ¼å¼?"
 msgid "Could not read header from '%s'"
 msgstr "ç?¡æ³?å¾?â??%sâ??è®?å??æ¨?é è³?æ??"
 
-#: ../plug-ins/common/file-pcx.c:381
+#: ../plug-ins/common/file-pcx.c:382
 #, c-format
 msgid "'%s' is not a PCX file"
 msgstr "â??%sâ??ä¸?æ?¯ PCX æª?ã??"
 
-#: ../plug-ins/common/file-pcx.c:394 ../plug-ins/file-bmp/bmp-read.c:637
+#: ../plug-ins/common/file-pcx.c:396 ../plug-ins/file-bmp/bmp-read.c:638
 #: ../plug-ins/file-psd/psd-load.c:301
 #, fuzzy, c-format
 msgid "Unsupported or invalid image width: %d"
 msgstr "å??ç??ç??é??åº¦å??/æ??é«?åº¦ç?¡æ??"
 
-#: ../plug-ins/common/file-pcx.c:399 ../plug-ins/file-bmp/bmp-read.c:643
+#: ../plug-ins/common/file-pcx.c:402 ../plug-ins/file-bmp/bmp-read.c:644
 #: ../plug-ins/file-psd/psd-load.c:293
 #, fuzzy, c-format
 msgid "Unsupported or invalid image height: %d"
 msgstr "å??ç??ç??é??åº¦å??/æ??é«?åº¦ç?¡æ??"
 
-#: ../plug-ins/common/file-pcx.c:404
+#: ../plug-ins/common/file-pcx.c:408
 msgid "Invalid number of bytes per line in PCX header"
 msgstr ""
 
-#: ../plug-ins/common/file-pcx.c:411
+#: ../plug-ins/common/file-pcx.c:416
 #, c-format
 msgid "Image dimensions too large: width %d x height %d"
 msgstr "å??ç??å°ºå¯¸é??å¤§ï¼?é??åº¦ %d x é«?åº¦ %d"
 
-#: ../plug-ins/common/file-pcx.c:459
+#: ../plug-ins/common/file-pcx.c:465
 msgid "Unusual PCX flavour, giving up"
 msgstr "PCX æ ¼å¼?æ??å??é¡?ï¼?æ?¾æ£?è¼?å?¥"
 
@@ -3867,11 +3859,52 @@ msgstr ""
 msgid "Bottom border out of bounds (must be < %d): %d"
 msgstr ""
 
-#: ../plug-ins/common/file-pcx.c:758
+#: ../plug-ins/common/file-pcx.c:766
 #, fuzzy, c-format
 msgid "Writing to file '%s' failed: %s"
 msgstr "é??å??æª?æ¡?ã??%sã??å¤±æ??ï¼?%s"
 
+#: ../plug-ins/common/file-pdf-load.c:289
+#, fuzzy
+msgid "Portable Document Format"
+msgstr "DJVU æ??ä»¶æ??ä¸?æ£ç¢ºç??æ ¼å¼?"
+
+#: ../plug-ins/common/file-pdf-load.c:556
+#, fuzzy, c-format
+msgid "Could not load '%s': %s"
+msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
+
+#: ../plug-ins/common/file-pdf-load.c:635
+#, c-format
+msgid "%s-%s"
+msgstr "%s-%s"
+
+#: ../plug-ins/common/file-pdf-load.c:637 ../plug-ins/common/file-ps.c:1125
+#, fuzzy, c-format
+msgid "%s-pages"
+msgstr " é ?"
+
+#: ../plug-ins/common/file-pdf-load.c:823
+msgid "Import from PDF"
+msgstr "å¾? PDF æª?å?¯å?¥"
+
+#: ../plug-ins/common/file-pdf-load.c:828 ../plug-ins/common/file-ps.c:3097
+#: ../plug-ins/common/file-tiff-load.c:483
+msgid "_Import"
+msgstr "å?¯å?¥(_I)"
+
+#: ../plug-ins/common/file-pdf-load.c:896
+msgid "_Width (pixels):"
+msgstr "é??åº¦[å??ç´ ](_W)ï¼?"
+
+#: ../plug-ins/common/file-pdf-load.c:897
+msgid "_Height (pixels):"
+msgstr "é«?åº¦[å??ç´ ](_H)ï¼?"
+
+#: ../plug-ins/common/file-pdf-load.c:899
+msgid "_Resolution:"
+msgstr "è§£å??åº¦(_R)ï¼?"
+
 #: ../plug-ins/common/file-pix.c:141 ../plug-ins/common/file-pix.c:158
 #, fuzzy
 msgid "Alias Pix image"
@@ -4014,11 +4047,6 @@ msgstr "PDF æ??ä»¶"
 msgid "Could not interpret Postscript file '%s'"
 msgstr "æ?¾ä¸?å?° pixmap æª?â??%sâ??\n"
 
-#: ../plug-ins/common/file-ps.c:1125
-#, fuzzy, c-format
-msgid "%s-pages"
-msgstr " é ?"
-
 #: ../plug-ins/common/file-ps.c:1192
 #, c-format
 msgid "PostScript save cannot handle images with alpha channels"
@@ -4040,7 +4068,7 @@ msgstr "ç¬¬ %d é ?"
 
 #: ../plug-ins/common/file-ps.c:2601 ../plug-ins/common/file-ps.c:2733
 #: ../plug-ins/common/file-ps.c:2883 ../plug-ins/common/file-ps.c:3008
-#: ../plug-ins/common/file-sunras.c:1503 ../plug-ins/common/file-sunras.c:1611
+#: ../plug-ins/common/file-sunras.c:1504 ../plug-ins/common/file-sunras.c:1612
 #: ../plug-ins/file-fits/fits.c:849 ../plug-ins/file-fits/fits.c:973
 msgid "Write error occurred"
 msgstr "ç?¼ç??å¯«å?¥é?¯èª¤"
@@ -4050,10 +4078,6 @@ msgstr "ç?¼ç??å¯«å?¥é?¯èª¤"
 msgid "Import from PostScript"
 msgstr "ç?±æª?æ¡?å?¯å?¥"
 
-#: ../plug-ins/common/file-ps.c:3097 ../plug-ins/common/file-tiff-load.c:483
-msgid "_Import"
-msgstr "å?¯å?¥(_I)"
-
 #. Rendering
 #: ../plug-ins/common/file-ps.c:3135
 msgid "Rendering"
@@ -4075,7 +4099,7 @@ msgstr " é ?"
 msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)"
 msgstr "ç?¡æ³?è¼?å?¥é??æ?²"
 
-#: ../plug-ins/common/file-ps.c:3201 ../plug-ins/common/sphere-designer.c:2643
+#: ../plug-ins/common/file-ps.c:3201 ../plug-ins/common/sphere-designer.c:2647
 msgid "Layers"
 msgstr "å??å±¤"
 
@@ -4326,11 +4350,11 @@ msgstr "ä¸?æ?¯æ?´æ¤é¡?å??ç?? SUN raster æª?æ¡?"
 msgid "Could not read color entries from '%s'"
 msgstr "ç?¡æ³?å¾?â??%sâ??è®?å??è?²å½©é ?ç?®"
 
-#: ../plug-ins/common/file-sunras.c:448
+#: ../plug-ins/common/file-sunras.c:449
 msgid "Type of colormap not supported"
 msgstr "ä¸?æ?¯æ?´æ¤é¡? colormap"
 
-#: ../plug-ins/common/file-sunras.c:455 ../plug-ins/common/file-xbm.c:826
+#: ../plug-ins/common/file-sunras.c:456 ../plug-ins/common/file-xbm.c:826
 #: ../plug-ins/common/file-xwd.c:488
 #, c-format
 msgid ""
@@ -4340,16 +4364,16 @@ msgstr ""
 "â??%sâ??ï¼?\n"
 "æ?ªæ??å®?å??ç??é??åº¦"
 
-#: ../plug-ins/common/file-sunras.c:463 ../plug-ins/common/file-xbm.c:833
-#: ../plug-ins/common/file-xwd.c:497
+#: ../plug-ins/common/file-sunras.c:464 ../plug-ins/common/file-xbm.c:833
+#: ../plug-ins/common/file-xwd.c:498
 #, c-format
 msgid ""
 "'%s':\n"
 "Image width is larger than GIMP can handle"
 msgstr ""
 
-#: ../plug-ins/common/file-sunras.c:471 ../plug-ins/common/file-xbm.c:840
-#: ../plug-ins/common/file-xwd.c:505
+#: ../plug-ins/common/file-sunras.c:472 ../plug-ins/common/file-xbm.c:840
+#: ../plug-ins/common/file-xwd.c:507
 #, c-format
 msgid ""
 "'%s':\n"
@@ -4358,48 +4382,48 @@ msgstr ""
 "â??%sâ??ï¼?\n"
 "æ?ªæ??å®?å??ç??é«?åº¦"
 
-#: ../plug-ins/common/file-sunras.c:479 ../plug-ins/common/file-xbm.c:847
-#: ../plug-ins/common/file-xwd.c:513
+#: ../plug-ins/common/file-sunras.c:480 ../plug-ins/common/file-xbm.c:847
+#: ../plug-ins/common/file-xwd.c:516
 #, c-format
 msgid ""
 "'%s':\n"
 "Image height is larger than GIMP can handle"
 msgstr ""
 
-#: ../plug-ins/common/file-sunras.c:517
+#: ../plug-ins/common/file-sunras.c:518
 #, fuzzy
 msgid "This image depth is not supported"
 msgstr "æ?¬é¡?å??ç??å°?è©±æ?¹å¡?ä¸?æ?¯æ?´ %s é?¸é ?\n"
 
-#: ../plug-ins/common/file-sunras.c:541
+#: ../plug-ins/common/file-sunras.c:542
 #, c-format
 msgid "SUNRAS save cannot handle images with alpha channels"
 msgstr "SUNRAS å?²å?ç¨?åº?ç?¡æ³?è??ç??æ??é??æ??è?²ç??ç??å??ç??"
 
-#: ../plug-ins/common/file-sunras.c:552
+#: ../plug-ins/common/file-sunras.c:553
 msgid "Can't operate on unknown image types"
 msgstr "ä¸?é?©ç?¨æ?¼ä¸?æ??ç??å??ç??é¡?å??"
 
-#: ../plug-ins/common/file-sunras.c:1081 ../plug-ins/common/file-sunras.c:1172
-#: ../plug-ins/common/file-sunras.c:1253 ../plug-ins/common/file-sunras.c:1348
-#: ../plug-ins/common/file-xwd.c:1347 ../plug-ins/common/file-xwd.c:1448
-#: ../plug-ins/common/file-xwd.c:1606 ../plug-ins/common/file-xwd.c:1806
-#: ../plug-ins/common/file-xwd.c:2063 ../plug-ins/file-fits/fits.c:696
+#: ../plug-ins/common/file-sunras.c:1082 ../plug-ins/common/file-sunras.c:1173
+#: ../plug-ins/common/file-sunras.c:1254 ../plug-ins/common/file-sunras.c:1349
+#: ../plug-ins/common/file-xwd.c:1351 ../plug-ins/common/file-xwd.c:1452
+#: ../plug-ins/common/file-xwd.c:1610 ../plug-ins/common/file-xwd.c:1810
+#: ../plug-ins/common/file-xwd.c:2067 ../plug-ins/file-fits/fits.c:696
 msgid "EOF encountered on reading"
 msgstr "è®?å??æ??é??å?° EOF"
 
-#: ../plug-ins/common/file-sunras.c:1628
+#: ../plug-ins/common/file-sunras.c:1629
 #, fuzzy
 msgid "SUNRAS"
 msgstr "å?²å?ç?º SUNRAS"
 
 #. file save type
-#: ../plug-ins/common/file-sunras.c:1631
+#: ../plug-ins/common/file-sunras.c:1632
 #, fuzzy
 msgid "Data Formatting"
 msgstr "æ£å?¨æ ¼å¼?å??å??å?²å?? %d / %s (%s)"
 
-#: ../plug-ins/common/file-sunras.c:1635
+#: ../plug-ins/common/file-sunras.c:1636
 msgid "RunLength Encoded"
 msgstr ""
 
@@ -4606,7 +4630,7 @@ msgstr "å?³ç??è¨å®?ç®¡ç??"
 
 #: ../plug-ins/common/file-tiff-save.c:1101
 msgid "Save _color values from transparent pixels"
-msgstr ""
+msgstr "ä¿?å?å¾?é??æ??å??ç´ ç??é¡?è?²å?¼(_C)"
 
 #: ../plug-ins/common/file-tiff-save.c:1117 ../plug-ins/common/file-xbm.c:1232
 msgid "Comment:"
@@ -4975,7 +4999,7 @@ msgstr "ç?¡æ³?å¾?â??%sâ??è®?å?? XWD æª?é è³?æ??"
 msgid "Can't read color entries"
 msgstr "ç?¡æ³?è®?å?¥ä»»ä½?é?µç?¤ï¼?"
 
-#: ../plug-ins/common/file-xwd.c:569
+#: ../plug-ins/common/file-xwd.c:573
 #, fuzzy, c-format
 msgid ""
 "XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is "
@@ -4984,15 +5008,15 @@ msgstr ""
 "XWD æª?æ¡? %s ç??æ ¼å¼?æ?¯ %dï¼?è?²å½©æ·±åº¦ç?º %d è??æ¯?å??å??ç´ ä½? %d ä½?å??ã??\n"
 "ç?®å??æ?ªæ??æ?¯æ?´é??ç¨®æ ¼å¼?ã??"
 
-#: ../plug-ins/common/file-xwd.c:592
+#: ../plug-ins/common/file-xwd.c:596
 msgid "Cannot save images with alpha channels."
 msgstr "ç?¡æ³?å?²å?æ??é??æ??è?²ç??ç??å??ç??ã??"
 
-#: ../plug-ins/common/file-xwd.c:2194
+#: ../plug-ins/common/file-xwd.c:2198
 msgid "Error during writing indexed/gray image"
 msgstr "å¯«å?¥ç´¢å¼?è?²æ??ç?°é??å??ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../plug-ins/common/file-xwd.c:2292
+#: ../plug-ins/common/file-xwd.c:2296
 msgid "Error during writing rgb image"
 msgstr "å¯«å?¥ rgb å??ç??æ??ç?¼ç??é?¯èª¤"
 
@@ -5231,7 +5255,7 @@ msgstr "å½±ç??ç?«é?¢ç??é£½å??åº¦"
 
 #: ../plug-ins/common/filter-pack.c:829
 msgid "Select Pixels By"
-msgstr "ç?¨ä½?è??é?¸æ??å??ç´ "
+msgstr "é?¸å??å??ç´ æ ¹æ??"
 
 #: ../plug-ins/common/filter-pack.c:834
 msgid "H_ue"
@@ -5330,7 +5354,7 @@ msgstr "Y_2ï¼?"
 
 #: ../plug-ins/common/gradient-map.c:83
 msgid "Recolor the image using colors from the active gradient"
-msgstr "é??æ?°ç?ºå??ç??ç??è?²,ä½¿ç?¨å??æ?¯è??è??æ?¯é¡?è?²ç?¢ç??ç??æ¼¸è®?è?²é¡?è?²"
+msgstr "é??æ?°ç?ºå??ç??ç??è?²,ä½¿ç?¨ä½?ç?¨ä¸ç??æ¼¸è®?è?²é¡?è?²"
 
 #: ../plug-ins/common/gradient-map.c:96
 msgid "_Gradient Map"
@@ -5338,7 +5362,7 @@ msgstr "æ¼¸è®?è?²æ? å°?(_G)"
 
 #: ../plug-ins/common/gradient-map.c:105
 msgid "Recolor the image using colors from the active palette"
-msgstr "é??æ?°ç?ºå??ç??ç??è?²ï¼?ç?¨ä½¿ç?¨ä¸ç??èª¿è?²ç?¤"
+msgstr "é??æ?°ç?ºå??ç??ç??è?²ï¼?ä½¿ç?¨ä½?ç?¨ä¸ç??èª¿è?²ç?¤"
 
 #: ../plug-ins/common/gradient-map.c:118
 msgid "_Palette Map"
@@ -5371,18 +5395,16 @@ msgstr "æ ¼ç·?"
 
 #. attach labels
 #: ../plug-ins/common/grid.c:717
-#, fuzzy
 msgid ""
 "Horizontal\n"
 "Lines"
-msgstr "æ°´å¹³å°?é½?è¨å®?"
+msgstr "æ°´å¹³ç·?"
 
 #: ../plug-ins/common/grid.c:719
-#, fuzzy
 msgid ""
 "Vertical\n"
 "Lines"
-msgstr "ç?´å¼?æ¨?é»?"
+msgstr "å??ç?´ç·?"
 
 #: ../plug-ins/common/grid.c:721
 msgid "Intersection"
@@ -5555,7 +5577,7 @@ msgstr "è®?å½¢å??å??å??å¾?(_D)ï¼?"
 
 #: ../plug-ins/common/iwarp.c:1157
 msgid "D_eform amount:"
-msgstr "è®?å½¢ç¨?åº¦(_E)ï¼?"
+msgstr "è®?å½¢ç¸½é??(_E)ï¼?"
 
 #: ../plug-ins/common/iwarp.c:1166
 msgid "_Bilinear"
@@ -5715,9 +5737,9 @@ msgstr "æª?æ¡?â??%sâ??ä¸?å??æ?¯ IFS Compose æª?æ¡?ã??"
 
 #. ICC color profile conversion
 #: ../plug-ins/common/lcms.c:884
-#, fuzzy, c-format
+#, c-format
 msgid "Converting from '%s' to '%s'"
-msgstr "è¡?äº?æ??ï¼?å¾? %s å?° %s"
+msgstr "è½?æ??å¾?ã??%sã??å?°ã??%sã??"
 
 #: ../plug-ins/common/lcms.c:1128
 #, fuzzy, c-format
@@ -5951,7 +5973,7 @@ msgstr "æ¨?é¡?(_U)ï¼?"
 msgid "some sort of error with the file extension or lack thereof"
 msgstr "å»¶ä¼¸æª?å??æ??é?¯èª¤æ??è??ä¸?å?å?¨"
 
-#: ../plug-ins/common/mail.c:724
+#: ../plug-ins/common/mail.c:726
 #, fuzzy, c-format
 msgid "Could not start sendmail (%s)"
 msgstr "ç?¡æ³?é??å§?æ??å°?ç¨?åº?"
@@ -6247,11 +6269,11 @@ msgstr "é?¨æ©?ç??å??æ??æ?²"
 
 #: ../plug-ins/common/noise-randomize.c:102
 msgid "Random Pick"
-msgstr "é?¨æ©?é?¸æ??"
+msgstr "æ½?æ¿º"
 
 #: ../plug-ins/common/noise-randomize.c:103
 msgid "Random Slur"
-msgstr "é?¨æ©?æ³¥æ¼¿"
+msgstr "å?«ç³?"
 
 #: ../plug-ins/common/noise-randomize.c:201
 msgid "Completely randomize a fraction of pixels"
@@ -6263,7 +6285,7 @@ msgstr "å??é?°è¿?ç??å??ç´ é?¨æ©?äº¤æ??ä¸?äº?"
 
 #: ../plug-ins/common/noise-randomize.c:205
 msgid "Randomly slide some pixels downward (similar to melting)"
-msgstr "ä¸?äº?é?¨æ©?å??ç´ å??ä¸?æ»?å??(é¡?ä¼¼ç??å??)"
+msgstr "é?¨æ©?æ»?å??ä¸?äº?å??ç´ (é¡?ä¼¼ç??å??)"
 
 #: ../plug-ins/common/noise-randomize.c:232
 msgid "_Hurl..."
@@ -6271,11 +6293,11 @@ msgstr "ç??å??æ??æ?²(_H)..."
 
 #: ../plug-ins/common/noise-randomize.c:244
 msgid "_Pick..."
-msgstr "é?¸æ??æ?§ç??(_P)..."
+msgstr "æ½?æ¿º(_P)..."
 
 #: ../plug-ins/common/noise-randomize.c:256
 msgid "_Slur..."
-msgstr "æ³¥æ¼¿(_S)..."
+msgstr "å?«ç³?(_S)..."
 
 #: ../plug-ins/common/noise-randomize.c:771
 #: ../plug-ins/common/noise-solid.c:602
@@ -6288,7 +6310,7 @@ msgstr "é?¨æ©?å??[%] (_A)ï¼?"
 
 #: ../plug-ins/common/noise-randomize.c:783
 msgid "Percentage of pixels to be filtered"
-msgstr ""
+msgstr "ç?¾å??æ¯?ç??å??ç´ è¢«é??æ¿¾"
 
 #: ../plug-ins/common/noise-randomize.c:795
 msgid "R_epeat:"
@@ -6736,45 +6758,45 @@ msgstr "æ¼£æ¼ª(_R)..."
 msgid "Rippling"
 msgstr "æ¼£æ³¢èµ·ä¼?"
 
-#: ../plug-ins/common/ripple.c:482
+#: ../plug-ins/common/ripple.c:484
 msgid "Ripple"
 msgstr "æ¼£æ¼ª"
 
-#: ../plug-ins/common/ripple.c:541
+#: ../plug-ins/common/ripple.c:543
 msgid "_Retain tilability"
 msgstr "ä¿?ç??å?¯é?ªæ??ç??æ?§è³ª(_R)"
 
 #. Edges toggle box
-#: ../plug-ins/common/ripple.c:578
+#: ../plug-ins/common/ripple.c:580
 msgid "Edges"
 msgstr "é??ç·£"
 
-#: ../plug-ins/common/ripple.c:584
+#: ../plug-ins/common/ripple.c:586
 msgid "_Blank"
 msgstr "ç?¡å??æ¡?(_B)"
 
 #. Wave toggle box
-#: ../plug-ins/common/ripple.c:606
+#: ../plug-ins/common/ripple.c:608
 msgid "Wave Type"
 msgstr "æ³¢æµªé¡?å??"
 
-#: ../plug-ins/common/ripple.c:610
+#: ../plug-ins/common/ripple.c:612
 msgid "Saw_tooth"
 msgstr "é?¸é½?(_T)"
 
-#: ../plug-ins/common/ripple.c:611
+#: ../plug-ins/common/ripple.c:613
 msgid "S_ine"
 msgstr "å¼¦æ³¢(_I)"
 
-#: ../plug-ins/common/ripple.c:634
+#: ../plug-ins/common/ripple.c:636
 msgid "_Period:"
 msgstr "å?¨æ??(_P)ï¼?"
 
-#: ../plug-ins/common/ripple.c:647
+#: ../plug-ins/common/ripple.c:649
 msgid "A_mplitude:"
 msgstr "æ³¢å¹?(_M)ï¼?"
 
-#: ../plug-ins/common/ripple.c:660
+#: ../plug-ins/common/ripple.c:662
 msgid "Phase _shift:"
 msgstr "ç?¸ä½?ç§»(_S):"
 
@@ -6796,19 +6818,19 @@ msgstr "æ??è½?"
 
 #: ../plug-ins/common/sample-colorize.c:297
 msgid "Colorize image using a sample image as a guide"
-msgstr "å??ç??ç??è?²ä½¿ç?¨æ¨£å??å??ç??ä½?ç?ºæ??å¼?"
+msgstr "å??ç??ç??è?²ä½¿ç?¨æ¨£æ?¬å??ç??ä½?ç?ºæ??å¼?"
 
 #: ../plug-ins/common/sample-colorize.c:302
 msgid "_Sample Colorize..."
-msgstr "æ¨£å??è?²ç??è?²(_S)..."
+msgstr "æ¨£æ?¬ç??è?²(_S)..."
 
 #: ../plug-ins/common/sample-colorize.c:1315
 msgid "Sample Colorize"
-msgstr "æ¨£å??è?²ç??è?²"
+msgstr "æ¨£æ?¬ç??è?²"
 
 #: ../plug-ins/common/sample-colorize.c:1320
 msgid "Get _Sample Colors"
-msgstr "å??å¾?æ¨£å??è?²(_S)"
+msgstr "å??å¾?æ¨£æ?¬è?²(_S)"
 
 #. layer combo_box (Dst)
 #: ../plug-ins/common/sample-colorize.c:1349
@@ -6818,7 +6840,7 @@ msgstr "ç?®æ¨?ï¼?"
 #. layer combo_box (Sample)
 #: ../plug-ins/common/sample-colorize.c:1365
 msgid "Sample:"
-msgstr "æ¨£å??ï¼?"
+msgstr "æ¨£æ?¬ï¼?"
 
 #: ../plug-ins/common/sample-colorize.c:1375
 msgid "From reverse gradient"
@@ -6867,11 +6889,11 @@ msgstr "<ç§?äººå°?ç?¨å??>"
 #. check button
 #: ../plug-ins/common/sample-colorize.c:1682
 msgid "Smooth samples"
-msgstr "å¹³æ»?æ¨£å??è?²"
+msgstr "å¹³æ»?æ¨£æ?¬è?²"
 
 #: ../plug-ins/common/sample-colorize.c:2654
 msgid "Sample analyze"
-msgstr "æ¨£å??å??æ??"
+msgstr "æ¨£æ?¬å??æ??"
 
 #: ../plug-ins/common/sample-colorize.c:3032
 msgid "Remap colorized"
@@ -7222,35 +7244,35 @@ msgstr "èª¿æ?´ç?«å??é??è??äº®åº¦"
 
 #: ../plug-ins/common/sparkle.c:399
 msgid "_Spike length:"
-msgstr "ç©?ç??é?·åº¦(_S):"
+msgstr "å??è??é?·åº¦(_S)ï¼?"
 
 #: ../plug-ins/common/sparkle.c:402
 msgid "Adjust the spike length"
-msgstr "èª¿æ?´ç?«è?±ç©?é?·"
+msgstr "èª¿æ?´å??è??é?·åº¦"
 
 #: ../plug-ins/common/sparkle.c:412
 msgid "Sp_ike points:"
-msgstr "ç©?ç??æ?¸ç?®(_I):"
+msgstr "å??è??ç??æ?¸ç?®(_I)ï¼?"
 
 #: ../plug-ins/common/sparkle.c:415
 msgid "Adjust the number of spikes"
-msgstr "èª¿æ?´ç?«è?±ç©?ç??æ?¸ç?®"
+msgstr "èª¿æ?´å??è??ç??æ?¸ç?®"
 
 #: ../plug-ins/common/sparkle.c:425
 msgid "Spi_ke angle (-1: random):"
-msgstr "ç©?ç??è§?åº¦[-1:é?¨æ©?ç??](_K):"
+msgstr "å??è??ç??è§?åº¦[-1:é?¨æ©?ç??](_K)ï¼?"
 
 #: ../plug-ins/common/sparkle.c:428
 msgid "Adjust the spike angle (-1 causes a random angle to be chosen)"
-msgstr "èª¿æ?´ç©?ç??è§?åº¦(è¨å®?å?¼è?¥ç?º-1 ç?¢ç??ä¸?å??é?¨æ©?é?¸æ??ç??è§?åº¦)"
+msgstr "èª¿æ?´å??è??ç??è§?åº¦(è¨å®?å?¼è?¥ç?º-1 ç?¢ç??ä¸?å??é?¨æ©?é?¸æ??ç??è§?åº¦)"
 
 #: ../plug-ins/common/sparkle.c:439
 msgid "Spik_e density:"
-msgstr "ç©?ç??å¯?åº¦(_E):"
+msgstr "å??è??ç??å¯?åº¦(_E)ï¼?"
 
 #: ../plug-ins/common/sparkle.c:442
 msgid "Adjust the spike density"
-msgstr "èª¿æ?´ç?«è?±ç©?ç??å¯?åº¦"
+msgstr "èª¿æ?´å??è??ç??å¯?åº¦"
 
 #: ../plug-ins/common/sparkle.c:452
 msgid "Tr_ansparency:"
@@ -7258,7 +7280,7 @@ msgstr "é??æ??åº¦(_A):"
 
 #: ../plug-ins/common/sparkle.c:455
 msgid "Adjust the opacity of the spikes"
-msgstr "èª¿æ?´ç?«è?±ç©?ç??ä¸?é??æ??åº¦"
+msgstr "èª¿æ?´å??è??ç??ä¸?é??æ??åº¦"
 
 #: ../plug-ins/common/sparkle.c:465
 msgid "_Random hue:"
@@ -7324,177 +7346,175 @@ msgstr "ä½¿ç?¨å??æ?¯é¡?è?²"
 msgid "Use the background color"
 msgstr "ä½¿ç?¨è??æ?¯é¡?è?²"
 
-#: ../plug-ins/common/sphere-designer.c:290
+#: ../plug-ins/common/sphere-designer.c:292
 #: ../plug-ins/gimpressionist/general.c:165
 msgid "Solid"
 msgstr "ç´?è?²"
 
-#: ../plug-ins/common/sphere-designer.c:291
+#: ../plug-ins/common/sphere-designer.c:293
 msgid "Checker"
 msgstr "æ£?ç?¤"
 
-#: ../plug-ins/common/sphere-designer.c:292
+#: ../plug-ins/common/sphere-designer.c:294
 msgid "Marble"
 msgstr "å¤§ç??ç?³ç´?"
 
-#: ../plug-ins/common/sphere-designer.c:293
+#: ../plug-ins/common/sphere-designer.c:295
 msgid "Lizard"
-msgstr ""
+msgstr "è?¥è?´"
 
-#: ../plug-ins/common/sphere-designer.c:294
+#: ../plug-ins/common/sphere-designer.c:296
 msgid "Phong"
 msgstr ""
 
-#: ../plug-ins/common/sphere-designer.c:295 ../plug-ins/flame/flame.c:771
+#: ../plug-ins/common/sphere-designer.c:297 ../plug-ins/flame/flame.c:771
 #, fuzzy
 msgid "Noise"
 msgstr "å?ªé?³é?³æ¨?"
 
-#: ../plug-ins/common/sphere-designer.c:296
+#: ../plug-ins/common/sphere-designer.c:298
 msgid "Wood"
 msgstr "æ?¨ç´?"
 
-#: ../plug-ins/common/sphere-designer.c:297 ../plug-ins/flame/flame.c:755
+#: ../plug-ins/common/sphere-designer.c:299 ../plug-ins/flame/flame.c:755
 msgid "Spiral"
 msgstr "æ¼©æ¸¦"
 
-#: ../plug-ins/common/sphere-designer.c:298
+#: ../plug-ins/common/sphere-designer.c:300
 msgid "Spots"
 msgstr "å°?ç??"
 
-#: ../plug-ins/common/sphere-designer.c:1741
-#: ../plug-ins/common/sphere-designer.c:2690
+#: ../plug-ins/common/sphere-designer.c:1743
+#: ../plug-ins/common/sphere-designer.c:2694
 msgid "Texture"
 msgstr "ç´ æ??"
 
-#: ../plug-ins/common/sphere-designer.c:1743
+#: ../plug-ins/common/sphere-designer.c:1745
 msgid "Bumpmap"
 msgstr "å?¹å?¸è²¼å??"
 
-#: ../plug-ins/common/sphere-designer.c:1745
-#: ../plug-ins/common/sphere-designer.c:2692
+#: ../plug-ins/common/sphere-designer.c:1747
+#: ../plug-ins/common/sphere-designer.c:2696
 msgid "Light"
 msgstr "å??ç·?"
 
-#: ../plug-ins/common/sphere-designer.c:2008
+#: ../plug-ins/common/sphere-designer.c:2010
 #, fuzzy, c-format
 msgid "File '%s' is not a valid save file."
 msgstr "æª?æ¡?ä¸?æ?¯æ??æ??ç?? .desktop æª?æ¡?"
 
-#: ../plug-ins/common/sphere-designer.c:2186
+#: ../plug-ins/common/sphere-designer.c:2188
 msgid "Open File"
 msgstr "é??å??æª?æ¡?"
 
-#: ../plug-ins/common/sphere-designer.c:2186
+#: ../plug-ins/common/sphere-designer.c:2188
 msgid "Save File"
 msgstr "å?²å?æª?æ¡?"
 
-#: ../plug-ins/common/sphere-designer.c:2543
+#: ../plug-ins/common/sphere-designer.c:2547
 msgid "Sphere Designer"
 msgstr "ç??é«?è¨è¨?"
 
-#: ../plug-ins/common/sphere-designer.c:2675
+#: ../plug-ins/common/sphere-designer.c:2679
 msgid "Properties"
 msgstr "å±¬æ?§"
 
-#: ../plug-ins/common/sphere-designer.c:2691
+#: ../plug-ins/common/sphere-designer.c:2695
 msgid "Bump"
 msgstr "å?¹å?¸"
 
 #. row labels
-#: ../plug-ins/common/sphere-designer.c:2699
-#: ../plug-ins/lighting/lighting-ui.c:404
+#: ../plug-ins/common/sphere-designer.c:2703
+#: ../plug-ins/lighting/lighting-ui.c:403
 msgid "Type:"
 msgstr "é¡?å??ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2718
+#: ../plug-ins/common/sphere-designer.c:2722
 msgid "Texture:"
 msgstr "ç´ æ??ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2723
+#: ../plug-ins/common/sphere-designer.c:2727
 msgid "Colors:"
 msgstr "é¡?è?²ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2726
-#: ../plug-ins/common/sphere-designer.c:2737
+#: ../plug-ins/common/sphere-designer.c:2730
+#: ../plug-ins/common/sphere-designer.c:2741
 msgid "Color Selection Dialog"
 msgstr "é¡?è?²é?¸æ??å°?è©±æ?¹å¡?"
 
 #. Scale
-#: ../plug-ins/common/sphere-designer.c:2748
+#: ../plug-ins/common/sphere-designer.c:2752
 #: ../plug-ins/gimpressionist/paper.c:193
 #: ../plug-ins/ifs-compose/ifs-compose.c:551
 msgid "Scale:"
 msgstr "æ¯?ä¾?ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2756
+#: ../plug-ins/common/sphere-designer.c:2760
 msgid "Turbulence:"
 msgstr "æ¹?æµ?ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2763
+#: ../plug-ins/common/sphere-designer.c:2767
 msgid "Amount:"
-msgstr "ç¨?åº¦(_A)ï¼?"
+msgstr "ç¸½é??ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2770
-#, fuzzy
+#: ../plug-ins/common/sphere-designer.c:2774
 msgid "Exp.:"
-msgstr "EXP"
+msgstr "æ??æ?¸ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2777
-#, fuzzy
+#: ../plug-ins/common/sphere-designer.c:2781
 msgid "Transformations"
-msgstr "è?²å½©è®?æ??"
+msgstr "è®?æ??"
 
-#: ../plug-ins/common/sphere-designer.c:2793
+#: ../plug-ins/common/sphere-designer.c:2797
 #: ../plug-ins/map-object/map-object-ui.c:1143
 msgid "Scale X:"
 msgstr "æ¯?ä¾? Xï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2800
+#: ../plug-ins/common/sphere-designer.c:2804
 msgid "Scale Y:"
 msgstr "æ¯?ä¾? Yï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2806
+#: ../plug-ins/common/sphere-designer.c:2810
 msgid "Scale Z:"
 msgstr "æ¯?ä¾? Zï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2813
+#: ../plug-ins/common/sphere-designer.c:2817
 msgid "Rotate X:"
 msgstr "æ??è½? ï¼¸ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2820
+#: ../plug-ins/common/sphere-designer.c:2824
 msgid "Rotate Y:"
 msgstr "æ??è½? Yï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2827
+#: ../plug-ins/common/sphere-designer.c:2831
 msgid "Rotate Z:"
 msgstr "æ??è½? Zï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2834
+#: ../plug-ins/common/sphere-designer.c:2838
 msgid "Position X:"
 msgstr "ä½?ç½® Xï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2841
+#: ../plug-ins/common/sphere-designer.c:2845
 msgid "Position Y:"
 msgstr "ä½?ç½® Yï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2848
+#: ../plug-ins/common/sphere-designer.c:2852
 msgid "Position Z:"
 msgstr "ä½?ç½® Zï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2963
+#: ../plug-ins/common/sphere-designer.c:2969
 msgid "Rendering sphere"
 msgstr "ç¹ªè£½ç??é«?"
 
-#: ../plug-ins/common/sphere-designer.c:3013
+#: ../plug-ins/common/sphere-designer.c:3019
 msgid "Create an image of a textured sphere"
 msgstr "å?µå»ºä¸?å??æ??ç´?ç??ç??ç??é«?å??ç??"
 
-#: ../plug-ins/common/sphere-designer.c:3020
+#: ../plug-ins/common/sphere-designer.c:3026
 msgid "Sphere _Designer..."
 msgstr "ç??é«?è¨è¨?(_D)..."
 
-#: ../plug-ins/common/sphere-designer.c:3080
+#: ../plug-ins/common/sphere-designer.c:3096
 msgid "Region selected for plug-in is empty"
 msgstr ""
 
@@ -8370,7 +8390,7 @@ msgstr "æ??è½?è§?åº¦(_W):"
 
 #: ../plug-ins/common/whirl-pinch.c:577
 msgid "_Pinch amount:"
-msgstr "æ? å£?ç¨?åº¦(_P):"
+msgstr "æ? å£?ç¸½é??(_P)ï¼?"
 
 #: ../plug-ins/common/wind.c:174
 msgid "Smear image to give windblown effect"
@@ -8452,35 +8472,35 @@ msgstr "è¼?é«?ç??å?¼æ??å¢?å? æ??æ??ç??å¼·åº¦"
 msgid "Bad colormap"
 msgstr "æ??å£?ç??ç°½ç½²"
 
-#: ../plug-ins/file-bmp/bmp-read.c:171 ../plug-ins/file-bmp/bmp-read.c:181
-#: ../plug-ins/file-bmp/bmp-read.c:188 ../plug-ins/file-bmp/bmp-read.c:197
-#: ../plug-ins/file-bmp/bmp-read.c:212 ../plug-ins/file-bmp/bmp-read.c:417
-#: ../plug-ins/file-bmp/bmp-read.c:438 ../plug-ins/file-bmp/bmp-read.c:449
-#: ../plug-ins/file-bmp/bmp-read.c:457 ../plug-ins/file-bmp/bmp-read.c:465
-#: ../plug-ins/file-bmp/bmp-read.c:477
+#: ../plug-ins/file-bmp/bmp-read.c:171 ../plug-ins/file-bmp/bmp-read.c:182
+#: ../plug-ins/file-bmp/bmp-read.c:189 ../plug-ins/file-bmp/bmp-read.c:198
+#: ../plug-ins/file-bmp/bmp-read.c:213 ../plug-ins/file-bmp/bmp-read.c:418
+#: ../plug-ins/file-bmp/bmp-read.c:439 ../plug-ins/file-bmp/bmp-read.c:450
+#: ../plug-ins/file-bmp/bmp-read.c:458 ../plug-ins/file-bmp/bmp-read.c:466
+#: ../plug-ins/file-bmp/bmp-read.c:478
 #, c-format
 msgid "'%s' is not a valid BMP file"
 msgstr "â??%sâ??ä¸?æ?¯æ??æ??ç?? BMP é»?é?£å??"
 
-#: ../plug-ins/file-bmp/bmp-read.c:226 ../plug-ins/file-bmp/bmp-read.c:253
-#: ../plug-ins/file-bmp/bmp-read.c:281 ../plug-ins/file-bmp/bmp-read.c:346
-#: ../plug-ins/file-bmp/bmp-read.c:396
+#: ../plug-ins/file-bmp/bmp-read.c:227 ../plug-ins/file-bmp/bmp-read.c:254
+#: ../plug-ins/file-bmp/bmp-read.c:282 ../plug-ins/file-bmp/bmp-read.c:347
+#: ../plug-ins/file-bmp/bmp-read.c:397
 #, c-format
 msgid "Error reading BMP file header from '%s'"
 msgstr "è®?å?? BMP é»?é?£å??â??%sâ??ç??æª?é æ??ç?¼ç??é?¯èª¤"
 
-#: ../plug-ins/file-bmp/bmp-read.c:589
+#: ../plug-ins/file-bmp/bmp-read.c:590
 #, fuzzy
 msgid "Unrecognized or invalid BMP compression format."
 msgstr "ç?¡æ³?è¾¨å?¥ç??å¯?ç¢¼å??é¡?å??ï¼?æ??æ?¯ç?¡æ??ç??è³?æ??æ ¼å¼?"
 
-#: ../plug-ins/file-bmp/bmp-read.c:631
+#: ../plug-ins/file-bmp/bmp-read.c:632
 #, fuzzy
 msgid "Unsupported or invalid bitdepth."
 msgstr "ç?¡æ??æ??ç?¡æ³?ç¢?èª?ç??å¯?ç¢¼å??ï¼?%s"
 
-#: ../plug-ins/file-bmp/bmp-read.c:819 ../plug-ins/file-bmp/bmp-read.c:860
-#: ../plug-ins/file-bmp/bmp-read.c:910
+#: ../plug-ins/file-bmp/bmp-read.c:820 ../plug-ins/file-bmp/bmp-read.c:861
+#: ../plug-ins/file-bmp/bmp-read.c:911
 #, fuzzy
 msgid "The bitmap ends unexpectedly."
 msgstr "â??%sâ??å?¨ç?¡æ³?é ?è¨?ç??æ??æ³?ä¸?é?¢é??"
@@ -8886,17 +8906,17 @@ msgstr "ä¸?æ?¯æ?´æ??ç?¡æ??ç??å??å±¤é?®ç½©é??åº¦ï¼?%d"
 msgid "Unsupported or invalid layer mask size: %dx%d"
 msgstr "ä¸?æ?¯æ?´æ??ç?¡æ??ç??å??å±¤é?®ç½©å¤§å°?ï¼?%dx%d"
 
-#: ../plug-ins/file-psd/psd-load.c:1201 ../plug-ins/file-psd/psd-load.c:1551
+#: ../plug-ins/file-psd/psd-load.c:1202 ../plug-ins/file-psd/psd-load.c:1552
 #, fuzzy, c-format
 msgid "Unsupported compression mode: %d"
 msgstr "å??æ??å?¨è?¢å¹?æ¨¡å¼?"
 
-#: ../plug-ins/file-psd/psd-load.c:1644
+#: ../plug-ins/file-psd/psd-load.c:1645
 #, fuzzy
 msgid "Extra"
 msgstr "ç?¹å¤§"
 
-#: ../plug-ins/file-psd/psd-load.c:1819
+#: ../plug-ins/file-psd/psd-load.c:1820
 #, c-format
 msgid "Unsupported or invalid channel size"
 msgstr ""
@@ -9170,7 +9190,6 @@ msgid "Directions"
 msgstr "æ?¹å??"
 
 #: ../plug-ins/flame/flame.c:702
-#, fuzzy
 msgid "Controls"
 msgstr "æ?§å?¶"
 
@@ -9334,9 +9353,8 @@ msgid "Spatial _filter radius:"
 msgstr "è??å¤©å®¤æ¸?å?®é??æ¿¾å?¨:"
 
 #: ../plug-ins/flame/flame.c:1161
-#, fuzzy
 msgid "Color_map:"
-msgstr "é?¸æ??æ??å??(_S)ï¼?"
+msgstr "é¡?è?²å°?æ??è¡¨(_M)ï¼?"
 
 #: ../plug-ins/flame/flame.c:1203
 msgid "Custom gradient"
@@ -9362,9 +9380,8 @@ msgstr ""
 "ç??è¨å®?ã??"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:562
-#, fuzzy
 msgid "Fractal Explorer"
-msgstr "Accerciser ç?¡é??ç¤?å??è?½ç??è¦½å?¨"
+msgstr "ç¢?å½¢ç??è¦½å?¨"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:637
 msgid "Realtime preview"
@@ -9433,9 +9450,8 @@ msgstr "CXï¼?"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:783
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:793
-#, fuzzy
 msgid "Changes aspect of fractal"
-msgstr "ä¿?æ??é?·å¯¬æ¯?ä¾?(&A)"
+msgstr "æ?¹è®?ç¢?å½¢é?·å¯¬æ¯?"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:790
 msgid "CY:"
@@ -9594,9 +9610,8 @@ msgid "Create a color-map using a gradient from the gradient editor"
 msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1167
-#, fuzzy
 msgid "FractalExplorer Gradient"
-msgstr "äº?ä»¶æ¼¸è®?è?²æ??æ??"
+msgstr "ç¢?å½¢ç??è¦½å?¨æ¼¸è®?è?²"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1197
 msgid "_Fractals"
@@ -9620,7 +9635,7 @@ msgstr "å?²å?ç¢?å½¢å??æ?¸"
 msgid "'%s' is not a FractalExplorer file"
 msgstr "â??%sâ??ä¸?æ?¯ FractalExplorer æ ¼å¼?æª?æ¡?"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1876
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1877
 #, c-format
 msgid "'%s' is corrupt. Line %d Option section incorrect"
 msgstr "æª?æ¡?â??%sâ??å?§å®¹å??æ??ã??ç¬¬ %d è¡?ç?? Option é?¨ä»½ä¸?æ£ç¢º"
@@ -9652,7 +9667,7 @@ msgstr "å?ªé?¤ç¢?å½¢"
 msgid "File '%s' is not a FractalExplorer file"
 msgstr "â??%sâ??ä¸?æ?¯ FractalExplorer æ ¼å¼?æª?æ¡?"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:958
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:959
 #, c-format
 msgid ""
 "File '%s' is corrupt.\n"
@@ -9661,30 +9676,29 @@ msgstr ""
 "æª?æ¡?â??%sâ??å·²æ??æ¯?ã??\n"
 "ç¬¬ %d è¡?é?¸é ?ç??é?¨ä»½ä¸?æ£ç¢º"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1002
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1004
 msgid "My first fractal"
 msgstr "æ??ç??ç¬¬ä¸?å??ç¢?å½¢"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1066
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1068
 msgid "Select folder and rescan collection"
 msgstr "é?¸å??ç?®é??ä¸¦é??æ?°æ??ç?? Gfig ç?©ä»¶é??"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1078
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1080
 msgid "Apply currently selected fractal"
 msgstr "æ?¡ç?¨ç?®å??é?¸å??ç??ç¢?å½¢"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1090
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1092
 msgid "Delete currently selected fractal"
 msgstr "å?ªé?¤ç?®å??é?¸å®?ç??ç¢?å½¢"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1113
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1115
 msgid "Rescan for Fractals"
 msgstr "é??æ?°æ??æ??ç¢?å½¢"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1132
-#, fuzzy
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1134
 msgid "Add FractalExplorer Path"
-msgstr "å? å?¥æ?°ç??å??ç¤ºè·¯å¾?"
+msgstr "å? å?¥ç¢?å½¢ç??è¦½å?¨è·¯å¾?"
 
 #: ../plug-ins/gfig/gfig-bezier.c:442
 msgid "Closed"
@@ -9880,9 +9894,8 @@ msgid "Show position"
 msgstr "é¡¯ç¤ºä½?ç½®"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1240
-#, fuzzy
 msgid "Show control points"
-msgstr "é¡¯ç¤ºè³?æ??é»?"
+msgstr "é¡¯ç¤ºæ?§å?¶é»?"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1274
 msgid "Max undo:"
@@ -10035,12 +10048,12 @@ msgstr "å?µå»ºå¹¾ä½?å½¢ç??"
 msgid "_Gfig..."
 msgstr "ç¹ªè£½å¤?é??å½¢(_G)..."
 
-#: ../plug-ins/gfig/gfig.c:731
+#: ../plug-ins/gfig/gfig.c:735
 msgid ""
 "Error trying to save figure as a parasite: can't attach parasite to drawable."
 msgstr ""
 
-#: ../plug-ins/gfig/gfig.c:758
+#: ../plug-ins/gfig/gfig.c:762
 #, fuzzy, c-format
 msgid "Error trying to open temporary file '%s' for parasite loading: %s"
 msgstr "ç?¡æ³?é??å??â??%sâ??ä¾?è®?å??è³?æ??ï¼?%s"
@@ -10501,7 +10514,7 @@ msgstr "ç?å??ç??ç?¸å°?å¯?åº¦"
 #. * gimp_filename_to_utf8 () and g_strerror () return temporary strings
 #. * that need not and should not be freed. So this call is OK.
 #. *
-#: ../plug-ins/gimpressionist/ppmtool.c:651
+#: ../plug-ins/gimpressionist/ppmtool.c:652
 #, c-format
 msgid "Failed to save PPM file '%s': %s"
 msgstr "ç?¡æ³?å?²å? PPM æª?â??%sâ??ï¼?%s"
@@ -10542,7 +10555,7 @@ msgstr "æ??åº?é ?è¨çµ?å??é?¸å?®"
 #: ../plug-ins/gimpressionist/preview.c:173
 #: ../plug-ins/gimpressionist/repaint.c:1183
 #: ../plug-ins/imagemap/imap_polygon.c:514
-#: ../plug-ins/lighting/lighting-ui.c:1074
+#: ../plug-ins/lighting/lighting-ui.c:1073
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
@@ -10559,9 +10572,8 @@ msgid "_Size"
 msgstr "ç?å??å°ºå¯¸(_S)"
 
 #: ../plug-ins/gimpressionist/size.c:108
-#, fuzzy
 msgid "Size variants:"
-msgstr "æ£?ç?¤å¤§å°?(_B):"
+msgstr "å°ºå¯¸è®?é??ï¼?"
 
 #: ../plug-ins/gimpressionist/size.c:112
 msgid "The number of sizes of brushes to use"
@@ -10584,9 +10596,8 @@ msgid "The largest brush to create"
 msgstr "ç?å?·å°ºå¯¸ä¸?é??"
 
 #: ../plug-ins/gimpressionist/size.c:150
-#, fuzzy
 msgid "Size depends on:"
-msgstr "<span size=\"small\">%U æ?¼ %h</span>"
+msgstr "å°ºå¯¸å??æ±ºæ?¼ï¼?"
 
 #: ../plug-ins/gimpressionist/size.c:159
 msgid ""
@@ -11093,7 +11104,7 @@ msgstr "_IFS ç¢?å½¢..."
 
 #. X
 #: ../plug-ins/ifs-compose/ifs-compose.c:523
-#: ../plug-ins/lighting/lighting-ui.c:526
+#: ../plug-ins/lighting/lighting-ui.c:525
 #: ../plug-ins/map-object/map-object-ui.c:675
 #: ../plug-ins/map-object/map-object-ui.c:729
 #: ../plug-ins/map-object/map-object-ui.c:997
@@ -11103,7 +11114,7 @@ msgstr "Xï¼?"
 
 #. Y
 #: ../plug-ins/ifs-compose/ifs-compose.c:537
-#: ../plug-ins/lighting/lighting-ui.c:540
+#: ../plug-ins/lighting/lighting-ui.c:539
 #: ../plug-ins/map-object/map-object-ui.c:689
 #: ../plug-ins/map-object/map-object-ui.c:742
 #: ../plug-ins/map-object/map-object-ui.c:1010
@@ -11147,29 +11158,24 @@ msgid "Full"
 msgstr "å®?æ?´"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:693
-#, fuzzy
 msgid "IFS Fractal: Red"
-msgstr "ç´?è?²è¡¨ç¤ºé?»é??"
+msgstr "IFS ç¢?å½¢ï¼?ç´?"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:701
-#, fuzzy
 msgid "IFS Fractal: Green"
-msgstr "é»?åº?ç¶ å?"
+msgstr "IFS ç¢?å½¢ï¼?ç¶ "
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:709
-#, fuzzy
 msgid "IFS Fractal: Blue"
-msgstr "é?¸æ??æ?§è??è?²å?»é£½å??"
+msgstr "IFS ç¢?å½¢ï¼?è??"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:717
-#, fuzzy
 msgid "IFS Fractal: Black"
-msgstr "%(white)s å°? %(black)s"
+msgstr "IFS ç¢?å½¢ï¼?é»?"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:767
-#, fuzzy
 msgid "IFS Fractal"
-msgstr "æ?°å¢?ç¢?å½¢"
+msgstr "IFS ç¢?å½¢"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:865
 msgid "Spatial Transformation"
@@ -11221,9 +11227,8 @@ msgid "Stretch"
 msgstr "ä¼¸å±?"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1172
-#, fuzzy
 msgid "IFS Fractal Render Options"
-msgstr "æ??ç¹ªé?¸é ?"
+msgstr "IFS ç¢?å½¢æ¸²æ??é?¸é ?"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1194
 #, fuzzy
@@ -11259,23 +11264,21 @@ msgid "Open failed"
 msgstr "é??å??æª?æ¡?å¤±æ??"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2490
-#, fuzzy, c-format
+#, c-format
 msgid "File '%s' doesn't seem to be an IFS Fractal file."
-msgstr "æª?æ¡?â??%sâ??ä¸?å??æ?¯ IFS Compose æª?æ¡?ã??"
+msgstr "æª?æ¡?ã??%sã??ä¼¼ä¹?ä¸?æ?¯ä¸?å?? IFS ç¢?å½¢æª?æ¡?ã??"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2530
-#, fuzzy
 msgid "Save as IFS Fractal file"
-msgstr "å?¦å?ç?®å??ç??æ??å°?ç?ºæª?æ¡?"
+msgstr "å?²å?ç?º IFS ç¢?å½¢æª?æ¡?"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2567
-#, fuzzy
 msgid "Open IFS Fractal file"
-msgstr "é??å??ä¸?æ?¯å?¨æ?¬æ©?ç??æª?æ¡?"
+msgstr "é??å?? IFS ç¢?å½¢æª?æ¡?"
 
 #: ../plug-ins/imagemap/imap_about.c:42
 msgid "Image Map Plug-In"
-msgstr "å½±å??å?°å??ç·¨è¼¯å?¨æ??ä»¶"
+msgstr "å??å??å?°å??ç·¨è¼¯å?¨æ??ä»¶"
 
 #: ../plug-ins/imagemap/imap_about.c:46
 #, fuzzy
@@ -12050,7 +12053,7 @@ msgid "View Source"
 msgstr "é¡¯ç¤ºå??å§?æª?"
 
 #: ../plug-ins/lighting/lighting-apply.c:105
-#: ../plug-ins/lighting/lighting-ui.c:1018
+#: ../plug-ins/lighting/lighting-ui.c:1017
 msgid "Lighting Effects"
 msgstr "å??ç·?æ??æ??"
 
@@ -12063,141 +12066,141 @@ msgid "_Lighting Effects..."
 msgstr "å??ç·?æ??æ??(_L)..."
 
 #. General options
-#: ../plug-ins/lighting/lighting-ui.c:294
+#: ../plug-ins/lighting/lighting-ui.c:293
 #: ../plug-ins/map-object/map-object-ui.c:472
 msgid "General Options"
 msgstr "ä¸?è?¬é?¸é ?"
 
-#: ../plug-ins/lighting/lighting-ui.c:302
+#: ../plug-ins/lighting/lighting-ui.c:301
 msgid "T_ransparent background"
 msgstr "é??æ??è??æ?¯(_R)"
 
-#: ../plug-ins/lighting/lighting-ui.c:312
+#: ../plug-ins/lighting/lighting-ui.c:311
 msgid "Make destination image transparent where bump height is zero"
-msgstr ""
+msgstr "ä½¿ç?®ç??å?°å??å??é??æ??ï¼?å?¶å?¹å?¸é«?åº¦æ?¯é?¶"
 
-#: ../plug-ins/lighting/lighting-ui.c:315
+#: ../plug-ins/lighting/lighting-ui.c:314
 msgid "Cre_ate new image"
 msgstr "ç?¢ç??æ?°ç??å??ç??(_A)"
 
-#: ../plug-ins/lighting/lighting-ui.c:325
+#: ../plug-ins/lighting/lighting-ui.c:324
 #: ../plug-ins/map-object/map-object-ui.c:541
 msgid "Create a new image when applying filter"
 msgstr "å¥?ç?¨æ¿¾é?¡æ??æ??ç?¢ç??æ?°ç??å??ç??"
 
-#: ../plug-ins/lighting/lighting-ui.c:327
+#: ../plug-ins/lighting/lighting-ui.c:326
 msgid "High _quality preview"
 msgstr "é«?å??è³ªé ?è¦½(_Q)"
 
-#: ../plug-ins/lighting/lighting-ui.c:337
+#: ../plug-ins/lighting/lighting-ui.c:336
 msgid "Enable/disable high quality preview"
 msgstr "(ä¸?)å??ç?¨é«?å??è³ªé ?è¦½"
 
-#: ../plug-ins/lighting/lighting-ui.c:344
+#: ../plug-ins/lighting/lighting-ui.c:343
 msgid "Distance:"
 msgstr "è·?é?¢ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:377
+#: ../plug-ins/lighting/lighting-ui.c:376
 #: ../plug-ins/map-object/map-object-ui.c:619
 msgid "Light Settings"
 msgstr "å??æº?è¨å®?"
 
-#: ../plug-ins/lighting/lighting-ui.c:390
+#: ../plug-ins/lighting/lighting-ui.c:389
 msgid "Light 1"
 msgstr "å??ç·? 1"
 
-#: ../plug-ins/lighting/lighting-ui.c:391
+#: ../plug-ins/lighting/lighting-ui.c:390
 msgid "Light 2"
 msgstr "å??ç·? 2"
 
-#: ../plug-ins/lighting/lighting-ui.c:392
+#: ../plug-ins/lighting/lighting-ui.c:391
 msgid "Light 3"
 msgstr "å??ç·? 3"
 
-#: ../plug-ins/lighting/lighting-ui.c:393
+#: ../plug-ins/lighting/lighting-ui.c:392
 msgid "Light 4"
 msgstr "å??ç·? 4"
 
-#: ../plug-ins/lighting/lighting-ui.c:394
+#: ../plug-ins/lighting/lighting-ui.c:393
 msgid "Light 5"
 msgstr "å??ç·? 5"
 
-#: ../plug-ins/lighting/lighting-ui.c:395
+#: ../plug-ins/lighting/lighting-ui.c:394
 msgid "Light 6"
 msgstr "å??ç·? 6"
 
-#: ../plug-ins/lighting/lighting-ui.c:409
+#: ../plug-ins/lighting/lighting-ui.c:408
 msgid "Color:"
 msgstr "é¡?è?²ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:416
+#: ../plug-ins/lighting/lighting-ui.c:415
 msgid "Directional"
 msgstr "æ?¹å??æ?§"
 
-#: ../plug-ins/lighting/lighting-ui.c:417
+#: ../plug-ins/lighting/lighting-ui.c:416
 msgid "Point"
 msgstr "é»?"
 
-#: ../plug-ins/lighting/lighting-ui.c:431
+#: ../plug-ins/lighting/lighting-ui.c:430
 #: ../plug-ins/map-object/map-object-ui.c:642
 msgid "Type of light source to apply"
 msgstr "æº?å??ä½¿ç?¨ç??å??æº?é¡?å??"
 
-#: ../plug-ins/lighting/lighting-ui.c:433
+#: ../plug-ins/lighting/lighting-ui.c:432
 #: ../plug-ins/map-object/map-object-ui.c:644
 msgid "Select lightsource color"
 msgstr "è«?é?¸å??å??æº?é¡?è?²"
 
-#: ../plug-ins/lighting/lighting-ui.c:447
+#: ../plug-ins/lighting/lighting-ui.c:446
 #: ../plug-ins/map-object/map-object-ui.c:657
 msgid "Set light source color"
 msgstr "è¨å®?å??æº?é¡?è?²"
 
-#: ../plug-ins/lighting/lighting-ui.c:455
+#: ../plug-ins/lighting/lighting-ui.c:454
 msgid "_Intensity:"
 msgstr "äº®åº¦(_I)ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:463
+#: ../plug-ins/lighting/lighting-ui.c:462
 msgid "Light intensity"
 msgstr "å??æº?äº®åº¦"
 
-#: ../plug-ins/lighting/lighting-ui.c:466
+#: ../plug-ins/lighting/lighting-ui.c:465
 #: ../plug-ins/map-object/map-object-ui.c:659
 #: ../plug-ins/map-object/map-object-ui.c:986
 #: ../plug-ins/print/print-page-layout.c:355
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../plug-ins/lighting/lighting-ui.c:484
+#: ../plug-ins/lighting/lighting-ui.c:483
 #: ../plug-ins/map-object/map-object-ui.c:683
 msgid "Light source X position in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? X åº§æ¨?"
 
-#: ../plug-ins/lighting/lighting-ui.c:499
+#: ../plug-ins/lighting/lighting-ui.c:498
 #: ../plug-ins/map-object/map-object-ui.c:697
 msgid "Light source Y position in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? Y åº§æ¨?"
 
-#: ../plug-ins/lighting/lighting-ui.c:506
+#: ../plug-ins/lighting/lighting-ui.c:505
 msgid "_Z:"
 msgstr "_Zï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:514
+#: ../plug-ins/lighting/lighting-ui.c:513
 #: ../plug-ins/map-object/map-object-ui.c:711
 msgid "Light source Z position in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? Z åº§æ¨?"
 
-#: ../plug-ins/lighting/lighting-ui.c:534
+#: ../plug-ins/lighting/lighting-ui.c:533
 #: ../plug-ins/map-object/map-object-ui.c:737
 msgid "Light source X direction in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? X æ?¹å??"
 
-#: ../plug-ins/lighting/lighting-ui.c:548
+#: ../plug-ins/lighting/lighting-ui.c:547
 #: ../plug-ins/map-object/map-object-ui.c:750
 msgid "Light source Y direction in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? Y æ?¹å??"
 
-#: ../plug-ins/lighting/lighting-ui.c:554
+#: ../plug-ins/lighting/lighting-ui.c:553
 #: ../plug-ins/map-object/map-object-ui.c:703
 #: ../plug-ins/map-object/map-object-ui.c:755
 #: ../plug-ins/map-object/map-object-ui.c:1023
@@ -12206,149 +12209,148 @@ msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? Y æ?¹å??"
 msgid "Z:"
 msgstr "Zï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:562
+#: ../plug-ins/lighting/lighting-ui.c:561
 #: ../plug-ins/map-object/map-object-ui.c:763
 msgid "Light source Z direction in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? Z æ?¹å??"
 
-#: ../plug-ins/lighting/lighting-ui.c:565
+#: ../plug-ins/lighting/lighting-ui.c:564
 msgid "I_solate"
 msgstr "é??é?¢(_S)"
 
-#: ../plug-ins/lighting/lighting-ui.c:574
+#: ../plug-ins/lighting/lighting-ui.c:573
 msgid "Lighting preset:"
 msgstr "å??ç·?æ??æ??çµ?æ??ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:620
+#: ../plug-ins/lighting/lighting-ui.c:619
 msgid "Material Properties"
 msgstr "æ??è³ªå±¬æ?§"
 
-#: ../plug-ins/lighting/lighting-ui.c:638
+#: ../plug-ins/lighting/lighting-ui.c:637
 msgid "_Glowing:"
 msgstr "ç?½ç?±ç??(_G):"
 
-#: ../plug-ins/lighting/lighting-ui.c:657
+#: ../plug-ins/lighting/lighting-ui.c:656
 #: ../plug-ins/map-object/map-object-ui.c:824
 msgid "Amount of original color to show where no direct light falls"
 msgstr "ç?¶æ²?æ??è¢«å??æº?ç?´æ?¥ç?§å°?æ??é¡¯ç¤ºç??å??ä¾?è?²å½©ä»½é??"
 
-#: ../plug-ins/lighting/lighting-ui.c:671
+#: ../plug-ins/lighting/lighting-ui.c:670
 msgid "_Bright:"
 msgstr "æ??äº®ç??(_B):"
 
-#: ../plug-ins/lighting/lighting-ui.c:690
+#: ../plug-ins/lighting/lighting-ui.c:689
 #: ../plug-ins/map-object/map-object-ui.c:853
 msgid "Intensity of original color when lit by a light source"
 msgstr "è¢«å??æº?ç?§å?°æ??å??è?²å½©ç??å¼·åº¦"
 
-#: ../plug-ins/lighting/lighting-ui.c:704
+#: ../plug-ins/lighting/lighting-ui.c:703
 msgid "_Shiny:"
 msgstr "å??äº®ç??(_S):"
 
-#: ../plug-ins/lighting/lighting-ui.c:723
+#: ../plug-ins/lighting/lighting-ui.c:722
 #: ../plug-ins/map-object/map-object-ui.c:925
 msgid "Controls how intense the highlights will be"
 msgstr "æ?§å?¶å¼·å??é?¨ä»½å¤?éº¼å¼·ç??"
 
-#: ../plug-ins/lighting/lighting-ui.c:736
+#: ../plug-ins/lighting/lighting-ui.c:735
 msgid "_Polished:"
 msgstr "ç£¨å??ç??(_P):"
 
-#: ../plug-ins/lighting/lighting-ui.c:755
+#: ../plug-ins/lighting/lighting-ui.c:754
 #: ../plug-ins/map-object/map-object-ui.c:954
 msgid "Higher values makes the highlights more focused"
 msgstr "è¼?é«?ç??å?¼,ä½¿å¼·å??é?¨ä»½æ?´é??ä¸"
 
 #. Metallic
-#: ../plug-ins/lighting/lighting-ui.c:765
+#: ../plug-ins/lighting/lighting-ui.c:764
 msgid "_Metallic"
 msgstr "é??å±¬é?¢(_M)"
 
-#: ../plug-ins/lighting/lighting-ui.c:802
+#: ../plug-ins/lighting/lighting-ui.c:801
 msgid "E_nable bump mapping"
 msgstr "ä½¿ç?¨å?¹å?¸è²¼å??(_N)"
 
-#: ../plug-ins/lighting/lighting-ui.c:816
+#: ../plug-ins/lighting/lighting-ui.c:815
 msgid "Enable/disable bump-mapping (image depth)"
-msgstr ""
+msgstr "å??ç?¨/å??ç?¨å?¹å?¸è²¼å??(å??å??æ·±åº¦)"
 
-#: ../plug-ins/lighting/lighting-ui.c:838
+#: ../plug-ins/lighting/lighting-ui.c:837
 msgid "Bumpm_ap image:"
 msgstr "å?¹å?¸è²¼å??å??ç??(_A):"
 
-#: ../plug-ins/lighting/lighting-ui.c:842
+#: ../plug-ins/lighting/lighting-ui.c:841
 msgid "Logarithmic"
 msgstr "å°?æ?¸"
 
-#: ../plug-ins/lighting/lighting-ui.c:854
+#: ../plug-ins/lighting/lighting-ui.c:853
 msgid "Cu_rve:"
 msgstr "æ?²ç·?(_R)ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:859
+#: ../plug-ins/lighting/lighting-ui.c:858
 msgid "Ma_ximum height:"
 msgstr "é«?åº¦ä¸?é??(_X)ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:869
-#, fuzzy
+#: ../plug-ins/lighting/lighting-ui.c:868
 msgid "Maximum height for bumps"
-msgstr "æ??å?å®¹å?¨å??ä»¶ç??é«?åº¦"
+msgstr "ç?ºå?¹å?¸ç??æ??å¤§é«?åº¦"
 
-#: ../plug-ins/lighting/lighting-ui.c:893
+#: ../plug-ins/lighting/lighting-ui.c:892
 msgid "E_nable environment mapping"
 msgstr "å??ç?¨ç?°å¢?æ? å°?(_N)"
 
-#: ../plug-ins/lighting/lighting-ui.c:907
+#: ../plug-ins/lighting/lighting-ui.c:906
 msgid "Enable/disable environment-mapping (reflection)"
 msgstr "å??ç?¨/å??ç?¨ç?°å¢?æ? å°?(å??å°?)"
 
-#: ../plug-ins/lighting/lighting-ui.c:924
+#: ../plug-ins/lighting/lighting-ui.c:923
 msgid "En_vironment image:"
 msgstr "ç?°å¢?å??ç??(_V):"
 
-#: ../plug-ins/lighting/lighting-ui.c:927
+#: ../plug-ins/lighting/lighting-ui.c:926
 msgid "Environment image to use"
 msgstr "è¦?ä½¿ç?¨ç??ç?°å¢?æ? å°?å??ç??"
 
-#: ../plug-ins/lighting/lighting-ui.c:949
+#: ../plug-ins/lighting/lighting-ui.c:948
 msgid "Op_tions"
 msgstr "é?¸é ?(_T)"
 
-#: ../plug-ins/lighting/lighting-ui.c:953
+#: ../plug-ins/lighting/lighting-ui.c:952
 #: ../plug-ins/map-object/map-object-ui.c:1291
 msgid "_Light"
 msgstr "å??ç·?(_L)"
 
-#: ../plug-ins/lighting/lighting-ui.c:957
+#: ../plug-ins/lighting/lighting-ui.c:956
 #: ../plug-ins/map-object/map-object-ui.c:1295
 msgid "_Material"
 msgstr "æ??è³ª(_M)"
 
-#: ../plug-ins/lighting/lighting-ui.c:961
+#: ../plug-ins/lighting/lighting-ui.c:960
 msgid "_Bump Map"
 msgstr "å?¹å?¸è²¼å??(_B)"
 
-#: ../plug-ins/lighting/lighting-ui.c:965
+#: ../plug-ins/lighting/lighting-ui.c:964
 msgid "_Environment Map"
 msgstr "ç?°å¢?æ? å°?(_E)"
 
-#: ../plug-ins/lighting/lighting-ui.c:1081
+#: ../plug-ins/lighting/lighting-ui.c:1080
 #: ../plug-ins/map-object/map-object-ui.c:1397
 msgid "Recompute preview image"
 msgstr "é??æ?°è¨?ç®?é ?è¦½å??ç??"
 
-#: ../plug-ins/lighting/lighting-ui.c:1083
+#: ../plug-ins/lighting/lighting-ui.c:1082
 msgid "I_nteractive"
 msgstr "äº?å??å¼?(_N)"
 
-#: ../plug-ins/lighting/lighting-ui.c:1097
+#: ../plug-ins/lighting/lighting-ui.c:1096
 msgid "Enable/disable real time preview of changes"
 msgstr "å??ç?¨/é??é??é«?å??è³ªå?³æ??é ?è¦½"
 
-#: ../plug-ins/lighting/lighting-ui.c:1136
+#: ../plug-ins/lighting/lighting-ui.c:1140
 msgid "Save Lighting Preset"
 msgstr "å?²å?å??ç·?æ??æ??çµ?æ??"
 
-#: ../plug-ins/lighting/lighting-ui.c:1280
+#: ../plug-ins/lighting/lighting-ui.c:1284
 msgid "Load Lighting Preset"
 msgstr "è¼?å?¥å??ç·?æ??æ??çµ?æ??"
 
@@ -12928,31 +12930,3 @@ msgstr "ç?«é?¢å¿«ç?§(_S)..."
 #: ../plug-ins/win-snap/winsnap.c:1142
 msgid "No data captured"
 msgstr "æ²?æ??æ??å?°ä»»ä½?è³?æ??"
-
-#, fuzzy
-#~ msgid "Portable Document Format"
-#~ msgstr "DJVU æ??ä»¶æ??ä¸?æ£ç¢ºç??æ ¼å¼?"
-
-#, fuzzy
-#~ msgid "Could not load '%s': %s"
-#~ msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
-
-#~ msgid "%s-%s"
-#~ msgstr "%s-%s"
-
-#~ msgid "Import from PDF"
-#~ msgstr "å¾? PDF æª?å?¯å?¥"
-
-#, fuzzy
-#~ msgid "_Width (pixels):"
-#~ msgstr "ç?«é?¢å¿«ç?§å¯¬åº¦(ä»¥å??ç´ è¨?):"
-
-#, fuzzy
-#~ msgid "_Height (pixels):"
-#~ msgstr "é«?åº¦ï¼?%.2f é»? (%d å??ç´ )"
-
-#~ msgid "_Resolution:"
-#~ msgstr "è§£æ??åº¦(_R)ï¼?"
-
-#~ msgid "pixels/%s"
-#~ msgstr "å??ç´ /%s"
diff --git a/po-plug-ins/zh_TW.po b/po-plug-ins/zh_TW.po
index 0d970cb..cba7d66 100644
--- a/po-plug-ins/zh_TW.po
+++ b/po-plug-ins/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-std-plug-ins 2.1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 19:45+0800\n"
+"POT-Creation-Date: 2011-01-01 19:43+0800\n"
 "PO-Revision-Date: 2010-10-04 20:02+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n linux org tw>\n"
@@ -62,16 +62,14 @@ msgid "To:"
 msgstr "å?°ï¼?"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:375
-#, fuzzy
 msgctxt "color-rotate"
 msgid "From:"
-msgstr "å¯?ä»¶è??:"
+msgstr "å¾?ï¼?"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:376
-#, fuzzy
 msgctxt "color-rotate"
 msgid "To:"
-msgstr "å?°:"
+msgstr "å?°ï¼?"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:416
 #: ../plug-ins/common/file-ps.c:3228 ../plug-ins/imagemap/imap_menu.c:213
@@ -306,7 +304,7 @@ msgstr "å°?é½?å?¯è¦?å??å±¤"
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:998
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1039
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1080
-#: ../plug-ins/lighting/lighting-ui.c:415
+#: ../plug-ins/lighting/lighting-ui.c:414
 #: ../plug-ins/print/print-page-layout.c:461
 msgid "None"
 msgstr "ç?¡"
@@ -559,7 +557,7 @@ msgstr "ç?«å¸?æ??æ??"
 #. radio buttons for choosing LEFT or RIGHT
 #. *************************************************
 #: ../plug-ins/common/apply-canvas.c:1292 ../plug-ins/common/wind.c:945
-#: ../plug-ins/lighting/lighting-ui.c:517
+#: ../plug-ins/lighting/lighting-ui.c:516
 msgid "Direction"
 msgstr "æ?¹å??"
 
@@ -603,16 +601,16 @@ msgid "Blinds"
 msgstr "ç?¾è??çª?"
 
 #. Orientation toggle box
-#: ../plug-ins/common/blinds.c:257 ../plug-ins/common/ripple.c:554
+#: ../plug-ins/common/blinds.c:257 ../plug-ins/common/ripple.c:556
 msgid "Orientation"
 msgstr "æ?¹å??"
 
-#: ../plug-ins/common/blinds.c:261 ../plug-ins/common/ripple.c:558
+#: ../plug-ins/common/blinds.c:261 ../plug-ins/common/ripple.c:560
 #: ../plug-ins/common/tile-small.c:432 ../plug-ins/pagecurl/pagecurl.c:533
 msgid "_Horizontal"
 msgstr "æ°´å¹³(_H)"
 
-#: ../plug-ins/common/blinds.c:264 ../plug-ins/common/ripple.c:561
+#: ../plug-ins/common/blinds.c:264 ../plug-ins/common/ripple.c:563
 #: ../plug-ins/common/tile-small.c:442 ../plug-ins/pagecurl/pagecurl.c:532
 msgid "_Vertical"
 msgstr "å??ç?´(_V)"
@@ -621,21 +619,21 @@ msgstr "å??ç?´(_V)"
 #. * Create the "background" layer to hold the image...
 #.
 #: ../plug-ins/common/blinds.c:278 ../plug-ins/common/compose.c:934
-#: ../plug-ins/common/decompose.c:725 ../plug-ins/common/file-cel.c:361
-#: ../plug-ins/common/file-cel.c:364 ../plug-ins/common/file-dicom.c:609
+#: ../plug-ins/common/decompose.c:725 ../plug-ins/common/file-cel.c:362
+#: ../plug-ins/common/file-cel.c:365 ../plug-ins/common/file-dicom.c:613
 #: ../plug-ins/common/file-gif-load.c:927
-#: ../plug-ins/common/file-jp2-load.c:357 ../plug-ins/common/file-pcx.c:418
-#: ../plug-ins/common/file-pcx.c:424 ../plug-ins/common/file-pix.c:381
+#: ../plug-ins/common/file-jp2-load.c:357 ../plug-ins/common/file-pcx.c:424
+#: ../plug-ins/common/file-pcx.c:430 ../plug-ins/common/file-pix.c:381
 #: ../plug-ins/common/file-png.c:851 ../plug-ins/common/file-pnm.c:584
-#: ../plug-ins/common/file-raw.c:761 ../plug-ins/common/file-sunras.c:974
+#: ../plug-ins/common/file-raw.c:761 ../plug-ins/common/file-sunras.c:975
 #: ../plug-ins/common/file-tga.c:1063 ../plug-ins/common/file-tiff-load.c:998
 #: ../plug-ins/common/file-xbm.c:896 ../plug-ins/common/film.c:745
 #: ../plug-ins/common/smooth-palette.c:256 ../plug-ins/common/tile.c:266
-#: ../plug-ins/file-bmp/bmp-read.c:381 ../plug-ins/file-bmp/bmp-read.c:648
+#: ../plug-ins/file-bmp/bmp-read.c:382 ../plug-ins/file-bmp/bmp-read.c:649
 #: ../plug-ins/file-faxg3/faxg3.c:477 ../plug-ins/file-fits/fits.c:529
 #: ../plug-ins/file-jpeg/jpeg-load.c:248 ../plug-ins/file-jpeg/jpeg-load.c:760
-#: ../plug-ins/file-psd/psd-image-res-load.c:994
-#: ../plug-ins/file-psd/psd-load.c:1575 ../plug-ins/file-sgi/sgi.c:406
+#: ../plug-ins/file-psd/psd-image-res-load.c:997
+#: ../plug-ins/file-psd/psd-load.c:1576 ../plug-ins/file-sgi/sgi.c:406
 #: ../plug-ins/gfig/gfig-dialog.c:1284
 #: ../plug-ins/gimpressionist/general.c:139 ../plug-ins/twain/twain.c:567
 #: ../plug-ins/win-snap/winsnap.c:1155
@@ -742,63 +740,63 @@ msgstr "å??æ??æ¨¡ç³?å??(_M)..."
 msgid "Motion blurring"
 msgstr "å??æ??æ¨¡ç³?"
 
-#: ../plug-ins/common/blur-motion.c:1011
+#: ../plug-ins/common/blur-motion.c:1013
 msgid "Motion Blur"
 msgstr "å??æ??æ¨¡ç³?å??"
 
-#: ../plug-ins/common/blur-motion.c:1045
+#: ../plug-ins/common/blur-motion.c:1047
 msgid "Blur Type"
 msgstr "æ¨¡ç³?æ?¹å¼?"
 
-#: ../plug-ins/common/blur-motion.c:1049
+#: ../plug-ins/common/blur-motion.c:1051
 msgctxt "blur-type"
 msgid "_Linear"
 msgstr "ç·?æ?§(_L)"
 
-#: ../plug-ins/common/blur-motion.c:1050
+#: ../plug-ins/common/blur-motion.c:1052
 msgctxt "blur-type"
 msgid "_Radial"
-msgstr "æ?¾å°?ç??(_R)"
+msgstr "æ??è½?(_R)"
 
-#: ../plug-ins/common/blur-motion.c:1051
+#: ../plug-ins/common/blur-motion.c:1053
 msgctxt "blur-type"
 msgid "_Zoom"
 msgstr "ç¸®æ?¾(_Z)"
 
-#: ../plug-ins/common/blur-motion.c:1058
+#: ../plug-ins/common/blur-motion.c:1060
 msgid "Blur Center"
 msgstr "æ¨¡ç³?ä¸å¿?"
 
-#: ../plug-ins/common/blur-motion.c:1094 ../plug-ins/common/lens-flare.c:762
+#: ../plug-ins/common/blur-motion.c:1096 ../plug-ins/common/lens-flare.c:762
 #: ../plug-ins/common/nova.c:453 ../plug-ins/common/tile-paper.c:282
 #: ../plug-ins/flame/flame.c:1248
 #: ../plug-ins/gradient-flare/gradient-flare.c:2724
-#: ../plug-ins/lighting/lighting-ui.c:476
+#: ../plug-ins/lighting/lighting-ui.c:475
 msgid "_X:"
 msgstr "_Xï¼?"
 
-#: ../plug-ins/common/blur-motion.c:1099 ../plug-ins/common/lens-flare.c:767
+#: ../plug-ins/common/blur-motion.c:1101 ../plug-ins/common/lens-flare.c:767
 #: ../plug-ins/common/nova.c:458 ../plug-ins/common/tile-paper.c:291
 #: ../plug-ins/flame/flame.c:1262
 #: ../plug-ins/gradient-flare/gradient-flare.c:2728
-#: ../plug-ins/lighting/lighting-ui.c:491
+#: ../plug-ins/lighting/lighting-ui.c:490
 msgid "_Y:"
 msgstr "_Yï¼?"
 
-#: ../plug-ins/common/blur-motion.c:1101
+#: ../plug-ins/common/blur-motion.c:1103
 msgid "Blur _outward"
 msgstr "å??å¤?æ¨¡ç³?(_O)"
 
-#: ../plug-ins/common/blur-motion.c:1114
+#: ../plug-ins/common/blur-motion.c:1116
 msgid "Blur Parameters"
 msgstr "æ¨¡ç³?å??æ?¸"
 
-#: ../plug-ins/common/blur-motion.c:1125
+#: ../plug-ins/common/blur-motion.c:1127
 #: ../plug-ins/map-object/map-object-ui.c:1252
 msgid "L_ength:"
 msgstr "é?·åº¦(_E)ï¼?"
 
-#: ../plug-ins/common/blur-motion.c:1138 ../plug-ins/common/newsprint.c:991
+#: ../plug-ins/common/blur-motion.c:1140 ../plug-ins/common/newsprint.c:991
 msgid "_Angle:"
 msgstr "è§?åº¦(_A)ï¼?"
 
@@ -870,17 +868,17 @@ msgstr "å?¹å?¸è²¼å??(_B):"
 
 #. Map type menu
 #: ../plug-ins/common/bump-map.c:835 ../plug-ins/flame/flame.c:745
-#: ../plug-ins/lighting/lighting-ui.c:841
+#: ../plug-ins/lighting/lighting-ui.c:840
 msgid "Linear"
 msgstr "ç·?æ?§"
 
 #: ../plug-ins/common/bump-map.c:836 ../plug-ins/flame/flame.c:747
-#: ../plug-ins/lighting/lighting-ui.c:844
+#: ../plug-ins/lighting/lighting-ui.c:843
 msgid "Spherical"
 msgstr "ç??å½¢"
 
 #: ../plug-ins/common/bump-map.c:837 ../plug-ins/flame/flame.c:746
-#: ../plug-ins/lighting/lighting-ui.c:843
+#: ../plug-ins/lighting/lighting-ui.c:842
 msgid "Sinusoidal"
 msgstr "å¼¦æ³¢"
 
@@ -955,7 +953,7 @@ msgstr "é»?è?²ç?¾å??æ¯?(_P)ï¼?"
 
 #: ../plug-ins/common/channel-mixer.c:174
 msgid "Alter colors by mixing RGB Channels"
-msgstr "æ··å?? RGB é??é??ä»¥è®?æ??é¡?è?²"
+msgstr "æ··å?? RGB è?²ç??ä»¥è®?æ??é¡?è?²"
 
 #: ../plug-ins/common/channel-mixer.c:179
 msgid "Channel Mi_xer..."
@@ -1029,23 +1027,23 @@ msgstr "è¼?å?¥è?²ç??æ··å??å?¨è¨å®?"
 
 #. stat error (file does not exist)
 #: ../plug-ins/common/channel-mixer.c:982
-#: ../plug-ins/common/cml-explorer.c:2177 ../plug-ins/common/curve-bend.c:891
+#: ../plug-ins/common/cml-explorer.c:2207 ../plug-ins/common/curve-bend.c:891
 #: ../plug-ins/common/file-cel.c:311 ../plug-ins/common/file-compressor.c:497
-#: ../plug-ins/common/file-compressor.c:665
+#: ../plug-ins/common/file-compressor.c:666
 #: ../plug-ins/common/file-dicom.c:339 ../plug-ins/common/file-gbr.c:367
-#: ../plug-ins/common/file-gif-load.c:355 ../plug-ins/common/file-gih.c:643
+#: ../plug-ins/common/file-gif-load.c:355 ../plug-ins/common/file-gih.c:644
 #: ../plug-ins/common/file-jp2-load.c:197
 #: ../plug-ins/common/file-jp2-load.c:206 ../plug-ins/common/file-mng.c:1107
 #: ../plug-ins/common/file-pat.c:336 ../plug-ins/common/file-pcx.c:360
 #: ../plug-ins/common/file-pix.c:342 ../plug-ins/common/file-png.c:720
 #: ../plug-ins/common/file-pnm.c:493 ../plug-ins/common/file-ps.c:1036
-#: ../plug-ins/common/file-ps.c:3045 ../plug-ins/common/file-psp.c:1703
+#: ../plug-ins/common/file-ps.c:3045 ../plug-ins/common/file-psp.c:1704
 #: ../plug-ins/common/file-raw.c:255 ../plug-ins/common/file-raw.c:709
 #: ../plug-ins/common/file-sunras.c:390 ../plug-ins/common/file-svg.c:332
 #: ../plug-ins/common/file-svg.c:730 ../plug-ins/common/file-tga.c:441
 #: ../plug-ins/common/file-tiff-load.c:291 ../plug-ins/common/file-xbm.c:736
 #: ../plug-ins/common/file-xmc.c:666 ../plug-ins/common/file-xmc.c:853
-#: ../plug-ins/common/file-xwd.c:432 ../plug-ins/common/sphere-designer.c:2001
+#: ../plug-ins/common/file-xwd.c:432 ../plug-ins/common/sphere-designer.c:2003
 #: ../plug-ins/file-bmp/bmp-read.c:155 ../plug-ins/file-faxg3/faxg3.c:232
 #: ../plug-ins/file-fits/fits.c:357 ../plug-ins/file-fli/fli-gimp.c:458
 #: ../plug-ins/file-fli/fli-gimp.c:495 ../plug-ins/file-ico/ico-load.c:652
@@ -1059,7 +1057,7 @@ msgstr "è¼?å?¥è?²ç??æ··å??å?¨è¨å®?"
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:928
 #: ../plug-ins/gfig/gfig.c:434 ../plug-ins/help/gimphelplocale.c:222
 #: ../plug-ins/help/gimphelplocale.c:238
-#: ../plug-ins/lighting/lighting-ui.c:1353
+#: ../plug-ins/lighting/lighting-ui.c:1357
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "ç?¡æ³?é??å??â??%sâ??ä¾?è®?å??è³?æ??ï¼?%s"
@@ -1069,23 +1067,23 @@ msgid "Save Channel Mixer Settings"
 msgstr "å?²å?è?²ç??æ··å??å?¨è¨å®?"
 
 #: ../plug-ins/common/channel-mixer.c:1060
-#: ../plug-ins/common/cml-explorer.c:2004 ../plug-ins/common/curve-bend.c:839
-#: ../plug-ins/common/file-cel.c:582 ../plug-ins/common/file-compressor.c:425
+#: ../plug-ins/common/cml-explorer.c:2034 ../plug-ins/common/curve-bend.c:839
+#: ../plug-ins/common/file-cel.c:583 ../plug-ins/common/file-compressor.c:425
 #: ../plug-ins/common/file-compressor.c:507
 #: ../plug-ins/common/file-compressor.c:589
-#: ../plug-ins/common/file-compressor.c:676
-#: ../plug-ins/common/file-csource.c:406 ../plug-ins/common/file-dicom.c:1352
-#: ../plug-ins/common/file-gbr.c:661 ../plug-ins/common/file-gif-save.c:781
-#: ../plug-ins/common/file-gih.c:1261 ../plug-ins/common/file-html-table.c:235
+#: ../plug-ins/common/file-compressor.c:677
+#: ../plug-ins/common/file-csource.c:406 ../plug-ins/common/file-dicom.c:1356
+#: ../plug-ins/common/file-gbr.c:662 ../plug-ins/common/file-gif-save.c:781
+#: ../plug-ins/common/file-gih.c:1262 ../plug-ins/common/file-html-table.c:235
 #: ../plug-ins/common/file-mng.c:609 ../plug-ins/common/file-mng.c:943
-#: ../plug-ins/common/file-pat.c:484 ../plug-ins/common/file-pcx.c:672
+#: ../plug-ins/common/file-pat.c:484 ../plug-ins/common/file-pcx.c:709
 #: ../plug-ins/common/file-pix.c:523 ../plug-ins/common/file-png.c:1270
 #: ../plug-ins/common/file-pnm.c:976 ../plug-ins/common/file-ps.c:1213
 #: ../plug-ins/common/file-raw.c:589 ../plug-ins/common/file-raw.c:617
-#: ../plug-ins/common/file-sunras.c:562 ../plug-ins/common/file-tga.c:1169
+#: ../plug-ins/common/file-sunras.c:563 ../plug-ins/common/file-tga.c:1169
 #: ../plug-ins/common/file-tiff-save.c:683 ../plug-ins/common/file-xbm.c:1034
-#: ../plug-ins/common/file-xmc.c:1460 ../plug-ins/common/file-xwd.c:613
-#: ../plug-ins/common/sphere-designer.c:2110
+#: ../plug-ins/common/file-xmc.c:1460 ../plug-ins/common/file-xwd.c:617
+#: ../plug-ins/common/sphere-designer.c:2112
 #: ../plug-ins/file-bmp/bmp-write.c:295 ../plug-ins/file-fits/fits.c:475
 #: ../plug-ins/file-fli/fli-gimp.c:748 ../plug-ins/file-ico/ico-save.c:1007
 #: ../plug-ins/file-jpeg/jpeg-save.c:328 ../plug-ins/file-psd/psd-save.c:1637
@@ -1093,14 +1091,14 @@ msgstr "å?²å?è?²ç??æ··å??å?¨è¨å®?"
 #: ../plug-ins/file-xjt/xjt.c:1276 ../plug-ins/file-xjt/xjt.c:1711
 #: ../plug-ins/flame/flame.c:440
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1545
-#: ../plug-ins/gfig/gfig.c:794 ../plug-ins/ifs-compose/ifs-compose.c:2394
-#: ../plug-ins/lighting/lighting-ui.c:1210
+#: ../plug-ins/gfig/gfig.c:798 ../plug-ins/ifs-compose/ifs-compose.c:2394
+#: ../plug-ins/lighting/lighting-ui.c:1214
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "ç?¡æ³?é??å??â??%sâ??ä¾?å¯«å?¥è³?æ??ï¼?%s"
 
 #: ../plug-ins/common/channel-mixer.c:1068
-#: ../plug-ins/common/cml-explorer.c:2059
+#: ../plug-ins/common/cml-explorer.c:2089
 #, c-format
 msgid "Parameters were saved to '%s'"
 msgstr "å??æ?¸å·²å?²å?è?³â??%sâ??"
@@ -1241,7 +1239,7 @@ msgstr "Min (x-d, -)ï¼?x å°?æ?¼ 0.5"
 msgid "Min (x-d, -), (0.5 < x)"
 msgstr "Min (x-d, -)ï¼?x å¤§æ?¼ 0.5"
 
-#: ../plug-ins/common/cml-explorer.c:199 ../plug-ins/common/file-sunras.c:1636
+#: ../plug-ins/common/cml-explorer.c:199 ../plug-ins/common/file-sunras.c:1637
 msgid "Standard"
 msgstr "æ¨?æº?"
 
@@ -1349,83 +1347,83 @@ msgstr "äº®åº¦"
 msgid "(None)"
 msgstr "(ç?¡)"
 
-#: ../plug-ins/common/cml-explorer.c:454
+#: ../plug-ins/common/cml-explorer.c:459
 msgid "Create abstract Coupled-Map Lattice patterns"
 msgstr "å?µå»ºæ?½è±¡ç??è?¦å??æ? å??æ ¼å?å??æ¡?"
 
-#: ../plug-ins/common/cml-explorer.c:465
+#: ../plug-ins/common/cml-explorer.c:470
 msgid "CML _Explorer..."
 msgstr "CMLç??è¦½å?¨(_E)..."
 
-#: ../plug-ins/common/cml-explorer.c:755
+#: ../plug-ins/common/cml-explorer.c:760
 #, fuzzy
 msgid "CML Explorer: evoluting"
 msgstr "Accerciser ç?¡é??ç¤?å??è?½ç??è¦½å?¨"
 
-#: ../plug-ins/common/cml-explorer.c:1176
+#: ../plug-ins/common/cml-explorer.c:1181
 msgid "Coupled-Map-Lattice Explorer"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1223
+#: ../plug-ins/common/cml-explorer.c:1228
 msgid "New Seed"
 msgstr "æ?°ç¨®å?"
 
-#: ../plug-ins/common/cml-explorer.c:1234
+#: ../plug-ins/common/cml-explorer.c:1239
 msgid "Fix Seed"
 msgstr "å?ºå®?ç¨®å?"
 
-#: ../plug-ins/common/cml-explorer.c:1245
+#: ../plug-ins/common/cml-explorer.c:1250
 msgid "Random Seed"
 msgstr "é?¨æ©?æ?¸ç¨®å?"
 
-#: ../plug-ins/common/cml-explorer.c:1287 ../plug-ins/common/filter-pack.c:699
+#: ../plug-ins/common/cml-explorer.c:1292 ../plug-ins/common/filter-pack.c:699
 #: ../plug-ins/common/van-gogh-lic.c:671
 msgid "_Hue"
 msgstr "è?²ç?¸(_H)"
 
-#: ../plug-ins/common/cml-explorer.c:1291
+#: ../plug-ins/common/cml-explorer.c:1296
 msgid "Sat_uration"
 msgstr "é£½å??åº¦(_U)"
 
-#: ../plug-ins/common/cml-explorer.c:1295 ../plug-ins/common/filter-pack.c:707
+#: ../plug-ins/common/cml-explorer.c:1300 ../plug-ins/common/filter-pack.c:707
 msgid "_Value"
 msgstr "äº®åº¦(_V)"
 
-#: ../plug-ins/common/cml-explorer.c:1299
+#: ../plug-ins/common/cml-explorer.c:1304
 msgid "_Advanced"
 msgstr "é?²é??(_A)"
 
-#: ../plug-ins/common/cml-explorer.c:1314
+#: ../plug-ins/common/cml-explorer.c:1319
 #, fuzzy
 msgid "Channel Independent Parameters"
 msgstr "æ??ä»¤å??æ?¸"
 
-#: ../plug-ins/common/cml-explorer.c:1336
+#: ../plug-ins/common/cml-explorer.c:1341
 msgid "Initial value:"
 msgstr "èµ·å§?å?¼ï¼?"
 
-#: ../plug-ins/common/cml-explorer.c:1342
+#: ../plug-ins/common/cml-explorer.c:1347
 msgid "Zoom scale:"
 msgstr "ç¸®æ?¾æ¯?ä¾?ï¼?"
 
-#: ../plug-ins/common/cml-explorer.c:1351
+#: ../plug-ins/common/cml-explorer.c:1356
 #, fuzzy
 msgid "Start offset:"
 msgstr "æ?²å??å??ç§»"
 
-#: ../plug-ins/common/cml-explorer.c:1360
+#: ../plug-ins/common/cml-explorer.c:1365
 msgid "Seed of Random (only for \"From Seed\" Modes)"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1371 ../plug-ins/maze/maze-dialog.c:251
+#: ../plug-ins/common/cml-explorer.c:1376 ../plug-ins/maze/maze-dialog.c:251
 msgid "Seed:"
 msgstr "ç¨®å?:"
 
-#: ../plug-ins/common/cml-explorer.c:1384
+#: ../plug-ins/common/cml-explorer.c:1389
 msgid "Switch to \"From seed\" With the Last Seed"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1396
+#: ../plug-ins/common/cml-explorer.c:1401
 msgid ""
 "\"Fix seed\" button is an alias of me.\n"
 "The same seed produces the same image, if (1) the widths of images are same "
@@ -1433,143 +1431,143 @@ msgid ""
 "(2) all mutation rates equal to zero."
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1404
+#: ../plug-ins/common/cml-explorer.c:1409
 msgid "O_thers"
 msgstr "å?¶å®?(_T)"
 
-#: ../plug-ins/common/cml-explorer.c:1419
+#: ../plug-ins/common/cml-explorer.c:1424
 msgid "Copy Settings"
 msgstr "è¤?è£½è¨å®?"
 
-#: ../plug-ins/common/cml-explorer.c:1438
+#: ../plug-ins/common/cml-explorer.c:1443
 msgid "Source channel:"
 msgstr "ä¾?æº?è?²ç??:"
 
-#: ../plug-ins/common/cml-explorer.c:1453
-#: ../plug-ins/common/cml-explorer.c:1501
+#: ../plug-ins/common/cml-explorer.c:1458
+#: ../plug-ins/common/cml-explorer.c:1506
 msgid "Destination channel:"
 msgstr "ç?®ç??è?²ç??:"
 
-#: ../plug-ins/common/cml-explorer.c:1457
+#: ../plug-ins/common/cml-explorer.c:1462
 msgid "Copy Parameters"
 msgstr "è¤?è£½å??æ?¸"
 
-#: ../plug-ins/common/cml-explorer.c:1466
+#: ../plug-ins/common/cml-explorer.c:1471
 msgid "Selective Load Settings"
 msgstr "é?¸æ??æ?§è¼?å?¥è¨å®?å?¼"
 
-#: ../plug-ins/common/cml-explorer.c:1486
+#: ../plug-ins/common/cml-explorer.c:1491
 msgid "Source channel in file:"
 msgstr "æª?æ¡?å?§ä¾?æº?è?²ç??:"
 
-#: ../plug-ins/common/cml-explorer.c:1507
+#: ../plug-ins/common/cml-explorer.c:1512
 msgid "_Misc Ops."
 msgstr "å?¶å®?é?¸é ?(_M)"
 
-#: ../plug-ins/common/cml-explorer.c:1556
+#: ../plug-ins/common/cml-explorer.c:1571
 #, fuzzy
 msgid "Function type:"
 msgstr "é©?è?é¡?å??"
 
-#: ../plug-ins/common/cml-explorer.c:1572
+#: ../plug-ins/common/cml-explorer.c:1587
 #, fuzzy
 msgid "Composition:"
 msgstr "å¯«ä½?"
 
-#: ../plug-ins/common/cml-explorer.c:1586
+#: ../plug-ins/common/cml-explorer.c:1601
 #, fuzzy
 msgid "Misc arrange:"
 msgstr "æ??å??æª?æ¡?(_A)"
 
-#: ../plug-ins/common/cml-explorer.c:1590
+#: ../plug-ins/common/cml-explorer.c:1605
 msgid "Use cyclic range"
 msgstr "ä½¿ç?¨å¾ªç?°ç¯?å??"
 
-#: ../plug-ins/common/cml-explorer.c:1600
+#: ../plug-ins/common/cml-explorer.c:1615
 #, fuzzy
 msgid "Mod. rate:"
 msgstr "å??æ¨£ç??ï¼?"
 
-#: ../plug-ins/common/cml-explorer.c:1609
+#: ../plug-ins/common/cml-explorer.c:1624
 #, fuzzy
 msgid "Env. sensitivity:"
 msgstr "æ??é??æ??æ??åº¦"
 
-#: ../plug-ins/common/cml-explorer.c:1618
+#: ../plug-ins/common/cml-explorer.c:1633
 msgid "Diffusion dist.:"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1627
+#: ../plug-ins/common/cml-explorer.c:1642
 msgid "# of subranges:"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1636
+#: ../plug-ins/common/cml-explorer.c:1651
 #, fuzzy
 msgid "P(ower factor):"
 msgstr "æ?¾å¤§ç??(_F):"
 
-#: ../plug-ins/common/cml-explorer.c:1645
+#: ../plug-ins/common/cml-explorer.c:1660
 msgid "Parameter k:"
 msgstr "å??æ?¸ k:"
 
-#: ../plug-ins/common/cml-explorer.c:1654
+#: ../plug-ins/common/cml-explorer.c:1669
 #, fuzzy
 msgid "Range low:"
 msgstr "<ä½?å??ä»£ç??å??>"
 
-#: ../plug-ins/common/cml-explorer.c:1663
+#: ../plug-ins/common/cml-explorer.c:1678
 #, fuzzy
 msgid "Range high:"
 msgstr "é«?å??ä»£ç??å??"
 
-#: ../plug-ins/common/cml-explorer.c:1675
+#: ../plug-ins/common/cml-explorer.c:1690
 msgid "Plot a Graph of the Settings"
 msgstr "ç¹ªè£½è¨å®?ç??å??å½¢"
 
-#: ../plug-ins/common/cml-explorer.c:1720
+#: ../plug-ins/common/cml-explorer.c:1735
 #, fuzzy
 msgid "Ch. sensitivity:"
 msgstr "æ??é??æ??æ??åº¦"
 
-#: ../plug-ins/common/cml-explorer.c:1730
+#: ../plug-ins/common/cml-explorer.c:1745
 msgid "Mutation rate:"
 msgstr "çª?è®?ç??:"
 
-#: ../plug-ins/common/cml-explorer.c:1740
+#: ../plug-ins/common/cml-explorer.c:1755
 msgid "Mutation dist.:"
 msgstr ""
 
-#: ../plug-ins/common/cml-explorer.c:1818
+#: ../plug-ins/common/cml-explorer.c:1848
 msgid "Graph of the Current Settings"
 msgstr "ç?®å??è¨å®?ç??å??å½¢"
 
-#: ../plug-ins/common/cml-explorer.c:1889
+#: ../plug-ins/common/cml-explorer.c:1919
 msgid "Warning: the source and the destination are the same channel."
 msgstr "è¦å??ï¼?ä¾?æº?å??ç?®ç??é?½æ?¯ç?¸å??ç??è?²æ?¿ã??"
 
-#: ../plug-ins/common/cml-explorer.c:1948
+#: ../plug-ins/common/cml-explorer.c:1978
 msgid "Save CML Explorer Parameters"
 msgstr "å?²å? CML ç??è¦½å?¨å??æ?¸"
 
-#: ../plug-ins/common/cml-explorer.c:2081
+#: ../plug-ins/common/cml-explorer.c:2111
 msgid "Load CML Explorer Parameters"
 msgstr "è¼?å?¥ CML ç??è¦½å?¨å??æ?¸"
 
-#: ../plug-ins/common/cml-explorer.c:2199
+#: ../plug-ins/common/cml-explorer.c:2229
 msgid "Error: it's not CML parameter file."
 msgstr "é?¯èª¤ï¼?å®?ä¸?æ?¯ CML å??æ?¸æª?ã??"
 
-#: ../plug-ins/common/cml-explorer.c:2206
+#: ../plug-ins/common/cml-explorer.c:2236
 #, c-format
 msgid "Warning: '%s' is an old format file."
 msgstr "è¦å??ï¼?â??%sâ??æ?¯è??æ ¼å¼?ç??æª?æ¡?ã??"
 
-#: ../plug-ins/common/cml-explorer.c:2210
+#: ../plug-ins/common/cml-explorer.c:2240
 #, fuzzy, c-format
 msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer."
 msgstr "è¦å??ï¼?â??%sâ??é??å??å??æ?¸æª?ç??ç??æ?¬æ¯?æ?¬ç¨?å¼?è?½å¤ è¾¨èª?ç??é??è¦?æ?°ã??"
 
-#: ../plug-ins/common/cml-explorer.c:2273
+#: ../plug-ins/common/cml-explorer.c:2303
 msgid "Error: failed to load parameters"
 msgstr "é?¯èª¤ï¼?è¼?å?¥å??æ?¸å¤±æ??"
 
@@ -1632,9 +1630,8 @@ msgid "Color Exchange"
 msgstr "è?²å½©äº¤æ??"
 
 #: ../plug-ins/common/color-exchange.c:310
-#, fuzzy
 msgid "Middle-Click Inside Preview to Pick \"From Color\""
-msgstr "é ?è¦½ï¼?è«?æ??è£¡é?¢é?¸å??ã??ä¾?æº?é¡?è?²ã??"
+msgstr "å?¨é ?è¦½å??ä¸ï¼?æ??æ»?é¼ ä¸é?µæ??é?¸ã??ä¾?æº?é¡?è?²ã??"
 
 #: ../plug-ins/common/color-exchange.c:355
 msgid "To Color"
@@ -1685,10 +1682,9 @@ msgid "Color to Alpha"
 msgstr "è?²å½©è½?ç?ºé??æ??"
 
 #: ../plug-ins/common/color-to-alpha.c:410
-#, fuzzy
 msgctxt "color-to-alpha"
 msgid "From:"
-msgstr "å¯?ä»¶è??:"
+msgstr "å¾?ï¼?"
 
 #: ../plug-ins/common/color-to-alpha.c:414
 msgid "Color to Alpha Color Picker"
@@ -1918,7 +1914,7 @@ msgstr "Redness_cr709f:"
 
 #: ../plug-ins/common/compose.c:403
 msgid "Create an image using multiple gray images as color channels"
-msgstr "å»ºç«?ä¸?å??å??ç??ï¼?å?¶ä½¿ç?¨å¤?å??ç?°é??å??ç??ä½?ç?ºè?²å½©è?²ç??"
+msgstr "å»ºç«?ä¸?å??å??ç??ï¼?å?¶ä½¿ç?¨å¤?å??ç?°é??å??ç??ä½?ç?ºé¡?è?²è?²ç??"
 
 #: ../plug-ins/common/compose.c:409
 msgid "C_ompose..."
@@ -1996,9 +1992,8 @@ msgstr "è?²å½©æ¨¡å¼?(_M)ï¼?"
 
 #. Channel representation table
 #: ../plug-ins/common/compose.c:1551
-#, fuzzy
 msgid "Channel Representations"
-msgstr "è¦?è¨?é??é??"
+msgstr "è?²ç??å±?ç?¾"
 
 #: ../plug-ins/common/compose.c:1614
 #, fuzzy
@@ -2012,11 +2007,11 @@ msgstr "ä¼¸å±?æ?´é«?äº®åº¦å?¼"
 #: ../plug-ins/common/contrast-normalize.c:91
 #: ../plug-ins/common/edge-dog.c:361
 msgid "_Normalize"
-msgstr "æ£è¦?å??(_N)"
+msgstr "æ??é«?å°?æ¯?åº¦(_N)"
 
 #: ../plug-ins/common/contrast-normalize.c:125
 msgid "Normalizing"
-msgstr "æ£è¦?å??"
+msgstr "æ??é«?å°?æ¯?åº¦"
 
 #: ../plug-ins/common/contrast-retinex.c:155
 msgid "Enhance contrast using the Retinex method"
@@ -2129,7 +2124,7 @@ msgstr "å»¶ä¼¸(_X)"
 
 #: ../plug-ins/common/convolution-matrix.c:73
 #: ../plug-ins/common/displace.c:472 ../plug-ins/common/edge.c:705
-#: ../plug-ins/common/fractal-trace.c:736 ../plug-ins/common/ripple.c:582
+#: ../plug-ins/common/fractal-trace.c:736 ../plug-ins/common/ripple.c:584
 msgid "_Wrap"
 msgstr "ç¹?å?°å?¦ä¸?é??(_W)"
 
@@ -2146,9 +2141,8 @@ msgid "_Convolution Matrix..."
 msgstr "ç?©é?£é??ç®?(_C)..."
 
 #: ../plug-ins/common/convolution-matrix.c:240
-#, fuzzy
 msgid "Convolution does not work on layers smaller than 3x3 pixels."
-msgstr "ç?©é?£é??ç®?ä¸?é?©ç?¨æ?¼å°?æ?¼ 3 å??å??ç´ ç??å??å±¤ã??"
+msgstr "å?·ç©?ä¸?èµ·ä½?ç?¨ï¼?ç?¶å??å±¤å°?æ?¼3x3å??ç´ ã??"
 
 #: ../plug-ins/common/convolution-matrix.c:313
 msgid "Applying convolution"
@@ -2279,13 +2273,13 @@ msgstr "è®?å??å½±ç?? DVD æ??ç?¼ç??é?¯èª¤ (%s)"
 
 #. Possibly retrieve data from a previous run
 #. The shell and main vbox
-#: ../plug-ins/common/curve-bend.c:1223 ../plug-ins/common/curve-bend.c:2963
+#: ../plug-ins/common/curve-bend.c:1224 ../plug-ins/common/curve-bend.c:2964
 msgid "Curve Bend"
 msgstr "ä¾?æ?²ç·?æ?æ?²"
 
 #. Preview area, top of column
 #. preview
-#: ../plug-ins/common/curve-bend.c:1260
+#: ../plug-ins/common/curve-bend.c:1261
 #: ../plug-ins/gimpressionist/orientmap.c:591
 #: ../plug-ins/gimpressionist/sizemap.c:461
 #: ../plug-ins/print/print-page-layout.c:171
@@ -2293,117 +2287,117 @@ msgid "Preview"
 msgstr "é ?è¦½"
 
 #. The preview button
-#: ../plug-ins/common/curve-bend.c:1289
+#: ../plug-ins/common/curve-bend.c:1290
 msgid "_Preview Once"
 msgstr "é ?è¦½ä¸?æ¬¡(_P)"
 
 #. The preview toggle
-#: ../plug-ins/common/curve-bend.c:1298
+#: ../plug-ins/common/curve-bend.c:1299
 msgid "Automatic pre_view"
 msgstr "è?ªå??æ?´æ?°é ?è¦½(_V)"
 
 #. Options area, bottom of column
 #. Options section
-#: ../plug-ins/common/curve-bend.c:1308 ../plug-ins/common/ripple.c:520
+#: ../plug-ins/common/curve-bend.c:1309 ../plug-ins/common/ripple.c:522
 #: ../plug-ins/gfig/gfig-dialog.c:1206
 msgid "Options"
 msgstr "é?¸é ?"
 
 #. Rotate spinbutton
-#: ../plug-ins/common/curve-bend.c:1322
+#: ../plug-ins/common/curve-bend.c:1323
 msgid "Rotat_e:"
 msgstr "æ??è½?(_E)ï¼?"
 
 #. The smoothing toggle
-#: ../plug-ins/common/curve-bend.c:1341
+#: ../plug-ins/common/curve-bend.c:1342
 msgid "Smoo_thing"
 msgstr "å¹³æ»?å??(_T)"
 
 #. The antialiasing toggle
-#: ../plug-ins/common/curve-bend.c:1351 ../plug-ins/common/mosaic.c:731
-#: ../plug-ins/common/qbist.c:852 ../plug-ins/common/ripple.c:529
+#: ../plug-ins/common/curve-bend.c:1352 ../plug-ins/common/mosaic.c:731
+#: ../plug-ins/common/qbist.c:852 ../plug-ins/common/ripple.c:531
 msgid "_Antialiasing"
 msgstr "å??é?¸é½?(_A)"
 
 #. The work_on_copy toggle
-#: ../plug-ins/common/curve-bend.c:1361
+#: ../plug-ins/common/curve-bend.c:1362
 msgid "Work on cop_y"
 msgstr "å°?çµ?æ??é¡¯ç¤ºæ?¼å??ä»½å??å±¤ä¸(_Y)"
 
 #. The curves graph
-#: ../plug-ins/common/curve-bend.c:1371
+#: ../plug-ins/common/curve-bend.c:1372
 msgid "Modify Curves"
 msgstr "ä¿®æ?¹æ?²ç·?"
 
-#: ../plug-ins/common/curve-bend.c:1399
+#: ../plug-ins/common/curve-bend.c:1400
 msgid "Curve for Border"
 msgstr "é??ç·£ç??æ?²ç·?"
 
-#: ../plug-ins/common/curve-bend.c:1403
+#: ../plug-ins/common/curve-bend.c:1404
 msgid "_Upper"
 msgstr "é ?é?¨(_U)"
 
-#: ../plug-ins/common/curve-bend.c:1404
+#: ../plug-ins/common/curve-bend.c:1405
 msgid "_Lower"
 msgstr "åº?é?¨(_L)"
 
-#: ../plug-ins/common/curve-bend.c:1414
+#: ../plug-ins/common/curve-bend.c:1415
 msgid "Curve Type"
 msgstr "æ?²ç·?é¡?å??(_T)ï¼?"
 
-#: ../plug-ins/common/curve-bend.c:1418
+#: ../plug-ins/common/curve-bend.c:1419
 msgid "Smoot_h"
 msgstr "å¹³æ»?(_H)"
 
-#: ../plug-ins/common/curve-bend.c:1419
+#: ../plug-ins/common/curve-bend.c:1420
 msgid "_Free"
 msgstr "è?ªç?±(_F)"
 
 #. The Copy button
-#: ../plug-ins/common/curve-bend.c:1434
+#: ../plug-ins/common/curve-bend.c:1435
 msgid "_Copy"
 msgstr "è¤?è£½(_C)"
 
-#: ../plug-ins/common/curve-bend.c:1439
+#: ../plug-ins/common/curve-bend.c:1440
 msgid "Copy the active curve to the other border"
 msgstr "å°?ä½¿ç?¨ä¸ç??æ?²ç·?è¤?è£½è?³å?¦ä¸?é??"
 
 #. The CopyInv button
-#: ../plug-ins/common/curve-bend.c:1446
+#: ../plug-ins/common/curve-bend.c:1447
 msgid "_Mirror"
 msgstr "é?¡å??(_M)"
 
-#: ../plug-ins/common/curve-bend.c:1451
+#: ../plug-ins/common/curve-bend.c:1452
 msgid "Mirror the active curve to the other border"
 msgstr "å°?ä½¿ç?¨ä¸ç??æ?²ç·?ç??é?¡å??è¤?è£½è?³å?¦ä¸?é??"
 
 #. The Swap button
-#: ../plug-ins/common/curve-bend.c:1459
+#: ../plug-ins/common/curve-bend.c:1460
 msgid "S_wap"
 msgstr "äº¤æ??(_W)"
 
-#: ../plug-ins/common/curve-bend.c:1464
+#: ../plug-ins/common/curve-bend.c:1465
 msgid "Swap the two curves"
 msgstr "äº¤æ??å?©é??ç??æ?²ç·?"
 
-#: ../plug-ins/common/curve-bend.c:1476
+#: ../plug-ins/common/curve-bend.c:1477
 msgid "Reset the active curve"
 msgstr "é??æ?°è¨å®?ä½¿ç?¨ä¸ç??æ?²ç·?"
 
-#: ../plug-ins/common/curve-bend.c:1493
+#: ../plug-ins/common/curve-bend.c:1494
 msgid "Load the curves from a file"
 msgstr "å¾?æª?æ¡?è¼?å?¥æ?²ç·?"
 
-#: ../plug-ins/common/curve-bend.c:1505
+#: ../plug-ins/common/curve-bend.c:1506
 msgid "Save the curves to a file"
 msgstr "å°?æ?²ç·?å?²å?è?³æª?æ¡?"
 
-#: ../plug-ins/common/curve-bend.c:2061
+#: ../plug-ins/common/curve-bend.c:2062
 #, fuzzy
 msgid "Load Curve Points from File"
 msgstr "å¾?æª?æ¡?è¼?å?¥ WMS å??å±¤"
 
-#: ../plug-ins/common/curve-bend.c:2096
+#: ../plug-ins/common/curve-bend.c:2097
 #, fuzzy
 msgid "Save Curve Points to File"
 msgstr "ç?¡æ³?å?²å?æª?æ¡? %(filename)sã??"
@@ -2604,24 +2598,24 @@ msgid "Decompose"
 msgstr "å??è§£"
 
 #: ../plug-ins/common/decompose.c:1512
-#, fuzzy
 msgid "Extract Channels"
-msgstr "è?²é??æ?¸ç?®ï¼?"
+msgstr "æ??å??è?²ç??"
 
 #: ../plug-ins/common/decompose.c:1559
 msgid "_Decompose to layers"
 msgstr "å??è§£å?°æ?¸å??å??å±¤ä¸(_D)"
 
 #: ../plug-ins/common/decompose.c:1570
-#, fuzzy
 msgid "_Foreground as registration color"
-msgstr "ä»¥å?ä¸²æ?¹å¼?è¡¨é??ç??å??æ?¯é¡?è?²"
+msgstr "å??æ?¯é¡?è?²ç?¶ä½?ç?»è¨?é¡?è?²(_F)"
 
 #: ../plug-ins/common/decompose.c:1571
 msgid ""
 "Pixels in the foreground color will appear black in all output images.  This "
 "can be used for things like crop marks that have to show up on all channels."
 msgstr ""
+"å??æ?¯è?²ç??å??ç´ å°?å?ºç?¾é»?è?²å?¨æ??æ??è¼¸å?ºå??ç??ã??é??å?¯ä»¥ç?¨æ?¼è£?å??ç·?é¡?ç??æ?±è¥¿ï¼?æ?¯è¦?é¡¯ç¤ºå?¨æ??"
+"æ??è?²ç??ã??"
 
 #: ../plug-ins/common/deinterlace.c:90
 msgid "Fix images where every other row is missing"
@@ -2637,11 +2631,11 @@ msgstr "å?»äº¤é?¯"
 
 #: ../plug-ins/common/deinterlace.c:354
 msgid "Keep o_dd fields"
-msgstr "ä¿?æ??å¥?æ?¸æ¬?ä½?(_D)"
+msgstr "ä¿?ç??å¥?æ?¸å??å??(_D)"
 
 #: ../plug-ins/common/deinterlace.c:355
 msgid "Keep _even fields"
-msgstr "ä¿?æ??å?¶æ?¸æ¬?ä½?(_E)"
+msgstr "ä¿?ç??å?¶æ?¸å??å??(_E)"
 
 #: ../plug-ins/common/depth-merge.c:184
 msgid "Combine two images using depth maps (z-buffers)"
@@ -2739,7 +2733,7 @@ msgstr "æ£å?¨æ¶?å?»æ¢?ç´?..."
 msgid "Destripe"
 msgstr "å?»æ¢?ç´?"
 
-#: ../plug-ins/common/destripe.c:473 ../plug-ins/common/file-html-table.c:580
+#: ../plug-ins/common/destripe.c:473 ../plug-ins/common/file-html-table.c:581
 #: ../plug-ins/common/file-ps.c:3168 ../plug-ins/common/file-ps.c:3363
 #: ../plug-ins/common/file-raw.c:1132 ../plug-ins/common/smooth-palette.c:435
 #: ../plug-ins/common/tile-paper.c:302 ../plug-ins/common/tile.c:431
@@ -2863,7 +2857,7 @@ msgid "Edge Behavior"
 msgstr "é??ç·£è¡?ç?º"
 
 #: ../plug-ins/common/displace.c:474 ../plug-ins/common/edge.c:718
-#: ../plug-ins/common/ripple.c:583 ../plug-ins/common/waves.c:282
+#: ../plug-ins/common/ripple.c:585 ../plug-ins/common/waves.c:282
 msgid "_Smear"
 msgstr "å¡?æ±¡(_S)"
 
@@ -2934,7 +2928,7 @@ msgstr "é??è?¹ç??å?µæ¸¬"
 
 #: ../plug-ins/common/edge-neon.c:747 ../plug-ins/common/unsharp-mask.c:879
 msgid "_Amount:"
-msgstr "ç¨?åº¦(_A)ï¼?"
+msgstr "ç¸½é??(_A)ï¼?"
 
 #: ../plug-ins/common/edge-sobel.c:107
 msgid "Specialized direction-dependent edge detection"
@@ -2950,11 +2944,11 @@ msgstr "Sobel é??ç·£å?µæ¸¬"
 
 #: ../plug-ins/common/edge-sobel.c:260
 msgid "Sobel _horizontally"
-msgstr "Sobel æ°´å¹³ç??(_H)"
+msgstr "å?§å?¹æµ®é??æ??æ??(_H)"
 
 #: ../plug-ins/common/edge-sobel.c:272
 msgid "Sobel _vertically"
-msgstr "Sobel å??ç?´ç??(_V)"
+msgstr "å¤?å?¸æµ®é??æ??æ??(_V)"
 
 #: ../plug-ins/common/edge-sobel.c:284
 msgid "_Keep sign of result (one direction only)"
@@ -3007,7 +3001,7 @@ msgstr "æ¼?ç®?æ³?(_A)ï¼?"
 
 #: ../plug-ins/common/edge.c:686
 msgid "A_mount:"
-msgstr "æ?¸é??(_M):"
+msgstr "ç·?æ¢?å¯¬åº¦(_M)ï¼?"
 
 #: ../plug-ins/common/emboss.c:124
 msgid "Simulate an image created by embossing"
@@ -3053,7 +3047,7 @@ msgstr "æ£å?¨é?²è¡?é??å?»..."
 msgid "Engrave"
 msgstr "é??å?»..."
 
-#: ../plug-ins/common/engrave.c:244 ../plug-ins/common/file-html-table.c:596
+#: ../plug-ins/common/engrave.c:244 ../plug-ins/common/file-html-table.c:597
 #: ../plug-ins/common/file-ps.c:3178 ../plug-ins/common/file-ps.c:3372
 #: ../plug-ins/common/file-raw.c:1145 ../plug-ins/common/film.c:1002
 #: ../plug-ins/common/smooth-palette.c:440 ../plug-ins/common/tile-paper.c:313
@@ -3095,19 +3089,19 @@ msgstr "è¼?å?¥ KISS èª¿è?²ç?¤"
 #. -1  assume there is no floating selection
 #: ../plug-ins/common/file-cel.c:316 ../plug-ins/common/file-dicom.c:344
 #: ../plug-ins/common/file-gbr.c:372 ../plug-ins/common/file-gif-load.c:360
-#: ../plug-ins/common/file-gih.c:648 ../plug-ins/common/file-jp2-load.c:190
+#: ../plug-ins/common/file-gih.c:649 ../plug-ins/common/file-jp2-load.c:190
 #: ../plug-ins/common/file-pat.c:341 ../plug-ins/common/file-pcx.c:365
-#: ../plug-ins/common/file-pix.c:347 ../plug-ins/common/file-png.c:727
-#: ../plug-ins/common/file-pnm.c:498 ../plug-ins/common/file-ps.c:1042
-#: ../plug-ins/common/file-raw.c:714 ../plug-ins/common/file-sunras.c:485
-#: ../plug-ins/common/file-tga.c:446 ../plug-ins/common/file-tiff-load.c:604
-#: ../plug-ins/common/file-wmf.c:993 ../plug-ins/common/file-xbm.c:741
-#: ../plug-ins/common/file-xmc.c:678 ../plug-ins/common/file-xpm.c:351
-#: ../plug-ins/common/file-xwd.c:519 ../plug-ins/file-bmp/bmp-read.c:160
-#: ../plug-ins/file-faxg3/faxg3.c:216 ../plug-ins/file-fli/fli-gimp.c:500
-#: ../plug-ins/file-ico/ico-load.c:645 ../plug-ins/file-jpeg/jpeg-load.c:114
-#: ../plug-ins/file-psd/psd-load.c:135 ../plug-ins/file-sgi/sgi.c:329
-#: ../plug-ins/file-xjt/xjt.c:3329
+#: ../plug-ins/common/file-pdf-load.c:601 ../plug-ins/common/file-pix.c:347
+#: ../plug-ins/common/file-png.c:727 ../plug-ins/common/file-pnm.c:498
+#: ../plug-ins/common/file-ps.c:1042 ../plug-ins/common/file-raw.c:714
+#: ../plug-ins/common/file-sunras.c:486 ../plug-ins/common/file-tga.c:446
+#: ../plug-ins/common/file-tiff-load.c:604 ../plug-ins/common/file-wmf.c:993
+#: ../plug-ins/common/file-xbm.c:741 ../plug-ins/common/file-xmc.c:678
+#: ../plug-ins/common/file-xpm.c:351 ../plug-ins/common/file-xwd.c:523
+#: ../plug-ins/file-bmp/bmp-read.c:160 ../plug-ins/file-faxg3/faxg3.c:216
+#: ../plug-ins/file-fli/fli-gimp.c:500 ../plug-ins/file-ico/ico-load.c:645
+#: ../plug-ins/file-jpeg/jpeg-load.c:114 ../plug-ins/file-psd/psd-load.c:135
+#: ../plug-ins/file-sgi/sgi.c:329 ../plug-ins/file-xjt/xjt.c:3329
 #, fuzzy, c-format
 msgid "Opening '%s'"
 msgstr "æ£å?¨é??å??â??%sâ??"
@@ -3116,22 +3110,22 @@ msgstr "æ£å?¨é??å??â??%sâ??"
 msgid "Can't create a new image"
 msgstr "ç?¡æ³?ç?¢ç??æ?°ç??å??ç??"
 
-#: ../plug-ins/common/file-cel.c:442
+#: ../plug-ins/common/file-cel.c:443
 #, c-format
 msgid "Unsupported bit depth (%d)!"
 msgstr "ä¸?æ?¯æ?´ç??é¡?è?²ä½?å??æ?¸(%d)ï¼?"
 
 #. init the progress meter
 #. And let's begin the progress
-#: ../plug-ins/common/file-cel.c:587 ../plug-ins/common/file-gbr.c:666
-#: ../plug-ins/common/file-gif-save.c:788 ../plug-ins/common/file-gih.c:1266
-#: ../plug-ins/common/file-html-table.c:255 ../plug-ins/common/file-pat.c:489
-#: ../plug-ins/common/file-pcx.c:633 ../plug-ins/common/file-pix.c:528
+#: ../plug-ins/common/file-cel.c:588 ../plug-ins/common/file-gbr.c:667
+#: ../plug-ins/common/file-gif-save.c:788 ../plug-ins/common/file-gih.c:1267
+#: ../plug-ins/common/file-html-table.c:256 ../plug-ins/common/file-pat.c:489
+#: ../plug-ins/common/file-pcx.c:641 ../plug-ins/common/file-pix.c:528
 #: ../plug-ins/common/file-png.c:1277 ../plug-ins/common/file-pnm.c:981
-#: ../plug-ins/common/file-ps.c:1218 ../plug-ins/common/file-sunras.c:567
+#: ../plug-ins/common/file-ps.c:1218 ../plug-ins/common/file-sunras.c:568
 #: ../plug-ins/common/file-tga.c:1174 ../plug-ins/common/file-tiff-save.c:693
 #: ../plug-ins/common/file-xbm.c:1039 ../plug-ins/common/file-xmc.c:1465
-#: ../plug-ins/common/file-xpm.c:636 ../plug-ins/common/file-xwd.c:618
+#: ../plug-ins/common/file-xpm.c:636 ../plug-ins/common/file-xwd.c:622
 #: ../plug-ins/file-bmp/bmp-write.c:306 ../plug-ins/file-fits/fits.c:480
 #: ../plug-ins/file-fli/fli-gimp.c:716 ../plug-ins/file-ico/ico-save.c:1001
 #: ../plug-ins/file-jpeg/jpeg-save.c:285 ../plug-ins/file-psd/psd-save.c:1642
@@ -3163,50 +3157,50 @@ msgstr "æ²?æ??å??ç??ç??å»¶ä¼¸æª?å??ï¼?å??è©¦è?ªå??å?µæ¸¬æª?æ¡?é¡?å??ã??"
 msgid "C source code"
 msgstr "C æº?ä»£ç¢¼"
 
-#: ../plug-ins/common/file-csource.c:703
+#: ../plug-ins/common/file-csource.c:704
 #, fuzzy
 msgid "C-Source"
 msgstr "ä¾?æº?"
 
-#: ../plug-ins/common/file-csource.c:721
+#: ../plug-ins/common/file-csource.c:722
 msgid "_Prefixed name:"
 msgstr "å??ç½®å??ç¨±(_P)ï¼?"
 
-#: ../plug-ins/common/file-csource.c:730
+#: ../plug-ins/common/file-csource.c:731
 msgid "Co_mment:"
 msgstr "å??è¨»(_M)ï¼?"
 
 #. Use Comment
 #.
-#: ../plug-ins/common/file-csource.c:737
+#: ../plug-ins/common/file-csource.c:738
 msgid "_Save comment to file"
 msgstr "å°?å??è¨»æ??å?å?²å?å?°æª?æ¡?ä¸(_S)"
 
 #. GLib types
 #.
-#: ../plug-ins/common/file-csource.c:749
+#: ../plug-ins/common/file-csource.c:750
 msgid "_Use GLib types (guint8*)"
 msgstr "ä½¿ç?¨ _GLib è³?æ??é¡?å?? (guint8*)"
 
-#: ../plug-ins/common/file-csource.c:762
+#: ../plug-ins/common/file-csource.c:763
 msgid "Us_e macros instead of struct"
 msgstr "ä½¿ç?¨å·¨é??è??ä¸?ç?¨ _Struct"
 
-#: ../plug-ins/common/file-csource.c:775
+#: ../plug-ins/common/file-csource.c:776
 msgid "Use _1 byte Run-Length-Encoding"
 msgstr ""
 
-#: ../plug-ins/common/file-csource.c:788
+#: ../plug-ins/common/file-csource.c:789
 msgid "Sa_ve alpha channel (RGBA/RGB)"
 msgstr "å?²å?é??æ??è?²ç?? (_RGBA/RGB)"
 
 #. RGB-565
 #.
-#: ../plug-ins/common/file-csource.c:800
+#: ../plug-ins/common/file-csource.c:801
 msgid "Save as _RGB565 (16-bit)"
 msgstr ""
 
-#: ../plug-ins/common/file-csource.c:823
+#: ../plug-ins/common/file-csource.c:824
 msgid "Op_acity:"
 msgstr "ä¸?é??æ??åº¦(_A)ï¼?"
 
@@ -3228,18 +3222,18 @@ msgstr "DICOM å??ç??"
 msgid "Digital Imaging and Communications in Medicine image"
 msgstr ""
 
-#: ../plug-ins/common/file-dicom.c:366
+#: ../plug-ins/common/file-dicom.c:368
 #, c-format
 msgid "'%s' is not a DICOM file."
 msgstr "â??%sâ??ä¸?æ?¯ DICOM æ ¼å¼?æª?æ¡?ã??"
 
-#: ../plug-ins/common/file-dicom.c:1320 ../plug-ins/common/file-pcx.c:665
+#: ../plug-ins/common/file-dicom.c:1324 ../plug-ins/common/file-pcx.c:673
 #: ../plug-ins/common/file-pnm.c:966
 msgid "Cannot save images with alpha channel."
 msgstr "ç?¡æ³?å?²å?æ??é??æ??è?²ç??ç??å??ç??ã??"
 
-#: ../plug-ins/common/file-dicom.c:1335 ../plug-ins/common/file-ps.c:1203
-#: ../plug-ins/common/file-xwd.c:603 ../plug-ins/file-fits/fits.c:465
+#: ../plug-ins/common/file-dicom.c:1339 ../plug-ins/common/file-ps.c:1203
+#: ../plug-ins/common/file-xwd.c:607 ../plug-ins/file-fits/fits.c:465
 #: ../plug-ins/file-xjt/xjt.c:1687
 msgid "Cannot operate on unknown image types."
 msgstr "ç?¡æ³?è??ç??ä¸?æ??ç??å??ç??ã??"
@@ -3268,25 +3262,25 @@ msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "ç?å?·æª?æ¡?â??%sâ??ä¸å?«æ??ç?¡æ??ç?? UTF-8 æ??å?ã??"
 
 #: ../plug-ins/common/file-gbr.c:460 ../plug-ins/common/file-gih.c:491
-#: ../plug-ins/common/file-gih.c:1140
+#: ../plug-ins/common/file-gih.c:1141
 #: ../plug-ins/gradient-flare/gradient-flare.c:3062
 msgid "Unnamed"
 msgstr "æ?ªå?½å??"
 
-#: ../plug-ins/common/file-gbr.c:651
+#: ../plug-ins/common/file-gbr.c:652
 msgid "GIMP brushes are either GRAYSCALE or RGBA"
 msgstr "GIMP ç?å?·æª?å¿?é ?ç?ºç?°é??æ?? RGBA å??ç??"
 
-#: ../plug-ins/common/file-gbr.c:768
+#: ../plug-ins/common/file-gbr.c:769
 msgid "Brush"
 msgstr "ç?å?·"
 
 #. attach labels
-#: ../plug-ins/common/file-gbr.c:782 ../plug-ins/common/grid.c:790
+#: ../plug-ins/common/file-gbr.c:783 ../plug-ins/common/grid.c:790
 msgid "Spacing:"
 msgstr "é??é??ï¼?"
 
-#: ../plug-ins/common/file-gbr.c:793 ../plug-ins/common/file-gih.c:891
+#: ../plug-ins/common/file-gbr.c:794 ../plug-ins/common/file-gih.c:892
 #: ../plug-ins/common/file-pat.c:566 ../plug-ins/gimpressionist/presets.c:666
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
@@ -3302,7 +3296,7 @@ msgstr "é??å??ä¸?æ?¯ GIF æª?"
 
 #: ../plug-ins/common/file-gif-load.c:411
 msgid "Non-square pixels.  Image might look squashed."
-msgstr ""
+msgstr "é??æ?¹å½¢å??ç´ ã??å??ç??ç??èµ·ä¾?è¢«å£?æ??ç??ã??"
 
 #: ../plug-ins/common/file-gif-load.c:929
 #, c-format
@@ -3341,7 +3335,7 @@ msgstr "ç?¡æ³?å??å?ªæ¸?é¡?è?²æ?¸ç?®ã??ç?¾å?¨æ??å?²å?ç?ºä¸?é??æ??ç??å??ç??ã??"
 msgid ""
 "Unable to save '%s'.  The GIF file format does not support images that are "
 "more than %d pixels wide or tall."
-msgstr ""
+msgstr "ä¸?è?½å?²å?ã??%sã??ã??GIF æª?æ¡?æ ¼å¼?ä¸?æ?¯æ??è¶?é?? %d å??ç´ å¯¬æ??é«?ç??å??ç??ã??"
 
 #: ../plug-ins/common/file-gif-save.c:693
 msgid ""
@@ -3410,6 +3404,8 @@ msgid ""
 "You can only export as animation when the image has more than one layer. The "
 "image you are trying to export only has one layer."
 msgstr ""
+"ç?¶å??ç??æ??ä¸?å?ªä¸?å??å??å±¤æ??ï¼?æ?¨æ??å?¯ä»¥å°?å®?å?¯å?ºæ??ç?ºå??ç?«ã??ä½?æ?¯æ?¨æ£å??è©¦å?¯å?ºç??å??ç??å?»å?ª"
+"æ??ä¸?å??å??å±¤ï¼?"
 
 #: ../plug-ins/common/file-gif-save.c:2349
 msgid "Error writing output file."
@@ -3434,61 +3430,61 @@ msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?å®?ä¸?æ?¯ GIMP ç?å?·
 msgid "GIMP brush file appears to be corrupted."
 msgstr "GIMP ç?å?·æª?ä¼¼ä¹?å£?äº?ã??"
 
-#: ../plug-ins/common/file-gih.c:699
+#: ../plug-ins/common/file-gih.c:700
 msgid "Couldn't load one brush in the pipe, giving up."
 msgstr ""
 
-#: ../plug-ins/common/file-gih.c:860
+#: ../plug-ins/common/file-gih.c:861
 #, fuzzy
 msgid "Brush Pipe"
 msgstr "ç®¡ç·?ä¸æ?·"
 
-#: ../plug-ins/common/file-gih.c:877
+#: ../plug-ins/common/file-gih.c:878
 msgid "Spacing (percent):"
 msgstr "é??é??(ç?¾å??æ¯?)ï¼?"
 
-#: ../plug-ins/common/file-gih.c:944
+#: ../plug-ins/common/file-gih.c:945
 msgid "Pixels"
 msgstr "å??ç´ "
 
-#: ../plug-ins/common/file-gih.c:949
+#: ../plug-ins/common/file-gih.c:950
 msgid "Cell size:"
 msgstr "å?®å??å°ºå¯¸:"
 
-#: ../plug-ins/common/file-gih.c:961
+#: ../plug-ins/common/file-gih.c:962
 #, fuzzy
 msgid "Number of cells:"
 msgstr "<b>å?²å?æ ¼æ?¸ï¼?</b>"
 
-#: ../plug-ins/common/file-gih.c:986
+#: ../plug-ins/common/file-gih.c:987
 #, fuzzy
 msgid " Rows of "
 msgstr "å??"
 
-#: ../plug-ins/common/file-gih.c:998
+#: ../plug-ins/common/file-gih.c:999
 #, fuzzy
 msgid " Columns on each layer"
 msgstr "æ?¨æ£?å?³é?¢æ¬?ä½?"
 
-#: ../plug-ins/common/file-gih.c:1002
+#: ../plug-ins/common/file-gih.c:1003
 msgid " (Width Mismatch!) "
 msgstr " (å¯¬åº¦ä¸?ç¬¦ï¼?) "
 
-#: ../plug-ins/common/file-gih.c:1006
+#: ../plug-ins/common/file-gih.c:1007
 msgid " (Height Mismatch!) "
 msgstr " (é«?åº¦ä¸?ç¬¦ï¼?) "
 
-#: ../plug-ins/common/file-gih.c:1011
+#: ../plug-ins/common/file-gih.c:1012
 #, fuzzy
 msgid "Display as:"
 msgstr "é¡¯ç¤ºå??æ¨?ç?º"
 
-#: ../plug-ins/common/file-gih.c:1020
+#: ../plug-ins/common/file-gih.c:1021
 #, fuzzy
 msgid "Dimension:"
 msgstr "Dimension"
 
-#: ../plug-ins/common/file-gih.c:1095
+#: ../plug-ins/common/file-gih.c:1096
 #, fuzzy
 msgid "Ranks:"
 msgstr "ç?ç´? (%s)"
@@ -3498,15 +3494,15 @@ msgid "C source code header"
 msgstr "C æº?ä»£ç¢¼æª?é "
 
 #: ../plug-ins/common/file-html-table.c:155
-#: ../plug-ins/common/file-html-table.c:408
+#: ../plug-ins/common/file-html-table.c:409
 msgid "HTML table"
 msgstr "HTML è¡¨æ ¼"
 
-#: ../plug-ins/common/file-html-table.c:421
+#: ../plug-ins/common/file-html-table.c:422
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../plug-ins/common/file-html-table.c:432
+#: ../plug-ins/common/file-html-table.c:433
 msgid ""
 "You are about to create a huge\n"
 "HTML file which will most likely\n"
@@ -3514,15 +3510,15 @@ msgid ""
 msgstr "æ?¨æ£è¦?å»ºç«?ä¸?å??å¾?å?¯è?½æ??è®?ç??è¦½å?¨æ??æ??ç??å·¨å¤§ HTML æª?ã??"
 
 #. HTML Page Options
-#: ../plug-ins/common/file-html-table.c:441
+#: ../plug-ins/common/file-html-table.c:442
 msgid "HTML Page Options"
 msgstr "HTML ç¶²é ?é?¸é ?"
 
-#: ../plug-ins/common/file-html-table.c:448
+#: ../plug-ins/common/file-html-table.c:449
 msgid "_Generate full HTML document"
 msgstr "ç?¢ç??å®?æ?´ç?? _HTML æ??ä»¶"
 
-#: ../plug-ins/common/file-html-table.c:454
+#: ../plug-ins/common/file-html-table.c:455
 msgid ""
 "If checked GTM will output a full HTML document with <HTML>, <BODY>, etc. "
 "tags instead of just the table html."
@@ -3531,15 +3527,15 @@ msgstr ""
 "æ??è¡¨æ ¼é?¨ä»½ç?? HTMLã??"
 
 #. HTML Table Creation Options
-#: ../plug-ins/common/file-html-table.c:467
+#: ../plug-ins/common/file-html-table.c:468
 msgid "Table Creation Options"
 msgstr "è¡¨æ ¼å»ºç«?é?¸é ?"
 
-#: ../plug-ins/common/file-html-table.c:475
+#: ../plug-ins/common/file-html-table.c:476
 msgid "_Use cellspan"
 msgstr "ä½¿ç?¨ _Cellspan"
 
-#: ../plug-ins/common/file-html-table.c:481
+#: ../plug-ins/common/file-html-table.c:482
 msgid ""
 "If checked GTM will replace any rectangular sections of identically colored "
 "blocks with one large cell with ROWSPAN and COLSPAN values."
@@ -3547,11 +3543,11 @@ msgstr ""
 "è?¥é?¸ä¸?æ¤é?¸é ?ï¼?GTM æ??å°?ä»»ä½?æ??ç?©å??å??å??è??ä¸?é¡?è?²ç?¸å??ç??æ ¼å?å??æ??ä¸?å??æ?? ROWSPAN å?? "
 "COLSPAN å?¼ç??å¤§å??æ?¹æ ¼ã??"
 
-#: ../plug-ins/common/file-html-table.c:490
+#: ../plug-ins/common/file-html-table.c:491
 msgid "Co_mpress TD tags"
 msgstr "å£?ç¸® TD æ¨?ç±¤(_M)"
 
-#: ../plug-ins/common/file-html-table.c:496
+#: ../plug-ins/common/file-html-table.c:497
 msgid ""
 "Checking this tag will cause GTM to leave no whitespace between the TD tags "
 "and the cellcontent.  This is only necessary for pixel level positioning "
@@ -3560,60 +3556,60 @@ msgstr ""
 "è?¥é?¸ä¸?æ¤é?¸é ?ï¼?GTM å°?ä¸?æ??å?¨ TD æ¨?ç±¤å??æ ¼å?å?§å®¹ä¹?é??ç??ä¸?ä»»ä½?ç©ºç?½å?ç¬¦ã??é??å?ªå?¨é??è¦?"
 "ä»¥å??ç´ ç??ç¨?åº¦æ?§å?¶ä½?ç½®æ??æ??é??è¦?ä½¿ç?¨ã??"
 
-#: ../plug-ins/common/file-html-table.c:506
+#: ../plug-ins/common/file-html-table.c:507
 msgid "C_aption"
 msgstr "æ¨?é¡?(_A)"
 
-#: ../plug-ins/common/file-html-table.c:512
+#: ../plug-ins/common/file-html-table.c:513
 msgid "Check if you would like to have the table captioned."
 msgstr "è?¥è¡¨æ ¼è¦?æ??æ¨?é¡?è«?é?¸å??æ?¬é?¸é ?ã??"
 
-#: ../plug-ins/common/file-html-table.c:527
+#: ../plug-ins/common/file-html-table.c:528
 msgid "The text for the table caption."
 msgstr "è¡¨æ ¼ç??æ¨?é¡?ã??"
 
-#: ../plug-ins/common/file-html-table.c:540
+#: ../plug-ins/common/file-html-table.c:541
 msgid "C_ell content:"
 msgstr "æ ¼å?å?§å®¹(_E)ï¼?"
 
-#: ../plug-ins/common/file-html-table.c:544
+#: ../plug-ins/common/file-html-table.c:545
 msgid "The text to go into each cell."
 msgstr "æº?å??æ?¾å?°æ ¼å?§ç??æ??å?ã??"
 
 #. HTML Table Options
-#: ../plug-ins/common/file-html-table.c:554
+#: ../plug-ins/common/file-html-table.c:555
 msgid "Table Options"
 msgstr "è¡¨æ ¼é?¸é ?"
 
-#: ../plug-ins/common/file-html-table.c:565
+#: ../plug-ins/common/file-html-table.c:566
 msgid "_Border:"
 msgstr "é??æ¡?(_B)ï¼?"
 
-#: ../plug-ins/common/file-html-table.c:569
+#: ../plug-ins/common/file-html-table.c:570
 msgid "The number of pixels in the table border."
 msgstr "è¡¨æ ¼é??æ¡?ç??å¯¬åº¦(å??ç´ )ã??"
 
-#: ../plug-ins/common/file-html-table.c:584
+#: ../plug-ins/common/file-html-table.c:585
 msgid "The width for each table cell.  Can be a number or a percent."
 msgstr "è¡¨æ ¼æ ¼å?ç??å¯¬åº¦ã??å?¯ä»¥æ?¯æ?¸å?æ??æ?¯ç?¾å??æ¯?ã??"
 
-#: ../plug-ins/common/file-html-table.c:600
+#: ../plug-ins/common/file-html-table.c:601
 msgid "The height for each table cell.  Can be a number or a percent."
 msgstr "è¡¨æ ¼æ ¼å?ç??é«?åº¦ã??å?¯ä»¥æ?¯æ?¸å?æ??æ?¯ç?¾å??æ¯?ã??"
 
-#: ../plug-ins/common/file-html-table.c:611
+#: ../plug-ins/common/file-html-table.c:612
 msgid "Cell-_padding:"
 msgstr "æ ¼å?ç??é??(_P)ï¼?"
 
-#: ../plug-ins/common/file-html-table.c:615
+#: ../plug-ins/common/file-html-table.c:616
 msgid "The amount of cellpadding."
 msgstr "æ ¼å?ç??é??ç??å¯¬åº¦ã??"
 
-#: ../plug-ins/common/file-html-table.c:624
+#: ../plug-ins/common/file-html-table.c:625
 msgid "Cell-_spacing:"
 msgstr "æ ¼å?é??é??(_S)ï¼?"
 
-#: ../plug-ins/common/file-html-table.c:628
+#: ../plug-ins/common/file-html-table.c:629
 msgid "The amount of cellspacing."
 msgstr "æ ¼å?é??é??ç??è·?é?¢ã??"
 
@@ -3828,33 +3824,33 @@ msgstr "PCX å??ç??æ ¼å¼?"
 msgid "Could not read header from '%s'"
 msgstr "ç?¡æ³?å¾?â??%sâ??è®?å??æ¨?é è³?æ??"
 
-#: ../plug-ins/common/file-pcx.c:381
+#: ../plug-ins/common/file-pcx.c:382
 #, c-format
 msgid "'%s' is not a PCX file"
 msgstr "â??%sâ??ä¸?æ?¯ PCX æª?ã??"
 
-#: ../plug-ins/common/file-pcx.c:394 ../plug-ins/file-bmp/bmp-read.c:637
+#: ../plug-ins/common/file-pcx.c:396 ../plug-ins/file-bmp/bmp-read.c:638
 #: ../plug-ins/file-psd/psd-load.c:301
 #, fuzzy, c-format
 msgid "Unsupported or invalid image width: %d"
 msgstr "å??ç??ç??å¯¬åº¦å??/æ??é«?åº¦ç?¡æ??"
 
-#: ../plug-ins/common/file-pcx.c:399 ../plug-ins/file-bmp/bmp-read.c:643
+#: ../plug-ins/common/file-pcx.c:402 ../plug-ins/file-bmp/bmp-read.c:644
 #: ../plug-ins/file-psd/psd-load.c:293
 #, fuzzy, c-format
 msgid "Unsupported or invalid image height: %d"
 msgstr "å??ç??ç??å¯¬åº¦å??/æ??é«?åº¦ç?¡æ??"
 
-#: ../plug-ins/common/file-pcx.c:404
+#: ../plug-ins/common/file-pcx.c:408
 msgid "Invalid number of bytes per line in PCX header"
 msgstr ""
 
-#: ../plug-ins/common/file-pcx.c:411
+#: ../plug-ins/common/file-pcx.c:416
 #, c-format
 msgid "Image dimensions too large: width %d x height %d"
 msgstr "å??ç??å°ºå¯¸é??å¤§ï¼?å¯¬åº¦ %d x é«?åº¦ %d"
 
-#: ../plug-ins/common/file-pcx.c:459
+#: ../plug-ins/common/file-pcx.c:465
 msgid "Unusual PCX flavour, giving up"
 msgstr "PCX æ ¼å¼?æ??å??é¡?ï¼?æ?¾æ£?è¼?å?¥"
 
@@ -3878,11 +3874,52 @@ msgstr ""
 msgid "Bottom border out of bounds (must be < %d): %d"
 msgstr ""
 
-#: ../plug-ins/common/file-pcx.c:758
+#: ../plug-ins/common/file-pcx.c:766
 #, fuzzy, c-format
 msgid "Writing to file '%s' failed: %s"
 msgstr "é??å??æª?æ¡?ã??%sã??å¤±æ??ï¼?%s"
 
+#: ../plug-ins/common/file-pdf-load.c:289
+#, fuzzy
+msgid "Portable Document Format"
+msgstr "DJVU æ??ä»¶æ??ä¸?æ£ç¢ºç??æ ¼å¼?"
+
+#: ../plug-ins/common/file-pdf-load.c:556
+#, fuzzy, c-format
+msgid "Could not load '%s': %s"
+msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
+
+#: ../plug-ins/common/file-pdf-load.c:635
+#, c-format
+msgid "%s-%s"
+msgstr "%s-%s"
+
+#: ../plug-ins/common/file-pdf-load.c:637 ../plug-ins/common/file-ps.c:1125
+#, fuzzy, c-format
+msgid "%s-pages"
+msgstr " é ?"
+
+#: ../plug-ins/common/file-pdf-load.c:823
+msgid "Import from PDF"
+msgstr "å¾? PDF æª?å?¯å?¥"
+
+#: ../plug-ins/common/file-pdf-load.c:828 ../plug-ins/common/file-ps.c:3097
+#: ../plug-ins/common/file-tiff-load.c:483
+msgid "_Import"
+msgstr "å?¯å?¥(_I)"
+
+#: ../plug-ins/common/file-pdf-load.c:896
+msgid "_Width (pixels):"
+msgstr "å¯¬åº¦[å??ç´ ](_W)ï¼?"
+
+#: ../plug-ins/common/file-pdf-load.c:897
+msgid "_Height (pixels):"
+msgstr "é«?åº¦[å??ç´ ](_H)ï¼?"
+
+#: ../plug-ins/common/file-pdf-load.c:899
+msgid "_Resolution:"
+msgstr "è§£æ??åº¦(_R)ï¼?"
+
 #: ../plug-ins/common/file-pix.c:141 ../plug-ins/common/file-pix.c:158
 #, fuzzy
 msgid "Alias Pix image"
@@ -4025,11 +4062,6 @@ msgstr "PDF æ??ä»¶"
 msgid "Could not interpret Postscript file '%s'"
 msgstr "æ?¾ä¸?å?° pixmap æª?â??%sâ??\n"
 
-#: ../plug-ins/common/file-ps.c:1125
-#, fuzzy, c-format
-msgid "%s-pages"
-msgstr " é ?"
-
 #: ../plug-ins/common/file-ps.c:1192
 #, c-format
 msgid "PostScript save cannot handle images with alpha channels"
@@ -4051,7 +4083,7 @@ msgstr "ç¬¬ %d é ?"
 
 #: ../plug-ins/common/file-ps.c:2601 ../plug-ins/common/file-ps.c:2733
 #: ../plug-ins/common/file-ps.c:2883 ../plug-ins/common/file-ps.c:3008
-#: ../plug-ins/common/file-sunras.c:1503 ../plug-ins/common/file-sunras.c:1611
+#: ../plug-ins/common/file-sunras.c:1504 ../plug-ins/common/file-sunras.c:1612
 #: ../plug-ins/file-fits/fits.c:849 ../plug-ins/file-fits/fits.c:973
 msgid "Write error occurred"
 msgstr "ç?¼ç??å¯«å?¥é?¯èª¤"
@@ -4061,10 +4093,6 @@ msgstr "ç?¼ç??å¯«å?¥é?¯èª¤"
 msgid "Import from PostScript"
 msgstr "ç?±æª?æ¡?å?¯å?¥"
 
-#: ../plug-ins/common/file-ps.c:3097 ../plug-ins/common/file-tiff-load.c:483
-msgid "_Import"
-msgstr "å?¯å?¥(_I)"
-
 #. Rendering
 #: ../plug-ins/common/file-ps.c:3135
 msgid "Rendering"
@@ -4086,7 +4114,7 @@ msgstr " é ?"
 msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)"
 msgstr "ç?¡æ³?è¼?å?¥é??æ?²"
 
-#: ../plug-ins/common/file-ps.c:3201 ../plug-ins/common/sphere-designer.c:2643
+#: ../plug-ins/common/file-ps.c:3201 ../plug-ins/common/sphere-designer.c:2647
 msgid "Layers"
 msgstr "å??å±¤"
 
@@ -4337,11 +4365,11 @@ msgstr "ä¸?æ?¯æ?´æ¤é¡?å??ç?? SUN raster æª?æ¡?"
 msgid "Could not read color entries from '%s'"
 msgstr "ç?¡æ³?å¾?â??%sâ??è®?å??è?²å½©é ?ç?®"
 
-#: ../plug-ins/common/file-sunras.c:448
+#: ../plug-ins/common/file-sunras.c:449
 msgid "Type of colormap not supported"
 msgstr "ä¸?æ?¯æ?´æ¤é¡? colormap"
 
-#: ../plug-ins/common/file-sunras.c:455 ../plug-ins/common/file-xbm.c:826
+#: ../plug-ins/common/file-sunras.c:456 ../plug-ins/common/file-xbm.c:826
 #: ../plug-ins/common/file-xwd.c:488
 #, c-format
 msgid ""
@@ -4351,16 +4379,16 @@ msgstr ""
 "â??%sâ??ï¼?\n"
 "æ?ªæ??å®?å??ç??å¯¬åº¦"
 
-#: ../plug-ins/common/file-sunras.c:463 ../plug-ins/common/file-xbm.c:833
-#: ../plug-ins/common/file-xwd.c:497
+#: ../plug-ins/common/file-sunras.c:464 ../plug-ins/common/file-xbm.c:833
+#: ../plug-ins/common/file-xwd.c:498
 #, c-format
 msgid ""
 "'%s':\n"
 "Image width is larger than GIMP can handle"
 msgstr ""
 
-#: ../plug-ins/common/file-sunras.c:471 ../plug-ins/common/file-xbm.c:840
-#: ../plug-ins/common/file-xwd.c:505
+#: ../plug-ins/common/file-sunras.c:472 ../plug-ins/common/file-xbm.c:840
+#: ../plug-ins/common/file-xwd.c:507
 #, c-format
 msgid ""
 "'%s':\n"
@@ -4369,48 +4397,48 @@ msgstr ""
 "â??%sâ??ï¼?\n"
 "æ?ªæ??å®?å??ç??é«?åº¦"
 
-#: ../plug-ins/common/file-sunras.c:479 ../plug-ins/common/file-xbm.c:847
-#: ../plug-ins/common/file-xwd.c:513
+#: ../plug-ins/common/file-sunras.c:480 ../plug-ins/common/file-xbm.c:847
+#: ../plug-ins/common/file-xwd.c:516
 #, c-format
 msgid ""
 "'%s':\n"
 "Image height is larger than GIMP can handle"
 msgstr ""
 
-#: ../plug-ins/common/file-sunras.c:517
+#: ../plug-ins/common/file-sunras.c:518
 #, fuzzy
 msgid "This image depth is not supported"
 msgstr "æ?¬é¡?å??ç??å°?è©±æ?¹å¡?ä¸?æ?¯æ?´ %s é?¸é ?\n"
 
-#: ../plug-ins/common/file-sunras.c:541
+#: ../plug-ins/common/file-sunras.c:542
 #, c-format
 msgid "SUNRAS save cannot handle images with alpha channels"
 msgstr "SUNRAS å?²å?ç¨?åº?ç?¡æ³?è??ç??æ??é??æ??è?²ç??ç??å??ç??"
 
-#: ../plug-ins/common/file-sunras.c:552
+#: ../plug-ins/common/file-sunras.c:553
 msgid "Can't operate on unknown image types"
 msgstr "ä¸?é?©ç?¨æ?¼ä¸?æ??ç??å??ç??é¡?å??"
 
-#: ../plug-ins/common/file-sunras.c:1081 ../plug-ins/common/file-sunras.c:1172
-#: ../plug-ins/common/file-sunras.c:1253 ../plug-ins/common/file-sunras.c:1348
-#: ../plug-ins/common/file-xwd.c:1347 ../plug-ins/common/file-xwd.c:1448
-#: ../plug-ins/common/file-xwd.c:1606 ../plug-ins/common/file-xwd.c:1806
-#: ../plug-ins/common/file-xwd.c:2063 ../plug-ins/file-fits/fits.c:696
+#: ../plug-ins/common/file-sunras.c:1082 ../plug-ins/common/file-sunras.c:1173
+#: ../plug-ins/common/file-sunras.c:1254 ../plug-ins/common/file-sunras.c:1349
+#: ../plug-ins/common/file-xwd.c:1351 ../plug-ins/common/file-xwd.c:1452
+#: ../plug-ins/common/file-xwd.c:1610 ../plug-ins/common/file-xwd.c:1810
+#: ../plug-ins/common/file-xwd.c:2067 ../plug-ins/file-fits/fits.c:696
 msgid "EOF encountered on reading"
 msgstr "è®?å??æ??é??å?° EOF"
 
-#: ../plug-ins/common/file-sunras.c:1628
+#: ../plug-ins/common/file-sunras.c:1629
 #, fuzzy
 msgid "SUNRAS"
 msgstr "å?²å?ç?º SUNRAS"
 
 #. file save type
-#: ../plug-ins/common/file-sunras.c:1631
+#: ../plug-ins/common/file-sunras.c:1632
 #, fuzzy
 msgid "Data Formatting"
 msgstr "æ£å?¨æ ¼å¼?å??å??å?²å?? %d / %s (%s)"
 
-#: ../plug-ins/common/file-sunras.c:1635
+#: ../plug-ins/common/file-sunras.c:1636
 msgid "RunLength Encoded"
 msgstr ""
 
@@ -4619,7 +4647,7 @@ msgstr "å?³ç??è¨å®?ç®¡ç??"
 
 #: ../plug-ins/common/file-tiff-save.c:1101
 msgid "Save _color values from transparent pixels"
-msgstr ""
+msgstr "ä¿?å?å¾?é??æ??å??ç´ ç??é¡?è?²å?¼(_C)"
 
 #: ../plug-ins/common/file-tiff-save.c:1117 ../plug-ins/common/file-xbm.c:1232
 msgid "Comment:"
@@ -4988,7 +5016,7 @@ msgstr "ç?¡æ³?å¾?â??%sâ??è®?å?? XWD æª?é è³?æ??"
 msgid "Can't read color entries"
 msgstr "ç?¡æ³?è®?å?¥ä»»ä½?é?µç?¤ï¼?"
 
-#: ../plug-ins/common/file-xwd.c:569
+#: ../plug-ins/common/file-xwd.c:573
 #, fuzzy, c-format
 msgid ""
 "XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is "
@@ -4997,15 +5025,15 @@ msgstr ""
 "XWD æª?æ¡? %s ç??æ ¼å¼?æ?¯ %dï¼?è?²å½©æ·±åº¦ç?º %d è??æ¯?å??å??ç´ ä½? %d ä½?å??ã??\n"
 "ç?®å??æ?ªæ??æ?¯æ?´é??ç¨®æ ¼å¼?ã??"
 
-#: ../plug-ins/common/file-xwd.c:592
+#: ../plug-ins/common/file-xwd.c:596
 msgid "Cannot save images with alpha channels."
 msgstr "ç?¡æ³?å?²å?æ??é??æ??è?²ç??ç??å??ç??ã??"
 
-#: ../plug-ins/common/file-xwd.c:2194
+#: ../plug-ins/common/file-xwd.c:2198
 msgid "Error during writing indexed/gray image"
 msgstr "å¯«å?¥ç´¢å¼?è?²æ??ç?°é??å??ç??æ??ç?¼ç??é?¯èª¤"
 
-#: ../plug-ins/common/file-xwd.c:2292
+#: ../plug-ins/common/file-xwd.c:2296
 msgid "Error during writing rgb image"
 msgstr "å¯«å?¥ rgb å??ç??æ??ç?¼ç??é?¯èª¤"
 
@@ -5244,7 +5272,7 @@ msgstr "å½±ç??ç?«é?¢ç??é£½å??åº¦"
 
 #: ../plug-ins/common/filter-pack.c:829
 msgid "Select Pixels By"
-msgstr "ç?¨ä½?è??é?¸æ??å??ç´ "
+msgstr "é?¸å??å??ç´ ä¾?"
 
 #: ../plug-ins/common/filter-pack.c:834
 msgid "H_ue"
@@ -5343,7 +5371,7 @@ msgstr "Y_2ï¼?"
 
 #: ../plug-ins/common/gradient-map.c:83
 msgid "Recolor the image using colors from the active gradient"
-msgstr "é??æ?°ç?ºå??ç??è??è?²,ä½¿ç?¨å??æ?¯è??è??æ?¯é¡?è?²ç?¢ç??ç??æ¼¸å±¤é¡?è?²"
+msgstr "é??æ?°ç?ºå??ç??è??è?²,ä½¿ç?¨ä½?ç?¨ä¸ç??æ¼¸å±¤é¡?è?²"
 
 #: ../plug-ins/common/gradient-map.c:96
 msgid "_Gradient Map"
@@ -5351,7 +5379,7 @@ msgstr "æ¼¸å±¤æ? å°?(_G)"
 
 #: ../plug-ins/common/gradient-map.c:105
 msgid "Recolor the image using colors from the active palette"
-msgstr "é??æ?°ç?ºå??ç??è??è?²ï¼?ç?¨ä½¿ç?¨ä¸ç??èª¿è?²ç?¤"
+msgstr "é??æ?°ç?ºå??ç??è??è?²ï¼?ä½¿ç?¨ä½?ç?¨ä¸ç??èª¿è?²ç?¤"
 
 #: ../plug-ins/common/gradient-map.c:118
 msgid "_Palette Map"
@@ -5384,18 +5412,16 @@ msgstr "æ ¼ç·?"
 
 #. attach labels
 #: ../plug-ins/common/grid.c:717
-#, fuzzy
 msgid ""
 "Horizontal\n"
 "Lines"
-msgstr "æ°´å¹³å°?é½?è¨å®?"
+msgstr "æ°´å¹³ç·?"
 
 #: ../plug-ins/common/grid.c:719
-#, fuzzy
 msgid ""
 "Vertical\n"
 "Lines"
-msgstr "ç?´å¼?æ¨?é»?"
+msgstr "å??ç?´ç·?"
 
 #: ../plug-ins/common/grid.c:721
 msgid "Intersection"
@@ -5568,7 +5594,7 @@ msgstr "è®?å½¢å??å??å??å¾?(_D)ï¼?"
 
 #: ../plug-ins/common/iwarp.c:1157
 msgid "D_eform amount:"
-msgstr "è®?å½¢ç¨?åº¦(_E)ï¼?"
+msgstr "è®?å½¢ç¸½é??(_E)ï¼?"
 
 #: ../plug-ins/common/iwarp.c:1166
 msgid "_Bilinear"
@@ -5728,9 +5754,9 @@ msgstr "æª?æ¡?â??%sâ??ä¸?å??æ?¯ IFS Compose æª?æ¡?ã??"
 
 #. ICC color profile conversion
 #: ../plug-ins/common/lcms.c:884
-#, fuzzy, c-format
+#, c-format
 msgid "Converting from '%s' to '%s'"
-msgstr "è¡?äº?æ??ï¼?å¾? %s å?° %s"
+msgstr "è½?æ??å¾?ã??%sã??å?°ã??%sã??"
 
 #: ../plug-ins/common/lcms.c:1128
 #, fuzzy, c-format
@@ -5964,7 +5990,7 @@ msgstr "æ¨?é¡?(_U)ï¼?"
 msgid "some sort of error with the file extension or lack thereof"
 msgstr "å»¶ä¼¸æª?å??æ??é?¯èª¤æ??è??ä¸?å?å?¨"
 
-#: ../plug-ins/common/mail.c:724
+#: ../plug-ins/common/mail.c:726
 #, fuzzy, c-format
 msgid "Could not start sendmail (%s)"
 msgstr "ç?¡æ³?é??å§?æ??å°?ç¨?åº?"
@@ -6260,11 +6286,11 @@ msgstr "é?¨æ©?ç??å??æ??æ?²"
 
 #: ../plug-ins/common/noise-randomize.c:102
 msgid "Random Pick"
-msgstr "é?¨æ©?é?¸æ??"
+msgstr "æ½?æ¿º"
 
 #: ../plug-ins/common/noise-randomize.c:103
 msgid "Random Slur"
-msgstr "é?¨æ©?æ³¥æ¼¿"
+msgstr "å?«ç³?"
 
 #: ../plug-ins/common/noise-randomize.c:201
 msgid "Completely randomize a fraction of pixels"
@@ -6276,7 +6302,7 @@ msgstr "å??é?°è¿?ç??å??ç´ é?¨æ©?äº¤æ??ä¸?äº?"
 
 #: ../plug-ins/common/noise-randomize.c:205
 msgid "Randomly slide some pixels downward (similar to melting)"
-msgstr "ä¸?äº?é?¨æ©?å??ç´ å??ä¸?æ»?å??(é¡?ä¼¼ç??å??)"
+msgstr "é?¨æ©?æ»?å??ä¸?äº?å??ç´ (é¡?ä¼¼ç??å??)"
 
 #: ../plug-ins/common/noise-randomize.c:232
 msgid "_Hurl..."
@@ -6284,11 +6310,11 @@ msgstr "ç??å??æ??æ?²(_H)..."
 
 #: ../plug-ins/common/noise-randomize.c:244
 msgid "_Pick..."
-msgstr "é?¸æ??æ?§ç??(_P)..."
+msgstr "æ½?æ¿º(_P)..."
 
 #: ../plug-ins/common/noise-randomize.c:256
 msgid "_Slur..."
-msgstr "æ³¥æ¼¿(_S)..."
+msgstr "å?«ç³?(_S)..."
 
 #: ../plug-ins/common/noise-randomize.c:771
 #: ../plug-ins/common/noise-solid.c:602
@@ -6301,7 +6327,7 @@ msgstr "é?¨æ©?å??[%] (_A)ï¼?"
 
 #: ../plug-ins/common/noise-randomize.c:783
 msgid "Percentage of pixels to be filtered"
-msgstr ""
+msgstr "ç?¾å??æ¯?ç??å??ç´ è¢«é??æ¿¾"
 
 #: ../plug-ins/common/noise-randomize.c:795
 msgid "R_epeat:"
@@ -6753,45 +6779,45 @@ msgstr "æ¼£æ¼ª(_R)..."
 msgid "Rippling"
 msgstr "æ¼£æ³¢èµ·ä¼?"
 
-#: ../plug-ins/common/ripple.c:482
+#: ../plug-ins/common/ripple.c:484
 msgid "Ripple"
 msgstr "æ¼£æ¼ª"
 
-#: ../plug-ins/common/ripple.c:541
+#: ../plug-ins/common/ripple.c:543
 msgid "_Retain tilability"
 msgstr "ä¿?ç??å?¯é?ªæ??ç??æ?§è³ª(_R)"
 
 #. Edges toggle box
-#: ../plug-ins/common/ripple.c:578
+#: ../plug-ins/common/ripple.c:580
 msgid "Edges"
 msgstr "é??ç·£"
 
-#: ../plug-ins/common/ripple.c:584
+#: ../plug-ins/common/ripple.c:586
 msgid "_Blank"
 msgstr "ç?¡å??æ¡?(_B)"
 
 #. Wave toggle box
-#: ../plug-ins/common/ripple.c:606
+#: ../plug-ins/common/ripple.c:608
 msgid "Wave Type"
 msgstr "æ³¢æµªé¡?å??"
 
-#: ../plug-ins/common/ripple.c:610
+#: ../plug-ins/common/ripple.c:612
 msgid "Saw_tooth"
 msgstr "é?¸é½?(_T)"
 
-#: ../plug-ins/common/ripple.c:611
+#: ../plug-ins/common/ripple.c:613
 msgid "S_ine"
 msgstr "å¼¦æ³¢(_I)"
 
-#: ../plug-ins/common/ripple.c:634
+#: ../plug-ins/common/ripple.c:636
 msgid "_Period:"
 msgstr "å?¨æ??(_P)ï¼?"
 
-#: ../plug-ins/common/ripple.c:647
+#: ../plug-ins/common/ripple.c:649
 msgid "A_mplitude:"
 msgstr "æ³¢å¹?(_M)ï¼?"
 
-#: ../plug-ins/common/ripple.c:660
+#: ../plug-ins/common/ripple.c:662
 msgid "Phase _shift:"
 msgstr "ç?¸ä½?ç§»(_S):"
 
@@ -6813,19 +6839,19 @@ msgstr "æ??è½?"
 
 #: ../plug-ins/common/sample-colorize.c:297
 msgid "Colorize image using a sample image as a guide"
-msgstr "å??ç??è??è?²ä½¿ç?¨æ¨£å??å??ç??ä½?ç?ºæ??å¼?"
+msgstr "å??ç??è??è?²ä½¿ç?¨æ¨£æ?¬å??ç??ä½?ç?ºæ??å¼?"
 
 #: ../plug-ins/common/sample-colorize.c:302
 msgid "_Sample Colorize..."
-msgstr "æ¨£å??è?²è??è?²(_S)..."
+msgstr "æ¨£æ?¬è??è?²(_S)..."
 
 #: ../plug-ins/common/sample-colorize.c:1315
 msgid "Sample Colorize"
-msgstr "æ¨£å??è?²è??è?²"
+msgstr "æ¨£æ?¬è??è?²"
 
 #: ../plug-ins/common/sample-colorize.c:1320
 msgid "Get _Sample Colors"
-msgstr "å??å¾?æ¨£å??è?²(_S)"
+msgstr "å??å¾?æ¨£æ?¬è?²(_S)"
 
 #. layer combo_box (Dst)
 #: ../plug-ins/common/sample-colorize.c:1349
@@ -6835,7 +6861,7 @@ msgstr "ç?®æ¨?ï¼?"
 #. layer combo_box (Sample)
 #: ../plug-ins/common/sample-colorize.c:1365
 msgid "Sample:"
-msgstr "æ¨£å??ï¼?"
+msgstr "æ¨£æ?¬ï¼?"
 
 #: ../plug-ins/common/sample-colorize.c:1375
 msgid "From reverse gradient"
@@ -6884,11 +6910,11 @@ msgstr "<ç§?äººå°?ç?¨å??>"
 #. check button
 #: ../plug-ins/common/sample-colorize.c:1682
 msgid "Smooth samples"
-msgstr "å¹³æ»?æ¨£å??è?²"
+msgstr "å¹³æ»?æ¨£æ?¬è?²"
 
 #: ../plug-ins/common/sample-colorize.c:2654
 msgid "Sample analyze"
-msgstr "æ¨£å??å??æ??"
+msgstr "æ¨£æ?¬å??æ??"
 
 #: ../plug-ins/common/sample-colorize.c:3032
 msgid "Remap colorized"
@@ -7239,35 +7265,35 @@ msgstr "èª¿æ?´ç?«å??é??è??äº®åº¦"
 
 #: ../plug-ins/common/sparkle.c:399
 msgid "_Spike length:"
-msgstr "ç©?ç??é?·åº¦(_S):"
+msgstr "å??è??é?·åº¦(_S)ï¼?"
 
 #: ../plug-ins/common/sparkle.c:402
 msgid "Adjust the spike length"
-msgstr "èª¿æ?´ç?«è?±ç©?é?·"
+msgstr "èª¿æ?´å??è??é?·åº¦"
 
 #: ../plug-ins/common/sparkle.c:412
 msgid "Sp_ike points:"
-msgstr "ç©?ç??æ?¸ç?®(_I):"
+msgstr "å??è??ç??æ?¸ç?®(_I)ï¼?"
 
 #: ../plug-ins/common/sparkle.c:415
 msgid "Adjust the number of spikes"
-msgstr "èª¿æ?´ç?«è?±ç©?ç??æ?¸ç?®"
+msgstr "èª¿æ?´å??è??ç??æ?¸ç?®"
 
 #: ../plug-ins/common/sparkle.c:425
 msgid "Spi_ke angle (-1: random):"
-msgstr "ç©?ç??è§?åº¦[-1:é?¨æ©?ç??](_K):"
+msgstr "å??è??ç??è§?åº¦[-1:é?¨æ©?ç??](_K)ï¼?"
 
 #: ../plug-ins/common/sparkle.c:428
 msgid "Adjust the spike angle (-1 causes a random angle to be chosen)"
-msgstr "èª¿æ?´ç©?ç??è§?åº¦(è¨å®?å?¼è?¥ç?º-1 ç?¢ç??ä¸?å??é?¨æ©?é?¸æ??ç??è§?åº¦)"
+msgstr "èª¿æ?´å??è??ç??è§?åº¦(è¨å®?å?¼è?¥ç?º-1 ç?¢ç??ä¸?å??é?¨æ©?é?¸æ??ç??è§?åº¦)"
 
 #: ../plug-ins/common/sparkle.c:439
 msgid "Spik_e density:"
-msgstr "ç©?ç??å¯?åº¦(_E):"
+msgstr "å??è??ç??å¯?åº¦(_E)ï¼?"
 
 #: ../plug-ins/common/sparkle.c:442
 msgid "Adjust the spike density"
-msgstr "èª¿æ?´ç?«è?±ç©?ç??å¯?åº¦"
+msgstr "èª¿æ?´å??è??ç??å¯?åº¦"
 
 #: ../plug-ins/common/sparkle.c:452
 msgid "Tr_ansparency:"
@@ -7275,7 +7301,7 @@ msgstr "é??æ??åº¦(_A):"
 
 #: ../plug-ins/common/sparkle.c:455
 msgid "Adjust the opacity of the spikes"
-msgstr "èª¿æ?´ç?«è?±ç©?ç??ä¸?é??æ??åº¦"
+msgstr "èª¿æ?´å??è??ç??ä¸?é??æ??åº¦"
 
 #: ../plug-ins/common/sparkle.c:465
 msgid "_Random hue:"
@@ -7341,177 +7367,175 @@ msgstr "ä½¿ç?¨å??æ?¯é¡?è?²"
 msgid "Use the background color"
 msgstr "ä½¿ç?¨è??æ?¯é¡?è?²"
 
-#: ../plug-ins/common/sphere-designer.c:290
+#: ../plug-ins/common/sphere-designer.c:292
 #: ../plug-ins/gimpressionist/general.c:165
 msgid "Solid"
 msgstr "ç´?è?²"
 
-#: ../plug-ins/common/sphere-designer.c:291
+#: ../plug-ins/common/sphere-designer.c:293
 msgid "Checker"
 msgstr "æ£?ç?¤"
 
-#: ../plug-ins/common/sphere-designer.c:292
+#: ../plug-ins/common/sphere-designer.c:294
 msgid "Marble"
 msgstr "å¤§ç??ç?³ç´?"
 
-#: ../plug-ins/common/sphere-designer.c:293
+#: ../plug-ins/common/sphere-designer.c:295
 msgid "Lizard"
-msgstr ""
+msgstr "è?¥è?´"
 
-#: ../plug-ins/common/sphere-designer.c:294
+#: ../plug-ins/common/sphere-designer.c:296
 msgid "Phong"
 msgstr ""
 
-#: ../plug-ins/common/sphere-designer.c:295 ../plug-ins/flame/flame.c:771
+#: ../plug-ins/common/sphere-designer.c:297 ../plug-ins/flame/flame.c:771
 #, fuzzy
 msgid "Noise"
 msgstr "å?ªé?³é?³æ¨?"
 
-#: ../plug-ins/common/sphere-designer.c:296
+#: ../plug-ins/common/sphere-designer.c:298
 msgid "Wood"
 msgstr "æ?¨ç´?"
 
-#: ../plug-ins/common/sphere-designer.c:297 ../plug-ins/flame/flame.c:755
+#: ../plug-ins/common/sphere-designer.c:299 ../plug-ins/flame/flame.c:755
 msgid "Spiral"
 msgstr "æ¼©æ¸¦"
 
-#: ../plug-ins/common/sphere-designer.c:298
+#: ../plug-ins/common/sphere-designer.c:300
 msgid "Spots"
 msgstr "å°?ç??"
 
-#: ../plug-ins/common/sphere-designer.c:1741
-#: ../plug-ins/common/sphere-designer.c:2690
+#: ../plug-ins/common/sphere-designer.c:1743
+#: ../plug-ins/common/sphere-designer.c:2694
 msgid "Texture"
 msgstr "ç´ æ??"
 
-#: ../plug-ins/common/sphere-designer.c:1743
+#: ../plug-ins/common/sphere-designer.c:1745
 msgid "Bumpmap"
 msgstr "å?¹å?¸è²¼å??"
 
-#: ../plug-ins/common/sphere-designer.c:1745
-#: ../plug-ins/common/sphere-designer.c:2692
+#: ../plug-ins/common/sphere-designer.c:1747
+#: ../plug-ins/common/sphere-designer.c:2696
 msgid "Light"
 msgstr "å??ç·?"
 
-#: ../plug-ins/common/sphere-designer.c:2008
+#: ../plug-ins/common/sphere-designer.c:2010
 #, fuzzy, c-format
 msgid "File '%s' is not a valid save file."
 msgstr "æª?æ¡?ä¸?æ?¯æ??æ??ç?? .desktop æª?æ¡?"
 
-#: ../plug-ins/common/sphere-designer.c:2186
+#: ../plug-ins/common/sphere-designer.c:2188
 msgid "Open File"
 msgstr "é??å??æª?æ¡?"
 
-#: ../plug-ins/common/sphere-designer.c:2186
+#: ../plug-ins/common/sphere-designer.c:2188
 msgid "Save File"
 msgstr "å?²å?æª?æ¡?"
 
-#: ../plug-ins/common/sphere-designer.c:2543
+#: ../plug-ins/common/sphere-designer.c:2547
 msgid "Sphere Designer"
 msgstr "ç??é«?è¨è¨?"
 
-#: ../plug-ins/common/sphere-designer.c:2675
+#: ../plug-ins/common/sphere-designer.c:2679
 msgid "Properties"
 msgstr "å±¬æ?§"
 
-#: ../plug-ins/common/sphere-designer.c:2691
+#: ../plug-ins/common/sphere-designer.c:2695
 msgid "Bump"
 msgstr "å?¹å?¸"
 
 #. row labels
-#: ../plug-ins/common/sphere-designer.c:2699
-#: ../plug-ins/lighting/lighting-ui.c:404
+#: ../plug-ins/common/sphere-designer.c:2703
+#: ../plug-ins/lighting/lighting-ui.c:403
 msgid "Type:"
 msgstr "é¡?å??ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2718
+#: ../plug-ins/common/sphere-designer.c:2722
 msgid "Texture:"
 msgstr "ç´ æ??ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2723
+#: ../plug-ins/common/sphere-designer.c:2727
 msgid "Colors:"
 msgstr "é¡?è?²ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2726
-#: ../plug-ins/common/sphere-designer.c:2737
+#: ../plug-ins/common/sphere-designer.c:2730
+#: ../plug-ins/common/sphere-designer.c:2741
 msgid "Color Selection Dialog"
 msgstr "é¡?è?²é?¸æ??å°?è©±æ?¹å¡?"
 
 #. Scale
-#: ../plug-ins/common/sphere-designer.c:2748
+#: ../plug-ins/common/sphere-designer.c:2752
 #: ../plug-ins/gimpressionist/paper.c:193
 #: ../plug-ins/ifs-compose/ifs-compose.c:551
 msgid "Scale:"
 msgstr "æ¯?ä¾?ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2756
+#: ../plug-ins/common/sphere-designer.c:2760
 msgid "Turbulence:"
 msgstr "æ¹?æµ?ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2763
+#: ../plug-ins/common/sphere-designer.c:2767
 msgid "Amount:"
-msgstr "ç¨?åº¦(_A)ï¼?"
+msgstr "ç¸½é??ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2770
-#, fuzzy
+#: ../plug-ins/common/sphere-designer.c:2774
 msgid "Exp.:"
-msgstr "EXP"
+msgstr "æ??æ?¸ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2777
-#, fuzzy
+#: ../plug-ins/common/sphere-designer.c:2781
 msgid "Transformations"
-msgstr "è?²å½©è®?æ??"
+msgstr "è®?æ??"
 
-#: ../plug-ins/common/sphere-designer.c:2793
+#: ../plug-ins/common/sphere-designer.c:2797
 #: ../plug-ins/map-object/map-object-ui.c:1143
 msgid "Scale X:"
 msgstr "æ¯?ä¾? Xï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2800
+#: ../plug-ins/common/sphere-designer.c:2804
 msgid "Scale Y:"
 msgstr "æ¯?ä¾? Yï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2806
+#: ../plug-ins/common/sphere-designer.c:2810
 msgid "Scale Z:"
 msgstr "æ¯?ä¾? Zï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2813
+#: ../plug-ins/common/sphere-designer.c:2817
 msgid "Rotate X:"
 msgstr "æ??è½? ï¼¸ï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2820
+#: ../plug-ins/common/sphere-designer.c:2824
 msgid "Rotate Y:"
 msgstr "æ??è½? Yï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2827
+#: ../plug-ins/common/sphere-designer.c:2831
 msgid "Rotate Z:"
 msgstr "æ??è½? Zï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2834
+#: ../plug-ins/common/sphere-designer.c:2838
 msgid "Position X:"
 msgstr "ä½?ç½® Xï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2841
+#: ../plug-ins/common/sphere-designer.c:2845
 msgid "Position Y:"
 msgstr "ä½?ç½® Yï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2848
+#: ../plug-ins/common/sphere-designer.c:2852
 msgid "Position Z:"
 msgstr "ä½?ç½® Zï¼?"
 
-#: ../plug-ins/common/sphere-designer.c:2963
+#: ../plug-ins/common/sphere-designer.c:2969
 msgid "Rendering sphere"
 msgstr "ç¹ªè£½ç??é«?"
 
-#: ../plug-ins/common/sphere-designer.c:3013
+#: ../plug-ins/common/sphere-designer.c:3019
 msgid "Create an image of a textured sphere"
 msgstr "å?µå»ºä¸?å??æ??ç´?ç??ç??ç??é«?å??ç??"
 
-#: ../plug-ins/common/sphere-designer.c:3020
+#: ../plug-ins/common/sphere-designer.c:3026
 msgid "Sphere _Designer..."
 msgstr "ç??é«?è¨è¨?(_D)..."
 
-#: ../plug-ins/common/sphere-designer.c:3080
+#: ../plug-ins/common/sphere-designer.c:3096
 msgid "Region selected for plug-in is empty"
 msgstr ""
 
@@ -8391,7 +8415,7 @@ msgstr "æ??è½?è§?åº¦(_W):"
 
 #: ../plug-ins/common/whirl-pinch.c:577
 msgid "_Pinch amount:"
-msgstr "æ? å£?ç¨?åº¦(_P):"
+msgstr "æ? å£?ç¸½é??(_P)ï¼?"
 
 #: ../plug-ins/common/wind.c:174
 msgid "Smear image to give windblown effect"
@@ -8473,35 +8497,35 @@ msgstr "è¼?é«?ç??å?¼æ??å¢?å? æ??æ??ç??å¼·åº¦"
 msgid "Bad colormap"
 msgstr "æ??å£?ç??ç°½ç« "
 
-#: ../plug-ins/file-bmp/bmp-read.c:171 ../plug-ins/file-bmp/bmp-read.c:181
-#: ../plug-ins/file-bmp/bmp-read.c:188 ../plug-ins/file-bmp/bmp-read.c:197
-#: ../plug-ins/file-bmp/bmp-read.c:212 ../plug-ins/file-bmp/bmp-read.c:417
-#: ../plug-ins/file-bmp/bmp-read.c:438 ../plug-ins/file-bmp/bmp-read.c:449
-#: ../plug-ins/file-bmp/bmp-read.c:457 ../plug-ins/file-bmp/bmp-read.c:465
-#: ../plug-ins/file-bmp/bmp-read.c:477
+#: ../plug-ins/file-bmp/bmp-read.c:171 ../plug-ins/file-bmp/bmp-read.c:182
+#: ../plug-ins/file-bmp/bmp-read.c:189 ../plug-ins/file-bmp/bmp-read.c:198
+#: ../plug-ins/file-bmp/bmp-read.c:213 ../plug-ins/file-bmp/bmp-read.c:418
+#: ../plug-ins/file-bmp/bmp-read.c:439 ../plug-ins/file-bmp/bmp-read.c:450
+#: ../plug-ins/file-bmp/bmp-read.c:458 ../plug-ins/file-bmp/bmp-read.c:466
+#: ../plug-ins/file-bmp/bmp-read.c:478
 #, c-format
 msgid "'%s' is not a valid BMP file"
 msgstr "â??%sâ??ä¸?æ?¯æ??æ??ç?? BMP é»?é?£å??"
 
-#: ../plug-ins/file-bmp/bmp-read.c:226 ../plug-ins/file-bmp/bmp-read.c:253
-#: ../plug-ins/file-bmp/bmp-read.c:281 ../plug-ins/file-bmp/bmp-read.c:346
-#: ../plug-ins/file-bmp/bmp-read.c:396
+#: ../plug-ins/file-bmp/bmp-read.c:227 ../plug-ins/file-bmp/bmp-read.c:254
+#: ../plug-ins/file-bmp/bmp-read.c:282 ../plug-ins/file-bmp/bmp-read.c:347
+#: ../plug-ins/file-bmp/bmp-read.c:397
 #, c-format
 msgid "Error reading BMP file header from '%s'"
 msgstr "è®?å?? BMP é»?é?£å??â??%sâ??ç??æª?é æ??ç?¼ç??é?¯èª¤"
 
-#: ../plug-ins/file-bmp/bmp-read.c:589
+#: ../plug-ins/file-bmp/bmp-read.c:590
 #, fuzzy
 msgid "Unrecognized or invalid BMP compression format."
 msgstr "ç?¡æ³?è¾¨å?¥ç??é??é?°é¡?å??ï¼?æ??æ?¯ç?¡æ??ç??è³?æ??æ ¼å¼?"
 
-#: ../plug-ins/file-bmp/bmp-read.c:631
+#: ../plug-ins/file-bmp/bmp-read.c:632
 #, fuzzy
 msgid "Unsupported or invalid bitdepth."
 msgstr "ç?¡æ??æ??ç?¡æ³?ç¢?èª?ç??é??é?°ï¼?%s"
 
-#: ../plug-ins/file-bmp/bmp-read.c:819 ../plug-ins/file-bmp/bmp-read.c:860
-#: ../plug-ins/file-bmp/bmp-read.c:910
+#: ../plug-ins/file-bmp/bmp-read.c:820 ../plug-ins/file-bmp/bmp-read.c:861
+#: ../plug-ins/file-bmp/bmp-read.c:911
 #, fuzzy
 msgid "The bitmap ends unexpectedly."
 msgstr "â??%sâ??å?¨ç?¡æ³?é ?è¨?ç??æ??æ³?ä¸?é?¢é??"
@@ -8907,17 +8931,17 @@ msgstr "ä¸?æ?¯æ?´æ??ç?¡æ??ç??å??å±¤é?®ç½©å¯¬åº¦ï¼?%d"
 msgid "Unsupported or invalid layer mask size: %dx%d"
 msgstr "ä¸?æ?¯æ?´æ??ç?¡æ??ç??å??å±¤é?®ç½©å¤§å°?ï¼?%dx%d"
 
-#: ../plug-ins/file-psd/psd-load.c:1201 ../plug-ins/file-psd/psd-load.c:1551
+#: ../plug-ins/file-psd/psd-load.c:1202 ../plug-ins/file-psd/psd-load.c:1552
 #, fuzzy, c-format
 msgid "Unsupported compression mode: %d"
 msgstr "å??æ??å?¨è?¢å¹?æ¨¡å¼?"
 
-#: ../plug-ins/file-psd/psd-load.c:1644
+#: ../plug-ins/file-psd/psd-load.c:1645
 #, fuzzy
 msgid "Extra"
 msgstr "ç?¹å¤§"
 
-#: ../plug-ins/file-psd/psd-load.c:1819
+#: ../plug-ins/file-psd/psd-load.c:1820
 #, c-format
 msgid "Unsupported or invalid channel size"
 msgstr ""
@@ -9193,7 +9217,6 @@ msgid "Directions"
 msgstr "æ?¹å??"
 
 #: ../plug-ins/flame/flame.c:702
-#, fuzzy
 msgid "Controls"
 msgstr "æ?§å?¶"
 
@@ -9357,9 +9380,8 @@ msgid "Spatial _filter radius:"
 msgstr "è??å¤©å®¤æ¸?å?®é??æ¿¾å?¨:"
 
 #: ../plug-ins/flame/flame.c:1161
-#, fuzzy
 msgid "Color_map:"
-msgstr "é?¸æ??æ??å??(_S)ï¼?"
+msgstr "é¡?è?²å°?æ??è¡¨(_M)ï¼?"
 
 #: ../plug-ins/flame/flame.c:1203
 msgid "Custom gradient"
@@ -9385,9 +9407,8 @@ msgstr ""
 "ç??è¨å®?ã??"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:562
-#, fuzzy
 msgid "Fractal Explorer"
-msgstr "Accerciser ç?¡é??ç¤?å??è?½ç??è¦½å?¨"
+msgstr "ç¢?å½¢ç??è¦½å?¨"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:637
 msgid "Realtime preview"
@@ -9457,9 +9478,8 @@ msgstr "CXï¼?"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:783
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:793
-#, fuzzy
 msgid "Changes aspect of fractal"
-msgstr "ä¿?æ??é?·å¯¬æ¯?ä¾?(&A)"
+msgstr "æ?¹è®?ç¢?å½¢é?·å¯¬æ¯?"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:790
 msgid "CY:"
@@ -9618,9 +9638,8 @@ msgid "Create a color-map using a gradient from the gradient editor"
 msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1167
-#, fuzzy
 msgid "FractalExplorer Gradient"
-msgstr "äº?ä»¶æ¼¸å±¤æ??æ??"
+msgstr "ç¢?å½¢ç??è¦½å?¨æ¼¸å±¤"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1197
 msgid "_Fractals"
@@ -9644,7 +9663,7 @@ msgstr "å?²å?ç¢?å½¢å??æ?¸"
 msgid "'%s' is not a FractalExplorer file"
 msgstr "â??%sâ??ä¸?æ?¯ FractalExplorer æ ¼å¼?æª?æ¡?"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1876
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1877
 #, c-format
 msgid "'%s' is corrupt. Line %d Option section incorrect"
 msgstr "æª?æ¡?â??%sâ??å?§å®¹å??æ??ã??ç¬¬ %d è¡?ç?? Option é?¨ä»½ä¸?æ£ç¢º"
@@ -9676,7 +9695,7 @@ msgstr "å?ªé?¤ç¢?å½¢"
 msgid "File '%s' is not a FractalExplorer file"
 msgstr "â??%sâ??ä¸?æ?¯ FractalExplorer æ ¼å¼?æª?æ¡?"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:958
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:959
 #, c-format
 msgid ""
 "File '%s' is corrupt.\n"
@@ -9685,30 +9704,29 @@ msgstr ""
 "æª?æ¡?â??%sâ??å·²æ??æ¯?ã??\n"
 "ç¬¬ %d è¡?é?¸é ?ç??é?¨ä»½ä¸?æ£ç¢º"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1002
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1004
 msgid "My first fractal"
 msgstr "æ??ç??ç¬¬ä¸?å??ç¢?å½¢"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1066
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1068
 msgid "Select folder and rescan collection"
 msgstr "é?¸å??ç?®é??ä¸¦é??æ?°æ??ç?? Gfig ç?©ä»¶é??"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1078
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1080
 msgid "Apply currently selected fractal"
 msgstr "æ?¡ç?¨ç?®å??é?¸å??ç??ç¢?å½¢"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1090
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1092
 msgid "Delete currently selected fractal"
 msgstr "å?ªé?¤ç?®å??é?¸å®?ç??ç¢?å½¢"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1113
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1115
 msgid "Rescan for Fractals"
 msgstr "é??æ?°æ??æ??ç¢?å½¢"
 
-#: ../plug-ins/fractal-explorer/fractal-explorer.c:1132
-#, fuzzy
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1134
 msgid "Add FractalExplorer Path"
-msgstr "å? å?¥æ?°ç??å??ç¤ºè·¯å¾?"
+msgstr "å? å?¥ç¢?å½¢ç??è¦½å?¨è·¯å¾?"
 
 #: ../plug-ins/gfig/gfig-bezier.c:442
 msgid "Closed"
@@ -9904,9 +9922,8 @@ msgid "Show position"
 msgstr "é¡¯ç¤ºä½?ç½®"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1240
-#, fuzzy
 msgid "Show control points"
-msgstr "é¡¯ç¤ºè³?æ??é»?"
+msgstr "é¡¯ç¤ºæ?§å?¶é»?"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1274
 msgid "Max undo:"
@@ -10059,12 +10076,12 @@ msgstr "å?µå»ºå¹¾ä½?å½¢ç??"
 msgid "_Gfig..."
 msgstr "ç¹ªè£½å¤?é??å½¢(_G)..."
 
-#: ../plug-ins/gfig/gfig.c:731
+#: ../plug-ins/gfig/gfig.c:735
 msgid ""
 "Error trying to save figure as a parasite: can't attach parasite to drawable."
 msgstr ""
 
-#: ../plug-ins/gfig/gfig.c:758
+#: ../plug-ins/gfig/gfig.c:762
 #, fuzzy, c-format
 msgid "Error trying to open temporary file '%s' for parasite loading: %s"
 msgstr "ç?¡æ³?é??å??â??%sâ??ä¾?è®?å??è³?æ??ï¼?%s"
@@ -10525,7 +10542,7 @@ msgstr "ç?å??ç??ç?¸å°?å¯?åº¦"
 #. * gimp_filename_to_utf8 () and g_strerror () return temporary strings
 #. * that need not and should not be freed. So this call is OK.
 #. *
-#: ../plug-ins/gimpressionist/ppmtool.c:651
+#: ../plug-ins/gimpressionist/ppmtool.c:652
 #, c-format
 msgid "Failed to save PPM file '%s': %s"
 msgstr "ç?¡æ³?å?²å? PPM æª?â??%sâ??ï¼?%s"
@@ -10566,7 +10583,7 @@ msgstr "æ??åº?é ?è¨çµ?å??é?¸å?®"
 #: ../plug-ins/gimpressionist/preview.c:173
 #: ../plug-ins/gimpressionist/repaint.c:1183
 #: ../plug-ins/imagemap/imap_polygon.c:514
-#: ../plug-ins/lighting/lighting-ui.c:1074
+#: ../plug-ins/lighting/lighting-ui.c:1073
 msgid "_Update"
 msgstr "æ?´æ?°(_U)"
 
@@ -10583,9 +10600,8 @@ msgid "_Size"
 msgstr "ç?å??å°ºå¯¸(_S)"
 
 #: ../plug-ins/gimpressionist/size.c:108
-#, fuzzy
 msgid "Size variants:"
-msgstr "æ£?ç?¤å¤§å°?(_B):"
+msgstr "å°ºå¯¸è®?é??ï¼?"
 
 #: ../plug-ins/gimpressionist/size.c:112
 msgid "The number of sizes of brushes to use"
@@ -10608,9 +10624,8 @@ msgid "The largest brush to create"
 msgstr "ç?å?·å°ºå¯¸ä¸?é??"
 
 #: ../plug-ins/gimpressionist/size.c:150
-#, fuzzy
 msgid "Size depends on:"
-msgstr "<span size=\"small\">%U æ?¼ %h</span>"
+msgstr "å°ºå¯¸å??æ±ºæ?¼ï¼?"
 
 #: ../plug-ins/gimpressionist/size.c:159
 msgid ""
@@ -11117,7 +11132,7 @@ msgstr "_IFS ç¢?å½¢..."
 
 #. X
 #: ../plug-ins/ifs-compose/ifs-compose.c:523
-#: ../plug-ins/lighting/lighting-ui.c:526
+#: ../plug-ins/lighting/lighting-ui.c:525
 #: ../plug-ins/map-object/map-object-ui.c:675
 #: ../plug-ins/map-object/map-object-ui.c:729
 #: ../plug-ins/map-object/map-object-ui.c:997
@@ -11127,7 +11142,7 @@ msgstr "Xï¼?"
 
 #. Y
 #: ../plug-ins/ifs-compose/ifs-compose.c:537
-#: ../plug-ins/lighting/lighting-ui.c:540
+#: ../plug-ins/lighting/lighting-ui.c:539
 #: ../plug-ins/map-object/map-object-ui.c:689
 #: ../plug-ins/map-object/map-object-ui.c:742
 #: ../plug-ins/map-object/map-object-ui.c:1010
@@ -11171,29 +11186,24 @@ msgid "Full"
 msgstr "å®?æ?´"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:693
-#, fuzzy
 msgid "IFS Fractal: Red"
-msgstr "ç´?è?²è¡¨ç¤ºé?»é??"
+msgstr "IFS ç¢?å½¢ï¼?ç´?"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:701
-#, fuzzy
 msgid "IFS Fractal: Green"
-msgstr "é»?åº?ç¶ å?"
+msgstr "IFS ç¢?å½¢ï¼?ç¶ "
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:709
-#, fuzzy
 msgid "IFS Fractal: Blue"
-msgstr "é?¸æ??æ?§è??è?²å?»é£½å??"
+msgstr "IFS ç¢?å½¢ï¼?è??"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:717
-#, fuzzy
 msgid "IFS Fractal: Black"
-msgstr "%(white)s å°? %(black)s"
+msgstr "IFS ç¢?å½¢ï¼?é»?"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:767
-#, fuzzy
 msgid "IFS Fractal"
-msgstr "æ?°å¢?ç¢?å½¢"
+msgstr "IFS ç¢?å½¢"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:865
 msgid "Spatial Transformation"
@@ -11245,9 +11255,8 @@ msgid "Stretch"
 msgstr "ä¼¸å±?"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1172
-#, fuzzy
 msgid "IFS Fractal Render Options"
-msgstr "æ??ç¹ªé?¸é ?"
+msgstr "IFS ç¢?å½¢æ¸²æ??é?¸é ?"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1194
 #, fuzzy
@@ -11283,19 +11292,17 @@ msgid "Open failed"
 msgstr "é??å??æª?æ¡?å¤±æ??"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2490
-#, fuzzy, c-format
+#, c-format
 msgid "File '%s' doesn't seem to be an IFS Fractal file."
-msgstr "æª?æ¡?â??%sâ??ä¸?å??æ?¯ IFS Compose æª?æ¡?ã??"
+msgstr "æª?æ¡?ã??%sã??ä¼¼ä¹?ä¸?æ?¯ä¸?å?? IFS ç¢?å½¢æª?æ¡?ã??"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2530
-#, fuzzy
 msgid "Save as IFS Fractal file"
-msgstr "å?¦å?ç?®å??ç??æ??å°?ç?ºæª?æ¡?"
+msgstr "å?²å?ç?º IFS ç¢?å½¢æª?æ¡?"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2567
-#, fuzzy
 msgid "Open IFS Fractal file"
-msgstr "é??å??ä¸?æ?¯å?¨æ?¬æ©?ç??æª?æ¡?"
+msgstr "é??å?? IFS ç¢?å½¢æª?æ¡?"
 
 #: ../plug-ins/imagemap/imap_about.c:42
 msgid "Image Map Plug-In"
@@ -12074,7 +12081,7 @@ msgid "View Source"
 msgstr "é¡¯ç¤ºå??å§?æª?"
 
 #: ../plug-ins/lighting/lighting-apply.c:105
-#: ../plug-ins/lighting/lighting-ui.c:1018
+#: ../plug-ins/lighting/lighting-ui.c:1017
 msgid "Lighting Effects"
 msgstr "å??ç·?æ??æ??"
 
@@ -12087,141 +12094,141 @@ msgid "_Lighting Effects..."
 msgstr "å??ç·?æ??æ??(_L)..."
 
 #. General options
-#: ../plug-ins/lighting/lighting-ui.c:294
+#: ../plug-ins/lighting/lighting-ui.c:293
 #: ../plug-ins/map-object/map-object-ui.c:472
 msgid "General Options"
 msgstr "ä¸?è?¬é?¸é ?"
 
-#: ../plug-ins/lighting/lighting-ui.c:302
+#: ../plug-ins/lighting/lighting-ui.c:301
 msgid "T_ransparent background"
 msgstr "é??æ??è??æ?¯(_R)"
 
-#: ../plug-ins/lighting/lighting-ui.c:312
+#: ../plug-ins/lighting/lighting-ui.c:311
 msgid "Make destination image transparent where bump height is zero"
-msgstr ""
+msgstr "ä½¿ç?®ç??å?°å½±å??é??æ??ï¼?å?¶å?¹å?¸é«?åº¦æ?¯é?¶"
 
-#: ../plug-ins/lighting/lighting-ui.c:315
+#: ../plug-ins/lighting/lighting-ui.c:314
 msgid "Cre_ate new image"
 msgstr "ç?¢ç??æ?°ç??å??ç??(_A)"
 
-#: ../plug-ins/lighting/lighting-ui.c:325
+#: ../plug-ins/lighting/lighting-ui.c:324
 #: ../plug-ins/map-object/map-object-ui.c:541
 msgid "Create a new image when applying filter"
 msgstr "å¥?ç?¨æ¿¾é?¡æ??æ??ç?¢ç??æ?°ç??å??ç??"
 
-#: ../plug-ins/lighting/lighting-ui.c:327
+#: ../plug-ins/lighting/lighting-ui.c:326
 msgid "High _quality preview"
 msgstr "é«?å??è³ªé ?è¦½(_Q)"
 
-#: ../plug-ins/lighting/lighting-ui.c:337
+#: ../plug-ins/lighting/lighting-ui.c:336
 msgid "Enable/disable high quality preview"
 msgstr "(ä¸?)å??ç?¨é«?å??è³ªé ?è¦½"
 
-#: ../plug-ins/lighting/lighting-ui.c:344
+#: ../plug-ins/lighting/lighting-ui.c:343
 msgid "Distance:"
 msgstr "è·?é?¢ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:377
+#: ../plug-ins/lighting/lighting-ui.c:376
 #: ../plug-ins/map-object/map-object-ui.c:619
 msgid "Light Settings"
 msgstr "å??æº?è¨å®?"
 
-#: ../plug-ins/lighting/lighting-ui.c:390
+#: ../plug-ins/lighting/lighting-ui.c:389
 msgid "Light 1"
 msgstr "å??ç·? 1"
 
-#: ../plug-ins/lighting/lighting-ui.c:391
+#: ../plug-ins/lighting/lighting-ui.c:390
 msgid "Light 2"
 msgstr "å??ç·? 2"
 
-#: ../plug-ins/lighting/lighting-ui.c:392
+#: ../plug-ins/lighting/lighting-ui.c:391
 msgid "Light 3"
 msgstr "å??ç·? 3"
 
-#: ../plug-ins/lighting/lighting-ui.c:393
+#: ../plug-ins/lighting/lighting-ui.c:392
 msgid "Light 4"
 msgstr "å??ç·? 4"
 
-#: ../plug-ins/lighting/lighting-ui.c:394
+#: ../plug-ins/lighting/lighting-ui.c:393
 msgid "Light 5"
 msgstr "å??ç·? 5"
 
-#: ../plug-ins/lighting/lighting-ui.c:395
+#: ../plug-ins/lighting/lighting-ui.c:394
 msgid "Light 6"
 msgstr "å??ç·? 6"
 
-#: ../plug-ins/lighting/lighting-ui.c:409
+#: ../plug-ins/lighting/lighting-ui.c:408
 msgid "Color:"
 msgstr "é¡?è?²ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:416
+#: ../plug-ins/lighting/lighting-ui.c:415
 msgid "Directional"
 msgstr "æ?¹å??æ?§"
 
-#: ../plug-ins/lighting/lighting-ui.c:417
+#: ../plug-ins/lighting/lighting-ui.c:416
 msgid "Point"
 msgstr "é»?"
 
-#: ../plug-ins/lighting/lighting-ui.c:431
+#: ../plug-ins/lighting/lighting-ui.c:430
 #: ../plug-ins/map-object/map-object-ui.c:642
 msgid "Type of light source to apply"
 msgstr "æº?å??ä½¿ç?¨ç??å??æº?é¡?å??"
 
-#: ../plug-ins/lighting/lighting-ui.c:433
+#: ../plug-ins/lighting/lighting-ui.c:432
 #: ../plug-ins/map-object/map-object-ui.c:644
 msgid "Select lightsource color"
 msgstr "è«?é?¸å??å??æº?é¡?è?²"
 
-#: ../plug-ins/lighting/lighting-ui.c:447
+#: ../plug-ins/lighting/lighting-ui.c:446
 #: ../plug-ins/map-object/map-object-ui.c:657
 msgid "Set light source color"
 msgstr "è¨å®?å??æº?é¡?è?²"
 
-#: ../plug-ins/lighting/lighting-ui.c:455
+#: ../plug-ins/lighting/lighting-ui.c:454
 msgid "_Intensity:"
 msgstr "äº®åº¦(_I)ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:463
+#: ../plug-ins/lighting/lighting-ui.c:462
 msgid "Light intensity"
 msgstr "å??æº?äº®åº¦"
 
-#: ../plug-ins/lighting/lighting-ui.c:466
+#: ../plug-ins/lighting/lighting-ui.c:465
 #: ../plug-ins/map-object/map-object-ui.c:659
 #: ../plug-ins/map-object/map-object-ui.c:986
 #: ../plug-ins/print/print-page-layout.c:355
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../plug-ins/lighting/lighting-ui.c:484
+#: ../plug-ins/lighting/lighting-ui.c:483
 #: ../plug-ins/map-object/map-object-ui.c:683
 msgid "Light source X position in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? X åº§æ¨?"
 
-#: ../plug-ins/lighting/lighting-ui.c:499
+#: ../plug-ins/lighting/lighting-ui.c:498
 #: ../plug-ins/map-object/map-object-ui.c:697
 msgid "Light source Y position in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? Y åº§æ¨?"
 
-#: ../plug-ins/lighting/lighting-ui.c:506
+#: ../plug-ins/lighting/lighting-ui.c:505
 msgid "_Z:"
 msgstr "_Zï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:514
+#: ../plug-ins/lighting/lighting-ui.c:513
 #: ../plug-ins/map-object/map-object-ui.c:711
 msgid "Light source Z position in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? Z åº§æ¨?"
 
-#: ../plug-ins/lighting/lighting-ui.c:534
+#: ../plug-ins/lighting/lighting-ui.c:533
 #: ../plug-ins/map-object/map-object-ui.c:737
 msgid "Light source X direction in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? X æ?¹å??"
 
-#: ../plug-ins/lighting/lighting-ui.c:548
+#: ../plug-ins/lighting/lighting-ui.c:547
 #: ../plug-ins/map-object/map-object-ui.c:750
 msgid "Light source Y direction in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? Y æ?¹å??"
 
-#: ../plug-ins/lighting/lighting-ui.c:554
+#: ../plug-ins/lighting/lighting-ui.c:553
 #: ../plug-ins/map-object/map-object-ui.c:703
 #: ../plug-ins/map-object/map-object-ui.c:755
 #: ../plug-ins/map-object/map-object-ui.c:1023
@@ -12230,149 +12237,148 @@ msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? Y æ?¹å??"
 msgid "Z:"
 msgstr "Zï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:562
+#: ../plug-ins/lighting/lighting-ui.c:561
 #: ../plug-ins/map-object/map-object-ui.c:763
 msgid "Light source Z direction in XYZ space"
 msgstr "ä¸?ç¶ç©ºé??ä¸å??æº?ç?? Z æ?¹å??"
 
-#: ../plug-ins/lighting/lighting-ui.c:565
+#: ../plug-ins/lighting/lighting-ui.c:564
 msgid "I_solate"
 msgstr "é??é?¢(_S)"
 
-#: ../plug-ins/lighting/lighting-ui.c:574
+#: ../plug-ins/lighting/lighting-ui.c:573
 msgid "Lighting preset:"
 msgstr "å??ç·?æ??æ??çµ?æ??ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:620
+#: ../plug-ins/lighting/lighting-ui.c:619
 msgid "Material Properties"
 msgstr "æ??è³ªå±¬æ?§"
 
-#: ../plug-ins/lighting/lighting-ui.c:638
+#: ../plug-ins/lighting/lighting-ui.c:637
 msgid "_Glowing:"
 msgstr "ç?½ç?±ç??(_G):"
 
-#: ../plug-ins/lighting/lighting-ui.c:657
+#: ../plug-ins/lighting/lighting-ui.c:656
 #: ../plug-ins/map-object/map-object-ui.c:824
 msgid "Amount of original color to show where no direct light falls"
 msgstr "ç?¶æ²?æ??è¢«å??æº?ç?´æ?¥ç?§å°?æ??é¡¯ç¤ºç??å??ä¾?è?²å½©ä»½é??"
 
-#: ../plug-ins/lighting/lighting-ui.c:671
+#: ../plug-ins/lighting/lighting-ui.c:670
 msgid "_Bright:"
 msgstr "æ??äº®ç??(_B):"
 
-#: ../plug-ins/lighting/lighting-ui.c:690
+#: ../plug-ins/lighting/lighting-ui.c:689
 #: ../plug-ins/map-object/map-object-ui.c:853
 msgid "Intensity of original color when lit by a light source"
 msgstr "è¢«å??æº?ç?§å?°æ??å??è?²å½©ç??å¼·åº¦"
 
-#: ../plug-ins/lighting/lighting-ui.c:704
+#: ../plug-ins/lighting/lighting-ui.c:703
 msgid "_Shiny:"
 msgstr "å??äº®ç??(_S):"
 
-#: ../plug-ins/lighting/lighting-ui.c:723
+#: ../plug-ins/lighting/lighting-ui.c:722
 #: ../plug-ins/map-object/map-object-ui.c:925
 msgid "Controls how intense the highlights will be"
 msgstr "æ?§å?¶å¼·å??é?¨ä»½å¤?éº¼å¼·ç??"
 
-#: ../plug-ins/lighting/lighting-ui.c:736
+#: ../plug-ins/lighting/lighting-ui.c:735
 msgid "_Polished:"
 msgstr "ç£¨å??ç??(_P):"
 
-#: ../plug-ins/lighting/lighting-ui.c:755
+#: ../plug-ins/lighting/lighting-ui.c:754
 #: ../plug-ins/map-object/map-object-ui.c:954
 msgid "Higher values makes the highlights more focused"
 msgstr "è¼?é«?ç??å?¼,ä½¿å¼·å??é?¨ä»½æ?´é??ä¸"
 
 #. Metallic
-#: ../plug-ins/lighting/lighting-ui.c:765
+#: ../plug-ins/lighting/lighting-ui.c:764
 msgid "_Metallic"
 msgstr "é??å±¬é?¢(_M)"
 
-#: ../plug-ins/lighting/lighting-ui.c:802
+#: ../plug-ins/lighting/lighting-ui.c:801
 msgid "E_nable bump mapping"
 msgstr "ä½¿ç?¨å?¹å?¸è²¼å??(_N)"
 
-#: ../plug-ins/lighting/lighting-ui.c:816
+#: ../plug-ins/lighting/lighting-ui.c:815
 msgid "Enable/disable bump-mapping (image depth)"
-msgstr ""
+msgstr "å??ç?¨/å??ç?¨å?¹å?¸è²¼å??(å½±å??æ·±åº¦)"
 
-#: ../plug-ins/lighting/lighting-ui.c:838
+#: ../plug-ins/lighting/lighting-ui.c:837
 msgid "Bumpm_ap image:"
 msgstr "å?¹å?¸è²¼å??å??ç??(_A):"
 
-#: ../plug-ins/lighting/lighting-ui.c:842
+#: ../plug-ins/lighting/lighting-ui.c:841
 msgid "Logarithmic"
 msgstr "å°?æ?¸"
 
-#: ../plug-ins/lighting/lighting-ui.c:854
+#: ../plug-ins/lighting/lighting-ui.c:853
 msgid "Cu_rve:"
 msgstr "æ?²ç·?(_R)ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:859
+#: ../plug-ins/lighting/lighting-ui.c:858
 msgid "Ma_ximum height:"
 msgstr "é«?åº¦ä¸?é??(_X)ï¼?"
 
-#: ../plug-ins/lighting/lighting-ui.c:869
-#, fuzzy
+#: ../plug-ins/lighting/lighting-ui.c:868
 msgid "Maximum height for bumps"
-msgstr "æ??å?å®¹å?¨å??ä»¶ç??é«?åº¦"
+msgstr "ç?ºå?¹å?¸ç??æ??å¤§é«?åº¦"
 
-#: ../plug-ins/lighting/lighting-ui.c:893
+#: ../plug-ins/lighting/lighting-ui.c:892
 msgid "E_nable environment mapping"
 msgstr "å??ç?¨ç?°å¢?æ? å°?(_N)"
 
-#: ../plug-ins/lighting/lighting-ui.c:907
+#: ../plug-ins/lighting/lighting-ui.c:906
 msgid "Enable/disable environment-mapping (reflection)"
 msgstr "å??ç?¨/å??ç?¨ç?°å¢?æ? å°?(å??å°?)"
 
-#: ../plug-ins/lighting/lighting-ui.c:924
+#: ../plug-ins/lighting/lighting-ui.c:923
 msgid "En_vironment image:"
 msgstr "ç?°å¢?å??ç??(_V):"
 
-#: ../plug-ins/lighting/lighting-ui.c:927
+#: ../plug-ins/lighting/lighting-ui.c:926
 msgid "Environment image to use"
 msgstr "è¦?ä½¿ç?¨ç??ç?°å¢?æ? å°?å??ç??"
 
-#: ../plug-ins/lighting/lighting-ui.c:949
+#: ../plug-ins/lighting/lighting-ui.c:948
 msgid "Op_tions"
 msgstr "é?¸é ?(_T)"
 
-#: ../plug-ins/lighting/lighting-ui.c:953
+#: ../plug-ins/lighting/lighting-ui.c:952
 #: ../plug-ins/map-object/map-object-ui.c:1291
 msgid "_Light"
 msgstr "å??ç·?(_L)"
 
-#: ../plug-ins/lighting/lighting-ui.c:957
+#: ../plug-ins/lighting/lighting-ui.c:956
 #: ../plug-ins/map-object/map-object-ui.c:1295
 msgid "_Material"
 msgstr "æ??è³ª(_M)"
 
-#: ../plug-ins/lighting/lighting-ui.c:961
+#: ../plug-ins/lighting/lighting-ui.c:960
 msgid "_Bump Map"
 msgstr "å?¹å?¸è²¼å??(_B)"
 
-#: ../plug-ins/lighting/lighting-ui.c:965
+#: ../plug-ins/lighting/lighting-ui.c:964
 msgid "_Environment Map"
 msgstr "ç?°å¢?æ? å°?(_E)"
 
-#: ../plug-ins/lighting/lighting-ui.c:1081
+#: ../plug-ins/lighting/lighting-ui.c:1080
 #: ../plug-ins/map-object/map-object-ui.c:1397
 msgid "Recompute preview image"
 msgstr "é??æ?°è¨?ç®?é ?è¦½å??ç??"
 
-#: ../plug-ins/lighting/lighting-ui.c:1083
+#: ../plug-ins/lighting/lighting-ui.c:1082
 msgid "I_nteractive"
 msgstr "äº?å??å¼?(_N)"
 
-#: ../plug-ins/lighting/lighting-ui.c:1097
+#: ../plug-ins/lighting/lighting-ui.c:1096
 msgid "Enable/disable real time preview of changes"
 msgstr "å??ç?¨/é??é??é«?å??è³ªå?³æ??é ?è¦½"
 
-#: ../plug-ins/lighting/lighting-ui.c:1136
+#: ../plug-ins/lighting/lighting-ui.c:1140
 msgid "Save Lighting Preset"
 msgstr "å?²å?å??ç·?æ??æ??çµ?æ??"
 
-#: ../plug-ins/lighting/lighting-ui.c:1280
+#: ../plug-ins/lighting/lighting-ui.c:1284
 msgid "Load Lighting Preset"
 msgstr "è¼?å?¥å??ç·?æ??æ??çµ?æ??"
 
@@ -12952,31 +12958,3 @@ msgstr "ç?«é?¢å¿«ç?§(_S)..."
 #: ../plug-ins/win-snap/winsnap.c:1142
 msgid "No data captured"
 msgstr "æ²?æ??æ??å?°ä»»ä½?è³?æ??"
-
-#, fuzzy
-#~ msgid "Portable Document Format"
-#~ msgstr "DJVU æ??ä»¶æ??ä¸?æ£ç¢ºç??æ ¼å¼?"
-
-#, fuzzy
-#~ msgid "Could not load '%s': %s"
-#~ msgstr "ç?¡æ³?è¼?å?¥ã??%sã??"
-
-#~ msgid "%s-%s"
-#~ msgstr "%s-%s"
-
-#~ msgid "Import from PDF"
-#~ msgstr "å¾? PDF æª?å?¯å?¥"
-
-#, fuzzy
-#~ msgid "_Width (pixels):"
-#~ msgstr "ç?«é?¢å¿«ç?§å¯¬åº¦(ä»¥å??ç´ è¨?):"
-
-#, fuzzy
-#~ msgid "_Height (pixels):"
-#~ msgstr "é«?åº¦ï¼?%.2f é»? (%d å??ç´ )"
-
-#~ msgid "_Resolution:"
-#~ msgstr "è§£æ??åº¦(_R)ï¼?"
-
-#~ msgid "pixels/%s"
-#~ msgstr "å??ç´ /%s"
diff --git a/po-python/zh_HK.po b/po-python/zh_HK.po
index 88b4d90..949eef3 100644
--- a/po-python/zh_HK.po
+++ b/po-python/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-python 2.1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 19:48+0800\n"
-"PO-Revision-Date: 2010-10-30 19:48+0800\n"
+"POT-Creation-Date: 2011-01-01 19:44+0800\n"
+"PO-Revision-Date: 2011-01-01 19:45+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -58,49 +58,49 @@ msgstr "--%2$s æ??ç?¡æ??ç??æ?¸å?¼ã??%1$sã??"
 msgid "Python-Fu Color Selection"
 msgstr "é¡?è?²é?¸æ??å°?è©±ç??ç??æ¨?é¡?"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:106
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:109
 #, fuzzy
 msgid "Saving as colored XHTML"
 msgstr "å?²å?æ??é ?è¨å»ºè°ç??æª?æ¡?å??ç¨±"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:183
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:186
 #, fuzzy
 msgid "Save as colored XHTML"
 msgstr "å°?è?¯çµ¡äººå?²å?ç?º VCar_d..."
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:188
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:191
 #, fuzzy
 msgid "Colored XHTML"
 msgstr "XHTML 1.0 - Tags"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:195
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:198
 #, fuzzy
 msgid "Character _source"
 msgstr "ä¾?æº?é?¸é ?"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:196
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:199
 #, fuzzy
 msgid "Source code"
 msgstr "C æº?ä»£ç¢¼"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:197
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:200
 msgid "Text file"
 msgstr "æ??å?æª?"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:198
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:201
 #, fuzzy
 msgid "Entry box"
 msgstr "çµ?å??æ?¹å¡?é ?ç?®"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:199
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:202
 msgid "_File to read or characters to use"
 msgstr ""
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:201
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:204
 msgid "Fo_nt size in pixels"
 msgstr ""
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:202
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:205
 #, fuzzy
 msgid "_Write a separate CSS file"
 msgstr "ç?¡æ³?å¯«å?¥â??%sâ??æª?æ¡?ï¼?%s"
diff --git a/po-python/zh_TW.po b/po-python/zh_TW.po
index 681f307..9f2d111 100644
--- a/po-python/zh_TW.po
+++ b/po-python/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-python 2.1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 19:48+0800\n"
+"POT-Creation-Date: 2011-01-01 19:44+0800\n"
 "PO-Revision-Date: 2010-10-04 20:06+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n linux org tw>\n"
@@ -58,49 +58,49 @@ msgstr "--%2$s æ??ç?¡æ??ç??æ?¸å?¼ã??%1$sã??"
 msgid "Python-Fu Color Selection"
 msgstr "é¡?è?²é?¸æ??å°?è©±ç??ç??æ¨?é¡?"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:106
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:109
 #, fuzzy
 msgid "Saving as colored XHTML"
 msgstr "å?²å?æ??é ?è¨å»ºè°ç??æª?æ¡?å??ç¨±"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:183
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:186
 #, fuzzy
 msgid "Save as colored XHTML"
 msgstr "å°?é?£çµ¡äººå?²å?ç?º VCar_d..."
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:188
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:191
 #, fuzzy
 msgid "Colored XHTML"
 msgstr "XHTML 1.0 - Tags"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:195
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:198
 #, fuzzy
 msgid "Character _source"
 msgstr "ä¾?æº?é?¸é ?"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:196
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:199
 #, fuzzy
 msgid "Source code"
 msgstr "C æº?ä»£ç¢¼"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:197
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:200
 msgid "Text file"
 msgstr "æ??å?æª?"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:198
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:201
 #, fuzzy
 msgid "Entry box"
 msgstr "çµ?å??æ?¹å¡?é ?ç?®"
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:199
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:202
 msgid "_File to read or characters to use"
 msgstr ""
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:201
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:204
 msgid "Fo_nt size in pixels"
 msgstr ""
 
-#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:202
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:205
 #, fuzzy
 msgid "_Write a separate CSS file"
 msgstr "ç?¡æ³?å¯«å?¥â??%sâ??æª?æ¡?ï¼?%s"
diff --git a/po-script-fu/zh_HK.po b/po-script-fu/zh_HK.po
index 54eaa38..bdffd8b 100644
--- a/po-script-fu/zh_HK.po
+++ b/po-script-fu/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-script-fu 2.1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 19:49+0800\n"
-"PO-Revision-Date: 2010-10-30 19:49+0800\n"
+"POT-Creation-Date: 2011-01-01 19:45+0800\n"
+"PO-Revision-Date: 2011-01-01 19:45+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
@@ -495,7 +495,6 @@ msgstr "å?¨å??ç??å?¨å??å? ä¸?é??æ¡?"
 
 #: ../plug-ins/script-fu/scripts/addborder.scm.h:3
 #, fuzzy
-#| msgid "Border size"
 msgid "Border Layer"
 msgstr "é??æ¡?å¤§å°?"
 
@@ -519,14 +518,12 @@ msgstr "é¡?è?²ç?? Delta æ?¸å?¼"
 #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:1
 #: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:1
 #, fuzzy
-#| msgid "_Alien Glow"
 msgid "Alien Glow"
 msgstr "ç?°æ¨£ç?¼å??(_A)"
 
 #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:2
 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:1
 #, fuzzy
-#| msgid "_Arrow..."
 msgid "Arrow"
 msgstr "ç®é (_A)..."
 
@@ -538,7 +535,6 @@ msgstr "ç®é (_A)..."
 #: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:1
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:2
 #, fuzzy
-#| msgid "Background color"
 msgid "Background"
 msgstr "è??æ?¯é¡?è?²"
 
@@ -627,7 +623,6 @@ msgstr "æ°´å¹³ç·?(_H)..."
 #: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:4
 #: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:1
 #, fuzzy
-#| msgid "_Bullet..."
 msgid "Bullet"
 msgstr "å°?å??ç??(_B)..."
 
@@ -653,7 +648,6 @@ msgstr "æ??é??(_U)..."
 
 #: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:4
 #, fuzzy
-#| msgid "_Buttons"
 msgid "Button"
 msgstr "æ??é??(_B)"
 
@@ -1041,14 +1035,12 @@ msgstr "è¿·å½©å??æ¡?(_C)..."
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:1
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:2
 #, fuzzy
-#| msgid "Bevel width"
 msgid "Bevel Highlight"
 msgstr "æ??é?¢é??åº¦"
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:2
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:3
 #, fuzzy
-#| msgid "Shadow"
 msgid "Bevel Shadow"
 msgstr "é?°å½±"
 
@@ -1064,7 +1056,6 @@ msgstr ""
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:5
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:7
 #, fuzzy
-#| msgid "Create shadow"
 msgid "Cast Shadow"
 msgstr "ç?¢ç??é?°å½±"
 
@@ -1074,8 +1065,9 @@ msgstr "æº?å??é??å?»ç??å??ç??"
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:7
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:11
+#, fuzzy
 msgid "Inset"
-msgstr ""
+msgstr "ç?¸å??"
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:8
 msgid "Stencil C_arve..."
@@ -1163,7 +1155,6 @@ msgstr ""
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:3
 #, fuzzy
-#| msgid "C_hrome..."
 msgid "Chrome"
 msgstr "é??é?»(_H)..."
 
@@ -1194,7 +1185,6 @@ msgstr "å°?ç?½è?²å??å??é??é?»"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:9
 #, fuzzy
-#| msgid "Drop shadow"
 msgid "Drop Shadow"
 msgstr "å½±å?"
 
@@ -1207,7 +1197,6 @@ msgstr "ç?°å¢?æ? å°?"
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:11
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:7
 #, fuzzy
-#| msgid "Highlight color"
 msgid "Highlight"
 msgstr "é«?äº®åº¦å??é¡?è?²"
 
@@ -1255,7 +1244,6 @@ msgstr "ç?¢ç??é?»è·¯å??ç??é?¨æ©?æ?¸ä¾?æº?æ?¸å?"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:2
 #, fuzzy
-#| msgid "Separate layer"
 msgid "Effect layer"
 msgstr "ä½¿ç?¨æ?°å??å±¤"
 
@@ -1331,7 +1319,6 @@ msgstr "å??è®?æ??"
 
 #: ../plug-ins/script-fu/scripts/coffee.scm.h:3
 #, fuzzy
-#| msgid "Stains"
 msgid "Stain"
 msgstr "æ±¡æ¼¬"
 
@@ -1946,18 +1933,16 @@ msgid "Number of lines"
 msgstr "ç·?æ¢?æ?¸ç?®"
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:4
-#, fuzzy
 msgid "Offset radius"
-msgstr "æ¨¡ç³?å??å¾?(_B)ï¼?"
+msgstr "å??ç§»å??å¾?"
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:5
 msgid "Randomness"
 msgstr "é?¨æ©?ç¨?åº¦"
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:6
-#, fuzzy
 msgid "Sharpness (degrees)"
-msgstr "å??é?²ä½?ç¶?ç·¯åº¦"
+msgstr "é?³å?©åº¦(åº¦)"
 
 #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:1
 msgid "Create a rectangular brush"
@@ -2477,9 +2462,8 @@ msgid "Hole ratio"
 msgstr "å£?ç¸®ç??ï¼?"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:14
-#, fuzzy
 msgid "Inner teeth"
-msgstr "å?§é?¨æ¡?ç·?"
+msgstr "å?§é½?"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:15
 msgid "Lissajous"
@@ -2492,7 +2476,7 @@ msgstr "é ?ç«¯é??ç??ï¼?ä»¥å??ç´ è¨?ï¼?"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:17
 msgid "Outer teeth"
-msgstr ""
+msgstr "å¤?é½?"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:18
 msgid "Pencil"
diff --git a/po-script-fu/zh_TW.po b/po-script-fu/zh_TW.po
index beb251e..d1e35eb 100644
--- a/po-script-fu/zh_TW.po
+++ b/po-script-fu/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-script-fu 2.1.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 19:49+0800\n"
+"POT-Creation-Date: 2011-01-01 19:45+0800\n"
 "PO-Revision-Date: 2010-10-04 20:08+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
@@ -497,7 +497,6 @@ msgstr "å?¨å??ç??å?¨å??å? ä¸?é??æ¡?"
 
 #: ../plug-ins/script-fu/scripts/addborder.scm.h:3
 #, fuzzy
-#| msgid "Border size"
 msgid "Border Layer"
 msgstr "é??æ¡?å¤§å°?"
 
@@ -521,14 +520,12 @@ msgstr "é¡?è?²ç?? Delta æ?¸å?¼"
 #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:1
 #: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:1
 #, fuzzy
-#| msgid "_Alien Glow"
 msgid "Alien Glow"
 msgstr "ç?°æ¨£ç?¼å??(_A)"
 
 #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:2
 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:1
 #, fuzzy
-#| msgid "_Arrow..."
 msgid "Arrow"
 msgstr "ç®é (_A)..."
 
@@ -540,7 +537,6 @@ msgstr "ç®é (_A)..."
 #: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:1
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:2
 #, fuzzy
-#| msgid "Background color"
 msgid "Background"
 msgstr "è??æ?¯é¡?è?²"
 
@@ -629,7 +625,6 @@ msgstr "æ°´å¹³ç·?(_H)..."
 #: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:4
 #: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:1
 #, fuzzy
-#| msgid "_Bullet..."
 msgid "Bullet"
 msgstr "å°?å??ç??(_B)..."
 
@@ -655,7 +650,6 @@ msgstr "æ??é??(_U)..."
 
 #: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:4
 #, fuzzy
-#| msgid "_Buttons"
 msgid "Button"
 msgstr "æ??é??(_B)"
 
@@ -1043,14 +1037,12 @@ msgstr "è¿·å½©å??æ¡?(_C)..."
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:1
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:2
 #, fuzzy
-#| msgid "Bevel width"
 msgid "Bevel Highlight"
 msgstr "æ??é?¢å¯¬åº¦"
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:2
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:3
 #, fuzzy
-#| msgid "Shadow"
 msgid "Bevel Shadow"
 msgstr "é?°å½±"
 
@@ -1066,7 +1058,6 @@ msgstr ""
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:5
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:7
 #, fuzzy
-#| msgid "Create shadow"
 msgid "Cast Shadow"
 msgstr "ç?¢ç??é?°å½±"
 
@@ -1076,8 +1067,9 @@ msgstr "æº?å??é??å?»ç??å??ç??"
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:7
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:11
+#, fuzzy
 msgid "Inset"
-msgstr ""
+msgstr "ç?¸å??"
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:8
 msgid "Stencil C_arve..."
@@ -1165,7 +1157,6 @@ msgstr ""
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:3
 #, fuzzy
-#| msgid "C_hrome..."
 msgid "Chrome"
 msgstr "é??é?»(_H)..."
 
@@ -1196,7 +1187,6 @@ msgstr "å°?ç?½è?²å??å??é??é?»"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:9
 #, fuzzy
-#| msgid "Drop shadow"
 msgid "Drop Shadow"
 msgstr "å½±å?"
 
@@ -1209,7 +1199,6 @@ msgstr "ç?°å¢?æ? å°?"
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:11
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:7
 #, fuzzy
-#| msgid "Highlight color"
 msgid "Highlight"
 msgstr "é«?äº®åº¦å??é¡?è?²"
 
@@ -1257,7 +1246,6 @@ msgstr "ç?¢ç??é?»è·¯å??ç??é?¨æ©?æ?¸ä¾?æº?æ?¸å?"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:2
 #, fuzzy
-#| msgid "Separate layer"
 msgid "Effect layer"
 msgstr "ä½¿ç?¨æ?°å??å±¤"
 
@@ -1333,7 +1321,6 @@ msgstr "å??è®?æ??"
 
 #: ../plug-ins/script-fu/scripts/coffee.scm.h:3
 #, fuzzy
-#| msgid "Stains"
 msgid "Stain"
 msgstr "æ±¡æ¼¬"
 
@@ -1948,18 +1935,16 @@ msgid "Number of lines"
 msgstr "ç·?æ¢?æ?¸ç?®"
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:4
-#, fuzzy
 msgid "Offset radius"
-msgstr "æ¨¡ç³?å??å¾?(_B)ï¼?"
+msgstr "å??ç§»å??å¾?"
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:5
 msgid "Randomness"
 msgstr "é?¨æ©?ç¨?åº¦"
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:6
-#, fuzzy
 msgid "Sharpness (degrees)"
-msgstr "å??é?²ä½?ç¶?ç·¯åº¦"
+msgstr "é?³å?©åº¦(åº¦)"
 
 #: ../plug-ins/script-fu/scripts/mkbrush.scm.h:1
 msgid "Create a rectangular brush"
@@ -2479,9 +2464,8 @@ msgid "Hole ratio"
 msgstr "å£?ç¸®ç??ï¼?"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:14
-#, fuzzy
 msgid "Inner teeth"
-msgstr "å?§é?¨æ¡?ç·?"
+msgstr "å?§é½?"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:15
 msgid "Lissajous"
@@ -2494,7 +2478,7 @@ msgstr "é ?ç«¯é??ç??ï¼?ä»¥å??ç´ è¨?ï¼?"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:17
 msgid "Outer teeth"
-msgstr ""
+msgstr "å¤?é½?"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:18
 msgid "Pencil"
diff --git a/po-tags/zh_HK.po b/po-tags/zh_HK.po
index fbaf3e2..ad77338 100644
--- a/po-tags/zh_HK.po
+++ b/po-tags/zh_HK.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-tags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 19:52+0800\n"
-"PO-Revision-Date: 2010-10-30 19:52+0800\n"
+"POT-Creation-Date: 2011-01-01 19:46+0800\n"
+"PO-Revision-Date: 2011-01-01 19:46+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: zh_TW\n"
diff --git a/po-tags/zh_TW.po b/po-tags/zh_TW.po
index 2ddc773..9c86e99 100644
--- a/po-tags/zh_TW.po
+++ b/po-tags/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-tags\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 19:52+0800\n"
+"POT-Creation-Date: 2011-01-01 19:46+0800\n"
 "PO-Revision-Date: 2010-10-04 20:11+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n linux org tw>\n"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 8b416e8..45860c2 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -5,16 +5,16 @@
 # Chun-Chung Chen (é?³ä¿?ä»²) <cjj u washington edu>, 2001.
 # Abel Cheung <abel oaka org>, 2001, 03-05.
 # Yi-Shun Wang <dnextstep gmail com>, 2008.
-# taijuin <taijuin gmail com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp 2.6.7\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n";
-"POT-Creation-Date: 2010-10-03 20:17+0000\n"
-"PO-Revision-Date: 2010-10-30 19:33+0800\n"
-"Last-Translator: taijuin <taijuin gmail com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-01 19:28+0800\n"
+"PO-Revision-Date: 2011-01-01 19:40+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid "GIMP"
 msgstr "GIMP"
 
-#: ../app/about.h:26
-#: ../desktop/gimp.desktop.in.in.h:2
+#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:2
 msgid "GNU Image Manipulation Program"
 msgstr "GNU å??ç??è??ç??ç¨?å¼?"
 
+#. The year of the last commit (UTC) will be inserted into this string.
 #: ../app/about.h:30
 #, c-format
 msgid ""
@@ -41,11 +41,18 @@ msgstr ""
 #: ../app/about.h:34
 #, fuzzy
 msgid ""
-"GIMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.\n"
+"GIMP is free software: you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 3 of the License, or (at your option) any later "
+"version.\n"
 "\n"
-"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with GIMP.  If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"GIMP.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 "æ?¬ç¨?å¼?æ?¯è?ªç?±è»?ä»¶ï¼?ä½ å?¯ä»¥é?µç?§è?ªç?±è»?ä»¶å?ºé??æ?? (Free Software Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è?æ¢?æ¬¾ (GNU General Public License) ç¬¬äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??ä½¿ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??\n"
 "\n"
@@ -58,7 +65,8 @@ msgstr ""
 msgid ""
 "Unable to open a test swap file.\n"
 "\n"
-"To avoid data loss, please check the location and permissions of the swap directory defined in your Preferences (currently \"%s\")."
+"To avoid data loss, please check the location and permissions of the swap "
+"directory defined in your Preferences (currently \"%s\")."
 msgstr ""
 "ç?¡æ³?é??å??æ¸¬è©¦ç?¨ç??äº¤æ??è¨?æ?¶æª?æ¡?ã??\n"
 "\n"
@@ -69,14 +77,12 @@ msgstr ""
 msgid "No batch interpreter specified, using the default '%s'.\n"
 msgstr "æ²?æ??æ??å®?æ?¹æ¬¡è§£è¯å?¨ï¼?ä½¿ç?¨é ?è¨ç??â??%sâ??\n"
 
-#: ../app/batch.c:93
-#: ../app/batch.c:111
+#: ../app/batch.c:93 ../app/batch.c:111
 #, c-format
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
 msgstr "æ?¹æ¬¡è§£è¯å?¨â??%sâ??ç?¡æ³?ä½¿ç?¨ã??æ?¹æ¬¡æ¨¡å¼?å·²å??ç?¨ã??"
 
-#: ../app/main.c:139
-#: ../tools/gimp-remote.c:59
+#: ../app/main.c:139 ../tools/gimp-remote.c:59
 msgid "Show version information and exit"
 msgstr "é¡¯ç¤ºç??æ?¬è³?è¨?ä¸¦é?¢é??"
 
@@ -109,9 +115,8 @@ msgid "Do not load any fonts"
 msgstr "ä¸?è¦?è¼?å?¥ä»»ä½?å?å??"
 
 #: ../app/main.c:179
-#, fuzzy
 msgid "Do not show a splash screen"
-msgstr "ä¸?è¦?é¡¯ç¤ºæ¡è¿?ç?«é?¢"
+msgstr "ä¸?è¦?é¡¯ç¤ºå??å??ç?«é?¢"
 
 #: ../app/main.c:184
 msgid "Do not use shared memory between GIMP and plugins"
@@ -145,10 +150,12 @@ msgstr "ç?¨ä¾?è??ç??æ?¹æ¬¡æ??ä»¤ç??ç¨?åº?"
 msgid "Send messages to console instead of using a dialog"
 msgstr "å?³é??è¨?æ?¯å?° console è??é??å°?è©±ç??"
 
+#. don't translate the mode names (off|on|warn)
 #: ../app/main.c:225
 msgid "PDB compatibility mode (off|on|warn)"
 msgstr "PDB å?¼å®¹æ?§æ¨¡å¼? (off|on|warn)"
 
+#. don't translate the mode names (never|query|always)
 #: ../app/main.c:231
 msgid "Debug in case of a crash (never|query|always)"
 msgstr "å¦?æ??ç?¼ç??ç?¶æ©?å°±é?¤é?¯ (never|query|always)"
@@ -208,50 +215,48 @@ msgstr ""
 #: ../app/sanity.c:417
 #, c-format
 msgid ""
-"The name of the directory holding the GIMP user configuration cannot be converted to UTF-8: %s\n"
+"The name of the directory holding the GIMP user configuration cannot be "
+"converted to UTF-8: %s\n"
 "\n"
-"Your filesystem probably stores files in an encoding other than UTF-8 and you didn't tell GLib about this. Please set the environment variable G_FILENAME_ENCODING."
+"Your filesystem probably stores files in an encoding other than UTF-8 and "
+"you didn't tell GLib about this. Please set the environment variable "
+"G_FILENAME_ENCODING."
 msgstr ""
 "å?«æ?? GIMP å??äººçµ?æ??æª?ç??ç?®é??ç??å??ç¨±ç?¡æ³?è½?æ??è?³ UTF-8ï¼?%s\n"
 "\n"
 "æ??å?¯è?½ç??å??å? æ?¯ï¼?æª?æ¡?ç³»çµ±ä½¿ç?¨äº? UTF-8 ä»¥å¤?ç??ç·¨ç¢¼ä½?ç?ºæª?æ¡?å??ç¨±ï¼?è??ä¸?ä½ æ²?æ??æ£ç¢ºè¨å®?ä¾?é??ç?¥ Glibã??è«?è¨å®?ç?°å¢?è®?æ?¸ G_FILENAME_ENCODINGã??"
 
+#. show versions of libraries used by GIMP
 #: ../app/version.c:64
 #, c-format
 msgid "using %s version %s (compiled against version %s)"
 msgstr "æ£å?¨ä½¿ç?¨ %s ç??æ?¬ %sï¼?æ ¹æ??ç??æ?¬ %s ç·¨è¯ï¼?"
 
-#: ../app/version.c:127
-#: ../tools/gimp-remote.c:94
+#: ../app/version.c:127 ../tools/gimp-remote.c:94
 #, c-format
 msgid "%s version %s"
 msgstr "%s ç??æ?¬ %s"
 
-#: ../app/actions/actions.c:109
-#: ../app/dialogs/dialogs.c:353
+#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:353
 #: ../app/widgets/gimpbrusheditor.c:89
 msgid "Brush Editor"
 msgstr "ç?å?·ç·¨è¼¯å?¨"
 
-#: ../app/actions/actions.c:112
-#: ../app/core/gimp.c:953
-#: ../app/dialogs/dialogs.c:282
-#: ../app/dialogs/preferences-dialog.c:2720
+#. initialize the list of gimp brushes
+#: ../app/actions/actions.c:112 ../app/core/gimp.c:953
+#: ../app/dialogs/dialogs.c:282 ../app/dialogs/preferences-dialog.c:2718
 msgid "Brushes"
 msgstr "ç?å?·"
 
-#: ../app/actions/actions.c:115
-#: ../app/dialogs/dialogs.c:292
+#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:292
 msgid "Buffers"
 msgstr "ç·©è¡?å??"
 
-#: ../app/actions/actions.c:118
-#: ../app/dialogs/dialogs.c:311
+#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:311
 msgid "Channels"
 msgstr "è?²ç??"
 
-#: ../app/actions/actions.c:121
-#: ../app/dialogs/convert-dialog.c:174
+#: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174
 #: ../app/dialogs/dialogs.c:319
 msgid "Colormap"
 msgstr "é¡?è?²å°?æ??è¡¨"
@@ -264,8 +269,7 @@ msgstr "çµ?æ??"
 msgid "Context"
 msgstr "é??è?¯"
 
-#: ../app/actions/actions.c:130
-#: ../app/dialogs/dialogs.c:275
+#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:275
 msgid "Pointer Information"
 msgstr "é¼ æ¨?è³?è¨?"
 
@@ -285,8 +289,8 @@ msgstr "å??é§?"
 msgid "Dockable"
 msgstr "å?¯å??é§?"
 
-#: ../app/actions/actions.c:145
-#: ../app/dialogs/dialogs.c:294
+#. Document History
+#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:294
 #: ../app/dialogs/preferences-dialog.c:1573
 msgid "Document History"
 msgstr "æ??ä»¶è¨?é??"
@@ -295,13 +299,12 @@ msgstr "æ??ä»¶è¨?é??"
 msgid "Drawable"
 msgstr "å?¯ç¹ªç?©ä»¶"
 
-#: ../app/actions/actions.c:151
-#: ../app/dialogs/dialogs.c:300
+#. Some things do not have grids, so just list
+#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:300
 msgid "Paint Dynamics"
 msgstr "ç?å?·å??æ??"
 
-#: ../app/actions/actions.c:154
-#: ../app/dialogs/dialogs.c:357
+#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:357
 #: ../app/widgets/gimpdynamicseditor.c:94
 msgid "Paint Dynamics Editor"
 msgstr "ç?å?·å??æ??ç·¨è¼¯å?¨"
@@ -310,8 +313,7 @@ msgstr "ç?å?·å??æ??ç·¨è¼¯å?¨"
 msgid "Edit"
 msgstr "ç·¨è¼¯"
 
-#: ../app/actions/actions.c:160
-#: ../app/dialogs/dialogs.c:271
+#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:271
 msgid "Error Console"
 msgstr "é?¯èª¤è¨?æ?¯"
 
@@ -319,33 +321,29 @@ msgstr "é?¯èª¤è¨?æ?¯"
 msgid "File"
 msgstr "æª?æ¡?"
 
-#: ../app/actions/actions.c:166
-#: ../app/dialogs/dialogs.c:290
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:290
+#: ../app/dialogs/preferences-dialog.c:2738
 msgid "Fonts"
 msgstr "å?å??"
 
-#: ../app/actions/actions.c:169
-#: ../app/dialogs/dialogs.c:361
-#: ../app/widgets/gimpgradienteditor.c:275
+#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:361
+#: ../app/widgets/gimpgradienteditor.c:273
 msgid "Gradient Editor"
 msgstr "æ¼¸è®?è?²ç·¨è¼¯å?¨"
 
-#: ../app/actions/actions.c:172
-#: ../app/core/gimp.c:973
-#: ../app/dialogs/dialogs.c:286
-#: ../app/dialogs/preferences-dialog.c:2736
+#. initialize the list of gimp gradients
+#: ../app/actions/actions.c:172 ../app/core/gimp.c:973
+#: ../app/dialogs/dialogs.c:286 ../app/dialogs/preferences-dialog.c:2734
 msgid "Gradients"
 msgstr "æ¼¸è®?è?²"
 
-#: ../app/actions/actions.c:175
-#: ../app/core/gimp.c:983
+#. initialize the list of gimp tool presets
+#: ../app/actions/actions.c:175 ../app/core/gimp.c:983
 #: ../app/dialogs/dialogs.c:302
 msgid "Tool Presets"
 msgstr "å·¥å?·é ?è¨"
 
-#: ../app/actions/actions.c:178
-#: ../app/dialogs/dialogs.c:369
+#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:369
 #: ../app/widgets/gimptoolpreseteditor.c:75
 msgid "Tool Preset Editor"
 msgstr "å·¥å?·é ?è¨ç·¨è¼¯å?¨"
@@ -358,49 +356,42 @@ msgstr "æ±?å?©"
 msgid "Image"
 msgstr "å??ç??"
 
-#: ../app/actions/actions.c:187
-#: ../app/dialogs/dialogs.c:280
+#. list & grid views
+#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:280
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../app/actions/actions.c:190
-#: ../app/dialogs/dialogs.c:307
+#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:307
 #: ../app/dialogs/resize-dialog.c:287
 msgid "Layers"
 msgstr "å??å±¤"
 
-#: ../app/actions/actions.c:193
-#: ../app/dialogs/dialogs.c:365
-#: ../app/widgets/gimppaletteeditor.c:152
+#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:365
+#: ../app/widgets/gimppaletteeditor.c:145
 msgid "Palette Editor"
 msgstr "èª¿è?²ç?¤ç·¨è¼¯å?¨"
 
-#: ../app/actions/actions.c:196
-#: ../app/core/gimp.c:968
-#: ../app/dialogs/dialogs.c:288
-#: ../app/dialogs/preferences-dialog.c:2732
+#. initialize the list of gimp palettes
+#: ../app/actions/actions.c:196 ../app/core/gimp.c:968
+#: ../app/dialogs/dialogs.c:288 ../app/dialogs/preferences-dialog.c:2730
 msgid "Palettes"
 msgstr "èª¿è?²ç?¤"
 
-#: ../app/actions/actions.c:199
-#: ../app/core/gimp.c:963
-#: ../app/dialogs/dialogs.c:284
-#: ../app/dialogs/preferences-dialog.c:2728
+#. initialize the list of gimp patterns
+#: ../app/actions/actions.c:199 ../app/core/gimp.c:963
+#: ../app/dialogs/dialogs.c:284 ../app/dialogs/preferences-dialog.c:2726
 msgid "Patterns"
 msgstr "å??æ¨£"
 
-#: ../app/actions/actions.c:202
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2742
 msgid "Plug-Ins"
 msgstr "å¤?æ??ç¨?å¼?"
 
-#: ../app/actions/actions.c:205
-#: ../app/core/gimpchannel.c:385
+#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:385
 msgid "Quick Mask"
 msgstr "å¿«é??é?®ç½©"
 
-#: ../app/actions/actions.c:208
-#: ../app/dialogs/dialogs.c:335
+#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:335
 msgid "Sample Points"
 msgstr "å??æ¨£é»?"
 
@@ -408,8 +399,8 @@ msgstr "å??æ¨£é»?"
 msgid "Select"
 msgstr "é?¸å??å??å??"
 
-#: ../app/actions/actions.c:214
-#: ../app/core/gimp.c:988
+#. initialize the template list
+#: ../app/actions/actions.c:214 ../app/core/gimp.c:988
 #: ../app/dialogs/dialogs.c:296
 msgid "Templates"
 msgstr "ç¯?æ?¬"
@@ -422,21 +413,17 @@ msgstr "æ??å?å·¥å?·"
 msgid "Text Editor"
 msgstr "æ??å?ç·¨è¼¯å?¨"
 
-#: ../app/actions/actions.c:223
-#: ../app/dialogs/dialogs.c:263
-#: ../app/dialogs/preferences-dialog.c:1854
-#: ../app/gui/gui.c:428
+#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:263
+#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:425
 msgid "Tool Options"
 msgstr "å·¥å?·é?¸é ?"
 
-#: ../app/actions/actions.c:226
-#: ../app/widgets/gimptoolbox.c:927
+#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:181
 msgid "Tools"
 msgstr "å·¥å?·ç®±"
 
-#: ../app/actions/actions.c:229
-#: ../app/dialogs/dialogs.c:315
-#: ../app/tools/gimpvectortool.c:162
+#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:315
+#: ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "è·¯å¾?"
 
@@ -448,15 +435,17 @@ msgstr "é¡¯ç¤º"
 msgid "Windows"
 msgstr "Windows"
 
+#. value description and new value shown in the status bar
 #: ../app/actions/actions.c:584
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %.2f"
-msgstr "$ %.2f"
+msgstr "%s: %.2f"
 
+#. value description and new value shown in the status bar
 #: ../app/actions/actions.c:610
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %d"
-msgstr "%s (%s)"
+msgstr "%s: %d"
 
 #: ../app/actions/brush-editor-actions.c:42
 msgctxt "brush-editor-action"
@@ -686,7 +675,7 @@ msgstr "è®?é??å??è?²ç??ç§»å?°è?²ç??å ?ç??ç??æ??ä¸?å±¤"
 #: ../app/actions/channels-actions.c:108
 msgctxt "channels-action"
 msgid "Channel to Sele_ction"
-msgstr "è?²ç??è½?ç?ºé?¸æ??å??å??(_C)"
+msgstr "è?²ç??è½?ç?ºé?¸å??å??å??(_C)"
 
 #: ../app/actions/channels-actions.c:109
 msgctxt "channels-action"
@@ -721,7 +710,7 @@ msgstr "å??é?¸å??å??å??ç??äº¤é??(_I)"
 #: ../app/actions/channels-actions.c:127
 msgctxt "channels-action"
 msgid "Intersect this channel with the current selection"
-msgstr "è¨?ç®?é??å??è?²ç??å??ç?®å??é?¸æ??å??å??ç??äº¤é??å??å??"
+msgstr "è¨?ç®?é??å??è?²ç??å??ç?®å??é?¸å??å??å??ç??äº¤é??"
 
 #: ../app/actions/channels-commands.c:85
 #: ../app/actions/channels-commands.c:402
@@ -741,8 +730,7 @@ msgstr "ä¿®æ?¹è?²ç??é¡?è?²"
 msgid "_Fill opacity:"
 msgstr "å¡«è?²ä¸?é??æ??åº¦(_F):"
 
-#: ../app/actions/channels-commands.c:116
-#: ../app/core/gimpchannel.c:271
+#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:271
 #: ../app/widgets/gimpchanneltreeview.c:334
 msgid "Channel"
 msgstr "è?²ç??"
@@ -761,8 +749,7 @@ msgstr "æ?°å¢?è?²ç??é?¸é ?"
 msgid "New Channel Color"
 msgstr "æ?°å¢?è?²ç??é¡?è?²"
 
-#: ../app/actions/channels-commands.c:244
-#: ../app/core/gimpimage-new.c:252
+#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:252
 #: ../app/display/gimpdisplayshell-dnd.c:599
 #: ../app/widgets/gimpchanneltreeview.c:261
 #: ../app/widgets/gimplayertreeview.c:785
@@ -960,17 +947,14 @@ msgctxt "cursor-info-action"
 msgid "Use the composite color of all visible layers"
 msgstr "ä½¿ç?¨æ??æ??ç??å¾?è¦?å??å±¤ç??è¤?å??è?²"
 
-#: ../app/actions/data-commands.c:104
-#: ../app/actions/documents-commands.c:343
-#: ../app/actions/file-commands.c:194
-#: ../app/dialogs/file-open-dialog.c:233
+#: ../app/actions/data-commands.c:104 ../app/actions/documents-commands.c:343
+#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:233
 #: ../app/dialogs/file-open-dialog.c:278
 #: ../app/dialogs/file-open-location-dialog.c:213
 #: ../app/dialogs/file-open-location-dialog.c:225
 #: ../app/display/gimpdisplayshell-dnd.c:552
-#: ../app/widgets/gimplayertreeview.c:745
-#: ../app/widgets/gimptoolbox-dnd.c:178
-#: ../app/widgets/gimptoolbox.c:1222
+#: ../app/widgets/gimplayertreeview.c:745 ../app/widgets/gimptoolbox-dnd.c:180
+#: ../app/widgets/gimptoolbox.c:867
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -982,12 +966,9 @@ msgstr ""
 "%s"
 
 #: ../app/actions/data-commands.c:133
-#: ../app/core/gimpbrushgenerated-load.c:125
-#: ../app/core/gimpimage.c:1648
-#: ../app/core/gimppalette-import.c:210
-#: ../app/core/gimppalette-load.c:223
-#: ../app/core/gimppalette.c:379
-#: ../app/dialogs/palette-import-dialog.c:771
+#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1538
+#: ../app/core/gimppalette-import.c:210 ../app/core/gimppalette-load.c:223
+#: ../app/core/gimppalette.c:398 ../app/dialogs/palette-import-dialog.c:771
 #: ../app/widgets/gimpdnd-xds.c:94
 msgid "Untitled"
 msgstr "æ?ªå?½å??"
@@ -1003,7 +984,8 @@ msgstr "å?ªé?¤ â??%sâ??ï¼?"
 
 #: ../app/actions/data-commands.c:264
 #, c-format
-msgid "Are you sure you want to remove '%s' from the list and delete it on disk?"
+msgid ""
+"Are you sure you want to remove '%s' from the list and delete it on disk?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å??æ??å?¨æ¸?å?®å??ç£?ç¢?è£?å?ªé?¤â??%sâ??ï¼?"
 
 #: ../app/actions/dialogs-actions.c:44
@@ -1362,8 +1344,7 @@ msgid "About GIMP"
 msgstr "é??æ?¼ GIMP"
 
 #: ../app/actions/dialogs-actions.c:304
-#: ../app/dialogs/preferences-dialog.c:1943
-#: ../app/widgets/gimptoolbox.c:770
+#: ../app/dialogs/preferences-dialog.c:1943 ../app/widgets/gimptoolbox.c:597
 msgid "Toolbox"
 msgstr "å·¥å?·ç®±"
 
@@ -1509,8 +1490,7 @@ msgctxt "tab-style"
 msgid "St_atus & Text"
 msgstr "ç??æ??å??æ??å?(_A)"
 
-#: ../app/actions/dockable-actions.c:116
-#: ../app/widgets/widgets-enums.c:224
+#: ../app/actions/dockable-actions.c:116 ../app/widgets/widgets-enums.c:224
 msgctxt "tab-style"
 msgid "Automatic"
 msgstr "è?ªå??"
@@ -1647,7 +1627,9 @@ msgid "Clear the Recent Documents list?"
 msgstr "æ?¯å?¦æ¸?é?¤æ??è¿?ä½¿ç?¨ç??æ??ä»¶æ¸?å?®ï¼?"
 
 #: ../app/actions/documents-commands.c:218
-msgid "Clearing the document history will permanently remove all images from the recent documents list."
+msgid ""
+"Clearing the document history will permanently remove all images from the "
+"recent documents list."
 msgstr "æ¸?é?¤æ??ä»¶æ·å?²è¨?é??æ??æ°¸ä¹?å?°ç§»é?¤æ??è¿?ä½¿ç?¨ç??å??ç??æ¸?å?®ã??"
 
 #: ../app/actions/drawable-actions.c:45
@@ -1663,7 +1645,7 @@ msgstr "è?ªå??å°?æ¯?åº¦å¢?å¼·"
 #: ../app/actions/drawable-actions.c:51
 msgctxt "drawable-action"
 msgid "In_vert"
-msgstr "å??ç?¸(_V)"
+msgstr "è² ç??æ??æ??(_V)"
 
 #: ../app/actions/drawable-actions.c:52
 msgctxt "drawable-action"
@@ -1710,6 +1692,7 @@ msgctxt "drawable-action"
 msgid "Toggle the linked state"
 msgstr "å??æ??å·²é?£çµ?ç??æ??"
 
+#. GIMP_STOCK_LOCK
 #: ../app/actions/drawable-actions.c:87
 msgctxt "drawable-action"
 msgid "L_ock pixels"
@@ -1777,7 +1760,7 @@ msgstr "äº®åº¦ç?å??ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
 
 #: ../app/actions/drawable-commands.c:87
 msgid "Invert does not operate on indexed layers."
-msgstr "å??ç?¸è?²å½©ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
+msgstr "è² ç??æ??æ??ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
 
 #: ../app/actions/drawable-commands.c:111
 msgid "White Balance operates only on RGB color layers."
@@ -1926,7 +1909,7 @@ msgstr "æ¸?é?¤å¾©å??è¨?é??(_C)"
 #: ../app/actions/edit-actions.c:98
 msgctxt "edit-action"
 msgid "Remove all operations from the undo history"
-msgstr "ç§»é?¤å¾©å??è¨?é??ç??æ??æ??æ??ä½?ç¨?åº?"
+msgstr "ç§»é?¤å¾©å??è¨?é??ä¸ç??æ??æ??æ??ä½?ç¨?åº?"
 
 #: ../app/actions/edit-actions.c:103
 msgctxt "edit-action"
@@ -1958,6 +1941,7 @@ msgctxt "edit-action"
 msgid "Copy the selected pixels to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??å??ç´ å?°å?ªè²¼ç°¿"
 
+#. GIMP_STOCK_COPY_VISIBLE,
 #: ../app/actions/edit-actions.c:122
 msgctxt "edit-action"
 msgid "Copy _Visible"
@@ -1993,8 +1977,7 @@ msgctxt "edit-action"
 msgid "From _Clipboard"
 msgstr "å¾?å?ªè²¼ç°¿(_C)"
 
-#: ../app/actions/edit-actions.c:142
-#: ../app/actions/edit-actions.c:148
+#: ../app/actions/edit-actions.c:142 ../app/actions/edit-actions.c:148
 msgctxt "edit-action"
 msgid "Create a new image from the content of the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿ç??å?§å®¹å»ºç«?æ?°ç??å??ç??"
@@ -2034,6 +2017,7 @@ msgctxt "edit-action"
 msgid "Copy the selected pixels to a named buffer"
 msgstr "è¤?è£½é?¸å??ç??å??ç´ å?°ä¸?å?½å??ç??ç·©è¡?å??"
 
+#. GIMP_STOCK_COPY_VISIBLE,
 #: ../app/actions/edit-actions.c:171
 msgctxt "edit-action"
 msgid "Copy _Visible Named..."
@@ -2127,7 +2111,7 @@ msgstr "æ¸?é?¤å¾©å??è¨?é??"
 
 #: ../app/actions/edit-commands.c:162
 msgid "Really clear image's undo history?"
-msgstr "æ?¯å?¦æ¸?é?¤å??ç??ç??å¾©å??è¨?é??ï¼?"
+msgstr "ç??ç??è¦?æ¸?é?¤å??ç??ç??å¾©å??è¨?é??å??ï¼?"
 
 #: ../app/actions/edit-commands.c:175
 #, c-format
@@ -2138,21 +2122,17 @@ msgstr "æ¸?é?¤é??å??å??ç??ç??å¾©å??è¨?é??å?¯ç?²å¾? %s è¨?æ?¶é«?ã??"
 msgid "Cut pixels to the clipboard"
 msgstr "å?ªä¸?å??ç´ å?°å?ªè²¼ç°¿"
 
-#: ../app/actions/edit-commands.c:235
-#: ../app/actions/edit-commands.c:264
+#: ../app/actions/edit-commands.c:235 ../app/actions/edit-commands.c:264
 msgid "Copied pixels to the clipboard"
 msgstr "è¤?è£½å??ç´ å?°å?ªè²¼ç°¿"
 
-#: ../app/actions/edit-commands.c:324
-#: ../app/actions/edit-commands.c:359
+#: ../app/actions/edit-commands.c:324 ../app/actions/edit-commands.c:359
 #: ../app/actions/edit-commands.c:538
 msgid "There is no image data in the clipboard to paste."
 msgstr "å?ªè²¼ç°¿ä¸æ²?æ??å??ç??è³?æ??å?¯è²¼ä¸?ã??"
 
-#: ../app/actions/edit-commands.c:347
-#: ../app/core/gimpbrushclipboard.c:180
-#: ../app/core/gimppatternclipboard.c:180
-#: ../app/widgets/gimpclipboard.c:345
+#: ../app/actions/edit-commands.c:347 ../app/core/gimpbrushclipboard.c:180
+#: ../app/core/gimppatternclipboard.c:180 ../app/widgets/gimpclipboard.c:345
 msgid "Clipboard"
 msgstr "å?ªè²¼ç°¿"
 
@@ -2160,8 +2140,7 @@ msgstr "å?ªè²¼ç°¿"
 msgid "Cut Named"
 msgstr "å?ªä¸?ä¸¦å?½å??"
 
-#: ../app/actions/edit-commands.c:376
-#: ../app/actions/edit-commands.c:417
+#: ../app/actions/edit-commands.c:376 ../app/actions/edit-commands.c:417
 #: ../app/actions/edit-commands.c:437
 msgid "Enter a name for this buffer"
 msgstr "ç?ºæ¤ç·©è¡?å??å?½å??"
@@ -2178,8 +2157,7 @@ msgstr "è¤?è£½å?¯è¦?ç??ä¸¦å?½å??"
 msgid "There is no active layer or channel to cut from."
 msgstr "ç?®å??æ²?æ??ä»»ä½?ä½¿ç?¨ä¸ç??å??å±¤æ??è??è?²ç??å?¯ä»¥å?ªä¸?ã??"
 
-#: ../app/actions/edit-commands.c:560
-#: ../app/actions/edit-commands.c:592
+#: ../app/actions/edit-commands.c:560 ../app/actions/edit-commands.c:592
 #: ../app/actions/edit-commands.c:616
 msgid "(Unnamed Buffer)"
 msgstr "(æ?ªå?½å??ç??ç·©è¡?å??)"
@@ -2363,7 +2341,9 @@ msgstr "å?²å?ç?ºè¤?æ?¬(_Y)..."
 
 #: ../app/actions/file-actions.c:135
 msgctxt "file-action"
-msgid "Save a copy of this image, without affecting the source file (if any) or the current state of the image"
+msgid ""
+"Save a copy of this image, without affecting the source file (if any) or the "
+"current state of the image"
 msgstr "å?²å?é??å??å??ç??ç??è¤?æ?¬ï¼?è??ä¸?å½±é?¿ä¾?æº?æª?æ¡?ï¼?å¦?æ??æ??ç??è©±ï¼?æ??ç?¶å??å??ç??ç??ç??æ??"
 
 #: ../app/actions/file-actions.c:140
@@ -2420,8 +2400,7 @@ msgstr "è¦?å¯« %s"
 msgid "Export to"
 msgstr "å?¯å?ºå?°"
 
-#: ../app/actions/file-commands.c:112
-#: ../app/actions/file-commands.c:475
+#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:475
 #: ../app/dialogs/file-open-dialog.c:77
 msgid "Open Image"
 msgstr "é??å??å??ç??"
@@ -2434,8 +2413,7 @@ msgstr "é??å??å??ç??æ??ç?ºå??å±¤"
 msgid "No changes need to be saved"
 msgstr "æ²?æ??é??è¦?å?²å?ç??æ?´æ?¹"
 
-#: ../app/actions/file-commands.c:272
-#: ../app/dialogs/file-save-dialog.c:95
+#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95
 msgid "Save Image"
 msgstr "å?²å?å??ç??"
 
@@ -2465,7 +2443,9 @@ msgid "Revert '%s' to '%s'?"
 msgstr "æ?¯å?¦å°? â??%sâ?? é??å??ç?º â??%sâ??ï¼?"
 
 #: ../app/actions/file-commands.c:427
-msgid "By reverting the image to the state saved on disk, you will lose all changes, including all undo information."
+msgid ""
+"By reverting the image to the state saved on disk, you will lose all "
+"changes, including all undo information."
 msgstr "å°?å??ç??é??å??ç??è©±ï¼?æ??å¤±å?»æ??æ??å·²æ?´æ?¹ç??è³?æ??ï¼?å??æ?¬æ??æ??å??ç??ç??æ?´æ?¹ç´?é??ã??"
 
 #: ../app/actions/file-commands.c:638
@@ -2935,8 +2915,7 @@ msgstr "ç·¨è¼¯æ¼¸è®?è?²"
 msgid "Save '%s' as POV-Ray"
 msgstr "å°? â??%sâ?? å?¦å?ç?º POV-Ray"
 
-#: ../app/actions/help-actions.c:37
-#: ../app/actions/help-actions.c:40
+#: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40
 msgctxt "help-action"
 msgid "_Help"
 msgstr "èªªæ??(_H)"
@@ -2956,8 +2935,7 @@ msgctxt "help-action"
 msgid "Show the help for a specific user interface item"
 msgstr "é¡¯ç¤ºç?¹å®?ä½¿ç?¨è??ä»?é?¢é ?ç?®ç??æ±?å?©"
 
-#: ../app/actions/image-actions.c:48
-#: ../app/actions/image-actions.c:52
+#: ../app/actions/image-actions.c:48 ../app/actions/image-actions.c:52
 msgctxt "image-action"
 msgid "Image Menu"
 msgstr "ã??å??ç??ã??é?¸å?®"
@@ -3075,7 +3053,7 @@ msgstr "å?ªè£?å?ºé?¸å??å??å??(_C)"
 #: ../app/actions/image-actions.c:104
 msgctxt "image-action"
 msgid "Crop the image to the extents of the selection"
-msgstr "å?¨å??ç??ä¸å?ªè£?å?ºé?¸æ??å??å??å¤§å°?ç??é?¨å??"
+msgstr "å?¨å??ç??ä¸å?ªè£?å?ºé?¸å??å??å??å¤§å°?ç??é?¨å??"
 
 #: ../app/actions/image-actions.c:109
 msgctxt "image-action"
@@ -3211,8 +3189,7 @@ msgstr "å??å·¦æ??è½? 90 åº¦è©²å??ç??"
 msgid "Set Image Canvas Size"
 msgstr "è¨å®?å??ç??ç??ç?«å¸?å°ºå¯¸"
 
-#: ../app/actions/image-commands.c:265
-#: ../app/actions/image-commands.c:289
+#: ../app/actions/image-commands.c:265 ../app/actions/image-commands.c:289
 #: ../app/actions/image-commands.c:581
 msgid "Resizing"
 msgstr "ç¸®æ?¾ä¸"
@@ -3230,16 +3207,13 @@ msgstr "ç¿»è½?ä¸"
 
 #: ../app/actions/image-commands.c:402
 #: ../app/pdb/drawable-transform-cmds.c:547
-#: ../app/pdb/drawable-transform-cmds.c:628
-#: ../app/pdb/image-cmds.c:536
-#: ../app/pdb/item-transform-cmds.c:423
-#: ../app/pdb/transform-tools-cmds.c:224
+#: ../app/pdb/drawable-transform-cmds.c:628 ../app/pdb/image-cmds.c:536
+#: ../app/pdb/item-transform-cmds.c:423 ../app/pdb/transform-tools-cmds.c:224
 #: ../app/tools/gimprotatetool.c:122
 msgid "Rotating"
 msgstr "æ??è½?ä¸"
 
-#: ../app/actions/image-commands.c:428
-#: ../app/actions/layers-commands.c:691
+#: ../app/actions/image-commands.c:428 ../app/actions/layers-commands.c:691
 msgid "Cannot crop because the current selection is empty."
 msgstr "ç?¡æ³?è£?å?ªï¼?å? ç?ºç?®å??é?¸å??å??å??æ?¯ç©ºç??ã??"
 
@@ -3251,18 +3225,14 @@ msgstr "æ?¹è®?æ??å?°ç??å¤§å°?"
 msgid "Scale Image"
 msgstr "ç¸®æ?¾å??ç??"
 
-#: ../app/actions/image-commands.c:680
-#: ../app/actions/layers-commands.c:1145
+#. Scaling
+#: ../app/actions/image-commands.c:680 ../app/actions/layers-commands.c:1145
 #: ../app/dialogs/preferences-dialog.c:1899
 #: ../app/pdb/drawable-transform-cmds.c:708
-#: ../app/pdb/drawable-transform-cmds.c:786
-#: ../app/pdb/image-cmds.c:408
-#: ../app/pdb/image-cmds.c:444
-#: ../app/pdb/item-transform-cmds.c:512
-#: ../app/pdb/layer-cmds.c:333
-#: ../app/pdb/layer-cmds.c:378
-#: ../app/pdb/transform-tools-cmds.c:302
-#: ../app/tools/gimpscaletool.c:106
+#: ../app/pdb/drawable-transform-cmds.c:786 ../app/pdb/image-cmds.c:408
+#: ../app/pdb/image-cmds.c:444 ../app/pdb/item-transform-cmds.c:512
+#: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378
+#: ../app/pdb/transform-tools-cmds.c:302 ../app/tools/gimpscaletool.c:106
 msgid "Scaling"
 msgstr "ç¸®æ?¾"
 
@@ -3366,8 +3336,7 @@ msgctxt "layers-action"
 msgid "Edit the layer's name"
 msgstr "ç·¨è¼¯å??å±¤å??ç¨±"
 
-#: ../app/actions/layers-actions.c:82
-#: ../app/actions/layers-actions.c:598
+#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:598
 msgctxt "layers-action"
 msgid "_New Layer..."
 msgstr "æ?°å¢?å??å±¤(_N)..."
@@ -3377,8 +3346,7 @@ msgctxt "layers-action"
 msgid "Create a new layer and add it to the image"
 msgstr "å»ºç«?æ?°ç??å??å±¤ä¸¦å°?å®?å? å?¥å??ç??"
 
-#: ../app/actions/layers-actions.c:88
-#: ../app/actions/layers-actions.c:599
+#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:599
 msgctxt "layers-action"
 msgid "_New Layer"
 msgstr "æ?°å¢?å??å±¤(_N)"
@@ -3681,7 +3649,7 @@ msgstr "é?®ç½©è½?ç?ºé?¸å??å??å??(_M)"
 #: ../app/actions/layers-actions.c:285
 msgctxt "layers-action"
 msgid "Replace the selection with the layer mask"
-msgstr "ç?¨å??å±¤é?®ç½©å??ä»£é?¸æ??å??å??"
+msgstr "ç?¨å??å±¤é?®ç½©å??ä»£é?¸å??å??å??"
 
 #: ../app/actions/layers-actions.c:290
 msgctxt "layers-action"
@@ -3691,10 +3659,9 @@ msgstr "å? å?¥è?³é?¸å??å??å??(_A)"
 #: ../app/actions/layers-actions.c:291
 msgctxt "layers-action"
 msgid "Add the layer mask to the current selection"
-msgstr "å°?å??å±¤é?®ç½©å? å?¥è?³ç?®å??ç??é?¸æ??å??å??"
+msgstr "å°?å??å±¤é?®ç½©å? å?¥è?³ç?®å??ç??é?¸å??å??å??"
 
-#: ../app/actions/layers-actions.c:296
-#: ../app/actions/layers-actions.c:325
+#: ../app/actions/layers-actions.c:296 ../app/actions/layers-actions.c:325
 msgctxt "layers-action"
 msgid "_Subtract from Selection"
 msgstr "å¾?é?¸å??å??å??ç§»é?¤(_S)"
@@ -3702,10 +3669,9 @@ msgstr "å¾?é?¸å??å??å??ç§»é?¤(_S)"
 #: ../app/actions/layers-actions.c:297
 msgctxt "layers-action"
 msgid "Subtract the layer mask from the current selection"
-msgstr "å¾?ç?®å??ç??é?¸æ??å??å??å?ªé?¤å??å±¤é?®ç½©"
+msgstr "å¾?ç?®å??ç??é?¸å??å??å??å?ªé?¤å??å±¤é?®ç½©"
 
-#: ../app/actions/layers-actions.c:302
-#: ../app/actions/layers-actions.c:332
+#: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:332
 msgctxt "layers-action"
 msgid "_Intersect with Selection"
 msgstr "å??é?¸å??å??å??ç??äº¤é??(_I)"
@@ -3785,17 +3751,22 @@ msgctxt "layers-action"
 msgid "Select the layer below the current layer"
 msgstr "é?¸å??å?¨ç?®å??å??å±¤ä¹?ä¸?ç??å??å±¤"
 
+#. Will be followed with e.g. "Shift-Click
+#. on thumbnail"
+#.
 #: ../app/actions/layers-actions.c:442
 #, fuzzy
 msgid "Shortcut: "
 msgstr "æ?·å¾?"
 
+#. Will be prepended with a modifier key
+#. string, e.g. "Shift"
+#.
 #: ../app/actions/layers-actions.c:447
 msgid "-Click on thumbnail in Layers dockable"
 msgstr ""
 
-#: ../app/actions/layers-actions.c:593
-#: ../app/actions/layers-actions.c:594
+#: ../app/actions/layers-actions.c:593 ../app/actions/layers-actions.c:594
 #, fuzzy
 msgctxt "layers-action"
 msgid "To _New Layer"
@@ -3809,13 +3780,11 @@ msgstr "å??å±¤å±¬æ?§"
 msgid "Edit Layer Attributes"
 msgstr "ç·¨è¼¯å??å±¤å±¬æ?§"
 
-#: ../app/actions/layers-commands.c:250
-#: ../app/core/gimplayer.c:265
+#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:265
 msgid "Layer"
 msgstr "å??å±¤"
 
-#: ../app/actions/layers-commands.c:252
-#: ../app/actions/layers-commands.c:320
+#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320
 #: ../app/widgets/gimpdrawabletreeview.c:337
 #: ../app/widgets/gimplayertreeview.c:846
 msgid "New Layer"
@@ -4161,7 +4130,7 @@ msgstr "æ??ç¹ª(_R)"
 #: ../app/actions/plug-in-actions.c:112
 msgctxt "plug-in-action"
 msgid "_Clouds"
-msgstr "é?²æ?µ(_C)"
+msgstr "é?²ç??(_C)"
 
 #: ../app/actions/plug-in-actions.c:114
 msgctxt "plug-in-action"
@@ -4334,12 +4303,12 @@ msgstr "å??æ¶?é?¸å??å??å??"
 #: ../app/actions/select-actions.c:62
 msgctxt "select-action"
 msgid "_Invert"
-msgstr "å??å??é?¸å??(_I)"
+msgstr "å??è½?(_I)"
 
 #: ../app/actions/select-actions.c:63
 msgctxt "select-action"
 msgid "Invert the selection"
-msgstr "é?¸å??å??å??æ?¬é?¸å??ç?¸å??ç??å??å??"
+msgstr "é?¸å??å??å??æ?¬ç?¸å??ç??å??å??"
 
 #: ../app/actions/select-actions.c:68
 msgctxt "select-action"
@@ -4399,7 +4368,7 @@ msgstr "é??æ¡?(_R)..."
 #: ../app/actions/select-actions.c:100
 msgctxt "select-action"
 msgid "Replace the selection by its border"
-msgstr "å°?é?¸æ??å??å??ä»¥å®?ç??é??æ¡?å??ä»£"
+msgstr "å°?é?¸å??å??å??ä»¥å®?ç??é??æ¡?å??ä»£"
 
 #: ../app/actions/select-actions.c:105
 msgctxt "select-action"
@@ -4437,7 +4406,7 @@ msgstr "ç¾½å??é?¸å??å??å??"
 
 #: ../app/actions/select-commands.c:159
 msgid "Feather selection by"
-msgstr "é?¸å??å??å??ç¾½å??ç¨?åº¦ï¼?"
+msgstr "é?¸å??å??å??é??ç·£ç¾½å??ç¨?åº¦ï¼?"
 
 #: ../app/actions/select-commands.c:196
 msgid "Shrink Selection"
@@ -4467,18 +4436,18 @@ msgstr "é?¸å??å??å??æ¡?ç·?å??"
 msgid "Border selection by"
 msgstr "é?¸å??å??å??æ¡?ç·?å??ç¨?åº¦:"
 
+#. Feather button
 #: ../app/actions/select-commands.c:279
 msgid "_Feather border"
 msgstr "ç¾½å??æ¡?ç·?(_F)"
 
+#. Edge lock button
 #: ../app/actions/select-commands.c:292
 msgid "_Lock selection to image edges"
 msgstr "å°?é?¸å??å??å??é??å®?å?¨å??ç??é??ç·£(_L)"
 
-#: ../app/actions/select-commands.c:342
-#: ../app/actions/select-commands.c:375
-#: ../app/actions/vectors-commands.c:386
-#: ../app/actions/vectors-commands.c:420
+#: ../app/actions/select-commands.c:342 ../app/actions/select-commands.c:375
+#: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420
 #: ../app/dialogs/stroke-dialog.c:289
 msgid "There is no active layer or channel to stroke to."
 msgstr "ç?®å??æ²?æ??ä»»ä½?ä½¿ç?¨ä¸ç??å??å±¤æ??è??è?²ç??å?¯ä»¥ç?¨ä¾?æ??é??ã??"
@@ -4561,7 +4530,8 @@ msgstr "å?ªé?¤ç¯?æ?¬"
 
 #: ../app/actions/templates-commands.c:238
 #, c-format
-msgid "Are you sure you want to delete template '%s' from the list and from disk?"
+msgid ""
+"Are you sure you want to delete template '%s' from the list and from disk?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å??æ??å?¨æ¸?å?®å??ç£?ç¢?è£?å?ªé?¤ç¯?æ?¬â??%sâ??ï¼?"
 
 #: ../app/actions/text-editor-actions.c:43
@@ -4585,7 +4555,6 @@ msgid "Clear all text"
 msgstr "æ¸?é?¤æ??æ??æ??å?"
 
 #: ../app/actions/text-editor-actions.c:58
-#, fuzzy
 msgctxt "text-editor-action"
 msgid "LTR"
 msgstr "å·¦è?³å?³"
@@ -4596,7 +4565,6 @@ msgid "From left to right"
 msgstr "ç?±å·¦è?³å?³"
 
 #: ../app/actions/text-editor-actions.c:64
-#, fuzzy
 msgctxt "text-editor-action"
 msgid "RTL"
 msgstr "å?³è?³å·¦"
@@ -4612,100 +4580,91 @@ msgid "Open Text File (UTF-8)"
 msgstr "é??å??æ??å?æª? (UTF-8)"
 
 #: ../app/actions/text-editor-commands.c:143
-#: ../app/actions/text-tool-commands.c:226
-#: ../app/config/gimpconfig-file.c:58
-#: ../app/core/gimpbrush-load.c:140
-#: ../app/core/gimpbrush-load.c:422
+#: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58
+#: ../app/core/gimpbrush-load.c:140 ../app/core/gimpbrush-load.c:422
 #: ../app/core/gimpbrushgenerated-load.c:73
-#: ../app/core/gimpbrushpipe-load.c:81
-#: ../app/core/gimpcurve-load.c:54
-#: ../app/core/gimpgradient-load.c:62
-#: ../app/core/gimppalette-load.c:76
-#: ../app/core/gimppalette-load.c:273
-#: ../app/core/gimppalette-load.c:319
-#: ../app/core/gimppalette-load.c:376
-#: ../app/core/gimppalette-load.c:466
-#: ../app/core/gimppalette-load.c:633
-#: ../app/core/gimppattern-load.c:76
-#: ../app/tools/gimpcurvestool.c:637
-#: ../app/tools/gimplevelstool.c:747
+#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54
+#: ../app/core/gimpgradient-load.c:62 ../app/core/gimppalette-load.c:76
+#: ../app/core/gimppalette-load.c:273 ../app/core/gimppalette-load.c:319
+#: ../app/core/gimppalette-load.c:376 ../app/core/gimppalette-load.c:466
+#: ../app/core/gimppalette-load.c:633 ../app/core/gimppattern-load.c:76
+#: ../app/tools/gimpcurvestool.c:637 ../app/tools/gimplevelstool.c:747
 #: ../app/xcf/xcf.c:329
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "ç?¡æ³?é??å?? â??%sâ?? ä¾?è®?å??è³?æ??ï¼?%s"
 
-#: ../app/actions/text-tool-actions.c:49
+#: ../app/actions/text-tool-actions.c:50
 msgctxt "text-tool-action"
 msgid "Text Tool Menu"
 msgstr "ã??æ??å?å·¥å?·ã??é?¸å?®"
 
-#: ../app/actions/text-tool-actions.c:53
-#, fuzzy
+#: ../app/actions/text-tool-actions.c:54
 msgctxt "text-tool-action"
 msgid "Input _Methods"
 msgstr "è¼¸å?¥æ³?(_M)"
 
-#: ../app/actions/text-tool-actions.c:57
+#: ../app/actions/text-tool-actions.c:58
 msgctxt "text-tool-action"
 msgid "Cu_t"
 msgstr "å?ªä¸?(_T)"
 
-#: ../app/actions/text-tool-actions.c:62
+#: ../app/actions/text-tool-actions.c:63
 msgctxt "text-tool-action"
 msgid "_Copy"
 msgstr "è¤?è£½(_C)"
 
-#: ../app/actions/text-tool-actions.c:67
+#: ../app/actions/text-tool-actions.c:68
 msgctxt "text-tool-action"
 msgid "_Paste"
 msgstr "è²¼ä¸?(_P)"
 
-#: ../app/actions/text-tool-actions.c:72
+#: ../app/actions/text-tool-actions.c:73
 msgctxt "text-tool-action"
 msgid "_Delete"
 msgstr "å?ªé?¤(_D)"
 
-#: ../app/actions/text-tool-actions.c:77
+#: ../app/actions/text-tool-actions.c:78
 msgctxt "text-tool-action"
 msgid "_Open text file..."
 msgstr "é??å??æ??å?æª?æ¡?(_O)..."
 
-#: ../app/actions/text-tool-actions.c:82
+#: ../app/actions/text-tool-actions.c:83
 msgctxt "text-tool-action"
 msgid "Cl_ear"
 msgstr "æ¸?é?¤(_E)"
 
-#: ../app/actions/text-tool-actions.c:83
+#: ../app/actions/text-tool-actions.c:84
 msgctxt "text-tool-action"
 msgid "Clear all text"
 msgstr "æ¸?é?¤æ??æ??æ??å?"
 
-#: ../app/actions/text-tool-actions.c:88
+#: ../app/actions/text-tool-actions.c:89
 msgctxt "text-tool-action"
 msgid "_Path from Text"
 msgstr "å¾?æ??å?å»ºç«?è·¯å¾?(_P)"
 
-#: ../app/actions/text-tool-actions.c:90
+#: ../app/actions/text-tool-actions.c:91
 msgctxt "text-tool-action"
 msgid "Create a path from the outlines of the current text"
 msgstr "å¾?ç?®å??æ??å?ç??è¼ªå»?å»ºç«?è·¯å¾?"
 
-#: ../app/actions/text-tool-actions.c:95
+#: ../app/actions/text-tool-actions.c:96
 msgctxt "text-tool-action"
 msgid "Text _along Path"
 msgstr "æ²¿ç??è·¯å¾?ç??æ??å?(_A)"
 
-#: ../app/actions/text-tool-actions.c:97
+#: ../app/actions/text-tool-actions.c:98
 msgctxt "text-tool-action"
 msgid "Bend the text along the currently active path"
 msgstr "æ²¿ç??ç?®å??ä½¿ç?¨ç??è·¯å¾?æ?æ?²æ??å?"
 
-#: ../app/actions/text-tool-actions.c:105
+#: ../app/actions/text-tool-actions.c:106
 msgctxt "text-tool-action"
 msgid "From left to right"
 msgstr "ç?±å·¦è?³å?³"
 
-#: ../app/actions/text-tool-actions.c:110
+#: ../app/actions/text-tool-actions.c:111
 msgctxt "text-tool-action"
 msgid "From right to left"
 msgstr "ç?±å?³è?³å·¦"
@@ -5065,6 +5024,7 @@ msgctxt "vectors-action"
 msgid "_Linked"
 msgstr "å·²é?£çµ?(_L)"
 
+#. GIMP_STOCK_LOCK
 #: ../app/actions/vectors-actions.c:159
 #, fuzzy
 msgctxt "vectors-action"
@@ -5126,8 +5086,7 @@ msgctxt "vectors-action"
 msgid "Selecti_on to Path"
 msgstr "é?¸å??è½?ç?ºè·¯å¾?(_O)"
 
-#: ../app/actions/vectors-actions.c:202
-#: ../app/actions/vectors-actions.c:208
+#: ../app/actions/vectors-actions.c:202 ../app/actions/vectors-actions.c:208
 msgctxt "vectors-action"
 msgid "Selection to path"
 msgstr "é?¸å??è½?ç?ºè·¯å¾?"
@@ -5155,8 +5114,7 @@ msgstr "è·¯å¾?å±¬æ?§"
 msgid "Edit Path Attributes"
 msgstr "ç·¨è¼¯è·¯å¾?å±¬æ?§"
 
-#: ../app/actions/vectors-commands.c:164
-#: ../app/vectors/gimpvectors.c:205
+#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207
 #: ../app/widgets/gimpvectorstreeview.c:252
 msgid "Path"
 msgstr "è·¯å¾?"
@@ -5169,9 +5127,8 @@ msgstr "æ?°å¢?è·¯å¾?"
 msgid "New Path Options"
 msgstr "æ?°å¢?è·¯å¾?é?¸é ?"
 
-#: ../app/actions/vectors-commands.c:392
-#: ../app/tools/gimpvectoroptions.c:198
-#: ../app/tools/gimpvectortool.c:1990
+#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:198
+#: ../app/tools/gimpvectortool.c:1982
 msgid "Stroke Path"
 msgstr "æ²¿ç??è·¯å¾?æ??é??"
 
@@ -5440,8 +5397,7 @@ msgctxt "view-zoom-action"
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../app/actions/view-actions.c:264
-#: ../app/actions/view-actions.c:276
+#: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276
 msgctxt "view-action"
 msgid "Zoom out"
 msgstr "æ??é? "
@@ -5451,8 +5407,7 @@ msgctxt "view-zoom-action"
 msgid "Zoom _In"
 msgstr "æ??è¿?(_I)"
 
-#: ../app/actions/view-actions.c:270
-#: ../app/actions/view-actions.c:282
+#: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282
 msgctxt "view-action"
 msgid "Zoom in"
 msgstr "æ??è¿?"
@@ -5676,7 +5631,8 @@ msgstr "é?±è??å??é§?å¼?å??å?¶ä»?å°?è©±ç??"
 
 #: ../app/actions/windows-actions.c:103
 msgctxt "windows-action"
-msgid "When enabled docks and other dialogs are hidden, leaving only image windows."
+msgid ""
+"When enabled docks and other dialogs are hidden, leaving only image windows."
 msgstr "ç?¶å??ç?¨æ?¬é?¸é ?ï¼?å??é§?å¼?å??å?¶ä»?ç??å°?è©±ç??æ??é?±è??ï¼?å?ªç??ä¸?å??ç??è¦?çª?ã??"
 
 #: ../app/actions/windows-actions.c:109
@@ -5686,7 +5642,9 @@ msgstr "å?®ä¸?è¦?çª?æ¨¡å¼?"
 
 #: ../app/actions/windows-actions.c:110
 msgctxt "windows-action"
-msgid "When enabled GIMP is in a single-window mode. Far from completely implemented!"
+msgid ""
+"When enabled GIMP is in a single-window mode. Far from completely "
+"implemented!"
 msgstr "ç?¶å??ç?¨æ?¬é?¸é ?ï¼?GIMP æ?¯å?¨å?®ä¸?è¦?çª?æ¨¡å¼?ã??"
 
 #: ../app/base/base-enums.c:23
@@ -5860,7 +5818,11 @@ msgid "Anti erase"
 msgstr "å??æ¶?æ?¹é?¤"
 
 #: ../app/base/tile-swap.c:710
-msgid "Unable to open swap file. GIMP has run out of memory and cannot use the swap file. Some parts of your images may be corrupted. Try to save your work using different filenames, restart GIMP and check the location of the swap directory in your Preferences."
+msgid ""
+"Unable to open swap file. GIMP has run out of memory and cannot use the swap "
+"file. Some parts of your images may be corrupted. Try to save your work "
+"using different filenames, restart GIMP and check the location of the swap "
+"directory in your Preferences."
 msgstr "ç?¡æ³?é??å??äº¤æ??æª?ã??GIMP å·²è??ç?¡è¨?æ?¶é«?ï¼?è??ä¸?ç?¡æ³?ä½¿ç?¨äº¤æ??æª?ï¼?é??æ¨£å?¯è?½å¼?è?´æ??é?¨ä»½å??ç??å?§å®¹æ??å£?ã??è«?ä½ å??è©¦ä½¿ç?¨å?¦ä¸?å??æª?æ¡?å??ç¨±å?²å?å??ç??ï¼?ç?¶å¾?é??æ?°å??å?? GIMPï¼?å?¨å??å¥½è¨å®?ä¸æª¢æ?¥æ??é??äº¤æ??æª?è³?æ??å¤¾ç??ä½?ç½®ã??"
 
 #: ../app/base/tile-swap.c:725
@@ -5963,23 +5925,17 @@ msgctxt "cursor-format"
 msgid "Fancy"
 msgstr "å½©è?²"
 
-#: ../app/config/gimpconfig-file.c:67
-#: ../app/core/gimpbrushgenerated-save.c:62
-#: ../app/core/gimpcurve-save.c:52
-#: ../app/core/gimpgradient-save.c:50
-#: ../app/core/gimpgradient-save.c:144
-#: ../app/core/gimppalette-save.c:55
-#: ../app/gui/themes.c:238
-#: ../app/tools/gimpcurvestool.c:690
-#: ../app/tools/gimplevelstool.c:800
-#: ../app/vectors/gimpvectors-export.c:81
+#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62
+#: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50
+#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:55
+#: ../app/gui/themes.c:243 ../app/tools/gimpcurvestool.c:690
+#: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81
 #: ../app/xcf/xcf.c:422
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "ç?¡æ³?é??å??â??%sâ??ä¾?å¯«å?¥è³?æ??ï¼?%s"
 
-#: ../app/config/gimpconfig-file.c:78
-#: ../app/config/gimpconfig-file.c:101
+#: ../app/config/gimpconfig-file.c:78 ../app/config/gimpconfig-file.c:101
 #, c-format
 msgid "Error writing '%s': %s"
 msgstr "å¯«å?¥â??%sâ??æ??ç?¼ç??é?¯èª¤ï¼?%s"
@@ -5991,20 +5947,30 @@ msgstr "è®?å??â??%sâ??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 #: ../app/config/gimpconfig-file.c:131
 #, c-format
-msgid "There was an error parsing your '%s' file. Default values will be used. A backup of your configuration has been created at '%s'."
+msgid ""
+"There was an error parsing your '%s' file. Default values will be used. A "
+"backup of your configuration has been created at '%s'."
 msgstr "å??æ??â??%sâ??æª?æ¡?ç??å?§å®¹æ??å?ºç?¾é?¯èª¤ï¼?æ??æ?¹ç?ºä½¿ç?¨é ?è¨ç??çµ?æ??ã??ä½ ç??çµ?æ??æª?æ¡?å·²è¢«å??ä»½ç?ºâ??%sâ??ã??"
 
+#. Not all strings defined here are used in the user interface
+#. *  (the preferences dialog mainly) and only those that are should
+#. *  be marked for translation.
+#.
 #: ../app/config/gimprc-blurbs.h:13
-msgid "When enabled, an image will become the active image when its image window receives the focus. This is useful for window managers using \"click to focus\"."
+msgid ""
+"When enabled, an image will become the active image when its image window "
+"receives the focus. This is useful for window managers using \"click to focus"
+"\"."
 msgstr "å??ç?¨æ??ï¼?å??ç??æ??å?¨å®?ç??å??ç??è¦?çª?ç?²å¾?ç?¦é»?æ??è®?æ??ä½¿ç?¨ä¸ç??å??ç??ã??é??å?¨è¦?çª?ç®¡ç??ç¨?å¼?ä½¿ç?¨â??é»?æ??ä»¥å??å¾?ç?¦é»?â??æ??å¾?æ??å¹«å?©ã??"
 
-#: ../app/config/gimprc-blurbs.h:23
-#: ../app/config/gimprc-blurbs.h:28
+#: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28
 msgid "Sets the dynamics search path."
 msgstr "è¨ç½®å??æ??æ??ç´¢è·¯å¾?ã??"
 
 #: ../app/config/gimprc-blurbs.h:33
-msgid "Sets the canvas padding color used if the padding mode is set to custom color."
+msgid ""
+"Sets the canvas padding color used if the padding mode is set to custom "
+"color."
 msgstr "å¦?æ??è£?ç?½æ¨¡å¼?è¨ç?ºè?ªé?¸é¡?è?²ï¼?å?¨é??è£?è¨å®?ç?«å¸?è£?ç?½é¡?è?²ã??"
 
 #: ../app/config/gimprc-blurbs.h:37
@@ -6028,11 +5994,15 @@ msgid "Sets the type of mouse pointers to use."
 msgstr "æ??å®? GIMP ä»¥å?ªç¨®æ?¹å¼?é¡¯ç¤ºé¼ æ¨?ã??"
 
 #: ../app/config/gimprc-blurbs.h:55
-msgid "Context-dependent mouse pointers are helpful.  They are enabled by default.  However, they require overhead that you may want to do without."
+msgid ""
+"Context-dependent mouse pointers are helpful.  They are enabled by default.  "
+"However, they require overhead that you may want to do without."
 msgstr "å?¨ä¸?å??ç??æ??æ³?ä¸?ä½¿ç?¨ä¸?å??ç??é¼ æ¨?æ?¯å¾?æ£?ç??ï¼?é ?è¨æ??ä½¿ç?¨é??ç¨®æ?¹å¼?é¡¯ç¤ºé¼ æ¨?ã??ä½?æ?¯ï¼?å®?ä¹?æ??æ¶?è??ä¸?äº?è³?æº?ï¼?æ??äº?æ??æ³?ä¸?ä½ å?¯è?½ä¸?å¸?æ??ä½¿ç?¨é??ç¨®è¨å®?ã??"
 
 #: ../app/config/gimprc-blurbs.h:71
-msgid "When enabled, this will ensure that each pixel of an image gets mapped to a pixel on the screen."
+msgid ""
+"When enabled, this will ensure that each pixel of an image gets mapped to a "
+"pixel on the screen."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?å??ç??ç??æ¯?ä¸?å??å??ç´ ç?¸ç?æ?¼ç?«é?¢ç??æ¯?ä¸?å??å??ç´ ã??"
 
 #: ../app/config/gimprc-blurbs.h:93
@@ -6040,11 +6010,19 @@ msgid "This is the distance in pixels where Guide and Grid snapping activates."
 msgstr "ä»¤ç?©ä»¶è?ªå??è²¼é½?å??è??ç·?å??æ ¼ç·?é??å??å??è?½ç??æ??æ??é??ç??è·?é?¢ (å??ç´ )ã??"
 
 #: ../app/config/gimprc-blurbs.h:109
-msgid "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill algorithm.  The seed fill starts at the initially selected pixel and progresses in all directions until the difference of pixel intensity from the original is greater than a specified threshold. This value represents the default threshold."
-msgstr "ä¸?äº?å·¥å?·ï¼?å??æ¨¡ç³?é?¸å??å??å??æ??è??å¡«è?²ï¼?æ??ä»¥ seed-fill é??ç®?æ³?ä¾?å°?æ?¾å??å??ã??é??å§?ç??æ??å??ï¼?æ??é?¸å®?ä¸?å??å??ç´ ï¼?ç?¶å¾?å??æ??æ??æ?¹å??å»¶ä¼¸ï¼?ç?´è?³å?©å??ç?¸é?°å??ç´ ä¹?é??ç??äº®åº¦ç??å·®å¤§æ?¼æ??å??ç??é??ã??æ?¬æ?¸å?¼å°±æ?¯é ?è¨ç??ç??é??ã??"
+msgid ""
+"Tools such as fuzzy-select and bucket fill find regions based on a seed-fill "
+"algorithm.  The seed fill starts at the initially selected pixel and "
+"progresses in all directions until the difference of pixel intensity from "
+"the original is greater than a specified threshold. This value represents "
+"the default threshold."
+msgstr "ä¸?äº?å·¥å?·ï¼?å??æ¨¡ç³?é?¸å??å??å??æ??è??å¡«è?²ï¼?æ??ä»¥ seed-fill é??ç®?æ³?ä¾?å°?æ?¾å??å??ã??é??å§?ç??æ??å??ï¼?æ??é?¸å®?ä¸?å??å??ç´ ï¼?ç?¶å¾?å??æ??æ??æ?¹å??å»¶ä¼¸ï¼?ç?´è?³å?©å??ç?¸é?°å??ç´ ä¹?é??ç??äº®åº¦ç??å·®å¤§æ?¼æ??å??ç??é??ã??æ?¬æ?¸å?¼å°±æ?¯é ?è¨ç??è?¨ç??å?¼ã??"
 
 #: ../app/config/gimprc-blurbs.h:122
-msgid "The window type hint that is set on dock windows and the toolbox window. This may affect the way your window manager decorates and handles these windows."
+msgid ""
+"The window type hint that is set on dock windows and the toolbox window. "
+"This may affect the way your window manager decorates and handles these "
+"windows."
 msgstr "è¦?çª?é¡?å??æ??ç¤ºç?¨å?¨è¨ç½®å??é§?å¼?è¦?çª?å??å·¥å?·ç®±è¦?çª?ã??é??å?¯è?½æ??å½±é?¿ä½ ç??è¦?çª?ç®¡ç??ç¨?å¼?è£?é£¾å??è??ç??é??äº?è¦?çª?ç??æ?¹å¼?ã??"
 
 #: ../app/config/gimprc-blurbs.h:154
@@ -6076,242 +6054,316 @@ msgid "Sets the text to appear in image window titles."
 msgstr "æ??å®?å??ç??è¦?çª?æ¨?é¡?ä¸é¡¯ç¤ºç??æ??å?ã??"
 
 #: ../app/config/gimprc-blurbs.h:197
-msgid "When enabled, this will ensure that the full image is visible after a file is opened, otherwise it will be displayed with a scale of 1:1."
+msgid ""
+"When enabled, this will ensure that the full image is visible after a file "
+"is opened, otherwise it will be displayed with a scale of 1:1."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?GIMP æ??ç¢ºä¿?é??å??å??ç??å¾?ï¼?ç?«é?¢ä¸æ??å®?å?¨é¡¯ç¤ºæ?´å¹?å??ç??ï¼?å?¦å??å®?æ??ä»¥å??ä¾?å°ºå¯¸é¡¯ç¤ºã??"
 
 #: ../app/config/gimprc-blurbs.h:201
-msgid "Install a private colormap; might be useful on 8-bit (256 colors) displays."
-msgstr "ç¨?å¼?æ??ä½¿ç?¨è?ªå·±ç??é¡?è?²è??ä¸?ç?¨ç³»çµ±å??é??ç??é¡?è?²ï¼?å?¨ 8 bit (256 è?²) ç?«é?¢ä¸æ??æ??ç?¨ã??"
-
-#: ../app/config/gimprc-blurbs.h:204
-msgid "Sets the level of interpolation used for scaling and other transformations."
+msgid ""
+"Sets the level of interpolation used for scaling and other transformations."
 msgstr "è¨å®?ç¸®æ?¾å??è®?æ??å??ç??æ??é?¸ç?¨ç??æ??å?¼æ³?å??è³ªã??"
 
-#: ../app/config/gimprc-blurbs.h:211
+#: ../app/config/gimprc-blurbs.h:208
 msgid "Specifies the language to use for the user interface."
 msgstr "ç?º GIMP ç¨?å¼?ä½¿ç?¨è??ç??é?¢æ??å®?è¦?ä½¿ç?¨ç??èª?è¨?ã??"
 
-#: ../app/config/gimprc-blurbs.h:214
+#: ../app/config/gimprc-blurbs.h:211
 msgid "How many recently opened image filenames to keep on the File menu."
 msgstr "æª?æ¡?é?¸å?®æ??ä¿?ç??å¤?å°?å??æ??è¿?é??å??ç??æª?æ¡?ã??"
 
-#: ../app/config/gimprc-blurbs.h:217
-msgid "Speed of marching ants in the selection outline.  This value is in milliseconds (less time indicates faster marching)."
+#: ../app/config/gimprc-blurbs.h:214
+msgid ""
+"Speed of marching ants in the selection outline.  This value is in "
+"milliseconds (less time indicates faster marching)."
 msgstr "é?¸å??å??å??å?¨å??ç??è??ç·?ç§»å??é??åº¦ã??æ?¬æ?¸å?¼ä»¥äº³ç§?è¡¨ç¤º (æ??é??è¼?å°?è¡¨ç¤ºé??åº¦è¼?å¿«)ã??"
 
-#: ../app/config/gimprc-blurbs.h:221
-msgid "GIMP will warn the user if an attempt is made to create an image that would take more memory than the size specified here."
+#: ../app/config/gimprc-blurbs.h:218
+msgid ""
+"GIMP will warn the user if an attempt is made to create an image that would "
+"take more memory than the size specified here."
 msgstr "å¦?æ??ç?¨æ?¶å??è©¦ç?¢ç??ä¸?å??ä½¿ç?¨å¤?æ?¼æ??å®?è¨?æ?¶é«?æ?¸é??ç??å??ç??æ??ï¼?GIMP æ??ç?¼å?ºè¦å??è¨?æ?¯æ??ç¤ºç?¨æ?¶ã??"
 
-#: ../app/config/gimprc-blurbs.h:225
-msgid "Generally only a concern for 8-bit displays, this sets the minimum number of system colors allocated for GIMP."
-msgstr "ä¸?è?¬ä¸?å?ªæ??å°?ä½¿ç?¨ 8 ä½?å??è?²å½©ç??ç?«é?¢æ¯?è¼?é??è¦?ï¼?å®?æ??å®?æ??å??é??çµ¦ GIMP ç??é¡?è?²æ?¸ç?®ä¸?é??ã??"
-
-#: ../app/config/gimprc-blurbs.h:235
-msgid "Sets the monitor's horizontal resolution, in dots per inch.  If set to 0, forces the X server to be queried for both horizontal and vertical resolution information."
+#: ../app/config/gimprc-blurbs.h:228
+msgid ""
+"Sets the monitor's horizontal resolution, in dots per inch.  If set to 0, "
+"forces the X server to be queried for both horizontal and vertical "
+"resolution information."
 msgstr "è¨å®?è?¢å¹?ç??æ°´å¹³è§£å??åº¦ (å?®ä½?ç?º dpi)ã??å¦?æ??è¨å®?ç?º 0 ç??è©±ï¼?æ??å¼·å?¶ X ä¼ºæ??å?¨æ?¥è©¢æ°´å¹³å??å??ç?´ç??è§£å??åº¦ã??"
 
-#: ../app/config/gimprc-blurbs.h:240
-msgid "Sets the monitor's vertical resolution, in dots per inch.  If set to 0, forces the X server to be queried for both horizontal and vertical resolution information."
+#: ../app/config/gimprc-blurbs.h:233
+msgid ""
+"Sets the monitor's vertical resolution, in dots per inch.  If set to 0, "
+"forces the X server to be queried for both horizontal and vertical "
+"resolution information."
 msgstr "è¨å®?è?¢å¹?ç??å??ç?´è§£å??åº¦ (å?®ä½?ç?º dpi)ã??å¦?æ??è¨å®?ç?º 0 ç??è©±ï¼?æ??å¼·å?¶ X ä¼ºæ??å?¨æ?¥è©¢æ°´å¹³å??å??ç?´ç??è§£å??åº¦ã??"
 
-#: ../app/config/gimprc-blurbs.h:245
-msgid "If enabled, the move tool sets the edited layer or path as active.  This used to be the default behaviour in older versions."
+#: ../app/config/gimprc-blurbs.h:238
+msgid ""
+"If enabled, the move tool sets the edited layer or path as active.  This "
+"used to be the default behaviour in older versions."
 msgstr "å¦?æ??å??ç?¨ï¼?ç§»å??å·¥å?·æ??å°?å·²ç·¨è¼¯ç??å??å±¤æ??è·¯å¾?è¨ç?ºä½¿ç?¨ä¸ã??é??å?¨è??ç??æ?¬ä¸æ?¯é ?è¨ç??è¡?ç?ºã??"
 
-#: ../app/config/gimprc-blurbs.h:249
-msgid "Sets the size of the navigation preview available in the lower right corner of the image window."
+#: ../app/config/gimprc-blurbs.h:242
+msgid ""
+"Sets the size of the navigation preview available in the lower right corner "
+"of the image window."
 msgstr "è¨å®?å??ç??è¦?çª?å?³ä¸?è§?ç??å°?è¦½å??å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:253
+#: ../app/config/gimprc-blurbs.h:246
 msgid "Sets how many processors GIMP should try to use simultaneously."
 msgstr "è¨å®? GIMP æ??å??è©¦å??æ??ä½¿ç?¨å¹¾å??è??ç??å?¨ã??"
 
-#: ../app/config/gimprc-blurbs.h:266
+#: ../app/config/gimprc-blurbs.h:259
 #, fuzzy
-msgid "When enabled, the X server is queried for the mouse's current position on each motion event, rather than relying on the position hint.  This means painting with large brushes should be more accurate, but it may be slower.  Conversely, on some X servers enabling this option results in faster painting."
+msgid ""
+"When enabled, the X server is queried for the mouse's current position on "
+"each motion event, rather than relying on the position hint.  This means "
+"painting with large brushes should be more accurate, but it may be slower.  "
+"Conversely, on some X servers enabling this option results in faster "
+"painting."
 msgstr "ç?¶å??ç?¨ç??æ??å??ï¼?X ä¼ºæ??å?¨æ??å?¨æ¯?æ¬¡ç?¼ç??ç§»å??äº?ä»¶æ??æ?¥è©¢æ»?é¼ ç?®å??ç??ä½?ç½®ï¼?è??ä¸?æ??æ ¹æ??å?¶ä½?ç½®æ??ç¤ºã??é??è¡¨ç¤ºä½¿ç?¨å¤§å??ç?å?·ç¹ªå??æ??æ??æ??æ?´å? æº?ç¢ºï¼?ä½?æ?¯å®?å?¯è?½æ??ä½¿é??åº¦è®?æ?¢ã??ä¸?é??å?¨æ??äº? X ä¼ºæ??å?¨ä¸?å??ç?¨é??å??é?¸é ?æ??ä½¿å¾?ç¹ªå??é??åº¦è®?å¿«ã??"
 
-#: ../app/config/gimprc-blurbs.h:282
-msgid "Sets whether GIMP should create previews of layers and channels. Previews in the layers and channels dialog are nice to have but they can slow things down when working with large images."
+#: ../app/config/gimprc-blurbs.h:275
+msgid ""
+"Sets whether GIMP should create previews of layers and channels. Previews in "
+"the layers and channels dialog are nice to have but they can slow things "
+"down when working with large images."
 msgstr "æ??å®? GIMP æ??å?¦ç?¢ç??å??å±¤å??è?²ç??ç??é ?è¦½å??ã??å?¨å??å±¤å??è?²ç??å°?è©±ç??ä¸é¡¯ç¤ºé ?è¦½å??æ?¯ä¸?ä»¶å¥½äº?ï¼?ä½?å¦?æ??é??å??è¼?å¤§ç??å??ç??ï¼?æ??æ??æ?¢æ?´é«?ç??é??è¡?é??åº¦ã??"
 
-#: ../app/config/gimprc-blurbs.h:287
-msgid "Sets the preview size used for layers and channel previews in newly created dialogs."
+#: ../app/config/gimprc-blurbs.h:280
+msgid ""
+"Sets the preview size used for layers and channel previews in newly created "
+"dialogs."
 msgstr "ç?ºå??å±¤å??è?²ç??æ??å®?å?¨æ?°å»ºå°?è©±ç??ä¸é ?è¦½å??ç??é ?è¨å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:291
-msgid "When enabled, the image window will automatically resize itself whenever the physical image size changes."
+#: ../app/config/gimprc-blurbs.h:284
+msgid ""
+"When enabled, the image window will automatically resize itself whenever the "
+"physical image size changes."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?ç?¶å??ç??ç??å¯¦é??å°ºå¯¸æ??è®?å??æ??ï¼?è¦?çª?æ??è?ªå??èª¿æ?´å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:295
-msgid "When enabled, the image window will automatically resize itself when zooming into and out of images."
+#: ../app/config/gimprc-blurbs.h:288
+msgid ""
+"When enabled, the image window will automatically resize itself when zooming "
+"into and out of images."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?ç?¶æ??è¿?æ??è??æ??é? å??ç??æ??ï¼?å??ç??è¦?çª?æ??è?ªå??èª¿æ?´å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:299
+#: ../app/config/gimprc-blurbs.h:292
 msgid "Let GIMP try to restore your last saved session on each startup."
 msgstr "è®? GIMP å?¨æ¯?æ¬¡å??å??æ??å??å¾©ä¸?æ¬¡å?·è¡?ç??æ??æ³?ã??"
 
-#: ../app/config/gimprc-blurbs.h:302
-msgid "Remember the current tool, pattern, color, and brush across GIMP sessions."
+#: ../app/config/gimprc-blurbs.h:295
+msgid ""
+"Remember the current tool, pattern, color, and brush across GIMP sessions."
 msgstr "å?¨ GIMP çµ?æ??å??ï¼?è¨?é??ç?®å??ä½¿ç?¨ç??å·¥å?·ã??å??æ¨£ã??è?²å½©å??ç?å?·ã??"
 
-#: ../app/config/gimprc-blurbs.h:306
-msgid "Keep a permanent record of all opened and saved files in the Recent Documents list."
+#: ../app/config/gimprc-blurbs.h:299
+msgid ""
+"Keep a permanent record of all opened and saved files in the Recent "
+"Documents list."
 msgstr "å?¨æ??è¿?ä½¿ç?¨æ??ä»¶æ¸?å?®ä¸æ°¸ä¹?ä¿?å?æ??æ??é??å??æ??å?²å?é??ç??æª?æ¡?ã??"
 
-#: ../app/config/gimprc-blurbs.h:310
+#: ../app/config/gimprc-blurbs.h:303
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
 msgstr "ç?¶ GIMP çµ?æ??æ??å?²å?ä¸»è¦?å°?è©±ç??ç??ä½?ç½®å??å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:313
+#: ../app/config/gimprc-blurbs.h:306
 msgid "Save the tool options when GIMP exits."
 msgstr "ç?¶ GIMP çµ?æ??æ??å?²å?å·¥å?·é?¸é ?ã??"
 
-#: ../app/config/gimprc-blurbs.h:319
-msgid "When enabled, all paint tools will show a preview of the current brush's outline."
+#: ../app/config/gimprc-blurbs.h:312
+msgid ""
+"When enabled, all paint tools will show a preview of the current brush's "
+"outline."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?ä½¿ç?¨ä»»ä½?ç¹ªç?«å·¥å?·æ??é?½æ??é¡¯ç¤ºç?®å??ç??ç?å?·ç??å½¢ç??ã??"
 
-#: ../app/config/gimprc-blurbs.h:323
-msgid "When enabled, dialogs will show a help button that gives access to the related help page.  Without this button, the help page can still be reached by pressing F1."
+#: ../app/config/gimprc-blurbs.h:316
+msgid ""
+"When enabled, dialogs will show a help button that gives access to the "
+"related help page.  Without this button, the help page can still be reached "
+"by pressing F1."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?æ??æ??å°?è©±ç??é?½æ??é¡¯ç¤ºã??æ±?å?©ã??æ??é??ï¼?è®?ä½ ç??è¦½ç?¸é??ç??èªªæ??æ??ä»¶ã??ä¸?é??å?³ä½¿æ²?æ??é??å??æ??é??ï¼?ä»?ç?¶å?¯ä»¥æ??é?µç?¤ç?? F1 ä»£æ?¿ã??"
 
-#: ../app/config/gimprc-blurbs.h:328
-msgid "When enabled, the mouse pointer will be shown over the image while using a paint tool."
+#: ../app/config/gimprc-blurbs.h:321
+msgid ""
+"When enabled, the mouse pointer will be shown over the image while using a "
+"paint tool."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?ç?¶ä½¿ç?¨ç¹ªç?«å·¥å?·æ??ä¹?ä¸?æ¨£é¡¯ç¤ºé¼ æ¨?ã??"
 
-#: ../app/config/gimprc-blurbs.h:332
-msgid "When enabled, the menubar is visible by default. This can also be toggled with the \"View->Show Menubar\" command."
+#: ../app/config/gimprc-blurbs.h:325
+msgid ""
+"When enabled, the menubar is visible by default. This can also be toggled "
+"with the \"View->Show Menubar\" command."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?é?¸å?®å??é¡¯ç¤ºå?ºä¾?ã??ä½ ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºé?¸å?®å??ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:336
-msgid "When enabled, the rulers are visible by default. This can also be toggled with the \"View->Show Rulers\" command."
+#: ../app/config/gimprc-blurbs.h:329
+msgid ""
+"When enabled, the rulers are visible by default. This can also be toggled "
+"with the \"View->Show Rulers\" command."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å°ºè¦?é¡¯ç¤ºå?ºä¾?ã??ä½ ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå°ºè¦?ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:340
-msgid "When enabled, the scrollbars are visible by default. This can also be toggled with the \"View->Show Scrollbars\" command."
+#: ../app/config/gimprc-blurbs.h:333
+msgid ""
+"When enabled, the scrollbars are visible by default. This can also be "
+"toggled with the \"View->Show Scrollbars\" command."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?æ?²å??å??é¡¯ç¤ºå?ºä¾?ã??ä½ ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºæ?²å??è»¸ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:344
-msgid "When enabled, the statusbar is visible by default. This can also be toggled with the \"View->Show Statusbar\" command."
+#: ../app/config/gimprc-blurbs.h:337
+msgid ""
+"When enabled, the statusbar is visible by default. This can also be toggled "
+"with the \"View->Show Statusbar\" command."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?ç??æ??å??é¡¯ç¤ºå?ºä¾?ã??ä½ ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºç??æ??å??ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:348
-msgid "When enabled, the selection is visible by default. This can also be toggled with the \"View->Show Selection\" command."
+#: ../app/config/gimprc-blurbs.h:341
+msgid ""
+"When enabled, the selection is visible by default. This can also be toggled "
+"with the \"View->Show Selection\" command."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?é?¸å??å??å??å?¨å??ç??è??ç·?é¡¯ç¤ºå?ºä¾?ã??ä½ ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºé?¸å??å??å??ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:352
-msgid "When enabled, the layer boundary is visible by default. This can also be toggled with the \"View->Show Layer Boundary\" command."
+#: ../app/config/gimprc-blurbs.h:345
+msgid ""
+"When enabled, the layer boundary is visible by default. This can also be "
+"toggled with the \"View->Show Layer Boundary\" command."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å??å±¤é??ç??é¡¯ç¤ºå?ºä¾?ã??ä½ ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå??å±¤é??ç??ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:356
-msgid "When enabled, the guides are visible by default. This can also be toggled with the \"View->Show Guides\" command."
+#: ../app/config/gimprc-blurbs.h:349
+msgid ""
+"When enabled, the guides are visible by default. This can also be toggled "
+"with the \"View->Show Guides\" command."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å??è??ç·?é¡¯ç¤ºå?ºä¾?ã??ä½ ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå??è??ç·?ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:360
-msgid "When enabled, the grid is visible by default. This can also be toggled with the \"View->Show Grid\" command."
+#: ../app/config/gimprc-blurbs.h:353
+msgid ""
+"When enabled, the grid is visible by default. This can also be toggled with "
+"the \"View->Show Grid\" command."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?æ ¼ç·?é¡¯ç¤ºå?ºä¾?ã??ä½ ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºæ ¼ç·?ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:364
-msgid "When enabled, the sample points are visible by default. This can also be toggled with the \"View->Show Sample Points\" command."
+#: ../app/config/gimprc-blurbs.h:357
+msgid ""
+"When enabled, the sample points are visible by default. This can also be "
+"toggled with the \"View->Show Sample Points\" command."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å??æ¨£é»?é¡¯ç¤ºå?ºä¾?ã??ä½ ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå??æ¨£é»?ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:368
+#: ../app/config/gimprc-blurbs.h:361
 msgid "Show a tooltip when the pointer hovers over an item."
 msgstr "ç?¶é¼ æ¨?å??å?¨é ?ç?®ä¸?æ??é¡¯ç¤ºå·¥å?·æ??ç¤ºã??"
 
-#: ../app/config/gimprc-blurbs.h:371
+#: ../app/config/gimprc-blurbs.h:364
 msgid "Use GIMP in a single-window mode."
 msgstr "ä½¿ç?¨ GIMP å?¨ä¸?å??å?®ä¸?è¦?çª?æ¨¡å¼?ã??"
 
-#: ../app/config/gimprc-blurbs.h:374
+#: ../app/config/gimprc-blurbs.h:367
 msgid "Hide docks and other windows, leaving only image windows."
-msgstr ""
+msgstr "é?±è??å??é§?å¼?å??å?¶ä»?è¦?çª?ï¼?å?ªç??ä¸?å??ç??è¦?çª?ã??"
 
-#: ../app/config/gimprc-blurbs.h:377
+#: ../app/config/gimprc-blurbs.h:370
 msgid "What to do when the space bar is pressed in the image window."
 msgstr "ç?¶ç©ºç?½é?µå?¨å??ç??è¦?çª?ä¸æ??ä¸?æ??è¦?å??ä»?éº¼ã??"
 
-#: ../app/config/gimprc-blurbs.h:380
-msgid "Sets the swap file location. GIMP uses a tile based memory allocation scheme. The swap file is used to quickly and easily swap tiles out to disk and back in. Be aware that the swap file can easily get very large if GIMP is used with large images. Also, things can get horribly slow if the swap file is created on a folder that is mounted over NFS.  For these reasons, it may be desirable to put your swap file in \"/tmp\"."
+#: ../app/config/gimprc-blurbs.h:373
+msgid ""
+"Sets the swap file location. GIMP uses a tile based memory allocation "
+"scheme. The swap file is used to quickly and easily swap tiles out to disk "
+"and back in. Be aware that the swap file can easily get very large if GIMP "
+"is used with large images. Also, things can get horribly slow if the swap "
+"file is created on a folder that is mounted over NFS.  For these reasons, it "
+"may be desirable to put your swap file in \"/tmp\"."
 msgstr "æ??å®?äº¤æ??æª?ç??ä½?ç½®ã??GIMP æ??ä½¿ç?¨å¹³é?¢å??å¡?ç??æ?¹å¼?å??é??è¨?æ?¶é«?ã??äº¤æ??æª?ç??ç?¨é??æ?¯å°?é??äº?å??å¡?å¿«é??å?°å¯«å?¥ç£?ç¢?æ??è??è®?å?¥è¨?æ?¶é«?ã??ä½?æ?¯è¦?æ³¨æ??ï¼?å¦?æ?? GIMP é??å??äº?è¼?å¤§ç??å??ç??ï¼?é??äº?äº¤æ??æª?å?¯ä»¥è®?å¾?å¾?å¤§ã??å?¦å¤?ï¼?å¦?æ??äº¤æ??æª?ç?®é??æ?¯å?¨ NFS ä¼ºæ??å?¨ä¸ï¼?é??åº¦å?¯ä»¥è®?å¾?å¾?æ?¢ã??å?ºæ?¼ä»¥ä¸?ç??å??å? ï¼?æ??å¥½å°?äº¤æ??æª?æ¡?ç?®é??è¨å®?ç?ºâ??/tmpâ??ã??"
 
-#: ../app/config/gimprc-blurbs.h:389
+#: ../app/config/gimprc-blurbs.h:382
 msgid "When enabled, menus can be torn off."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?å?¯ä»¤é?¸å?®è?«é?¢è¦?çª?ã??"
 
-#: ../app/config/gimprc-blurbs.h:392
-msgid "When enabled, you can change keyboard shortcuts for menu items by hitting a key combination while the menu item is highlighted."
+#: ../app/config/gimprc-blurbs.h:385
+msgid ""
+"When enabled, you can change keyboard shortcuts for menu items by hitting a "
+"key combination while the menu item is highlighted."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?ç?¶æ??å??é?¸å?®é ?ç?®è¢«é?¸ä¸æ??ï¼?ä½ å?¯å?³æ??æ??ä¸?é?©ç?¶ç??æ??é?µçµ?å??ï¼?ä¾?æ?´æ?¹ä»£è¡¨é??å??é?¸å?®é ?ç?®ç??æ?·å¾?é?µã??"
 
-#: ../app/config/gimprc-blurbs.h:396
+#: ../app/config/gimprc-blurbs.h:389
 msgid "Save changed keyboard shortcuts when GIMP exits."
 msgstr "ç?¶ GIMP çµ?æ??æ??å?²å?å·±ä¿®æ?¹ç??æ?·å¾?é?µã??"
 
-#: ../app/config/gimprc-blurbs.h:399
+#: ../app/config/gimprc-blurbs.h:392
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "ç?¶ GIMP å??å??æ??è¼?å?¥å·±ä¿®æ?¹ç??æ?·å¾?é?µã??"
 
-#: ../app/config/gimprc-blurbs.h:402
-msgid "Sets the folder for temporary storage. Files will appear here during the course of running GIMP.  Most files will disappear when GIMP exits, but some files are likely to remain, so it is best if this folder not be one that is shared by other users."
+#: ../app/config/gimprc-blurbs.h:395
+msgid ""
+"Sets the folder for temporary storage. Files will appear here during the "
+"course of running GIMP.  Most files will disappear when GIMP exits, but some "
+"files are likely to remain, so it is best if this folder not be one that is "
+"shared by other users."
 msgstr "æ??å®?å?æ?¾æ?«å?æª?ç??ç?®é??ã??ç?¶å?·è¡? GIMP ç??æ??å??ï¼?è©²ç?®é??æ??å?ºç?¾ä¸?äº?æª?æ¡?ï¼?å?¶ä¸å¤§é?¨ä»½é?½æ??å?¨ GIMP çµ?æ??å¾?æ¶?å¤±ï¼?ä½?æ??å?¯è?½æ??ä¸?äº?æª?æ¡?æ??ç??ä¸?ï¼?å? æ¤è©²ç?®é??æ??å¥½æ?¯ä¸?å?¯ä»¥å??äº«çµ¦å?¶å®?ä½¿ç?¨è??ã??"
 
-#: ../app/config/gimprc-blurbs.h:414
+#: ../app/config/gimprc-blurbs.h:407
 msgid "Sets the size of the thumbnail shown in the Open dialog."
 msgstr "è¨å®?é??å??å°?è©±ç??ä¹?ä¸é ?è¦½å??ç??å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:417
-msgid "The thumbnail in the Open dialog will be automatically updated if the file being previewed is smaller than the size set here."
+#: ../app/config/gimprc-blurbs.h:410
+msgid ""
+"The thumbnail in the Open dialog will be automatically updated if the file "
+"being previewed is smaller than the size set here."
 msgstr "å¦?æ??æº?å??é ?è¦½ç??å??ç??å¤§å°?ä½?æ?¼æ?¬è¨å®?ï¼?ã??é??å??å??ç??ã??å°?è©±ç??ä¸ç??ç¸®å??æ??è?ªå??æ?´æ?°ã??"
 
-#: ../app/config/gimprc-blurbs.h:421
-msgid "When the amount of pixel data exceeds this limit, GIMP will start to swap tiles to disk.  This is a lot slower but it makes it possible to work on images that wouldn't fit into memory otherwise.  If you have a lot of RAM, you may want to set this to a higher value."
+#: ../app/config/gimprc-blurbs.h:414
+msgid ""
+"When the amount of pixel data exceeds this limit, GIMP will start to swap "
+"tiles to disk.  This is a lot slower but it makes it possible to work on "
+"images that wouldn't fit into memory otherwise.  If you have a lot of RAM, "
+"you may want to set this to a higher value."
 msgstr "ç?¶å??ç´ è³?æ??ç??ç¸½æ?¸è¶?é??é??å??é??å?¶æ??ï¼?GIMP æ??é??å§?å°?è³?æ??æ?«å?æ?¼ç£?ç¢?ä¸ã??é??æ¨£æ??è®?å®?è®?å¾?æ¯?è¼?æ?¢ï¼?ä½?ä¹?è®?æ??å??å?¯ä»¥è??ç??ç?¡æ³?å®?å?¨è¼?å?¥è¨?æ?¶é«?ä¸ç??å¤§å??å??ç??ã??å¦?æ??ä½ æ??å¾?å¤?è¨?æ?¶é«?(RAM)ï¼?ä½ å?¯è?½æ??æ??é??å??é?¸é ?è¨ç?ºæ¯?è¼?é«?ç??æ?¸å?¼ã??"
 
-#: ../app/config/gimprc-blurbs.h:427
+#: ../app/config/gimprc-blurbs.h:420
 msgid "Show the current foreground and background colors in the toolbox."
 msgstr "é¡¯ç¤ºå·¥å?·ç®±ä¸ç?®å??ç??å??æ?¯å??è??æ?¯é¡?è?²"
 
-#: ../app/config/gimprc-blurbs.h:430
+#: ../app/config/gimprc-blurbs.h:423
 msgid "Show the currently selected brush, pattern and gradient in the toolbox."
 msgstr "é¡¯ç¤ºç?®å??å?¨å·¥å?·ç®±ä¸é?¸å??ç??ç?å?·ã??å??æ¨£å??æ¼¸è®?è?²ã??"
 
-#: ../app/config/gimprc-blurbs.h:433
+#: ../app/config/gimprc-blurbs.h:426
 msgid "Show the currently active image in the toolbox."
 msgstr "é¡¯ç¤ºå·¥å?·ç®±ä¸ç?®å??ä½¿ç?¨ç??å??ç??ã??"
 
-#: ../app/config/gimprc-blurbs.h:439
+#: ../app/config/gimprc-blurbs.h:432
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "æ??å®?é¡¯ç¤ºå??ç??æ??é??æ??åº¦ç??è¡¨ç¤ºæ?¹å¼?ã??"
 
-#: ../app/config/gimprc-blurbs.h:442
+#: ../app/config/gimprc-blurbs.h:435
 msgid "Sets the size of the checkerboard used to display transparency."
 msgstr "ä»¥æ£?ç?¤æ ¼ä»£è¡¨é??æ??åº¦æ??ï¼?æ??å®?æ£?ç?¤æ ¼ç??å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:445
-msgid "When enabled, GIMP will not save an image if it has not been changed since it was opened."
+#: ../app/config/gimprc-blurbs.h:438
+msgid ""
+"When enabled, GIMP will not save an image if it has not been changed since "
+"it was opened."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?GIMP ä¸?æ??å?²å?æ²?æ??ä¿®æ?¹ç??å??ç??ã??"
 
-#: ../app/config/gimprc-blurbs.h:449
-msgid "Sets the minimal number of operations that can be undone. More undo levels are kept available until the undo-size limit is reached."
+#: ../app/config/gimprc-blurbs.h:442
+msgid ""
+"Sets the minimal number of operations that can be undone. More undo levels "
+"are kept available until the undo-size limit is reached."
 msgstr "æ??å®?å?¯ä»¥é??å??ç??æ??ä½?ç¨?åº?æ¬¡æ?¸ä¸?é??ã??è?³æ?¼é¡?å¤?å?¯é??å??ç??æ??ä½?ç¨?åº?ï¼?æ??ä¿?ç??è?³ç?¨ç?¡æ??å®?ç??è¨?æ?¶é«?æ?¸ç?®ç?ºæ¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:453
-msgid "Sets an upper limit to the memory that is used per image to keep operations on the undo stack. Regardless of this setting, at least as many undo-levels as configured can be undone."
+#: ../app/config/gimprc-blurbs.h:446
+msgid ""
+"Sets an upper limit to the memory that is used per image to keep operations "
+"on the undo stack. Regardless of this setting, at least as many undo-levels "
+"as configured can be undone."
 msgstr "æ¯?å¹?å??ç??é?½æ??å°?æ?¾ç¶?ä½¿ç?¨æ??ä½?ç¨?åº?ä¿?ç??å?¨è¨?æ?¶ä¸ï¼?ä»¥å??å°?ä¾?å¾©å??æ??ä½¿ç?¨ï¼?é??è£?æ??å®?æ¯?å¹?å??ç??å??å?¥ä½?ç?¨ç??è¨?æ?¶é«?ä¸?é??ã??ä½?ç?¡è«?æ?¬è¨å®?ç?ºä½?å?¼ï¼?å¾©å??æ¬¡æ?¸ç??è¨å®?æ??å?ªå??è??æ?®ã??"
 
-#: ../app/config/gimprc-blurbs.h:458
+#: ../app/config/gimprc-blurbs.h:451
 msgid "Sets the size of the previews in the Undo History."
 msgstr "è¨ç½®å¾©å??è¨?é??ä¸é ?è¦½å??ç??å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:461
+#: ../app/config/gimprc-blurbs.h:454
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?æ?? F1 æ??é¡¯ç¤ºèªªæ??æ??ä»¶ç??è¦½å?¨ã??"
 
-#: ../app/config/gimprc-deserialize.c:134
-#: ../app/core/gimp-modules.c:133
-#: ../app/core/gimp-units.c:163
-#: ../app/gui/session.c:243
+#: ../app/config/gimprc-deserialize.c:134 ../app/core/gimp-modules.c:133
+#: ../app/core/gimp-units.c:163 ../app/gui/session.c:243
 #: ../app/plug-in/plug-in-rc.c:212
 msgid "fatal parse error"
 msgstr "å??æ??æ??å?ºç?¾å?´é??é?¯èª¤"
@@ -6379,7 +6431,7 @@ msgstr "å??ç??"
 #: ../app/core/core-enums.c:218
 msgctxt "align-reference-type"
 msgid "Selection"
-msgstr "é?¸æ??å??å??"
+msgstr "é?¸å??å??å??"
 
 #: ../app/core/core-enums.c:219
 msgctxt "align-reference-type"
@@ -6646,498 +6698,477 @@ msgctxt "view-type"
 msgid "View as grid"
 msgstr "ä»¥æ ¼å?æ?¹å¼?é¡¯ç¤º"
 
-#: ../app/core/core-enums.c:687
+#: ../app/core/core-enums.c:654
 msgctxt "thumbnail-size"
 msgid "No thumbnails"
 msgstr "æ²?æ??ç¸®å??"
 
-#: ../app/core/core-enums.c:688
+#: ../app/core/core-enums.c:655
 msgctxt "thumbnail-size"
 msgid "Normal (128x128)"
 msgstr "ä¸?è?¬ (128x128)"
 
-#: ../app/core/core-enums.c:689
+#: ../app/core/core-enums.c:656
 msgctxt "thumbnail-size"
 msgid "Large (256x256)"
 msgstr "å¤§ (256x256)"
 
-#: ../app/core/core-enums.c:866
+#: ../app/core/core-enums.c:833
 msgctxt "undo-type"
 msgid "<<invalid>>"
 msgstr "<<ç?¡æ??>>"
 
-#: ../app/core/core-enums.c:867
+#: ../app/core/core-enums.c:834
 msgctxt "undo-type"
 msgid "Scale image"
 msgstr "ç¸®æ?¾å??ç??"
 
-#: ../app/core/core-enums.c:868
+#: ../app/core/core-enums.c:835
 msgctxt "undo-type"
 msgid "Resize image"
 msgstr "èª¿æ?´å??ç??å¤§å°?"
 
-#: ../app/core/core-enums.c:869
+#: ../app/core/core-enums.c:836
 msgctxt "undo-type"
 msgid "Flip image"
 msgstr "ç¿»è½?å??ç??"
 
-#: ../app/core/core-enums.c:870
+#: ../app/core/core-enums.c:837
 msgctxt "undo-type"
 msgid "Rotate image"
 msgstr "æ??è½?å??ç??"
 
-#: ../app/core/core-enums.c:871
+#: ../app/core/core-enums.c:838
 msgctxt "undo-type"
 msgid "Crop image"
 msgstr "è£?å?ªå??ç??"
 
-#: ../app/core/core-enums.c:872
+#: ../app/core/core-enums.c:839
 msgctxt "undo-type"
 msgid "Convert image"
 msgstr "è½?æ??å??ç??æ ¼å¼?"
 
-#: ../app/core/core-enums.c:873
+#: ../app/core/core-enums.c:840
 msgctxt "undo-type"
 msgid "Remove item"
 msgstr "ç§»é?¤é ?ç?®"
 
-#: ../app/core/core-enums.c:874
+#: ../app/core/core-enums.c:841
 msgctxt "undo-type"
 msgid "Merge layers"
 msgstr "å??ä½µå??å±¤"
 
-#: ../app/core/core-enums.c:875
+#: ../app/core/core-enums.c:842
 msgctxt "undo-type"
 msgid "Merge paths"
 msgstr "å??ä½µè·¯å¾?"
 
-#: ../app/core/core-enums.c:876
+#: ../app/core/core-enums.c:843
 msgctxt "undo-type"
 msgid "Quick Mask"
 msgstr "å¿«é??é?®ç½©"
 
-#: ../app/core/core-enums.c:877
-#: ../app/core/core-enums.c:907
+#: ../app/core/core-enums.c:844 ../app/core/core-enums.c:874
 #: ../app/core/gimpimage-grid.c:63
 msgctxt "undo-type"
 msgid "Grid"
 msgstr "æ ¼ç·?"
 
-#: ../app/core/core-enums.c:878
-#: ../app/core/core-enums.c:909
+#: ../app/core/core-enums.c:845 ../app/core/core-enums.c:876
 msgctxt "undo-type"
 msgid "Guide"
 msgstr "å??è??ç·?"
 
-#: ../app/core/core-enums.c:879
-#: ../app/core/core-enums.c:910
+#: ../app/core/core-enums.c:846 ../app/core/core-enums.c:877
 msgctxt "undo-type"
 msgid "Sample Point"
 msgstr "å??æ¨£é»?"
 
-#: ../app/core/core-enums.c:880
-#: ../app/core/core-enums.c:911
+#: ../app/core/core-enums.c:847 ../app/core/core-enums.c:878
 msgctxt "undo-type"
 msgid "Layer/Channel"
 msgstr "å??å±¤/è?²ç??"
 
-#: ../app/core/core-enums.c:881
-#: ../app/core/core-enums.c:912
+#: ../app/core/core-enums.c:848 ../app/core/core-enums.c:879
 msgctxt "undo-type"
 msgid "Layer/Channel modification"
 msgstr "å??å±¤/è?²ç??ä¿®æ?¹"
 
-#: ../app/core/core-enums.c:882
-#: ../app/core/core-enums.c:913
+#: ../app/core/core-enums.c:849 ../app/core/core-enums.c:880
 msgctxt "undo-type"
 msgid "Selection mask"
-msgstr "é?¸æ??å??å??é?®ç½©"
+msgstr "é?¸å??å??å??é?®ç½©"
 
-#: ../app/core/core-enums.c:883
-#: ../app/core/core-enums.c:917
+#: ../app/core/core-enums.c:850 ../app/core/core-enums.c:884
 msgctxt "undo-type"
 msgid "Item visibility"
 msgstr "é ?ç?®å?¯è¦?æ?§"
 
-#: ../app/core/core-enums.c:884
-#: ../app/core/core-enums.c:918
+#: ../app/core/core-enums.c:851 ../app/core/core-enums.c:885
 msgctxt "undo-type"
 msgid "Link/Unlink item"
 msgstr "é?£çµ?/å??æ¶?é?£çµ?é ?ç?®"
 
-#: ../app/core/core-enums.c:885
+#: ../app/core/core-enums.c:852
 msgctxt "undo-type"
 msgid "Item properties"
 msgstr "é ?ç?®å±¬æ?§"
 
-#: ../app/core/core-enums.c:886
-#: ../app/core/core-enums.c:916
+#: ../app/core/core-enums.c:853 ../app/core/core-enums.c:883
 msgctxt "undo-type"
 msgid "Move item"
 msgstr "ç§»å??é ?ç?®"
 
-#: ../app/core/core-enums.c:887
+#: ../app/core/core-enums.c:854
 msgctxt "undo-type"
 msgid "Scale item"
 msgstr "ç¸®æ?¾é ?ç?®"
 
-#: ../app/core/core-enums.c:888
+#: ../app/core/core-enums.c:855
 msgctxt "undo-type"
 msgid "Resize item"
 msgstr "èª¿æ?´é ?ç?®å¤§å°?"
 
-#: ../app/core/core-enums.c:889
+#: ../app/core/core-enums.c:856
 msgctxt "undo-type"
 msgid "Add layer"
 msgstr "å? å?¥å??å±¤"
 
-#: ../app/core/core-enums.c:890
-#: ../app/core/core-enums.c:929
+#: ../app/core/core-enums.c:857 ../app/core/core-enums.c:896
 msgctxt "undo-type"
 msgid "Add layer mask"
 msgstr "å? å?¥å??å±¤é?®ç½©"
 
-#: ../app/core/core-enums.c:891
-#: ../app/core/core-enums.c:931
+#: ../app/core/core-enums.c:858 ../app/core/core-enums.c:898
 msgctxt "undo-type"
 msgid "Apply layer mask"
 msgstr "å¥?ç?¨å??å±¤é?®ç½©"
 
-#: ../app/core/core-enums.c:892
-#: ../app/core/core-enums.c:939
+#: ../app/core/core-enums.c:859 ../app/core/core-enums.c:906
 msgctxt "undo-type"
 msgid "Floating selection to layer"
 msgstr "æµ®å??é?¸å??å??å??è½?æ??ç?ºå??å±¤"
 
-#: ../app/core/core-enums.c:893
+#: ../app/core/core-enums.c:860
 msgctxt "undo-type"
 msgid "Float selection"
 msgstr "æµ®å??é?¸å??å??å??"
 
-#: ../app/core/core-enums.c:894
+#: ../app/core/core-enums.c:861
 msgctxt "undo-type"
 msgid "Anchor floating selection"
 msgstr "å?ºå®?æµ®å??ç??é?¸å??å??å??"
 
-#: ../app/core/core-enums.c:895
-#: ../app/core/gimp-edit.c:262
+#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:262
 msgctxt "undo-type"
 msgid "Paste"
 msgstr "è²¼ä¸?"
 
-#: ../app/core/core-enums.c:896
-#: ../app/core/gimp-edit.c:501
+#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:501
 msgctxt "undo-type"
 msgid "Cut"
 msgstr "å?ªä¸?"
 
-#: ../app/core/core-enums.c:897
+#: ../app/core/core-enums.c:864
 msgctxt "undo-type"
 msgid "Text"
 msgstr "æ??å?"
 
-#: ../app/core/core-enums.c:898
-#: ../app/core/core-enums.c:940
+#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:907
 #: ../app/core/gimpdrawable-transform.c:567
 msgctxt "undo-type"
 msgid "Transform"
 msgstr "è®?æ??"
 
-#: ../app/core/core-enums.c:899
-#: ../app/core/core-enums.c:941
+#: ../app/core/core-enums.c:866 ../app/core/core-enums.c:908
 msgctxt "undo-type"
 msgid "Paint"
 msgstr "ç¹ªç?«"
 
-#: ../app/core/core-enums.c:900
-#: ../app/core/core-enums.c:944
+#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:911
 msgctxt "undo-type"
 msgid "Attach parasite"
 msgstr "é??å¸¶è³?è¨?"
 
-#: ../app/core/core-enums.c:901
-#: ../app/core/core-enums.c:945
+#: ../app/core/core-enums.c:868 ../app/core/core-enums.c:912
 msgctxt "undo-type"
 msgid "Remove parasite"
 msgstr "ç§»é?¤é??å¸¶è³?è¨?"
 
-#: ../app/core/core-enums.c:902
+#: ../app/core/core-enums.c:869
 msgctxt "undo-type"
 msgid "Import paths"
 msgstr "å?¯å?¥è·¯å¾?"
 
-#: ../app/core/core-enums.c:903
+#: ../app/core/core-enums.c:870
 msgctxt "undo-type"
 msgid "Plug-In"
 msgstr "å¤?æ??ç¨?å¼?"
 
-#: ../app/core/core-enums.c:904
+#: ../app/core/core-enums.c:871
 msgctxt "undo-type"
 msgid "Image type"
 msgstr "å??ç??é¡?å??"
 
-#: ../app/core/core-enums.c:905
+#: ../app/core/core-enums.c:872
 msgctxt "undo-type"
 msgid "Image size"
 msgstr "å??ç??å¤§å°?"
 
-#: ../app/core/core-enums.c:906
+#: ../app/core/core-enums.c:873
 msgctxt "undo-type"
 msgid "Image resolution change"
 msgstr "å??ç??è§£å??åº¦æ?¹è®?"
 
-#: ../app/core/core-enums.c:908
+#: ../app/core/core-enums.c:875
 msgctxt "undo-type"
 msgid "Change indexed palette"
 msgstr "æ?´æ?¹ç´¢å¼?è?²èª¿è?²ç?¤"
 
-#: ../app/core/core-enums.c:914
+#: ../app/core/core-enums.c:881
 msgctxt "undo-type"
 msgid "Reorder item"
 msgstr "é??æ?°ç·¨æ??é ?ç?®æ¬¡åº?"
 
-#: ../app/core/core-enums.c:915
+#: ../app/core/core-enums.c:882
 msgctxt "undo-type"
 msgid "Rename item"
 msgstr "æ?´æ?¹é ?ç?®å??ç¨±"
 
-#: ../app/core/core-enums.c:919
+#: ../app/core/core-enums.c:886
 msgctxt "undo-type"
 msgid "New layer"
 msgstr "æ?°å¢?å??å±¤"
 
-#: ../app/core/core-enums.c:920
+#: ../app/core/core-enums.c:887
 msgctxt "undo-type"
 msgid "Delete layer"
 msgstr "å?ªé?¤å??å±¤"
 
-#: ../app/core/core-enums.c:921
+#: ../app/core/core-enums.c:888
 msgctxt "undo-type"
 msgid "Set layer mode"
 msgstr "è¨å®?å??å±¤æ¨¡å¼?"
 
-#: ../app/core/core-enums.c:922
+#: ../app/core/core-enums.c:889
 msgctxt "undo-type"
 msgid "Set layer opacity"
 msgstr "è¨å®?å??å±¤ä¸?é??æ??åº¦"
 
-#: ../app/core/core-enums.c:923
+#: ../app/core/core-enums.c:890
 msgctxt "undo-type"
 msgid "Lock/Unlock alpha channel"
 msgstr "é??å®?/è§£é??é??æ??è?²ç??"
 
-#: ../app/core/core-enums.c:924
+#: ../app/core/core-enums.c:891
 msgctxt "undo-type"
 msgid "Suspend group layer resize"
 msgstr "æ?«å??å??å±¤ç¾£çµ?å°ºå¯¸èª¿æ?´"
 
-#: ../app/core/core-enums.c:925
+#: ../app/core/core-enums.c:892
 msgctxt "undo-type"
 msgid "Resume group layer resize"
 msgstr "æ?¢å¾©å??å±¤ç¾£çµ?å°ºå¯¸èª¿æ?´"
 
-#: ../app/core/core-enums.c:926
+#: ../app/core/core-enums.c:893
 msgctxt "undo-type"
 msgid "Convert group layer"
 msgstr "è½?æ??å??å±¤ç¾£çµ?"
 
-#: ../app/core/core-enums.c:927
+#: ../app/core/core-enums.c:894
 msgctxt "undo-type"
 msgid "Text layer"
 msgstr "æ??å?å??å±¤"
 
-#: ../app/core/core-enums.c:928
+#: ../app/core/core-enums.c:895
 msgctxt "undo-type"
 msgid "Text layer modification"
 msgstr "æ??å?å??å±¤ä¿®æ?¹"
 
-#: ../app/core/core-enums.c:930
+#: ../app/core/core-enums.c:897
 msgctxt "undo-type"
 msgid "Delete layer mask"
 msgstr "å?ªé?¤å??å±¤é?®ç½©"
 
-#: ../app/core/core-enums.c:932
+#: ../app/core/core-enums.c:899
 msgctxt "undo-type"
 msgid "Show layer mask"
 msgstr "é¡¯ç¤ºå??å±¤é?®ç½©"
 
-#: ../app/core/core-enums.c:933
+#: ../app/core/core-enums.c:900
 msgctxt "undo-type"
 msgid "New channel"
 msgstr "æ?°å¢?è?²ç??"
 
-#: ../app/core/core-enums.c:934
+#: ../app/core/core-enums.c:901
 msgctxt "undo-type"
 msgid "Delete channel"
 msgstr "å?ªé?¤è?²ç??"
 
-#: ../app/core/core-enums.c:935
+#: ../app/core/core-enums.c:902
 msgctxt "undo-type"
 msgid "Channel color"
 msgstr "è?²ç??é¡?è?²"
 
-#: ../app/core/core-enums.c:936
+#: ../app/core/core-enums.c:903
 msgctxt "undo-type"
 msgid "New path"
 msgstr "æ?°å¢?è·¯å¾?"
 
-#: ../app/core/core-enums.c:937
+#: ../app/core/core-enums.c:904
 msgctxt "undo-type"
 msgid "Delete path"
 msgstr "å?ªé?¤è·¯å¾?"
 
-#: ../app/core/core-enums.c:938
+#: ../app/core/core-enums.c:905
 msgctxt "undo-type"
 msgid "Path modification"
 msgstr "è·¯å¾?ä¿®æ?¹"
 
-#: ../app/core/core-enums.c:942
+#: ../app/core/core-enums.c:909
 msgctxt "undo-type"
 msgid "Ink"
 msgstr "å¢¨æ°´ç?"
 
-#: ../app/core/core-enums.c:943
+#: ../app/core/core-enums.c:910
 msgctxt "undo-type"
 msgid "Select foreground"
 msgstr "é?¸å??å??æ?¯"
 
-#: ../app/core/core-enums.c:946
+#: ../app/core/core-enums.c:913
 msgctxt "undo-type"
 msgid "Not undoable"
 msgstr "ç?¡æ³?å¾©å??"
 
-#: ../app/core/core-enums.c:1218
+#: ../app/core/core-enums.c:1185
 msgctxt "select-criterion"
 msgid "Composite"
 msgstr "çµ?å??"
 
-#: ../app/core/core-enums.c:1219
+#: ../app/core/core-enums.c:1186
 msgctxt "select-criterion"
 msgid "Red"
 msgstr "ç´?"
 
-#: ../app/core/core-enums.c:1220
+#: ../app/core/core-enums.c:1187
 msgctxt "select-criterion"
 msgid "Green"
 msgstr "ç¶ "
 
-#: ../app/core/core-enums.c:1221
+#: ../app/core/core-enums.c:1188
 msgctxt "select-criterion"
 msgid "Blue"
 msgstr "è??"
 
-#: ../app/core/core-enums.c:1222
+#: ../app/core/core-enums.c:1189
 msgctxt "select-criterion"
 msgid "Hue"
 msgstr "è?²ç?¸"
 
-#: ../app/core/core-enums.c:1223
+#: ../app/core/core-enums.c:1190
 msgctxt "select-criterion"
 msgid "Saturation"
 msgstr "é£½å??åº¦"
 
-#: ../app/core/core-enums.c:1224
+#: ../app/core/core-enums.c:1191
 msgctxt "select-criterion"
 msgid "Value"
 msgstr "äº®åº¦"
 
-#: ../app/core/core-enums.c:1253
+#: ../app/core/core-enums.c:1220
 msgctxt "message-severity"
 msgid "Message"
 msgstr "è¨?æ?¯"
 
-#: ../app/core/core-enums.c:1254
+#: ../app/core/core-enums.c:1221
 msgctxt "message-severity"
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../app/core/core-enums.c:1255
+#: ../app/core/core-enums.c:1222
 msgctxt "message-severity"
 msgid "Error"
 msgstr "é?¯èª¤"
 
-#: ../app/core/core-enums.c:1284
+#: ../app/core/core-enums.c:1251
 msgctxt "color-profile-policy"
 msgid "Ask what to do"
 msgstr "è©¢å??è¦?å??ä»?éº¼"
 
-#: ../app/core/core-enums.c:1285
+#: ../app/core/core-enums.c:1252
 msgctxt "color-profile-policy"
 msgid "Keep embedded profile"
 msgstr "ä¿?ç??åµ?å?¥ç??é??ç½®æª?"
 
-#: ../app/core/core-enums.c:1286
+#: ../app/core/core-enums.c:1253
 msgctxt "color-profile-policy"
 msgid "Convert to RGB workspace"
 msgstr "è½?æ??å?° RGB å·¥ä½?ç©ºé??"
 
-#: ../app/core/core-enums.c:1323
+#: ../app/core/core-enums.c:1290
 msgctxt "dynamics-output-type"
 msgid "Opacity"
 msgstr "ä¸?é??æ??åº¦"
 
-#: ../app/core/core-enums.c:1324
+#: ../app/core/core-enums.c:1291
 msgctxt "dynamics-output-type"
 msgid "Size"
 msgstr "å¤§å°?"
 
-#: ../app/core/core-enums.c:1325
+#: ../app/core/core-enums.c:1292
 msgctxt "dynamics-output-type"
 msgid "Angle"
 msgstr "è§?åº¦"
 
-#: ../app/core/core-enums.c:1326
+#: ../app/core/core-enums.c:1293
 msgctxt "dynamics-output-type"
 msgid "Color"
 msgstr "é¡?è?²"
 
-#: ../app/core/core-enums.c:1327
+#: ../app/core/core-enums.c:1294
 msgctxt "dynamics-output-type"
 msgid "Hardness"
 msgstr "ç¡¬åº¦"
 
-#: ../app/core/core-enums.c:1328
+#: ../app/core/core-enums.c:1295
 msgctxt "dynamics-output-type"
 msgid "Force"
 msgstr "å??é??"
 
-#: ../app/core/core-enums.c:1329
+#: ../app/core/core-enums.c:1296
 msgctxt "dynamics-output-type"
 msgid "Aspect ratio"
 msgstr "é?·å¯¬æ¯?"
 
-#: ../app/core/core-enums.c:1330
+#: ../app/core/core-enums.c:1297
 msgctxt "dynamics-output-type"
 msgid "Spacing"
 msgstr "é??é??"
 
-#: ../app/core/core-enums.c:1331
+#: ../app/core/core-enums.c:1298
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Rate"
 msgstr "Rate"
 
-#: ../app/core/core-enums.c:1332
+#: ../app/core/core-enums.c:1299
 msgctxt "dynamics-output-type"
 msgid "Flow"
 msgstr "æµ?å??"
 
-#: ../app/core/core-enums.c:1333
+#: ../app/core/core-enums.c:1300
 msgctxt "dynamics-output-type"
 msgid "Jitter"
 msgstr "æ??å??"
 
-#: ../app/core/gimp-contexts.c:154
-#: ../app/core/gimptooloptions.c:344
-#: ../app/gui/session.c:349
-#: ../app/menus/menus.c:464
-#: ../app/widgets/gimpdevices.c:269
+#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:344
+#: ../app/gui/session.c:349 ../app/menus/menus.c:464
+#: ../app/widgets/gimpdevices.c:270
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
 msgstr "å?ªé?¤â??%sâ??å¤±æ??ï¼?%s"
 
-#: ../app/core/gimp-edit.c:190
-#: ../app/core/gimpimage-new.c:304
+#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:304
 msgid "Pasted Layer"
 msgstr "è²¼ä¸?ç??å??å±¤"
 
@@ -7196,6 +7227,12 @@ msgstr "å??æ?¯è?²è?³è??æ?¯è?²(HSV é ?æ??é??è?²ç?¸)"
 msgid "FG to Transparent"
 msgstr "å??æ?¯è?²è?³é??æ??"
 
+#. This is a special string to specify the language identifier to
+#. * look for in the gimp-tags-default.xml file. Please translate the
+#. * C in it according to the name of the po file used for
+#. * gimp-tags-default.xml. E.g. lithuanian for the translation,
+#. * that would be "tags-locale:lt".
+#.
 #: ../app/core/gimp-tags.c:88
 #, fuzzy
 msgid "tags-locale:C"
@@ -7203,12 +7240,16 @@ msgstr "ç?®å??ç??å?°å??è¨å®?"
 
 #: ../app/core/gimp-user-install.c:154
 #, c-format
-msgid "It seems you have used GIMP %s before.  GIMP will now migrate your user settings to '%s'."
+msgid ""
+"It seems you have used GIMP %s before.  GIMP will now migrate your user "
+"settings to '%s'."
 msgstr "ä½ ä¼¼ä¹?ä»¥å??æ?¾ä½¿ç?¨é?? GIMP %sã??GIMP ç?¾å?¨å°?æ??ä½ ç??ä½¿ç?¨è??è¨å®?å?¼è½?ç§»ç?ºâ??%sâ??ã??"
 
 #: ../app/core/gimp-user-install.c:159
 #, c-format
-msgid "It appears that you are using GIMP for the first time.  GIMP will now create a folder named '%s' and copy some files to it."
+msgid ""
+"It appears that you are using GIMP for the first time.  GIMP will now create "
+"a folder named '%s' and copy some files to it."
 msgstr "é??ä¼¼ä¹?æ?¯ä½ ç¬¬ä¸?æ¬¡ä½¿ç?¨ GIMPã??GIMP ç?¾å?¨å°?å»ºç«?ä¸?å??å??ç?ºâ??%sâ??ç??è³?æ??å¤¾ä¸¦è¤?è£½ä¸?äº?æª?æ¡?é?²å?»ã??"
 
 #: ../app/core/gimp-user-install.c:311
@@ -7216,14 +7257,12 @@ msgstr "é??ä¼¼ä¹?æ?¯ä½ ç¬¬ä¸?æ¬¡ä½¿ç?¨ GIMPã??GIMP ç?¾å?¨å°?å»ºç«?ä¸?å??å??ç?º
 msgid "Copying file '%s' from '%s'..."
 msgstr "å¾?â??%2$sâ??è¤?è£½æª?æ¡?â??%1$sâ??..."
 
-#: ../app/core/gimp-user-install.c:326
-#: ../app/core/gimp-user-install.c:352
+#: ../app/core/gimp-user-install.c:326 ../app/core/gimp-user-install.c:352
 #, c-format
 msgid "Creating folder '%s'..."
 msgstr "å»ºç«?ç?®é??â??%sâ??..."
 
-#: ../app/core/gimp-user-install.c:337
-#: ../app/core/gimp-user-install.c:363
+#: ../app/core/gimp-user-install.c:337 ../app/core/gimp-user-install.c:363
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é??â??%sâ??ï¼?%s"
@@ -7232,10 +7271,12 @@ msgstr "ç?¡æ³?å»ºç«?ç?®é??â??%sâ??ï¼?%s"
 msgid "Initialization"
 msgstr "å??å§?å??"
 
+#. register all internal procedures
 #: ../app/core/gimp.c:698
 msgid "Internal Procedures"
 msgstr "å?§é?¨ç¨?åº?"
 
+#. initialize  the global parasite table
 #: ../app/core/gimp.c:949
 msgid "Looking for data files"
 msgstr "æ£å?¨å°?æ?¾è³?æ??æª?"
@@ -7244,20 +7285,23 @@ msgstr "æ£å?¨å°?æ?¾è³?æ??æª?"
 msgid "Parasites"
 msgstr "é??å¸¶è³?è¨?"
 
-#: ../app/core/gimp.c:958
-#: ../app/dialogs/preferences-dialog.c:2724
+#. initialize the list of gimp dynamics
+#: ../app/core/gimp.c:958 ../app/dialogs/preferences-dialog.c:2722
+#: ../app/tools/gimppaintoptions-gui.c:159
 msgid "Dynamics"
 msgstr "ç?å?·å??æ??"
 
+#. initialize the list of fonts
 #: ../app/core/gimp.c:978
 msgid "Fonts (this may take a while)"
 msgstr "å?å??ï¼?é??å?¯è?½æ??è?±é»?æ??é??ï¼?"
 
-#: ../app/core/gimp.c:992
-#: ../app/dialogs/preferences-dialog.c:2752
+#. initialize the module list
+#: ../app/core/gimp.c:992 ../app/dialogs/preferences-dialog.c:2750
 msgid "Modules"
 msgstr "æ¨¡çµ?"
 
+#. update tag cache
 #: ../app/core/gimp.c:996
 #, fuzzy
 msgid "Updating tag cache"
@@ -7293,22 +7337,19 @@ msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?è?²å½©æ·±åº¦æ?¸ç?® %d 
 msgid "Fatal parse error in brush file '%s': Unknown version %d."
 msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç??æ?¬ %d ä¸?æ??ã??"
 
-#: ../app/core/gimpbrush-load.c:269
-#: ../app/core/gimpbrush-load.c:389
+#: ../app/core/gimpbrush-load.c:269 ../app/core/gimpbrush-load.c:389
 #: ../app/core/gimpbrush-load.c:722
 #, c-format
 msgid "Fatal parse error in brush file '%s': File appears truncated."
 msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?æª?æ¡?ä¼¼ä¹?è¢«æ?ªç?äº?ã??"
 
-#: ../app/core/gimpbrush-load.c:277
-#: ../app/core/gimpbrushgenerated-load.c:128
+#: ../app/core/gimpbrush-load.c:277 ../app/core/gimpbrushgenerated-load.c:128
 #: ../app/core/gimpbrushpipe-load.c:97
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "ç?å?·æª?æ¡? â??%sâ?? ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²ã??"
 
-#: ../app/core/gimpbrush-load.c:284
-#: ../app/core/gimppattern-load.c:146
+#: ../app/core/gimpbrush-load.c:284 ../app/core/gimppattern-load.c:146
 #: ../app/dialogs/template-options-dialog.c:82
 #: ../app/tools/gimpvectortool.c:319
 msgid "Unnamed"
@@ -7325,7 +7366,8 @@ msgstr ""
 
 #: ../app/core/gimpbrush-load.c:450
 #, c-format
-msgid "Fatal parse error in brush file '%s': unable to decode abr format version %d."
+msgid ""
+"Fatal parse error in brush file '%s': unable to decode abr format version %d."
 msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç??æ?¬ %d ä¸?æ??ã??"
 
 #: ../app/core/gimpbrush-load.c:617
@@ -7344,12 +7386,14 @@ msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?å®?ä¸?æ?¯ GIMP ç?å?·
 
 #: ../app/core/gimpbrushgenerated-load.c:104
 #, c-format
-msgid "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
+msgid ""
+"Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
 msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç¬¬ %d è¡?ç?? GIMP ç?å?·ç??æ?¬ä¸?æ??"
 
 #: ../app/core/gimpbrushgenerated-load.c:150
 #, c-format
-msgid "Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d."
+msgid ""
+"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d."
 msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç¬¬ %d è¡?ç?? GIMP ç?å?·å½¢ç??ä¸?æ??"
 
 #: ../app/core/gimpbrushgenerated-load.c:226
@@ -7384,18 +7428,15 @@ msgstr "ç·¨è¼¯é?·é??"
 msgid "Brush Hardness"
 msgstr "ç?å?·ç¡¬åº¦"
 
-#: ../app/core/gimpbrushgenerated.c:159
-#: ../app/paint/gimppaintoptions.c:143
+#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:143
 msgid "Brush Aspect Ratio"
 msgstr "ç?å?·é?·å¯¬æ¯?"
 
-#: ../app/core/gimpbrushgenerated.c:166
-#: ../app/paint/gimppaintoptions.c:147
+#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:147
 msgid "Brush Angle"
 msgstr "ç?å?·è§?åº¦"
 
-#: ../app/core/gimpbrushpipe-load.c:113
-#: ../app/core/gimpbrushpipe-load.c:133
+#: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133
 #: ../app/core/gimpbrushpipe-load.c:224
 #, c-format
 msgid "Fatal parse error in brush file '%s': File is corrupt."
@@ -7416,8 +7457,7 @@ msgctxt "undo-type"
 msgid "Rounded Rectangle Select"
 msgstr "å??è§?ç?©å½¢é?¸å??"
 
-#: ../app/core/gimpchannel-select.c:433
-#: ../app/core/gimplayer.c:273
+#: ../app/core/gimpchannel-select.c:433 ../app/core/gimplayer.c:273
 #, fuzzy
 msgctxt "undo-type"
 msgid "Alpha to Selection"
@@ -7427,7 +7467,7 @@ msgstr "å? å?¥è?³é?¸æ??å??å??"
 #, c-format
 msgctxt "undo-type"
 msgid "%s Channel to Selection"
-msgstr "%s è?²ç??è½?ç?ºé?¸æ??å??å??"
+msgstr "%s è?²ç??è½?ç?ºé?¸å??å??å??"
 
 #: ../app/core/gimpchannel-select.c:519
 msgctxt "undo-type"
@@ -7469,8 +7509,7 @@ msgctxt "undo-type"
 msgid "Rotate Channel"
 msgstr "æ??è½?è?²ç??"
 
-#: ../app/core/gimpchannel.c:278
-#: ../app/core/gimpdrawable-transform.c:845
+#: ../app/core/gimpchannel.c:278 ../app/core/gimpdrawable-transform.c:845
 msgctxt "undo-type"
 msgid "Transform Channel"
 msgstr "è®?æ??è?²ç??"
@@ -7480,8 +7519,7 @@ msgctxt "undo-type"
 msgid "Stroke Channel"
 msgstr "æ ¹æ??è?²ç??æ??é??"
 
-#: ../app/core/gimpchannel.c:280
-#: ../app/core/gimpselection.c:584
+#: ../app/core/gimpchannel.c:280 ../app/core/gimpselection.c:584
 msgctxt "undo-type"
 msgid "Channel to Selection"
 msgstr "è?²ç??è½?ç?ºé?¸å??å??å??"
@@ -7573,30 +7611,26 @@ msgctxt "undo-type"
 msgid "Set Channel Opacity"
 msgstr "è¨å®?è?²ç??ä¸?é??æ??åº¦"
 
-#: ../app/core/gimpchannel.c:1926
-#: ../app/core/gimpselection.c:154
+#: ../app/core/gimpchannel.c:1926 ../app/core/gimpselection.c:154
 msgid "Selection Mask"
 msgstr "é?¸å??å??å??é?®ç½©"
 
-#: ../app/core/gimpcontext.c:640
+#: ../app/core/gimpcontext.c:640 ../app/tools/gimppaintoptions-gui.c:107
+#: ../app/tools/gimptransformoptions.c:332
 msgid "Opacity"
 msgstr "ä¸?é??æ??åº¦"
 
 #: ../app/core/gimpcontext.c:648
-#, fuzzy
 msgid "Paint Mode"
-msgstr "æ?·å¾?é?µæ¨¡å¼?"
+msgstr "ç?å?·æ¨¡å¼?"
 
-#: ../app/core/gimpdata.c:679
-#: ../app/core/gimptoolpresets.c:277
+#: ../app/core/gimpdata.c:679 ../app/core/gimptoolpresets.c:277
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "ç?¡æ³?å?ªé?¤â??%sâ??ï¼?%s"
 
-#: ../app/core/gimpdatafactory.c:427
-#: ../app/core/gimpdatafactory.c:456
-#: ../app/core/gimpdatafactory.c:622
-#: ../app/core/gimpdatafactory.c:644
+#: ../app/core/gimpdatafactory.c:427 ../app/core/gimpdatafactory.c:456
+#: ../app/core/gimpdatafactory.c:622 ../app/core/gimpdatafactory.c:644
 #, c-format
 msgid ""
 "Failed to save data:\n"
@@ -7607,28 +7641,31 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdatafactory.c:536
-#: ../app/core/gimpdatafactory.c:539
-#: ../app/core/gimpitem.c:425
-#: ../app/core/gimpitem.c:428
+#: ../app/core/gimpdatafactory.c:536 ../app/core/gimpdatafactory.c:539
+#: ../app/core/gimpitem.c:422 ../app/core/gimpitem.c:425
 msgid "copy"
 msgstr "è¤?æ?¬"
 
-#: ../app/core/gimpdatafactory.c:548
-#: ../app/core/gimpitem.c:437
+#: ../app/core/gimpdatafactory.c:548 ../app/core/gimpitem.c:434
 #, c-format
 msgid "%s copy"
 msgstr "%s è¤?æ?¬"
 
 #: ../app/core/gimpdatafactory.c:741
 #, c-format
-msgid "You have a writable data folder configured (%s), but this folder does not exist. Please create the folder or fix your configuation in the Preferences dialog's 'Folders' section."
-msgstr ""
+msgid ""
+"You have a writable data folder configured (%s), but this folder does not "
+"exist. Please create the folder or fix your configuation in the Preferences "
+"dialog's 'Folders' section."
+msgstr "ä½ æ??ä¸?å?¯å¯«å?¥æ?¸æ??ç??è³?æ??å¤¾é??ç½®(%s)ï¼?ä½?é??å??è³?æ??å¤¾ä¸?å?å?¨ã??è«?å»ºç«?è³?æ??å¤¾æ??ä¿®æ£ä½ å?¨ã??å??å¥½è¨å®?ã??å°?è©±ç??ä¸ã??è³?æ??å¤¾ã??é?¨ä»½ç??é??ç½®"
 
 #: ../app/core/gimpdatafactory.c:762
 #, c-format
-msgid "You have a writable data folder configured, but this folder is not part of your data search path. You probably edited the gimprc file manually, please fix it in the Preferences dialog's 'Folders' section."
-msgstr ""
+msgid ""
+"You have a writable data folder configured, but this folder is not part of "
+"your data search path. You probably edited the gimprc file manually, please "
+"fix it in the Preferences dialog's 'Folders' section."
+msgstr "ä½ æ??ä¸?å??å?¯å¯«æ?¸æ??ç??è³?æ??å¤¾é??ç½®ï¼?ä½?é??å??è³?æ??å¤¾æ?¯ä¸?å±¬æ?¼ä½ ç??æ?¸æ??æ??ç´¢è·¯å¾?ã??ä½ å?¯è?½è¦?æ??å??ç·¨è¼¯ gimprc æª?æ¡?ï¼?è«?å?¨[å??å¥½è¨å®?]å°?è©±ç??ä¸ç??[è³?æ??å¤¾]é?¨ä»½ä¸ä¿®å¾©å®?ã??"
 
 #: ../app/core/gimpdatafactory.c:772
 #, c-format
@@ -7647,7 +7684,6 @@ msgstr ""
 "%s"
 
 #: ../app/core/gimpdrawable-blend.c:244
-#, fuzzy
 msgctxt "undo-type"
 msgid "Blend"
 msgstr "æ··è?²"
@@ -7684,8 +7720,7 @@ msgctxt "undo-type"
 msgid "Colorize"
 msgstr "è?²å½©å??"
 
-#: ../app/core/gimpdrawable-curves.c:162
-#: ../app/core/gimpdrawable-curves.c:179
+#: ../app/core/gimpdrawable-curves.c:162 ../app/core/gimpdrawable-curves.c:179
 msgctxt "undo-type"
 msgid "Curves"
 msgstr "æ?²ç·?"
@@ -7714,13 +7749,11 @@ msgstr "è?²ç?¸å??é£½å??åº¦"
 msgid "Hue_Saturation"
 msgstr "è?²ç?¸å??é£½å??åº¦(_S)"
 
-#: ../app/core/gimpdrawable-invert.c:54
-#: ../app/core/gimpdrawable-invert.c:62
+#: ../app/core/gimpdrawable-invert.c:54 ../app/core/gimpdrawable-invert.c:62
 msgid "Invert"
-msgstr "å??ç?¸"
+msgstr "è² ç??æ??æ??"
 
-#: ../app/core/gimpdrawable-levels.c:153
-#: ../app/core/gimpdrawable-levels.c:169
+#: ../app/core/gimpdrawable-levels.c:153 ../app/core/gimpdrawable-levels.c:169
 #: ../app/tools/gimplevelstool.c:150
 msgid "Levels"
 msgstr "è?²é??"
@@ -7732,19 +7765,25 @@ msgid "Offset Drawable"
 msgstr "æ?²å??å??ç§»"
 
 #: ../app/core/gimpdrawable-posterize.c:69
-#: ../app/core/gimpdrawable-posterize.c:79
-#: ../app/tools/gimpposterizetool.c:84
+#: ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84
 msgid "Posterize"
 msgstr "è?²èª¿å??é?¢"
 
-#: ../app/core/gimpdrawable-stroke.c:435
+#: ../app/core/gimpdrawable-stroke.c:327
+#: ../app/paint/gimppaintcore-stroke.c:336 ../app/vectors/gimpvectors.c:557
+msgid "Not enough points to stroke"
+msgstr "æ²?æ??è¶³å¤ ç??ç?å??é»?"
+
+#: ../app/core/gimpdrawable-stroke.c:455
 #, fuzzy
 msgctxt "undo-type"
 msgid "Render Stroke"
 msgstr "æº?å??æ??ç¹ªç??æ??å?"
 
 #: ../app/core/gimpdrawable-threshold.c:70
-#: ../app/core/gimpdrawable-threshold.c:81
+#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:274
+#: ../app/tools/gimpbucketfilloptions.c:284
+#: ../app/tools/gimpregionselectoptions.c:214
 #: ../app/tools/gimpthresholdtool.c:90
 msgid "Threshold"
 msgstr "è?¨ç??å?¼"
@@ -7759,8 +7798,7 @@ msgctxt "undo-type"
 msgid "Rotate"
 msgstr "æ??è½?"
 
-#: ../app/core/gimpdrawable-transform.c:843
-#: ../app/core/gimplayer.c:272
+#: ../app/core/gimpdrawable-transform.c:843 ../app/core/gimplayer.c:272
 #, fuzzy
 msgctxt "undo-type"
 msgid "Transform Layer"
@@ -7770,7 +7808,7 @@ msgstr "è¼?å?©é?µå±¤ç´?"
 msgid "Transformation"
 msgstr "è®?æ??"
 
-#: ../app/core/gimpdrawable.c:486
+#: ../app/core/gimpdrawable.c:483
 msgctxt "undo-type"
 msgid "Scale"
 msgstr "ç¸®æ?¾"
@@ -7779,10 +7817,8 @@ msgstr "ç¸®æ?¾"
 msgid "Output type"
 msgstr "è¼¸å?ºé¡?å??"
 
-#: ../app/core/gimpgradient-load.c:71
-#: ../app/core/gimpgradient-load.c:96
-#: ../app/core/gimpgradient-load.c:117
-#: ../app/core/gimpgradient-load.c:168
+#: ../app/core/gimpgradient-load.c:71 ../app/core/gimpgradient-load.c:96
+#: ../app/core/gimpgradient-load.c:117 ../app/core/gimpgradient-load.c:168
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Read error in line %d."
 msgstr "å??æ??æ¼¸è®?è?²æª?æ¡?â??%sâ??ç??å?§å®¹æ??å?ºç?¾å?´é??é?¯èª¤ï¼?è®?å?¥ç¬¬ %d è¡?æ??ç?¼ç??é?¯èª¤ã??"
@@ -7802,14 +7838,12 @@ msgstr "æ¼¸è®?è?²æª?æ¡?â??%sâ??ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²ã??"
 msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d."
 msgstr "å??æ??æ¼¸è®?è?²æª?æ¡? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?æª?æ¡?å?§å®¹ç¬¬ %d è¡?å·²æ??å£?ã??"
 
-#: ../app/core/gimpgradient-load.c:218
-#: ../app/core/gimpgradient-load.c:229
+#: ../app/core/gimpgradient-load.c:218 ../app/core/gimpgradient-load.c:229
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d."
 msgstr "å??æ??æ¼¸è®?è?²æª?æ¡? â??%1$sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç¬¬ %3$d è¡?ç??ç??æ®µ %2$d å·²æ??å£?ã??"
 
-#: ../app/core/gimpgradient-load.c:241
-#: ../app/core/gimpgradient-load.c:255
+#: ../app/core/gimpgradient-load.c:241 ../app/core/gimpgradient-load.c:255
 #, c-format
 msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1."
 msgstr "æ¼¸è®?è?²æª?æ¡?â??%sâ??å·²æ??å£?ï¼?å??æ®µä¸?è?½è¶?é?? 0-1 ç??ç¯?å??ã??"
@@ -7833,7 +7867,8 @@ msgid "The foreground color of the grid."
 msgstr "æ ¼ç·?ç??ç·?æ¢?é¡?è?²ã??"
 
 #: ../app/core/gimpgrid.c:94
-msgid "The background color of the grid; only used in double dashed line style."
+msgid ""
+"The background color of the grid; only used in double dashed line style."
 msgstr "æ ¼ç·?ç??è??æ?¯é¡?è?²ï¼?æ?¬è¨å®?å?ªæ??å?¨é??é??è??ç·?ä¸ä½¿ç?¨ã??"
 
 #: ../app/core/gimpgrid.c:100
@@ -7845,7 +7880,8 @@ msgid "Vertical spacing of grid lines."
 msgstr "æ¯?å?©æ¢?æ ¼ç·?ä¹?é??ç??å??ç?´é??è·?ã??"
 
 #: ../app/core/gimpgrid.c:114
-msgid "Horizontal offset of the first grid line; this may be a negative number."
+msgid ""
+"Horizontal offset of the first grid line; this may be a negative number."
 msgstr "ç¬¬ä¸?æ¢?æ°´å¹³æ ¼ç·?ç??ä½?ç½®ï¼?å?¯ä»¥æ?¯è² æ?¸ã??"
 
 #: ../app/core/gimpgrid.c:121
@@ -7896,45 +7932,50 @@ msgctxt "undo-type"
 msgid "Arrange Objects"
 msgstr "æ??å??ç?©ä»¶"
 
-#: ../app/core/gimpimage-colormap.c:67
+#: ../app/core/gimpimage-colormap.c:63
+#, c-format
+msgid "Colormap of Image #%d (%s)"
+msgstr ""
+
+#: ../app/core/gimpimage-colormap.c:161
 msgctxt "undo-type"
 msgid "Set Colormap"
 msgstr "è¨ç½®é¡?è?²å°?æ??è¡¨"
 
-#: ../app/core/gimpimage-colormap.c:132
+#: ../app/core/gimpimage-colormap.c:242
 msgctxt "undo-type"
 msgid "Change Colormap entry"
 msgstr "æ?¹è®?é¡?è?²å°?æ??è¡¨é ?ç?®"
 
-#: ../app/core/gimpimage-colormap.c:157
+#: ../app/core/gimpimage-colormap.c:270
 msgctxt "undo-type"
 msgid "Add Color to Colormap"
 msgstr "å? å?¥é¡?è?²è?³é¡?è?²å°?æ??è¡¨"
 
-#: ../app/core/gimpimage-convert.c:791
+#: ../app/core/gimpimage-convert.c:792
 msgid "Cannot convert image: palette is empty."
 msgstr "ä¸?è?½è½?æ??å??ç??ï¼?èª¿è?²ç?¤æ?¯ç©ºç??ã??"
 
-#: ../app/core/gimpimage-convert.c:807
+#: ../app/core/gimpimage-convert.c:808
 msgctxt "undo-type"
 msgid "Convert Image to RGB"
 msgstr "è½?æ??å??ç??ç?º RGB æ¨¡å¼?"
 
-#: ../app/core/gimpimage-convert.c:811
+#: ../app/core/gimpimage-convert.c:812
 msgctxt "undo-type"
 msgid "Convert Image to Grayscale"
 msgstr "å??ç??è½?æ??ç?ºç?°é??"
 
-#: ../app/core/gimpimage-convert.c:815
+#: ../app/core/gimpimage-convert.c:816
 msgctxt "undo-type"
 msgid "Convert Image to Indexed"
 msgstr "å°?å??ç??æ¨¡å¼?è½?æ??ç?ºç´¢å¼?è?²"
 
-#: ../app/core/gimpimage-convert.c:894
+#: ../app/core/gimpimage-convert.c:895
 msgid "Converting to indexed colors (stage 2)"
 msgstr "å°?å??ç??è?²ç³»è½?æ??ç?ºç´¢å¼?è?² (ç¬¬ 2 æ¥é©?)"
 
-#: ../app/core/gimpimage-convert.c:939
+#: ../app/core/gimpimage-convert.c:940
 msgid "Converting to indexed colors (stage 3)"
 msgstr "å°?å??ç??è?²ç³»è½?æ??ç?ºç´¢å¼?è?² (ç¬¬ 3 æ¥é©?)"
 
@@ -7943,8 +7984,7 @@ msgctxt "undo-type"
 msgid "Crop Image"
 msgstr "è£?å?ªå??ç??"
 
-#: ../app/core/gimpimage-crop.c:132
-#: ../app/core/gimpimage-resize.c:86
+#: ../app/core/gimpimage-crop.c:132 ../app/core/gimpimage-resize.c:86
 msgctxt "undo-type"
 msgid "Resize Image"
 msgstr "èª¿æ?´å??ç??å¤§å°?"
@@ -7990,8 +8030,7 @@ msgctxt "undo-type"
 msgid "Transform Items"
 msgstr "æµ®å??é ?ç?®"
 
-#: ../app/core/gimpimage-merge.c:108
-#: ../app/core/gimpimage-merge.c:122
+#: ../app/core/gimpimage-merge.c:108 ../app/core/gimpimage-merge.c:122
 msgctxt "undo-type"
 msgid "Merge Visible Layers"
 msgstr "å??ä½µç??å¾?è¦?ç??å??å±¤"
@@ -8071,17 +8110,17 @@ msgstr "ç¸®æ?¾å??ç??"
 msgid "Can't undo %s"
 msgstr "ç?¡æ³?å¾©å?? %s"
 
-#: ../app/core/gimpimage.c:1758
+#: ../app/core/gimpimage.c:1648
 msgctxt "undo-type"
 msgid "Change Image Resolution"
 msgstr "æ?´æ?¹å??ç??è§£å??åº¦"
 
-#: ../app/core/gimpimage.c:1810
+#: ../app/core/gimpimage.c:1700
 msgctxt "undo-type"
 msgid "Change Image Unit"
 msgstr "æ?´æ?¹å??ç??ç??é??åº¦å?®ä½?"
 
-#: ../app/core/gimpimage.c:2814
+#: ../app/core/gimpimage.c:2692
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite to Image"
@@ -8089,51 +8128,48 @@ msgstr ""
 "ç?¡æ³?è¼?å?¥å??ç??:\n"
 "%s"
 
-#: ../app/core/gimpimage.c:2855
+#: ../app/core/gimpimage.c:2733
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Parasite from Image"
 msgstr "å¾?æ?æ?¾æ¸?å?®ä¸ç§»é?¤æª?æ¡?"
 
-#: ../app/core/gimpimage.c:3564
+#: ../app/core/gimpimage.c:3442
 msgctxt "undo-type"
 msgid "Add Layer"
 msgstr "å? å?¥å??å±¤"
 
-#: ../app/core/gimpimage.c:3614
-#: ../app/core/gimpimage.c:3634
+#: ../app/core/gimpimage.c:3492 ../app/core/gimpimage.c:3512
 msgctxt "undo-type"
 msgid "Remove Layer"
 msgstr "ç§»é?¤å??å±¤"
 
-#: ../app/core/gimpimage.c:3627
+#: ../app/core/gimpimage.c:3505
 msgctxt "undo-type"
 msgid "Remove Floating Selection"
 msgstr "ç§»é?¤æµ®å??é?¸å??å??å??"
 
-#: ../app/core/gimpimage.c:3793
+#: ../app/core/gimpimage.c:3671
 msgctxt "undo-type"
 msgid "Add Channel"
 msgstr "æ?°å¢?è?²ç??"
 
-#: ../app/core/gimpimage.c:3831
-#: ../app/core/gimpimage.c:3843
+#: ../app/core/gimpimage.c:3709 ../app/core/gimpimage.c:3721
 msgctxt "undo-type"
 msgid "Remove Channel"
 msgstr "ç§»é?¤è?²ç??"
 
-#: ../app/core/gimpimage.c:3890
+#: ../app/core/gimpimage.c:3768
 msgctxt "undo-type"
 msgid "Add Path"
 msgstr "å? å?¥è·¯å¾?"
 
-#: ../app/core/gimpimage.c:3921
+#: ../app/core/gimpimage.c:3799
 msgctxt "undo-type"
 msgid "Remove Path"
 msgstr "ç§»é?¤è·¯å¾?"
 
-#: ../app/core/gimpimagefile.c:534
-#: ../app/dialogs/preferences-dialog.c:1711
+#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1711
 msgid "Folder"
 msgstr "è³?æ??å¤¾"
 
@@ -8165,18 +8201,16 @@ msgstr "ç?¡æ³?ç?¢ç??é ?è¦½å??"
 msgid "(Preview may be out of date)"
 msgstr "(é ?è¦½å??å·²é??æ??)"
 
-#: ../app/core/gimpimagefile.c:611
-#: ../app/widgets/gimpimagepropview.c:446
-#: ../app/widgets/gimpsizebox.c:434
-#: ../app/widgets/gimptemplateeditor.c:565
+#. pixel size
+#: ../app/core/gimpimagefile.c:611 ../app/widgets/gimpimagepropview.c:446
+#: ../app/widgets/gimpsizebox.c:437 ../app/widgets/gimptemplateeditor.c:568
 #, c-format
 msgid "%d Ã? %d pixel"
 msgid_plural "%d Ã? %d pixels"
 msgstr[0] "%d Ã? %d å??ç´ "
 msgstr[1] "%d Ã? %d å??ç´ "
 
-#: ../app/core/gimpimagefile.c:634
-#: ../app/display/gimpdisplayshell-title.c:339
+#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:339
 #, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
@@ -8188,20 +8222,19 @@ msgstr[1] "%d å??å??å±¤"
 msgid "Could not open thumbnail '%s': %s"
 msgstr "ç?¡æ³?é??å??ç¸®å??â??%sâ??ï¼?%s"
 
-#: ../app/core/gimpitem.c:1564
+#: ../app/core/gimpitem.c:1561
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite"
 msgstr "é??å? è¦?çª?å??ä»¶"
 
-#: ../app/core/gimpitem.c:1574
+#: ../app/core/gimpitem.c:1571
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite to Item"
 msgstr "å°?æ?¾å? å?¥è?³â??%sâ??ç??é ?ç?®(_I):"
 
-#: ../app/core/gimpitem.c:1616
-#: ../app/core/gimpitem.c:1623
+#: ../app/core/gimpitem.c:1613 ../app/core/gimpitem.c:1620
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Parasite from Item"
@@ -8212,9 +8245,10 @@ msgctxt "undo-type"
 msgid "Anchor Floating Selection"
 msgstr "å?ºå®?æµ®å??ç??é?¸å??å??å??"
 
-#: ../app/core/gimplayer-floating-sel.c:126
-#: ../app/core/gimplayer.c:595
-msgid "Cannot create a new layer from the floating selection because it belongs to a layer mask or channel."
+#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:595
+msgid ""
+"Cannot create a new layer from the floating selection because it belongs to "
+"a layer mask or channel."
 msgstr "ç?¡æ³?å¾?æµ®å??é?¸å??å??å??ç?¢ç??æ?°ç??å??å±¤ï¼?å? ç?ºå®?å±¬æ?¼å?¦ä¸?å??å??å±¤é?®ç½©æ??è?²ç??ã??"
 
 #: ../app/core/gimplayer-floating-sel.c:133
@@ -8285,8 +8319,7 @@ msgstr "å??å±¤ç?¡æ³?å??å??ä¸?ç§»ã??"
 msgid "Layer cannot be lowered more."
 msgstr "å??å±¤ç?¡æ³?å??å??ä¸?ç§»ã??"
 
-#: ../app/core/gimplayer.c:437
-#: ../app/core/gimplayer.c:1488
+#: ../app/core/gimplayer.c:437 ../app/core/gimplayer.c:1488
 #: ../app/core/gimplayermask.c:233
 #, c-format
 msgid "%s mask"
@@ -8320,8 +8353,7 @@ msgctxt "undo-type"
 msgid "Transfer Alpha to Mask"
 msgstr "å?¨ GdkPixmap ä¸?ä½¿ç?¨ç??é?®ç½©é»?é?£å??"
 
-#: ../app/core/gimplayer.c:1713
-#: ../app/core/gimplayermask.c:259
+#: ../app/core/gimplayer.c:1713 ../app/core/gimplayermask.c:259
 msgctxt "undo-type"
 msgid "Apply Layer Mask"
 msgstr "å¥?ç?¨å??å±¤é?®ç½©"
@@ -8376,10 +8408,8 @@ msgstr "ç´¢å¼? %d"
 msgid "Unknown type of palette file: %s"
 msgstr "ä¸?æ??é¡?å??ç??èª¿è?²ç?¤æª?æ¡?ï¼?%s"
 
-#: ../app/core/gimppalette-load.c:85
-#: ../app/core/gimppalette-load.c:111
-#: ../app/core/gimppalette-load.c:132
-#: ../app/core/gimppalette-load.c:161
+#: ../app/core/gimppalette-load.c:85 ../app/core/gimppalette-load.c:111
+#: ../app/core/gimppalette-load.c:132 ../app/core/gimppalette-load.c:161
 #: ../app/core/gimppalette-load.c:237
 #, c-format
 msgid "Fatal parse error in palette file '%s': Read error in line %d."
@@ -8397,7 +8427,9 @@ msgstr "èª¿è?²ç?¤æª?æ¡?â??%sâ??ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²"
 
 #: ../app/core/gimppalette-load.c:148
 #, c-format
-msgid "Reading palette file '%s': Invalid number of columns in line %d. Using default value."
+msgid ""
+"Reading palette file '%s': Invalid number of columns in line %d. Using "
+"default value."
 msgstr "è¼?å?¥èª¿è?²ç?¤â??%sâ??ï¼?ç¬¬ %d è¡?ç??æ¬?ä½?æ?¸ç?®ä¸?æ£ç¢ºï¼?æ?¹ç?¨é ?è¨å?¼ã??"
 
 #: ../app/core/gimppalette-load.c:184
@@ -8425,14 +8457,12 @@ msgstr "è¼?å?¥èª¿è?²ç?¤æª?æ¡?â??%sâ??ï¼?ç¬¬ %d è¡?ç?? RGB å?¼è¶?å?ºç¯?å??ã??"
 msgid "Could not read header from palette file '%s'"
 msgstr "ç?¡æ³?å¾?èª¿è?²ç?¤æª?æ¡?â??%sâ??è®?å??æ¨?é "
 
-#: ../app/core/gimppalette-load.c:500
-#: ../app/core/gimppalette-load.c:588
+#: ../app/core/gimppalette-load.c:500 ../app/core/gimppalette-load.c:588
 #, c-format
 msgid "Fatal parse error in palette file '%s'"
 msgstr "èª¿è?²ç?¤æª?æ¡?'%s'å?ºç?¾å?´é??é?¯èª¤è§£æ??"
 
-#: ../app/core/gimppattern-load.c:85
-#: ../app/core/gimppattern-load.c:131
+#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131
 #: ../app/core/gimppattern-load.c:162
 #, c-format
 msgid "Fatal parse error in pattern file '%s': File appears truncated."
@@ -8440,7 +8470,8 @@ msgstr "å??æ??å??æ¡?æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?æª?æ¡?ä¼¼ä¹?è¢«æ?ªç?
 
 #: ../app/core/gimppattern-load.c:104
 #, c-format
-msgid "Fatal parse error in pattern file '%s': Unknown pattern format version %d."
+msgid ""
+"Fatal parse error in pattern file '%s': Unknown pattern format version %d."
 msgstr "å??æ??å??æ¨£æª?æ¡?â??%sâ??æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç?¡æ³?ç??è§£å??æ¨£æ ¼å¼?ç??æ?¬â??%dâ??ã??"
 
 #: ../app/core/gimppattern-load.c:114
@@ -8457,14 +8488,12 @@ msgstr ""
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "èª¿è?²ç?¤æª?æ¡?â??%sâ??ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²ã??"
 
-#: ../app/core/gimppdbprogress.c:287
-#: ../app/widgets/gimppdbdialog.c:339
+#: ../app/core/gimppdbprogress.c:287 ../app/widgets/gimppdbdialog.c:339
 #, c-format
 msgid "Unable to run %s callback. The corresponding plug-in may have crashed."
 msgstr "ç?¡æ³?å?·è¡? %s ç?? callbackã??ç?¸æ??ç??å¢?æ??æ¨¡çµ?å?¯è?½å·²ç¶?ä¸?æ£å¸¸çµ?æ??ã??"
 
-#: ../app/core/gimpprogress.c:106
-#: ../app/core/gimpprogress.c:153
+#: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153
 msgid "Please wait"
 msgstr "è«?ç¨?å??"
 
@@ -8506,7 +8535,7 @@ msgstr "å??å??é?¸å??å??å??"
 #: ../app/core/gimpselection.c:177
 msgctxt "undo-type"
 msgid "Border Selection"
-msgstr "æ¡?ç·?å??é?¸æ??å??å??"
+msgstr "æ¡?ç·?å??é?¸å??å??å??"
 
 #: ../app/core/gimpselection.c:178
 #, fuzzy
@@ -8534,14 +8563,16 @@ msgstr "å? ç?ºé?¸å??å??å??æ?¯ç©ºç?½ç??ï¼?æ??ä»¥ç?¡æ³?ä»¤é?¸å??å??å??æµ®å??ã??"
 #: ../app/core/gimpselection.c:852
 msgctxt "undo-type"
 msgid "Float Selection"
-msgstr "æµ®å??é?¸æ??å??å??"
+msgstr "æµ®å??é?¸å??å??å??"
 
 #: ../app/core/gimpselection.c:868
 msgid "Floated Layer"
 msgstr "æµ®å??ç??å??å±¤"
 
 #: ../app/core/gimpstrokeoptions.c:151
-msgid "Convert a mitered join to a bevelled join if the miter would extend to a distance of more than miter-limit * line-width from the actual join point."
+msgid ""
+"Convert a mitered join to a bevelled join if the miter would extend to a "
+"distance of more than miter-limit * line-width from the actual join point."
 msgstr "å¦?æ??æ??æ?¥å?¯ä»¥å¾?å¯¦é??é?£æ?¥é»?å»¶ä¼¸å?°å¤§æ?¼æ??æ?¥é??å?¶ * ç·?æ¢?é??åº¦ç??è·?é?¢ï¼?å°?æ??æ?¥é?£æ?¥è½?æ??ç?ºæ??é??é?£æ?¥ã??"
 
 #: ../app/core/gimptemplate.c:100
@@ -8616,8 +8647,7 @@ msgctxt "plural"
 msgid "percent"
 msgstr "ç?¾å??æ¯?"
 
-#: ../app/dialogs/about-dialog.c:106
-#: ../app/gui/gui.c:482
+#: ../app/dialogs/about-dialog.c:106 ../app/gui/gui.c:479
 msgid "About GIMP"
 msgstr "é??æ?¼ GIMP"
 
@@ -8625,6 +8655,8 @@ msgstr "é??æ?¼ GIMP"
 msgid "Visit the GIMP website"
 msgstr "è¨ªå?? GIMP ç¶²ç«?"
 
+#. Translators: insert your names here,
+#. separated by newline
 #: ../app/dialogs/about-dialog.c:121
 msgid "translator-credits"
 msgstr ""
@@ -8669,8 +8701,8 @@ msgstr "é¡?è?²æ?¸ç?®ä¸?é??(_M):"
 msgid "_Remove unused colors from colormap"
 msgstr "å¾?é¡?è?²å°?æ??è¡¨ä¸ç§»é?¤æ?ªä½¿ç?¨ç??é¡?è?²(_R)"
 
-#: ../app/dialogs/convert-dialog.c:233
-#: ../app/tools/gimpblendoptions.c:246
+#. dithering
+#: ../app/dialogs/convert-dialog.c:233 ../app/tools/gimpblendoptions.c:253
 msgid "Dithering"
 msgstr "æ?¬è?²(Dithering)"
 
@@ -8686,13 +8718,11 @@ msgstr "æ?¬è?²æ??å°?é??æ??åº¦è¨?ç®?å?¨å?§(_T)"
 msgid "Converting to indexed colors"
 msgstr "æ£å?¨è½?æ??ç?ºç´¢å¼?è?²"
 
-#: ../app/dialogs/convert-dialog.c:414
-#: ../app/pdb/convert-cmds.c:152
+#: ../app/dialogs/convert-dialog.c:415 ../app/pdb/convert-cmds.c:152
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "ä¸?å?¯ä»¥è½?æ??è?³ä¸?å??å¤?æ?¼ 256 è?²ç??èª¿è?²ç?¤ã??"
 
-#: ../app/dialogs/dialogs-constructors.c:212
-#: ../app/gui/gui.c:163
+#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:163
 #: ../app/gui/gui-message.c:145
 msgid "GIMP Message"
 msgstr "GIMP è¨?æ?¯"
@@ -8766,8 +8796,7 @@ msgstr "æ·¡å?? %s"
 msgid "_Fade"
 msgstr "æ·¡å??(_F)"
 
-#: ../app/dialogs/fade-dialog.c:157
-#: ../app/widgets/gimpdeviceinfoeditor.c:346
+#: ../app/dialogs/fade-dialog.c:157 ../app/widgets/gimpdeviceinfoeditor.c:349
 msgid "_Mode:"
 msgstr "æ¨¡å¼?(_M):"
 
@@ -8796,19 +8825,28 @@ msgid "_Export"
 msgstr "å?¯å?º(_E)"
 
 #: ../app/dialogs/file-save-dialog.c:468
-msgid "Saving remote files needs to determine the file format from the file extension. Please enter a file extension that matches the selected file format or enter no file extension at all."
+msgid ""
+"Saving remote files needs to determine the file format from the file "
+"extension. Please enter a file extension that matches the selected file "
+"format or enter no file extension at all."
 msgstr "é? ç«¯å?²å?æª?æ¡?é??è¦?æ ¹æ??å»¶ä¼¸æª?å??æ±ºå®?æª?æ¡?æ ¼å¼?ã??è«?é?¸æ??ç¬¦å??é?¸å??æª?æ¡?æ ¼å¼?ç??å»¶ä¼¸æª?å??æ??å®?å?¨ä¸?ä½¿ç?¨å»¶ä¼¸æª?å??ã??"
 
 #: ../app/dialogs/file-save-dialog.c:595
-msgid "You can use this dialog to export to various file formats. If you want to save the image to the GIMP XCF format, use Fileâ??Save instead."
-msgstr ""
+msgid ""
+"You can use this dialog to export to various file formats. If you want to "
+"save the image to the GIMP XCF format, use Fileâ??Save instead."
+msgstr "ä½ å?¯ä»¥ä½¿ç?¨é??å??å°?è©±ç??ä¾?å?¯å?ºä¸?å??ç??æª?æ¡?æ ¼å¼?ã??å¦?æ??ä½ æ?³å?²å?å??ç??ç?º GIMP XCF æ ¼å¼?ï¼?è«?ä½¿ç?¨[æª?æ¡?]>[å?²å?]æ?¿ä»£ã?? "
 
 #: ../app/dialogs/file-save-dialog.c:602
-msgid "You can use this dialog to save to the GIMP XCF format. Use Fileâ??Export to export to other file formats."
-msgstr ""
+msgid ""
+"You can use this dialog to save to the GIMP XCF format. Use Fileâ??Export to "
+"export to other file formats."
+msgstr "ä½ å?¯ä»¥ä½¿ç?¨é??å??å°?è©±ç??å?²å?ç?º GIMP XCF æ ¼å¼?ã??ä½¿ç?¨[æª?æ¡?]>[å?¯å?º]å?¯å?ºç?ºå?¶å®?æª?æ¡?æ ¼å¼?ã??"
 
 #: ../app/dialogs/file-save-dialog.c:608
-msgid "The given filename does not have any known file extension. Please enter a known file extension or select a file format from the file format list."
+msgid ""
+"The given filename does not have any known file extension. Please enter a "
+"known file extension or select a file format from the file format list."
 msgstr "çµ¦äº?ç??æª?æ¡?å??ç¨±æ²?æ??ä»»ä½?å·²ç?¥ç??å»¶ä¼¸æª?å??ã??è«?è¼¸å?¥ä¸?å??å·²ç?¥ç??å»¶ä¼¸æª?å??æ??å¾?æª?æ¡?æ ¼å¼?æ¸?å?®ä¸é?¸æ??ä¸?ç¨®æª?æ¡?æ ¼å¼?ã??"
 
 #: ../app/dialogs/file-save-dialog.c:622
@@ -8827,8 +8865,7 @@ msgstr "æ?¯å?¦å°?ä¸?å®?è¦?ä»¥æ¤å??ç¨±å?²å?é??å??å??ç??ï¼?"
 msgid "Saving canceled"
 msgstr "å?²å?å·²å??æ¶?"
 
-#: ../app/dialogs/file-save-dialog.c:705
-#: ../app/widgets/gimpdnd-xds.c:185
+#: ../app/dialogs/file-save-dialog.c:705 ../app/widgets/gimpdnd-xds.c:185
 #, c-format
 msgid ""
 "Saving '%s' failed:\n"
@@ -8904,7 +8941,9 @@ msgstr "ä½ æº?å??ç?¢ç??ä¸?å¹?å¤§å°?ç?º %s ç??å??ç??ã??"
 
 #: ../app/dialogs/image-new-dialog.c:328
 #, c-format
-msgid "An image of the chosen size will use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)."
+msgid ""
+"An image of the chosen size will use more memory than what is configured as "
+"\"Maximum Image Size\" in the Preferences dialog (currently %s)."
 msgstr "é??å??å°ºå¯¸ç??å??ç??æ??è¶?å?ºå??å¥½è¨å®?ä¸ç??â??æ??å¤§å??ç??å¤§å°?â??æ??è¨å®?ç??è¨?æ?¶é«?ç?¨é??(ç?®å??ç?º %s)ã??"
 
 #: ../app/dialogs/image-properties-dialog.c:60
@@ -8935,11 +8974,15 @@ msgstr "ç¢ºèª?ç¸®æ?¾å°ºå¯¸"
 
 #: ../app/dialogs/image-scale-dialog.c:245
 #, c-format
-msgid "Scaling the image to the chosen size will make it use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)."
+msgid ""
+"Scaling the image to the chosen size will make it use more memory than what "
+"is configured as \"Maximum Image Size\" in the Preferences dialog (currently "
+"%s)."
 msgstr "ç¸®æ?¾è?³é??å??å°ºå¯¸ç??è©±ï¼?å??ç??æ??è¶?å?ºå??å¥½è¨å®?ä¸ç??â??æ??å¤§å??ç??å¤§å°?â??æ??è¨å®?ç??è¨?æ?¶é«?ç?¨é??(ç?®å??ç?º %s)ã??"
 
 #: ../app/dialogs/image-scale-dialog.c:260
-msgid "Scaling the image to the chosen size will shrink some layers completely away."
+msgid ""
+"Scaling the image to the chosen size will shrink some layers completely away."
 msgstr "å??ç??ç¸®å°?è?³æ??å®?å°ºå¯¸ç??è©±ï¼?æ??ä»¤æ??äº?å??å±¤å®?å?¨æ¶?å¤±ã??"
 
 #: ../app/dialogs/image-scale-dialog.c:264
@@ -8955,7 +8998,9 @@ msgid "Configure Keyboard Shortcuts"
 msgstr "è¨å®?æ?·å¾?é?µ"
 
 #: ../app/dialogs/keyboard-shortcuts-dialog.c:73
-msgid "To edit a shortcut key, click on the corresponding row and type a new accelerator, or press backspace to clear."
+msgid ""
+"To edit a shortcut key, click on the corresponding row and type a new "
+"accelerator, or press backspace to clear."
 msgstr "è¦?ç·¨è¼¯æ?·å¾?é?µï¼?æ??ä¸?å°?æ??ç??å??ä¸¦è¼¸å?¥æ?°ç??æ?·å¾?é?µï¼?æ??æ?? backspace æ¸?é?¤å®?ã??"
 
 #: ../app/dialogs/keyboard-shortcuts-dialog.c:81
@@ -8978,13 +9023,14 @@ msgstr "å??å??é?®ç½©(_V)"
 msgid "Layer _name:"
 msgstr "å??å±¤å??ç¨±(_N):"
 
+#. The size labels
 #: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1075
+#: ../app/tools/gimpmeasuretool.c:1076
 msgid "Width:"
 msgstr "é??åº¦:"
 
 #: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1103
+#: ../app/tools/gimpmeasuretool.c:1104
 msgid "Height:"
 msgstr "é«?åº¦:"
 
@@ -9048,24 +9094,23 @@ msgstr "å??å±¤é?®ç½©å??ç§»"
 msgid "Offset Channel"
 msgstr "è?²ç??å??ç§»"
 
-#: ../app/dialogs/offset-dialog.c:118
-#: ../app/dialogs/offset-dialog.c:152
-#: ../app/dialogs/resize-dialog.c:198
-#: ../app/widgets/gimpgrideditor.c:275
+#. The offset frame
+#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152
+#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:246
+#: ../app/widgets/gimpgrideditor.c:277
 msgid "Offset"
 msgstr "å??ç§»"
 
+#. offset, used as a verb
 #: ../app/dialogs/offset-dialog.c:127
 msgid "_Offset"
 msgstr "å??ç§»(_O)"
 
-#: ../app/dialogs/offset-dialog.c:184
-#: ../app/dialogs/resize-dialog.c:227
+#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:227
 msgid "_X:"
 msgstr "_X:"
 
-#: ../app/dialogs/offset-dialog.c:186
-#: ../app/dialogs/resize-dialog.c:228
+#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:228
 msgid "_Y:"
 msgstr "_Y:"
 
@@ -9073,6 +9118,7 @@ msgstr "_Y:"
 msgid "Offset by  x/_2, y/2"
 msgstr "å??ç§»è?³ä¸?å??é??åº¦å??é«?åº¦ç??ä½?ç½®(_2)"
 
+#. The edge behavior frame
 #: ../app/dialogs/offset-dialog.c:222
 msgid "Edge Behavior"
 msgstr "é??ç·£è¡?ç?º"
@@ -9097,6 +9143,7 @@ msgstr "å?¯å?¥æ?°ç??èª¿è?²ç?¤"
 msgid "_Import"
 msgstr "å?¯å?¥(_I)"
 
+#. The "Source" frame
 #: ../app/dialogs/palette-import-dialog.c:203
 msgid "Select Source"
 msgstr "é?¸å??ä¾?æº?"
@@ -9122,10 +9169,12 @@ msgstr "å?ªæ??é?¸å??ç??å??ç´ (_S)"
 msgid "Palette _file"
 msgstr "èª¿è?²ç?¤æª?æ¡?(_F)"
 
+#. Palette file name entry
 #: ../app/dialogs/palette-import-dialog.c:292
 msgid "Select Palette File"
-msgstr "é?¸æ??èª¿è?²ç?¤æª?æ¡?"
+msgstr "é?¸å??èª¿è?²ç?¤æª?æ¡?"
 
+#. The "Import" frame
 #: ../app/dialogs/palette-import-dialog.c:303
 msgid "Import Options"
 msgstr "å?¯å?¥é?¸é ?"
@@ -9150,6 +9199,7 @@ msgstr "æ¬?(_O):"
 msgid "I_nterval:"
 msgstr "é??é??(_N):"
 
+#. The "Preview" frame
 #: ../app/dialogs/palette-import-dialog.c:361
 msgid "Preview"
 msgstr "é ?è¦½"
@@ -9171,7 +9221,9 @@ msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr "ä½ å¿?é ?é??æ?°å??å?? GIMP ä»¤ä»¥ä¸?ç??è¨å®?ç??æ??ï¼?"
 
 #: ../app/dialogs/preferences-dialog.c:538
-msgid "Your keyboard shortcuts will be reset to default values the next time you start GIMP."
+msgid ""
+"Your keyboard shortcuts will be reset to default values the next time you "
+"start GIMP."
 msgstr "ä¸?æ¬¡å??å?? GIMP æ??æ??å°?æ??æ??æ?·å¾?é?µé??å??ç?ºé ?è¨å?¼ã??"
 
 #: ../app/dialogs/preferences-dialog.c:549
@@ -9183,15 +9235,21 @@ msgid "Do you really want to remove all keyboard shortcuts from all menus?"
 msgstr "ä½ æ?¯å?¦ç¢ºå®?è¦?ç§»é?¤æ??æ??é?¸å?®ç??é?µç?¤æ?·å¾?é?µï¼?"
 
 #: ../app/dialogs/preferences-dialog.c:612
-msgid "Your window setup will be reset to default values the next time you start GIMP."
+msgid ""
+"Your window setup will be reset to default values the next time you start "
+"GIMP."
 msgstr "ä¸?æ¬¡å??å?? GIMP æ??æ??å°?æ??æ??è¦?çª?çµ?æ??é??å??ç?ºé ?è¨å?¼ã??"
 
 #: ../app/dialogs/preferences-dialog.c:647
-msgid "Your input device settings will be reset to default values the next time you start GIMP."
+msgid ""
+"Your input device settings will be reset to default values the next time you "
+"start GIMP."
 msgstr "ä¸?æ¬¡å??å?? GIMP æ??æ??å°?æ??æ??è¼¸å?¥è£?ç½®ç??è¨å®?é??å??ç?ºé ?è¨å?¼ã??"
 
 #: ../app/dialogs/preferences-dialog.c:682
-msgid "Your tool options will be reset to default values the next time you start GIMP."
+msgid ""
+"Your tool options will be reset to default values the next time you start "
+"GIMP."
 msgstr "ä¸?æ¬¡å??å?? GIMP æ??æ??å°?ä½ ç??å·¥å?·é?¸é ?é??å??ç?ºé ?è¨å?¼ã??"
 
 #: ../app/dialogs/preferences-dialog.c:1266
@@ -9243,7 +9301,7 @@ msgid "Preferences"
 msgstr "å??å¥½è¨å®?"
 
 #: ../app/dialogs/preferences-dialog.c:1507
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2758
 msgid "Environment"
 msgstr "ç³»çµ±ç?°å¢?"
 
@@ -9271,6 +9329,7 @@ msgstr "æ?°ç??å??ç??ç??ä½?ç?¨è¨?æ?¶ä¸?é??(_N):"
 msgid "Number of _processors to use:"
 msgstr "æ??ä½¿ç?¨ç?? C_PU æ?¸ç?®:"
 
+#. Image Thumbnails
 #: ../app/dialogs/preferences-dialog.c:1550
 msgid "Image Thumbnails"
 msgstr "ç¸®å??"
@@ -9283,6 +9342,7 @@ msgstr "ç¸®å??å°ºå¯¸(_T):"
 msgid "Maximum _filesize for thumbnailing:"
 msgstr "æ??è?ªå??ç?¢ç??ç¸®å??ç??å??å??å¤§å°?ä¸?é??(_F):"
 
+#. File Saving
 #: ../app/dialogs/preferences-dialog.c:1563
 msgid "Saving Images"
 msgstr "å?²å?å??ç??"
@@ -9307,6 +9367,7 @@ msgstr "ä»?é?¢"
 msgid "Language"
 msgstr "èª?è¨?"
 
+#. Previews
 #: ../app/dialogs/preferences-dialog.c:1604
 msgid "Previews"
 msgstr "é ?è¦½"
@@ -9323,6 +9384,7 @@ msgstr "é ?è¨å??å±¤å??è?²ç??ç??é ?è¦½å??å°ºå¯¸(_D)ï¼?"
 msgid "Na_vigation preview size:"
 msgstr "å°?è¦½å??å°ºå¯¸(_N):"
 
+#. Keyboard Shortcuts
 #: ../app/dialogs/preferences-dialog.c:1620
 msgid "Keyboard Shortcuts"
 msgstr "æ?·å¾?é?µ"
@@ -9368,10 +9430,11 @@ msgstr "é??æ?°è¼?å?¥ç?®å??ç??ä½?æ?¯ä¸»é¡?(_U)"
 msgid "Help System"
 msgstr "èªªæ??æ??ä»¶ç³»çµ±"
 
+#. General
 #: ../app/dialogs/preferences-dialog.c:1782
 #: ../app/dialogs/preferences-dialog.c:1866
-#: ../app/dialogs/preferences-dialog.c:2066
-#: ../app/widgets/gimpcontrollereditor.c:188
+#: ../app/dialogs/preferences-dialog.c:2065
+#: ../app/widgets/gimpcontrollereditor.c:191
 msgid "General"
 msgstr "ä¸?è?¬"
 
@@ -9403,6 +9466,7 @@ msgstr "é??è£?æ??æ?¬å?°ç«¯å®?è£?ç??ä½¿ç?¨è??æ??å??ã??"
 msgid "The user manual is not installed locally."
 msgstr "ä½¿ç?¨è??æ??å??ä¸¦æ²?æ??å?¨æ?¬å?°ç«¯å®?è£?ã??"
 
+#. Help Browser
 #: ../app/dialogs/preferences-dialog.c:1838
 msgid "Help Browser"
 msgstr "èªªæ??æ??ä»¶ç??è¦½å?¨"
@@ -9423,6 +9487,7 @@ msgstr "ç«?å?»å?²å?å·¥å?·é?¸é ?(_N)"
 msgid "_Reset Saved Tool Options to Default Values"
 msgstr "å°?å·¥å?·é?¸é ?è¨å®?ç?ºé ?è¨å?¼(_R)"
 
+#. Snapping Distance
 #: ../app/dialogs/preferences-dialog.c:1890
 msgid "Guide & Grid Snapping"
 msgstr "è²¼ç·?å??è??ç·? & æ ¼ç·?"
@@ -9435,6 +9500,7 @@ msgstr "è?ªå??è²¼é½?ç??æ??è·?é?¢(_S):"
 msgid "Default _interpolation:"
 msgstr "é ?è¨ä½¿ç?¨ç??å??ç??æ??å?¼æ³?(_I):"
 
+#. Global Brush, Pattern, ...
 #: ../app/dialogs/preferences-dialog.c:1910
 msgid "Paint Options Shared Between Tools"
 msgstr "æ??æ??å·¥å?·å?¯ä»¥å?±ç?¨ç??ç¹ªå??é?¸é ?"
@@ -9459,9 +9525,10 @@ msgstr "ç§»å??å·¥å?·"
 msgid "Set layer or path as active"
 msgstr "è¨å®?å??å±¤æ??è·¯å¾?ç?ºä½¿ç?¨ä¸"
 
+#. Appearance
 #: ../app/dialogs/preferences-dialog.c:1955
-#: ../app/dialogs/preferences-dialog.c:2139
-#: ../app/widgets/gimpgrideditor.c:203
+#: ../app/dialogs/preferences-dialog.c:2138
+#: ../app/widgets/gimpgrideditor.c:205
 msgid "Appearance"
 msgstr "å¤?è§?"
 
@@ -9477,6 +9544,7 @@ msgstr "é¡¯ç¤ºä½¿ç?¨ä¸ç??ç?å?·ã??å??æ¨£å??æ¼¸è®?è?²(_B)"
 msgid "Show active _image"
 msgstr "é¡¯ç¤ºä½¿ç?¨ä¸ç??å??ç??(_I)"
 
+#. Tool Editor
 #: ../app/dialogs/preferences-dialog.c:1975
 msgid "Tools configuration"
 msgstr "å·¥å?·é??ç½®"
@@ -9497,424 +9565,430 @@ msgstr "é ?è¨å??ç??æ ¼ç·?"
 msgid "Default Grid"
 msgstr "é ?è¨æ ¼ç·?"
 
-#: ../app/dialogs/preferences-dialog.c:2054
+#: ../app/dialogs/preferences-dialog.c:2053
 msgid "Image Windows"
 msgstr "å??ç??è¦?çª?"
 
-#: ../app/dialogs/preferences-dialog.c:2069
+#: ../app/dialogs/preferences-dialog.c:2068
 msgid "Use \"_Dot for dot\" by default"
 msgstr "é ?è¨ä½¿ç?¨ã??é»?å°?é»?ã??æ¨¡å¼?(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2075
+#: ../app/dialogs/preferences-dialog.c:2074
 msgid "Marching _ants speed:"
 msgstr "é?¸å??å??å??è??ç·? (Marching _Ants) ç§»å??é??åº¦:"
 
-#: ../app/dialogs/preferences-dialog.c:2079
+#. Zoom & Resize Behavior
+#: ../app/dialogs/preferences-dialog.c:2078
 msgid "Zoom & Resize Behavior"
 msgstr "ç¸®æ?¾å??èª¿æ?´å°ºå¯¸ç??é??ä½?æ?¹å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2083
+#: ../app/dialogs/preferences-dialog.c:2082
 msgid "Resize window on _zoom"
 msgstr "ç¸®æ?¾å??ç??æ??èª¿æ?´è¦?çª?å°ºå¯¸(_Z)"
 
-#: ../app/dialogs/preferences-dialog.c:2086
+#: ../app/dialogs/preferences-dialog.c:2085
 msgid "Resize window on image _size change"
 msgstr "å??ç??å°ºå¯¸æ?´æ?¹æ??èª¿æ?´è¦?çª?å°ºå¯¸(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2092
+#: ../app/dialogs/preferences-dialog.c:2091
 msgid "Fit to window"
 msgstr "ç¬¦å??è¦?çª?å°ºå¯¸"
 
-#: ../app/dialogs/preferences-dialog.c:2094
+#: ../app/dialogs/preferences-dialog.c:2093
 msgid "Initial zoom _ratio:"
 msgstr "æ??å??ç¸®æ?¾æ¯?ä¾?(_R):"
 
-#: ../app/dialogs/preferences-dialog.c:2098
+#. Space Bar
+#: ../app/dialogs/preferences-dialog.c:2097
 msgid "Space Bar"
 msgstr "ç©ºç?½é?µ"
 
-#: ../app/dialogs/preferences-dialog.c:2104
+#: ../app/dialogs/preferences-dialog.c:2103
 msgid "_While space bar is pressed:"
 msgstr "ç©ºç?½é?µè¢«æ??ä¸?(_W):"
 
-#: ../app/dialogs/preferences-dialog.c:2108
+#. Mouse Pointers
+#: ../app/dialogs/preferences-dialog.c:2107
 msgid "Mouse Pointers"
 msgstr "é¼ æ¨?"
 
-#: ../app/dialogs/preferences-dialog.c:2112
+#: ../app/dialogs/preferences-dialog.c:2111
 msgid "Show _brush outline"
 msgstr "é¡¯ç¤ºç?å?·è¼ªå»?(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:2115
+#: ../app/dialogs/preferences-dialog.c:2114
 msgid "Show pointer for paint _tools"
 msgstr "ä½¿ç?¨ç¹ªç?«å·¥å?·æ??é¡¯ç¤ºé¼ æ¨?(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2121
+#: ../app/dialogs/preferences-dialog.c:2120
 msgid "Pointer _mode:"
 msgstr "é¼ æ¨?æ¨¡å¼?(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:2124
+#: ../app/dialogs/preferences-dialog.c:2123
 msgid "Pointer re_ndering:"
 msgstr "æ??æ¨?ç¹ªè£½(_N):"
 
-#: ../app/dialogs/preferences-dialog.c:2136
+#: ../app/dialogs/preferences-dialog.c:2135
 msgid "Image Window Appearance"
 msgstr "å??ç??è¦?çª?å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2147
+#: ../app/dialogs/preferences-dialog.c:2146
 msgid "Default Appearance in Normal Mode"
 msgstr "å?¨æ£å¸¸æ¨¡å¼?ç??é ?è¨å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2152
+#: ../app/dialogs/preferences-dialog.c:2151
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "å?¨è?¢å¹?æ¨¡å¼?ä¸ç??é ?è¨å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2161
+#: ../app/dialogs/preferences-dialog.c:2160
 msgid "Image Title & Statusbar Format"
 msgstr "å??ç??æ¨?é¡?å??ç??æ??å??é¡¯ç¤ºæ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2164
+#: ../app/dialogs/preferences-dialog.c:2163
 msgid "Title & Status"
 msgstr "æ¨?é¡?å??ç??æ??"
 
-#: ../app/dialogs/preferences-dialog.c:2182
+#: ../app/dialogs/preferences-dialog.c:2181
 msgid "Current format"
 msgstr "ç?®å??ç??æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2183
+#: ../app/dialogs/preferences-dialog.c:2182
 msgid "Default format"
 msgstr "é ?è¨ç??æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2184
+#: ../app/dialogs/preferences-dialog.c:2183
 msgid "Show zoom percentage"
 msgstr "é¡¯ç¤ºç¸®æ?¾ç?¾å??æ¯?"
 
-#: ../app/dialogs/preferences-dialog.c:2185
+#: ../app/dialogs/preferences-dialog.c:2184
 msgid "Show zoom ratio"
 msgstr "é¡¯ç¤ºç¸®æ?¾æ¯?ä¾?"
 
-#: ../app/dialogs/preferences-dialog.c:2186
+#: ../app/dialogs/preferences-dialog.c:2185
 msgid "Show image size"
 msgstr "é¡¯ç¤ºå??ç??å°ºå¯¸"
 
-#: ../app/dialogs/preferences-dialog.c:2199
+#: ../app/dialogs/preferences-dialog.c:2198
 msgid "Image Title Format"
 msgstr "å??ç??æ¨?é¡?æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2201
+#: ../app/dialogs/preferences-dialog.c:2200
 msgid "Image Statusbar Format"
 msgstr "å??ç??ç??æ??å??é¡¯ç¤ºæ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2286
+#: ../app/dialogs/preferences-dialog.c:2285
 msgid "Display"
 msgstr "é¡¯ç¤º"
 
-#: ../app/dialogs/preferences-dialog.c:2298
+#. Transparency
+#: ../app/dialogs/preferences-dialog.c:2297
 msgid "Transparency"
 msgstr "é??æ??"
 
-#: ../app/dialogs/preferences-dialog.c:2302
+#: ../app/dialogs/preferences-dialog.c:2301
 msgid "_Check style:"
 msgstr "æª¢æ?¥æ¨£å¼?(_C):"
 
-#: ../app/dialogs/preferences-dialog.c:2305
+#: ../app/dialogs/preferences-dialog.c:2304
 msgid "Check _size:"
 msgstr "æª¢æ?¥å¤§å°?(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:2308
+#: ../app/dialogs/preferences-dialog.c:2307
 msgid "Monitor Resolution"
 msgstr "è?¢å¹?è§£å??åº¦"
 
-#: ../app/dialogs/preferences-dialog.c:2312
-#: ../app/display/gimpcursorview.c:200
-#: ../app/widgets/gimpgrideditor.c:268
-#: ../app/widgets/gimpgrideditor.c:300
+#. Pixels
+#: ../app/dialogs/preferences-dialog.c:2311
+#: ../app/display/gimpcursorview.c:200 ../app/widgets/gimpgrideditor.c:270
+#: ../app/widgets/gimpgrideditor.c:302
 msgid "Pixels"
 msgstr "å??ç´ "
 
-#: ../app/dialogs/preferences-dialog.c:2330
+#: ../app/dialogs/preferences-dialog.c:2329
 msgid "Horizontal"
 msgstr "æ°´å¹³"
 
-#: ../app/dialogs/preferences-dialog.c:2332
+#: ../app/dialogs/preferences-dialog.c:2331
 msgid "Vertical"
 msgstr "å??ç?´"
 
-#: ../app/dialogs/preferences-dialog.c:2334
+#: ../app/dialogs/preferences-dialog.c:2333
 #: ../app/widgets/gimpimagepropview.c:475
 msgid "ppi"
 msgstr "ppi"
 
-#: ../app/dialogs/preferences-dialog.c:2350
+#: ../app/dialogs/preferences-dialog.c:2349
 #, c-format
 msgid "_Detect automatically (currently %d Ã? %d ppi)"
 msgstr "è?ªå??å?µæ¸¬ï¼?ç?®å?? %d Ã? %d ppiï¼?(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2370
+#: ../app/dialogs/preferences-dialog.c:2368
 msgid "_Enter manually"
 msgstr "æ??å??è¼¸å?¥(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:2385
+#: ../app/dialogs/preferences-dialog.c:2383
 msgid "C_alibrate..."
 msgstr "å¾®èª¿(_A)..."
 
-#: ../app/dialogs/preferences-dialog.c:2408
+#: ../app/dialogs/preferences-dialog.c:2406
 msgid "Color Management"
 msgstr "è?²å½©ç®¡ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2428
+#: ../app/dialogs/preferences-dialog.c:2426
 msgid "_RGB profile:"
 msgstr "_RGB é??ç½®æª?ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2429
+#: ../app/dialogs/preferences-dialog.c:2427
 msgid "Select RGB Color Profile"
 msgstr "é?¸æ?? RGB è?²å½©é??ç½®æª?"
 
-#: ../app/dialogs/preferences-dialog.c:2430
+#: ../app/dialogs/preferences-dialog.c:2428
 msgid "_CMYK profile:"
 msgstr "_CMYK é??ç½®æª?ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2431
+#: ../app/dialogs/preferences-dialog.c:2429
 msgid "Select CMYK Color Profile"
 msgstr "é?¸æ?? CMYK è?²å½©é??ç½®æª?"
 
-#: ../app/dialogs/preferences-dialog.c:2432
+#: ../app/dialogs/preferences-dialog.c:2430
 msgid "_Monitor profile:"
 msgstr "è?¢å¹?é??ç½®æª?(_M)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2433
+#: ../app/dialogs/preferences-dialog.c:2431
 msgid "Select Monitor Color Profile"
 msgstr "é?¸æ??è?¢å¹?è?²å½©é??ç½®æª?"
 
-#: ../app/dialogs/preferences-dialog.c:2434
+#: ../app/dialogs/preferences-dialog.c:2432
 msgid "_Print simulation profile:"
 msgstr "æ??å?°æ¨¡æ?¬é??ç½®æª?(_P):"
 
-#: ../app/dialogs/preferences-dialog.c:2435
+#: ../app/dialogs/preferences-dialog.c:2433
 msgid "Select Printer Color Profile"
 msgstr "é?¸æ??æ??å?°æ©?è?²å½©é??ç½®æª?"
 
-#: ../app/dialogs/preferences-dialog.c:2446
+#: ../app/dialogs/preferences-dialog.c:2444
 msgid "_Mode of operation:"
 msgstr "æ??ä½?æ¨¡å¼?(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:2476
+#: ../app/dialogs/preferences-dialog.c:2474
 msgid "_Try to use the system monitor profile"
 msgstr "å??è©¦ä½¿ç?¨ç³»çµ±è?¢å¹?é??ç½®æª?(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2486
+#: ../app/dialogs/preferences-dialog.c:2484
 msgid "_Display rendering intent:"
 msgstr "é¡¯ç¤ºæ¼?è?²æ??æ¶µ(_D):"
 
-#: ../app/dialogs/preferences-dialog.c:2495
+#: ../app/dialogs/preferences-dialog.c:2493
 msgid "_Softproof rendering intent:"
 msgstr "è»?å¼?æ??æ¨£æ¼?è?²æ??æ¶µ(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:2508
+#: ../app/dialogs/preferences-dialog.c:2506
 msgid "Mark out of gamut colors"
 msgstr "æ¨?è¨?è¶?å?ºå?¨è?²å½©ç¯?å??"
 
-#: ../app/dialogs/preferences-dialog.c:2513
+#: ../app/dialogs/preferences-dialog.c:2511
 msgid "Select Warning Color"
 msgstr "é?¸æ??è¦å??é¡?è?²"
 
-#: ../app/dialogs/preferences-dialog.c:2526
+#: ../app/dialogs/preferences-dialog.c:2524
 msgid "File Open behaviour:"
 msgstr "æª?æ¡?é??å??è¡?ç?º:"
 
-#: ../app/dialogs/preferences-dialog.c:2538
+#: ../app/dialogs/preferences-dialog.c:2536
 msgid "Input Devices"
 msgstr "è¼¸å?¥è£?ç½®"
 
-#: ../app/dialogs/preferences-dialog.c:2548
+#. Extended Input Devices
+#: ../app/dialogs/preferences-dialog.c:2546
 msgid "Extended Input Devices"
 msgstr "é¡?å¤?è¼¸å?¥è£?ç½®"
 
-#: ../app/dialogs/preferences-dialog.c:2552
+#: ../app/dialogs/preferences-dialog.c:2550
 msgid "Configure E_xtended Input Devices..."
 msgstr "è¨å®?é¡?å¤?ç??è¼¸å?¥è£?ç½®(_X)..."
 
-#: ../app/dialogs/preferences-dialog.c:2559
+#: ../app/dialogs/preferences-dialog.c:2557
 msgid "_Save input device settings on exit"
 msgstr "çµ?æ??æ??å?²å?è¼¸å?¥è£?ç½®ç??è¨å®?(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2563
+#: ../app/dialogs/preferences-dialog.c:2561
 msgid "Save Input Device Settings _Now"
 msgstr "ç«?å?»å?²å?è¼¸å?¥è£?ç½®ç??è¨å®?(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2570
+#: ../app/dialogs/preferences-dialog.c:2568
 msgid "_Reset Saved Input Device Settings to Default Values"
 msgstr "é??æ?°è¼?å?¥å·²å?²å?ç??è¼¸å?¥è£?ç½®è¨å®?(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2585
+#: ../app/dialogs/preferences-dialog.c:2583
 msgid "Additional Input Controllers"
 msgstr "é¡?å¤?è¼¸å?¥è£?ç½®"
 
-#: ../app/dialogs/preferences-dialog.c:2588
+#: ../app/dialogs/preferences-dialog.c:2586
 msgid "Input Controllers"
 msgstr "è¼¸å?¥è£?ç½®"
 
-#: ../app/dialogs/preferences-dialog.c:2604
+#: ../app/dialogs/preferences-dialog.c:2602
 msgid "Window Management"
 msgstr "è¦?çª?ç®¡ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2613
+#: ../app/dialogs/preferences-dialog.c:2611
 msgid "Window Manager Hints"
 msgstr "è¦?çª?ç¸½ç®¡ç??æ??ç¤º"
 
-#: ../app/dialogs/preferences-dialog.c:2619
+#: ../app/dialogs/preferences-dialog.c:2617
 msgid "Hint for _docks and toolbox:"
 msgstr "çµ¦å??é§?å¼?å°?è©±ç??å??å·¥å?·ç®±ç??æ??ç¤º(_D)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2622
+#: ../app/dialogs/preferences-dialog.c:2620
 msgid "Focus"
 msgstr "ç?¦é»?"
 
-#: ../app/dialogs/preferences-dialog.c:2626
+#: ../app/dialogs/preferences-dialog.c:2624
 msgid "Activate the _focused image"
 msgstr "ä½¿ç?¨å·²ç?²ç?¦é»?ç??å??ç??(_F)"
 
-#: ../app/dialogs/preferences-dialog.c:2630
+#. Window Positions
+#: ../app/dialogs/preferences-dialog.c:2628
 msgid "Window Positions"
 msgstr "è¦?çª?ä½?ç½®"
 
-#: ../app/dialogs/preferences-dialog.c:2633
+#: ../app/dialogs/preferences-dialog.c:2631
 msgid "_Save window positions on exit"
 msgstr "çµ?æ??ç¨?å¼?æ??å?²å?è¦?çª?ä½?ç½®(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2637
+#: ../app/dialogs/preferences-dialog.c:2635
 msgid "Save Window Positions _Now"
 msgstr "ç«?å?»å?²å?è¦?çª?ä½?ç½®(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2644
+#: ../app/dialogs/preferences-dialog.c:2642
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr "å°?è¦?çª?ä½?ç½®è¨å®?ç?ºç¨?å¼?æ?¬èº«ç??é ?è¨å?¼(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2659
+#: ../app/dialogs/preferences-dialog.c:2657
 msgid "Folders"
 msgstr "è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2679
+#: ../app/dialogs/preferences-dialog.c:2677
 msgid "Temporary folder:"
 msgstr "æ?«å?è³?æ??å¤¾:"
 
-#: ../app/dialogs/preferences-dialog.c:2680
+#: ../app/dialogs/preferences-dialog.c:2678
 msgid "Select Folder for Temporary Files"
 msgstr "é?¸æ??æ?«å?æª?æ¡?ä½¿ç?¨ç??è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2684
+#: ../app/dialogs/preferences-dialog.c:2682
 msgid "Swap folder:"
 msgstr "äº¤æ??è¨?æ?¶æª?è³?æ??å¤¾:"
 
-#: ../app/dialogs/preferences-dialog.c:2685
+#: ../app/dialogs/preferences-dialog.c:2683
 msgid "Select Swap Folder"
 msgstr "é?¸å??äº¤æ??æª?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2720
+#: ../app/dialogs/preferences-dialog.c:2718
 msgid "Brush Folders"
 msgstr "ç?å?·è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2722
+#: ../app/dialogs/preferences-dialog.c:2720
 msgid "Select Brush Folders"
 msgstr "é?¸å??ç?å?·è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2724
+#: ../app/dialogs/preferences-dialog.c:2722
 msgid "Dynamics Folders"
 msgstr "ç?å?·å??æ??è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2726
+#: ../app/dialogs/preferences-dialog.c:2724
 msgid "Select Dynamics Folders"
 msgstr "é?¸å??ç?å?·å??æ??è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2728
+#: ../app/dialogs/preferences-dialog.c:2726
 msgid "Pattern Folders"
 msgstr "å??æ¨£è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2730
+#: ../app/dialogs/preferences-dialog.c:2728
 msgid "Select Pattern Folders"
 msgstr "é?¸å??å??æ¨£è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2732
+#: ../app/dialogs/preferences-dialog.c:2730
 msgid "Palette Folders"
 msgstr "èª¿è?²ç?¤è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2734
+#: ../app/dialogs/preferences-dialog.c:2732
 msgid "Select Palette Folders"
 msgstr "é?¸å??èª¿è?²ç?¤è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2736
+#: ../app/dialogs/preferences-dialog.c:2734
 msgid "Gradient Folders"
 msgstr "æ¼¸è®?è?²è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2738
+#: ../app/dialogs/preferences-dialog.c:2736
 msgid "Select Gradient Folders"
 msgstr "é?¸å??æ¼¸è®?è?²è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/dialogs/preferences-dialog.c:2738
 msgid "Font Folders"
 msgstr "å?å??è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2740
 msgid "Select Font Folders"
 msgstr "é?¸å??å?å??è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/dialogs/preferences-dialog.c:2742
 msgid "Plug-In Folders"
 msgstr "å¢?æ??æ¨¡çµ?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2744
 msgid "Select Plug-In Folders"
 msgstr "é?¸å??å¢?æ??æ¨¡çµ?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2746
 msgid "Scripts"
 msgstr "å?½ä»¤ç¨¿"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2746
 msgid "Script-Fu Folders"
 msgstr "Script-Fu è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2748
 msgid "Select Script-Fu Folders"
 msgstr "é?¸å?? Script-Fu è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2752
+#: ../app/dialogs/preferences-dialog.c:2750
 msgid "Module Folders"
 msgstr "æ¨¡çµ?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2754
+#: ../app/dialogs/preferences-dialog.c:2752
 msgid "Select Module Folders"
 msgstr "é?¸å??æ¨¡çµ?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2754
 msgid "Interpreters"
 msgstr "è§£è¯å?¨"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2754
 msgid "Interpreter Folders"
 msgstr "è§£è¯å?¨è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2758
+#: ../app/dialogs/preferences-dialog.c:2756
 msgid "Select Interpreter Folders"
 msgstr "é?¸å??è§£è¯å?¨è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2758
 msgid "Environment Folders"
 msgstr "ç?°å¢?è®?æ?¸è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2762
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Select Environment Folders"
 msgstr "é?¸å??ç?°å¢?è®?æ?¸è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2762
 msgid "Themes"
 msgstr "ä½?æ?¯ä¸»é¡?"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2762
 msgid "Theme Folders"
 msgstr "ä½?æ?¯ä¸»é¡?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2766
+#: ../app/dialogs/preferences-dialog.c:2764
 msgid "Select Theme Folders"
 msgstr "é?¸å??ä½?æ?¯ä¸»é¡?è³?æ??å¤¾"
 
@@ -9922,33 +9996,29 @@ msgstr "é?¸å??ä½?æ?¯ä¸»é¡?è³?æ??å¤¾"
 msgid "Print Size"
 msgstr "æ??å?°å°ºå¯¸"
 
-#: ../app/dialogs/print-size-dialog.c:165
-#: ../app/widgets/gimpsizebox.c:198
-#: ../app/widgets/gimptemplateeditor.c:160
+#. the image size labels
+#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:201
+#: ../app/widgets/gimptemplateeditor.c:163
 msgid "_Width:"
 msgstr "é??åº¦(_W):"
 
-#: ../app/dialogs/print-size-dialog.c:172
-#: ../app/widgets/gimpsizebox.c:202
-#: ../app/widgets/gimptemplateeditor.c:167
+#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:205
+#: ../app/widgets/gimptemplateeditor.c:170
 msgid "H_eight:"
 msgstr "é«?åº¦(_E):"
 
-#: ../app/dialogs/print-size-dialog.c:222
-#: ../app/widgets/gimpsizebox.c:260
-#: ../app/widgets/gimptemplateeditor.c:287
+#. the resolution labels
+#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:263
+#: ../app/widgets/gimptemplateeditor.c:290
 msgid "_X resolution:"
 msgstr "æ°´å¹³è§£å??åº¦(_X):"
 
-#: ../app/dialogs/print-size-dialog.c:229
-#: ../app/widgets/gimpsizebox.c:263
-#: ../app/widgets/gimptemplateeditor.c:294
+#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:266
+#: ../app/widgets/gimptemplateeditor.c:297
 msgid "_Y resolution:"
 msgstr "å??ç?´è§£å??åº¦(_Y):"
 
-#: ../app/dialogs/print-size-dialog.c:240
-#: ../app/widgets/gimpsizebox.c:256
-#: ../app/widgets/gimptemplateeditor.c:307
+#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:259
 #, c-format
 msgid "pixels/%a"
 msgstr "å??ç´ /%a"
@@ -9984,8 +10054,7 @@ msgstr "æ?¾æ£?æ?´æ?¹(_D)"
 msgid "Canvas Size"
 msgstr "ç?«å¸?å°ºå¯¸"
 
-#: ../app/dialogs/resize-dialog.c:130
-#: ../app/dialogs/scale-dialog.c:109
+#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:109
 msgid "Layer Size"
 msgstr "å??å±¤å°ºå¯¸"
 
@@ -10009,8 +10078,8 @@ msgstr "æ°´å¹³(_H):"
 msgid "_Vertical:"
 msgstr "å??ç?´(_V):"
 
-#: ../app/dialogs/scale-dialog.c:98
-#: ../app/widgets/gimptemplateeditor.c:138
+#. Image size frame
+#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:141
 msgid "Image Size"
 msgstr "å??ç??å°ºå¯¸"
 
@@ -10023,7 +10092,9 @@ msgid "I_nterpolation:"
 msgstr "æ??å?¼æ³?(_N):"
 
 #: ../app/dialogs/scale-dialog.c:207
-msgid "Indexed color layers are always scaled without interpolation. The chosen interpolation type will affect channels and layer masks only."
+msgid ""
+"Indexed color layers are always scaled without interpolation. The chosen "
+"interpolation type will affect channels and layer masks only."
 msgstr "ç´¢å¼?è?²å??å±¤æ°¸é? ä¸?ä½¿ç?¨æ??å?¼æ³?ç¸®æ?¾ã??é?¸å??ç??æ??å?¼æ³?é¡?å??å°?å?ªå½±é?¿è?²ç??å??å??å±¤é?®ç½©ã??"
 
 #: ../app/dialogs/stroke-dialog.c:97
@@ -10067,10 +10138,16 @@ msgstr "ä¸?ä¸?å??å¯?è¨£(_P)"
 msgid "_Next Tip"
 msgstr "ä¸?ä¸?å??å¯?è¨£(_N)"
 
+#. a link to the related section in the user manual
 #: ../app/dialogs/tips-dialog.c:193
 msgid "Learn more"
 msgstr "äº?è§£æ?´å¤?"
 
+#. This is a special string to specify the language identifier to
+#. look for in the gimp-tips.xml file. Please translate the C in it
+#. according to the name of the po file used for gimp-tips.xml.
+#. E.g. for the german translation, that would be "tips-locale:de".
+#.
 #: ../app/dialogs/tips-parser.c:187
 msgid "tips-locale:C"
 msgstr "tips-locale:zh_TW"
@@ -10128,54 +10205,48 @@ msgstr "ç¸®æ?¾å?¯å?¥ç??è·¯å¾?ä»¥ç¬¦å??å??ç??(_S)"
 msgid "Path name:"
 msgstr "è·¯å¾?å??ç¨±:"
 
-#: ../app/display/gimpcursorview.c:210
-#: ../app/display/gimpcursorview.c:216
-#: ../app/display/gimpcursorview.c:235
-#: ../app/display/gimpcursorview.c:241
-#: ../app/display/gimpcursorview.c:260
-#: ../app/display/gimpcursorview.c:266
-#: ../app/display/gimpcursorview.c:282
-#: ../app/display/gimpcursorview.c:289
-#: ../app/display/gimpcursorview.c:664
-#: ../app/display/gimpcursorview.c:665
-#: ../app/display/gimpcursorview.c:666
-#: ../app/display/gimpcursorview.c:667
-#: ../app/display/gimpcursorview.c:780
-#: ../app/display/gimpcursorview.c:781
-#: ../app/display/gimpcursorview.c:782
-#: ../app/display/gimpcursorview.c:783
-#: ../app/widgets/gimpcolorframe.c:630
+#: ../app/display/gimpcursorview.c:210 ../app/display/gimpcursorview.c:216
+#: ../app/display/gimpcursorview.c:235 ../app/display/gimpcursorview.c:241
+#: ../app/display/gimpcursorview.c:260 ../app/display/gimpcursorview.c:266
+#: ../app/display/gimpcursorview.c:282 ../app/display/gimpcursorview.c:289
+#: ../app/display/gimpcursorview.c:664 ../app/display/gimpcursorview.c:665
+#: ../app/display/gimpcursorview.c:666 ../app/display/gimpcursorview.c:667
+#: ../app/display/gimpcursorview.c:780 ../app/display/gimpcursorview.c:781
+#: ../app/display/gimpcursorview.c:782 ../app/display/gimpcursorview.c:783
+#: ../app/widgets/gimpcolorframe.c:633
 msgid "n/a"
 msgstr "ç?¡"
 
-#: ../app/display/gimpcursorview.c:213
-#: ../app/display/gimpcursorview.c:238
+#: ../app/display/gimpcursorview.c:213 ../app/display/gimpcursorview.c:238
 #: ../app/display/gimpcursorview.c:263
 #: ../app/widgets/gimpdeviceinfoeditor.c:140
 msgid "X"
 msgstr "X"
 
-#: ../app/display/gimpcursorview.c:219
-#: ../app/display/gimpcursorview.c:244
+#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244
 #: ../app/display/gimpcursorview.c:269
 #: ../app/widgets/gimpdeviceinfoeditor.c:141
 msgid "Y"
 msgstr "Y"
 
+#. Units
 #: ../app/display/gimpcursorview.c:225
 msgid "Units"
 msgstr "é?·åº¦å?®ä½?"
 
+#. Selection Bounding Box
 #: ../app/display/gimpcursorview.c:250
 #, fuzzy
 msgid "Selection Bounding Box"
 msgstr "ä¸?è¼?æ¤ç¶?å®?æ?¹å¡?"
 
+#. Width
 #: ../app/display/gimpcursorview.c:286
 #, fuzzy
 msgid "W"
 msgstr "è¥¿"
 
+#. Height
 #: ../app/display/gimpcursorview.c:293
 #, fuzzy
 msgid "H"
@@ -10185,25 +10256,24 @@ msgstr "H"
 msgid "_Sample Merged"
 msgstr "å??ä½µæ¨£æ?¬(_S)"
 
-#: ../app/display/gimpdisplayshell.c:502
+#: ../app/display/gimpdisplayshell.c:506
 msgid "Access the image menu"
 msgstr "å?å??å??ç??é?¸å?®"
 
-#: ../app/display/gimpdisplayshell.c:616
+#: ../app/display/gimpdisplayshell.c:617
 msgid "Zoom image when window size changes"
 msgstr "è¦?çª?å°ºå¯¸æ?´æ?¹æ??èª¿æ?´ç¸®æ?¾æ¯?ç??"
 
-#: ../app/display/gimpdisplayshell.c:645
+#: ../app/display/gimpdisplayshell.c:646
 msgid "Toggle Quick Mask"
 msgstr "å??æ??å¿«é??é?®ç½©"
 
-#: ../app/display/gimpdisplayshell.c:668
+#: ../app/display/gimpdisplayshell.c:669
 msgid "Navigate the image display"
 msgstr "å°?è¦½è?³å??ç??é¡¯ç¤º"
 
-#: ../app/display/gimpdisplayshell.c:736
-#: ../app/display/gimpdisplayshell.c:1328
-#: ../app/widgets/gimptoolbox.c:315
+#: ../app/display/gimpdisplayshell.c:737
+#: ../app/display/gimpdisplayshell.c:1323 ../app/widgets/gimptoolbox.c:270
 msgid "Drop image files here to open them"
 msgstr "å°?å??ç??æª?æ¡?æ??æ?¾è?³æ¤ä»¥é??å??å®?å??"
 
@@ -10225,21 +10295,27 @@ msgstr "é??é??è¦?çª?ä¹?å??æ?¯å?¦å?²å?å??ç?? â??%sâ??ï¼?"
 #: ../app/display/gimpdisplayshell-close.c:254
 #, c-format
 msgid "If you don't save the image, changes from the last hour will be lost."
-msgid_plural "If you don't save the image, changes from the last %d hours will be lost."
+msgid_plural ""
+"If you don't save the image, changes from the last %d hours will be lost."
 msgstr[0] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? 1 å°?æ??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 msgstr[1] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? %d å°?æ??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 
 #: ../app/display/gimpdisplayshell-close.c:264
 #, c-format
-msgid "If you don't save the image, changes from the last hour and %d minute will be lost."
-msgid_plural "If you don't save the image, changes from the last hour and %d minutes will be lost."
+msgid ""
+"If you don't save the image, changes from the last hour and %d minute will "
+"be lost."
+msgid_plural ""
+"If you don't save the image, changes from the last hour and %d minutes will "
+"be lost."
 msgstr[0] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? 1 å°?æ?? %d å??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 msgstr[1] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? 1 å°?æ?? %d å??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 
 #: ../app/display/gimpdisplayshell-close.c:275
 #, c-format
 msgid "If you don't save the image, changes from the last minute will be lost."
-msgid_plural "If you don't save the image, changes from the last %d minutes will be lost."
+msgid_plural ""
+"If you don't save the image, changes from the last %d minutes will be lost."
 msgstr[0] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? 1 å??é??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 msgstr[1] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? %d å??é??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 
@@ -10254,22 +10330,16 @@ msgid "Drop New Path"
 msgstr "æ??æ?¾æ?°ç??è·¯å¾?"
 
 #: ../app/display/gimpdisplayshell-dnd.c:347
-#: ../app/display/gimpdisplayshell-dnd.c:442
-#: ../app/tools/gimpblendtool.c:174
-#: ../app/tools/gimpbucketfilltool.c:135
-#: ../app/tools/gimpimagemaptool.c:279
+#: ../app/display/gimpdisplayshell-dnd.c:442 ../app/tools/gimpblendtool.c:171
+#: ../app/tools/gimpbucketfilltool.c:135 ../app/tools/gimpimagemaptool.c:280
 msgid "Cannot modify the pixels of layer groups."
 msgstr "ä¸?è?½ä¿®æ?¹å??å±¤ç¾£çµ?ç??å??ç´ ã??"
 
 #: ../app/display/gimpdisplayshell-dnd.c:355
-#: ../app/display/gimpdisplayshell-dnd.c:450
-#: ../app/tools/gimpblendtool.c:181
-#: ../app/tools/gimpbucketfilltool.c:142
-#: ../app/tools/gimpcroptool.c:335
-#: ../app/tools/gimpimagemaptool.c:286
-#: ../app/tools/gimppainttool.c:286
-#: ../app/tools/gimptransformtool.c:350
-#: ../app/tools/gimptransformtool.c:1174
+#: ../app/display/gimpdisplayshell-dnd.c:450 ../app/tools/gimpblendtool.c:178
+#: ../app/tools/gimpbucketfilltool.c:142 ../app/tools/gimpcroptool.c:342
+#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:285
+#: ../app/tools/gimptransformtool.c:315 ../app/tools/gimptransformtool.c:1261
 msgid "The active layer's pixels are locked."
 msgstr "ä½¿ç?¨ä¸ç??å??å±¤å??ç´ è¢«é??å®?ã??"
 
@@ -10280,8 +10350,7 @@ msgstr "æ??æ?¾å??å±¤"
 
 #: ../app/display/gimpdisplayshell-dnd.c:635
 #: ../app/display/gimpdisplayshell-dnd.c:657
-#: ../app/widgets/gimplayertreeview.c:811
-#: ../app/widgets/gimptoolbox-dnd.c:274
+#: ../app/widgets/gimplayertreeview.c:811 ../app/widgets/gimptoolbox-dnd.c:276
 msgid "Dropped Buffer"
 msgstr "æ??æ?¾ç·©è¡?å??"
 
@@ -10293,12 +10362,12 @@ msgstr "æ¿¾è?²ç??"
 msgid "Configure Color Display Filters"
 msgstr "è¨å®?æ¿¾è?²ç??"
 
-#: ../app/display/gimpdisplayshell-handlers.c:749
+#: ../app/display/gimpdisplayshell-handlers.c:802
 #, c-format
 msgid "Image saved to '%s'"
 msgstr "å??ç??å?²å?ç?ºâ??%sâ??"
 
-#: ../app/display/gimpdisplayshell-handlers.c:763
+#: ../app/display/gimpdisplayshell-handlers.c:816
 #, c-format
 msgid "Image exported to '%s'"
 msgstr "å??ç??å?¯å?ºå?° %s"
@@ -10343,19 +10412,18 @@ msgstr "(å?¯å?º)"
 
 #: ../app/display/gimpdisplayshell-title.c:506
 msgid " (overwritten)"
-msgstr ""
+msgstr "(è¦?è??)"
 
 #: ../app/display/gimpdisplayshell-title.c:512
 msgid " (imported)"
 msgstr "(å?¯å?¥)"
 
-#: ../app/display/gimpstatusbar.c:358
+#: ../app/display/gimpstatusbar.c:356
 #, c-format
 msgid "Cancel <i>%s</i>"
 msgstr "å??æ¶? <i>%s</i>"
 
-#: ../app/file/file-open.c:136
-#: ../app/file/file-save.c:112
+#: ../app/file/file-open.c:136 ../app/file/file-save.c:112
 msgid "Not a regular file"
 msgstr "ä¸?æ?¯æ?®é??æª?æ¡?"
 
@@ -10379,7 +10447,9 @@ msgid "Opening '%s' failed: %s"
 msgstr "é??å??â??%sâ??å¤±æ??ï¼?%s"
 
 #: ../app/file/file-open.c:678
-msgid "Color management has been disabled. It can be enabled again in the Preferences dialog."
+msgid ""
+"Color management has been disabled. It can be enabled again in the "
+"Preferences dialog."
 msgstr "è?²å½©ç®¡ç??å·²ç¶?è¢«å??ç?¨ã??å®?å?¯ä»¥å?¨å??å¥½è¨å®?å°?è©±ç??ä¸å??æ¬¡å??ç?¨ã??"
 
 #: ../app/file/file-procedure.c:198
@@ -10396,17 +10466,27 @@ msgstr "%s å¢?æ??æ¨¡çµ?ç?¡æ³?å?²å?å??ç??"
 msgid "'%s:' is not a valid URI scheme"
 msgstr "ã??%s:ã??ä¸?æ?¯æ??æ??ç?? URI æ?¶æ§?"
 
-#: ../app/file/file-utils.c:90
-#: ../app/file/file-utils.c:126
+#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126
 msgid "Invalid character sequence in URI"
 msgstr "URI ä¸å?ºç?¾ç?¡æ??ç??å?ç¬¦æ¬¡åº?"
 
+#: ../app/gegl/gimp-gegl-enums.c:24
+#, fuzzy
+msgctxt "cage-mode"
+msgid "Create or adjust the cage"
+msgstr "è£½ä½?æ?°ç??å??ç??"
+
+#: ../app/gegl/gimp-gegl-enums.c:25
+#, fuzzy
+msgctxt "cage-mode"
+msgid "Deform the cage to deform the image"
+msgstr "èª¿æ?´å??å±¤ç?ºå??ç??ç??å¤§å°?"
+
 #: ../app/gegl/gimpcurvesconfig.c:384
 msgid "not a GIMP Curves file"
 msgstr "ä¸?æ?¯ GIMP æ?²ç·?æª?æ¡?"
 
-#: ../app/gegl/gimpcurvesconfig.c:399
-#: ../app/gegl/gimplevelsconfig.c:710
+#: ../app/gegl/gimpcurvesconfig.c:399 ../app/gegl/gimplevelsconfig.c:710
 msgid "parse error"
 msgstr "å??æ??é?¯èª¤"
 
@@ -10414,7 +10494,8 @@ msgstr "å??æ??é?¯èª¤"
 msgid "not a GIMP Levels file"
 msgstr "ä¸¦é?? GIMP è?²é??æª?æ¡?"
 
-#: ../app/gui/gui.c:425
+#. initialize the document history
+#: ../app/gui/gui.c:422
 msgid "Documents"
 msgstr "æ??ä»¶"
 
@@ -10422,21 +10503,19 @@ msgstr "æ??ä»¶"
 msgid "GIMP Startup"
 msgstr "å??å?? GIMP"
 
-#: ../app/paint/gimpairbrush.c:72
-#: ../app/tools/gimpairbrushtool.c:53
+#: ../app/paint/gimpairbrush.c:72 ../app/tools/gimpairbrushtool.c:54
 msgid "Airbrush"
 msgstr "å?´æ§?"
 
-#: ../app/paint/gimpbrushcore.c:435
+#: ../app/paint/gimpbrushcore.c:432
 msgid "No brushes available for use with this tool."
 msgstr "æ²?æ??ç?å?·å?¯é??å??æ¤å·¥å?·ä½¿ç?¨ã??"
 
-#: ../app/paint/gimpbrushcore.c:442
+#: ../app/paint/gimpbrushcore.c:439
 msgid "No paint dynamics available for use with this tool."
 msgstr "æ²?æ??ç?å?·å??æ??å?¯é??å??æ¤å·¥å?·ä½¿ç?¨ã??"
 
-#: ../app/paint/gimpclone.c:102
-#: ../app/tools/gimpclonetool.c:60
+#: ../app/paint/gimpclone.c:102 ../app/tools/gimpclonetool.c:60
 msgid "Clone"
 msgstr "æ¨¡ä»¿"
 
@@ -10452,13 +10531,11 @@ msgstr "æ?²ç©?"
 msgid "Dodge/Burn"
 msgstr "æ¼?ç?½/ç?»é»?"
 
-#: ../app/paint/gimperaser.c:65
-#: ../app/tools/gimperasertool.c:65
+#: ../app/paint/gimperaser.c:65 ../app/tools/gimperasertool.c:65
 msgid "Eraser"
 msgstr "æ©¡ç?®æ?¦"
 
-#: ../app/paint/gimpheal.c:118
-#: ../app/tools/gimphealtool.c:52
+#: ../app/paint/gimpheal.c:118 ../app/tools/gimphealtool.c:52
 msgid "Heal"
 msgstr "ä¿®è£?"
 
@@ -10466,8 +10543,7 @@ msgstr "ä¿®è£?"
 msgid "Healing does not operate on indexed layers."
 msgstr "ä¿®è£?ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
 
-#: ../app/paint/gimpink.c:97
-#: ../app/tools/gimpinktool.c:54
+#: ../app/paint/gimpink.c:97 ../app/tools/gimpinktool.c:54
 msgid "Ink"
 msgstr "å¢¨æ°´ç?"
 
@@ -10483,30 +10559,25 @@ msgstr "å¢¨æ°´æ??é»?é?·å¯¬æ¯?"
 msgid "Ink Blob Angle"
 msgstr "å¢¨æ°´æ??é»?è§?åº¦"
 
-#: ../app/paint/gimppaintbrush.c:65
-#: ../app/tools/gimppaintbrushtool.c:50
+#: ../app/paint/gimppaintbrush.c:65 ../app/tools/gimppaintbrushtool.c:50
 msgid "Paintbrush"
 msgstr "ç?«ç?"
 
-#: ../app/paint/gimppaintcore-stroke.c:335
-msgid "Not enough points to stroke"
-msgstr "æ²?æ??è¶³å¤ ç??ç?å??é»?"
-
 #: ../app/paint/gimppaintcore.c:140
 msgid "Paint"
 msgstr "ç¹ªå??"
 
 #: ../app/paint/gimppaintoptions.c:138
-msgid "Brush Scale"
-msgstr "ç?å?·ç¸®æ?¾"
+#, fuzzy
+msgid "Brush Size"
+msgstr "ç·¨è¼¯é?·é??"
 
-#: ../app/paint/gimppencil.c:41
-#: ../app/tools/gimppenciltool.c:50
+#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50
 msgid "Pencil"
 msgstr "é??ç?"
 
 #: ../app/paint/gimpperspectiveclone.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:128
+#: ../app/tools/gimpperspectiveclonetool.c:124
 msgid "Perspective Clone"
 msgstr "é??è¦?æ³?ä»¿è£½"
 
@@ -10514,8 +10585,7 @@ msgstr "é??è¦?æ³?ä»¿è£½"
 msgid "Perspective Clone does not operate on indexed layers."
 msgstr "é??è¦?æ³?ä»¿è£½ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²å??å±¤ã??"
 
-#: ../app/paint/gimpsmudge.c:83
-#: ../app/tools/gimpsmudgetool.c:52
+#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:53
 msgid "Smudge"
 msgstr "å¡?æ?¹"
 
@@ -10573,23 +10643,20 @@ msgstr "å¢?æ??æ¨¡çµ?"
 
 #: ../app/pdb/drawable-transform-cmds.c:319
 #: ../app/pdb/drawable-transform-cmds.c:406
-#: ../app/pdb/item-transform-cmds.c:256
-#: ../app/pdb/transform-tools-cmds.c:153
+#: ../app/pdb/item-transform-cmds.c:256 ../app/pdb/transform-tools-cmds.c:153
 #: ../app/tools/gimpperspectivetool.c:69
 msgid "Perspective"
 msgstr "é??è¦?æ³?"
 
 #: ../app/pdb/drawable-transform-cmds.c:862
 #: ../app/pdb/drawable-transform-cmds.c:936
-#: ../app/pdb/item-transform-cmds.c:597
-#: ../app/pdb/transform-tools-cmds.c:375
+#: ../app/pdb/item-transform-cmds.c:597 ../app/pdb/transform-tools-cmds.c:375
 #: ../app/tools/gimpsheartool.c:110
 msgid "Shearing"
 msgstr "æ?¨ç§»"
 
 #: ../app/pdb/drawable-transform-cmds.c:1023
-#: ../app/pdb/item-transform-cmds.c:693
-#: ../app/pdb/transform-tools-cmds.c:453
+#: ../app/pdb/item-transform-cmds.c:693 ../app/pdb/transform-tools-cmds.c:453
 msgid "2D Transform"
 msgstr "2D è®?æ??"
 
@@ -10600,8 +10667,7 @@ msgstr "2D è®?æ??"
 msgid "2D Transforming"
 msgstr "2D è®?æ??"
 
-#: ../app/pdb/edit-cmds.c:725
-#: ../app/tools/gimpblendtool.c:243
+#: ../app/pdb/edit-cmds.c:725 ../app/tools/gimpblendtool.c:240
 msgid "Blending"
 msgstr "é?²è¡?æ··è?²"
 
@@ -10614,11 +10680,12 @@ msgid "Cannot anchor this layer because it is not a floating selection."
 msgstr "ç?¡æ³?å?ºå®?é??å??å??å±¤ï¼?å? ç?ºå®?ä¸?æ?¯æµ®å??ç??é?¸å??å??å??ã??"
 
 #: ../app/pdb/floating-sel-cmds.c:128
-msgid "Cannot convert this layer to a normal layer because it is not a floating selection."
+msgid ""
+"Cannot convert this layer to a normal layer because it is not a floating "
+"selection."
 msgstr "ç?¡æ³?è½?æ??é??å??å??å±¤ç?ºä¸?è?¬å??å±¤ï¼?å? ç?ºå®?ä¸?æ?¯æµ®å??ç??é?¸å??å??å??ã??"
 
-#: ../app/pdb/gimppdb-query.c:299
-#: ../app/pdb/gimppdb.c:306
+#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:306
 #: ../app/pdb/gimppdb.c:376
 #, c-format
 msgid "Procedure '%s' not found"
@@ -10719,12 +10786,16 @@ msgstr "ä¸?è?½ä½¿ç?¨é ?ç?®â??%sâ??(%d) å? ç?ºå®?å°?æ?ªè¢«å? å?¥å??ç??ä¸"
 
 #: ../app/pdb/gimppdb-utils.c:357
 #, fuzzy, c-format
-msgid "Item '%s' (%d) cannot be used because it is not a direct child of an item tree"
+msgid ""
+"Item '%s' (%d) cannot be used because it is not a direct child of an item "
+"tree"
 msgstr "ä¸?è?½ä½¿ç?¨é ?ç?®â??%sâ??(%d) å? ç?ºå®?å°?æ?ªè¢«å? å?¥å??ç??ä¸"
 
 #: ../app/pdb/gimppdb-utils.c:385
 #, fuzzy, c-format
-msgid "Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of the same item tree"
+msgid ""
+"Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of "
+"the same item tree"
 msgstr "ä¸?è?½ä½¿ç?¨é ?ç?®â??%sâ??(%d) å? ç?ºå®?å°?æ?ªè¢«å? å?¥å??ç??ä¸"
 
 #: ../app/pdb/gimppdb-utils.c:410
@@ -10779,7 +10850,9 @@ msgstr "å??é??ç?©ä»¶ %d ä¸?å??å?« ID %d ç??ç?å??"
 
 #: ../app/pdb/gimppdb.c:410
 #, c-format
-msgid "Procedure '%s' has been called with a wrong type for argument #%d. Expected %s, got %s."
+msgid ""
+"Procedure '%s' has been called with a wrong type for argument #%d. Expected "
+"%s, got %s."
 msgstr "å?¨å¼?æ?¸ #%2$d ä½¿ç?¨äº?é?¯èª¤ç??é¡?å??å?¼å?«ç¨?åº?ã??%1$sã??ã??é ?æ??ç?º %3$sï¼?å?»æ?¶å?° %4$sã??"
 
 #: ../app/pdb/gimppdbcontext.c:78
@@ -10788,85 +10861,93 @@ msgstr "å?¨å¼?æ?¸ #%2$d ä½¿ç?¨äº?é?¯èª¤ç??é¡?å??å?¼å?«ç¨?åº?ã??%1$sã??ã??é ?æ??
 msgid "Smooth edges"
 msgstr "å°?é??ç·£å¹³æ»?å??"
 
-#: ../app/pdb/gimpprocedure.c:371
-#: ../app/plug-in/gimppluginprocframe.c:208
+#: ../app/pdb/gimpprocedure.c:371 ../app/plug-in/gimppluginprocframe.c:208
 #, c-format
 msgid "Procedure '%s' returned no return values"
 msgstr "ç¨?åº?ã??%sã??å?³å??ã??æ²?æ??å??å?³æ?¸å?¼ã??"
 
 #: ../app/pdb/gimpprocedure.c:634
 #, c-format
-msgid "Procedure '%s' returned a wrong value type for return value '%s' (#%d). Expected %s, got %s."
+msgid ""
+"Procedure '%s' returned a wrong value type for return value '%s' (#%d). "
+"Expected %s, got %s."
 msgstr "ç¨?åº?ã??%sã??å?¨å??å?³æ?¸å?¼ã??%sã??(#%d)å?³å??é?¯èª¤ç??æ?¸å?¼é¡?å??ã??é ?æ??ç?º %sï¼?å?»æ?¶å?° %sã??"
 
 #: ../app/pdb/gimpprocedure.c:646
 #, c-format
-msgid "Procedure '%s' has been called with a wrong value type for argument '%s' (#%d). Expected %s, got %s."
+msgid ""
+"Procedure '%s' has been called with a wrong value type for argument '%s' (#"
+"%d). Expected %s, got %s."
 msgstr "å?¨å¼?æ?¸ã??%2$sã??(#%3$d)ä½¿ç?¨äº?é?¯èª¤ç??æ?¸å?¼é¡?å??å?¼å?«ç¨?åº?ã??%1$sã??ã??é ?æ??ç?º %4$sï¼?å?»æ?¶å?° %5$sã??"
 
 #: ../app/pdb/gimpprocedure.c:678
 #, c-format
-msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer."
+msgid ""
+"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
+"in is trying to work on a layer that doesn't exist any longer."
 msgstr "ç¨?åº?ã??%sã??å?³å??å¼?æ?¸ã??%sã??ç??ç?¡æ?? IDã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??ç??å·²ä¸?å?å?¨ç??å??å±¤ã??"
 
 #: ../app/pdb/gimpprocedure.c:690
 #, c-format
-msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer."
+msgid ""
+"Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
+"likely a plug-in is trying to work on a layer that doesn't exist any longer."
 msgstr "å?¨å¼?æ?¸ã??%2$sã??ä½¿ç?¨äº?ç?¡æ??ç?? ID å?¼å?«ç¨?åº?ã??%1$sã??ã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??ç??å·²ä¸?å?å?¨ç??å??å±¤ã??"
 
 #: ../app/pdb/gimpprocedure.c:706
 #, c-format
-msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer."
+msgid ""
+"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
+"in is trying to work on an image that doesn't exist any longer."
 msgstr "ç¨?åº?ã??%sã??å?³å??å¼?æ?¸ã??%sã??ç??ç?¡æ?? IDã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??ç??å·²ä¸?å?å?¨ç??å??ç??ã??"
 
 #: ../app/pdb/gimpprocedure.c:718
 #, c-format
-msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer."
+msgid ""
+"Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
+"likely a plug-in is trying to work on an image that doesn't exist any longer."
 msgstr "å?¨å¼?æ?¸ã??%2$sã??ä½¿ç?¨äº?ç?¡æ??ç?? ID å?¼å?«ç¨?åº?ã??%1$sã??ã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??ç??å·²ä¸?å?å?¨ç??å??ç??ã??"
 
 #: ../app/pdb/gimpprocedure.c:738
 #, c-format
-msgid "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value is out of range."
+msgid ""
+"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value "
+"is out of range."
 msgstr "ç¨?åº?ã??%sã??å?³å??ã??%sã??å??ç?ºå??å?³æ?¸å?¼ã??%sã??(#%dï¼?é¡?å?? %s)ã??é??å??æ?¸å?¼è¶?å?ºäº?ç¯?å??ã??"
 
 #: ../app/pdb/gimpprocedure.c:751
 #, c-format
-msgid "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %s). This value is out of range."
+msgid ""
+"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type "
+"%s). This value is out of range."
 msgstr "å?¨å¼?æ?¸ã??%3$sã??(#%4$dï¼?é¡?å?? %5$s) ä½¿ç?¨æ?¸å?¼ã??%2$sã??å?¼å?«ç¨?åº?ã??%1$sã??ã??é??å??æ?¸å?¼è¶?å?ºäº?ç¯?å??ã??"
 
 #: ../app/pdb/image-cmds.c:2650
-msgid "Image resolution is out of bounds, using the default resolution instead."
+msgid ""
+"Image resolution is out of bounds, using the default resolution instead."
 msgstr "å??ç??ç??è§£å??åº¦è¶?å?ºç¯?å??ï¼?æ??ä½¿ç?¨é ?è¨ç??è§£å??åº¦ä»£æ?¿ã??"
 
-#: ../app/pdb/layer-cmds.c:478
-#: ../app/pdb/layer-cmds.c:516
-msgid "Move Layer"
-msgstr "ç§»å??å??å±¤"
-
-#: ../app/pdb/selection-tools-cmds.c:217
-#: ../app/tools/gimpfreeselecttool.c:199
+#: ../app/pdb/image-select-cmds.c:164 ../app/pdb/selection-tools-cmds.c:217
+#: ../app/tools/gimpfreeselecttool.c:198
 msgid "Free Select"
 msgstr "è?ªç?±é?¸å??å??å??"
 
+#: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516
+msgid "Move Layer"
+msgstr "ç§»å??å??å±¤"
+
 #: ../app/pdb/text-layer-cmds.c:89
 #, c-format
 msgid "Failed to create text layer"
 msgstr "å»ºç«?æ??å?å??å±¤å¤±æ??"
 
-#: ../app/pdb/text-layer-cmds.c:162
-#: ../app/pdb/text-layer-cmds.c:272
-#: ../app/pdb/text-layer-cmds.c:351
-#: ../app/pdb/text-layer-cmds.c:424
-#: ../app/pdb/text-layer-cmds.c:496
-#: ../app/pdb/text-layer-cmds.c:568
-#: ../app/pdb/text-layer-cmds.c:640
-#: ../app/pdb/text-layer-cmds.c:712
-#: ../app/pdb/text-layer-cmds.c:784
-#: ../app/pdb/text-layer-cmds.c:854
-#: ../app/pdb/text-layer-cmds.c:926
-#: ../app/pdb/text-layer-cmds.c:998
-#: ../app/pdb/text-layer-cmds.c:1070
-#: ../app/pdb/text-layer-cmds.c:1106
+#: ../app/pdb/text-layer-cmds.c:162 ../app/pdb/text-layer-cmds.c:272
+#: ../app/pdb/text-layer-cmds.c:351 ../app/pdb/text-layer-cmds.c:424
+#: ../app/pdb/text-layer-cmds.c:496 ../app/pdb/text-layer-cmds.c:568
+#: ../app/pdb/text-layer-cmds.c:640 ../app/pdb/text-layer-cmds.c:712
+#: ../app/pdb/text-layer-cmds.c:784 ../app/pdb/text-layer-cmds.c:854
+#: ../app/pdb/text-layer-cmds.c:926 ../app/pdb/text-layer-cmds.c:998
+#: ../app/pdb/text-layer-cmds.c:1070 ../app/pdb/text-layer-cmds.c:1106
 #: ../app/pdb/text-layer-cmds.c:1185
 msgid "Set text layer attribute"
 msgstr "è¨å®?æ??å?å??å±¤å±¬æ?§"
@@ -10892,19 +10973,16 @@ msgstr "ç¸®æ?¾è·¯å¾?æ??é??"
 msgid "Rotate path stroke"
 msgstr "æ??è½?è·¯å¾?æ??é??"
 
-#: ../app/pdb/vectors-cmds.c:521
-#: ../app/pdb/vectors-cmds.c:565
+#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565
 msgid "Flip path stroke"
 msgstr "ç¿»è½?è·¯å¾?æ??é??"
 
-#: ../app/pdb/vectors-cmds.c:694
-#: ../app/pdb/vectors-cmds.c:816
+#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:816
 #: ../app/pdb/vectors-cmds.c:1035
 msgid "Add path stroke"
 msgstr "å? å?¥è·¯å¾?æ??é??"
 
-#: ../app/pdb/vectors-cmds.c:868
-#: ../app/pdb/vectors-cmds.c:921
+#: ../app/pdb/vectors-cmds.c:868 ../app/pdb/vectors-cmds.c:921
 #: ../app/pdb/vectors-cmds.c:982
 msgid "Extend path stroke"
 msgstr "æ?´å¤§è·¯å¾?æ??é??"
@@ -10957,7 +11035,8 @@ msgid ""
 "Plug-in crashed: \"%s\"\n"
 "(%s)\n"
 "\n"
-"The dying plug-in may have messed up GIMP's internal state. You may want to save your images and restart GIMP to be on the safe side."
+"The dying plug-in may have messed up GIMP's internal state. You may want to "
+"save your images and restart GIMP to be on the safe side."
 msgstr ""
 "å¢?æ??æ¨¡çµ?ç?°å¸¸çµ?æ¢ï¼?â??%sâ??\n"
 "(%s)\n"
@@ -11046,58 +11125,59 @@ msgstr "æ??å®?å??ç¤ºé¡?å??ç??å?¼ â??%sâ?? ç?¡æ??"
 msgid "invalid value '%ld' for icon type"
 msgstr "æ??å®?å??ç¤ºé¡?å??ç??å?¼ â??%ldâ?? ç?¡æ??"
 
+#. This is a so-called pangram; it's supposed to
+#. contain all characters found in the alphabet.
 #: ../app/text/gimpfont.c:43
 msgid ""
 "Pack my box with\n"
 "five dozen liquor jugs."
 msgstr "This is Chinese test: 'ä¸æ??æ¸¬è©¦'"
 
-#: ../app/text/gimptext-compat.c:107
-#: ../app/tools/gimptexttool.c:1383
+#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:1394
 msgid "Add Text Layer"
 msgstr "å? å?¥æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:141
+#: ../app/text/gimptextlayer.c:142
 msgid "Text Layer"
 msgstr "æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:142
+#: ../app/text/gimptextlayer.c:143
 msgid "Rename Text Layer"
 msgstr "æ?´æ?¹æ??å?å??å±¤å??ç¨±"
 
-#: ../app/text/gimptextlayer.c:143
+#: ../app/text/gimptextlayer.c:144
 msgid "Move Text Layer"
 msgstr "ç§»å??æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:144
+#: ../app/text/gimptextlayer.c:145
 msgid "Scale Text Layer"
 msgstr "ç¸®æ?¾æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:145
+#: ../app/text/gimptextlayer.c:146
 msgid "Resize Text Layer"
 msgstr "èª¿æ?´æ??å?å??å±¤å°ºå¯¸"
 
-#: ../app/text/gimptextlayer.c:146
+#: ../app/text/gimptextlayer.c:147
 msgid "Flip Text Layer"
 msgstr "ç¿»è½?æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:147
+#: ../app/text/gimptextlayer.c:148
 msgid "Rotate Text Layer"
 msgstr "æ??è½?æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:148
+#: ../app/text/gimptextlayer.c:149
 msgid "Transform Text Layer"
 msgstr "è®?æ??æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:509
+#: ../app/text/gimptextlayer.c:522
 msgid "Discard Text Information"
 msgstr "æ?¾æ£?æ??å?è³?è¨?"
 
-#: ../app/text/gimptextlayer.c:562
+#: ../app/text/gimptextlayer.c:575
 msgid "Due to lack of any fonts, text functionality is not available."
 msgstr "å? ç?ºç¼ºä¹?å?¯ä½¿ç?¨ç??å?å??ï¼?æ??ä»¥ç?¡æ³?æ??ä¾?æ??å?å??è?½ã??"
 
-#: ../app/text/gimptextlayer.c:613
+#: ../app/text/gimptextlayer.c:626
 msgid "Empty Text Layer"
 msgstr "ç©ºç?½æ??å?å??å±¤"
 
@@ -11107,7 +11187,8 @@ msgid ""
 "Problems parsing the text parasite for layer '%s':\n"
 "%s\n"
 "\n"
-"Some text properties may be wrong. Unless you want to edit the text layer, you don't need to worry about this."
+"Some text properties may be wrong. Unless you want to edit the text layer, "
+"you don't need to worry about this."
 msgstr ""
 "å??æ??å??å±¤ã??%sã??ç??é??å¸¶æ??å?å?ºç?¾å??é¡?ï¼?\n"
 "%s\n"
@@ -11132,31 +11213,31 @@ msgstr ""
 "æ?¬å·¥å?·\n"
 "ä¸¦æ²?æ??é?¸é ?ã??"
 
-#: ../app/tools/gimpairbrushtool.c:54
+#: ../app/tools/gimpairbrushtool.c:55
 msgid "Airbrush Tool: Paint using a brush, with variable pressure"
 msgstr "å?´æ§?å·¥å?·ï¼?ä½¿ç?¨å?¯è®?å£?ç??å?´æ§?"
 
-#: ../app/tools/gimpairbrushtool.c:55
+#: ../app/tools/gimpairbrushtool.c:56
 msgid "_Airbrush"
 msgstr "å?´æ§?(_A)"
 
-#: ../app/tools/gimpairbrushtool.c:88
+#: ../app/tools/gimpairbrushtool.c:86
 #, fuzzy
 msgid "Motion only"
 msgstr "å?¯è®?"
 
-#: ../app/tools/gimpairbrushtool.c:97
-#: ../app/tools/gimpconvolvetool.c:216
-#: ../app/tools/gimpsmudgetool.c:96
-msgid "Rate:"
-msgstr "å¼·åº¦:"
+#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:211
+#: ../app/tools/gimpsmudgetool.c:91
+#, fuzzy
+msgid "Rate"
+msgstr "Rate"
 
-#: ../app/tools/gimpairbrushtool.c:103
-msgid "Flow:"
-msgstr "æµ?å??ï¼?"
+#: ../app/tools/gimpairbrushtool.c:97
+#, fuzzy
+msgid "Flow"
+msgstr "æµ?å??"
 
-#: ../app/tools/gimpaligntool.c:135
-#: ../app/tools/gimpaligntool.c:764
+#: ../app/tools/gimpaligntool.c:135 ../app/tools/gimpaligntool.c:780
 msgid "Align"
 msgstr "å°?é½?"
 
@@ -11196,124 +11277,114 @@ msgstr "æ??ä¸?é??è£?å°?é??å??è·¯å¾?è¨ç?ºç¬¬ä¸?é ?ç?®"
 msgid "Click to add this path to the list"
 msgstr "æ??ä¸?é??è£?å°?é??å??è·¯å¾?å? å?¥æ¸?å?®"
 
-#: ../app/tools/gimpaligntool.c:776
+#: ../app/tools/gimpaligntool.c:792
 msgid "Relative to:"
 msgstr "ç?¸å°?æ?¼:"
 
-#: ../app/tools/gimpaligntool.c:794
+#: ../app/tools/gimpaligntool.c:810
 msgid "Align left edge of target"
 msgstr "å°?é½?ç?®æ¨?ç??å·¦ç·£"
 
-#: ../app/tools/gimpaligntool.c:800
+#: ../app/tools/gimpaligntool.c:816
 msgid "Align center of target"
 msgstr "å°?é½?ç?®æ¨?ç??ä¸é??"
 
-#: ../app/tools/gimpaligntool.c:806
+#: ../app/tools/gimpaligntool.c:822
 msgid "Align right edge of target"
 msgstr "å°?é½?ç?®æ¨?ç??å?³ç·£"
 
-#: ../app/tools/gimpaligntool.c:816
+#: ../app/tools/gimpaligntool.c:832
 msgid "Align top edge of target"
 msgstr "å°?é½?ç?®æ¨?ç??ä¸?ç·£"
 
-#: ../app/tools/gimpaligntool.c:822
+#: ../app/tools/gimpaligntool.c:838
 msgid "Align middle of target"
 msgstr "å°?é½?ç?®æ¨?ç??ä¸å¤®"
 
-#: ../app/tools/gimpaligntool.c:828
+#: ../app/tools/gimpaligntool.c:844
 msgid "Align bottom of target"
 msgstr "å°?é½?ç?®æ¨?ç??ä¸?ç·£"
 
-#: ../app/tools/gimpaligntool.c:832
+#: ../app/tools/gimpaligntool.c:848
 msgid "Distribute"
 msgstr "å??å¸?"
 
-#: ../app/tools/gimpaligntool.c:846
+#: ../app/tools/gimpaligntool.c:862
 msgid "Distribute left edges of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??å·¦ç·£"
 
-#: ../app/tools/gimpaligntool.c:853
+#: ../app/tools/gimpaligntool.c:869
 msgid "Distribute horizontal centers of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??ä¸é??"
 
-#: ../app/tools/gimpaligntool.c:860
+#: ../app/tools/gimpaligntool.c:876
 msgid "Distribute right edges of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??å?³ç·£"
 
-#: ../app/tools/gimpaligntool.c:870
+#: ../app/tools/gimpaligntool.c:886
 msgid "Distribute top edges of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??ä¸?ç·£"
 
-#: ../app/tools/gimpaligntool.c:877
+#: ../app/tools/gimpaligntool.c:893
 msgid "Distribute vertical centers of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??ä¸é??"
 
-#: ../app/tools/gimpaligntool.c:883
+#: ../app/tools/gimpaligntool.c:899
 msgid "Distribute bottoms of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??ä¸?ç·£"
 
-#: ../app/tools/gimpaligntool.c:891
-#: ../app/tools/gimpblendoptions.c:221
+#: ../app/tools/gimpaligntool.c:907
 msgid "Offset:"
 msgstr "å??ç§»ï¼?"
 
-#: ../app/tools/gimpblendoptions.c:215
-#: ../app/tools/gimppaintoptions-gui.c:307
-msgid "Gradient:"
-msgstr "æ¼¸è®?è?²:"
+#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:285
+msgid "Gradient"
+msgstr "æ¼¸è®?è?²"
 
-#: ../app/tools/gimpblendoptions.c:231
-#: ../app/widgets/gimpbrusheditor.c:145
+#: ../app/tools/gimpblendoptions.c:230 ../app/widgets/gimpbrusheditor.c:145
 msgid "Shape:"
 msgstr "å½¢ç??:"
 
-#: ../app/tools/gimpblendoptions.c:238
-#: ../app/tools/gimppaintoptions-gui.c:238
+#: ../app/tools/gimpblendoptions.c:237 ../app/tools/gimppaintoptions-gui.c:269
 msgid "Repeat:"
 msgstr "é??è¤?:"
 
-#: ../app/tools/gimpblendoptions.c:256
+#: ../app/tools/gimpblendoptions.c:260
 msgid "Adaptive supersampling"
 msgstr "æ??é?©æ?§è¶?å??ç??å??æ¨£"
 
-#: ../app/tools/gimpblendoptions.c:264
-msgid "Max depth:"
+#: ../app/tools/gimpblendoptions.c:267
+#, fuzzy
+msgid "Max depth"
 msgstr "æ??å¤§æ·±åº¦:"
 
-#: ../app/tools/gimpblendoptions.c:271
-#: ../app/tools/gimpbucketfilloptions.c:287
-#: ../app/tools/gimpregionselectoptions.c:219
-msgid "Threshold:"
-msgstr "è?¨ç??å?¼ï¼?"
-
-#: ../app/tools/gimpblendtool.c:109
+#: ../app/tools/gimpblendtool.c:106
 msgid "Blend"
 msgstr "æ··è?²"
 
-#: ../app/tools/gimpblendtool.c:110
+#: ../app/tools/gimpblendtool.c:107
 msgid "Blend Tool: Fill selected area with a color gradient"
-msgstr "æ··è?²å·¥å?·ï¼?å°?é?¸å??ç??å??å??å¡«ä¸?è?²å½©æ¼¸è®?è?²"
+msgstr "æ··è?²å·¥å?·ï¼?ç?¨é¡?è?²æ¼¸è®?è?²å¡«å??é?¸å??å??å??"
 
-#: ../app/tools/gimpblendtool.c:111
+#: ../app/tools/gimpblendtool.c:108
 msgid "Blen_d"
 msgstr "æ··è?²(_D)"
 
-#: ../app/tools/gimpblendtool.c:167
+#: ../app/tools/gimpblendtool.c:164
 msgid "Blend does not operate on indexed layers."
 msgstr "æ··è?²ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
 
-#: ../app/tools/gimpblendtool.c:420
-#: ../app/tools/gimppainttool.c:634
+#: ../app/tools/gimpblendtool.c:417 ../app/tools/gimppainttool.c:637
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%s å?¯é??å®?è§?åº¦"
 
-#: ../app/tools/gimpblendtool.c:421
+#: ../app/tools/gimpblendtool.c:418
 #, c-format
 msgid "%s to move the whole line"
 msgstr "%s æ??ç§»å??æ?´æ¢?ç·?"
 
-#: ../app/tools/gimpblendtool.c:425
+#: ../app/tools/gimpblendtool.c:422
 msgid "Blend: "
 msgstr "æ··è?²ï¼?"
 
@@ -11357,55 +11428,55 @@ msgstr "å°?æ¯?(_T):"
 msgid "Edit these Settings as Levels"
 msgstr "å°?é??äº?è¨å®?å?¼ç?¶ä½?è?²é??ç·¨è¼¯"
 
-#: ../app/tools/gimpbucketfilloptions.c:99
+#: ../app/tools/gimpbucketfilloptions.c:100
 msgid "Allow completely transparent regions to be filled"
 msgstr "å??è¨±å°?å®?å?¨é??æ??ç??å??å??å¡«è?²"
 
-#: ../app/tools/gimpbucketfilloptions.c:105
+#: ../app/tools/gimpbucketfilloptions.c:106
 msgid "Base filled area on all visible layers"
 msgstr "æ??æ??å?¯è¦?ç??å??å±¤ä¸?ç??å?ºç¤?å¡«æ»¿å??å??"
 
-#: ../app/tools/gimpbucketfilloptions.c:111
+#: ../app/tools/gimpbucketfilloptions.c:112
 #: ../app/tools/gimpregionselectoptions.c:95
 msgid "Maximum color difference"
 msgstr "æ??å¤§é¡?è?²å·®ç?°"
 
-#: ../app/tools/gimpbucketfilloptions.c:225
+#. fill type
+#: ../app/tools/gimpbucketfilloptions.c:227
 #, c-format
 msgid "Fill Type  (%s)"
 msgstr "å¡«æ»¿é¡?å??  (%s)"
 
-#: ../app/tools/gimpbucketfilloptions.c:239
+#. fill selection
+#: ../app/tools/gimpbucketfilloptions.c:242
 #, c-format
 msgid "Affected Area  (%s)"
 msgstr "å½±é?¿å??å??  (%s)"
 
-#: ../app/tools/gimpbucketfilloptions.c:243
+#: ../app/tools/gimpbucketfilloptions.c:246
 msgid "Fill whole selection"
 msgstr "å¡«æ»¿æ?´å??é?¸å??å??å??"
 
-#: ../app/tools/gimpbucketfilloptions.c:244
+#: ../app/tools/gimpbucketfilloptions.c:247
 msgid "Fill similar colors"
 msgstr "å?ªå°?è¿?ä¼¼ç??é¡?è?²å¡«è?²"
 
-#: ../app/tools/gimpbucketfilloptions.c:253
+#: ../app/tools/gimpbucketfilloptions.c:256
 msgid "Finding Similar Colors"
 msgstr "å°?æ?¾ç?¸è¿?ç??é¡?è?²"
 
-#: ../app/tools/gimpbucketfilloptions.c:269
+#: ../app/tools/gimpbucketfilloptions.c:272
 msgid "Fill transparent areas"
 msgstr "å°?é??æ??å??å??å¡«è?²"
 
-#: ../app/tools/gimpbucketfilloptions.c:275
-#: ../app/tools/gimpclonetool.c:113
-#: ../app/tools/gimpcolorpickeroptions.c:150
-#: ../app/tools/gimphealtool.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:959
-#: ../app/tools/gimpregionselectoptions.c:207
+#: ../app/tools/gimpbucketfilloptions.c:278 ../app/tools/gimpclonetool.c:113
+#: ../app/tools/gimpcolorpickeroptions.c:150 ../app/tools/gimphealtool.c:98
+#: ../app/tools/gimpperspectiveclonetool.c:952
+#: ../app/tools/gimpregionselectoptions.c:208
 msgid "Sample merged"
 msgstr "å??ä½µæ¨£æ?¬"
 
-#: ../app/tools/gimpbucketfilloptions.c:294
+#: ../app/tools/gimpbucketfilloptions.c:297
 msgid "Fill by:"
 msgstr "å¡«ä¸?:"
 
@@ -11438,6 +11509,37 @@ msgctxt "command"
 msgid "Select by Color"
 msgstr "æ ¹æ??é¡?è?²é?¸å??"
 
+#: ../app/tools/gimpcageoptions.c:144
+msgid "Fill from first point"
+msgstr ""
+
+#: ../app/tools/gimpcagetool.c:136
+#, fuzzy
+msgid "Cage Transform"
+msgstr "è®?æ??"
+
+#: ../app/tools/gimpcagetool.c:137
+msgid "Cage Transform: Deform a selection with a cage"
+msgstr ""
+
+#: ../app/tools/gimpcagetool.c:138
+#, fuzzy
+msgid "_Cage Transform"
+msgstr "è®?æ??(_T)"
+
+#: ../app/tools/gimpcagetool.c:402
+msgid "Press ENTER to commit the transform"
+msgstr ""
+
+#: ../app/tools/gimpcagetool.c:680
+msgid "Coefficient computation"
+msgstr ""
+
+#: ../app/tools/gimpcagetool.c:783
+#, fuzzy
+msgid "Cage transform"
+msgstr "è®?æ??"
+
 #: ../app/tools/gimpclonetool.c:61
 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush"
 msgstr "ä»¿è£½å·¥å?·ï¼?ä½¿ç?¨ç?å?·ï¼?é?¸æ??æ?§ç??è¤?è£½å??ç??æ??å??æ¨£"
@@ -11446,13 +11548,11 @@ msgstr "ä»¿è£½å·¥å?·ï¼?ä½¿ç?¨ç?å?·ï¼?é?¸æ??æ?§ç??è¤?è£½å??ç??æ??å??æ¨£"
 msgid "_Clone"
 msgstr "ä»¿è£½(_C)"
 
-#: ../app/tools/gimpclonetool.c:85
-#: ../app/tools/gimpclonetool.c:88
+#: ../app/tools/gimpclonetool.c:85 ../app/tools/gimpclonetool.c:88
 msgid "Click to clone"
 msgstr "é»?é?¸ä»¥ä»¿è£½"
 
-#: ../app/tools/gimpclonetool.c:86
-#: ../app/tools/gimpclonetool.c:90
+#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:90
 #, c-format
 msgid "%s to set a new clone source"
 msgstr "%s å?¯ä»¥è¨å®?æ?°ç??è¤?è£½ä¾?æº?"
@@ -11462,13 +11562,12 @@ msgid "Click to set a new clone source"
 msgstr "æ??ä¸?é??è£?å?¯ä»¥è¨å®?æ?°ç??è¤?è£½ä¾?æº?"
 
 #: ../app/tools/gimpclonetool.c:108
-#: ../app/tools/gimpperspectiveclonetool.c:954
+#: ../app/tools/gimpperspectiveclonetool.c:947
 msgid "Source"
 msgstr "ä¾?æº?"
 
-#: ../app/tools/gimpclonetool.c:129
-#: ../app/tools/gimphealtool.c:110
-#: ../app/tools/gimpperspectiveclonetool.c:975
+#: ../app/tools/gimpclonetool.c:130 ../app/tools/gimphealtool.c:110
+#: ../app/tools/gimpperspectiveclonetool.c:969
 msgid "Alignment:"
 msgstr "æ??å??:"
 
@@ -11504,8 +11603,7 @@ msgstr "è?²å½©å¹³è¡¡å?ªé?©ç?¨æ?¼ RGB è?²ç³»ç??å??å±¤ã??"
 msgid "Select Range to Adjust"
 msgstr "é?¸æ??è¦?èª¿æ?´ç??ç¯?å??"
 
-#: ../app/tools/gimpcolorbalancetool.c:276
-#: ../app/tools/gimplevelstool.c:172
+#: ../app/tools/gimpcolorbalancetool.c:276 ../app/tools/gimplevelstool.c:172
 msgid "Adjust Color Levels"
 msgstr "èª¿æ?´è?²é??"
 
@@ -11594,26 +11692,27 @@ msgstr "é£½å??åº¦(_S):"
 msgid "_Lightness:"
 msgstr "äº®åº¦(_L):"
 
-#: ../app/tools/gimpcoloroptions.c:75
+#: ../app/tools/gimpcoloroptions.c:77
 msgid "Color Picker Average Radius"
 msgstr "é¡?è?²æ??é?¸å?¨å¹³å??å??å¾?"
 
-#: ../app/tools/gimpcoloroptions.c:161
+#: ../app/tools/gimpcoloroptions.c:157
+#: ../app/tools/gimprectangleselectoptions.c:160
+#: ../app/tools/gimpselectionoptions.c:270
+msgid "Radius"
+msgstr "å??å¾?"
+
+#: ../app/tools/gimpcoloroptions.c:163
 msgid "Sample average"
 msgstr "å¹³å??å??æ¨£"
 
-#: ../app/tools/gimpcoloroptions.c:171
-#: ../app/tools/gimprectangleselectoptions.c:175
-#: ../app/tools/gimpselectionoptions.c:280
-#: ../app/widgets/gimpbrusheditor.c:153
-msgid "Radius:"
-msgstr "å??å¾?:"
-
+#. the pick FG/BG frame
 #: ../app/tools/gimpcolorpickeroptions.c:155
 #, c-format
 msgid "Pick Mode  (%s)"
 msgstr "æ??é?¸æ¨¡å¼?  (%s)"
 
+#. the use_info_window toggle button
 #: ../app/tools/gimpcolorpickeroptions.c:164
 #, c-format
 msgid "Use info window  (%s)"
@@ -11635,13 +11734,11 @@ msgstr "é¡?è?²æ??é?¸å?¨(_O)"
 msgid "Click in any image to view its color"
 msgstr "é»?é?¸Gimpé??å??ç??ä»»ä½?å??ç??ä»¥æª¢è¦?å®?ç??é¡?è?²"
 
-#: ../app/tools/gimpcolorpickertool.c:249
-#: ../app/tools/gimppainttool.c:493
+#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:493
 msgid "Click in any image to pick the foreground color"
 msgstr "é»?é?¸Gimpé??å??ç??ä»»ä½?å??ç??ä»¥æ??é?¸å??æ?¯é¡?è?²"
 
-#: ../app/tools/gimpcolorpickertool.c:257
-#: ../app/tools/gimppainttool.c:499
+#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:499
 msgid "Click in any image to pick the background color"
 msgstr "é»?é?¸Gimpé??å??ç??ä»»ä½?å??ç??ä»¥æ??é?¸è??æ?¯é¡?è?²"
 
@@ -11649,66 +11746,67 @@ msgstr "é»?é?¸Gimpé??å??ç??ä»»ä½?å??ç??ä»¥æ??é?¸è??æ?¯é¡?è?²"
 msgid "Click in any image to add the color to the palette"
 msgstr "é»?é?¸Gimpé??å??ç??ä»»ä½?å??ç??ä»¥å°?é¡?è?²å? å?¥èª¿è?²ç?¤"
 
+#. tool->display->shell
 #: ../app/tools/gimpcolorpickertool.c:318
 msgid "Color Picker Information"
 msgstr "æ??é??é¡?è?²æ??é?¸å?¨ç??è³?è¨?"
 
-#: ../app/tools/gimpcolortool.c:225
-#: ../app/tools/gimpcolortool.c:398
+#: ../app/tools/gimpcolortool.c:228 ../app/tools/gimpcolortool.c:401
 msgid "Move Sample Point: "
 msgstr "ç§»å??å??æ¨£é»?ï¼?"
 
-#: ../app/tools/gimpcolortool.c:390
+#: ../app/tools/gimpcolortool.c:393
 msgid "Remove Sample Point"
 msgstr "ç§»é?¤å??æ¨£é»?"
 
-#: ../app/tools/gimpcolortool.c:391
+#: ../app/tools/gimpcolortool.c:394
 msgid "Cancel Sample Point"
 msgstr "å??æ¶?å??æ¨£é»?"
 
-#: ../app/tools/gimpcolortool.c:399
+#: ../app/tools/gimpcolortool.c:402
 msgid "Add Sample Point: "
 msgstr "å? å?¥å??æ¨£é»?ï¼?"
 
-#: ../app/tools/gimpconvolvetool.c:72
+#: ../app/tools/gimpconvolvetool.c:73
 msgid "Blur / Sharpen"
 msgstr "æ¨¡ç³?å?? / é?³å?©å??"
 
-#: ../app/tools/gimpconvolvetool.c:73
+#: ../app/tools/gimpconvolvetool.c:74
 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush"
 msgstr "æ¨¡ç³?/é?³å?©å??å·¥å?·ï¼?ä½¿ç?¨ç?å?·é?¸æ??æ?§ç??æ¨¡ç³?æ??é?³å?©å??"
 
-#: ../app/tools/gimpconvolvetool.c:74
+#: ../app/tools/gimpconvolvetool.c:75
 msgid "Bl_ur / Sharpen"
 msgstr "æ¨¡ç³?å??/é?³å?©å??(_U)"
 
-#: ../app/tools/gimpconvolvetool.c:169
+#: ../app/tools/gimpconvolvetool.c:170
 msgid "Click to blur"
 msgstr "é»?é?¸ä½¿å?¶æ¨¡ç³?"
 
-#: ../app/tools/gimpconvolvetool.c:170
+#: ../app/tools/gimpconvolvetool.c:171
 msgid "Click to blur the line"
 msgstr "è«?æ??é??è£?ä»¥æ¨¡ç³?æ¤ç·?æ¢?"
 
-#: ../app/tools/gimpconvolvetool.c:171
+#: ../app/tools/gimpconvolvetool.c:172
 #, c-format
 msgid "%s to sharpen"
 msgstr "è®? %s æ?´é?³å?©"
 
-#: ../app/tools/gimpconvolvetool.c:175
+#: ../app/tools/gimpconvolvetool.c:176
 msgid "Click to sharpen"
 msgstr "è«?æ??é??è£?é?³å?©å??"
 
-#: ../app/tools/gimpconvolvetool.c:176
+#: ../app/tools/gimpconvolvetool.c:177
 msgid "Click to sharpen the line"
 msgstr "è«?æ??é??è£?è®?ç·?æ¢?æ?´é?³å?©"
 
-#: ../app/tools/gimpconvolvetool.c:177
+#: ../app/tools/gimpconvolvetool.c:178
 #, c-format
 msgid "%s to blur"
 msgstr "è®? %s æ?´æ¨¡ç³?"
 
-#: ../app/tools/gimpconvolvetool.c:198
+#. the type radio box
+#: ../app/tools/gimpconvolvetool.c:199
 #, c-format
 msgid "Convolve Type  (%s)"
 msgstr "æ?²ç©?é¡?å?? (%s)"
@@ -11721,23 +11819,23 @@ msgstr "å??é?©ç?¨æ?¼ç?®å??å??å±¤"
 msgid "Allow growing"
 msgstr "å??è¨±å¢?å¤§"
 
-#: ../app/tools/gimpcroptool.c:127
+#: ../app/tools/gimpcroptool.c:128
 msgid "Crop"
 msgstr "è£?å?ª"
 
-#: ../app/tools/gimpcroptool.c:128
+#: ../app/tools/gimpcroptool.c:129
 msgid "Crop Tool: Remove edge areas from image or layer"
 msgstr "å?ªè£?å·¥å?·ï¼?è?ªå??ç??æ??å??å±¤ç§»é?¤é??ç·£å??å??"
 
-#: ../app/tools/gimpcroptool.c:129
+#: ../app/tools/gimpcroptool.c:130
 msgid "_Crop"
 msgstr "å?ªè£?(_C)"
 
-#: ../app/tools/gimpcroptool.c:271
+#: ../app/tools/gimpcroptool.c:272
 msgid "Click or press Enter to crop"
 msgstr "é»?é?¸æ??æ?? Enter é?²è¡?å?ªè£?"
 
-#: ../app/tools/gimpcroptool.c:328
+#: ../app/tools/gimpcroptool.c:335
 msgid "There is no active layer to crop."
 msgstr "ç?®å??æ²?æ??ä»»ä½?ä½¿ç?¨ä¸ç??å??å±¤å?¯ä»¥å?ªä¸?ã??"
 
@@ -11781,23 +11879,19 @@ msgstr "é»?é?¸ä»¥å? å?¥æ?§å?¶é»?å?°æ??æ??è?²ç??"
 msgid "Click to locate on curve (try Shift, Ctrl)"
 msgstr ""
 
-#: ../app/tools/gimpcurvestool.c:453
-#: ../app/tools/gimplevelstool.c:384
+#: ../app/tools/gimpcurvestool.c:453 ../app/tools/gimplevelstool.c:384
 msgid "Cha_nnel:"
 msgstr "è?²ç??(_N):"
 
-#: ../app/tools/gimpcurvestool.c:479
-#: ../app/tools/gimplevelstool.c:408
+#: ../app/tools/gimpcurvestool.c:479 ../app/tools/gimplevelstool.c:408
 msgid "R_eset Channel"
 msgstr "é??è¨è?²ç??(_E)"
 
-#: ../app/tools/gimpcurvestool.c:571
-#: ../app/widgets/gimpdeviceinfoeditor.c:460
+#: ../app/tools/gimpcurvestool.c:571 ../app/widgets/gimpdeviceinfoeditor.c:463
 msgid "Curve _type:"
 msgstr "æ?²ç·?é¡?å??(_T):"
 
-#: ../app/tools/gimpcurvestool.c:646
-#: ../app/tools/gimplevelstool.c:756
+#: ../app/tools/gimpcurvestool.c:646 ../app/tools/gimplevelstool.c:756
 #, c-format
 msgid "Could not read header from '%s': %s"
 msgstr "ç?¡æ³?å¾?â??%sâ??è®?å??æ¨?é ï¼?%s"
@@ -11826,68 +11920,71 @@ msgstr "å?»é£½å??åº¦å?ªé?©ç?¨æ?¼ RGB è?²å½©ç??å??å±¤ã??"
 msgid "Choose shade of gray based on:"
 msgstr "é?¸æ??ç?°é??ç??å?ºç¤?ï¼?"
 
-#: ../app/tools/gimpdodgeburntool.c:72
+#: ../app/tools/gimpdodgeburntool.c:73
 msgid "Dodge / Burn"
 msgstr "æ¼?ç?½ / ç?»é»?"
 
-#: ../app/tools/gimpdodgeburntool.c:73
+#: ../app/tools/gimpdodgeburntool.c:74
 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush"
 msgstr "æ¼?ç?½ / ç?»é»?å·¥å?·ï¼?ä½¿ç?¨ç?å?·ä¾?å¢?äº®æ??è®?æ??"
 
-#: ../app/tools/gimpdodgeburntool.c:74
+#: ../app/tools/gimpdodgeburntool.c:75
 msgid "Dod_ge / Burn"
 msgstr "æ¼?ç?½ / ç?»é»?(_G)"
 
-#: ../app/tools/gimpdodgeburntool.c:172
+#: ../app/tools/gimpdodgeburntool.c:173
 msgid "Click to dodge"
 msgstr "è«?æ??é??è£?æ¼?ç?½"
 
-#: ../app/tools/gimpdodgeburntool.c:173
+#: ../app/tools/gimpdodgeburntool.c:174
 msgid "Click to dodge the line"
 msgstr "è«?æ??é??è£?æ¼?ç?½ç·?æ¢?"
 
-#: ../app/tools/gimpdodgeburntool.c:174
+#: ../app/tools/gimpdodgeburntool.c:175
 #, c-format
 msgid "%s to burn"
 msgstr "å°? %s ç?»é»?"
 
-#: ../app/tools/gimpdodgeburntool.c:178
+#: ../app/tools/gimpdodgeburntool.c:179
 msgid "Click to burn"
 msgstr "è«?æ??é??è£?ç?»é»?"
 
-#: ../app/tools/gimpdodgeburntool.c:179
+#: ../app/tools/gimpdodgeburntool.c:180
 msgid "Click to burn the line"
 msgstr "è«?æ??é??è£?ç?»é»?ç·?æ¢?"
 
-#: ../app/tools/gimpdodgeburntool.c:180
+#: ../app/tools/gimpdodgeburntool.c:181
 #, c-format
 msgid "%s to dodge"
 msgstr "å°? %s æ¼?ç?½"
 
-#: ../app/tools/gimpdodgeburntool.c:201
+#. the type (dodge or burn)
+#: ../app/tools/gimpdodgeburntool.c:202
 #, c-format
 msgid "Type  (%s)"
 msgstr "é¡?å??  (%s)"
 
-#: ../app/tools/gimpdodgeburntool.c:212
+#. mode (highlights, midtones, or shadows)
+#: ../app/tools/gimpdodgeburntool.c:213
 msgid "Range"
 msgstr "ç¯?å??"
 
-#: ../app/tools/gimpdodgeburntool.c:224
-msgid "Exposure:"
+#: ../app/tools/gimpdodgeburntool.c:219
+#, fuzzy
+msgid "Exposure"
 msgstr "æ??å??åº¦:"
 
-#: ../app/tools/gimpeditselectiontool.c:240
+#: ../app/tools/gimpeditselectiontool.c:239
 msgid "Move Selection"
 msgstr "ç§»å??é?¸å??å??å??"
 
-#: ../app/tools/gimpeditselectiontool.c:244
-#: ../app/tools/gimpeditselectiontool.c:1233
+#: ../app/tools/gimpeditselectiontool.c:243
+#: ../app/tools/gimpeditselectiontool.c:1235
 msgid "Move Floating Selection"
 msgstr "ç§»å??æµ®å??é?¸å??å??å??"
 
-#: ../app/tools/gimpeditselectiontool.c:453
-#: ../app/tools/gimpeditselectiontool.c:728
+#: ../app/tools/gimpeditselectiontool.c:452
+#: ../app/tools/gimpeditselectiontool.c:727
 msgid "Move: "
 msgstr "ç§»å??ï¼?"
 
@@ -11924,6 +12021,7 @@ msgstr "è«?æ??é??è£?æ?¦æ??ç·?æ¢?"
 msgid "%s to pick a background color"
 msgstr "%s ä»¥æ??é?¸è??æ?¯é¡?è?²"
 
+#. the anti_erase toggle
 #: ../app/tools/gimperasertool.c:145
 #, c-format
 msgid "Anti erase  (%s)"
@@ -11933,6 +12031,7 @@ msgstr "å??æ¶?æ?¦å?»  (%s)"
 msgid "Affect:"
 msgstr "æ??æ??ï¼?"
 
+#. tool toggle
 #: ../app/tools/gimpflipoptions.c:138
 #, c-format
 msgid "Flip Type  (%s)"
@@ -11943,7 +12042,8 @@ msgid "Flip"
 msgstr "ç¿»è½?"
 
 #: ../app/tools/gimpfliptool.c:80
-msgid "Flip Tool: Reverse the layer, selection or path horizontally or vertically"
+msgid ""
+"Flip Tool: Reverse the layer, selection or path horizontally or vertically"
 msgstr "ç¿»è½?å·¥å?·ï¼?æ°´å¹³æ??å??ç?´å??è½?å??å±¤ã??é?¸å??å??å??æ??è·¯å¾?"
 
 #: ../app/tools/gimpfliptool.c:82
@@ -11964,7 +12064,9 @@ msgid "Size of the brush used for refinements"
 msgstr "ç?¨ä¾?ç²¾è£½ç??ç?å?·å¤§å°?"
 
 #: ../app/tools/gimpforegroundselectoptions.c:102
-msgid "Smaller values give a more accurate selection border but may introduce holes in the selection"
+msgid ""
+"Smaller values give a more accurate selection border but may introduce holes "
+"in the selection"
 msgstr "è¼?å°?ç??æ?¸å?¼å?¯ä»¥ç?¢ç??æ?´ç²¾ç¢ºç??é?¸å??å??å??æ¡?ç·?ï¼?ä½?ä¹?æ??é? æ??é?¸å??å??å??å?ºç?¾æ¼?æ´?"
 
 #: ../app/tools/gimpforegroundselectoptions.c:121
@@ -11979,10 +12081,12 @@ msgstr "ç´?/ç¶ å??ç´ ç??é??æ??åº¦"
 msgid "Sensitivity for yellow/blue component"
 msgstr "é»?/è??å??ç´ ç??é??æ??åº¦"
 
+#. single / multiple objects
 #: ../app/tools/gimpforegroundselectoptions.c:276
 msgid "Contiguous"
 msgstr "é?£çº?"
 
+#. foreground / background
 #: ../app/tools/gimpforegroundselectoptions.c:281
 #, c-format
 msgid "Interactive refinement  (%s)"
@@ -12012,6 +12116,7 @@ msgstr "å¹³æ»?å??:"
 msgid "Preview color:"
 msgstr "é ?è¦½é¡?è?²:"
 
+#. granularity
 #: ../app/tools/gimpforegroundselectoptions.c:343
 msgid "Color Sensitivity"
 msgstr "é¡?è?²é??æ??åº¦"
@@ -12037,40 +12142,40 @@ msgid "Mark foreground by painting on the object to extract"
 msgstr "å?¨ç?©ä»¶ä¸?ç¹ªç?«ä»¥æ¨?è¨?å?ºè¦?æ??å??ç??å??æ?¯"
 
 #: ../app/tools/gimpforegroundselecttool.c:327
-#, fuzzy
 msgid "Roughly outline the object to extract"
-msgstr "å?¨ç?©ä»¶ä¸?ç²?ç?¥ç¹ªå?ºè¦?æ??å??ç??è¼ªå»?"
+msgstr "ç²?ç?¥å?°æ??ç?«ç?©ä»¶ç??è¼ªå»?ä»¥æ??å??"
 
 #: ../app/tools/gimpforegroundselecttool.c:779
 msgctxt "command"
 msgid "Foreground Select"
 msgstr "å??æ?¯é?¸å??"
 
-#: ../app/tools/gimpfreeselecttool.c:200
-msgid "Free Select Tool: Select a hand-drawn region with free and polygonal segments"
+#: ../app/tools/gimpfreeselecttool.c:199
+msgid ""
+"Free Select Tool: Select a hand-drawn region with free and polygonal segments"
 msgstr "è?ªç?±é?¸å??å·¥å?·ï¼?ä»¥æ??ç¹ªæ?¹å¼?é?¸å??ä»»æ??å??å¤?é??å½¢ç??æ®µç??å??å??"
 
-#: ../app/tools/gimpfreeselecttool.c:201
+#: ../app/tools/gimpfreeselecttool.c:200
 msgid "_Free Select"
 msgstr "è?ªç?±é?¸å??(_F)"
 
-#: ../app/tools/gimpfreeselecttool.c:1120
+#: ../app/tools/gimpfreeselecttool.c:1119
 msgid "Click to complete selection"
 msgstr "è«?æ??é??è£?å®?æ??é?¸å??å??å??"
 
-#: ../app/tools/gimpfreeselecttool.c:1124
+#: ../app/tools/gimpfreeselecttool.c:1123
 msgid "Click-Drag to move segment vertex"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??å??æ®µç«¯é»?"
 
-#: ../app/tools/gimpfreeselecttool.c:1129
+#: ../app/tools/gimpfreeselecttool.c:1128
 msgid "Return commits, Escape cancels, Backspace removes last segment"
 msgstr "Enter ç?ºé??å?ºã??Escape ç?ºå??æ¶?ã??Backspace ç?ºç§»é?¤ä¸?ä¸?å??å??æ®µ"
 
-#: ../app/tools/gimpfreeselecttool.c:1133
+#: ../app/tools/gimpfreeselecttool.c:1132
 msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
 msgstr "æ??æ?³å?¯å? å?¥è?ªç?±å??æ®µï¼?é»?é?¸æ??å? å?¥å¤?é??å½¢å??æ®µ"
 
-#: ../app/tools/gimpfreeselecttool.c:1639
+#: ../app/tools/gimpfreeselecttool.c:1633
 msgctxt "command"
 msgid "Free Select"
 msgstr "æ?ºæ?§å??é?¸å??"
@@ -12092,8 +12197,7 @@ msgctxt "command"
 msgid "Fuzzy Select"
 msgstr "æ?ºæ?§å??é?¸å??"
 
-#: ../app/tools/gimpgegltool.c:93
-#: ../app/tools/gimpgegltool.c:112
+#: ../app/tools/gimpgegltool.c:93 ../app/tools/gimpgegltool.c:112
 msgid "GEGL Operation"
 msgstr "GEGL æ??ä½?"
 
@@ -12113,6 +12217,7 @@ msgstr "GEGL æ??ä½?ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
 msgid "_Operation:"
 msgstr "æ??ä½?(_O):"
 
+#. The options vbox
 #: ../app/tools/gimpgegltool.c:430
 msgid "Operation Settings"
 msgstr "æ??ä½?è¨å®?"
@@ -12130,13 +12235,11 @@ msgstr "ä¿®è£?å·¥å?·ï¼?ä¿®è£?å??ç??ç??ç??ç?µ"
 msgid "_Heal"
 msgstr "ä¿®è£?(_H)"
 
-#: ../app/tools/gimphealtool.c:76
-#: ../app/tools/gimphealtool.c:79
+#: ../app/tools/gimphealtool.c:76 ../app/tools/gimphealtool.c:79
 msgid "Click to heal"
 msgstr "é»?é?¸ä»¥é??å§?ä¿®è£?"
 
-#: ../app/tools/gimphealtool.c:77
-#: ../app/tools/gimphealtool.c:81
+#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:81
 #, c-format
 msgid "%s to set a new heal source"
 msgstr "%s è¨å®?æ?°ç??ä¿®è£?ä¾?æº?"
@@ -12230,45 +12333,43 @@ msgstr "é ?å??è¨å®?(_S):"
 msgid "Settings saved to '%s'"
 msgstr "è¨å®?å?¼å·²å?²å?ç?ºâ??%sâ??"
 
-#: ../app/tools/gimpimagemaptool.c:367
+#: ../app/tools/gimpimagemaptool.c:368
 msgid "_Preview"
 msgstr "é ?è¦½(_P)"
 
-#: ../app/tools/gimpinkoptions-gui.c:55
+#. adjust sliders
+#: ../app/tools/gimpinkoptions-gui.c:54
 msgid "Adjustment"
 msgstr "èª¿æ?´"
 
-#: ../app/tools/gimpinkoptions-gui.c:67
-#: ../app/tools/gimpinkoptions-gui.c:92
-#: ../app/tools/gimprectangleoptions.c:972
-#: ../app/tools/gimptextoptions.c:489
-msgid "Size:"
-msgstr "å°ºå¯¸:"
+#: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87
+#: ../app/tools/gimppaintoptions-gui.c:127
+#, fuzzy
+msgid "Size"
+msgstr "å¤§å°?"
 
-#: ../app/tools/gimpinkoptions-gui.c:75
-#: ../app/tools/gimpmeasuretool.c:1047
-#: ../app/tools/gimppaintoptions-gui.c:139
-#: ../app/widgets/gimpbrusheditor.c:207
-msgid "Angle:"
-msgstr "è§?åº¦:"
+#: ../app/tools/gimpinkoptions-gui.c:71
+#: ../app/tools/gimppaintoptions-gui.c:153
+msgid "Angle"
+msgstr "è§?åº¦"
 
-#: ../app/tools/gimpinkoptions-gui.c:80
+#. sens sliders
+#: ../app/tools/gimpinkoptions-gui.c:77
 msgid "Sensitivity"
 msgstr "é??æ??åº¦"
 
-#: ../app/tools/gimpinkoptions-gui.c:99
-msgid "Tilt:"
-msgstr "å?¾æ??ï¼?"
-
-#: ../app/tools/gimpinkoptions-gui.c:106
-msgid "Speed:"
-msgstr "é??åº¦:"
+#: ../app/tools/gimpinkoptions-gui.c:94
+#: ../app/widgets/gimpdynamicseditor.c:146
+#: ../app/widgets/gimpdynamicsoutputeditor.c:233
+msgid "Tilt"
+msgstr "å?¾æ??"
 
-#: ../app/tools/gimpinkoptions-gui.c:117
-msgid "Type"
-msgstr "é¡?å??"
+#: ../app/tools/gimpinkoptions-gui.c:101
+msgid "Speed"
+msgstr "é??åº¦"
 
-#: ../app/tools/gimpinkoptions-gui.c:148
+#. Blob shape widgets
+#: ../app/tools/gimpinkoptions-gui.c:107
 msgid "Shape"
 msgstr "å½¢ç??"
 
@@ -12284,46 +12385,44 @@ msgstr "å¢¨æ°´ç?(_K)"
 msgid "Interactive boundary"
 msgstr "äº?å??å¼?é??ç??"
 
-#: ../app/tools/gimpiscissorstool.c:279
+#: ../app/tools/gimpiscissorstool.c:277
 msgid "Scissors"
 msgstr "å?ªå??"
 
-#: ../app/tools/gimpiscissorstool.c:280
+#: ../app/tools/gimpiscissorstool.c:278
 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting"
 msgstr "å?ªå??é?¸å??å·¥å?·ï¼?ä½¿ç?¨è?°æ??å?¤æ?·é??ç·£æ?¯å?¦å??é?©ç??æ?¹æ³?ï¼?ä¾?é?¸å??å½¢ç??"
 
-#: ../app/tools/gimpiscissorstool.c:281
+#: ../app/tools/gimpiscissorstool.c:279
 msgid "Intelligent _Scissors"
 msgstr "æ?ºæ?§å??å?ªå??(_S)"
 
-#: ../app/tools/gimpiscissorstool.c:931
-#: ../app/tools/gimpmeasuretool.c:608
+#: ../app/tools/gimpiscissorstool.c:931 ../app/tools/gimpmeasuretool.c:609
 msgid "Click-Drag to move this point"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??é??å??é»?"
 
-#: ../app/tools/gimpiscissorstool.c:933
-#: ../app/tools/gimpiscissorstool.c:997
+#: ../app/tools/gimpiscissorstool.c:933 ../app/tools/gimpiscissorstool.c:998
 #, c-format
 msgid "%s: disable auto-snap"
 msgstr "%sï¼?å??ç?¨è?ªå??è²¼é½?"
 
-#: ../app/tools/gimpiscissorstool.c:949
+#: ../app/tools/gimpiscissorstool.c:950
 msgid "Click to close the curve"
 msgstr "è«?æ??é??è£?ä»¥é??é??æ?²ç·?"
 
-#: ../app/tools/gimpiscissorstool.c:955
+#: ../app/tools/gimpiscissorstool.c:956
 msgid "Click to add a point on this segment"
 msgstr "æ??ä¸?é??è£?å?¨æ¤å??æ®µä¸å? å?¥æ?§å?¶é»?"
 
-#: ../app/tools/gimpiscissorstool.c:969
+#: ../app/tools/gimpiscissorstool.c:970
 msgid "Click or press Enter to convert to a selection"
 msgstr "é»?é?¸æ??æ?? Enter ä¾?è½?æ??ç?ºæ??é?¸å??å??"
 
-#: ../app/tools/gimpiscissorstool.c:979
+#: ../app/tools/gimpiscissorstool.c:980
 msgid "Press Enter to convert to a selection"
 msgstr "æ?? Enter ä¾?è½?æ??ç?ºæ??é?¸å??å??"
 
-#: ../app/tools/gimpiscissorstool.c:994
+#: ../app/tools/gimpiscissorstool.c:995
 msgid "Click or Click-Drag to add a point"
 msgstr "æ??ä¸?é??è£?æ??æ??æ?³å?¯ä»¥å? å?¥ä¸?å??é»?"
 
@@ -12359,24 +12458,26 @@ msgstr "é?¸å??ç?°è?²ä½?ç½®"
 msgid "Pick white point"
 msgstr "é?¸å??ç?½è?²ä½?ç½®"
 
+#. Input levels frame
 #: ../app/tools/gimplevelstool.c:423
 msgid "Input Levels"
-msgstr "è¼¸å?¥ç?ç´?"
+msgstr "è¼¸å?¥è?²é??"
 
 #: ../app/tools/gimplevelstool.c:526
 msgid "Gamma"
 msgstr "Gamma"
 
+#. Output levels frame
 #: ../app/tools/gimplevelstool.c:568
 msgid "Output Levels"
-msgstr "è¼¸å?ºç?ç´?"
+msgstr "è¼¸å?ºè?²é??"
 
+#. all channels frame
 #: ../app/tools/gimplevelstool.c:645
 msgid "All Channels"
 msgstr "æ??æ??è?²ç??"
 
-#: ../app/tools/gimplevelstool.c:657
-#: ../app/tools/gimpthresholdtool.c:268
+#: ../app/tools/gimplevelstool.c:657 ../app/tools/gimpthresholdtool.c:268
 msgid "_Auto"
 msgstr "è?ªå??(_A)"
 
@@ -12396,8 +12497,8 @@ msgstr "ä½¿ç?¨è??ç??è?²é??æª?æ¡?æ ¼å¼?(_O)"
 msgid "Auto-resize window"
 msgstr "è?ªå??èª¿æ?´è¦?çª?å°ºå¯¸"
 
-#: ../app/tools/gimpmagnifyoptions.c:171
-#: ../app/tools/gimpmoveoptions.c:187
+#. tool toggle
+#: ../app/tools/gimpmagnifyoptions.c:171 ../app/tools/gimpmoveoptions.c:187
 #, c-format
 msgid "Tool Toggle  (%s)"
 msgstr "å·¥å?·å??æ??  (%s)"
@@ -12408,7 +12509,7 @@ msgstr "ç¸®æ?¾"
 
 #: ../app/tools/gimpmagnifytool.c:88
 msgid "Zoom Tool: Adjust the zoom level"
-msgstr "ç¸®æ?¾å·¥å?·ï¼?èª¿æ?´ç¸®æ?¾ç¨?åº¦"
+msgstr "ç¸®æ?¾é¡¯ç¤ºå·¥å?·ï¼?èª¿æ?´ç¸®æ?¾ç¨?åº¦"
 
 #: ../app/tools/gimpmagnifytool.c:89
 msgctxt "tool"
@@ -12419,15 +12520,15 @@ msgstr "ç¸®æ?¾(_Z)"
 msgid "Use info window"
 msgstr "ä½¿ç?¨è³?è¨?è¦?çª?"
 
-#: ../app/tools/gimpmeasuretool.c:125
+#: ../app/tools/gimpmeasuretool.c:124
 msgid "Measure"
 msgstr "æ¸¬é??"
 
-#: ../app/tools/gimpmeasuretool.c:126
+#: ../app/tools/gimpmeasuretool.c:125
 msgid "Measure Tool: Measure distances and angles"
 msgstr "æ¸¬é??å·¥å?·ï¼?æ¸¬é??è·?é?¢å??è§?åº¦"
 
-#: ../app/tools/gimpmeasuretool.c:127
+#: ../app/tools/gimpmeasuretool.c:126
 msgid "_Measure"
 msgstr "æ¸¬é??(_M)"
 
@@ -12435,42 +12536,45 @@ msgstr "æ¸¬é??(_M)"
 msgid "Add Guides"
 msgstr "æ?°å¢?å??è??ç·?"
 
-#: ../app/tools/gimpmeasuretool.c:559
+#: ../app/tools/gimpmeasuretool.c:560
 msgid "Click to place vertical and horizontal guides"
 msgstr "é»?é?¸ä»¥æ?¾ç½®æ°´å¹³å??å??ç?´å??è??ç·?"
 
-#: ../app/tools/gimpmeasuretool.c:568
+#: ../app/tools/gimpmeasuretool.c:569
 msgid "Click to place a horizontal guide"
 msgstr "è«?æ??é??è£?æ?¾ç½®æ°´å¹³å??è??ç·?"
 
-#: ../app/tools/gimpmeasuretool.c:583
+#: ../app/tools/gimpmeasuretool.c:584
 msgid "Click to place a vertical guide"
 msgstr "è«?æ??é??è£?æ?¾ç½®å??ç?´å??è??ç·?"
 
-#: ../app/tools/gimpmeasuretool.c:597
+#: ../app/tools/gimpmeasuretool.c:598
 msgid "Click-Drag to add a new point"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥å? å?¥æ?°ç??é»?"
 
-#: ../app/tools/gimpmeasuretool.c:628
+#: ../app/tools/gimpmeasuretool.c:629
 msgid "Click-Drag to move all points"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??æ??æ??ç??é»?"
 
-#: ../app/tools/gimpmeasuretool.c:885
-#: ../app/tools/gimpmeasuretool.c:1030
-#: ../app/tools/gimpmeasuretool.c:1086
-#: ../app/tools/gimpmeasuretool.c:1114
-#: ../app/tools/gimppainttool.c:643
+#: ../app/tools/gimpmeasuretool.c:886 ../app/tools/gimpmeasuretool.c:1031
+#: ../app/tools/gimpmeasuretool.c:1087 ../app/tools/gimpmeasuretool.c:1115
+#: ../app/tools/gimppainttool.c:646
 msgid "pixels"
 msgstr "å??ç´ "
 
-#: ../app/tools/gimpmeasuretool.c:998
+#. tool->display->shell
+#: ../app/tools/gimpmeasuretool.c:999
 msgid "Measure Distances and Angles"
 msgstr "æ¸¬é??è·?é?¢å??è§?åº¦"
 
-#: ../app/tools/gimpmeasuretool.c:1019
+#: ../app/tools/gimpmeasuretool.c:1020
 msgid "Distance:"
 msgstr "è·?é?¢:"
 
+#: ../app/tools/gimpmeasuretool.c:1048 ../app/widgets/gimpbrusheditor.c:207
+msgid "Angle:"
+msgstr "è§?åº¦:"
+
 #: ../app/tools/gimpmoveoptions.c:139
 msgid "Pick a layer or guide"
 msgstr "é?¸æ??å??å±¤æ??å??è??ç·?"
@@ -12495,33 +12599,32 @@ msgstr "ç§»å??ä½¿ç?¨ä¸ç??è·¯å¾?"
 msgid "Move:"
 msgstr "ç§»å??:"
 
-#: ../app/tools/gimpmovetool.c:126
+#: ../app/tools/gimpmovetool.c:128
 msgctxt "tool"
 msgid "Move"
 msgstr "ç§»å??"
 
-#: ../app/tools/gimpmovetool.c:127
+#: ../app/tools/gimpmovetool.c:129
 msgid "Move Tool: Move layers, selections, and other objects"
 msgstr "ç§»å??å·¥å?·ï¼?ç§»å??å??å±¤ã??é?¸å??å??å??å??å?¶ä»?ç?©ä»¶"
 
-#: ../app/tools/gimpmovetool.c:128
+#: ../app/tools/gimpmovetool.c:130
 msgid "_Move"
 msgstr "ç§»å??(_M)"
 
-#: ../app/tools/gimpmovetool.c:246
-#: ../app/tools/gimpmovetool.c:537
+#: ../app/tools/gimpmovetool.c:247 ../app/tools/gimpmovetool.c:538
 msgid "Move Guide: "
 msgstr "ç§»å??å??è??ç·?ï¼?"
 
-#: ../app/tools/gimpmovetool.c:531
+#: ../app/tools/gimpmovetool.c:532
 msgid "Remove Guide"
 msgstr "ç§»é?¤å??è??ç·?"
 
-#: ../app/tools/gimpmovetool.c:531
+#: ../app/tools/gimpmovetool.c:532
 msgid "Cancel Guide"
 msgstr "å??æ¶?å??è??ç·?"
 
-#: ../app/tools/gimpmovetool.c:537
+#: ../app/tools/gimpmovetool.c:538
 msgid "Add Guide: "
 msgstr "å? å?¥å??è??ç·?ï¼?"
 
@@ -12533,83 +12636,84 @@ msgstr "ç?«ç?å·¥å?·ï¼?ä½¿ç?¨ç?å?·ç¹ªè£½æ»?é ?ç??ç?å??æ??æ??"
 msgid "_Paintbrush"
 msgstr "ç?«ç?(_P)"
 
-#: ../app/tools/gimppaintoptions-gui.c:90
+#: ../app/tools/gimppaintoptions-gui.c:93
 #: ../app/tools/gimpselectionoptions.c:210
-#: ../app/widgets/gimpbrushselect.c:193
-#: ../app/widgets/gimplayertreeview.c:266
+#: ../app/widgets/gimpbrushselect.c:193 ../app/widgets/gimplayertreeview.c:266
 msgid "Mode:"
 msgstr "æ¨¡å¼?:"
 
-#: ../app/tools/gimppaintoptions-gui.c:105
-#: ../app/tools/gimptransformoptions.c:347
-#: ../app/widgets/gimpbrushselect.c:180
-#: ../app/widgets/gimplayertreeview.c:289
-msgid "Opacity:"
-msgstr "ä¸?é??æ??åº¦:"
-
-#: ../app/tools/gimppaintoptions-gui.c:118
-msgid "Brush:"
-msgstr "ç?å?·:"
+#: ../app/tools/gimppaintoptions-gui.c:117
+msgid "Brush"
+msgstr "ç?å?·"
 
-#: ../app/tools/gimppaintoptions-gui.c:123
-msgid "Scale:"
-msgstr "ç¸®æ?¾:"
+#: ../app/tools/gimppaintoptions-gui.c:144
+msgid "Reset size to brush's native size"
+msgstr ""
 
-#: ../app/tools/gimppaintoptions-gui.c:132
-msgid "Aspect:"
-msgstr "é?·å¯¬æ¯?ï¼?"
+#: ../app/tools/gimppaintoptions-gui.c:147
+msgid "Aspect Ratio"
+msgstr "é?·å¯¬æ¯?"
 
-#: ../app/tools/gimppaintoptions-gui.c:164
+#: ../app/tools/gimppaintoptions-gui.c:182
 msgid "Incremental"
 msgstr "é??å¢?æ¨¡å¼?"
 
-#: ../app/tools/gimppaintoptions-gui.c:180
+#: ../app/tools/gimppaintoptions-gui.c:198
 msgid "Hard edge"
 msgstr "é??ç??è¼?å??æ??"
 
-#: ../app/tools/gimppaintoptions-gui.c:214
-msgid "Fade out"
-msgstr "æ·¡å?º"
+#: ../app/tools/gimppaintoptions-gui.c:227
+#, fuzzy
+msgid "Dynamics Options"
+msgstr "ç?å?·å??æ??è³?æ??å¤¾"
+
+#: ../app/tools/gimppaintoptions-gui.c:233
+#, fuzzy
+msgid "Fade Options"
+msgstr "å·²å?²å?é?¸é ?"
 
-#: ../app/tools/gimppaintoptions-gui.c:223
-msgid "Length:"
-msgstr "é?·åº¦:"
+#: ../app/tools/gimppaintoptions-gui.c:247
+#, fuzzy
+msgid "Fade length"
+msgstr "æ·¡å?º"
 
-#: ../app/tools/gimppaintoptions-gui.c:243
-#: ../app/widgets/gimpviewablebox.c:223
+#: ../app/tools/gimppaintoptions-gui.c:273
+#: ../app/widgets/gimpviewablebox.c:288
 msgid "Reverse"
 msgstr "ç?¸å??æ?¹å??"
 
-#: ../app/tools/gimppaintoptions-gui.c:263
-msgid "Apply Jitter"
-msgstr "å¥?ç?¨æ??å??"
+#: ../app/tools/gimppaintoptions-gui.c:280
+#, fuzzy
+msgid "Color Options"
+msgstr "å·¥å?·é?¸é ?"
 
-#: ../app/tools/gimppaintoptions-gui.c:268
-msgid "Amount:"
+#: ../app/tools/gimppaintoptions-gui.c:305
+#, fuzzy
+msgid "Amount"
 msgstr "ç¸½é¡?:"
 
-#: ../app/tools/gimppaintoptions-gui.c:290
-msgid "Use color from gradient"
-msgstr "ä½¿ç?¨æ¼¸è®?è?²ä¸ç??é¡?è?²"
+#: ../app/tools/gimppaintoptions-gui.c:309
+msgid "Apply Jitter"
+msgstr "å¥?ç?¨æ??å??"
 
-#: ../app/tools/gimppainttool.c:142
+#: ../app/tools/gimppainttool.c:140
 msgid "Click to paint"
 msgstr "è«?æ??é??è£?ç¹ªè£½"
 
-#: ../app/tools/gimppainttool.c:143
+#: ../app/tools/gimppainttool.c:141
 msgid "Click to draw the line"
 msgstr "è«?æ??é??è£?ç¹ªè£½ç·?æ¢?"
 
-#: ../app/tools/gimppainttool.c:144
+#: ../app/tools/gimppainttool.c:142
 #, c-format
 msgid "%s to pick a color"
 msgstr "%s ä»¥æ??é?¸é¡?è?²"
 
-#: ../app/tools/gimppainttool.c:279
+#: ../app/tools/gimppainttool.c:278
 msgid "Cannot paint on layer groups."
 msgstr "ç?¡æ³?å?¨å??å±¤é?®ç½©ä¸?ç¹ªç?«"
 
-#: ../app/tools/gimppainttool.c:689
+#: ../app/tools/gimppainttool.c:692
 #, c-format
 msgid "%s for a straight line"
 msgstr "%s å?¯ç¹ªå?ºç?´ç·?"
@@ -12622,15 +12726,17 @@ msgstr "é??ç?å·¥å?·ï¼?ä½¿ç?¨ç?å?·ç¹ªå?ºå ?ç¡¬é??ç·£ç??ç?è§¸"
 msgid "Pe_ncil"
 msgstr "é??ç?(_N)"
 
-#: ../app/tools/gimpperspectiveclonetool.c:129
-msgid "Perspective Clone Tool: Clone from an image source after applying a perspective transformation"
+#: ../app/tools/gimpperspectiveclonetool.c:125
+msgid ""
+"Perspective Clone Tool: Clone from an image source after applying a "
+"perspective transformation"
 msgstr "é??è¦?æ³?ä»¿è£½å·¥å?·ï¼?å?¨å¥?ç?¨é??è¦?æ³?è®?æ??å¾?å¾?å??ç??ä¾?æº?ä»¿è£½"
 
-#: ../app/tools/gimpperspectiveclonetool.c:131
+#: ../app/tools/gimpperspectiveclonetool.c:127
 msgid "_Perspective Clone"
 msgstr "é??è¦?æ³?ä»¿è£½(_P)"
 
-#: ../app/tools/gimpperspectiveclonetool.c:704
+#: ../app/tools/gimpperspectiveclonetool.c:700
 msgid "Ctrl-Click to set a clone source"
 msgstr "è«?æ?? Ctrl ä¸¦é»?é?¸ä»¥è¨å®?è¤?è£½ä¾?æº?"
 
@@ -12679,52 +12785,57 @@ msgstr "è?²èª¿å??é?¢ç¨?åº¦(_L):"
 msgid "Use all visible layers when shrinking the selection"
 msgstr "å?¨æ?¶ç¸®é?¸å??å??å??æ??ä½¿ç?¨æ??æ??ç??å¾?è¦?ç??å??å±¤"
 
-#: ../app/tools/gimprectangleoptions.c:728
+#. Current, as in what is currently in use.
+#: ../app/tools/gimprectangleoptions.c:745
 msgid "Current"
 msgstr "ç?®å??ç??"
 
-#: ../app/tools/gimprectangleoptions.c:806
+#: ../app/tools/gimprectangleoptions.c:823
 msgid "Expand from center"
 msgstr "å¾?ä¸å¤®æ?´å±?"
 
-#: ../app/tools/gimprectangleoptions.c:829
+#: ../app/tools/gimprectangleoptions.c:846
 msgid "Fixed:"
 msgstr "å?ºå®?:"
 
-#: ../app/tools/gimprectangleoptions.c:962
+#: ../app/tools/gimprectangleoptions.c:979
 msgid "Position:"
 msgstr "ä½?ç½®:"
 
-#: ../app/tools/gimprectangleoptions.c:980
+#: ../app/tools/gimprectangleoptions.c:989 ../app/tools/gimptextoptions.c:489
+msgid "Size:"
+msgstr "å°ºå¯¸:"
+
+#: ../app/tools/gimprectangleoptions.c:997
 msgid "Highlight"
 msgstr "çª?é¡¯"
 
-#: ../app/tools/gimprectangleoptions.c:990
+#. Auto Shrink
+#: ../app/tools/gimprectangleoptions.c:1007
 msgid "Auto Shrink"
 msgstr "è?ªå??æ?¶ç¸®"
 
-#: ../app/tools/gimprectangleoptions.c:997
+#: ../app/tools/gimprectangleoptions.c:1014
 msgid "Shrink merged"
 msgstr "æ?¶ç¸®å??ä½µ"
 
-#: ../app/tools/gimprectangleselectoptions.c:163
+#: ../app/tools/gimprectangleselectoptions.c:164
 msgid "Rounded corners"
 msgstr "å??è§?"
 
-#: ../app/tools/gimprectangleselecttool.c:168
+#: ../app/tools/gimprectangleselecttool.c:169
 msgid "Rectangle Select"
 msgstr "ç?©å½¢é?¸å??"
 
-#: ../app/tools/gimprectangleselecttool.c:169
+#: ../app/tools/gimprectangleselecttool.c:170
 msgid "Rectangle Select Tool: Select a rectangular region"
 msgstr "ç?©å½¢é?¸å??å·¥å?·ï¼?é?¸å??ç?©å½¢å??å??"
 
-#: ../app/tools/gimprectangleselecttool.c:170
+#: ../app/tools/gimprectangleselecttool.c:171
 msgid "_Rectangle Select"
 msgstr "ç?©å½¢é?¸å??(_R)"
 
-#: ../app/tools/gimprectangletool.c:1158
-#: ../app/tools/gimprectangletool.c:2216
+#: ../app/tools/gimprectangletool.c:1169 ../app/tools/gimprectangletool.c:2165
 msgid "Rectangle: "
 msgstr "ç?©å½¢: "
 
@@ -12737,11 +12848,11 @@ msgstr "å?¯é?¸å??å®?å?¨é??æ??ç??å??å??"
 msgid "Base selection on all visible layers"
 msgstr "å??å??é?¸æ??ä»¥æ??æ??å?¯è¦?ç??å??å±¤ç?ºå?ºç¤?"
 
-#: ../app/tools/gimpregionselectoptions.c:201
+#: ../app/tools/gimpregionselectoptions.c:202
 msgid "Select transparent areas"
 msgstr "é?¸å??é??æ??å??å??"
 
-#: ../app/tools/gimpregionselectoptions.c:226
+#: ../app/tools/gimpregionselectoptions.c:228
 msgid "Select by:"
 msgstr "é?¸æ??æ ¹æ??:"
 
@@ -12784,7 +12895,7 @@ msgstr "ç¸®æ?¾"
 
 #: ../app/tools/gimpscaletool.c:78
 msgid "Scale Tool: Scale the layer, selection or path"
-msgstr "ç¸®æ?¾å·¥å?·ï¼?ç¸®æ?¾å??å±¤ã??é?¸å??å??å??æ??è·¯å¾?"
+msgstr "ç¸®æ?¾æ¯?ä¾?å·¥å?·ï¼?ç¸®æ?¾å??å±¤ã??é?¸å??å??å??æ??è·¯å¾?"
 
 #: ../app/tools/gimpscaletool.c:79
 msgid "_Scale"
@@ -12795,12 +12906,11 @@ msgctxt "command"
 msgid "Scale"
 msgstr "ç¸®æ?¾"
 
-#: ../app/tools/gimpselectionoptions.c:257
-#: ../app/tools/gimptextoptions.c:502
+#: ../app/tools/gimpselectionoptions.c:257 ../app/tools/gimptextoptions.c:502
 msgid "Antialiasing"
 msgstr "å??é?¸é½?"
 
-#: ../app/tools/gimpselectionoptions.c:272
+#: ../app/tools/gimpselectionoptions.c:274
 msgid "Feather edges"
 msgstr "ç¾½å??é??ç·£"
 
@@ -12865,24 +12975,25 @@ msgstr "æ?¨ç§»é?? _X:"
 msgid "Shear magnitude _Y:"
 msgstr "æ?¨ç§»é?? _Y:"
 
-#: ../app/tools/gimpsmudgetool.c:53
+#: ../app/tools/gimpsmudgetool.c:54
 msgid "Smudge Tool: Smudge selectively using a brush"
 msgstr "å¡?æ?¹å·¥å?·ï¼?ä½¿ç?¨ç?å?·é?²è¡?é?¸æ??æ?§ç??å¡?æ?¹"
 
-#: ../app/tools/gimpsmudgetool.c:54
+#: ../app/tools/gimpsmudgetool.c:55
 msgid "_Smudge"
 msgstr "å¡?æ?¹(_S)"
 
-#: ../app/tools/gimpsmudgetool.c:73
+#: ../app/tools/gimpsmudgetool.c:74
 msgid "Click to smudge"
 msgstr "è«?æ??é??è£?å¡?æ?¹"
 
-#: ../app/tools/gimpsmudgetool.c:74
+#: ../app/tools/gimpsmudgetool.c:75
 msgid "Click to smudge the line"
 msgstr "è«?æ??é??è£?å¡?æ?¹ç·?æ¢?"
 
 #: ../app/tools/gimptextoptions.c:137
-msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes"
+msgid ""
+"Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr "å¾®èª¿ä¿®æ£å?å??ç??è¼ªå»?ä»¥ä¾¿å?¨å°?å?å??æ??è?½ç?¢ç??æ¸?æ?°ç??é»?é?£å??"
 
 #: ../app/tools/gimptextoptions.c:145
@@ -12907,12 +13018,14 @@ msgid "Text box resize mode"
 msgstr "ç´?æ??å?ç·¨è¼¯æ¨¡å¼?"
 
 #: ../app/tools/gimptextoptions.c:186
-msgid "Use an external editor window for text entry, instead of direct-on-canvas editing"
+msgid ""
+"Use an external editor window for text entry, instead of direct-on-canvas "
+"editing"
 msgstr "ç?ºæ??å?è¼¸å?¥ä½¿ç?¨å¤?é?¨ç·¨è¼¯å?¨è¦?çª?ï¼?å??ä»£ç?´æ?¥å?¨ç?«å¸?ä¸?ç·¨è¼¯"
 
-#: ../app/tools/gimptextoptions.c:482
-msgid "Font:"
-msgstr "å?å??:"
+#: ../app/tools/gimptextoptions.c:474
+msgid "Font"
+msgstr "å?å??"
 
 #: ../app/tools/gimptextoptions.c:498
 msgid "Use editor"
@@ -12955,22 +13068,23 @@ msgstr "æ??å?å·¥å?·ï¼?å»ºç«?æ??ç·¨è¼¯æ??å?å??å±¤"
 msgid "Te_xt"
 msgstr "æ??å?(_X)"
 
-#: ../app/tools/gimptexttool.c:956
+#: ../app/tools/gimptexttool.c:958
 msgid "Reshape Text Layer"
 msgstr "ä¿®æ?´æ??å?å??å±¤"
 
-#: ../app/tools/gimptexttool.c:1494
-#: ../app/tools/gimptexttool.c:1497
+#: ../app/tools/gimptexttool.c:1505 ../app/tools/gimptexttool.c:1508
 msgid "Confirm Text Editing"
 msgstr "ç¢ºèª?æ??å?ç·¨è¼¯"
 
-#: ../app/tools/gimptexttool.c:1501
+#: ../app/tools/gimptexttool.c:1512
 msgid "Create _New Layer"
 msgstr "å»ºç«?ä¸?å??æ?°ç??å??å±¤(_N)"
 
-#: ../app/tools/gimptexttool.c:1525
+#: ../app/tools/gimptexttool.c:1536
 msgid ""
-"The layer you selected is a text layer but it has been modified using other tools. Editing the layer with the text tool will discard these modifications.\n"
+"The layer you selected is a text layer but it has been modified using other "
+"tools. Editing the layer with the text tool will discard these "
+"modifications.\n"
 "\n"
 "You can edit the layer or create a new text layer from its text attributes."
 msgstr ""
@@ -12978,7 +13092,7 @@ msgstr ""
 "\n"
 "ä½ å?¯ä»¥ç·¨è¼¯æ¤å??å±¤æ??ä»¥å®?ç??æ??å?å±¬æ?§å»ºç«?ä¸?å??æ?°ç??æ??å?å??å±¤ã??"
 
-#: ../app/tools/gimptexttool-editor.c:1118
+#: ../app/tools/gimptexttool-editor.c:1158
 msgid "GIMP Text Editor"
 msgstr "GIMP æ??å?ç·¨è¼¯å?¨"
 
@@ -13004,61 +13118,62 @@ msgstr "å?¯å?ºè?¨ç??å?¼è¨å®?"
 
 #: ../app/tools/gimpthresholdtool.c:162
 msgid "Threshold does not operate on indexed layers."
-msgstr "è?¨ç??å?¼ä¸?é?©ç?¨æ?¼ç´¢å¼?å??å±¤ã??"
+msgstr "è?¨ç??å?¼ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²å??å±¤ã??"
 
 #: ../app/tools/gimpthresholdtool.c:270
 msgid "Automatically adjust to optimal binarization threshold"
 msgstr "è?ªå??èª¿æ?´å?°æ??ä½³ç??äº?å??å??è?¨ç??å?¼"
 
-#: ../app/tools/gimptool.c:886
+#: ../app/tools/gimptool.c:917
 msgid "Can't work on an empty image, add a layer first"
-msgstr ""
+msgstr "ç?¡æ³?æ??ä½?å?¨ä¸?ç©ºç??å??ç??ä¸?ï¼?æ??ä»¥ä½ é¦?å??è¦?å? å?¥ä¸?å??å??å±¤"
 
-#: ../app/tools/gimptransformoptions.c:272
+#: ../app/tools/gimptransformoptions.c:273
 msgid "Transform:"
 msgstr "è®?æ??:"
 
-#: ../app/tools/gimptransformoptions.c:281
-#: ../app/widgets/gimpdynamicseditor.c:150
-#: ../app/widgets/gimpdynamicsoutputeditor.c:227
+#: ../app/tools/gimptransformoptions.c:282
+#: ../app/widgets/gimpdynamicseditor.c:145
+#: ../app/widgets/gimpdynamicsoutputeditor.c:226
 msgid "Direction"
 msgstr "æ?¹å??"
 
-#: ../app/tools/gimptransformoptions.c:286
+#. the interpolation menu
+#: ../app/tools/gimptransformoptions.c:287
 msgid "Interpolation:"
 msgstr "æ??å?¼æ³?:"
 
-#: ../app/tools/gimptransformoptions.c:299
+#: ../app/tools/gimptransformoptions.c:300
 msgid "Clipping:"
 msgstr "å?ªè¼¯ï¼?"
 
-#: ../app/tools/gimptransformoptions.c:317
+#: ../app/tools/gimptransformoptions.c:318
 msgid "Preview:"
 msgstr "é ?è¦½:"
 
-#: ../app/tools/gimptransformoptions.c:388
+#: ../app/tools/gimptransformoptions.c:364
 #, c-format
 msgid "15 degrees  (%s)"
 msgstr "15 åº¦  (%s)"
 
-#: ../app/tools/gimptransformoptions.c:392
+#: ../app/tools/gimptransformoptions.c:368
 #, c-format
 msgid "Keep aspect  (%s)"
 msgstr "ä¿?æ??é?·å¯¬æ¯?  (%s)"
 
-#: ../app/tools/gimptransformtool.c:240
+#: ../app/tools/gimptransformtool.c:237
 msgid "Transforming"
 msgstr "æ£å?¨é?²è¡?è®?æ??"
 
-#: ../app/tools/gimptransformtool.c:1173
+#: ../app/tools/gimptransformtool.c:1260
 msgid "There is no layer to transform."
 msgstr "ç?®å??æ²?æ??è¦?è®?æ??ç??å??å±¤ã??"
 
-#: ../app/tools/gimptransformtool.c:1186
+#: ../app/tools/gimptransformtool.c:1273
 msgid "There is no path to transform."
 msgstr "ç?®å??æ²?æ??è¦?è®?æ??ç??è·¯å¾?ã??"
 
-#: ../app/tools/gimptransformtool.c:1187
+#: ../app/tools/gimptransformtool.c:1274
 msgid "The active path's strokes are locked."
 msgstr "ä½¿ç?¨ä¸è·¯å¾?ç??æ??é??æ?¯é??ä½?ç??ã??"
 
@@ -13087,19 +13202,20 @@ msgstr ""
 " %s å?ªæ¸?\n"
 " %s äº¤é??"
 
+#. Create a selection from the current path
 #: ../app/tools/gimpvectoroptions.c:188
 msgid "Selection from Path"
 msgstr "è·¯å¾?è½?ç?ºé?¸å??å??å??"
 
-#: ../app/tools/gimpvectortool.c:163
+#: ../app/tools/gimpvectortool.c:161
 msgid "Paths Tool: Create and edit paths"
 msgstr "è·¯å¾?å·¥å?·ï¼?å»ºç«?å??ç·¨è¼¯è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:164
+#: ../app/tools/gimpvectortool.c:162
 msgid "Pat_hs"
 msgstr "è·¯å¾?(_H)"
 
-#: ../app/tools/gimpvectortool.c:254
+#: ../app/tools/gimpvectortool.c:252
 msgid "The active path is locked."
 msgstr "ä½¿ç?¨ä¸è·¯å¾?æ?¯é??ä½?ç??ã??"
 
@@ -13119,119 +13235,117 @@ msgstr "æ??å?¥é?¨é»?"
 msgid "Drag Handle"
 msgstr "æ??æ?³æ?§å?¶æ??"
 
-#: ../app/tools/gimpvectortool.c:453
+#: ../app/tools/gimpvectortool.c:454
 msgid "Drag Anchor"
 msgstr "æ??æ?³é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:471
+#: ../app/tools/gimpvectortool.c:472
 msgid "Drag Anchors"
 msgstr "æ??æ?³é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:494
+#: ../app/tools/gimpvectortool.c:495
 msgid "Drag Curve"
 msgstr "æ??æ?³æ?²ç·?"
 
-#: ../app/tools/gimpvectortool.c:523
+#: ../app/tools/gimpvectortool.c:524
 msgid "Connect Strokes"
 msgstr "é?£æ?¥ç?å??"
 
-#: ../app/tools/gimpvectortool.c:555
+#: ../app/tools/gimpvectortool.c:556
 msgid "Drag Path"
 msgstr "æ??æ?³è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:566
+#: ../app/tools/gimpvectortool.c:567
 msgid "Convert Edge"
 msgstr "è½?æ??é??ç·£"
 
-#: ../app/tools/gimpvectortool.c:597
+#: ../app/tools/gimpvectortool.c:598
 msgid "Delete Anchor"
 msgstr "å?ªé?¤å??é??"
 
-#: ../app/tools/gimpvectortool.c:620
+#: ../app/tools/gimpvectortool.c:621
 msgid "Delete Segment"
 msgstr "å?ªé?¤å??æ®µ"
 
-#: ../app/tools/gimpvectortool.c:839
+#: ../app/tools/gimpvectortool.c:840
 msgid "Move Anchors"
 msgstr "ç§»å??é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1199
+#: ../app/tools/gimpvectortool.c:1203
 msgid "Click to pick path to edit"
 msgstr "æ??ä¸?é??è£?å?¯ä»¥é?¸æ??ä½ æº?å??ç·¨è¼¯ç??è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:1203
+#: ../app/tools/gimpvectortool.c:1207
 msgid "Click to create a new path"
 msgstr "æ??ä¸?é??è£?å?¯ä»¥è£½ä½?æ?°ç??è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:1207
+#: ../app/tools/gimpvectortool.c:1211
 msgid "Click to create a new component of the path"
 msgstr "æ??ä¸?é??è£?å?¯ä»¥è£½ä½?è·¯å¾?ç??æ?°å??ä»¶"
 
-#: ../app/tools/gimpvectortool.c:1211
+#: ../app/tools/gimpvectortool.c:1215
 msgid "Click or Click-Drag to create a new anchor"
 msgstr "æ??ä¸?å¾?æ??æ?³ä»¥å»ºç«?æ?°ç??é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1221
-#: ../app/tools/gimpvectortool.c:1228
+#: ../app/tools/gimpvectortool.c:1225 ../app/tools/gimpvectortool.c:1232
 msgid "Click-Drag to move the anchor around"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1232
-#: ../app/tools/gimpvectortool.c:1255
+#: ../app/tools/gimpvectortool.c:1236 ../app/tools/gimpvectortool.c:1259
 msgid "Click-Drag to move the anchors around"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1238
+#: ../app/tools/gimpvectortool.c:1242
 msgid "Click-Drag to move the handle around"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??æ?§å?¶æ??"
 
-#: ../app/tools/gimpvectortool.c:1245
+#: ../app/tools/gimpvectortool.c:1249
 #, fuzzy
 msgid "Click-Drag to move the handles around symmetrically"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??æ?§å?¶æ??"
 
-#: ../app/tools/gimpvectortool.c:1260
+#: ../app/tools/gimpvectortool.c:1264
 msgid "Click-Drag to change the shape of the curve"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥æ?¹è®?æ?²ç·?ç??å½¢ç??"
 
-#: ../app/tools/gimpvectortool.c:1263
+#: ../app/tools/gimpvectortool.c:1267
 #, c-format
 msgid "%s: symmetrical"
 msgstr "%sï¼?å°?ç¨±å¼?"
 
-#: ../app/tools/gimpvectortool.c:1268
+#: ../app/tools/gimpvectortool.c:1272
 msgid "Click-Drag to move the component around"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??å??ä»¶"
 
-#: ../app/tools/gimpvectortool.c:1276
+#: ../app/tools/gimpvectortool.c:1280
 msgid "Click-Drag to move the path around"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:1280
+#: ../app/tools/gimpvectortool.c:1284
 msgid "Click-Drag to insert an anchor on the path"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥å?¨è·¯å¾?ä¸æ??å?¥é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1288
+#: ../app/tools/gimpvectortool.c:1292
 msgid "Click to delete this anchor"
 msgstr "é»?é?¸ä»¥å?ªé?¤é??å??é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1292
+#: ../app/tools/gimpvectortool.c:1296
 msgid "Click to connect this anchor with the selected endpoint"
 msgstr "é»?é?¸ä»¥å°?é??å??é?¨é»?è??é?¸å??ç??çµ?æ??é»?é?£æ?¥"
 
-#: ../app/tools/gimpvectortool.c:1297
+#: ../app/tools/gimpvectortool.c:1301
 msgid "Click to open up the path"
 msgstr "æ??ä¸?é??è£?å?¯ä»¥é??å??è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:1301
+#: ../app/tools/gimpvectortool.c:1305
 msgid "Click to make this node angular"
 msgstr "é»?é?¸è®?é??å??ç¯?é»?æ??ç?ºç¨?è§?"
 
-#: ../app/tools/gimpvectortool.c:1813
+#: ../app/tools/gimpvectortool.c:1805
 msgid "Delete Anchors"
 msgstr "å?ªé?¤é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1984
+#: ../app/tools/gimpvectortool.c:1976
 msgid "There is no active layer or channel to stroke to"
 msgstr "ç?®å??æ²?æ??ä»»ä½?ä½¿ç?¨ä¸ç??å??å±¤æ??è??è?²ç??å?¯ä»¥ç?¨ä¾?æ??é??"
 
@@ -13286,10 +13400,9 @@ msgid "Size"
 msgstr "å¤§å°?"
 
 #: ../app/tools/tools-enums.c:219
-#, fuzzy
 msgctxt "rect-select-mode"
 msgid "Free select"
-msgstr "é?¸æ??é??æ?²"
+msgstr "è?ªç?±é?¸å??"
 
 #: ../app/tools/tools-enums.c:220
 msgctxt "rect-select-mode"
@@ -13361,97 +13474,97 @@ msgctxt "vector-mode"
 msgid "Move"
 msgstr "ç§»å??"
 
-#: ../app/vectors/gimpvectors.c:206
+#: ../app/vectors/gimpvectors.c:208
 msgctxt "undo-type"
 msgid "Rename Path"
 msgstr "æ?´æ?¹è·¯å¾?å??ç¨±"
 
-#: ../app/vectors/gimpvectors.c:207
+#: ../app/vectors/gimpvectors.c:209
 msgctxt "undo-type"
 msgid "Move Path"
 msgstr "ç§»å??è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:208
+#: ../app/vectors/gimpvectors.c:210
 msgctxt "undo-type"
 msgid "Scale Path"
 msgstr "ç¸®æ?¾è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:209
+#: ../app/vectors/gimpvectors.c:211
 msgctxt "undo-type"
 msgid "Resize Path"
 msgstr "èª¿æ?´è·¯å¾?å¤§å°?"
 
-#: ../app/vectors/gimpvectors.c:210
+#: ../app/vectors/gimpvectors.c:212
 msgctxt "undo-type"
 msgid "Flip Path"
 msgstr "ç¿»è½?è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:211
+#: ../app/vectors/gimpvectors.c:213
 msgctxt "undo-type"
 msgid "Rotate Path"
 msgstr "æ??è½?è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:212
+#: ../app/vectors/gimpvectors.c:214
 msgctxt "undo-type"
 msgid "Transform Path"
 msgstr "è®?æ??è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:213
+#: ../app/vectors/gimpvectors.c:215
 msgctxt "undo-type"
 msgid "Stroke Path"
 msgstr "æ²¿ç??è·¯å¾?æ??é??"
 
-#: ../app/vectors/gimpvectors.c:214
+#: ../app/vectors/gimpvectors.c:216
 msgctxt "undo-type"
 msgid "Path to Selection"
 msgstr "è·¯å¾?è½?ç?ºé?¸å??å??å??"
 
-#: ../app/vectors/gimpvectors.c:215
+#: ../app/vectors/gimpvectors.c:217
 msgctxt "undo-type"
 msgid "Reorder Path"
 msgstr "é??æ?°ç·¨æ??è·¯å¾?æ¬¡åº?"
 
-#: ../app/vectors/gimpvectors.c:216
+#: ../app/vectors/gimpvectors.c:218
 msgctxt "undo-type"
 msgid "Raise Path"
 msgstr "æ??å??è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:217
+#: ../app/vectors/gimpvectors.c:219
 msgctxt "undo-type"
 msgid "Raise Path to Top"
 msgstr "æ??å??è·¯å¾?å?°æ??ä¸?å±¤"
 
-#: ../app/vectors/gimpvectors.c:218
+#: ../app/vectors/gimpvectors.c:220
 msgctxt "undo-type"
 msgid "Lower Path"
 msgstr "é??ä½?è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:219
+#: ../app/vectors/gimpvectors.c:221
 msgctxt "undo-type"
 msgid "Lower Path to Bottom"
 msgstr "é??ä½?è·¯å¾?å?°æ??ä¸?å±¤"
 
-#: ../app/vectors/gimpvectors.c:220
+#: ../app/vectors/gimpvectors.c:222
 msgid "Path cannot be raised higher."
 msgstr "è·¯å¾?ç?¡æ³?å??å??ä¸?ç§»ã??"
 
-#: ../app/vectors/gimpvectors.c:221
+#: ../app/vectors/gimpvectors.c:223
 msgid "Path cannot be lowered more."
 msgstr "è·¯å¾?ç?¡æ³?å??å??ä¸?ç§»ã??"
 
-#: ../app/vectors/gimpvectors.c:364
+#: ../app/vectors/gimpvectors.c:365
 msgid "Move Path"
 msgstr "ç§»å??è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:463
+#: ../app/vectors/gimpvectors.c:464
 msgid "Flip Path"
 msgstr "ç¿»è½?è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:494
+#: ../app/vectors/gimpvectors.c:495
 msgid "Rotate Path"
 msgstr "æ??è½?è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:524
+#: ../app/vectors/gimpvectors.c:525
 msgid "Transform Path"
 msgstr "è®?æ??è·¯å¾?"
 
@@ -13482,7 +13595,7 @@ msgstr "ç·©è¡?å??ä¸æ²?æ??ä»»ä½?è·¯å¾?"
 msgid "Failed to import paths from '%s': %s"
 msgstr "ç?¡æ³?å¾?â??%sâ??å?¯å?¥è·¯å¾?ï¼?%s"
 
-#: ../app/widgets/gimpactioneditor.c:66
+#: ../app/widgets/gimpactioneditor.c:69
 msgid "_Search:"
 msgstr "æ??å°?(_S):"
 
@@ -13492,7 +13605,7 @@ msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 msgstr "RGBA (%0.3fï¼?%0.3fï¼?%0.3fï¼?%0.3f)"
 
 #: ../app/widgets/gimpactionview.c:337
-#: ../app/widgets/gimpcontrollereditor.c:344
+#: ../app/widgets/gimpcontrollereditor.c:347
 msgid "Action"
 msgstr "å??ä½?"
 
@@ -13504,8 +13617,7 @@ msgstr "æ?·å¾?é?µ"
 msgid "Name"
 msgstr "å??ç¨±"
 
-#: ../app/widgets/gimpactionview.c:632
-#: ../app/widgets/gimpactionview.c:832
+#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832
 msgid "Changing shortcut failed."
 msgstr "ç?¡æ³?æ?´æ?¹æ?·å¾?é?µã??"
 
@@ -13535,6 +13647,10 @@ msgstr "æ?·å¾?é?µä¸?å??æ³?ã??"
 msgid "Removing shortcut failed."
 msgstr "ç?¡æ³?ç§»é?¤æ?·å¾?é?µã??"
 
+#: ../app/widgets/gimpbrusheditor.c:153
+msgid "Radius:"
+msgstr "å??å¾?:"
+
 #: ../app/widgets/gimpbrusheditor.c:168
 msgid "Spikes:"
 msgstr "å°?ç«¯æ?¸ï¼?"
@@ -13557,9 +13673,12 @@ msgstr "é??é??ï¼?"
 msgid "Percentage of width of brush"
 msgstr "ç?å?·é??åº¦ç?¾å??æ¯?"
 
-#: ../app/widgets/gimpbufferview.c:173
-#: ../app/widgets/gimpbufferview.c:257
-#: ../app/widgets/gimpeditor.c:735
+#: ../app/widgets/gimpbrushselect.c:180 ../app/widgets/gimplayertreeview.c:289
+msgid "Opacity:"
+msgstr "ä¸?é??æ??åº¦:"
+
+#: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257
+#: ../app/widgets/gimpeditor.c:737
 msgid "(None)"
 msgstr "(ç?¡)"
 
@@ -13567,109 +13686,107 @@ msgstr "(ç?¡)"
 msgid "Add the current color to the color history"
 msgstr "å°?ç?®å??ç??é¡?è?²å? å?¥è?²å½©ä½¿ç?¨ç´?é??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:151
+#: ../app/widgets/gimpcolordisplayeditor.c:154
 msgid "Available Filters"
 msgstr "å?¯ä½¿ç?¨ç??æ¿¾è?²ç??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:212
+#: ../app/widgets/gimpcolordisplayeditor.c:215
 msgid "Move the selected filter up"
 msgstr "å°?é?¸å??ç??æ¿¾è?²ç??ä¸?ç§»"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:221
+#: ../app/widgets/gimpcolordisplayeditor.c:224
 msgid "Move the selected filter down"
 msgstr "å°?é?¸å??ç??æ¿¾è?²ç??ä¸?ç§»"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:267
+#: ../app/widgets/gimpcolordisplayeditor.c:270
 msgid "Active Filters"
 msgstr "ä½¿ç?¨ä¸ç??æ¿¾è?²ç??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:318
+#: ../app/widgets/gimpcolordisplayeditor.c:321
 msgid "Reset the selected filter to default values"
 msgstr "é??å??é?¸å??ç??æ¿¾é?¡ç?ºé ?è¨æ?¸å?¼"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:492
+#: ../app/widgets/gimpcolordisplayeditor.c:495
 #, c-format
 msgid "Add '%s' to the list of active filters"
 msgstr "å°?ã??%sã??å? å?¥ä½¿ç?¨ä¸æ¿¾é?¡æ¸?å?®"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:529
+#: ../app/widgets/gimpcolordisplayeditor.c:532
 #, c-format
 msgid "Remove '%s' from the list of active filters"
 msgstr "å¾?ä½¿ç?¨ä¸æ¿¾é?¡æ¸?å?®ä¸ç§»é?¤ã??%sã??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:560
+#: ../app/widgets/gimpcolordisplayeditor.c:563
 msgid "No filter selected"
 msgstr "æ?ªé?¸å??æ¿¾é?¡"
 
 #: ../app/widgets/gimpcoloreditor.c:259
-msgid "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts CSS color names."
+msgid ""
+"Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
+"CSS color names."
 msgstr "å¸¸ç?¨æ?¼ HTML å?? CSS ç??å??å?é?²ä½?é¡?è?²ç¢¼ã??é??å??é ?ç?®ä¹?å?¯ä»¥ä½¿ç?¨ CSS è?²å½©å??ç¨±ã??"
 
-#: ../app/widgets/gimpcolorframe.c:508
+#: ../app/widgets/gimpcolorframe.c:511
 msgid "Index:"
 msgstr "ç´¢å¼?:"
 
-#: ../app/widgets/gimpcolorframe.c:521
-#: ../app/widgets/gimpcolorframe.c:547
+#: ../app/widgets/gimpcolorframe.c:524 ../app/widgets/gimpcolorframe.c:550
 msgid "Red:"
 msgstr "ç´?:"
 
-#: ../app/widgets/gimpcolorframe.c:522
-#: ../app/widgets/gimpcolorframe.c:548
+#: ../app/widgets/gimpcolorframe.c:525 ../app/widgets/gimpcolorframe.c:551
 msgid "Green:"
 msgstr "ç¶ :"
 
-#: ../app/widgets/gimpcolorframe.c:523
-#: ../app/widgets/gimpcolorframe.c:549
+#: ../app/widgets/gimpcolorframe.c:526 ../app/widgets/gimpcolorframe.c:552
 msgid "Blue:"
 msgstr "è??:"
 
-#: ../app/widgets/gimpcolorframe.c:536
-#: ../app/widgets/gimpcolorframe.c:569
+#: ../app/widgets/gimpcolorframe.c:539 ../app/widgets/gimpcolorframe.c:572
 msgid "Value:"
 msgstr "äº®åº¦:"
 
-#: ../app/widgets/gimpcolorframe.c:560
+#: ../app/widgets/gimpcolorframe.c:563
 msgid "Hex:"
 msgstr "16 é?²å?¶:"
 
-#: ../app/widgets/gimpcolorframe.c:567
+#: ../app/widgets/gimpcolorframe.c:570
 msgid "Hue:"
 msgstr "è?²ç?¸:"
 
-#: ../app/widgets/gimpcolorframe.c:568
+#: ../app/widgets/gimpcolorframe.c:571
 msgid "Sat.:"
 msgstr "é£½å??åº¦:"
 
-#: ../app/widgets/gimpcolorframe.c:586
+#: ../app/widgets/gimpcolorframe.c:589
 msgid "Cyan:"
 msgstr "æ°°è??:"
 
-#: ../app/widgets/gimpcolorframe.c:587
+#: ../app/widgets/gimpcolorframe.c:590
 msgid "Magenta:"
 msgstr "æ´?ç´?:"
 
-#: ../app/widgets/gimpcolorframe.c:588
+#: ../app/widgets/gimpcolorframe.c:591
 msgid "Yellow:"
 msgstr "é»?:"
 
-#: ../app/widgets/gimpcolorframe.c:589
+#: ../app/widgets/gimpcolorframe.c:592
 msgid "Black:"
 msgstr "é»?:"
 
-#: ../app/widgets/gimpcolorframe.c:609
+#: ../app/widgets/gimpcolorframe.c:612
 msgid "Alpha:"
 msgstr "é??æ??:"
 
-#: ../app/widgets/gimpcolormapeditor.c:208
+#: ../app/widgets/gimpcolormapeditor.c:201
 msgid "Color index:"
 msgstr "è?²å½©ç´¢å¼?:"
 
-#: ../app/widgets/gimpcolormapeditor.c:218
+#: ../app/widgets/gimpcolormapeditor.c:211
 msgid "HTML notation:"
 msgstr "HTML æ?¹å¼?è¡¨ç¤º:"
 
-#: ../app/widgets/gimpcolormapeditor.c:472
+#: ../app/widgets/gimpcolormapeditor.c:473
 msgid "Only indexed images have a colormap."
 msgstr "å?ªæ??ç´¢å¼?å¼?å??ç??æ??é¡?è?²å°?æ??è¡¨ã??"
 
@@ -13685,50 +13802,50 @@ msgstr "å°?é ?è¦½å??ç¸®å°?"
 msgid "Larger Previews"
 msgstr "å°?é ?è¦½å??æ?¾å¤§"
 
-#: ../app/widgets/gimpcontrollereditor.c:201
+#: ../app/widgets/gimpcontrollereditor.c:204
 msgid "_Dump events from this controller"
 msgstr "å?¾å?°é??å??æ?§å?¶å?¨ç??äº?ä»¶(_D)"
 
-#: ../app/widgets/gimpcontrollereditor.c:206
+#: ../app/widgets/gimpcontrollereditor.c:209
 msgid "_Enable this controller"
 msgstr "å??ç?¨é??å??æ?§å?¶å?¨(_E)"
 
-#: ../app/widgets/gimpcontrollereditor.c:227
+#: ../app/widgets/gimpcontrollereditor.c:230
 msgid "Name:"
 msgstr "å??ç¨±(_N):"
 
-#: ../app/widgets/gimpcontrollereditor.c:233
+#: ../app/widgets/gimpcontrollereditor.c:236
 msgid "State:"
 msgstr "ç??æ??:"
 
-#: ../app/widgets/gimpcontrollereditor.c:338
+#: ../app/widgets/gimpcontrollereditor.c:341
 msgid "Event"
 msgstr "äº?ä»¶"
 
-#: ../app/widgets/gimpcontrollereditor.c:363
+#: ../app/widgets/gimpcontrollereditor.c:366
 msgid "_Grab event"
 msgstr "æ??å??äº?ä»¶(_G)"
 
-#: ../app/widgets/gimpcontrollereditor.c:372
+#: ../app/widgets/gimpcontrollereditor.c:375
 msgid "Select the next event arriving from the controller"
 msgstr "é?¸æ??ä¸?ä¸?å??é??é??æ¤æ?§å?¶å?¨ç??äº?ä»¶"
 
-#: ../app/widgets/gimpcontrollereditor.c:530
+#: ../app/widgets/gimpcontrollereditor.c:533
 #, c-format
 msgid "Remove the action assigned to '%s'"
 msgstr "ç§»é?¤æ??æ´¾çµ¦â??%sâ??ç??å??ä½?"
 
-#: ../app/widgets/gimpcontrollereditor.c:535
+#: ../app/widgets/gimpcontrollereditor.c:538
 #, c-format
 msgid "Assign an action to '%s'"
 msgstr "æ??æ´¾å??ä½?çµ¦â??%sâ??"
 
-#: ../app/widgets/gimpcontrollereditor.c:656
+#: ../app/widgets/gimpcontrollereditor.c:659
 #, c-format
 msgid "Select Action for Event '%s'"
 msgstr "é?¸æ??äº?ä»¶â??%sâ??ç??å??ä½?"
 
-#: ../app/widgets/gimpcontrollereditor.c:661
+#: ../app/widgets/gimpcontrollereditor.c:664
 msgid "Select Controller Event Action"
 msgstr "é?¸æ??æ?§å?¶å?¨äº?ä»¶å??ä½?"
 
@@ -13789,37 +13906,37 @@ msgstr "é?µç?¤äº?ä»¶"
 msgid "Ready"
 msgstr "å°±ç·?"
 
-#: ../app/widgets/gimpcontrollerlist.c:181
+#: ../app/widgets/gimpcontrollerlist.c:184
 msgid "Available Controllers"
 msgstr "å?¯ç?¨ç??æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:273
+#: ../app/widgets/gimpcontrollerlist.c:276
 msgid "Active Controllers"
 msgstr "ä½¿ç?¨ä¸æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:289
+#: ../app/widgets/gimpcontrollerlist.c:292
 msgid "Configure the selected controller"
 msgstr "è¨å®?é?¸å??ç??æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:297
+#: ../app/widgets/gimpcontrollerlist.c:300
 msgid "Move the selected controller up"
 msgstr "å°?é?¸å??ç??æ?§å?¶å?¨ä¸?ç§»"
 
-#: ../app/widgets/gimpcontrollerlist.c:305
+#: ../app/widgets/gimpcontrollerlist.c:308
 msgid "Move the selected controller down"
 msgstr "å°?é?¸å??ç??æ?§å?¶å?¨å¾?ä¸?ç§»å??"
 
-#: ../app/widgets/gimpcontrollerlist.c:429
+#: ../app/widgets/gimpcontrollerlist.c:432
 #, c-format
 msgid "Add '%s' to the list of active controllers"
 msgstr "å°?â??%sâ??å? å?¥ä½¿ç?¨ä¸æ?§å?¶å?¨ç??æ¸?å?®"
 
-#: ../app/widgets/gimpcontrollerlist.c:480
+#: ../app/widgets/gimpcontrollerlist.c:483
 #, c-format
 msgid "Remove '%s' from the list of active controllers"
 msgstr "å¾?ä½¿ç?¨ä¸æ?§å?¶å?¨æ¸?å?®ç§»é?¤ã??%sã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:514
+#: ../app/widgets/gimpcontrollerlist.c:517
 msgid ""
 "There can only be one active keyboard controller.\n"
 "\n"
@@ -13829,7 +13946,7 @@ msgstr ""
 "\n"
 "ä½ ç??ä½¿ç?¨ä¸æ?§å?¶å?¨æ¸?å?®ä¸å·²ç¶?æ??é?µç?¤æ?§å?¶å?¨äº?ã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:525
+#: ../app/widgets/gimpcontrollerlist.c:528
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
@@ -13839,34 +13956,36 @@ msgstr ""
 "\n"
 "ä½ ç??ä½¿ç?¨ä¸æ?§å?¶å?¨æ¸?å?®ä¸å·²ç¶?æ?? wheel æ?§å?¶å?¨äº?ã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:551
+#: ../app/widgets/gimpcontrollerlist.c:554
 msgid "Remove Controller?"
 msgstr "æ?¯å?¦ç§»é?¤æ?§å?¶å?¨ï¼?"
 
-#: ../app/widgets/gimpcontrollerlist.c:556
+#: ../app/widgets/gimpcontrollerlist.c:559
 msgid "Disable Controller"
 msgstr "å??ç?¨æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:558
+#: ../app/widgets/gimpcontrollerlist.c:561
 msgid "Remove Controller"
 msgstr "ç§»é?¤æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:570
+#: ../app/widgets/gimpcontrollerlist.c:573
 #, c-format
 msgid "Remove Controller '%s'?"
 msgstr "æ?¯å?¦ç§»é?¤æ?§å?¶å?¨â??%sâ??ï¼?"
 
-#: ../app/widgets/gimpcontrollerlist.c:574
+#: ../app/widgets/gimpcontrollerlist.c:577
 msgid ""
-"Removing this controller from the list of active controllers will permanently delete all event mappings you have configured.\n"
+"Removing this controller from the list of active controllers will "
+"permanently delete all event mappings you have configured.\n"
 "\n"
-"Selecting \"Disable Controller\" will disable the controller without removing it."
+"Selecting \"Disable Controller\" will disable the controller without "
+"removing it."
 msgstr ""
 "å¾?ä½¿ç?¨ä¸æ?§å?¶å?¨æ¸?å?®ç§»é?¤é??å??æ?§å?¶å?¨æ??æ°¸é? å?ªé?¤æ??æ??ä½ è¨å®?é??ç??äº?ä»¶å°?æ? ã??\n"
 "\n"
 "é?¸æ??ã??å??ç?¨æ?§å?¶å?¨ã??å?ªæ??å??ç?¨è©²æ?§å?¶å?¨è??ä¸?æ??ç§»é?¤å®?ã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:626
+#: ../app/widgets/gimpcontrollerlist.c:629
 msgid "Configure Input Controller"
 msgstr "è¨å®?è¼¸å?¥æ?§å?¶å?¨"
 
@@ -13935,28 +14054,30 @@ msgstr "é??å??"
 msgid "%s (read only)"
 msgstr "%s (å?¯è®?)"
 
-#: ../app/widgets/gimpdeviceeditor.c:161
+#: ../app/widgets/gimpdeviceeditor.c:168
 msgid "Delete the selected device"
 msgstr "å?ªé?¤é?¸å??ç??è£?ç½®"
 
-#: ../app/widgets/gimpdeviceeditor.c:469
+#: ../app/widgets/gimpdeviceeditor.c:510
 msgid "Delete Device Settings"
 msgstr "å?ªé?¤è£?ç½®ç??è¨å®?ï¼?"
 
-#: ../app/widgets/gimpdeviceeditor.c:490
+#: ../app/widgets/gimpdeviceeditor.c:531
 #, c-format
 msgid "Delete \"%s\"?"
 msgstr "å?ªé?¤[%s] ?"
 
-#: ../app/widgets/gimpdeviceeditor.c:493
+#: ../app/widgets/gimpdeviceeditor.c:534
 msgid ""
 "You are about to delete this device's stored settings.\n"
 "The next time this device is plugged, default settings will be used."
 msgstr ""
+"ä½ å°?è¦?å?ªé?¤é??å??è£?ç½®ç??å?²å?è¨å®?ã??\n"
+"ä¸?æ¬¡é??å??è£?ç½®æ??å?¥æ??ï¼?é ?è¨ç??è¨å®?å°?è¢«ä½¿ç?¨ã??"
 
 #: ../app/widgets/gimpdeviceinfoeditor.c:142
-#: ../app/widgets/gimpdynamicseditor.c:148
-#: ../app/widgets/gimpdynamicsoutputeditor.c:213
+#: ../app/widgets/gimpdynamicseditor.c:143
+#: ../app/widgets/gimpdynamicsoutputeditor.c:212
 msgid "Pressure"
 msgstr "å£?å??"
 
@@ -13969,52 +14090,54 @@ msgid "Y tilt"
 msgstr "Y å?¾æ??"
 
 #: ../app/widgets/gimpdeviceinfoeditor.c:145
-#: ../app/widgets/gimpdynamicseditor.c:152
-#: ../app/widgets/gimpdynamicsoutputeditor.c:241
+#: ../app/widgets/gimpdynamicseditor.c:147
+#: ../app/widgets/gimpdynamicsoutputeditor.c:240
 msgid "Wheel"
 msgstr "æ??è½?"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:192
+#. the axes
+#: ../app/widgets/gimpdeviceinfoeditor.c:195
 #, fuzzy
 msgid "Axes"
 msgstr "è»¸"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:266
+#. the keys
+#: ../app/widgets/gimpdeviceinfoeditor.c:269
 #, fuzzy
 msgid "Keys"
 msgstr "æ?¥é?µ"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:366
-#: ../app/widgets/gimpdeviceinfoeditor.c:584
+#: ../app/widgets/gimpdeviceinfoeditor.c:369
+#: ../app/widgets/gimpdeviceinfoeditor.c:587
 #, c-format
 msgid "none"
 msgstr "ç?¡"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:414
+#: ../app/widgets/gimpdeviceinfoeditor.c:417
 #, c-format
 msgid "%s Curve"
 msgstr "%s æ?²ç·?"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:473
-#: ../app/widgets/gimpdynamicsoutputeditor.c:196
+#: ../app/widgets/gimpdeviceinfoeditor.c:476
+#: ../app/widgets/gimpdynamicsoutputeditor.c:195
 msgid "_Reset Curve"
 msgstr "é??è¨æ?²ç·?(_R)"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:486
+#: ../app/widgets/gimpdeviceinfoeditor.c:489
 #, fuzzy, c-format
 msgid "The axis '%s' has no curve"
 msgstr "æ²?æ??æ??ç?¨ç¨?å¼?å??å¾?ç?¦é»?ã??"
 
-#: ../app/widgets/gimpdevicestatus.c:139
+#: ../app/widgets/gimpdevicestatus.c:136
 msgid "Save device status"
 msgstr "å?²å?è£?ç½®ç??æ??"
 
-#: ../app/widgets/gimpdevicestatus.c:448
+#: ../app/widgets/gimpdevicestatus.c:440
 #, c-format
 msgid "Foreground: %d, %d, %d"
 msgstr "å??æ?¯é¡?è?²ï¼?%dï¼?%dï¼?%d"
 
-#: ../app/widgets/gimpdevicestatus.c:453
+#: ../app/widgets/gimpdevicestatus.c:445
 #, c-format
 msgid "Background: %d, %d, %d"
 msgstr "è??æ?¯é¡?è?²ï¼?%dï¼?%dï¼?%d"
@@ -14040,17 +14163,24 @@ msgstr "å??ç¨±ç?º â??%sâ?? ç??æª?æ¡?å·²ç¶?å?å?¨ã??"
 msgid "Do you want to replace it with the image you are saving?"
 msgstr "æ?¯å?¦å°?æº?å??å?²å?ç??å??ç??å??ä»£å??ä¾?ç??å??ç??ï¼?"
 
+#. String used to separate dockables, e.g. "Tool Options, Layers"
 #: ../app/widgets/gimpdock.h:34
 #, fuzzy
 msgctxt "dock"
 msgid ", "
 msgstr " "
 
+#. String used to separate books (GtkNotebooks) within a dock,
+#. e.g. "Tool Options, Layers - Brushes"
+#.
 #: ../app/widgets/gimpdock.h:39
 msgctxt "dock"
 msgid " - "
 msgstr "-"
 
+#. String used to separate dock columns,
+#. e.g. "Tool Options, Layers - Brushes | Gradients"
+#.
 #: ../app/widgets/gimpdock.h:44
 msgctxt "dock"
 msgid " | "
@@ -14060,40 +14190,36 @@ msgstr "|"
 msgid "Configure this tab"
 msgstr "è¨å®?é??å??å??é ?"
 
+#. Auto button
 #: ../app/widgets/gimpdockwindow.c:353
 msgid "Auto"
 msgstr "è?ªå??"
 
 #: ../app/widgets/gimpdockwindow.c:364
-msgid "When enabled the dialog automatically follows the image you are working on."
+msgid ""
+"When enabled the dialog automatically follows the image you are working on."
 msgstr "å??ç?¨æ??ï¼?å°?è©±ç??æ??è?ªå??é?¨ä½ æ£å?¨æ??ä½?ç??å??ç??è??è®?å??ã??"
 
 #: ../app/widgets/gimpdrawabletreeview.c:124
 msgid "Lock pixels"
 msgstr "é??å®?å??ç´ "
 
-#: ../app/widgets/gimpdynamicseditor.c:133
-#: ../app/widgets/gimpdynamicseditor.c:139
+#: ../app/widgets/gimpdynamicseditor.c:137
 msgid "Mapping matrix"
 msgstr "æ? å°?ç?©é?£"
 
-#: ../app/widgets/gimpdynamicseditor.c:149
-#: ../app/widgets/gimpdynamicsoutputeditor.c:220
+#: ../app/widgets/gimpdynamicseditor.c:144
+#: ../app/widgets/gimpdynamicsoutputeditor.c:219
 msgid "Velocity"
 msgstr "é??åº¦"
 
-#: ../app/widgets/gimpdynamicseditor.c:151
-#: ../app/widgets/gimpdynamicsoutputeditor.c:234
-msgid "Tilt"
-msgstr "å?¾æ??"
-
-#: ../app/widgets/gimpdynamicseditor.c:153
-#: ../app/widgets/gimpdynamicsoutputeditor.c:248
+#: ../app/widgets/gimpdynamicseditor.c:148
+#: ../app/widgets/gimpdynamicsoutputeditor.c:247
 msgid "Random"
 msgstr "é?¨æ©?"
 
-#: ../app/widgets/gimpdynamicseditor.c:154
-#: ../app/widgets/gimpdynamicsoutputeditor.c:255
+#: ../app/widgets/gimpdynamicseditor.c:149
+#: ../app/widgets/gimpdynamicsoutputeditor.c:254
 msgid "Fade"
 msgstr "æ·¡å??"
 
@@ -14110,23 +14236,23 @@ msgstr "è¨?æ?¯æ??é??æ?°å°?å??è?³æ¨?æº?é?¯èª¤è¼¸å?ºã??"
 msgid "%s Message"
 msgstr "%s æ??ç¤ºè¨?æ?¯"
 
-#: ../app/widgets/gimpfiledialog.c:326
+#: ../app/widgets/gimpfiledialog.c:327
 msgid "Automatically Detected"
 msgstr "è?ªå??å?µæ¸¬"
 
-#: ../app/widgets/gimpfiledialog.c:343
+#: ../app/widgets/gimpfiledialog.c:344
 msgid "By Extension"
 msgstr "æ ¹æ??å»¶ä¼¸æª?å??"
 
-#: ../app/widgets/gimpfiledialog.c:799
+#: ../app/widgets/gimpfiledialog.c:800
 msgid "All files"
 msgstr "æ??æ??æª?æ¡?"
 
-#: ../app/widgets/gimpfiledialog.c:804
+#: ../app/widgets/gimpfiledialog.c:805
 msgid "All images"
 msgstr "æ??æ??å??ç??"
 
-#: ../app/widgets/gimpfiledialog.c:980
+#: ../app/widgets/gimpfiledialog.c:981
 #, c-format
 msgid "Select File _Type (%s)"
 msgstr "é?¸æ??æª?æ¡?æ ¼å¼? [%s] (_T)"
@@ -14139,131 +14265,130 @@ msgstr "æª?æ¡?æ ¼å¼?"
 msgid "Extensions"
 msgstr "æ ¹æ??å»¶ä¼¸æª?å??"
 
-#: ../app/widgets/gimpfilleditor.c:127
+#: ../app/widgets/gimpfilleditor.c:130
 msgid "Fill Color"
 msgstr "å¡«å?¥è?²å½©"
 
-#: ../app/widgets/gimpfilleditor.c:145
+#: ../app/widgets/gimpfilleditor.c:149
 msgid "_Antialiasing"
 msgstr "å??é?¸é½?(_A)"
 
-#: ../app/widgets/gimpgradienteditor.c:413
+#. Instant update toggle
+#: ../app/widgets/gimpgradienteditor.c:411
 msgid "Instant update"
 msgstr "å?³æ??æ?´æ?°"
 
-#: ../app/widgets/gimpgradienteditor.c:775
+#: ../app/widgets/gimpgradienteditor.c:773
 #, c-format
 msgid "Zoom factor: %d:1"
 msgstr "ç¸®æ?¾å??ç??ï¼? %d:1"
 
-#: ../app/widgets/gimpgradienteditor.c:778
+#: ../app/widgets/gimpgradienteditor.c:776
 #, c-format
 msgid "Displaying [%0.4f, %0.4f]"
 msgstr "é¡¯ç¤º [%0.4f, %0.4f]"
 
-#: ../app/widgets/gimpgradienteditor.c:997
+#: ../app/widgets/gimpgradienteditor.c:995
 #, c-format
 msgid "Position: %0.4f"
 msgstr "ä½?ç½®ï¼?%0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:998
+#: ../app/widgets/gimpgradienteditor.c:996
 #, c-format
 msgid "RGB (%0.3f, %0.3f, %0.3f)"
 msgstr "RGB (%0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpgradienteditor.c:1000
+#: ../app/widgets/gimpgradienteditor.c:998
 #, c-format
 msgid "HSV (%0.1f, %0.1f, %0.1f)"
 msgstr "HSV (%0.1f, %0.1f, %0.1f)"
 
-#: ../app/widgets/gimpgradienteditor.c:1002
+#: ../app/widgets/gimpgradienteditor.c:1000
 #, c-format
 msgid "Luminance: %0.1f    Opacity: %0.1f"
 msgstr "äº®åº¦ï¼?%0.1f  ä¸?é??æ??åº¦(é??æ??=0)ï¼?%0.1f"
 
-#: ../app/widgets/gimpgradienteditor.c:1033
+#: ../app/widgets/gimpgradienteditor.c:1031
 #, c-format
 msgid "RGB (%d, %d, %d)"
 msgstr "RGB (%dï¼?%dï¼?%d)"
 
-#: ../app/widgets/gimpgradienteditor.c:1044
+#: ../app/widgets/gimpgradienteditor.c:1042
 msgid "Foreground color set to:"
 msgstr "å??æ?¯é¡?è?²è¨å®?ç?º:"
 
-#: ../app/widgets/gimpgradienteditor.c:1051
+#: ../app/widgets/gimpgradienteditor.c:1049
 msgid "Background color set to:"
 msgstr "è??æ?¯é¡?è?²è¨å®?ç?º:"
 
-#: ../app/widgets/gimpgradienteditor.c:1285
-#: ../app/widgets/gimpgradienteditor.c:1351
+#: ../app/widgets/gimpgradienteditor.c:1283
+#: ../app/widgets/gimpgradienteditor.c:1349
 #, c-format
 msgid "%s%sDrag: move & compress"
 msgstr "%s%sæ??æ?³ï¼?ç§»å??å??å£?ç¸®"
 
-#: ../app/widgets/gimpgradienteditor.c:1291
+#: ../app/widgets/gimpgradienteditor.c:1289
 msgid "Drag: move"
 msgstr "æ??æ?³ï¼?ç§»å??"
 
-#: ../app/widgets/gimpgradienteditor.c:1298
-#: ../app/widgets/gimpgradienteditor.c:1312
-#: ../app/widgets/gimpgradienteditor.c:1326
-#: ../app/widgets/gimpgradienteditor.c:1348
+#: ../app/widgets/gimpgradienteditor.c:1296
+#: ../app/widgets/gimpgradienteditor.c:1310
+#: ../app/widgets/gimpgradienteditor.c:1324
+#: ../app/widgets/gimpgradienteditor.c:1346
 #, c-format
 msgid "%s%sClick: extend selection"
 msgstr "%s%sæ??ä¸?æ??é??ï¼?æ?´å±?é?¸æ??å??"
 
-#: ../app/widgets/gimpgradienteditor.c:1304
-#: ../app/widgets/gimpgradienteditor.c:1318
+#: ../app/widgets/gimpgradienteditor.c:1302
+#: ../app/widgets/gimpgradienteditor.c:1316
 msgid "Click: select"
 msgstr "æ??ä¸?æ??é??ï¼?é?¸å??"
 
-#: ../app/widgets/gimpgradienteditor.c:1332
-#: ../app/widgets/gimpgradienteditor.c:1356
+#: ../app/widgets/gimpgradienteditor.c:1330
+#: ../app/widgets/gimpgradienteditor.c:1354
 msgid "Click: select    Drag: move"
 msgstr "æ??ä¸?æ??é??ï¼?é?¸å??    æ??æ?³ï¼?ç§»å??"
 
-#: ../app/widgets/gimpgradienteditor.c:1571
-#: ../app/widgets/gimpgradienteditor.c:1579
+#: ../app/widgets/gimpgradienteditor.c:1569
+#: ../app/widgets/gimpgradienteditor.c:1577
 #, c-format
 msgid "Handle position: %0.4f"
 msgstr "æ?§å?¶æ??ä½?ç½®ï¼? %0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:1596
+#: ../app/widgets/gimpgradienteditor.c:1594
 #, c-format
 msgid "Distance: %0.4f"
 msgstr "è·?é?¢ï¼?%0.4f"
 
-#: ../app/widgets/gimpgrideditor.c:216
+#: ../app/widgets/gimpgrideditor.c:218
 msgid "Line _style:"
 msgstr "ç·?æ¢?æ¨£å¼?(_S):"
 
-#: ../app/widgets/gimpgrideditor.c:220
+#: ../app/widgets/gimpgrideditor.c:222
 msgid "Change grid foreground color"
 msgstr "æ?´æ?¹æ ¼ç·?å??æ?¯é¡?è?²"
 
-#: ../app/widgets/gimpgrideditor.c:227
+#: ../app/widgets/gimpgrideditor.c:229
 msgid "_Foreground color:"
 msgstr "å??æ?¯é¡?è?²(_F):"
 
-#: ../app/widgets/gimpgrideditor.c:231
+#: ../app/widgets/gimpgrideditor.c:233
 msgid "Change grid background color"
 msgstr "æ?´æ?¹æ ¼ç·?è??æ?¯é¡?è?²"
 
-#: ../app/widgets/gimpgrideditor.c:238
+#: ../app/widgets/gimpgrideditor.c:240
 msgid "_Background color:"
 msgstr "è??æ?¯é¡?è?²(_B):"
 
-#: ../app/widgets/gimpgrideditor.c:243
+#: ../app/widgets/gimpgrideditor.c:245
 msgid "Spacing"
 msgstr "é??é??"
 
-#: ../app/widgets/gimpgrideditor.c:264
-#: ../app/widgets/gimpgrideditor.c:296
+#: ../app/widgets/gimpgrideditor.c:266 ../app/widgets/gimpgrideditor.c:298
 msgid "Width"
 msgstr "é??åº¦"
 
-#: ../app/widgets/gimpgrideditor.c:266
-#: ../app/widgets/gimpgrideditor.c:298
+#: ../app/widgets/gimpgrideditor.c:268 ../app/widgets/gimpgrideditor.c:300
 msgid "Height"
 msgstr "é«?åº¦"
 
@@ -14276,7 +14401,9 @@ msgid "The GIMP help browser is not available."
 msgstr "GIMP èªªæ??æ??ä»¶ç??è¦½å?¨ç?¡æ³?ä½¿ç?¨ã??"
 
 #: ../app/widgets/gimphelp.c:295
-msgid "The GIMP help browser plug-in appears to be missing from your installation. You may instead use the web browser for reading the help pages."
+msgid ""
+"The GIMP help browser plug-in appears to be missing from your installation. "
+"You may instead use the web browser for reading the help pages."
 msgstr "å®?è£? GIMP æ??ä¼¼ä¹?æ²?æ??å??æ??å®?è£?æ??é??èªªæ??æ??ä»¶ç??è¦½å?¨ç??å¢?æ??æ¨¡çµ?ã??ä½ å?¯ä»¥ä½¿ç?¨ç¶²é ?ç??è¦½å?¨é?±è®?èªªæ??æ??ä»¶ã??"
 
 #: ../app/widgets/gimphelp.c:336
@@ -14304,7 +14431,9 @@ msgid "The GIMP user manual is not installed on your computer."
 msgstr "GIMP ä½¿ç?¨è??æ??å??ä¸¦æ?ªå®?è£?å?¨ä½ ç??é?»è?¦ä¸?ã??"
 
 #: ../app/widgets/gimphelp.c:644
-msgid "You may either install the additional help package or change your preferences to use the online version."
+msgid ""
+"You may either install the additional help package or change your "
+"preferences to use the online version."
 msgstr "ä½ å?¯ä»¥å®?è£?é¡?å¤?ç??èªªæ??æª?å¥?ä»¶æ??æ?¹è®?å??å¥½è¨å®?ä¾?ä½¿ç?¨ç¶²ä¸?ç??æ?¬ã??"
 
 #: ../app/widgets/gimphistogrameditor.c:99
@@ -14335,12 +14464,15 @@ msgstr "ç?¾å??å?¼:"
 msgid "Channel:"
 msgstr "è?²ç??:"
 
+#. Button
 #: ../app/widgets/gimpimagecommenteditor.c:107
 msgid "Use default comment"
 msgstr "ä½¿ç?¨é ?è¨å??è¨»"
 
 #: ../app/widgets/gimpimagecommenteditor.c:109
-msgid "Replace the current image comment with the default comment set in Editâ??Preferencesâ??Default Image."
+msgid ""
+"Replace the current image comment with the default comment set in "
+"Editâ??Preferencesâ??Default Image."
 msgstr "æ?¿æ??ç?®å??ç??å??ç??å??è¨»ï¼?ç?¨è¨ç½®å?¨[ç·¨è¼¯]â??[å??å¥½è¨å®?]â??[é ?è¨å??ç??]ä¸ç??å??è¨»å?§å®¹ã??"
 
 #: ../app/widgets/gimpimageprofileview.c:200
@@ -14348,9 +14480,8 @@ msgid "Querying..."
 msgstr "æ?¥è©¢ä¸..."
 
 #: ../app/widgets/gimpimagepropview.c:122
-#, fuzzy
 msgid "Size in pixels:"
-msgstr "Topmargin in pixels"
+msgstr "å°ºå¯¸ä»¥å??ç´ è¨?ï¼?"
 
 #: ../app/widgets/gimpimagepropview.c:125
 msgid "Print size:"
@@ -14404,11 +14535,13 @@ msgstr "è?²ç??æ?¸ç?®:"
 msgid "Number of paths:"
 msgstr "è·¯å¾?æ?¸ç?®:"
 
+#. no undo (or redo) steps available
 #: ../app/widgets/gimpimagepropview.c:416
 msgid "None"
 msgstr "ç?¡"
 
 #: ../app/widgets/gimpimagepropview.c:470
+#: ../app/widgets/gimptemplateeditor.c:310
 #, c-format
 msgid "pixels/%s"
 msgstr "å??ç´ /%s"
@@ -14422,15 +14555,15 @@ msgstr "%g Ã? %g %s"
 msgid "colors"
 msgstr "é¡?è?²"
 
-#: ../app/widgets/gimpitemtreeview.c:708
+#: ../app/widgets/gimpitemtreeview.c:705
 msgid "Lock:"
 msgstr "é??å®?:"
 
-#: ../app/widgets/gimpitemtreeview.c:1481
+#: ../app/widgets/gimpitemtreeview.c:1478
 msgid "Set Item Exclusive Visible"
 msgstr "è¨å®?é ?ç?®æ??é?¤å?¯è¦?æ?§"
 
-#: ../app/widgets/gimpitemtreeview.c:1489
+#: ../app/widgets/gimpitemtreeview.c:1486
 msgid "Set Item Exclusive Linked"
 msgstr "è¨å®?é ?ç?®æ??é?¤é?£çµ?"
 
@@ -14438,21 +14571,21 @@ msgstr "è¨å®?é ?ç?®æ??é?¤é?£çµ?"
 msgid "Lock alpha channel"
 msgstr "é??å®?é??æ??è?²ç??"
 
-#: ../app/widgets/gimpmessagebox.c:439
+#: ../app/widgets/gimpmessagebox.c:442
 #, c-format
 msgid "Message repeated %d times."
 msgstr "è¨?æ?¯å·²é??è¤? %d æ¬¡ã??"
 
-#: ../app/widgets/gimpmessagebox.c:441
+#: ../app/widgets/gimpmessagebox.c:444
 msgid "Message repeated once."
 msgstr "è¨?æ?¯å·²é??è¤? 1 æ¬¡ã??"
 
-#: ../app/widgets/gimppaletteeditor.c:252
-#: ../app/widgets/gimppaletteeditor.c:743
+#: ../app/widgets/gimppaletteeditor.c:228
+#: ../app/widgets/gimppaletteeditor.c:693
 msgid "Undefined"
 msgstr "æ?ªæ??å®?"
 
-#: ../app/widgets/gimppaletteeditor.c:260
+#: ../app/widgets/gimppaletteeditor.c:236
 msgid "Columns:"
 msgstr "ç?´è¡?è¡?æ?¸:"
 
@@ -14479,60 +14612,60 @@ msgstr ""
 msgid "Invalid UTF-8"
 msgstr "ç?¡æ??ç?? UTF-8 å?ä¸²"
 
-#: ../app/widgets/gimpsettingsbox.c:241
+#: ../app/widgets/gimpsettingsbox.c:244
 msgid "Pick a setting from the list"
 msgstr "å¾?æ¸?å?®é?¸æ??è¨å®?å?¼"
 
-#: ../app/widgets/gimpsettingsbox.c:262
+#: ../app/widgets/gimpsettingsbox.c:265
 msgid "Add settings to favorites"
 msgstr "å°?è¨å®?å?¼å? å?¥æ??ç??æ??æ??"
 
-#: ../app/widgets/gimpsettingsbox.c:290
+#: ../app/widgets/gimpsettingsbox.c:293
 msgid "_Import Settings from File..."
 msgstr "ç?±æª?æ¡?å?¯å?¥è¨å®?å?¼(_I)..."
 
-#: ../app/widgets/gimpsettingsbox.c:296
+#: ../app/widgets/gimpsettingsbox.c:299
 msgid "_Export Settings to File..."
 msgstr "å?¯å?ºè¨å®?å?¼å?°æª?æ¡?(_E)..."
 
-#: ../app/widgets/gimpsettingsbox.c:303
+#: ../app/widgets/gimpsettingsbox.c:306
 msgid "_Manage Settings..."
 msgstr "ç®¡ç??è¨å®?å?¼(_M)..."
 
-#: ../app/widgets/gimpsettingsbox.c:590
+#: ../app/widgets/gimpsettingsbox.c:593
 msgid "Add Settings to Favorites"
 msgstr "å°?è¨å®?å?¼å? å?¥æ??ç??æ??æ??"
 
-#: ../app/widgets/gimpsettingsbox.c:593
+#: ../app/widgets/gimpsettingsbox.c:596
 msgid "Enter a name for the settings"
 msgstr "è«?è¼¸å?¥è¨å®?å?¼ç??å??ç¨±"
 
-#: ../app/widgets/gimpsettingsbox.c:594
+#: ../app/widgets/gimpsettingsbox.c:597
 msgid "Saved Settings"
 msgstr "å·²å?²å?ç??è¨å®?å?¼"
 
-#: ../app/widgets/gimpsettingsbox.c:630
+#: ../app/widgets/gimpsettingsbox.c:633
 msgid "Manage Saved Settings"
 msgstr "ç®¡ç??å·²å?²å?ç??è¨å®?å?¼"
 
-#: ../app/widgets/gimpsettingseditor.c:174
+#: ../app/widgets/gimpsettingseditor.c:177
 msgid "Import settings from a file"
 msgstr "ç?±æª?æ¡?å?¯å?¥è¨å®?å?¼"
 
-#: ../app/widgets/gimpsettingseditor.c:183
+#: ../app/widgets/gimpsettingseditor.c:186
 msgid "Export the selected settings to a file"
 msgstr "å?¯å?ºé?¸å??ç??è¨å®?å?¼å?°æª?æ¡?"
 
-#: ../app/widgets/gimpsettingseditor.c:192
+#: ../app/widgets/gimpsettingseditor.c:195
 msgid "Delete the selected settings"
 msgstr "å?ªé?¤é?¸å??ç??è¨å®?å?¼"
 
-#: ../app/widgets/gimpsizebox.c:460
+#: ../app/widgets/gimpsizebox.c:463
 #, c-format
 msgid "%d Ã? %d ppi"
 msgstr "%d Ã? %d dpi"
 
-#: ../app/widgets/gimpsizebox.c:462
+#: ../app/widgets/gimpsizebox.c:465
 #, c-format
 msgid "%d ppi"
 msgstr "%d ppi"
@@ -14575,45 +14708,49 @@ msgstr "é??æ¿¾æ¢?ä»¶(_F)"
 msgid "enter tags"
 msgstr "API æ¨?ç±¤"
 
+#. Seperator for tags
+#. * IMPORTANT: use only one of Unicode terminal punctuation chars.
+#. * http://unicode.org/review/pr-23.html
+#.
 #: ../app/widgets/gimptagentry.c:1716
 msgid ","
 msgstr ","
 
-#: ../app/widgets/gimptemplateeditor.c:179
+#: ../app/widgets/gimptemplateeditor.c:182
 #, c-format
 msgid "%p"
 msgstr "%p"
 
-#: ../app/widgets/gimptemplateeditor.c:254
+#: ../app/widgets/gimptemplateeditor.c:257
 msgid "_Advanced Options"
 msgstr "é?²é??é?¸é ?(_A)"
 
-#: ../app/widgets/gimptemplateeditor.c:361
+#: ../app/widgets/gimptemplateeditor.c:364
 msgid "Color _space:"
 msgstr "è?²å½©ç©ºé??(_S):"
 
-#: ../app/widgets/gimptemplateeditor.c:369
+#: ../app/widgets/gimptemplateeditor.c:372
 msgid "_Fill with:"
 msgstr "å¡«ä¸?(_F):"
 
-#: ../app/widgets/gimptemplateeditor.c:379
+#: ../app/widgets/gimptemplateeditor.c:382
 msgid "Comme_nt:"
 msgstr "å??è¨»(_N):"
 
-#: ../app/widgets/gimptemplateeditor.c:529
+#: ../app/widgets/gimptemplateeditor.c:532
 msgid "_Name:"
 msgstr "å??ç¨±(_N):"
 
-#: ../app/widgets/gimptemplateeditor.c:542
+#: ../app/widgets/gimptemplateeditor.c:545
 msgid "_Icon:"
 msgstr "å??ç¤º(_I)ï¼?"
 
-#: ../app/widgets/gimptemplateeditor.c:670
+#: ../app/widgets/gimptemplateeditor.c:673
 #, c-format
 msgid "%d Ã? %d ppi, %s"
 msgstr "%d Ã? %d ppiï¼?%s"
 
-#: ../app/widgets/gimptemplateeditor.c:672
+#: ../app/widgets/gimptemplateeditor.c:675
 #, c-format
 msgid "%d ppi, %s"
 msgstr "%d ppiï¼?%s"
@@ -14637,26 +14774,26 @@ msgstr "æª?æ¡? â??%sâ?? ä¸å?«æ??ç?¡æ??ç?? UTF-8 æ??å?ã??"
 msgid "_Use selected font"
 msgstr "ä½¿ç?¨é?¸å??ç??å?å??(_U)"
 
-#: ../app/widgets/gimptextstyleeditor.c:200
+#: ../app/widgets/gimptextstyleeditor.c:203
 #, fuzzy
 msgid "Change size of selected text"
 msgstr "å°?å·²é?¸æ??å?è®?ç?ºå¤§å¯«"
 
-#: ../app/widgets/gimptextstyleeditor.c:207
+#: ../app/widgets/gimptextstyleeditor.c:210
 msgid "Change color of selected text"
 msgstr "æ?¹è®?é?¸å??ç??æ??å?é¡?è?²"
 
-#: ../app/widgets/gimptextstyleeditor.c:232
+#: ../app/widgets/gimptextstyleeditor.c:235
 #, fuzzy
 msgid "Clear style of selected text"
 msgstr "æ?¥è©¢å·²é?¸å?è©?(_L)"
 
-#: ../app/widgets/gimptextstyleeditor.c:252
+#: ../app/widgets/gimptextstyleeditor.c:255
 #, fuzzy
 msgid "Change kerning of selected text"
 msgstr "å°?å·²é?¸æ??å?è®?ç?ºå¤§å¯«"
 
-#: ../app/widgets/gimptextstyleeditor.c:268
+#: ../app/widgets/gimptextstyleeditor.c:271
 #, fuzzy
 msgid "Change baseline of selected text"
 msgstr "å°?å·²é?¸æ??å?è®?ç?ºå¤§å¯«"
@@ -14674,19 +14811,16 @@ msgstr ""
 msgid "Pr_eview"
 msgstr "é ?è¦½(_E)"
 
-#: ../app/widgets/gimpthumbbox.c:403
-#: ../app/widgets/gimpthumbbox.c:467
+#: ../app/widgets/gimpthumbbox.c:403 ../app/widgets/gimpthumbbox.c:467
 msgid "No selection"
 msgstr "æ?ªé?¸æ??æª?æ¡?"
 
-#: ../app/widgets/gimpthumbbox.c:595
-#: ../app/widgets/gimpthumbbox.c:616
+#: ../app/widgets/gimpthumbbox.c:595 ../app/widgets/gimpthumbbox.c:616
 #, c-format
 msgid "Thumbnail %d of %d"
 msgstr "ç¸®å?? %2$d ä¹? %1$d"
 
-#: ../app/widgets/gimpthumbbox.c:729
-#: ../app/widgets/gimpthumbbox.c:739
+#: ../app/widgets/gimpthumbbox.c:729 ../app/widgets/gimpthumbbox.c:739
 msgid "Creating preview..."
 msgstr "æ£å?¨å»ºç«?é ?è¦½..."
 
@@ -14767,19 +14901,19 @@ msgstr "é??ä½?é??å??å·¥å?·è?³åº?å±¤"
 msgid "Reset tool order and visibility"
 msgstr "é??è¨å·¥å?·é ?åº?è??å?¯è¦?æ?§"
 
-#: ../app/widgets/gimptooloptionseditor.c:218
+#: ../app/widgets/gimptooloptionseditor.c:219
 msgid "Save options to..."
 msgstr "å?²å?é?¸é ?å?°..."
 
-#: ../app/widgets/gimptooloptionseditor.c:226
+#: ../app/widgets/gimptooloptionseditor.c:227
 msgid "Restore options from..."
 msgstr "é??å??é?¸é ?è?ª..."
 
-#: ../app/widgets/gimptooloptionseditor.c:234
+#: ../app/widgets/gimptooloptionseditor.c:235
 msgid "Delete saved options..."
 msgstr "å?ªé?¤å·²å?²å?ç??é?¸é ?..."
 
-#: ../app/widgets/gimptooloptionseditor.c:592
+#: ../app/widgets/gimptooloptionseditor.c:591
 #, c-format
 msgid "Error saving tool options presets: %s"
 msgstr "å?²å?å·¥å?·é?¸é ?é ?å??è¨å®?æ??ç?¼ç??é?¯èª¤ï¼?%s"
@@ -14843,42 +14977,47 @@ msgstr "[ å?ºæ?¬å??ç?? ]"
 msgid "Lock path strokes"
 msgstr "é??ä½?è·¯å¾?æ??é??"
 
-#: ../app/widgets/gimpviewablebox.c:80
+#: ../app/widgets/gimpviewablebox.c:82
 msgid "Open the brush selection dialog"
 msgstr "é??å??ç?å?·é?¸æ??å°?è©±ç??ã??"
 
-#: ../app/widgets/gimpviewablebox.c:137
+#: ../app/widgets/gimpviewablebox.c:141
+#, fuzzy
+msgid "Open the dynamics selection dialog"
+msgstr "é??å??é?¸å??å?å??ç??å°?è©±ç??"
+
+#: ../app/widgets/gimpviewablebox.c:202
 msgid "Open the pattern selection dialog"
 msgstr "é??å??å??æ¨£é?¸æ??å°?è©±ç??ã??"
 
-#: ../app/widgets/gimpviewablebox.c:203
+#: ../app/widgets/gimpviewablebox.c:268
 msgid "Open the gradient selection dialog"
 msgstr "é??å??æ¼¸è®?è?²é?¸æ??å°?è©±ç??ã??"
 
-#: ../app/widgets/gimpviewablebox.c:305
+#: ../app/widgets/gimpviewablebox.c:373
 msgid "Open the palette selection dialog"
 msgstr "é??å??èª¿è?²ç?¤é?¸æ??å°?è©±ç??"
 
-#: ../app/widgets/gimpviewablebox.c:363
+#: ../app/widgets/gimpviewablebox.c:434
 msgid "Open the font selection dialog"
 msgstr "é??å??é?¸å??å?å??ç??å°?è©±ç??"
 
-#: ../app/widgets/gimpwidgets-utils.c:670
+#: ../app/widgets/gimpwidgets-utils.c:673
 #, c-format
 msgid "%s (try %s)"
 msgstr "%s (å??è©¦ %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:670
+#: ../app/widgets/gimpwidgets-utils.c:673
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:674
+#: ../app/widgets/gimpwidgets-utils.c:677
 #, c-format
 msgid "%s (try %s, %s)"
 msgstr "%s (å??è©¦ %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:678
+#: ../app/widgets/gimpwidgets-utils.c:681
 #, c-format
 msgid "%s (try %s, %s, %s)"
 msgstr "%s (å??è©¦ %s, %s, %s)"
@@ -14990,14 +15129,18 @@ msgid "Undefined"
 msgstr "æ?ªæ??å®?"
 
 #: ../app/xcf/xcf-load.c:332
-msgid "This XCF file is corrupt!  I have loaded as much of it as I can, but it is incomplete."
+msgid ""
+"This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
+"incomplete."
 msgstr "é??å?? XCF æª?æ¡?å·²æ??æ¯?ï¼?æ??å·²å??å?¯è?½è¼?å?¥å®?ï¼?ä½?æ?¯ä¸¦ä¸?å®?æ?´ã??"
 
 #: ../app/xcf/xcf-load.c:343
-msgid "This XCF file is corrupt!  I could not even salvage any partial image data from it."
+msgid ""
+"This XCF file is corrupt!  I could not even salvage any partial image data "
+"from it."
 msgstr "é??å?? XCF æª?æ¡?å·²æ??æ¯?ï¼?æ??ç??è?³ç?¡æ³?å¾?å®?å??å¾?ä»»ä½?é?¨å??ç??å??ç??è³?æ??ã??"
 
-#: ../app/xcf/xcf-load.c:407
+#: ../app/xcf/xcf-load.c:416
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -15006,7 +15149,7 @@ msgstr ""
 "XCF è¦å??ã??ç??æ?¬ 0 ç?? XCF æª?æ¡?æ ¼å¼?ç?¡æ³?\n"
 " æ£ç¢ºå?°å?²å?ç´¢å¼?ç??é¡?è?²å°?æ??è¡¨ã??ä»¥ç?°é??å??ä»£æ?¿ã??"
 
-#: ../app/xcf/xcf-read.c:108
+#: ../app/xcf/xcf-read.c:115
 msgid "Invalid UTF-8 string in XCF file"
 msgstr "XCF æª?æ¡?ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²"
 
@@ -15015,15 +15158,12 @@ msgstr "XCF æª?æ¡?ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²"
 msgid "Error writing XCF: %s"
 msgstr "å¯«å?¥ XCF æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../app/xcf/xcf-seek.c:43
-#: ../app/xcf/xcf-seek.c:60
-#: ../app/xcf/xcf-seek.c:71
+#: ../app/xcf/xcf-seek.c:43 ../app/xcf/xcf-seek.c:60 ../app/xcf/xcf-seek.c:71
 #, c-format
 msgid "Could not seek in XCF file: %s"
 msgstr "ç?¡æ³?å?¨ XCF æª?æ¡?ä¸æ??å°?è³?æ??ï¼?%s"
 
-#: ../app/xcf/xcf.c:99
-#: ../app/xcf/xcf.c:167
+#: ../app/xcf/xcf.c:99 ../app/xcf/xcf.c:167
 msgid "GIMP XCF image"
 msgstr "GIMP XCF å??ç??"
 
@@ -15088,8 +15228,8 @@ msgstr "ç?¡æ³?é?£ç·?è?³ GIMPã??"
 msgid "Make sure that the Toolbox is visible!"
 msgstr "ç¢ºå®?å·¥å?·ç®±ç?ºå?¯è¦?ï¼?"
 
+#. if execv and execvp return, there was an error
 #: ../tools/gimp-remote-x11.c:247
 #, c-format
 msgid "Couldn't start '%s': %s"
 msgstr "ç?¡æ³?å??å??â??%sâ??ï¼?%s"
-
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b4227cd..d09f157 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,16 +5,16 @@
 # Chun-Chung Chen (é?³ä¿?ä»²) <cjj u washington edu>, 2001.
 # Abel Cheung <abel oaka org>, 2001, 03-05.
 # Yi-Shun Wang <dnextstep gmail com>, 2008.
-# taijuin <taijuin gmail com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp 2.6.7\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n";
-"POT-Creation-Date: 2010-10-03 20:17+0000\n"
-"PO-Revision-Date: 2010-10-30 19:13+0800\n"
-"Last-Translator: taijuin <taijuin gmail com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-01-01 19:28+0800\n"
+"PO-Revision-Date: 2010-10-04 19:54+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <community linuxhall org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,11 +24,11 @@ msgstr ""
 msgid "GIMP"
 msgstr "GIMP"
 
-#: ../app/about.h:26
-#: ../desktop/gimp.desktop.in.in.h:2
+#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:2
 msgid "GNU Image Manipulation Program"
 msgstr "GNU å??ç??è??ç??ç¨?å¼?"
 
+#. The year of the last commit (UTC) will be inserted into this string.
 #: ../app/about.h:30
 #, c-format
 msgid ""
@@ -41,42 +41,53 @@ msgstr ""
 #: ../app/about.h:34
 #, fuzzy
 msgid ""
-"GIMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.\n"
+"GIMP is free software: you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 3 of the License, or (at your option) any later "
+"version.\n"
 "\n"
-"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with GIMP.  If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"GIMP.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
-"æ?¬ç¨?å¼?æ?¯è?ªç?±è»?é«?ï¼?æ?¨å?¯ä»¥é?µç?§è?ªç?±è»?é«?å?ºé??æ?? (Free Software Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è?æ¢?æ¬¾ (GNU General Public License) ç¬¬äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??ä½¿ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??\n"
+"æ?¬ç¨?å¼?æ?¯è?ªç?±è»?é«?ï¼?æ?¨å?¯ä»¥é?µç?§è?ªç?±è»?é«?å?ºé??æ?? (Free Software Foundation) å?ºç??ç?? "
+"GNU é??ç?¨å?¬å?±è¨±å?¯è?æ¢?æ¬¾ (GNU General Public License) ç¬¬äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??"
+"ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??ä½¿ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??\n"
 "\n"
-"ç?¼ä½?é??ä¸?ç¨?å¼?ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è?ã??\n"
+"ç?¼ä½?é??ä¸?ç¨?å¼?ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??"
+"æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è?ã??\n"
 "\n"
-"æ?¨æ??è©²å·²ç¶?å??ç¨?å¼?ä¸?èµ·æ?¶å?°ä¸?ä»½ GNU é??ç?¨å?¬å?±è¨±å?¯è?ç??å?¯æ?¬ã??å¦?æ??é??æ²?æ??ï¼?è«?æ?¥é?±<http://www.gnu.org/licenses/>ã??\n"
+"æ?¨æ??è©²å·²ç¶?å??ç¨?å¼?ä¸?èµ·æ?¶å?°ä¸?ä»½ GNU é??ç?¨å?¬å?±è¨±å?¯è?ç??å?¯æ?¬ã??å¦?æ??é??æ²?æ??ï¼?è«?æ?¥é?±"
+"<http://www.gnu.org/licenses/>ã??\n"
 
 #: ../app/app.c:220
 #, c-format
 msgid ""
 "Unable to open a test swap file.\n"
 "\n"
-"To avoid data loss, please check the location and permissions of the swap directory defined in your Preferences (currently \"%s\")."
+"To avoid data loss, please check the location and permissions of the swap "
+"directory defined in your Preferences (currently \"%s\")."
 msgstr ""
 "ç?¡æ³?é??å??æ¸¬è©¦ç?¨ç??äº¤æ??è¨?æ?¶æª?æ¡?ã??\n"
 "\n"
-"ç?ºäº?é?¿å??æ??å¤±è³?æ??ï¼?è«?æª¢æ?¥æ?¨å?¨å??å¥½è¨å®?ä¸æ??æ??å®?ç??äº¤æ??æª?ç?®é?? (ç?®å??ç?ºâ??%sâ??) ç??ä½?ç½®å??æ¬?é??æ?¯å?¦æ£ç¢ºã??"
+"ç?ºäº?é?¿å??æ??å¤±è³?æ??ï¼?è«?æª¢æ?¥æ?¨å?¨å??å¥½è¨å®?ä¸æ??æ??å®?ç??äº¤æ??æª?ç?®é?? (ç?®å??ç?ºâ??%sâ??) ç??ä½?ç½®"
+"å??æ¬?é??æ?¯å?¦æ£ç¢ºã??"
 
 #: ../app/batch.c:75
 #, c-format
 msgid "No batch interpreter specified, using the default '%s'.\n"
 msgstr "æ²?æ??æ??å®?æ?¹æ¬¡è§£è¯å?¨ï¼?ä½¿ç?¨é ?è¨ç??â??%sâ??\n"
 
-#: ../app/batch.c:93
-#: ../app/batch.c:111
+#: ../app/batch.c:93 ../app/batch.c:111
 #, c-format
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
 msgstr "æ?¹æ¬¡è§£è¯å?¨â??%sâ??ç?¡æ³?ä½¿ç?¨ã??æ?¹æ¬¡æ¨¡å¼?å·²å??ç?¨ã??"
 
-#: ../app/main.c:139
-#: ../tools/gimp-remote.c:59
+#: ../app/main.c:139 ../tools/gimp-remote.c:59
 msgid "Show version information and exit"
 msgstr "é¡¯ç¤ºç??æ?¬è³?è¨?ä¸¦é?¢é??"
 
@@ -109,9 +120,8 @@ msgid "Do not load any fonts"
 msgstr "ä¸?è¦?è¼?å?¥ä»»ä½?å?å??"
 
 #: ../app/main.c:179
-#, fuzzy
 msgid "Do not show a splash screen"
-msgstr "ä¸?è¦?é¡¯ç¤ºæ¡è¿?ç?«é?¢"
+msgstr "ä¸?è¦?é¡¯ç¤ºå??å??ç?«é?¢"
 
 #: ../app/main.c:184
 msgid "Do not use shared memory between GIMP and plugins"
@@ -145,10 +155,12 @@ msgstr "ç?¨ä¾?è??ç??æ?¹æ¬¡æ??ä»¤ç??ç¨?åº?"
 msgid "Send messages to console instead of using a dialog"
 msgstr "å?³é??è¨?æ?¯å?° console è??é??å°?è©±ç??"
 
+#. don't translate the mode names (off|on|warn)
 #: ../app/main.c:225
 msgid "PDB compatibility mode (off|on|warn)"
 msgstr "PDB ç?¸å®¹æ?§æ¨¡å¼? (off|on|warn)"
 
+#. don't translate the mode names (never|query|always)
 #: ../app/main.c:231
 msgid "Debug in case of a crash (never|query|always)"
 msgstr "å¦?æ??ç?¼ç??ç?¶æ©?å°±é?¤é?¯ (never|query|always)"
@@ -208,50 +220,49 @@ msgstr ""
 #: ../app/sanity.c:417
 #, c-format
 msgid ""
-"The name of the directory holding the GIMP user configuration cannot be converted to UTF-8: %s\n"
+"The name of the directory holding the GIMP user configuration cannot be "
+"converted to UTF-8: %s\n"
 "\n"
-"Your filesystem probably stores files in an encoding other than UTF-8 and you didn't tell GLib about this. Please set the environment variable G_FILENAME_ENCODING."
+"Your filesystem probably stores files in an encoding other than UTF-8 and "
+"you didn't tell GLib about this. Please set the environment variable "
+"G_FILENAME_ENCODING."
 msgstr ""
 "å?«æ?? GIMP å??äººçµ?æ??æª?ç??ç?®é??ç??å??ç¨±ç?¡æ³?è½?æ??è?³ UTF-8ï¼?%s\n"
 "\n"
-"æ??å?¯è?½ç??å??å? æ?¯ï¼?æª?æ¡?ç³»çµ±ä½¿ç?¨äº? UTF-8 ä»¥å¤?ç??ç·¨ç¢¼ä½?ç?ºæª?æ¡?å??ç¨±ï¼?è??ä¸?æ?¨æ²?æ??æ£ç¢ºè¨å®?ä¾?é??ç?¥ Glibã??è«?è¨å®?ç?°å¢?è®?æ?¸ G_FILENAME_ENCODINGã??"
+"æ??å?¯è?½ç??å??å? æ?¯ï¼?æª?æ¡?ç³»çµ±ä½¿ç?¨äº? UTF-8 ä»¥å¤?ç??ç·¨ç¢¼ä½?ç?ºæª?æ¡?å??ç¨±ï¼?è??ä¸?æ?¨æ²?æ??æ£ç¢ºè¨"
+"å®?ä¾?é??ç?¥ Glibã??è«?è¨å®?ç?°å¢?è®?æ?¸ G_FILENAME_ENCODINGã??"
 
+#. show versions of libraries used by GIMP
 #: ../app/version.c:64
 #, c-format
 msgid "using %s version %s (compiled against version %s)"
 msgstr "æ£å?¨ä½¿ç?¨ %s ç??æ?¬ %sï¼?ä¾?ç??æ?¬ %s ç·¨è¯ï¼?"
 
-#: ../app/version.c:127
-#: ../tools/gimp-remote.c:94
+#: ../app/version.c:127 ../tools/gimp-remote.c:94
 #, c-format
 msgid "%s version %s"
 msgstr "%s ç??æ?¬ %s"
 
-#: ../app/actions/actions.c:109
-#: ../app/dialogs/dialogs.c:353
+#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:353
 #: ../app/widgets/gimpbrusheditor.c:89
 msgid "Brush Editor"
 msgstr "ç?å?·ç·¨è¼¯å?¨"
 
-#: ../app/actions/actions.c:112
-#: ../app/core/gimp.c:953
-#: ../app/dialogs/dialogs.c:282
-#: ../app/dialogs/preferences-dialog.c:2720
+#. initialize the list of gimp brushes
+#: ../app/actions/actions.c:112 ../app/core/gimp.c:953
+#: ../app/dialogs/dialogs.c:282 ../app/dialogs/preferences-dialog.c:2718
 msgid "Brushes"
 msgstr "ç?å?·"
 
-#: ../app/actions/actions.c:115
-#: ../app/dialogs/dialogs.c:292
+#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:292
 msgid "Buffers"
 msgstr "ç·©è¡?å??"
 
-#: ../app/actions/actions.c:118
-#: ../app/dialogs/dialogs.c:311
+#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:311
 msgid "Channels"
 msgstr "è?²ç??"
 
-#: ../app/actions/actions.c:121
-#: ../app/dialogs/convert-dialog.c:174
+#: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174
 #: ../app/dialogs/dialogs.c:319
 msgid "Colormap"
 msgstr "é¡?è?²å°?æ??è¡¨"
@@ -264,8 +275,7 @@ msgstr "çµ?æ??"
 msgid "Context"
 msgstr "é??è?¯"
 
-#: ../app/actions/actions.c:130
-#: ../app/dialogs/dialogs.c:275
+#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:275
 msgid "Pointer Information"
 msgstr "æ»?é¼ æ??æ¨?è³?è¨?"
 
@@ -285,8 +295,8 @@ msgstr "å??é§?"
 msgid "Dockable"
 msgstr "å?¯å??é§?"
 
-#: ../app/actions/actions.c:145
-#: ../app/dialogs/dialogs.c:294
+#. Document History
+#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:294
 #: ../app/dialogs/preferences-dialog.c:1573
 msgid "Document History"
 msgstr "æ??ä»¶è¨?é??"
@@ -295,13 +305,12 @@ msgstr "æ??ä»¶è¨?é??"
 msgid "Drawable"
 msgstr "å?¯ç¹ªç?©ä»¶"
 
-#: ../app/actions/actions.c:151
-#: ../app/dialogs/dialogs.c:300
+#. Some things do not have grids, so just list
+#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:300
 msgid "Paint Dynamics"
 msgstr "ç?å?·å??æ??"
 
-#: ../app/actions/actions.c:154
-#: ../app/dialogs/dialogs.c:357
+#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:357
 #: ../app/widgets/gimpdynamicseditor.c:94
 msgid "Paint Dynamics Editor"
 msgstr "ç?å?·å??æ??ç·¨è¼¯å?¨"
@@ -310,8 +319,7 @@ msgstr "ç?å?·å??æ??ç·¨è¼¯å?¨"
 msgid "Edit"
 msgstr "ç·¨è¼¯"
 
-#: ../app/actions/actions.c:160
-#: ../app/dialogs/dialogs.c:271
+#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:271
 msgid "Error Console"
 msgstr "é?¯èª¤è¨?æ?¯"
 
@@ -319,33 +327,29 @@ msgstr "é?¯èª¤è¨?æ?¯"
 msgid "File"
 msgstr "æª?æ¡?"
 
-#: ../app/actions/actions.c:166
-#: ../app/dialogs/dialogs.c:290
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:290
+#: ../app/dialogs/preferences-dialog.c:2738
 msgid "Fonts"
 msgstr "å?å??"
 
-#: ../app/actions/actions.c:169
-#: ../app/dialogs/dialogs.c:361
-#: ../app/widgets/gimpgradienteditor.c:275
+#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:361
+#: ../app/widgets/gimpgradienteditor.c:273
 msgid "Gradient Editor"
 msgstr "æ¼¸å±¤ç·¨è¼¯å?¨"
 
-#: ../app/actions/actions.c:172
-#: ../app/core/gimp.c:973
-#: ../app/dialogs/dialogs.c:286
-#: ../app/dialogs/preferences-dialog.c:2736
+#. initialize the list of gimp gradients
+#: ../app/actions/actions.c:172 ../app/core/gimp.c:973
+#: ../app/dialogs/dialogs.c:286 ../app/dialogs/preferences-dialog.c:2734
 msgid "Gradients"
 msgstr "æ¼¸å±¤"
 
-#: ../app/actions/actions.c:175
-#: ../app/core/gimp.c:983
+#. initialize the list of gimp tool presets
+#: ../app/actions/actions.c:175 ../app/core/gimp.c:983
 #: ../app/dialogs/dialogs.c:302
 msgid "Tool Presets"
 msgstr "å·¥å?·é ?è¨"
 
-#: ../app/actions/actions.c:178
-#: ../app/dialogs/dialogs.c:369
+#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:369
 #: ../app/widgets/gimptoolpreseteditor.c:75
 msgid "Tool Preset Editor"
 msgstr "å·¥å?·é ?è¨ç·¨è¼¯å?¨"
@@ -358,49 +362,42 @@ msgstr "æ±?å?©"
 msgid "Image"
 msgstr "å??ç??"
 
-#: ../app/actions/actions.c:187
-#: ../app/dialogs/dialogs.c:280
+#. list & grid views
+#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:280
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../app/actions/actions.c:190
-#: ../app/dialogs/dialogs.c:307
+#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:307
 #: ../app/dialogs/resize-dialog.c:287
 msgid "Layers"
 msgstr "å??å±¤"
 
-#: ../app/actions/actions.c:193
-#: ../app/dialogs/dialogs.c:365
-#: ../app/widgets/gimppaletteeditor.c:152
+#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:365
+#: ../app/widgets/gimppaletteeditor.c:145
 msgid "Palette Editor"
 msgstr "èª¿è?²ç?¤ç·¨è¼¯å?¨"
 
-#: ../app/actions/actions.c:196
-#: ../app/core/gimp.c:968
-#: ../app/dialogs/dialogs.c:288
-#: ../app/dialogs/preferences-dialog.c:2732
+#. initialize the list of gimp palettes
+#: ../app/actions/actions.c:196 ../app/core/gimp.c:968
+#: ../app/dialogs/dialogs.c:288 ../app/dialogs/preferences-dialog.c:2730
 msgid "Palettes"
 msgstr "èª¿è?²ç?¤"
 
-#: ../app/actions/actions.c:199
-#: ../app/core/gimp.c:963
-#: ../app/dialogs/dialogs.c:284
-#: ../app/dialogs/preferences-dialog.c:2728
+#. initialize the list of gimp patterns
+#: ../app/actions/actions.c:199 ../app/core/gimp.c:963
+#: ../app/dialogs/dialogs.c:284 ../app/dialogs/preferences-dialog.c:2726
 msgid "Patterns"
 msgstr "å??æ¨£"
 
-#: ../app/actions/actions.c:202
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2742
 msgid "Plug-Ins"
 msgstr "å¤?æ??ç¨?å¼?"
 
-#: ../app/actions/actions.c:205
-#: ../app/core/gimpchannel.c:385
+#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:385
 msgid "Quick Mask"
 msgstr "å¿«é??é?®ç½©"
 
-#: ../app/actions/actions.c:208
-#: ../app/dialogs/dialogs.c:335
+#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:335
 msgid "Sample Points"
 msgstr "å??æ¨£é»?"
 
@@ -408,8 +405,8 @@ msgstr "å??æ¨£é»?"
 msgid "Select"
 msgstr "é?¸å??å??å??"
 
-#: ../app/actions/actions.c:214
-#: ../app/core/gimp.c:988
+#. initialize the template list
+#: ../app/actions/actions.c:214 ../app/core/gimp.c:988
 #: ../app/dialogs/dialogs.c:296
 msgid "Templates"
 msgstr "ç¯?æ?¬"
@@ -422,21 +419,17 @@ msgstr "æ??å?å·¥å?·"
 msgid "Text Editor"
 msgstr "æ??å?ç·¨è¼¯å?¨"
 
-#: ../app/actions/actions.c:223
-#: ../app/dialogs/dialogs.c:263
-#: ../app/dialogs/preferences-dialog.c:1854
-#: ../app/gui/gui.c:428
+#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:263
+#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:425
 msgid "Tool Options"
 msgstr "å·¥å?·é?¸é ?"
 
-#: ../app/actions/actions.c:226
-#: ../app/widgets/gimptoolbox.c:927
+#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:181
 msgid "Tools"
 msgstr "å·¥å?·ç®±"
 
-#: ../app/actions/actions.c:229
-#: ../app/dialogs/dialogs.c:315
-#: ../app/tools/gimpvectortool.c:162
+#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:315
+#: ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "è·¯å¾?"
 
@@ -448,15 +441,17 @@ msgstr "é¡¯ç¤º"
 msgid "Windows"
 msgstr "Windows"
 
+#. value description and new value shown in the status bar
 #: ../app/actions/actions.c:584
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %.2f"
-msgstr "$ %.2f"
+msgstr "%s: %.2f"
 
+#. value description and new value shown in the status bar
 #: ../app/actions/actions.c:610
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %d"
-msgstr "%s (%s)"
+msgstr "%s: %d"
 
 #: ../app/actions/brush-editor-actions.c:42
 msgctxt "brush-editor-action"
@@ -686,7 +681,7 @@ msgstr "è®?é??å??è?²ç??ç§»å?°è?²ç??å ?ç??ç??æ??ä¸?å±¤"
 #: ../app/actions/channels-actions.c:108
 msgctxt "channels-action"
 msgid "Channel to Sele_ction"
-msgstr "è?²ç??è½?ç?ºé?¸æ??å??å??(_C)"
+msgstr "è?²ç??è½?ç?ºé?¸å??å??å??(_C)"
 
 #: ../app/actions/channels-actions.c:109
 msgctxt "channels-action"
@@ -721,7 +716,7 @@ msgstr "å??é?¸å??å??å??ç??äº¤é??(_I)"
 #: ../app/actions/channels-actions.c:127
 msgctxt "channels-action"
 msgid "Intersect this channel with the current selection"
-msgstr "è¨?ç®?é??å??è?²ç??å??ç?®å??é?¸æ??å??å??ç??äº¤é??å??å??"
+msgstr "è¨?ç®?é??å??è?²ç??å??ç?®å??é?¸å??å??å??ç??äº¤é??"
 
 #: ../app/actions/channels-commands.c:85
 #: ../app/actions/channels-commands.c:402
@@ -741,8 +736,7 @@ msgstr "ä¿®æ?¹è?²ç??é¡?è?²"
 msgid "_Fill opacity:"
 msgstr "å¡«è?²ä¸?é??æ??åº¦(_F):"
 
-#: ../app/actions/channels-commands.c:116
-#: ../app/core/gimpchannel.c:271
+#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:271
 #: ../app/widgets/gimpchanneltreeview.c:334
 msgid "Channel"
 msgstr "è?²ç??"
@@ -761,8 +755,7 @@ msgstr "æ?°å¢?è?²ç??é?¸é ?"
 msgid "New Channel Color"
 msgstr "æ?°å¢?è?²ç??é¡?è?²"
 
-#: ../app/actions/channels-commands.c:244
-#: ../app/core/gimpimage-new.c:252
+#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:252
 #: ../app/display/gimpdisplayshell-dnd.c:599
 #: ../app/widgets/gimpchanneltreeview.c:261
 #: ../app/widgets/gimplayertreeview.c:785
@@ -960,17 +953,14 @@ msgctxt "cursor-info-action"
 msgid "Use the composite color of all visible layers"
 msgstr "ä½¿ç?¨æ??æ??ç??å¾?è¦?å??å±¤ç??è¤?å??è?²"
 
-#: ../app/actions/data-commands.c:104
-#: ../app/actions/documents-commands.c:343
-#: ../app/actions/file-commands.c:194
-#: ../app/dialogs/file-open-dialog.c:233
+#: ../app/actions/data-commands.c:104 ../app/actions/documents-commands.c:343
+#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:233
 #: ../app/dialogs/file-open-dialog.c:278
 #: ../app/dialogs/file-open-location-dialog.c:213
 #: ../app/dialogs/file-open-location-dialog.c:225
 #: ../app/display/gimpdisplayshell-dnd.c:552
-#: ../app/widgets/gimplayertreeview.c:745
-#: ../app/widgets/gimptoolbox-dnd.c:178
-#: ../app/widgets/gimptoolbox.c:1222
+#: ../app/widgets/gimplayertreeview.c:745 ../app/widgets/gimptoolbox-dnd.c:180
+#: ../app/widgets/gimptoolbox.c:867
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -982,12 +972,9 @@ msgstr ""
 "%s"
 
 #: ../app/actions/data-commands.c:133
-#: ../app/core/gimpbrushgenerated-load.c:125
-#: ../app/core/gimpimage.c:1648
-#: ../app/core/gimppalette-import.c:210
-#: ../app/core/gimppalette-load.c:223
-#: ../app/core/gimppalette.c:379
-#: ../app/dialogs/palette-import-dialog.c:771
+#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1538
+#: ../app/core/gimppalette-import.c:210 ../app/core/gimppalette-load.c:223
+#: ../app/core/gimppalette.c:398 ../app/dialogs/palette-import-dialog.c:771
 #: ../app/widgets/gimpdnd-xds.c:94
 msgid "Untitled"
 msgstr "æ?ªå?½å??"
@@ -1003,7 +990,8 @@ msgstr "å?ªé?¤ â??%sâ??ï¼?"
 
 #: ../app/actions/data-commands.c:264
 #, c-format
-msgid "Are you sure you want to remove '%s' from the list and delete it on disk?"
+msgid ""
+"Are you sure you want to remove '%s' from the list and delete it on disk?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å??æ??å?¨æ¸?å?®å??ç£?ç¢?è£¡å?ªé?¤â??%sâ??ï¼?"
 
 #: ../app/actions/dialogs-actions.c:44
@@ -1362,8 +1350,7 @@ msgid "About GIMP"
 msgstr "é??æ?¼ GIMP"
 
 #: ../app/actions/dialogs-actions.c:304
-#: ../app/dialogs/preferences-dialog.c:1943
-#: ../app/widgets/gimptoolbox.c:770
+#: ../app/dialogs/preferences-dialog.c:1943 ../app/widgets/gimptoolbox.c:597
 msgid "Toolbox"
 msgstr "å·¥å?·ç®±"
 
@@ -1509,8 +1496,7 @@ msgctxt "tab-style"
 msgid "St_atus & Text"
 msgstr "ç??æ??å??æ??å?(_A)"
 
-#: ../app/actions/dockable-actions.c:116
-#: ../app/widgets/widgets-enums.c:224
+#: ../app/actions/dockable-actions.c:116 ../app/widgets/widgets-enums.c:224
 msgctxt "tab-style"
 msgid "Automatic"
 msgstr "è?ªå??"
@@ -1647,7 +1633,9 @@ msgid "Clear the Recent Documents list?"
 msgstr "æ?¯å?¦æ¸?é?¤æ??è¿?ä½¿ç?¨ç??æ??ä»¶æ¸?å?®ï¼?"
 
 #: ../app/actions/documents-commands.c:218
-msgid "Clearing the document history will permanently remove all images from the recent documents list."
+msgid ""
+"Clearing the document history will permanently remove all images from the "
+"recent documents list."
 msgstr "æ¸?é?¤æ??ä»¶æ·å?²è¨?é??æ??æ°¸ä¹?å?°ç§»é?¤æ??è¿?ä½¿ç?¨ç??å??ç??æ¸?å?®ã??"
 
 #: ../app/actions/drawable-actions.c:45
@@ -1663,7 +1651,7 @@ msgstr "è?ªå??å°?æ¯?åº¦å¢?å¼·"
 #: ../app/actions/drawable-actions.c:51
 msgctxt "drawable-action"
 msgid "In_vert"
-msgstr "å??ç?¸(_V)"
+msgstr "è² ç??æ??æ??(_V)"
 
 #: ../app/actions/drawable-actions.c:52
 msgctxt "drawable-action"
@@ -1710,6 +1698,7 @@ msgctxt "drawable-action"
 msgid "Toggle the linked state"
 msgstr "å??æ??å·²é?£çµ?ç??æ??"
 
+#. GIMP_STOCK_LOCK
 #: ../app/actions/drawable-actions.c:87
 msgctxt "drawable-action"
 msgid "L_ock pixels"
@@ -1777,7 +1766,7 @@ msgstr "äº®åº¦ç?å??ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
 
 #: ../app/actions/drawable-commands.c:87
 msgid "Invert does not operate on indexed layers."
-msgstr "å??ç?¸è?²å½©ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
+msgstr "è² ç??æ??æ??ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
 
 #: ../app/actions/drawable-commands.c:111
 msgid "White Balance operates only on RGB color layers."
@@ -1926,7 +1915,7 @@ msgstr "æ¸?é?¤å¾©å??è¨?é??(_C)"
 #: ../app/actions/edit-actions.c:98
 msgctxt "edit-action"
 msgid "Remove all operations from the undo history"
-msgstr "ç§»é?¤å¾©å??è¨?é??ç??æ??æ??æ??ä½?ç¨?åº?"
+msgstr "ç§»é?¤å¾©å??è¨?é??ä¸ç??æ??æ??æ??ä½?ç¨?åº?"
 
 #: ../app/actions/edit-actions.c:103
 msgctxt "edit-action"
@@ -1958,6 +1947,7 @@ msgctxt "edit-action"
 msgid "Copy the selected pixels to the clipboard"
 msgstr "è¤?è£½é?¸å??ç??å??ç´ å?°å?ªè²¼ç°¿"
 
+#. GIMP_STOCK_COPY_VISIBLE,
 #: ../app/actions/edit-actions.c:122
 msgctxt "edit-action"
 msgid "Copy _Visible"
@@ -1993,8 +1983,7 @@ msgctxt "edit-action"
 msgid "From _Clipboard"
 msgstr "å¾?å?ªè²¼ç°¿(_C)"
 
-#: ../app/actions/edit-actions.c:142
-#: ../app/actions/edit-actions.c:148
+#: ../app/actions/edit-actions.c:142 ../app/actions/edit-actions.c:148
 msgctxt "edit-action"
 msgid "Create a new image from the content of the clipboard"
 msgstr "å¾?å?ªè²¼ç°¿ç??å?§å®¹å»ºç«?æ?°ç??å??ç??"
@@ -2034,6 +2023,7 @@ msgctxt "edit-action"
 msgid "Copy the selected pixels to a named buffer"
 msgstr "è¤?è£½é?¸å??ç??å??ç´ å?°ä¸?å?½å??ç??ç·©è¡?å??"
 
+#. GIMP_STOCK_COPY_VISIBLE,
 #: ../app/actions/edit-actions.c:171
 msgctxt "edit-action"
 msgid "Copy _Visible Named..."
@@ -2127,7 +2117,7 @@ msgstr "æ¸?é?¤å¾©å??è¨?é??"
 
 #: ../app/actions/edit-commands.c:162
 msgid "Really clear image's undo history?"
-msgstr "æ?¯å?¦æ¸?é?¤å??ç??ç??å¾©å??è¨?é??ï¼?"
+msgstr "ç??ç??è¦?æ¸?é?¤å??ç??ç??å¾©å??è¨?é??å??ï¼?"
 
 #: ../app/actions/edit-commands.c:175
 #, c-format
@@ -2138,21 +2128,17 @@ msgstr "æ¸?é?¤é??å??å??ç??ç??å¾©å??è¨?é??å?¯ç?²å¾? %s è¨?æ?¶é«?ã??"
 msgid "Cut pixels to the clipboard"
 msgstr "å?ªä¸?å??ç´ å?°å?ªè²¼ç°¿"
 
-#: ../app/actions/edit-commands.c:235
-#: ../app/actions/edit-commands.c:264
+#: ../app/actions/edit-commands.c:235 ../app/actions/edit-commands.c:264
 msgid "Copied pixels to the clipboard"
 msgstr "è¤?è£½å??ç´ å?°å?ªè²¼ç°¿"
 
-#: ../app/actions/edit-commands.c:324
-#: ../app/actions/edit-commands.c:359
+#: ../app/actions/edit-commands.c:324 ../app/actions/edit-commands.c:359
 #: ../app/actions/edit-commands.c:538
 msgid "There is no image data in the clipboard to paste."
 msgstr "å?ªè²¼ç°¿ä¸æ²?æ??å??ç??è³?æ??å?¯è²¼ä¸?ã??"
 
-#: ../app/actions/edit-commands.c:347
-#: ../app/core/gimpbrushclipboard.c:180
-#: ../app/core/gimppatternclipboard.c:180
-#: ../app/widgets/gimpclipboard.c:345
+#: ../app/actions/edit-commands.c:347 ../app/core/gimpbrushclipboard.c:180
+#: ../app/core/gimppatternclipboard.c:180 ../app/widgets/gimpclipboard.c:345
 msgid "Clipboard"
 msgstr "å?ªè²¼ç°¿"
 
@@ -2160,8 +2146,7 @@ msgstr "å?ªè²¼ç°¿"
 msgid "Cut Named"
 msgstr "å?ªä¸?ä¸¦å?½å??"
 
-#: ../app/actions/edit-commands.c:376
-#: ../app/actions/edit-commands.c:417
+#: ../app/actions/edit-commands.c:376 ../app/actions/edit-commands.c:417
 #: ../app/actions/edit-commands.c:437
 msgid "Enter a name for this buffer"
 msgstr "ç?ºæ¤ç·©è¡?å??å?½å??"
@@ -2178,8 +2163,7 @@ msgstr "è¤?è£½å?¯è¦?ç??ä¸¦å?½å??"
 msgid "There is no active layer or channel to cut from."
 msgstr "ç?®å??æ²?æ??ä»»ä½?ä½¿ç?¨ä¸ç??å??å±¤æ??è??è?²ç??å?¯ä»¥å?ªä¸?ã??"
 
-#: ../app/actions/edit-commands.c:560
-#: ../app/actions/edit-commands.c:592
+#: ../app/actions/edit-commands.c:560 ../app/actions/edit-commands.c:592
 #: ../app/actions/edit-commands.c:616
 msgid "(Unnamed Buffer)"
 msgstr "(æ?ªå?½å??ç??ç·©è¡?å??)"
@@ -2363,7 +2347,9 @@ msgstr "å?²å?ç?ºè¤?æ?¬(_Y)..."
 
 #: ../app/actions/file-actions.c:135
 msgctxt "file-action"
-msgid "Save a copy of this image, without affecting the source file (if any) or the current state of the image"
+msgid ""
+"Save a copy of this image, without affecting the source file (if any) or the "
+"current state of the image"
 msgstr "å?²å?é??å??å??ç??ç??è¤?æ?¬ï¼?è??ä¸?å½±é?¿ä¾?æº?æª?æ¡?ï¼?å¦?æ??æ??ç??è©±ï¼?æ??ç?¶å??å??ç??ç??ç??æ??"
 
 #: ../app/actions/file-actions.c:140
@@ -2420,8 +2406,7 @@ msgstr "è¦?å¯« %s"
 msgid "Export to"
 msgstr "å?¯å?ºå?°"
 
-#: ../app/actions/file-commands.c:112
-#: ../app/actions/file-commands.c:475
+#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:475
 #: ../app/dialogs/file-open-dialog.c:77
 msgid "Open Image"
 msgstr "é??å??å??ç??"
@@ -2434,8 +2419,7 @@ msgstr "é??å??å??ç??æ??ç?ºå??å±¤"
 msgid "No changes need to be saved"
 msgstr "æ²?æ??é??è¦?å?²å?ç??è®?æ?´"
 
-#: ../app/actions/file-commands.c:272
-#: ../app/dialogs/file-save-dialog.c:95
+#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95
 msgid "Save Image"
 msgstr "å?²å?å??ç??"
 
@@ -2465,7 +2449,9 @@ msgid "Revert '%s' to '%s'?"
 msgstr "æ?¯å?¦å°? â??%sâ?? é??å??ç?º â??%sâ??ï¼?"
 
 #: ../app/actions/file-commands.c:427
-msgid "By reverting the image to the state saved on disk, you will lose all changes, including all undo information."
+msgid ""
+"By reverting the image to the state saved on disk, you will lose all "
+"changes, including all undo information."
 msgstr "å°?å??ç??é??å??ç??è©±ï¼?æ??å¤±å?»æ??æ??å·²æ?´æ?¹ç??è³?æ??ï¼?å??æ?¬æ??æ??å??ç??ç??æ?´æ?¹ç´?é??ã??"
 
 #: ../app/actions/file-commands.c:638
@@ -2898,7 +2884,8 @@ msgstr "å?å?²ç?º _POV-Ray..."
 #: ../app/actions/gradients-actions.c:66
 msgctxt "gradients-action"
 msgid "Save gradient as POV-Ray"
-msgstr "å?²å?æ¼¸å±¤ç?º POV-Ray ( POV-Ray æ?¯ç¬¬ä¸?å??å?¨ç©ºé??è»?é??æ¸²æ??å?ºå??ç??ç??å??ç·?è·?è¹¤è»?é«?)"
+msgstr ""
+"å?²å?æ¼¸å±¤ç?º POV-Ray ( POV-Ray æ?¯ç¬¬ä¸?å??å?¨ç©ºé??è»?é??æ¸²æ??å?ºå??ç??ç??å??ç·?è·?è¹¤è»?é«?)"
 
 #: ../app/actions/gradients-actions.c:71
 msgctxt "gradients-action"
@@ -2935,8 +2922,7 @@ msgstr "ç·¨è¼¯æ¼¸å±¤"
 msgid "Save '%s' as POV-Ray"
 msgstr "å°? â??%sâ?? å?¦å?ç?º POV-Ray"
 
-#: ../app/actions/help-actions.c:37
-#: ../app/actions/help-actions.c:40
+#: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40
 msgctxt "help-action"
 msgid "_Help"
 msgstr "èªªæ??(_H)"
@@ -2956,8 +2942,7 @@ msgctxt "help-action"
 msgid "Show the help for a specific user interface item"
 msgstr "é¡¯ç¤ºç?¹å®?ä½¿ç?¨è??ä»?é?¢é ?ç?®ç??æ±?å?©"
 
-#: ../app/actions/image-actions.c:48
-#: ../app/actions/image-actions.c:52
+#: ../app/actions/image-actions.c:48 ../app/actions/image-actions.c:52
 msgctxt "image-action"
 msgid "Image Menu"
 msgstr "ã??å??ç??ã??é?¸å?®"
@@ -3075,7 +3060,7 @@ msgstr "å?ªè£?å?ºé?¸å??å??å??(_C)"
 #: ../app/actions/image-actions.c:104
 msgctxt "image-action"
 msgid "Crop the image to the extents of the selection"
-msgstr "å?¨å??ç??ä¸å?ªè£?å?ºé?¸æ??å??å??å¤§å°?ç??é?¨å??"
+msgstr "å?¨å??ç??ä¸å?ªè£?å?ºé?¸å??å??å??å¤§å°?ç??é?¨å??"
 
 #: ../app/actions/image-actions.c:109
 msgctxt "image-action"
@@ -3211,8 +3196,7 @@ msgstr "å??å·¦æ??è½? 90 åº¦è©²å??ç??"
 msgid "Set Image Canvas Size"
 msgstr "è¨å®?å??ç??ç??ç?«å¸?å°ºå¯¸"
 
-#: ../app/actions/image-commands.c:265
-#: ../app/actions/image-commands.c:289
+#: ../app/actions/image-commands.c:265 ../app/actions/image-commands.c:289
 #: ../app/actions/image-commands.c:581
 msgid "Resizing"
 msgstr "ç¸®æ?¾ä¸"
@@ -3230,16 +3214,13 @@ msgstr "ç¿»è½?ä¸"
 
 #: ../app/actions/image-commands.c:402
 #: ../app/pdb/drawable-transform-cmds.c:547
-#: ../app/pdb/drawable-transform-cmds.c:628
-#: ../app/pdb/image-cmds.c:536
-#: ../app/pdb/item-transform-cmds.c:423
-#: ../app/pdb/transform-tools-cmds.c:224
+#: ../app/pdb/drawable-transform-cmds.c:628 ../app/pdb/image-cmds.c:536
+#: ../app/pdb/item-transform-cmds.c:423 ../app/pdb/transform-tools-cmds.c:224
 #: ../app/tools/gimprotatetool.c:122
 msgid "Rotating"
 msgstr "æ??è½?ä¸"
 
-#: ../app/actions/image-commands.c:428
-#: ../app/actions/layers-commands.c:691
+#: ../app/actions/image-commands.c:428 ../app/actions/layers-commands.c:691
 msgid "Cannot crop because the current selection is empty."
 msgstr "ç?¡æ³?è£?å?ªï¼?å? ç?ºç?®å??é?¸å??å??å??æ?¯ç©ºç??ã??"
 
@@ -3251,18 +3232,14 @@ msgstr "æ?¹è®?å??å?°ç??å¤§å°?"
 msgid "Scale Image"
 msgstr "ç¸®æ?¾å??ç??"
 
-#: ../app/actions/image-commands.c:680
-#: ../app/actions/layers-commands.c:1145
+#. Scaling
+#: ../app/actions/image-commands.c:680 ../app/actions/layers-commands.c:1145
 #: ../app/dialogs/preferences-dialog.c:1899
 #: ../app/pdb/drawable-transform-cmds.c:708
-#: ../app/pdb/drawable-transform-cmds.c:786
-#: ../app/pdb/image-cmds.c:408
-#: ../app/pdb/image-cmds.c:444
-#: ../app/pdb/item-transform-cmds.c:512
-#: ../app/pdb/layer-cmds.c:333
-#: ../app/pdb/layer-cmds.c:378
-#: ../app/pdb/transform-tools-cmds.c:302
-#: ../app/tools/gimpscaletool.c:106
+#: ../app/pdb/drawable-transform-cmds.c:786 ../app/pdb/image-cmds.c:408
+#: ../app/pdb/image-cmds.c:444 ../app/pdb/item-transform-cmds.c:512
+#: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378
+#: ../app/pdb/transform-tools-cmds.c:302 ../app/tools/gimpscaletool.c:106
 msgid "Scaling"
 msgstr "ç¸®æ?¾"
 
@@ -3366,8 +3343,7 @@ msgctxt "layers-action"
 msgid "Edit the layer's name"
 msgstr "ç·¨è¼¯å??å±¤å??ç¨±"
 
-#: ../app/actions/layers-actions.c:82
-#: ../app/actions/layers-actions.c:598
+#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:598
 msgctxt "layers-action"
 msgid "_New Layer..."
 msgstr "æ?°å¢?å??å±¤(_N)..."
@@ -3377,8 +3353,7 @@ msgctxt "layers-action"
 msgid "Create a new layer and add it to the image"
 msgstr "å»ºç«?æ?°ç??å??å±¤ä¸¦å°?å®?å? å?¥å??ç??"
 
-#: ../app/actions/layers-actions.c:88
-#: ../app/actions/layers-actions.c:599
+#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:599
 msgctxt "layers-action"
 msgid "_New Layer"
 msgstr "æ?°å¢?å??å±¤(_N)"
@@ -3681,7 +3656,7 @@ msgstr "é?®ç½©è½?ç?ºé?¸å??å??å??(_M)"
 #: ../app/actions/layers-actions.c:285
 msgctxt "layers-action"
 msgid "Replace the selection with the layer mask"
-msgstr "ç?¨å??å±¤é?®ç½©å??ä»£é?¸æ??å??å??"
+msgstr "ç?¨å??å±¤é?®ç½©å??ä»£é?¸å??å??å??"
 
 #: ../app/actions/layers-actions.c:290
 msgctxt "layers-action"
@@ -3691,10 +3666,9 @@ msgstr "å? å?¥è?³é?¸å??å??å??(_A)"
 #: ../app/actions/layers-actions.c:291
 msgctxt "layers-action"
 msgid "Add the layer mask to the current selection"
-msgstr "å°?å??å±¤é?®ç½©å? å?¥è?³ç?®å??ç??é?¸æ??å??å??"
+msgstr "å°?å??å±¤é?®ç½©å? å?¥è?³ç?®å??ç??é?¸å??å??å??"
 
-#: ../app/actions/layers-actions.c:296
-#: ../app/actions/layers-actions.c:325
+#: ../app/actions/layers-actions.c:296 ../app/actions/layers-actions.c:325
 msgctxt "layers-action"
 msgid "_Subtract from Selection"
 msgstr "å¾?é?¸å??å??å??ç§»é?¤(_S)"
@@ -3702,10 +3676,9 @@ msgstr "å¾?é?¸å??å??å??ç§»é?¤(_S)"
 #: ../app/actions/layers-actions.c:297
 msgctxt "layers-action"
 msgid "Subtract the layer mask from the current selection"
-msgstr "å¾?ç?®å??ç??é?¸æ??å??å??å?ªé?¤å??å±¤é?®ç½©"
+msgstr "å¾?ç?®å??ç??é?¸å??å??å??å?ªé?¤å??å±¤é?®ç½©"
 
-#: ../app/actions/layers-actions.c:302
-#: ../app/actions/layers-actions.c:332
+#: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:332
 msgctxt "layers-action"
 msgid "_Intersect with Selection"
 msgstr "å??é?¸å??å??å??ç??äº¤é??(_I)"
@@ -3785,17 +3758,22 @@ msgctxt "layers-action"
 msgid "Select the layer below the current layer"
 msgstr "é?¸å??å?¨ç?®å??å??å±¤ä¹?ä¸?ç??å??å±¤"
 
+#. Will be followed with e.g. "Shift-Click
+#. on thumbnail"
+#.
 #: ../app/actions/layers-actions.c:442
 #, fuzzy
 msgid "Shortcut: "
 msgstr "æ?·å¾?"
 
+#. Will be prepended with a modifier key
+#. string, e.g. "Shift"
+#.
 #: ../app/actions/layers-actions.c:447
 msgid "-Click on thumbnail in Layers dockable"
 msgstr ""
 
-#: ../app/actions/layers-actions.c:593
-#: ../app/actions/layers-actions.c:594
+#: ../app/actions/layers-actions.c:593 ../app/actions/layers-actions.c:594
 #, fuzzy
 msgctxt "layers-action"
 msgid "To _New Layer"
@@ -3809,13 +3787,11 @@ msgstr "å??å±¤å±¬æ?§"
 msgid "Edit Layer Attributes"
 msgstr "ç·¨è¼¯å??å±¤å±¬æ?§"
 
-#: ../app/actions/layers-commands.c:250
-#: ../app/core/gimplayer.c:265
+#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:265
 msgid "Layer"
 msgstr "å??å±¤"
 
-#: ../app/actions/layers-commands.c:252
-#: ../app/actions/layers-commands.c:320
+#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320
 #: ../app/widgets/gimpdrawabletreeview.c:337
 #: ../app/widgets/gimplayertreeview.c:846
 msgid "New Layer"
@@ -4161,7 +4137,7 @@ msgstr "æ??ç¹ª(_R)"
 #: ../app/actions/plug-in-actions.c:112
 msgctxt "plug-in-action"
 msgid "_Clouds"
-msgstr "é?²æ?µ(_C)"
+msgstr "é?²ç??(_C)"
 
 #: ../app/actions/plug-in-actions.c:114
 msgctxt "plug-in-action"
@@ -4334,12 +4310,12 @@ msgstr "å??æ¶?é?¸å??å??å??"
 #: ../app/actions/select-actions.c:62
 msgctxt "select-action"
 msgid "_Invert"
-msgstr "å??å??é?¸å??(_I)"
+msgstr "å??è½?(_I)"
 
 #: ../app/actions/select-actions.c:63
 msgctxt "select-action"
 msgid "Invert the selection"
-msgstr "é?¸å??å??å??æ?¬é?¸å??ç?¸å??ç??å??å??"
+msgstr "é?¸å??å??å??æ?¬ç?¸å??ç??å??å??"
 
 #: ../app/actions/select-actions.c:68
 msgctxt "select-action"
@@ -4399,7 +4375,7 @@ msgstr "é??æ¡?(_R)..."
 #: ../app/actions/select-actions.c:100
 msgctxt "select-action"
 msgid "Replace the selection by its border"
-msgstr "å°?é?¸æ??å??å??ä»¥å®?ç??é??æ¡?å??ä»£"
+msgstr "å°?é?¸å??å??å??ä»¥å®?ç??é??æ¡?å??ä»£"
 
 #: ../app/actions/select-actions.c:105
 msgctxt "select-action"
@@ -4437,7 +4413,7 @@ msgstr "ç¾½å??é?¸å??å??å??"
 
 #: ../app/actions/select-commands.c:159
 msgid "Feather selection by"
-msgstr "é?¸å??å??å??ç¾½å??ç¨?åº¦ï¼?"
+msgstr "é?¸å??å??å??é??ç·£ç¾½å??ç¨?åº¦ï¼?"
 
 #: ../app/actions/select-commands.c:196
 msgid "Shrink Selection"
@@ -4467,18 +4443,18 @@ msgstr "é?¸å??å??å??æ¡?ç·?å??"
 msgid "Border selection by"
 msgstr "é?¸å??å??å??æ¡?ç·?å??ç¨?åº¦:"
 
+#. Feather button
 #: ../app/actions/select-commands.c:279
 msgid "_Feather border"
 msgstr "ç¾½å??æ¡?ç·?(_F)"
 
+#. Edge lock button
 #: ../app/actions/select-commands.c:292
 msgid "_Lock selection to image edges"
 msgstr "å°?é?¸å??å??å??é??å®?å?¨å??ç??é??ç·£(_L)"
 
-#: ../app/actions/select-commands.c:342
-#: ../app/actions/select-commands.c:375
-#: ../app/actions/vectors-commands.c:386
-#: ../app/actions/vectors-commands.c:420
+#: ../app/actions/select-commands.c:342 ../app/actions/select-commands.c:375
+#: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420
 #: ../app/dialogs/stroke-dialog.c:289
 msgid "There is no active layer or channel to stroke to."
 msgstr "ç?®å??æ²?æ??ä»»ä½?ä½¿ç?¨ä¸ç??å??å±¤æ??è??è?²ç??å?¯ä»¥ç?¨ä¾?æ??é??ã??"
@@ -4561,7 +4537,8 @@ msgstr "å?ªé?¤ç¯?æ?¬"
 
 #: ../app/actions/templates-commands.c:238
 #, c-format
-msgid "Are you sure you want to delete template '%s' from the list and from disk?"
+msgid ""
+"Are you sure you want to delete template '%s' from the list and from disk?"
 msgstr "æ?¯å?¦ç¢ºå®?è¦?å??æ??å?¨æ¸?å?®å??ç£?ç¢?è£¡å?ªé?¤ç¯?æ?¬â??%sâ??ï¼?"
 
 #: ../app/actions/text-editor-actions.c:43
@@ -4585,7 +4562,6 @@ msgid "Clear all text"
 msgstr "æ¸?é?¤æ??æ??æ??å?"
 
 #: ../app/actions/text-editor-actions.c:58
-#, fuzzy
 msgctxt "text-editor-action"
 msgid "LTR"
 msgstr "å·¦è?³å?³"
@@ -4596,7 +4572,6 @@ msgid "From left to right"
 msgstr "ç?±å·¦è?³å?³"
 
 #: ../app/actions/text-editor-actions.c:64
-#, fuzzy
 msgctxt "text-editor-action"
 msgid "RTL"
 msgstr "å?³è?³å·¦"
@@ -4612,100 +4587,91 @@ msgid "Open Text File (UTF-8)"
 msgstr "é??å??æ??å?æª? (UTF-8)"
 
 #: ../app/actions/text-editor-commands.c:143
-#: ../app/actions/text-tool-commands.c:226
-#: ../app/config/gimpconfig-file.c:58
-#: ../app/core/gimpbrush-load.c:140
-#: ../app/core/gimpbrush-load.c:422
+#: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58
+#: ../app/core/gimpbrush-load.c:140 ../app/core/gimpbrush-load.c:422
 #: ../app/core/gimpbrushgenerated-load.c:73
-#: ../app/core/gimpbrushpipe-load.c:81
-#: ../app/core/gimpcurve-load.c:54
-#: ../app/core/gimpgradient-load.c:62
-#: ../app/core/gimppalette-load.c:76
-#: ../app/core/gimppalette-load.c:273
-#: ../app/core/gimppalette-load.c:319
-#: ../app/core/gimppalette-load.c:376
-#: ../app/core/gimppalette-load.c:466
-#: ../app/core/gimppalette-load.c:633
-#: ../app/core/gimppattern-load.c:76
-#: ../app/tools/gimpcurvestool.c:637
-#: ../app/tools/gimplevelstool.c:747
+#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54
+#: ../app/core/gimpgradient-load.c:62 ../app/core/gimppalette-load.c:76
+#: ../app/core/gimppalette-load.c:273 ../app/core/gimppalette-load.c:319
+#: ../app/core/gimppalette-load.c:376 ../app/core/gimppalette-load.c:466
+#: ../app/core/gimppalette-load.c:633 ../app/core/gimppattern-load.c:76
+#: ../app/tools/gimpcurvestool.c:637 ../app/tools/gimplevelstool.c:747
 #: ../app/xcf/xcf.c:329
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "ç?¡æ³?é??å?? â??%sâ?? ä¾?è®?å??è³?æ??ï¼?%s"
 
-#: ../app/actions/text-tool-actions.c:49
+#: ../app/actions/text-tool-actions.c:50
 msgctxt "text-tool-action"
 msgid "Text Tool Menu"
 msgstr "ã??æ??å?å·¥å?·ã??é?¸å?®"
 
-#: ../app/actions/text-tool-actions.c:53
-#, fuzzy
+#: ../app/actions/text-tool-actions.c:54
 msgctxt "text-tool-action"
 msgid "Input _Methods"
 msgstr "è¼¸å?¥æ³?(_M)"
 
-#: ../app/actions/text-tool-actions.c:57
+#: ../app/actions/text-tool-actions.c:58
 msgctxt "text-tool-action"
 msgid "Cu_t"
 msgstr "å?ªä¸?(_T)"
 
-#: ../app/actions/text-tool-actions.c:62
+#: ../app/actions/text-tool-actions.c:63
 msgctxt "text-tool-action"
 msgid "_Copy"
 msgstr "è¤?è£½(_C)"
 
-#: ../app/actions/text-tool-actions.c:67
+#: ../app/actions/text-tool-actions.c:68
 msgctxt "text-tool-action"
 msgid "_Paste"
 msgstr "è²¼ä¸?(_P)"
 
-#: ../app/actions/text-tool-actions.c:72
+#: ../app/actions/text-tool-actions.c:73
 msgctxt "text-tool-action"
 msgid "_Delete"
 msgstr "å?ªé?¤(_D)"
 
-#: ../app/actions/text-tool-actions.c:77
+#: ../app/actions/text-tool-actions.c:78
 msgctxt "text-tool-action"
 msgid "_Open text file..."
 msgstr "é??å??æ??å?æª?æ¡?(_O)..."
 
-#: ../app/actions/text-tool-actions.c:82
+#: ../app/actions/text-tool-actions.c:83
 msgctxt "text-tool-action"
 msgid "Cl_ear"
 msgstr "æ¸?é?¤(_E)"
 
-#: ../app/actions/text-tool-actions.c:83
+#: ../app/actions/text-tool-actions.c:84
 msgctxt "text-tool-action"
 msgid "Clear all text"
 msgstr "æ¸?é?¤æ??æ??æ??å?"
 
-#: ../app/actions/text-tool-actions.c:88
+#: ../app/actions/text-tool-actions.c:89
 msgctxt "text-tool-action"
 msgid "_Path from Text"
 msgstr "å¾?æ??å?å»ºç«?è·¯å¾?(_P)"
 
-#: ../app/actions/text-tool-actions.c:90
+#: ../app/actions/text-tool-actions.c:91
 msgctxt "text-tool-action"
 msgid "Create a path from the outlines of the current text"
 msgstr "å¾?ç?®å??æ??å?ç??è¼ªå»?å»ºç«?è·¯å¾?"
 
-#: ../app/actions/text-tool-actions.c:95
+#: ../app/actions/text-tool-actions.c:96
 msgctxt "text-tool-action"
 msgid "Text _along Path"
 msgstr "æ²¿è??è·¯å¾?ç??æ??å?(_A)"
 
-#: ../app/actions/text-tool-actions.c:97
+#: ../app/actions/text-tool-actions.c:98
 msgctxt "text-tool-action"
 msgid "Bend the text along the currently active path"
 msgstr "æ²¿è??ç?®å??ä½¿ç?¨ç??è·¯å¾?æ?æ?²æ??å?"
 
-#: ../app/actions/text-tool-actions.c:105
+#: ../app/actions/text-tool-actions.c:106
 msgctxt "text-tool-action"
 msgid "From left to right"
 msgstr "ç?±å·¦è?³å?³"
 
-#: ../app/actions/text-tool-actions.c:110
+#: ../app/actions/text-tool-actions.c:111
 msgctxt "text-tool-action"
 msgid "From right to left"
 msgstr "ç?±å?³è?³å·¦"
@@ -5065,6 +5031,7 @@ msgctxt "vectors-action"
 msgid "_Linked"
 msgstr "å·²é?£çµ?(_L)"
 
+#. GIMP_STOCK_LOCK
 #: ../app/actions/vectors-actions.c:159
 #, fuzzy
 msgctxt "vectors-action"
@@ -5126,8 +5093,7 @@ msgctxt "vectors-action"
 msgid "Selecti_on to Path"
 msgstr "é?¸å??è½?ç?ºè·¯å¾?(_O)"
 
-#: ../app/actions/vectors-actions.c:202
-#: ../app/actions/vectors-actions.c:208
+#: ../app/actions/vectors-actions.c:202 ../app/actions/vectors-actions.c:208
 msgctxt "vectors-action"
 msgid "Selection to path"
 msgstr "é?¸å??è½?ç?ºè·¯å¾?"
@@ -5155,8 +5121,7 @@ msgstr "è·¯å¾?å±¬æ?§"
 msgid "Edit Path Attributes"
 msgstr "ç·¨è¼¯è·¯å¾?å±¬æ?§"
 
-#: ../app/actions/vectors-commands.c:164
-#: ../app/vectors/gimpvectors.c:205
+#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207
 #: ../app/widgets/gimpvectorstreeview.c:252
 msgid "Path"
 msgstr "è·¯å¾?"
@@ -5169,9 +5134,8 @@ msgstr "æ?°å¢?è·¯å¾?"
 msgid "New Path Options"
 msgstr "æ?°å¢?è·¯å¾?é?¸é ?"
 
-#: ../app/actions/vectors-commands.c:392
-#: ../app/tools/gimpvectoroptions.c:198
-#: ../app/tools/gimpvectortool.c:1990
+#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:198
+#: ../app/tools/gimpvectortool.c:1982
 msgid "Stroke Path"
 msgstr "æ²¿è??è·¯å¾?æ??é??"
 
@@ -5440,8 +5404,7 @@ msgctxt "view-zoom-action"
 msgid "Zoom _Out"
 msgstr "æ??é? (_O)"
 
-#: ../app/actions/view-actions.c:264
-#: ../app/actions/view-actions.c:276
+#: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276
 msgctxt "view-action"
 msgid "Zoom out"
 msgstr "æ??é? "
@@ -5451,8 +5414,7 @@ msgctxt "view-zoom-action"
 msgid "Zoom _In"
 msgstr "æ??è¿?(_I)"
 
-#: ../app/actions/view-actions.c:270
-#: ../app/actions/view-actions.c:282
+#: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282
 msgctxt "view-action"
 msgid "Zoom in"
 msgstr "æ??è¿?"
@@ -5676,7 +5638,8 @@ msgstr "é?±è??å??é§?å¼?å??å?¶ä»?å°?è©±ç??"
 
 #: ../app/actions/windows-actions.c:103
 msgctxt "windows-action"
-msgid "When enabled docks and other dialogs are hidden, leaving only image windows."
+msgid ""
+"When enabled docks and other dialogs are hidden, leaving only image windows."
 msgstr "ç?¶å??ç?¨æ?¬é?¸é ?ï¼?å??é§?å¼?å??å?¶ä»?ç??å°?è©±ç??æ??é?±è??ï¼?å?ªç??ä¸?å??ç??è¦?çª?ã??"
 
 #: ../app/actions/windows-actions.c:109
@@ -5686,7 +5649,9 @@ msgstr "å?®ä¸?è¦?çª?æ¨¡å¼?"
 
 #: ../app/actions/windows-actions.c:110
 msgctxt "windows-action"
-msgid "When enabled GIMP is in a single-window mode. Far from completely implemented!"
+msgid ""
+"When enabled GIMP is in a single-window mode. Far from completely "
+"implemented!"
 msgstr "ç?¶å??ç?¨æ?¬é?¸é ?ï¼?GIMP æ?¯å?¨å?®ä¸?è¦?çª?æ¨¡å¼?ã??"
 
 #: ../app/base/base-enums.c:23
@@ -5860,8 +5825,15 @@ msgid "Anti erase"
 msgstr "å??æ¶?æ?¹é?¤"
 
 #: ../app/base/tile-swap.c:710
-msgid "Unable to open swap file. GIMP has run out of memory and cannot use the swap file. Some parts of your images may be corrupted. Try to save your work using different filenames, restart GIMP and check the location of the swap directory in your Preferences."
-msgstr "ç?¡æ³?é??å??äº¤æ??æª?ã??GIMP å·²è??ç?¡è¨?æ?¶é«?ï¼?è??ä¸?ç?¡æ³?ä½¿ç?¨äº¤æ??æª?ï¼?é??æ¨£å?¯è?½å¼?è?´æ??é?¨ä»½å??ç??å?§å®¹æ??å£?ã??è«?æ?¨å??è©¦ä½¿ç?¨å?¦ä¸?å??æª?æ¡?å??ç¨±å?²å?å??ç??ï¼?ç?¶å¾?é??æ?°å??å?? GIMPï¼?å?¨å??å¥½è¨å®?ä¸æª¢æ?¥æ??é??äº¤æ??æª?è³?æ??å¤¾ç??ä½?ç½®ã??"
+msgid ""
+"Unable to open swap file. GIMP has run out of memory and cannot use the swap "
+"file. Some parts of your images may be corrupted. Try to save your work "
+"using different filenames, restart GIMP and check the location of the swap "
+"directory in your Preferences."
+msgstr ""
+"ç?¡æ³?é??å??äº¤æ??æª?ã??GIMP å·²è??ç?¡è¨?æ?¶é«?ï¼?è??ä¸?ç?¡æ³?ä½¿ç?¨äº¤æ??æª?ï¼?é??æ¨£å?¯è?½å¼?è?´æ??é?¨ä»½å??ç??"
+"å?§å®¹æ??å£?ã??è«?æ?¨å??è©¦ä½¿ç?¨å?¦ä¸?å??æª?æ¡?å??ç¨±å?²å?å??ç??ï¼?ç?¶å¾?é??æ?°å??å?? GIMPï¼?å?¨å??å¥½è¨å®?ä¸"
+"æª¢æ?¥æ??é??äº¤æ??æª?è³?æ??å¤¾ç??ä½?ç½®ã??"
 
 #: ../app/base/tile-swap.c:725
 #, c-format
@@ -5963,23 +5935,17 @@ msgctxt "cursor-format"
 msgid "Fancy"
 msgstr "å½©è?²"
 
-#: ../app/config/gimpconfig-file.c:67
-#: ../app/core/gimpbrushgenerated-save.c:62
-#: ../app/core/gimpcurve-save.c:52
-#: ../app/core/gimpgradient-save.c:50
-#: ../app/core/gimpgradient-save.c:144
-#: ../app/core/gimppalette-save.c:55
-#: ../app/gui/themes.c:238
-#: ../app/tools/gimpcurvestool.c:690
-#: ../app/tools/gimplevelstool.c:800
-#: ../app/vectors/gimpvectors-export.c:81
+#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62
+#: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50
+#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:55
+#: ../app/gui/themes.c:243 ../app/tools/gimpcurvestool.c:690
+#: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81
 #: ../app/xcf/xcf.c:422
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "ç?¡æ³?é??å??â??%sâ??ä¾?å¯«å?¥è³?æ??ï¼?%s"
 
-#: ../app/config/gimpconfig-file.c:78
-#: ../app/config/gimpconfig-file.c:101
+#: ../app/config/gimpconfig-file.c:78 ../app/config/gimpconfig-file.c:101
 #, c-format
 msgid "Error writing '%s': %s"
 msgstr "å¯«å?¥â??%sâ??æ??ç?¼ç??é?¯èª¤ï¼?%s"
@@ -5991,20 +5957,34 @@ msgstr "è®?å??â??%sâ??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
 #: ../app/config/gimpconfig-file.c:131
 #, c-format
-msgid "There was an error parsing your '%s' file. Default values will be used. A backup of your configuration has been created at '%s'."
-msgstr "å??æ??â??%sâ??æª?æ¡?ç??å?§å®¹æ??å?ºç?¾é?¯èª¤ï¼?æ??æ?¹ç?ºä½¿ç?¨é ?è¨ç??çµ?æ??ã??æ?¨ç??çµ?æ??æª?æ¡?å·²è¢«å??ä»½ç?ºâ??%sâ??ã??"
+msgid ""
+"There was an error parsing your '%s' file. Default values will be used. A "
+"backup of your configuration has been created at '%s'."
+msgstr ""
+"å??æ??â??%sâ??æª?æ¡?ç??å?§å®¹æ??å?ºç?¾é?¯èª¤ï¼?æ??æ?¹ç?ºä½¿ç?¨é ?è¨ç??çµ?æ??ã??æ?¨ç??çµ?æ??æª?æ¡?å·²è¢«å??ä»½"
+"ç?ºâ??%sâ??ã??"
 
+#. Not all strings defined here are used in the user interface
+#. *  (the preferences dialog mainly) and only those that are should
+#. *  be marked for translation.
+#.
 #: ../app/config/gimprc-blurbs.h:13
-msgid "When enabled, an image will become the active image when its image window receives the focus. This is useful for window managers using \"click to focus\"."
-msgstr "å??ç?¨æ??ï¼?å??ç??æ??å?¨å®?ç??å??ç??è¦?çª?ç?²å¾?ç?¦é»?æ??è®?æ??ä½¿ç?¨ä¸ç??å??ç??ã??é??å?¨è¦?çª?ç®¡ç??ç¨?å¼?ä½¿ç?¨â??é»?æ??ä»¥å??å¾?ç?¦é»?â??æ??å¾?æ??å¹«å?©ã??"
+msgid ""
+"When enabled, an image will become the active image when its image window "
+"receives the focus. This is useful for window managers using \"click to focus"
+"\"."
+msgstr ""
+"å??ç?¨æ??ï¼?å??ç??æ??å?¨å®?ç??å??ç??è¦?çª?ç?²å¾?ç?¦é»?æ??è®?æ??ä½¿ç?¨ä¸ç??å??ç??ã??é??å?¨è¦?çª?ç®¡ç??ç¨?å¼?ä½¿"
+"ç?¨â??é»?æ??ä»¥å??å¾?ç?¦é»?â??æ??å¾?æ??å¹«å?©ã??"
 
-#: ../app/config/gimprc-blurbs.h:23
-#: ../app/config/gimprc-blurbs.h:28
+#: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28
 msgid "Sets the dynamics search path."
 msgstr "è¨ç½®å??æ??æ??ç´¢è·¯å¾?ã??"
 
 #: ../app/config/gimprc-blurbs.h:33
-msgid "Sets the canvas padding color used if the padding mode is set to custom color."
+msgid ""
+"Sets the canvas padding color used if the padding mode is set to custom "
+"color."
 msgstr "å¦?æ??è£?ç?½æ¨¡å¼?è¨ç?ºè?ªè¨?é¡?è?²ï¼?å?¨é??è£¡è¨å®?ç?«å¸?è£?ç?½é¡?è?²ã??"
 
 #: ../app/config/gimprc-blurbs.h:37
@@ -6028,11 +6008,17 @@ msgid "Sets the type of mouse pointers to use."
 msgstr "æ??å®? GIMP ä»¥å?ªç¨®æ?¹å¼?é¡¯ç¤ºæ»?é¼ æ??æ¨?ã??"
 
 #: ../app/config/gimprc-blurbs.h:55
-msgid "Context-dependent mouse pointers are helpful.  They are enabled by default.  However, they require overhead that you may want to do without."
-msgstr "å?¨ä¸?å??ç??æ??æ³?ä¸?ä½¿ç?¨ä¸?å??ç??æ»?é¼ æ??æ¨?æ?¯å¾?æ£?ç??ï¼?é ?è¨æ??ä½¿ç?¨é??ç¨®æ?¹å¼?é¡¯ç¤ºæ»?é¼ æ??æ¨?ã??ä½?æ?¯ï¼?å®?ä¹?æ??æ¶?è??ä¸?äº?è³?æº?ï¼?æ??äº?æ??æ³?ä¸?æ?¨å?¯è?½ä¸?å¸?æ??ä½¿ç?¨é??ç¨®è¨å®?ã??"
+msgid ""
+"Context-dependent mouse pointers are helpful.  They are enabled by default.  "
+"However, they require overhead that you may want to do without."
+msgstr ""
+"å?¨ä¸?å??ç??æ??æ³?ä¸?ä½¿ç?¨ä¸?å??ç??æ»?é¼ æ??æ¨?æ?¯å¾?æ£?ç??ï¼?é ?è¨æ??ä½¿ç?¨é??ç¨®æ?¹å¼?é¡¯ç¤ºæ»?é¼ æ??æ¨?ã??ä½?"
+"æ?¯ï¼?å®?ä¹?æ??æ¶?è??ä¸?äº?è³?æº?ï¼?æ??äº?æ??æ³?ä¸?æ?¨å?¯è?½ä¸?å¸?æ??ä½¿ç?¨é??ç¨®è¨å®?ã??"
 
 #: ../app/config/gimprc-blurbs.h:71
-msgid "When enabled, this will ensure that each pixel of an image gets mapped to a pixel on the screen."
+msgid ""
+"When enabled, this will ensure that each pixel of an image gets mapped to a "
+"pixel on the screen."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?å??ç??ç??æ¯?ä¸?å??å??ç´ ç?¸ç?æ?¼ç?«é?¢ç??æ¯?ä¸?å??å??ç´ ã??"
 
 #: ../app/config/gimprc-blurbs.h:93
@@ -6040,12 +6026,25 @@ msgid "This is the distance in pixels where Guide and Grid snapping activates."
 msgstr "ä»¤ç?©ä»¶è?ªå??è²¼é½?å??è??ç·?å??æ ¼ç·?é??å??å??è?½ç??æ??æ??é??ç??è·?é?¢ (å??ç´ )ã??"
 
 #: ../app/config/gimprc-blurbs.h:109
-msgid "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill algorithm.  The seed fill starts at the initially selected pixel and progresses in all directions until the difference of pixel intensity from the original is greater than a specified threshold. This value represents the default threshold."
-msgstr "ä¸?äº?å·¥å?·ï¼?å??æ¨¡ç³?é?¸å??å??å??æ??è??å¡«è?²ï¼?æ??ä»¥ seed-fill é??ç®?æ³?ä¾?å°?æ?¾å??å??ã??é??å§?ç??æ??å??ï¼?æ??é?¸å®?ä¸?å??å??ç´ ï¼?ç?¶å¾?å??æ??æ??æ?¹å??å»¶ä¼¸ï¼?ç?´è?³å?©å??ç?¸é?°å??ç´ ä¹?é??ç??äº®åº¦ç??å·®å¤§æ?¼æ??å??ç??é??ã??æ?¬æ?¸å?¼å°±æ?¯é ?è¨ç??ç??é??ã??"
+msgid ""
+"Tools such as fuzzy-select and bucket fill find regions based on a seed-fill "
+"algorithm.  The seed fill starts at the initially selected pixel and "
+"progresses in all directions until the difference of pixel intensity from "
+"the original is greater than a specified threshold. This value represents "
+"the default threshold."
+msgstr ""
+"ä¸?äº?å·¥å?·ï¼?å??æ¨¡ç³?é?¸å??å??å??æ??è??å¡«è?²ï¼?æ??ä»¥ seed-fill é??ç®?æ³?ä¾?å°?æ?¾å??å??ã??é??å§?ç??æ??"
+"å??ï¼?æ??é?¸å®?ä¸?å??å??ç´ ï¼?ç?¶å¾?å??æ??æ??æ?¹å??å»¶ä¼¸ï¼?ç?´è?³å?©å??ç?¸é?°å??ç´ ä¹?é??ç??äº®åº¦ç??å·®å¤§æ?¼æ??"
+"å??ç??é??ã??æ?¬æ?¸å?¼å°±æ?¯é ?è¨ç??è?¨ç??å?¼ã??"
 
 #: ../app/config/gimprc-blurbs.h:122
-msgid "The window type hint that is set on dock windows and the toolbox window. This may affect the way your window manager decorates and handles these windows."
-msgstr "è¦?çª?é¡?å??æ??ç¤ºç?¨å?¨è¨ç½®å??é§?å¼?è¦?çª?å??å·¥å?·ç®±è¦?çª?ã??é??å?¯è?½æ??å½±é?¿ä½ ç??è¦?çª?ç®¡ç??ç¨?å¼?è£?é£¾å??è??ç??é??äº?è¦?çª?ç??æ?¹å¼?ã??"
+msgid ""
+"The window type hint that is set on dock windows and the toolbox window. "
+"This may affect the way your window manager decorates and handles these "
+"windows."
+msgstr ""
+"è¦?çª?é¡?å??æ??ç¤ºç?¨å?¨è¨ç½®å??é§?å¼?è¦?çª?å??å·¥å?·ç®±è¦?çª?ã??é??å?¯è?½æ??å½±é?¿ä½ ç??è¦?çª?ç®¡ç??ç¨?å¼?è£?é£¾"
+"å??è??ç??é??äº?è¦?çª?ç??æ?¹å¼?ã??"
 
 #: ../app/config/gimprc-blurbs.h:154
 msgid "When enabled, the selected brush will be used for all tools."
@@ -6076,242 +6075,366 @@ msgid "Sets the text to appear in image window titles."
 msgstr "æ??å®?å??ç??è¦?çª?æ¨?é¡?ä¸é¡¯ç¤ºç??æ??å?ã??"
 
 #: ../app/config/gimprc-blurbs.h:197
-msgid "When enabled, this will ensure that the full image is visible after a file is opened, otherwise it will be displayed with a scale of 1:1."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?GIMP æ??ç¢ºä¿?é??å??å??ç??å¾?ï¼?ç?«é?¢ä¸æ??å®?å?¨é¡¯ç¤ºæ?´å¹?å??ç??ï¼?å?¦å??å®?æ??ä»¥å??ä¾?å°ºå¯¸é¡¯ç¤ºã??"
+msgid ""
+"When enabled, this will ensure that the full image is visible after a file "
+"is opened, otherwise it will be displayed with a scale of 1:1."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?GIMP æ??ç¢ºä¿?é??å??å??ç??å¾?ï¼?ç?«é?¢ä¸æ??å®?å?¨é¡¯ç¤ºæ?´å¹?å??ç??ï¼?å?¦å??å®?æ??ä»¥å??ä¾?"
+"å°ºå¯¸é¡¯ç¤ºã??"
 
 #: ../app/config/gimprc-blurbs.h:201
-msgid "Install a private colormap; might be useful on 8-bit (256 colors) displays."
-msgstr "ç¨?å¼?æ??ä½¿ç?¨è?ªå·±ç??é¡?è?²è??ä¸?ç?¨ç³»çµ±å??é??ç??é¡?è?²ï¼?å?¨ 8 bit (256 è?²) ç?«é?¢ä¸æ??æ??ç?¨ã??"
-
-#: ../app/config/gimprc-blurbs.h:204
-msgid "Sets the level of interpolation used for scaling and other transformations."
+msgid ""
+"Sets the level of interpolation used for scaling and other transformations."
 msgstr "è¨å®?ç¸®æ?¾å??è®?æ??å??ç??æ??é?¸ç?¨ç??å?§æ??æ³?å??è³ªã??"
 
-#: ../app/config/gimprc-blurbs.h:211
+#: ../app/config/gimprc-blurbs.h:208
 msgid "Specifies the language to use for the user interface."
 msgstr "ç?º GIMP ç¨?å¼?ä½¿ç?¨è??ç??é?¢æ??å®?è¦?ä½¿ç?¨ç??èª?è¨?ã??"
 
-#: ../app/config/gimprc-blurbs.h:214
+#: ../app/config/gimprc-blurbs.h:211
 msgid "How many recently opened image filenames to keep on the File menu."
 msgstr "æª?æ¡?é?¸å?®æ??ä¿?ç??å¤?å°?å??æ??è¿?é??å??ç??æª?æ¡?ã??"
 
-#: ../app/config/gimprc-blurbs.h:217
-msgid "Speed of marching ants in the selection outline.  This value is in milliseconds (less time indicates faster marching)."
+#: ../app/config/gimprc-blurbs.h:214
+msgid ""
+"Speed of marching ants in the selection outline.  This value is in "
+"milliseconds (less time indicates faster marching)."
 msgstr "é?¸å??å??å??å?¨å??ç??è??ç·?ç§»å??é??åº¦ã??æ?¬æ?¸å?¼ä»¥äº³ç§?è¡¨ç¤º (æ??é??è¼?å°?è¡¨ç¤ºé??åº¦è¼?å¿«)ã??"
 
-#: ../app/config/gimprc-blurbs.h:221
-msgid "GIMP will warn the user if an attempt is made to create an image that would take more memory than the size specified here."
-msgstr "å¦?æ??ç?¨æ?¶å??è©¦ç?¢ç??ä¸?å??ä½¿ç?¨å¤?æ?¼æ??å®?è¨?æ?¶é«?æ?¸é??ç??å??ç??æ??ï¼?GIMP æ??ç?¼å?ºè¦å??è¨?æ?¯æ??ç¤ºç?¨æ?¶ã??"
-
-#: ../app/config/gimprc-blurbs.h:225
-msgid "Generally only a concern for 8-bit displays, this sets the minimum number of system colors allocated for GIMP."
-msgstr "ä¸?è?¬ä¸?å?ªæ??å°?ä½¿ç?¨ 8 ä½?å??è?²å½©ç??ç?«é?¢æ¯?è¼?é??è¦?ï¼?å®?æ??å®?æ??å??é??çµ¦ GIMP ç??é¡?è?²æ?¸ç?®ä¸?é??ã??"
+#: ../app/config/gimprc-blurbs.h:218
+msgid ""
+"GIMP will warn the user if an attempt is made to create an image that would "
+"take more memory than the size specified here."
+msgstr ""
+"å¦?æ??ç?¨æ?¶å??è©¦ç?¢ç??ä¸?å??ä½¿ç?¨å¤?æ?¼æ??å®?è¨?æ?¶é«?æ?¸é??ç??å??ç??æ??ï¼?GIMP æ??ç?¼å?ºè¦å??è¨?æ?¯æ??ç¤ºç?¨"
+"æ?¶ã??"
 
-#: ../app/config/gimprc-blurbs.h:235
-msgid "Sets the monitor's horizontal resolution, in dots per inch.  If set to 0, forces the X server to be queried for both horizontal and vertical resolution information."
-msgstr "è¨å®?è?¢å¹?ç??æ°´å¹³è§£æ??åº¦ (å?®ä½?ç?º dpi)ã??å¦?æ??è¨å®?ç?º 0 ç??è©±ï¼?æ??å¼·å?¶ X ä¼ºæ??å?¨æ?¥è©¢æ°´å¹³å??å??ç?´ç??è§£æ??åº¦ã??"
+#: ../app/config/gimprc-blurbs.h:228
+msgid ""
+"Sets the monitor's horizontal resolution, in dots per inch.  If set to 0, "
+"forces the X server to be queried for both horizontal and vertical "
+"resolution information."
+msgstr ""
+"è¨å®?è?¢å¹?ç??æ°´å¹³è§£æ??åº¦ (å?®ä½?ç?º dpi)ã??å¦?æ??è¨å®?ç?º 0 ç??è©±ï¼?æ??å¼·å?¶ X ä¼ºæ??å?¨æ?¥è©¢æ°´å¹³"
+"å??å??ç?´ç??è§£æ??åº¦ã??"
 
-#: ../app/config/gimprc-blurbs.h:240
-msgid "Sets the monitor's vertical resolution, in dots per inch.  If set to 0, forces the X server to be queried for both horizontal and vertical resolution information."
-msgstr "è¨å®?è?¢å¹?ç??å??ç?´è§£æ??åº¦ (å?®ä½?ç?º dpi)ã??å¦?æ??è¨å®?ç?º 0 ç??è©±ï¼?æ??å¼·å?¶ X ä¼ºæ??å?¨æ?¥è©¢æ°´å¹³å??å??ç?´ç??è§£æ??åº¦ã??"
+#: ../app/config/gimprc-blurbs.h:233
+msgid ""
+"Sets the monitor's vertical resolution, in dots per inch.  If set to 0, "
+"forces the X server to be queried for both horizontal and vertical "
+"resolution information."
+msgstr ""
+"è¨å®?è?¢å¹?ç??å??ç?´è§£æ??åº¦ (å?®ä½?ç?º dpi)ã??å¦?æ??è¨å®?ç?º 0 ç??è©±ï¼?æ??å¼·å?¶ X ä¼ºæ??å?¨æ?¥è©¢æ°´å¹³"
+"å??å??ç?´ç??è§£æ??åº¦ã??"
 
-#: ../app/config/gimprc-blurbs.h:245
-msgid "If enabled, the move tool sets the edited layer or path as active.  This used to be the default behaviour in older versions."
-msgstr "å¦?æ??å??ç?¨ï¼?ç§»å??å·¥å?·æ??å°?å·²ç·¨è¼¯ç??å??å±¤æ??è·¯å¾?è¨ç?ºä½¿ç?¨ä¸ã??é??å?¨è??ç??æ?¬ä¸æ?¯é ?è¨ç??è¡?ç?ºã??"
+#: ../app/config/gimprc-blurbs.h:238
+msgid ""
+"If enabled, the move tool sets the edited layer or path as active.  This "
+"used to be the default behaviour in older versions."
+msgstr ""
+"å¦?æ??å??ç?¨ï¼?ç§»å??å·¥å?·æ??å°?å·²ç·¨è¼¯ç??å??å±¤æ??è·¯å¾?è¨ç?ºä½¿ç?¨ä¸ã??é??å?¨è??ç??æ?¬ä¸æ?¯é ?è¨ç??è¡?"
+"ç?ºã??"
 
-#: ../app/config/gimprc-blurbs.h:249
-msgid "Sets the size of the navigation preview available in the lower right corner of the image window."
+#: ../app/config/gimprc-blurbs.h:242
+msgid ""
+"Sets the size of the navigation preview available in the lower right corner "
+"of the image window."
 msgstr "è¨å®?å??ç??è¦?çª?å?³ä¸?è§?ç??å°?è¦½å??å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:253
+#: ../app/config/gimprc-blurbs.h:246
 msgid "Sets how many processors GIMP should try to use simultaneously."
 msgstr "è¨å®? GIMP æ??å??è©¦å??æ??ä½¿ç?¨å¹¾å??è??ç??å?¨ã??"
 
-#: ../app/config/gimprc-blurbs.h:266
+#: ../app/config/gimprc-blurbs.h:259
 #, fuzzy
-msgid "When enabled, the X server is queried for the mouse's current position on each motion event, rather than relying on the position hint.  This means painting with large brushes should be more accurate, but it may be slower.  Conversely, on some X servers enabling this option results in faster painting."
-msgstr "ç?¶å??ç?¨ç??æ??å??ï¼?X ä¼ºæ??å?¨æ??å?¨æ¯?æ¬¡ç?¼ç??ç§»å??äº?ä»¶æ??æ?¥è©¢æ»?é¼ ç?®å??ç??ä½?ç½®ï¼?è??ä¸?æ??æ ¹æ??å?¶ä½?ç½®æ??ç¤ºã??é??è¡¨ç¤ºä½¿ç?¨å¤§å??ç?å?·ç¹ªå??æ??æ??æ??æ?´å? æº?ç¢ºï¼?ä½?æ?¯å®?å?¯è?½æ??ä½¿é??åº¦è®?æ?¢ã??ä¸?é??å?¨æ??äº? X ä¼ºæ??å?¨ä¸?å??ç?¨é??å??é?¸é ?æ??ä½¿å¾?ç¹ªå??é??åº¦è®?å¿«ã??"
+msgid ""
+"When enabled, the X server is queried for the mouse's current position on "
+"each motion event, rather than relying on the position hint.  This means "
+"painting with large brushes should be more accurate, but it may be slower.  "
+"Conversely, on some X servers enabling this option results in faster "
+"painting."
+msgstr ""
+"ç?¶å??ç?¨ç??æ??å??ï¼?X ä¼ºæ??å?¨æ??å?¨æ¯?æ¬¡ç?¼ç??ç§»å??äº?ä»¶æ??æ?¥è©¢æ»?é¼ ç?®å??ç??ä½?ç½®ï¼?è??ä¸?æ??æ ¹æ??å?¶"
+"ä½?ç½®æ??ç¤ºã??é??è¡¨ç¤ºä½¿ç?¨å¤§å??ç?å?·ç¹ªå??æ??æ??æ??æ?´å? æº?ç¢ºï¼?ä½?æ?¯å®?å?¯è?½æ??ä½¿é??åº¦è®?æ?¢ã??ä¸?é??"
+"å?¨æ??äº? X ä¼ºæ??å?¨ä¸?å??ç?¨é??å??é?¸é ?æ??ä½¿å¾?ç¹ªå??é??åº¦è®?å¿«ã??"
 
-#: ../app/config/gimprc-blurbs.h:282
-msgid "Sets whether GIMP should create previews of layers and channels. Previews in the layers and channels dialog are nice to have but they can slow things down when working with large images."
-msgstr "æ??å®? GIMP æ??å?¦ç?¢ç??å??å±¤å??è?²ç??ç??é ?è¦½å??ã??å?¨å??å±¤å??è?²ç??å°?è©±ç??ä¸é¡¯ç¤ºé ?è¦½å??æ?¯ä¸?ä»¶å¥½äº?ï¼?ä½?å¦?æ??é??å??è¼?å¤§ç??å??ç??ï¼?æ??æ??æ?¢æ?´é«?ç??é??è¡?é??åº¦ã??"
+#: ../app/config/gimprc-blurbs.h:275
+msgid ""
+"Sets whether GIMP should create previews of layers and channels. Previews in "
+"the layers and channels dialog are nice to have but they can slow things "
+"down when working with large images."
+msgstr ""
+"æ??å®? GIMP æ??å?¦ç?¢ç??å??å±¤å??è?²ç??ç??é ?è¦½å??ã??å?¨å??å±¤å??è?²ç??å°?è©±ç??ä¸é¡¯ç¤ºé ?è¦½å??æ?¯ä¸?ä»¶å¥½"
+"äº?ï¼?ä½?å¦?æ??é??å??è¼?å¤§ç??å??ç??ï¼?æ??æ??æ?¢æ?´é«?ç??é??è¡?é??åº¦ã??"
 
-#: ../app/config/gimprc-blurbs.h:287
-msgid "Sets the preview size used for layers and channel previews in newly created dialogs."
+#: ../app/config/gimprc-blurbs.h:280
+msgid ""
+"Sets the preview size used for layers and channel previews in newly created "
+"dialogs."
 msgstr "ç?ºå??å±¤å??è?²ç??æ??å®?å?¨æ?°å»ºå°?è©±ç??ä¸é ?è¦½å??ç??é ?è¨å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:291
-msgid "When enabled, the image window will automatically resize itself whenever the physical image size changes."
+#: ../app/config/gimprc-blurbs.h:284
+msgid ""
+"When enabled, the image window will automatically resize itself whenever the "
+"physical image size changes."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?ç?¶å??ç??ç??å¯¦é??å°ºå¯¸æ??è®?å??æ??ï¼?è¦?çª?æ??è?ªå??èª¿æ?´å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:295
-msgid "When enabled, the image window will automatically resize itself when zooming into and out of images."
+#: ../app/config/gimprc-blurbs.h:288
+msgid ""
+"When enabled, the image window will automatically resize itself when zooming "
+"into and out of images."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?ç?¶æ??è¿?æ??è??æ??é? å??ç??æ??ï¼?å??ç??è¦?çª?æ??è?ªå??èª¿æ?´å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:299
+#: ../app/config/gimprc-blurbs.h:292
 msgid "Let GIMP try to restore your last saved session on each startup."
 msgstr "è®? GIMP å?¨æ¯?æ¬¡å??å??æ??å??å¾©ä¸?æ¬¡å?·è¡?ç??æ??æ³?ã??"
 
-#: ../app/config/gimprc-blurbs.h:302
-msgid "Remember the current tool, pattern, color, and brush across GIMP sessions."
+#: ../app/config/gimprc-blurbs.h:295
+msgid ""
+"Remember the current tool, pattern, color, and brush across GIMP sessions."
 msgstr "å?¨ GIMP çµ?æ??å??ï¼?è¨?é??ç?®å??ä½¿ç?¨ç??å·¥å?·ã??å??æ¨£ã??è?²å½©å??ç?å?·ã??"
 
-#: ../app/config/gimprc-blurbs.h:306
-msgid "Keep a permanent record of all opened and saved files in the Recent Documents list."
+#: ../app/config/gimprc-blurbs.h:299
+msgid ""
+"Keep a permanent record of all opened and saved files in the Recent "
+"Documents list."
 msgstr "å?¨æ??è¿?ä½¿ç?¨æ??ä»¶æ¸?å?®ä¸æ°¸ä¹?ä¿?å?æ??æ??é??å??æ??å?²å?é??ç??æª?æ¡?ã??"
 
-#: ../app/config/gimprc-blurbs.h:310
+#: ../app/config/gimprc-blurbs.h:303
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
 msgstr "ç?¶ GIMP çµ?æ??æ??å?²å?ä¸»è¦?å°?è©±ç??ç??ä½?ç½®å??å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:313
+#: ../app/config/gimprc-blurbs.h:306
 msgid "Save the tool options when GIMP exits."
 msgstr "ç?¶ GIMP çµ?æ??æ??å?²å?å·¥å?·é?¸é ?ã??"
 
-#: ../app/config/gimprc-blurbs.h:319
-msgid "When enabled, all paint tools will show a preview of the current brush's outline."
+#: ../app/config/gimprc-blurbs.h:312
+msgid ""
+"When enabled, all paint tools will show a preview of the current brush's "
+"outline."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?ä½¿ç?¨ä»»ä½?ç¹ªç?«å·¥å?·æ??é?½æ??é¡¯ç¤ºç?®å??ç??ç?å?·ç??å½¢ç??ã??"
 
-#: ../app/config/gimprc-blurbs.h:323
-msgid "When enabled, dialogs will show a help button that gives access to the related help page.  Without this button, the help page can still be reached by pressing F1."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?æ??æ??å°?è©±ç??é?½æ??é¡¯ç¤ºã??æ±?å?©ã??æ??é??ï¼?è®?æ?¨ç??è¦½ç?¸é??ç??èªªæ??æ??ä»¶ã??ä¸?é??å?³ä½¿æ²?æ??é??å??æ??é??ï¼?ä»?ç?¶å?¯ä»¥æ??é?µç?¤ç?? F1 ä»£æ?¿ã??"
+#: ../app/config/gimprc-blurbs.h:316
+msgid ""
+"When enabled, dialogs will show a help button that gives access to the "
+"related help page.  Without this button, the help page can still be reached "
+"by pressing F1."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?æ??æ??å°?è©±ç??é?½æ??é¡¯ç¤ºã??æ±?å?©ã??æ??é??ï¼?è®?æ?¨ç??è¦½ç?¸é??ç??èªªæ??æ??ä»¶ã??ä¸?é??å?³"
+"ä½¿æ²?æ??é??å??æ??é??ï¼?ä»?ç?¶å?¯ä»¥æ??é?µç?¤ç?? F1 ä»£æ?¿ã??"
 
-#: ../app/config/gimprc-blurbs.h:328
-msgid "When enabled, the mouse pointer will be shown over the image while using a paint tool."
+#: ../app/config/gimprc-blurbs.h:321
+msgid ""
+"When enabled, the mouse pointer will be shown over the image while using a "
+"paint tool."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?ç?¶ä½¿ç?¨ç¹ªç?«å·¥å?·æ??ä¹?ä¸?æ¨£é¡¯ç¤ºæ»?é¼ æ??æ¨?ã??"
 
-#: ../app/config/gimprc-blurbs.h:332
-msgid "When enabled, the menubar is visible by default. This can also be toggled with the \"View->Show Menubar\" command."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?é?¸å?®å??é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºé?¸å?®å??ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
+#: ../app/config/gimprc-blurbs.h:325
+msgid ""
+"When enabled, the menubar is visible by default. This can also be toggled "
+"with the \"View->Show Menubar\" command."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?é?¸å?®å??é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºé?¸å?®å??ã??ä¸æ?´æ?¹æ?¬è¨"
+"å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:336
-msgid "When enabled, the rulers are visible by default. This can also be toggled with the \"View->Show Rulers\" command."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å°ºè¦?é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå°ºè¦?ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
+#: ../app/config/gimprc-blurbs.h:329
+msgid ""
+"When enabled, the rulers are visible by default. This can also be toggled "
+"with the \"View->Show Rulers\" command."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å°ºè¦?é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå°ºè¦?ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:340
-msgid "When enabled, the scrollbars are visible by default. This can also be toggled with the \"View->Show Scrollbars\" command."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?æ?²å??å??é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºæ?²å??è»¸ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
+#: ../app/config/gimprc-blurbs.h:333
+msgid ""
+"When enabled, the scrollbars are visible by default. This can also be "
+"toggled with the \"View->Show Scrollbars\" command."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?æ?²å??å??é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºæ?²å??è»¸ã??ä¸æ?´æ?¹æ?¬è¨"
+"å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:344
-msgid "When enabled, the statusbar is visible by default. This can also be toggled with the \"View->Show Statusbar\" command."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?ç??æ??å??é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºç??æ??å??ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
+#: ../app/config/gimprc-blurbs.h:337
+msgid ""
+"When enabled, the statusbar is visible by default. This can also be toggled "
+"with the \"View->Show Statusbar\" command."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?ç??æ??å??é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºç??æ??å??ã??ä¸æ?´æ?¹æ?¬è¨"
+"å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:348
-msgid "When enabled, the selection is visible by default. This can also be toggled with the \"View->Show Selection\" command."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?é?¸å??å??å??å?¨å??ç??è??ç·?é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºé?¸å??å??å??ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
+#: ../app/config/gimprc-blurbs.h:341
+msgid ""
+"When enabled, the selection is visible by default. This can also be toggled "
+"with the \"View->Show Selection\" command."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?é?¸å??å??å??å?¨å??ç??è??ç·?é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºé?¸å??å??"
+"å??ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:352
-msgid "When enabled, the layer boundary is visible by default. This can also be toggled with the \"View->Show Layer Boundary\" command."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å??å±¤é??ç??é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå??å±¤é??ç??ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
+#: ../app/config/gimprc-blurbs.h:345
+msgid ""
+"When enabled, the layer boundary is visible by default. This can also be "
+"toggled with the \"View->Show Layer Boundary\" command."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å??å±¤é??ç??é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå??å±¤é??ç??ã??ä¸æ?´æ?¹"
+"æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:356
-msgid "When enabled, the guides are visible by default. This can also be toggled with the \"View->Show Guides\" command."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å??è??ç·?é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå??è??ç·?ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
+#: ../app/config/gimprc-blurbs.h:349
+msgid ""
+"When enabled, the guides are visible by default. This can also be toggled "
+"with the \"View->Show Guides\" command."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å??è??ç·?é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå??è??ç·?ã??ä¸æ?´æ?¹æ?¬è¨"
+"å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:360
-msgid "When enabled, the grid is visible by default. This can also be toggled with the \"View->Show Grid\" command."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?æ ¼ç·?é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºæ ¼ç·?ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
+#: ../app/config/gimprc-blurbs.h:353
+msgid ""
+"When enabled, the grid is visible by default. This can also be toggled with "
+"the \"View->Show Grid\" command."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?æ ¼ç·?é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºæ ¼ç·?ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:364
-msgid "When enabled, the sample points are visible by default. This can also be toggled with the \"View->Show Sample Points\" command."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å??æ¨£é»?é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå??æ¨£é»?ã??ä¸æ?´æ?¹æ?¬è¨å®?ã??"
+#: ../app/config/gimprc-blurbs.h:357
+msgid ""
+"When enabled, the sample points are visible by default. This can also be "
+"toggled with the \"View->Show Sample Points\" command."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?é ?è¨æ??å°?å??æ¨£é»?é¡¯ç¤ºå?ºä¾?ã??æ?¨ä¹?å?¯ä»¥å?¨ã??é¡¯ç¤ºâ??é¡¯ç¤ºå??æ¨£é»?ã??ä¸æ?´æ?¹æ?¬è¨"
+"å®?ã??"
 
-#: ../app/config/gimprc-blurbs.h:368
+#: ../app/config/gimprc-blurbs.h:361
 msgid "Show a tooltip when the pointer hovers over an item."
 msgstr "ç?¶æ»?é¼ æ??æ¨?å??å?¨é ?ç?®ä¸?æ??é¡¯ç¤ºå·¥å?·æ??ç¤ºã??"
 
-#: ../app/config/gimprc-blurbs.h:371
+#: ../app/config/gimprc-blurbs.h:364
 msgid "Use GIMP in a single-window mode."
 msgstr "ä½¿ç?¨ GIMP å?¨ä¸?å??å?®ä¸?è¦?çª?æ¨¡å¼?ã??"
 
-#: ../app/config/gimprc-blurbs.h:374
+#: ../app/config/gimprc-blurbs.h:367
 msgid "Hide docks and other windows, leaving only image windows."
-msgstr ""
+msgstr "é?±è??å??é§?å¼?å??å?¶ä»?è¦?çª?ï¼?å?ªç??ä¸?å??ç??è¦?çª?ã??"
 
-#: ../app/config/gimprc-blurbs.h:377
+#: ../app/config/gimprc-blurbs.h:370
 msgid "What to do when the space bar is pressed in the image window."
 msgstr "ç?¶ç©ºç?½é?µå?¨å??ç??è¦?çª?ä¸æ??ä¸?æ??è¦?å??ä»?éº¼ã??"
 
-#: ../app/config/gimprc-blurbs.h:380
-msgid "Sets the swap file location. GIMP uses a tile based memory allocation scheme. The swap file is used to quickly and easily swap tiles out to disk and back in. Be aware that the swap file can easily get very large if GIMP is used with large images. Also, things can get horribly slow if the swap file is created on a folder that is mounted over NFS.  For these reasons, it may be desirable to put your swap file in \"/tmp\"."
-msgstr "æ??å®?äº¤æ??æª?ç??ä½?ç½®ã??GIMP æ??ä½¿ç?¨å¹³é?¢å??å¡?ç??æ?¹å¼?å??é??è¨?æ?¶é«?ã??äº¤æ??æª?ç??ç?¨é??æ?¯å°?é??äº?å??å¡?å¿«é??å?°å¯«å?¥ç£?ç¢?æ??è??è®?å?¥è¨?æ?¶é«?ã??ä½?æ?¯è¦?æ³¨æ??ï¼?å¦?æ?? GIMP é??å??äº?è¼?å¤§ç??å??ç??ï¼?é??äº?äº¤æ??æª?å?¯ä»¥è®?å¾?å¾?å¤§ã??å?¦å¤?ï¼?å¦?æ??äº¤æ??æª?ç?®é??æ?¯å?¨ NFS ä¼ºæ??å?¨ä¸ï¼?é??åº¦å?¯ä»¥è®?å¾?å¾?æ?¢ã??å?ºæ?¼ä»¥ä¸?ç??å??å? ï¼?æ??å¥½å°?äº¤æ??æª?æ¡?ç?®é??è¨å®?ç?ºâ??/tmpâ??ã??"
+#: ../app/config/gimprc-blurbs.h:373
+msgid ""
+"Sets the swap file location. GIMP uses a tile based memory allocation "
+"scheme. The swap file is used to quickly and easily swap tiles out to disk "
+"and back in. Be aware that the swap file can easily get very large if GIMP "
+"is used with large images. Also, things can get horribly slow if the swap "
+"file is created on a folder that is mounted over NFS.  For these reasons, it "
+"may be desirable to put your swap file in \"/tmp\"."
+msgstr ""
+"æ??å®?äº¤æ??æª?ç??ä½?ç½®ã??GIMP æ??ä½¿ç?¨å¹³é?¢å??å¡?ç??æ?¹å¼?å??é??è¨?æ?¶é«?ã??äº¤æ??æª?ç??ç?¨é??æ?¯å°?é??äº?å??"
+"å¡?å¿«é??å?°å¯«å?¥ç£?ç¢?æ??è??è®?å?¥è¨?æ?¶é«?ã??ä½?æ?¯è¦?æ³¨æ??ï¼?å¦?æ?? GIMP é??å??äº?è¼?å¤§ç??å??ç??ï¼?é??äº?"
+"äº¤æ??æª?å?¯ä»¥è®?å¾?å¾?å¤§ã??å?¦å¤?ï¼?å¦?æ??äº¤æ??æª?ç?®é??æ?¯å?¨ NFS ä¼ºæ??å?¨ä¸ï¼?é??åº¦å?¯ä»¥è®?å¾?å¾?æ?¢ã??"
+"å?ºæ?¼ä»¥ä¸?ç??å??å? ï¼?æ??å¥½å°?äº¤æ??æª?æ¡?ç?®é??è¨å®?ç?ºâ??/tmpâ??ã??"
 
-#: ../app/config/gimprc-blurbs.h:389
+#: ../app/config/gimprc-blurbs.h:382
 msgid "When enabled, menus can be torn off."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?å?¯ä»¤é?¸å?®è?«é?¢è¦?çª?ã??"
 
-#: ../app/config/gimprc-blurbs.h:392
-msgid "When enabled, you can change keyboard shortcuts for menu items by hitting a key combination while the menu item is highlighted."
-msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?ç?¶æ??å??é?¸å?®é ?ç?®è¢«é?¸ä¸æ??ï¼?æ?¨å?¯å?³æ??æ??ä¸?é?©ç?¶ç??æ??é?µçµ?å??ï¼?ä¾?æ?´æ?¹ä»£è¡¨é??å??é?¸å?®é ?ç?®ç??æ?·å¾?é?µã??"
+#: ../app/config/gimprc-blurbs.h:385
+msgid ""
+"When enabled, you can change keyboard shortcuts for menu items by hitting a "
+"key combination while the menu item is highlighted."
+msgstr ""
+"å¦?å??ç?¨æ?¬é?¸é ?ï¼?ç?¶æ??å??é?¸å?®é ?ç?®è¢«é?¸ä¸æ??ï¼?æ?¨å?¯å?³æ??æ??ä¸?é?©ç?¶ç??æ??é?µçµ?å??ï¼?ä¾?æ?´æ?¹ä»£è¡¨"
+"é??å??é?¸å?®é ?ç?®ç??æ?·å¾?é?µã??"
 
-#: ../app/config/gimprc-blurbs.h:396
+#: ../app/config/gimprc-blurbs.h:389
 msgid "Save changed keyboard shortcuts when GIMP exits."
 msgstr "ç?¶ GIMP çµ?æ??æ??å?²å?å·±ä¿®æ?¹ç??æ?·å¾?é?µã??"
 
-#: ../app/config/gimprc-blurbs.h:399
+#: ../app/config/gimprc-blurbs.h:392
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "ç?¶ GIMP å??å??æ??è¼?å?¥å·±ä¿®æ?¹ç??æ?·å¾?é?µã??"
 
-#: ../app/config/gimprc-blurbs.h:402
-msgid "Sets the folder for temporary storage. Files will appear here during the course of running GIMP.  Most files will disappear when GIMP exits, but some files are likely to remain, so it is best if this folder not be one that is shared by other users."
-msgstr "æ??å®?å?æ?¾æ?«å?æª?ç??ç?®é??ã??ç?¶å?·è¡? GIMP ç??æ??å??ï¼?è©²ç?®é??æ??å?ºç?¾ä¸?äº?æª?æ¡?ï¼?å?¶ä¸å¤§é?¨ä»½é?½æ??å?¨ GIMP çµ?æ??å¾?æ¶?å¤±ï¼?ä½?æ??å?¯è?½æ??ä¸?äº?æª?æ¡?æ??ç??ä¸?ï¼?å? æ¤è©²ç?®é??æ??å¥½æ?¯ä¸?å?¯ä»¥å??äº«çµ¦å?¶å®?ä½¿ç?¨è??ã??"
+#: ../app/config/gimprc-blurbs.h:395
+msgid ""
+"Sets the folder for temporary storage. Files will appear here during the "
+"course of running GIMP.  Most files will disappear when GIMP exits, but some "
+"files are likely to remain, so it is best if this folder not be one that is "
+"shared by other users."
+msgstr ""
+"æ??å®?å?æ?¾æ?«å?æª?ç??ç?®é??ã??ç?¶å?·è¡? GIMP ç??æ??å??ï¼?è©²ç?®é??æ??å?ºç?¾ä¸?äº?æª?æ¡?ï¼?å?¶ä¸å¤§é?¨ä»½é?½"
+"æ??å?¨ GIMP çµ?æ??å¾?æ¶?å¤±ï¼?ä½?æ??å?¯è?½æ??ä¸?äº?æª?æ¡?æ??ç??ä¸?ï¼?å? æ¤è©²ç?®é??æ??å¥½æ?¯ä¸?å?¯ä»¥å??äº«çµ¦"
+"å?¶å®?ä½¿ç?¨è??ã??"
 
-#: ../app/config/gimprc-blurbs.h:414
+#: ../app/config/gimprc-blurbs.h:407
 msgid "Sets the size of the thumbnail shown in the Open dialog."
 msgstr "è¨å®?é??å??å°?è©±ç??ä¹?ä¸é ?è¦½å??ç??å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:417
-msgid "The thumbnail in the Open dialog will be automatically updated if the file being previewed is smaller than the size set here."
-msgstr "å¦?æ??æº?å??é ?è¦½ç??å??ç??å¤§å°?ä½?æ?¼æ?¬è¨å®?ï¼?ã??é??å??å??ç??ã??å°?è©±ç??ä¸ç??ç¸®å??æ??è?ªå??æ?´æ?°ã??"
+#: ../app/config/gimprc-blurbs.h:410
+msgid ""
+"The thumbnail in the Open dialog will be automatically updated if the file "
+"being previewed is smaller than the size set here."
+msgstr ""
+"å¦?æ??æº?å??é ?è¦½ç??å??ç??å¤§å°?ä½?æ?¼æ?¬è¨å®?ï¼?ã??é??å??å??ç??ã??å°?è©±ç??ä¸ç??ç¸®å??æ??è?ªå??æ?´æ?°ã??"
 
-#: ../app/config/gimprc-blurbs.h:421
-msgid "When the amount of pixel data exceeds this limit, GIMP will start to swap tiles to disk.  This is a lot slower but it makes it possible to work on images that wouldn't fit into memory otherwise.  If you have a lot of RAM, you may want to set this to a higher value."
-msgstr "ç?¶å??ç´ è³?æ??ç??ç¸½æ?¸è¶?é??é??å??é??å?¶æ??ï¼?GIMP æ??é??å§?å°?è³?æ??æ?«å?æ?¼ç£?ç¢?ä¸ã??é??æ¨£æ??è®?å®?è®?å¾?æ¯?è¼?æ?¢ï¼?ä½?ä¹?è®?æ??å??å?¯ä»¥è??ç??ç?¡æ³?å®?å?¨è¼?å?¥è¨?æ?¶é«?ä¸ç??å¤§å??å??ç??ã??å¦?æ??æ?¨æ??å¾?å¤?è¨?æ?¶é«?(RAM)ï¼?æ?¨å?¯è?½æ??æ??é??å??é?¸é ?è¨ç?ºæ¯?è¼?é«?ç??æ?¸å?¼ã??"
+#: ../app/config/gimprc-blurbs.h:414
+msgid ""
+"When the amount of pixel data exceeds this limit, GIMP will start to swap "
+"tiles to disk.  This is a lot slower but it makes it possible to work on "
+"images that wouldn't fit into memory otherwise.  If you have a lot of RAM, "
+"you may want to set this to a higher value."
+msgstr ""
+"ç?¶å??ç´ è³?æ??ç??ç¸½æ?¸è¶?é??é??å??é??å?¶æ??ï¼?GIMP æ??é??å§?å°?è³?æ??æ?«å?æ?¼ç£?ç¢?ä¸ã??é??æ¨£æ??è®?å®?è®?å¾?"
+"æ¯?è¼?æ?¢ï¼?ä½?ä¹?è®?æ??å??å?¯ä»¥è??ç??ç?¡æ³?å®?å?¨è¼?å?¥è¨?æ?¶é«?ä¸ç??å¤§å??å??ç??ã??å¦?æ??æ?¨æ??å¾?å¤?è¨?æ?¶é«?"
+"(RAM)ï¼?æ?¨å?¯è?½æ??æ??é??å??é?¸é ?è¨ç?ºæ¯?è¼?é«?ç??æ?¸å?¼ã??"
 
-#: ../app/config/gimprc-blurbs.h:427
+#: ../app/config/gimprc-blurbs.h:420
 msgid "Show the current foreground and background colors in the toolbox."
 msgstr "é¡¯ç¤ºå·¥å?·ç®±ä¸ç?®å??ç??å??æ?¯å??è??æ?¯é¡?è?²"
 
-#: ../app/config/gimprc-blurbs.h:430
+#: ../app/config/gimprc-blurbs.h:423
 msgid "Show the currently selected brush, pattern and gradient in the toolbox."
 msgstr "é¡¯ç¤ºç?®å??å?¨å·¥å?·ç®±ä¸é?¸å??ç??ç?å?·ã??å??æ¨£å??æ¼¸å±¤ã??"
 
-#: ../app/config/gimprc-blurbs.h:433
+#: ../app/config/gimprc-blurbs.h:426
 msgid "Show the currently active image in the toolbox."
 msgstr "é¡¯ç¤ºå·¥å?·ç®±ä¸ç?®å??ä½¿ç?¨ç??å??ç??ã??"
 
-#: ../app/config/gimprc-blurbs.h:439
+#: ../app/config/gimprc-blurbs.h:432
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "æ??å®?é¡¯ç¤ºå??ç??æ??é??æ??åº¦ç??è¡¨ç¤ºæ?¹å¼?ã??"
 
-#: ../app/config/gimprc-blurbs.h:442
+#: ../app/config/gimprc-blurbs.h:435
 msgid "Sets the size of the checkerboard used to display transparency."
 msgstr "ä»¥æ£?ç?¤æ ¼ä»£è¡¨é??æ??åº¦æ??ï¼?æ??å®?æ£?ç?¤æ ¼ç??å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:445
-msgid "When enabled, GIMP will not save an image if it has not been changed since it was opened."
+#: ../app/config/gimprc-blurbs.h:438
+msgid ""
+"When enabled, GIMP will not save an image if it has not been changed since "
+"it was opened."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?GIMP ä¸?æ??å?²å?æ²?æ??ä¿®æ?¹ç??å??ç??ã??"
 
-#: ../app/config/gimprc-blurbs.h:449
-msgid "Sets the minimal number of operations that can be undone. More undo levels are kept available until the undo-size limit is reached."
-msgstr "æ??å®?å?¯ä»¥é??å??ç??æ??ä½?ç¨?åº?æ¬¡æ?¸ä¸?é??ã??è?³æ?¼é¡?å¤?å?¯é??å??ç??æ??ä½?ç¨?åº?ï¼?æ??ä¿?ç??è?³ç?¨ç?¡æ??å®?ç??è¨?æ?¶é«?æ?¸ç?®ç?ºæ¢ã??"
+#: ../app/config/gimprc-blurbs.h:442
+msgid ""
+"Sets the minimal number of operations that can be undone. More undo levels "
+"are kept available until the undo-size limit is reached."
+msgstr ""
+"æ??å®?å?¯ä»¥é??å??ç??æ??ä½?ç¨?åº?æ¬¡æ?¸ä¸?é??ã??è?³æ?¼é¡?å¤?å?¯é??å??ç??æ??ä½?ç¨?åº?ï¼?æ??ä¿?ç??è?³ç?¨ç?¡æ??å®?ç??"
+"è¨?æ?¶é«?æ?¸ç?®ç?ºæ¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:453
-msgid "Sets an upper limit to the memory that is used per image to keep operations on the undo stack. Regardless of this setting, at least as many undo-levels as configured can be undone."
-msgstr "æ¯?å¹?å??ç??é?½æ??å°?æ?¾ç¶?ä½¿ç?¨æ??ä½?ç¨?åº?ä¿?ç??å?¨è¨?æ?¶ä¸ï¼?ä»¥å??å°?ä¾?å¾©å??æ??ä½¿ç?¨ï¼?é??è£¡æ??å®?æ¯?å¹?å??ç??å??å?¥ä½?ç?¨ç??è¨?æ?¶é«?ä¸?é??ã??ä½?ç?¡è«?æ?¬è¨å®?ç?ºä½?å?¼ï¼?å¾©å??æ¬¡æ?¸ç??è¨å®?æ??å?ªå??è??æ?®ã??"
+#: ../app/config/gimprc-blurbs.h:446
+msgid ""
+"Sets an upper limit to the memory that is used per image to keep operations "
+"on the undo stack. Regardless of this setting, at least as many undo-levels "
+"as configured can be undone."
+msgstr ""
+"æ¯?å¹?å??ç??é?½æ??å°?æ?¾ç¶?ä½¿ç?¨æ??ä½?ç¨?åº?ä¿?ç??å?¨è¨?æ?¶ä¸ï¼?ä»¥å??å°?ä¾?å¾©å??æ??ä½¿ç?¨ï¼?é??è£¡æ??å®?æ¯?å¹?"
+"å??ç??å??å?¥ä½?ç?¨ç??è¨?æ?¶é«?ä¸?é??ã??ä½?ç?¡è«?æ?¬è¨å®?ç?ºä½?å?¼ï¼?å¾©å??æ¬¡æ?¸ç??è¨å®?æ??å?ªå??è??æ?®ã??"
 
-#: ../app/config/gimprc-blurbs.h:458
+#: ../app/config/gimprc-blurbs.h:451
 msgid "Sets the size of the previews in the Undo History."
 msgstr "è¨ç½®å¾©å??è¨?é??ä¸é ?è¦½å??ç??å°ºå¯¸ã??"
 
-#: ../app/config/gimprc-blurbs.h:461
+#: ../app/config/gimprc-blurbs.h:454
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "å¦?å??ç?¨æ?¬é?¸é ?ï¼?æ?? F1 æ??é¡¯ç¤ºèªªæ??æ??ä»¶ç??è¦½å?¨ã??"
 
-#: ../app/config/gimprc-deserialize.c:134
-#: ../app/core/gimp-modules.c:133
-#: ../app/core/gimp-units.c:163
-#: ../app/gui/session.c:243
+#: ../app/config/gimprc-deserialize.c:134 ../app/core/gimp-modules.c:133
+#: ../app/core/gimp-units.c:163 ../app/gui/session.c:243
 #: ../app/plug-in/plug-in-rc.c:212
 msgid "fatal parse error"
 msgstr "å??æ??æ??å?ºç?¾å?´é??é?¯èª¤"
@@ -6379,7 +6502,7 @@ msgstr "å??ç??"
 #: ../app/core/core-enums.c:218
 msgctxt "align-reference-type"
 msgid "Selection"
-msgstr "é?¸æ??å??å??"
+msgstr "é?¸å??å??å??"
 
 #: ../app/core/core-enums.c:219
 msgctxt "align-reference-type"
@@ -6646,498 +6769,477 @@ msgctxt "view-type"
 msgid "View as grid"
 msgstr "ä»¥æ ¼å?æ?¹å¼?é¡¯ç¤º"
 
-#: ../app/core/core-enums.c:687
+#: ../app/core/core-enums.c:654
 msgctxt "thumbnail-size"
 msgid "No thumbnails"
 msgstr "æ²?æ??ç¸®å??"
 
-#: ../app/core/core-enums.c:688
+#: ../app/core/core-enums.c:655
 msgctxt "thumbnail-size"
 msgid "Normal (128x128)"
 msgstr "ä¸?è?¬ (128x128)"
 
-#: ../app/core/core-enums.c:689
+#: ../app/core/core-enums.c:656
 msgctxt "thumbnail-size"
 msgid "Large (256x256)"
 msgstr "å¤§ (256x256)"
 
-#: ../app/core/core-enums.c:866
+#: ../app/core/core-enums.c:833
 msgctxt "undo-type"
 msgid "<<invalid>>"
 msgstr "<<ç?¡æ??>>"
 
-#: ../app/core/core-enums.c:867
+#: ../app/core/core-enums.c:834
 msgctxt "undo-type"
 msgid "Scale image"
 msgstr "ç¸®æ?¾å??ç??"
 
-#: ../app/core/core-enums.c:868
+#: ../app/core/core-enums.c:835
 msgctxt "undo-type"
 msgid "Resize image"
 msgstr "èª¿æ?´å??ç??å¤§å°?"
 
-#: ../app/core/core-enums.c:869
+#: ../app/core/core-enums.c:836
 msgctxt "undo-type"
 msgid "Flip image"
 msgstr "ç¿»è½?å??ç??"
 
-#: ../app/core/core-enums.c:870
+#: ../app/core/core-enums.c:837
 msgctxt "undo-type"
 msgid "Rotate image"
 msgstr "æ??è½?å??ç??"
 
-#: ../app/core/core-enums.c:871
+#: ../app/core/core-enums.c:838
 msgctxt "undo-type"
 msgid "Crop image"
 msgstr "è£?å?ªå??ç??"
 
-#: ../app/core/core-enums.c:872
+#: ../app/core/core-enums.c:839
 msgctxt "undo-type"
 msgid "Convert image"
 msgstr "è½?æ??å??ç??æ ¼å¼?"
 
-#: ../app/core/core-enums.c:873
+#: ../app/core/core-enums.c:840
 msgctxt "undo-type"
 msgid "Remove item"
 msgstr "ç§»é?¤é ?ç?®"
 
-#: ../app/core/core-enums.c:874
+#: ../app/core/core-enums.c:841
 msgctxt "undo-type"
 msgid "Merge layers"
 msgstr "å??ä½µå??å±¤"
 
-#: ../app/core/core-enums.c:875
+#: ../app/core/core-enums.c:842
 msgctxt "undo-type"
 msgid "Merge paths"
 msgstr "å??ä½µè·¯å¾?"
 
-#: ../app/core/core-enums.c:876
+#: ../app/core/core-enums.c:843
 msgctxt "undo-type"
 msgid "Quick Mask"
 msgstr "å¿«é??é?®ç½©"
 
-#: ../app/core/core-enums.c:877
-#: ../app/core/core-enums.c:907
+#: ../app/core/core-enums.c:844 ../app/core/core-enums.c:874
 #: ../app/core/gimpimage-grid.c:63
 msgctxt "undo-type"
 msgid "Grid"
 msgstr "æ ¼ç·?"
 
-#: ../app/core/core-enums.c:878
-#: ../app/core/core-enums.c:909
+#: ../app/core/core-enums.c:845 ../app/core/core-enums.c:876
 msgctxt "undo-type"
 msgid "Guide"
 msgstr "å??è??ç·?"
 
-#: ../app/core/core-enums.c:879
-#: ../app/core/core-enums.c:910
+#: ../app/core/core-enums.c:846 ../app/core/core-enums.c:877
 msgctxt "undo-type"
 msgid "Sample Point"
 msgstr "å??æ¨£é»?"
 
-#: ../app/core/core-enums.c:880
-#: ../app/core/core-enums.c:911
+#: ../app/core/core-enums.c:847 ../app/core/core-enums.c:878
 msgctxt "undo-type"
 msgid "Layer/Channel"
 msgstr "å??å±¤/è?²ç??"
 
-#: ../app/core/core-enums.c:881
-#: ../app/core/core-enums.c:912
+#: ../app/core/core-enums.c:848 ../app/core/core-enums.c:879
 msgctxt "undo-type"
 msgid "Layer/Channel modification"
 msgstr "å??å±¤/è?²ç??ä¿®æ?¹"
 
-#: ../app/core/core-enums.c:882
-#: ../app/core/core-enums.c:913
+#: ../app/core/core-enums.c:849 ../app/core/core-enums.c:880
 msgctxt "undo-type"
 msgid "Selection mask"
-msgstr "é?¸æ??å??å??é?®ç½©"
+msgstr "é?¸å??å??å??é?®ç½©"
 
-#: ../app/core/core-enums.c:883
-#: ../app/core/core-enums.c:917
+#: ../app/core/core-enums.c:850 ../app/core/core-enums.c:884
 msgctxt "undo-type"
 msgid "Item visibility"
 msgstr "é ?ç?®å?¯è¦?æ?§"
 
-#: ../app/core/core-enums.c:884
-#: ../app/core/core-enums.c:918
+#: ../app/core/core-enums.c:851 ../app/core/core-enums.c:885
 msgctxt "undo-type"
 msgid "Link/Unlink item"
 msgstr "é?£çµ?/å??æ¶?é?£çµ?é ?ç?®"
 
-#: ../app/core/core-enums.c:885
+#: ../app/core/core-enums.c:852
 msgctxt "undo-type"
 msgid "Item properties"
 msgstr "é ?ç?®å±¬æ?§"
 
-#: ../app/core/core-enums.c:886
-#: ../app/core/core-enums.c:916
+#: ../app/core/core-enums.c:853 ../app/core/core-enums.c:883
 msgctxt "undo-type"
 msgid "Move item"
 msgstr "ç§»å??é ?ç?®"
 
-#: ../app/core/core-enums.c:887
+#: ../app/core/core-enums.c:854
 msgctxt "undo-type"
 msgid "Scale item"
 msgstr "ç¸®æ?¾é ?ç?®"
 
-#: ../app/core/core-enums.c:888
+#: ../app/core/core-enums.c:855
 msgctxt "undo-type"
 msgid "Resize item"
 msgstr "èª¿æ?´é ?ç?®å¤§å°?"
 
-#: ../app/core/core-enums.c:889
+#: ../app/core/core-enums.c:856
 msgctxt "undo-type"
 msgid "Add layer"
 msgstr "å? å?¥å??å±¤"
 
-#: ../app/core/core-enums.c:890
-#: ../app/core/core-enums.c:929
+#: ../app/core/core-enums.c:857 ../app/core/core-enums.c:896
 msgctxt "undo-type"
 msgid "Add layer mask"
 msgstr "å? å?¥å??å±¤é?®ç½©"
 
-#: ../app/core/core-enums.c:891
-#: ../app/core/core-enums.c:931
+#: ../app/core/core-enums.c:858 ../app/core/core-enums.c:898
 msgctxt "undo-type"
 msgid "Apply layer mask"
 msgstr "å¥?ç?¨å??å±¤é?®ç½©"
 
-#: ../app/core/core-enums.c:892
-#: ../app/core/core-enums.c:939
+#: ../app/core/core-enums.c:859 ../app/core/core-enums.c:906
 msgctxt "undo-type"
 msgid "Floating selection to layer"
 msgstr "æµ®å??é?¸å??å??å??è½?æ??ç?ºå??å±¤"
 
-#: ../app/core/core-enums.c:893
+#: ../app/core/core-enums.c:860
 msgctxt "undo-type"
 msgid "Float selection"
 msgstr "æµ®å??é?¸å??å??å??"
 
-#: ../app/core/core-enums.c:894
+#: ../app/core/core-enums.c:861
 msgctxt "undo-type"
 msgid "Anchor floating selection"
 msgstr "å?ºå®?æµ®å??ç??é?¸å??å??å??"
 
-#: ../app/core/core-enums.c:895
-#: ../app/core/gimp-edit.c:262
+#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:262
 msgctxt "undo-type"
 msgid "Paste"
 msgstr "è²¼ä¸?"
 
-#: ../app/core/core-enums.c:896
-#: ../app/core/gimp-edit.c:501
+#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:501
 msgctxt "undo-type"
 msgid "Cut"
 msgstr "å?ªä¸?"
 
-#: ../app/core/core-enums.c:897
+#: ../app/core/core-enums.c:864
 msgctxt "undo-type"
 msgid "Text"
 msgstr "æ??å?"
 
-#: ../app/core/core-enums.c:898
-#: ../app/core/core-enums.c:940
+#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:907
 #: ../app/core/gimpdrawable-transform.c:567
 msgctxt "undo-type"
 msgid "Transform"
 msgstr "è®?æ??"
 
-#: ../app/core/core-enums.c:899
-#: ../app/core/core-enums.c:941
+#: ../app/core/core-enums.c:866 ../app/core/core-enums.c:908
 msgctxt "undo-type"
 msgid "Paint"
 msgstr "ç¹ªç?«"
 
-#: ../app/core/core-enums.c:900
-#: ../app/core/core-enums.c:944
+#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:911
 msgctxt "undo-type"
 msgid "Attach parasite"
 msgstr "é??å¸¶è³?è¨?"
 
-#: ../app/core/core-enums.c:901
-#: ../app/core/core-enums.c:945
+#: ../app/core/core-enums.c:868 ../app/core/core-enums.c:912
 msgctxt "undo-type"
 msgid "Remove parasite"
 msgstr "ç§»é?¤é??å¸¶è³?è¨?"
 
-#: ../app/core/core-enums.c:902
+#: ../app/core/core-enums.c:869
 msgctxt "undo-type"
 msgid "Import paths"
 msgstr "å?¯å?¥è·¯å¾?"
 
-#: ../app/core/core-enums.c:903
+#: ../app/core/core-enums.c:870
 msgctxt "undo-type"
 msgid "Plug-In"
 msgstr "å¤?æ??ç¨?å¼?"
 
-#: ../app/core/core-enums.c:904
+#: ../app/core/core-enums.c:871
 msgctxt "undo-type"
 msgid "Image type"
 msgstr "å??ç??é¡?å??"
 
-#: ../app/core/core-enums.c:905
+#: ../app/core/core-enums.c:872
 msgctxt "undo-type"
 msgid "Image size"
 msgstr "å??ç??å¤§å°?"
 
-#: ../app/core/core-enums.c:906
+#: ../app/core/core-enums.c:873
 msgctxt "undo-type"
 msgid "Image resolution change"
 msgstr "å??ç??è§£æ??åº¦æ?¹è®?"
 
-#: ../app/core/core-enums.c:908
+#: ../app/core/core-enums.c:875
 msgctxt "undo-type"
 msgid "Change indexed palette"
 msgstr "æ?´æ?¹ç´¢å¼?è?²èª¿è?²ç?¤"
 
-#: ../app/core/core-enums.c:914
+#: ../app/core/core-enums.c:881
 msgctxt "undo-type"
 msgid "Reorder item"
 msgstr "é??æ?°ç·¨æ??é ?ç?®æ¬¡åº?"
 
-#: ../app/core/core-enums.c:915
+#: ../app/core/core-enums.c:882
 msgctxt "undo-type"
 msgid "Rename item"
 msgstr "æ?´æ?¹é ?ç?®å??ç¨±"
 
-#: ../app/core/core-enums.c:919
+#: ../app/core/core-enums.c:886
 msgctxt "undo-type"
 msgid "New layer"
 msgstr "æ?°å¢?å??å±¤"
 
-#: ../app/core/core-enums.c:920
+#: ../app/core/core-enums.c:887
 msgctxt "undo-type"
 msgid "Delete layer"
 msgstr "å?ªé?¤å??å±¤"
 
-#: ../app/core/core-enums.c:921
+#: ../app/core/core-enums.c:888
 msgctxt "undo-type"
 msgid "Set layer mode"
 msgstr "è¨å®?å??å±¤æ¨¡å¼?"
 
-#: ../app/core/core-enums.c:922
+#: ../app/core/core-enums.c:889
 msgctxt "undo-type"
 msgid "Set layer opacity"
 msgstr "è¨å®?å??å±¤ä¸?é??æ??åº¦"
 
-#: ../app/core/core-enums.c:923
+#: ../app/core/core-enums.c:890
 msgctxt "undo-type"
 msgid "Lock/Unlock alpha channel"
 msgstr "é??å®?/è§£é??é??æ??è?²ç??"
 
-#: ../app/core/core-enums.c:924
+#: ../app/core/core-enums.c:891
 msgctxt "undo-type"
 msgid "Suspend group layer resize"
 msgstr "æ?«å??å??å±¤ç¾¤çµ?å°ºå¯¸èª¿æ?´"
 
-#: ../app/core/core-enums.c:925
+#: ../app/core/core-enums.c:892
 msgctxt "undo-type"
 msgid "Resume group layer resize"
 msgstr "æ?¢å¾©å??å±¤ç¾¤çµ?å°ºå¯¸èª¿æ?´"
 
-#: ../app/core/core-enums.c:926
+#: ../app/core/core-enums.c:893
 msgctxt "undo-type"
 msgid "Convert group layer"
 msgstr "è½?æ??å??å±¤ç¾¤çµ?"
 
-#: ../app/core/core-enums.c:927
+#: ../app/core/core-enums.c:894
 msgctxt "undo-type"
 msgid "Text layer"
 msgstr "æ??å?å??å±¤"
 
-#: ../app/core/core-enums.c:928
+#: ../app/core/core-enums.c:895
 msgctxt "undo-type"
 msgid "Text layer modification"
 msgstr "æ??å?å??å±¤ä¿®æ?¹"
 
-#: ../app/core/core-enums.c:930
+#: ../app/core/core-enums.c:897
 msgctxt "undo-type"
 msgid "Delete layer mask"
 msgstr "å?ªé?¤å??å±¤é?®ç½©"
 
-#: ../app/core/core-enums.c:932
+#: ../app/core/core-enums.c:899
 msgctxt "undo-type"
 msgid "Show layer mask"
 msgstr "é¡¯ç¤ºå??å±¤é?®ç½©"
 
-#: ../app/core/core-enums.c:933
+#: ../app/core/core-enums.c:900
 msgctxt "undo-type"
 msgid "New channel"
 msgstr "æ?°å¢?è?²ç??"
 
-#: ../app/core/core-enums.c:934
+#: ../app/core/core-enums.c:901
 msgctxt "undo-type"
 msgid "Delete channel"
 msgstr "å?ªé?¤è?²ç??"
 
-#: ../app/core/core-enums.c:935
+#: ../app/core/core-enums.c:902
 msgctxt "undo-type"
 msgid "Channel color"
 msgstr "è?²ç??é¡?è?²"
 
-#: ../app/core/core-enums.c:936
+#: ../app/core/core-enums.c:903
 msgctxt "undo-type"
 msgid "New path"
 msgstr "æ?°å¢?è·¯å¾?"
 
-#: ../app/core/core-enums.c:937
+#: ../app/core/core-enums.c:904
 msgctxt "undo-type"
 msgid "Delete path"
 msgstr "å?ªé?¤è·¯å¾?"
 
-#: ../app/core/core-enums.c:938
+#: ../app/core/core-enums.c:905
 msgctxt "undo-type"
 msgid "Path modification"
 msgstr "è·¯å¾?ä¿®æ?¹"
 
-#: ../app/core/core-enums.c:942
+#: ../app/core/core-enums.c:909
 msgctxt "undo-type"
 msgid "Ink"
 msgstr "å¢¨æ°´ç?"
 
-#: ../app/core/core-enums.c:943
+#: ../app/core/core-enums.c:910
 msgctxt "undo-type"
 msgid "Select foreground"
 msgstr "é?¸å??å??æ?¯"
 
-#: ../app/core/core-enums.c:946
+#: ../app/core/core-enums.c:913
 msgctxt "undo-type"
 msgid "Not undoable"
 msgstr "ç?¡æ³?å¾©å??"
 
-#: ../app/core/core-enums.c:1218
+#: ../app/core/core-enums.c:1185
 msgctxt "select-criterion"
 msgid "Composite"
 msgstr "çµ?å??"
 
-#: ../app/core/core-enums.c:1219
+#: ../app/core/core-enums.c:1186
 msgctxt "select-criterion"
 msgid "Red"
 msgstr "ç´?"
 
-#: ../app/core/core-enums.c:1220
+#: ../app/core/core-enums.c:1187
 msgctxt "select-criterion"
 msgid "Green"
 msgstr "ç¶ "
 
-#: ../app/core/core-enums.c:1221
+#: ../app/core/core-enums.c:1188
 msgctxt "select-criterion"
 msgid "Blue"
 msgstr "è??"
 
-#: ../app/core/core-enums.c:1222
+#: ../app/core/core-enums.c:1189
 msgctxt "select-criterion"
 msgid "Hue"
 msgstr "è?²ç?¸"
 
-#: ../app/core/core-enums.c:1223
+#: ../app/core/core-enums.c:1190
 msgctxt "select-criterion"
 msgid "Saturation"
 msgstr "é£½å??åº¦"
 
-#: ../app/core/core-enums.c:1224
+#: ../app/core/core-enums.c:1191
 msgctxt "select-criterion"
 msgid "Value"
 msgstr "äº®åº¦"
 
-#: ../app/core/core-enums.c:1253
+#: ../app/core/core-enums.c:1220
 msgctxt "message-severity"
 msgid "Message"
 msgstr "è¨?æ?¯"
 
-#: ../app/core/core-enums.c:1254
+#: ../app/core/core-enums.c:1221
 msgctxt "message-severity"
 msgid "Warning"
 msgstr "è¦å??"
 
-#: ../app/core/core-enums.c:1255
+#: ../app/core/core-enums.c:1222
 msgctxt "message-severity"
 msgid "Error"
 msgstr "é?¯èª¤"
 
-#: ../app/core/core-enums.c:1284
+#: ../app/core/core-enums.c:1251
 msgctxt "color-profile-policy"
 msgid "Ask what to do"
 msgstr "è©¢å??è¦?å??ä»?éº¼"
 
-#: ../app/core/core-enums.c:1285
+#: ../app/core/core-enums.c:1252
 msgctxt "color-profile-policy"
 msgid "Keep embedded profile"
 msgstr "ä¿?ç??åµ?å?¥ç??é??ç½®æª?"
 
-#: ../app/core/core-enums.c:1286
+#: ../app/core/core-enums.c:1253
 msgctxt "color-profile-policy"
 msgid "Convert to RGB workspace"
 msgstr "è½?æ??å?° RGB å·¥ä½?ç©ºé??"
 
-#: ../app/core/core-enums.c:1323
+#: ../app/core/core-enums.c:1290
 msgctxt "dynamics-output-type"
 msgid "Opacity"
 msgstr "ä¸?é??æ??åº¦"
 
-#: ../app/core/core-enums.c:1324
+#: ../app/core/core-enums.c:1291
 msgctxt "dynamics-output-type"
 msgid "Size"
 msgstr "å¤§å°?"
 
-#: ../app/core/core-enums.c:1325
+#: ../app/core/core-enums.c:1292
 msgctxt "dynamics-output-type"
 msgid "Angle"
 msgstr "è§?åº¦"
 
-#: ../app/core/core-enums.c:1326
+#: ../app/core/core-enums.c:1293
 msgctxt "dynamics-output-type"
 msgid "Color"
 msgstr "é¡?è?²"
 
-#: ../app/core/core-enums.c:1327
+#: ../app/core/core-enums.c:1294
 msgctxt "dynamics-output-type"
 msgid "Hardness"
 msgstr "ç¡¬åº¦"
 
-#: ../app/core/core-enums.c:1328
+#: ../app/core/core-enums.c:1295
 msgctxt "dynamics-output-type"
 msgid "Force"
 msgstr "å??é??"
 
-#: ../app/core/core-enums.c:1329
+#: ../app/core/core-enums.c:1296
 msgctxt "dynamics-output-type"
 msgid "Aspect ratio"
 msgstr "é?·å¯¬æ¯?"
 
-#: ../app/core/core-enums.c:1330
+#: ../app/core/core-enums.c:1297
 msgctxt "dynamics-output-type"
 msgid "Spacing"
 msgstr "é??é??"
 
-#: ../app/core/core-enums.c:1331
+#: ../app/core/core-enums.c:1298
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Rate"
 msgstr "Rate"
 
-#: ../app/core/core-enums.c:1332
+#: ../app/core/core-enums.c:1299
 msgctxt "dynamics-output-type"
 msgid "Flow"
 msgstr "æµ?å??"
 
-#: ../app/core/core-enums.c:1333
+#: ../app/core/core-enums.c:1300
 msgctxt "dynamics-output-type"
 msgid "Jitter"
 msgstr "æ??å??"
 
-#: ../app/core/gimp-contexts.c:154
-#: ../app/core/gimptooloptions.c:344
-#: ../app/gui/session.c:349
-#: ../app/menus/menus.c:464
-#: ../app/widgets/gimpdevices.c:269
+#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:344
+#: ../app/gui/session.c:349 ../app/menus/menus.c:464
+#: ../app/widgets/gimpdevices.c:270
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
 msgstr "å?ªé?¤â??%sâ??å¤±æ??ï¼?%s"
 
-#: ../app/core/gimp-edit.c:190
-#: ../app/core/gimpimage-new.c:304
+#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:304
 msgid "Pasted Layer"
 msgstr "è²¼ä¸?ç??å??å±¤"
 
@@ -7196,6 +7298,12 @@ msgstr "å??æ?¯è?²è?³è??æ?¯è?²(HSV é ?æ??é??è?²ç?¸)"
 msgid "FG to Transparent"
 msgstr "å??æ?¯è?²è?³é??æ??"
 
+#. This is a special string to specify the language identifier to
+#. * look for in the gimp-tags-default.xml file. Please translate the
+#. * C in it according to the name of the po file used for
+#. * gimp-tags-default.xml. E.g. lithuanian for the translation,
+#. * that would be "tags-locale:lt".
+#.
 #: ../app/core/gimp-tags.c:88
 #, fuzzy
 msgid "tags-locale:C"
@@ -7203,27 +7311,31 @@ msgstr "ç?®å??ç??å?°å??è¨å®?"
 
 #: ../app/core/gimp-user-install.c:154
 #, c-format
-msgid "It seems you have used GIMP %s before.  GIMP will now migrate your user settings to '%s'."
+msgid ""
+"It seems you have used GIMP %s before.  GIMP will now migrate your user "
+"settings to '%s'."
 msgstr "æ?¨ä¼¼ä¹?ä»¥å??æ?¾ä½¿ç?¨é?? GIMP %sã??GIMP ç?¾å?¨å°?æ??æ?¨ç??ä½¿ç?¨è??è¨å®?å?¼è½?ç§»ç?ºâ??%sâ??ã??"
 
 #: ../app/core/gimp-user-install.c:159
 #, c-format
-msgid "It appears that you are using GIMP for the first time.  GIMP will now create a folder named '%s' and copy some files to it."
-msgstr "é??ä¼¼ä¹?æ?¯æ?¨ç¬¬ä¸?æ¬¡ä½¿ç?¨ GIMPã??GIMP ç?¾å?¨å°?å»ºç«?ä¸?å??å??ç?ºâ??%sâ??ç??è³?æ??å¤¾ä¸¦è¤?è£½ä¸?äº?æª?æ¡?é?²å?»ã??"
+msgid ""
+"It appears that you are using GIMP for the first time.  GIMP will now create "
+"a folder named '%s' and copy some files to it."
+msgstr ""
+"é??ä¼¼ä¹?æ?¯æ?¨ç¬¬ä¸?æ¬¡ä½¿ç?¨ GIMPã??GIMP ç?¾å?¨å°?å»ºç«?ä¸?å??å??ç?ºâ??%sâ??ç??è³?æ??å¤¾ä¸¦è¤?è£½ä¸?äº?æª?æ¡?"
+"é?²å?»ã??"
 
 #: ../app/core/gimp-user-install.c:311
 #, c-format
 msgid "Copying file '%s' from '%s'..."
 msgstr "å¾?â??%2$sâ??è¤?è£½æª?æ¡?â??%1$sâ??..."
 
-#: ../app/core/gimp-user-install.c:326
-#: ../app/core/gimp-user-install.c:352
+#: ../app/core/gimp-user-install.c:326 ../app/core/gimp-user-install.c:352
 #, c-format
 msgid "Creating folder '%s'..."
 msgstr "å»ºç«?ç?®é??â??%sâ??..."
 
-#: ../app/core/gimp-user-install.c:337
-#: ../app/core/gimp-user-install.c:363
+#: ../app/core/gimp-user-install.c:337 ../app/core/gimp-user-install.c:363
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "ç?¡æ³?å»ºç«?ç?®é??â??%sâ??ï¼?%s"
@@ -7232,10 +7344,12 @@ msgstr "ç?¡æ³?å»ºç«?ç?®é??â??%sâ??ï¼?%s"
 msgid "Initialization"
 msgstr "å??å§?å??"
 
+#. register all internal procedures
 #: ../app/core/gimp.c:698
 msgid "Internal Procedures"
 msgstr "å?§é?¨ç¨?åº?"
 
+#. initialize  the global parasite table
 #: ../app/core/gimp.c:949
 msgid "Looking for data files"
 msgstr "æ£å?¨å°?æ?¾è³?æ??æª?"
@@ -7244,20 +7358,23 @@ msgstr "æ£å?¨å°?æ?¾è³?æ??æª?"
 msgid "Parasites"
 msgstr "é??å¸¶è³?è¨?"
 
-#: ../app/core/gimp.c:958
-#: ../app/dialogs/preferences-dialog.c:2724
+#. initialize the list of gimp dynamics
+#: ../app/core/gimp.c:958 ../app/dialogs/preferences-dialog.c:2722
+#: ../app/tools/gimppaintoptions-gui.c:159
 msgid "Dynamics"
 msgstr "ç?å?·å??æ??"
 
+#. initialize the list of fonts
 #: ../app/core/gimp.c:978
 msgid "Fonts (this may take a while)"
 msgstr "å?å??ï¼?é??å?¯è?½æ??è?±é»?æ??é??ï¼?"
 
-#: ../app/core/gimp.c:992
-#: ../app/dialogs/preferences-dialog.c:2752
+#. initialize the module list
+#: ../app/core/gimp.c:992 ../app/dialogs/preferences-dialog.c:2750
 msgid "Modules"
 msgstr "æ¨¡çµ?"
 
+#. update tag cache
 #: ../app/core/gimp.c:996
 #, fuzzy
 msgid "Updating tag cache"
@@ -7293,22 +7410,19 @@ msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?è?²å½©æ·±åº¦æ?¸ç?® %d 
 msgid "Fatal parse error in brush file '%s': Unknown version %d."
 msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç??æ?¬ %d ä¸?æ??ã??"
 
-#: ../app/core/gimpbrush-load.c:269
-#: ../app/core/gimpbrush-load.c:389
+#: ../app/core/gimpbrush-load.c:269 ../app/core/gimpbrush-load.c:389
 #: ../app/core/gimpbrush-load.c:722
 #, c-format
 msgid "Fatal parse error in brush file '%s': File appears truncated."
 msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?æª?æ¡?ä¼¼ä¹?è¢«æ?ªç?äº?ã??"
 
-#: ../app/core/gimpbrush-load.c:277
-#: ../app/core/gimpbrushgenerated-load.c:128
+#: ../app/core/gimpbrush-load.c:277 ../app/core/gimpbrushgenerated-load.c:128
 #: ../app/core/gimpbrushpipe-load.c:97
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "ç?å?·æª?æ¡? â??%sâ?? ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²ã??"
 
-#: ../app/core/gimpbrush-load.c:284
-#: ../app/core/gimppattern-load.c:146
+#: ../app/core/gimpbrush-load.c:284 ../app/core/gimppattern-load.c:146
 #: ../app/dialogs/template-options-dialog.c:82
 #: ../app/tools/gimpvectortool.c:319
 msgid "Unnamed"
@@ -7325,7 +7439,8 @@ msgstr ""
 
 #: ../app/core/gimpbrush-load.c:450
 #, c-format
-msgid "Fatal parse error in brush file '%s': unable to decode abr format version %d."
+msgid ""
+"Fatal parse error in brush file '%s': unable to decode abr format version %d."
 msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç??æ?¬ %d ä¸?æ??ã??"
 
 #: ../app/core/gimpbrush-load.c:617
@@ -7344,12 +7459,14 @@ msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?å®?ä¸?æ?¯ GIMP ç?å?·
 
 #: ../app/core/gimpbrushgenerated-load.c:104
 #, c-format
-msgid "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
+msgid ""
+"Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
 msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç¬¬ %d è¡?ç?? GIMP ç?å?·ç??æ?¬ä¸?æ??"
 
 #: ../app/core/gimpbrushgenerated-load.c:150
 #, c-format
-msgid "Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d."
+msgid ""
+"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d."
 msgstr "å??æ??ç?å?·æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç¬¬ %d è¡?ç?? GIMP ç?å?·å½¢ç??ä¸?æ??"
 
 #: ../app/core/gimpbrushgenerated-load.c:226
@@ -7384,18 +7501,15 @@ msgstr "ç·¨è¼¯é?·é??"
 msgid "Brush Hardness"
 msgstr "ç?å?·ç¡¬åº¦"
 
-#: ../app/core/gimpbrushgenerated.c:159
-#: ../app/paint/gimppaintoptions.c:143
+#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:143
 msgid "Brush Aspect Ratio"
 msgstr "ç?å?·é?·å¯¬æ¯?"
 
-#: ../app/core/gimpbrushgenerated.c:166
-#: ../app/paint/gimppaintoptions.c:147
+#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:147
 msgid "Brush Angle"
 msgstr "ç?å?·è§?åº¦"
 
-#: ../app/core/gimpbrushpipe-load.c:113
-#: ../app/core/gimpbrushpipe-load.c:133
+#: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133
 #: ../app/core/gimpbrushpipe-load.c:224
 #, c-format
 msgid "Fatal parse error in brush file '%s': File is corrupt."
@@ -7416,8 +7530,7 @@ msgctxt "undo-type"
 msgid "Rounded Rectangle Select"
 msgstr "å??è§?ç?©å½¢é?¸å??"
 
-#: ../app/core/gimpchannel-select.c:433
-#: ../app/core/gimplayer.c:273
+#: ../app/core/gimpchannel-select.c:433 ../app/core/gimplayer.c:273
 #, fuzzy
 msgctxt "undo-type"
 msgid "Alpha to Selection"
@@ -7427,7 +7540,7 @@ msgstr "å? å?¥è?³é?¸æ??å??å??"
 #, c-format
 msgctxt "undo-type"
 msgid "%s Channel to Selection"
-msgstr "%s è?²ç??è½?ç?ºé?¸æ??å??å??"
+msgstr "%s è?²ç??è½?ç?ºé?¸å??å??å??"
 
 #: ../app/core/gimpchannel-select.c:519
 msgctxt "undo-type"
@@ -7469,8 +7582,7 @@ msgctxt "undo-type"
 msgid "Rotate Channel"
 msgstr "æ??è½?è?²ç??"
 
-#: ../app/core/gimpchannel.c:278
-#: ../app/core/gimpdrawable-transform.c:845
+#: ../app/core/gimpchannel.c:278 ../app/core/gimpdrawable-transform.c:845
 msgctxt "undo-type"
 msgid "Transform Channel"
 msgstr "è®?æ??è?²ç??"
@@ -7480,8 +7592,7 @@ msgctxt "undo-type"
 msgid "Stroke Channel"
 msgstr "ä¾?è?²ç??æ??é??"
 
-#: ../app/core/gimpchannel.c:280
-#: ../app/core/gimpselection.c:584
+#: ../app/core/gimpchannel.c:280 ../app/core/gimpselection.c:584
 msgctxt "undo-type"
 msgid "Channel to Selection"
 msgstr "è?²ç??è½?ç?ºé?¸å??å??å??"
@@ -7573,30 +7684,26 @@ msgctxt "undo-type"
 msgid "Set Channel Opacity"
 msgstr "è¨å®?è?²ç??ä¸?é??æ??åº¦"
 
-#: ../app/core/gimpchannel.c:1926
-#: ../app/core/gimpselection.c:154
+#: ../app/core/gimpchannel.c:1926 ../app/core/gimpselection.c:154
 msgid "Selection Mask"
 msgstr "é?¸å??å??å??é?®ç½©"
 
-#: ../app/core/gimpcontext.c:640
+#: ../app/core/gimpcontext.c:640 ../app/tools/gimppaintoptions-gui.c:107
+#: ../app/tools/gimptransformoptions.c:332
 msgid "Opacity"
 msgstr "ä¸?é??æ??åº¦"
 
 #: ../app/core/gimpcontext.c:648
-#, fuzzy
 msgid "Paint Mode"
-msgstr "æ?·å¾?é?µæ¨¡å¼?"
+msgstr "ç?å?·æ¨¡å¼?"
 
-#: ../app/core/gimpdata.c:679
-#: ../app/core/gimptoolpresets.c:277
+#: ../app/core/gimpdata.c:679 ../app/core/gimptoolpresets.c:277
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "ç?¡æ³?å?ªé?¤â??%sâ??ï¼?%s"
 
-#: ../app/core/gimpdatafactory.c:427
-#: ../app/core/gimpdatafactory.c:456
-#: ../app/core/gimpdatafactory.c:622
-#: ../app/core/gimpdatafactory.c:644
+#: ../app/core/gimpdatafactory.c:427 ../app/core/gimpdatafactory.c:456
+#: ../app/core/gimpdatafactory.c:622 ../app/core/gimpdatafactory.c:644
 #, c-format
 msgid ""
 "Failed to save data:\n"
@@ -7607,28 +7714,35 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdatafactory.c:536
-#: ../app/core/gimpdatafactory.c:539
-#: ../app/core/gimpitem.c:425
-#: ../app/core/gimpitem.c:428
+#: ../app/core/gimpdatafactory.c:536 ../app/core/gimpdatafactory.c:539
+#: ../app/core/gimpitem.c:422 ../app/core/gimpitem.c:425
 msgid "copy"
 msgstr "è¤?æ?¬"
 
-#: ../app/core/gimpdatafactory.c:548
-#: ../app/core/gimpitem.c:437
+#: ../app/core/gimpdatafactory.c:548 ../app/core/gimpitem.c:434
 #, c-format
 msgid "%s copy"
 msgstr "%s è¤?æ?¬"
 
 #: ../app/core/gimpdatafactory.c:741
 #, c-format
-msgid "You have a writable data folder configured (%s), but this folder does not exist. Please create the folder or fix your configuation in the Preferences dialog's 'Folders' section."
+msgid ""
+"You have a writable data folder configured (%s), but this folder does not "
+"exist. Please create the folder or fix your configuation in the Preferences "
+"dialog's 'Folders' section."
 msgstr ""
+"æ?¨æ??ä¸?å?¯å¯«å?¥æ?¸æ??ç??è³?æ??å¤¾é??ç½®(%s)ï¼?ä½?é??å??è³?æ??å¤¾ä¸?å?å?¨ã??è«?å»ºç«?è³?æ??å¤¾æ??ä¿®æ£æ?¨å?¨"
+"ã??å??å¥½è¨å®?ã??å°?è©±ç??ä¸ã??è³?æ??å¤¾ã??é?¨ä»½ç??é??ç½®"
 
 #: ../app/core/gimpdatafactory.c:762
 #, c-format
-msgid "You have a writable data folder configured, but this folder is not part of your data search path. You probably edited the gimprc file manually, please fix it in the Preferences dialog's 'Folders' section."
+msgid ""
+"You have a writable data folder configured, but this folder is not part of "
+"your data search path. You probably edited the gimprc file manually, please "
+"fix it in the Preferences dialog's 'Folders' section."
 msgstr ""
+"æ?¨æ??ä¸?å??å?¯å¯«æ?¸æ??ç??è³?æ??å¤¾é??ç½®ï¼?ä½?é??å??è³?æ??å¤¾æ?¯ä¸?å±¬æ?¼ä½ ç??æ?¸æ??æ??ç´¢è·¯å¾?ã??ä½ å?¯è?½è¦?"
+"æ??å??ç·¨è¼¯ gimprc æª?æ¡?ï¼?è«?å?¨[å??å¥½è¨å®?]å°?è©±ç??ä¸ç??[è³?æ??å¤¾]é?¨ä»½ä¸ä¿®å¾©å®?ã??"
 
 #: ../app/core/gimpdatafactory.c:772
 #, c-format
@@ -7647,7 +7761,6 @@ msgstr ""
 "%s"
 
 #: ../app/core/gimpdrawable-blend.c:244
-#, fuzzy
 msgctxt "undo-type"
 msgid "Blend"
 msgstr "æ··è?²"
@@ -7684,8 +7797,7 @@ msgctxt "undo-type"
 msgid "Colorize"
 msgstr "è?²å½©å??"
 
-#: ../app/core/gimpdrawable-curves.c:162
-#: ../app/core/gimpdrawable-curves.c:179
+#: ../app/core/gimpdrawable-curves.c:162 ../app/core/gimpdrawable-curves.c:179
 msgctxt "undo-type"
 msgid "Curves"
 msgstr "æ?²ç·?"
@@ -7714,13 +7826,11 @@ msgstr "è?²ç?¸å??é£½å??åº¦"
 msgid "Hue_Saturation"
 msgstr "è?²ç?¸å??é£½å??åº¦(_S)"
 
-#: ../app/core/gimpdrawable-invert.c:54
-#: ../app/core/gimpdrawable-invert.c:62
+#: ../app/core/gimpdrawable-invert.c:54 ../app/core/gimpdrawable-invert.c:62
 msgid "Invert"
-msgstr "å??ç?¸"
+msgstr "è² ç??æ??æ??"
 
-#: ../app/core/gimpdrawable-levels.c:153
-#: ../app/core/gimpdrawable-levels.c:169
+#: ../app/core/gimpdrawable-levels.c:153 ../app/core/gimpdrawable-levels.c:169
 #: ../app/tools/gimplevelstool.c:150
 msgid "Levels"
 msgstr "è?²é??"
@@ -7732,19 +7842,25 @@ msgid "Offset Drawable"
 msgstr "æ?²å??å??ç§»"
 
 #: ../app/core/gimpdrawable-posterize.c:69
-#: ../app/core/gimpdrawable-posterize.c:79
-#: ../app/tools/gimpposterizetool.c:84
+#: ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84
 msgid "Posterize"
 msgstr "è?²èª¿å??é?¢"
 
-#: ../app/core/gimpdrawable-stroke.c:435
+#: ../app/core/gimpdrawable-stroke.c:327
+#: ../app/paint/gimppaintcore-stroke.c:336 ../app/vectors/gimpvectors.c:557
+msgid "Not enough points to stroke"
+msgstr "æ²?æ??è¶³å¤ ç??ç?å??é»?"
+
+#: ../app/core/gimpdrawable-stroke.c:455
 #, fuzzy
 msgctxt "undo-type"
 msgid "Render Stroke"
 msgstr "æº?å??æ??ç¹ªç??æ??å?"
 
 #: ../app/core/gimpdrawable-threshold.c:70
-#: ../app/core/gimpdrawable-threshold.c:81
+#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:274
+#: ../app/tools/gimpbucketfilloptions.c:284
+#: ../app/tools/gimpregionselectoptions.c:214
 #: ../app/tools/gimpthresholdtool.c:90
 msgid "Threshold"
 msgstr "è?¨ç??å?¼"
@@ -7759,8 +7875,7 @@ msgctxt "undo-type"
 msgid "Rotate"
 msgstr "æ??è½?"
 
-#: ../app/core/gimpdrawable-transform.c:843
-#: ../app/core/gimplayer.c:272
+#: ../app/core/gimpdrawable-transform.c:843 ../app/core/gimplayer.c:272
 #, fuzzy
 msgctxt "undo-type"
 msgid "Transform Layer"
@@ -7770,7 +7885,7 @@ msgstr "è¼?å?©é?µå±¤ç´?"
 msgid "Transformation"
 msgstr "è®?æ??"
 
-#: ../app/core/gimpdrawable.c:486
+#: ../app/core/gimpdrawable.c:483
 msgctxt "undo-type"
 msgid "Scale"
 msgstr "ç¸®æ?¾"
@@ -7779,10 +7894,8 @@ msgstr "ç¸®æ?¾"
 msgid "Output type"
 msgstr "è¼¸å?ºé¡?å??"
 
-#: ../app/core/gimpgradient-load.c:71
-#: ../app/core/gimpgradient-load.c:96
-#: ../app/core/gimpgradient-load.c:117
-#: ../app/core/gimpgradient-load.c:168
+#: ../app/core/gimpgradient-load.c:71 ../app/core/gimpgradient-load.c:96
+#: ../app/core/gimpgradient-load.c:117 ../app/core/gimpgradient-load.c:168
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Read error in line %d."
 msgstr "å??æ??æ¼¸å±¤æª?æ¡?â??%sâ??ç??å?§å®¹æ??å?ºç?¾å?´é??é?¯èª¤ï¼?è®?å?¥ç¬¬ %d è¡?æ??ç?¼ç??é?¯èª¤ã??"
@@ -7802,14 +7915,12 @@ msgstr "æ¼¸å±¤æª?æ¡?â??%sâ??ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²ã??"
 msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d."
 msgstr "å??æ??æ¼¸å±¤æª?æ¡? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?æª?æ¡?å?§å®¹ç¬¬ %d è¡?å·²æ??å£?ã??"
 
-#: ../app/core/gimpgradient-load.c:218
-#: ../app/core/gimpgradient-load.c:229
+#: ../app/core/gimpgradient-load.c:218 ../app/core/gimpgradient-load.c:229
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d."
 msgstr "å??æ??æ¼¸å±¤æª?æ¡? â??%1$sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç¬¬ %3$d è¡?ç??ç??æ®µ %2$d å·²æ??å£?ã??"
 
-#: ../app/core/gimpgradient-load.c:241
-#: ../app/core/gimpgradient-load.c:255
+#: ../app/core/gimpgradient-load.c:241 ../app/core/gimpgradient-load.c:255
 #, c-format
 msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1."
 msgstr "æ¼¸å±¤æª?æ¡?â??%sâ??å·²æ??å£?ï¼?å??æ®µä¸?è?½è¶?é?? 0-1 ç??ç¯?å??ã??"
@@ -7833,7 +7944,8 @@ msgid "The foreground color of the grid."
 msgstr "æ ¼ç·?ç??ç·?æ¢?é¡?è?²ã??"
 
 #: ../app/core/gimpgrid.c:94
-msgid "The background color of the grid; only used in double dashed line style."
+msgid ""
+"The background color of the grid; only used in double dashed line style."
 msgstr "æ ¼ç·?ç??è??æ?¯é¡?è?²ï¼?æ?¬è¨å®?å?ªæ??å?¨é??é??è??ç·?ä¸ä½¿ç?¨ã??"
 
 #: ../app/core/gimpgrid.c:100
@@ -7845,7 +7957,8 @@ msgid "Vertical spacing of grid lines."
 msgstr "æ¯?å?©æ¢?æ ¼ç·?ä¹?é??ç??å??ç?´é??è·?ã??"
 
 #: ../app/core/gimpgrid.c:114
-msgid "Horizontal offset of the first grid line; this may be a negative number."
+msgid ""
+"Horizontal offset of the first grid line; this may be a negative number."
 msgstr "ç¬¬ä¸?æ¢?æ°´å¹³æ ¼ç·?ç??ä½?ç½®ï¼?å?¯ä»¥æ?¯è² æ?¸ã??"
 
 #: ../app/core/gimpgrid.c:121
@@ -7896,45 +8009,50 @@ msgctxt "undo-type"
 msgid "Arrange Objects"
 msgstr "æ??å??ç?©ä»¶"
 
-#: ../app/core/gimpimage-colormap.c:67
+#: ../app/core/gimpimage-colormap.c:63
+#, c-format
+msgid "Colormap of Image #%d (%s)"
+msgstr ""
+
+#: ../app/core/gimpimage-colormap.c:161
 msgctxt "undo-type"
 msgid "Set Colormap"
 msgstr "è¨ç½®é¡?è?²å°?æ??è¡¨"
 
-#: ../app/core/gimpimage-colormap.c:132
+#: ../app/core/gimpimage-colormap.c:242
 msgctxt "undo-type"
 msgid "Change Colormap entry"
 msgstr "æ?¹è®?é¡?è?²å°?æ??è¡¨é ?ç?®"
 
-#: ../app/core/gimpimage-colormap.c:157
+#: ../app/core/gimpimage-colormap.c:270
 msgctxt "undo-type"
 msgid "Add Color to Colormap"
 msgstr "å? å?¥é¡?è?²è?³é¡?è?²å°?æ??è¡¨"
 
-#: ../app/core/gimpimage-convert.c:791
+#: ../app/core/gimpimage-convert.c:792
 msgid "Cannot convert image: palette is empty."
 msgstr "ä¸?è?½è½?æ??å??ç??ï¼?èª¿è?²ç?¤æ?¯ç©ºç??ã??"
 
-#: ../app/core/gimpimage-convert.c:807
+#: ../app/core/gimpimage-convert.c:808
 msgctxt "undo-type"
 msgid "Convert Image to RGB"
 msgstr "è½?æ??å??ç??ç?º RGB æ¨¡å¼?"
 
-#: ../app/core/gimpimage-convert.c:811
+#: ../app/core/gimpimage-convert.c:812
 msgctxt "undo-type"
 msgid "Convert Image to Grayscale"
 msgstr "å??ç??è½?æ??ç?ºç?°é??"
 
-#: ../app/core/gimpimage-convert.c:815
+#: ../app/core/gimpimage-convert.c:816
 msgctxt "undo-type"
 msgid "Convert Image to Indexed"
 msgstr "å°?å??ç??æ¨¡å¼?è½?æ??ç?ºç´¢å¼?è?²"
 
-#: ../app/core/gimpimage-convert.c:894
+#: ../app/core/gimpimage-convert.c:895
 msgid "Converting to indexed colors (stage 2)"
 msgstr "å°?å??ç??è?²ç³»è½?æ??ç?ºç´¢å¼?è?² (ç¬¬ 2 æ¥é©?)"
 
-#: ../app/core/gimpimage-convert.c:939
+#: ../app/core/gimpimage-convert.c:940
 msgid "Converting to indexed colors (stage 3)"
 msgstr "å°?å??ç??è?²ç³»è½?æ??ç?ºç´¢å¼?è?² (ç¬¬ 3 æ¥é©?)"
 
@@ -7943,8 +8061,7 @@ msgctxt "undo-type"
 msgid "Crop Image"
 msgstr "è£?å?ªå??ç??"
 
-#: ../app/core/gimpimage-crop.c:132
-#: ../app/core/gimpimage-resize.c:86
+#: ../app/core/gimpimage-crop.c:132 ../app/core/gimpimage-resize.c:86
 msgctxt "undo-type"
 msgid "Resize Image"
 msgstr "èª¿æ?´å??ç??å¤§å°?"
@@ -7990,8 +8107,7 @@ msgctxt "undo-type"
 msgid "Transform Items"
 msgstr "æµ®å??é ?ç?®"
 
-#: ../app/core/gimpimage-merge.c:108
-#: ../app/core/gimpimage-merge.c:122
+#: ../app/core/gimpimage-merge.c:108 ../app/core/gimpimage-merge.c:122
 msgctxt "undo-type"
 msgid "Merge Visible Layers"
 msgstr "å??ä½µç??å¾?è¦?ç??å??å±¤"
@@ -8071,17 +8187,17 @@ msgstr "ç¸®æ?¾å??ç??"
 msgid "Can't undo %s"
 msgstr "ç?¡æ³?å¾©å?? %s"
 
-#: ../app/core/gimpimage.c:1758
+#: ../app/core/gimpimage.c:1648
 msgctxt "undo-type"
 msgid "Change Image Resolution"
 msgstr "æ?´æ?¹å??ç??è§£æ??åº¦"
 
-#: ../app/core/gimpimage.c:1810
+#: ../app/core/gimpimage.c:1700
 msgctxt "undo-type"
 msgid "Change Image Unit"
 msgstr "æ?´æ?¹å??ç??ç??é??åº¦å?®ä½?"
 
-#: ../app/core/gimpimage.c:2814
+#: ../app/core/gimpimage.c:2692
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite to Image"
@@ -8089,51 +8205,48 @@ msgstr ""
 "ç?¡æ³?è¼?å?¥å??ç??:\n"
 "%s"
 
-#: ../app/core/gimpimage.c:2855
+#: ../app/core/gimpimage.c:2733
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Parasite from Image"
 msgstr "å¾?æ?æ?¾æ¸?å?®ä¸ç§»é?¤æª?æ¡?"
 
-#: ../app/core/gimpimage.c:3564
+#: ../app/core/gimpimage.c:3442
 msgctxt "undo-type"
 msgid "Add Layer"
 msgstr "å? å?¥å??å±¤"
 
-#: ../app/core/gimpimage.c:3614
-#: ../app/core/gimpimage.c:3634
+#: ../app/core/gimpimage.c:3492 ../app/core/gimpimage.c:3512
 msgctxt "undo-type"
 msgid "Remove Layer"
 msgstr "ç§»é?¤å??å±¤"
 
-#: ../app/core/gimpimage.c:3627
+#: ../app/core/gimpimage.c:3505
 msgctxt "undo-type"
 msgid "Remove Floating Selection"
 msgstr "ç§»é?¤æµ®å??é?¸å??å??å??"
 
-#: ../app/core/gimpimage.c:3793
+#: ../app/core/gimpimage.c:3671
 msgctxt "undo-type"
 msgid "Add Channel"
 msgstr "æ?°å¢?è?²ç??"
 
-#: ../app/core/gimpimage.c:3831
-#: ../app/core/gimpimage.c:3843
+#: ../app/core/gimpimage.c:3709 ../app/core/gimpimage.c:3721
 msgctxt "undo-type"
 msgid "Remove Channel"
 msgstr "ç§»é?¤è?²ç??"
 
-#: ../app/core/gimpimage.c:3890
+#: ../app/core/gimpimage.c:3768
 msgctxt "undo-type"
 msgid "Add Path"
 msgstr "å? å?¥è·¯å¾?"
 
-#: ../app/core/gimpimage.c:3921
+#: ../app/core/gimpimage.c:3799
 msgctxt "undo-type"
 msgid "Remove Path"
 msgstr "ç§»é?¤è·¯å¾?"
 
-#: ../app/core/gimpimagefile.c:534
-#: ../app/dialogs/preferences-dialog.c:1711
+#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1711
 msgid "Folder"
 msgstr "è³?æ??å¤¾"
 
@@ -8165,18 +8278,16 @@ msgstr "ç?¡æ³?ç?¢ç??é ?è¦½å??"
 msgid "(Preview may be out of date)"
 msgstr "(é ?è¦½å??å·²é??æ??)"
 
-#: ../app/core/gimpimagefile.c:611
-#: ../app/widgets/gimpimagepropview.c:446
-#: ../app/widgets/gimpsizebox.c:434
-#: ../app/widgets/gimptemplateeditor.c:565
+#. pixel size
+#: ../app/core/gimpimagefile.c:611 ../app/widgets/gimpimagepropview.c:446
+#: ../app/widgets/gimpsizebox.c:437 ../app/widgets/gimptemplateeditor.c:568
 #, c-format
 msgid "%d Ã? %d pixel"
 msgid_plural "%d Ã? %d pixels"
 msgstr[0] "%d Ã? %d å??ç´ "
 msgstr[1] "%d Ã? %d å??ç´ "
 
-#: ../app/core/gimpimagefile.c:634
-#: ../app/display/gimpdisplayshell-title.c:339
+#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:339
 #, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
@@ -8188,20 +8299,19 @@ msgstr[1] "%d å??å??å±¤"
 msgid "Could not open thumbnail '%s': %s"
 msgstr "ç?¡æ³?é??å??ç¸®å??â??%sâ??ï¼?%s"
 
-#: ../app/core/gimpitem.c:1564
+#: ../app/core/gimpitem.c:1561
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite"
 msgstr "é??å? è¦?çª?å??ä»¶"
 
-#: ../app/core/gimpitem.c:1574
+#: ../app/core/gimpitem.c:1571
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite to Item"
 msgstr "å°?æ?¾å? å?¥è?³â??%sâ??ç??é ?ç?®(_I):"
 
-#: ../app/core/gimpitem.c:1616
-#: ../app/core/gimpitem.c:1623
+#: ../app/core/gimpitem.c:1613 ../app/core/gimpitem.c:1620
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Parasite from Item"
@@ -8212,9 +8322,10 @@ msgctxt "undo-type"
 msgid "Anchor Floating Selection"
 msgstr "å?ºå®?æµ®å??ç??é?¸å??å??å??"
 
-#: ../app/core/gimplayer-floating-sel.c:126
-#: ../app/core/gimplayer.c:595
-msgid "Cannot create a new layer from the floating selection because it belongs to a layer mask or channel."
+#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:595
+msgid ""
+"Cannot create a new layer from the floating selection because it belongs to "
+"a layer mask or channel."
 msgstr "ç?¡æ³?å¾?æµ®å??é?¸å??å??å??ç?¢ç??æ?°ç??å??å±¤ï¼?å? ç?ºå®?å±¬æ?¼å?¦ä¸?å??å??å±¤é?®ç½©æ??è?²ç??ã??"
 
 #: ../app/core/gimplayer-floating-sel.c:133
@@ -8285,8 +8396,7 @@ msgstr "å??å±¤ç?¡æ³?å??å??ä¸?ç§»ã??"
 msgid "Layer cannot be lowered more."
 msgstr "å??å±¤ç?¡æ³?å??å??ä¸?ç§»ã??"
 
-#: ../app/core/gimplayer.c:437
-#: ../app/core/gimplayer.c:1488
+#: ../app/core/gimplayer.c:437 ../app/core/gimplayer.c:1488
 #: ../app/core/gimplayermask.c:233
 #, c-format
 msgid "%s mask"
@@ -8320,8 +8430,7 @@ msgctxt "undo-type"
 msgid "Transfer Alpha to Mask"
 msgstr "å?¨ GdkPixmap ä¸?ä½¿ç?¨ç??é?®ç½©é»?é?£å??"
 
-#: ../app/core/gimplayer.c:1713
-#: ../app/core/gimplayermask.c:259
+#: ../app/core/gimplayer.c:1713 ../app/core/gimplayermask.c:259
 msgctxt "undo-type"
 msgid "Apply Layer Mask"
 msgstr "å¥?ç?¨å??å±¤é?®ç½©"
@@ -8376,10 +8485,8 @@ msgstr "ç´¢å¼? %d"
 msgid "Unknown type of palette file: %s"
 msgstr "ä¸?æ??é¡?å??ç??èª¿è?²ç?¤æª?æ¡?ï¼?%s"
 
-#: ../app/core/gimppalette-load.c:85
-#: ../app/core/gimppalette-load.c:111
-#: ../app/core/gimppalette-load.c:132
-#: ../app/core/gimppalette-load.c:161
+#: ../app/core/gimppalette-load.c:85 ../app/core/gimppalette-load.c:111
+#: ../app/core/gimppalette-load.c:132 ../app/core/gimppalette-load.c:161
 #: ../app/core/gimppalette-load.c:237
 #, c-format
 msgid "Fatal parse error in palette file '%s': Read error in line %d."
@@ -8397,7 +8504,9 @@ msgstr "èª¿è?²ç?¤æª?æ¡?â??%sâ??ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²"
 
 #: ../app/core/gimppalette-load.c:148
 #, c-format
-msgid "Reading palette file '%s': Invalid number of columns in line %d. Using default value."
+msgid ""
+"Reading palette file '%s': Invalid number of columns in line %d. Using "
+"default value."
 msgstr "è¼?å?¥èª¿è?²ç?¤â??%sâ??ï¼?ç¬¬ %d è¡?ç??æ¬?ä½?æ?¸ç?®ä¸?æ£ç¢ºï¼?æ?¹ç?¨é ?è¨å?¼ã??"
 
 #: ../app/core/gimppalette-load.c:184
@@ -8425,14 +8534,12 @@ msgstr "è¼?å?¥èª¿è?²ç?¤æª?æ¡?â??%sâ??ï¼?ç¬¬ %d è¡?ç?? RGB å?¼è¶?å?ºç¯?å??ã??"
 msgid "Could not read header from palette file '%s'"
 msgstr "ç?¡æ³?å¾?èª¿è?²ç?¤æª?æ¡?â??%sâ??è®?å??æ¨?é "
 
-#: ../app/core/gimppalette-load.c:500
-#: ../app/core/gimppalette-load.c:588
+#: ../app/core/gimppalette-load.c:500 ../app/core/gimppalette-load.c:588
 #, c-format
 msgid "Fatal parse error in palette file '%s'"
 msgstr "èª¿è?²ç?¤æª?æ¡?'%s'å?ºç?¾å?´é??é?¯èª¤è§£æ??"
 
-#: ../app/core/gimppattern-load.c:85
-#: ../app/core/gimppattern-load.c:131
+#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131
 #: ../app/core/gimppattern-load.c:162
 #, c-format
 msgid "Fatal parse error in pattern file '%s': File appears truncated."
@@ -8440,7 +8547,8 @@ msgstr "å??æ??å??æ¡?æª? â??%sâ?? æ??å?ºç?¾å?´é??é?¯èª¤ï¼?æª?æ¡?ä¼¼ä¹?è¢«æ?ªç?
 
 #: ../app/core/gimppattern-load.c:104
 #, c-format
-msgid "Fatal parse error in pattern file '%s': Unknown pattern format version %d."
+msgid ""
+"Fatal parse error in pattern file '%s': Unknown pattern format version %d."
 msgstr "å??æ??å??æ¨£æª?æ¡?â??%sâ??æ??å?ºç?¾å?´é??é?¯èª¤ï¼?ç?¡æ³?ç??è§£å??æ¨£æ ¼å¼?ç??æ?¬â??%dâ??ã??"
 
 #: ../app/core/gimppattern-load.c:114
@@ -8457,14 +8565,12 @@ msgstr ""
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "èª¿è?²ç?¤æª?æ¡?â??%sâ??ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²ã??"
 
-#: ../app/core/gimppdbprogress.c:287
-#: ../app/widgets/gimppdbdialog.c:339
+#: ../app/core/gimppdbprogress.c:287 ../app/widgets/gimppdbdialog.c:339
 #, c-format
 msgid "Unable to run %s callback. The corresponding plug-in may have crashed."
 msgstr "ç?¡æ³?å?·è¡? %s ç?? callbackã??ç?¸æ??ç??å¢?æ??æ¨¡çµ?å?¯è?½å·²ç¶?ä¸?æ£å¸¸çµ?æ??ã??"
 
-#: ../app/core/gimpprogress.c:106
-#: ../app/core/gimpprogress.c:153
+#: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153
 msgid "Please wait"
 msgstr "è«?ç¨?å??"
 
@@ -8506,7 +8612,7 @@ msgstr "å??å??é?¸å??å??å??"
 #: ../app/core/gimpselection.c:177
 msgctxt "undo-type"
 msgid "Border Selection"
-msgstr "æ¡?ç·?å??é?¸æ??å??å??"
+msgstr "æ¡?ç·?å??é?¸å??å??å??"
 
 #: ../app/core/gimpselection.c:178
 #, fuzzy
@@ -8534,15 +8640,19 @@ msgstr "å? ç?ºé?¸å??å??å??æ?¯ç©ºç?½ç??ï¼?æ??ä»¥ç?¡æ³?ä»¤é?¸å??å??å??æµ®å??ã??"
 #: ../app/core/gimpselection.c:852
 msgctxt "undo-type"
 msgid "Float Selection"
-msgstr "æµ®å??é?¸æ??å??å??"
+msgstr "æµ®å??é?¸å??å??å??"
 
 #: ../app/core/gimpselection.c:868
 msgid "Floated Layer"
 msgstr "æµ®å??ç??å??å±¤"
 
 #: ../app/core/gimpstrokeoptions.c:151
-msgid "Convert a mitered join to a bevelled join if the miter would extend to a distance of more than miter-limit * line-width from the actual join point."
-msgstr "å¦?æ??æ??æ?¥å?¯ä»¥å¾?å¯¦é??é?£æ?¥é»?å»¶ä¼¸å?°å¤§æ?¼æ??æ?¥é??å?¶ * ç·?æ¢?å¯¬åº¦ç??è·?é?¢ï¼?å°?æ??æ?¥é?£æ?¥è½?æ??ç?ºæ??é??é?£æ?¥ã??"
+msgid ""
+"Convert a mitered join to a bevelled join if the miter would extend to a "
+"distance of more than miter-limit * line-width from the actual join point."
+msgstr ""
+"å¦?æ??æ??æ?¥å?¯ä»¥å¾?å¯¦é??é?£æ?¥é»?å»¶ä¼¸å?°å¤§æ?¼æ??æ?¥é??å?¶ * ç·?æ¢?å¯¬åº¦ç??è·?é?¢ï¼?å°?æ??æ?¥é?£æ?¥è½?æ??ç?º"
+"æ??é??é?£æ?¥ã??"
 
 #: ../app/core/gimptemplate.c:100
 msgid "The unit used for coordinate display when not in dot-for-dot mode."
@@ -8616,8 +8726,7 @@ msgctxt "plural"
 msgid "percent"
 msgstr "ç?¾å??æ¯?"
 
-#: ../app/dialogs/about-dialog.c:106
-#: ../app/gui/gui.c:482
+#: ../app/dialogs/about-dialog.c:106 ../app/gui/gui.c:479
 msgid "About GIMP"
 msgstr "é??æ?¼ GIMP"
 
@@ -8625,6 +8734,8 @@ msgstr "é??æ?¼ GIMP"
 msgid "Visit the GIMP website"
 msgstr "è¨ªå?? GIMP ç¶²ç«?"
 
+#. Translators: insert your names here,
+#. separated by newline
 #: ../app/dialogs/about-dialog.c:121
 msgid "translator-credits"
 msgstr ""
@@ -8669,8 +8780,8 @@ msgstr "é¡?è?²æ?¸ç?®ä¸?é??(_M):"
 msgid "_Remove unused colors from colormap"
 msgstr "å¾?é¡?è?²å°?æ??è¡¨ä¸ç§»é?¤æ?ªä½¿ç?¨ç??é¡?è?²(_R)"
 
-#: ../app/dialogs/convert-dialog.c:233
-#: ../app/tools/gimpblendoptions.c:246
+#. dithering
+#: ../app/dialogs/convert-dialog.c:233 ../app/tools/gimpblendoptions.c:253
 msgid "Dithering"
 msgstr "æ?¬è?²(Dithering)"
 
@@ -8686,13 +8797,11 @@ msgstr "æ?¬è?²æ??å°?é??æ??åº¦è¨?ç®?å?¨å?§(_T)"
 msgid "Converting to indexed colors"
 msgstr "æ£å?¨è½?æ??ç?ºç´¢å¼?è?²"
 
-#: ../app/dialogs/convert-dialog.c:414
-#: ../app/pdb/convert-cmds.c:152
+#: ../app/dialogs/convert-dialog.c:415 ../app/pdb/convert-cmds.c:152
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "ä¸?å?¯ä»¥è½?æ??è?³ä¸?å??å¤?æ?¼ 256 è?²ç??èª¿è?²ç?¤ã??"
 
-#: ../app/dialogs/dialogs-constructors.c:212
-#: ../app/gui/gui.c:163
+#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:163
 #: ../app/gui/gui-message.c:145
 msgid "GIMP Message"
 msgstr "GIMP è¨?æ?¯"
@@ -8766,8 +8875,7 @@ msgstr "æ·¡å?? %s"
 msgid "_Fade"
 msgstr "æ·¡å??(_F)"
 
-#: ../app/dialogs/fade-dialog.c:157
-#: ../app/widgets/gimpdeviceinfoeditor.c:346
+#: ../app/dialogs/fade-dialog.c:157 ../app/widgets/gimpdeviceinfoeditor.c:349
 msgid "_Mode:"
 msgstr "æ¨¡å¼?(_M):"
 
@@ -8796,20 +8904,37 @@ msgid "_Export"
 msgstr "å?¯å?º(_E)"
 
 #: ../app/dialogs/file-save-dialog.c:468
-msgid "Saving remote files needs to determine the file format from the file extension. Please enter a file extension that matches the selected file format or enter no file extension at all."
-msgstr "é? ç«¯å?²å?æª?æ¡?é??è¦?ä¾?å»¶ä¼¸æª?å??æ±ºå®?æª?æ¡?æ ¼å¼?ã??è«?é?¸æ??ç¬¦å??é?¸å??æª?æ¡?æ ¼å¼?ç??å»¶ä¼¸æª?å??æ??å®?å?¨ä¸?ä½¿ç?¨å»¶ä¼¸æª?å??ã??"
+msgid ""
+"Saving remote files needs to determine the file format from the file "
+"extension. Please enter a file extension that matches the selected file "
+"format or enter no file extension at all."
+msgstr ""
+"é? ç«¯å?²å?æª?æ¡?é??è¦?ä¾?å»¶ä¼¸æª?å??æ±ºå®?æª?æ¡?æ ¼å¼?ã??è«?é?¸æ??ç¬¦å??é?¸å??æª?æ¡?æ ¼å¼?ç??å»¶ä¼¸æª?å??æ??å®?"
+"å?¨ä¸?ä½¿ç?¨å»¶ä¼¸æª?å??ã??"
 
 #: ../app/dialogs/file-save-dialog.c:595
-msgid "You can use this dialog to export to various file formats. If you want to save the image to the GIMP XCF format, use Fileâ??Save instead."
+msgid ""
+"You can use this dialog to export to various file formats. If you want to "
+"save the image to the GIMP XCF format, use Fileâ??Save instead."
 msgstr ""
+"æ?¨å?¯ä»¥ä½¿ç?¨é??å??å°?è©±ç??ä¾?å?¯å?ºä¸?å??ç??æª?æ¡?æ ¼å¼?ã??å¦?æ??æ?¨æ?³å?²å?å??ç??ç?º GIMP XCF æ ¼å¼?ï¼?"
+"è«?ä½¿ç?¨[æª?æ¡?]>[å?²å?]æ?¿ä»£ã?? "
 
 #: ../app/dialogs/file-save-dialog.c:602
-msgid "You can use this dialog to save to the GIMP XCF format. Use Fileâ??Export to export to other file formats."
+msgid ""
+"You can use this dialog to save to the GIMP XCF format. Use Fileâ??Export to "
+"export to other file formats."
 msgstr ""
+"æ?¨å?¯ä»¥ä½¿ç?¨é??å??å°?è©±ç??å?²å?ç?º GIMP XCF æ ¼å¼?ã??ä½¿ç?¨[æª?æ¡?]>[å?¯å?º]å?¯å?ºç?ºå?¶å®?æª?æ¡?æ ¼"
+"å¼?ã??"
 
 #: ../app/dialogs/file-save-dialog.c:608
-msgid "The given filename does not have any known file extension. Please enter a known file extension or select a file format from the file format list."
-msgstr "çµ¦äº?ç??æª?æ¡?å??ç¨±æ²?æ??ä»»ä½?å·²ç?¥ç??å»¶ä¼¸æª?å??ã??è«?è¼¸å?¥ä¸?å??å·²ç?¥ç??å»¶ä¼¸æª?å??æ??å¾?æª?æ¡?æ ¼å¼?æ¸?å?®ä¸é?¸æ??ä¸?ç¨®æª?æ¡?æ ¼å¼?ã??"
+msgid ""
+"The given filename does not have any known file extension. Please enter a "
+"known file extension or select a file format from the file format list."
+msgstr ""
+"çµ¦äº?ç??æª?æ¡?å??ç¨±æ²?æ??ä»»ä½?å·²ç?¥ç??å»¶ä¼¸æª?å??ã??è«?è¼¸å?¥ä¸?å??å·²ç?¥ç??å»¶ä¼¸æª?å??æ??å¾?æª?æ¡?æ ¼å¼?æ¸?"
+"å?®ä¸é?¸æ??ä¸?ç¨®æª?æ¡?æ ¼å¼?ã??"
 
 #: ../app/dialogs/file-save-dialog.c:622
 msgid "Extension Mismatch"
@@ -8827,8 +8952,7 @@ msgstr "æ?¯å?¦å°?ä¸?å®?è¦?ä»¥æ¤å??ç¨±å?²å?é??å??å??ç??ï¼?"
 msgid "Saving canceled"
 msgstr "å?²å?å·²å??æ¶?"
 
-#: ../app/dialogs/file-save-dialog.c:705
-#: ../app/widgets/gimpdnd-xds.c:185
+#: ../app/dialogs/file-save-dialog.c:705 ../app/widgets/gimpdnd-xds.c:185
 #, c-format
 msgid ""
 "Saving '%s' failed:\n"
@@ -8904,8 +9028,11 @@ msgstr "æ?¨æº?å??ç?¢ç??ä¸?å¹?å¤§å°?ç?º %s ç??å??ç??ã??"
 
 #: ../app/dialogs/image-new-dialog.c:328
 #, c-format
-msgid "An image of the chosen size will use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)."
-msgstr "é??å??å°ºå¯¸ç??å??ç??æ??è¶?å?ºå??å¥½è¨å®?ä¸ç??â??æ??å¤§å??ç??å¤§å°?â??æ??è¨å®?ç??è¨?æ?¶é«?ç?¨é??(ç?®å??ç?º %s)ã??"
+msgid ""
+"An image of the chosen size will use more memory than what is configured as "
+"\"Maximum Image Size\" in the Preferences dialog (currently %s)."
+msgstr ""
+"é??å??å°ºå¯¸ç??å??ç??æ??è¶?å?ºå??å¥½è¨å®?ä¸ç??â??æ??å¤§å??ç??å¤§å°?â??æ??è¨å®?ç??è¨?æ?¶é«?ç?¨é??(ç?®å??ç?º %s)ã??"
 
 #: ../app/dialogs/image-properties-dialog.c:60
 #: ../app/dialogs/image-properties-dialog.c:63
@@ -8935,11 +9062,17 @@ msgstr "ç¢ºèª?ç¸®æ?¾å°ºå¯¸"
 
 #: ../app/dialogs/image-scale-dialog.c:245
 #, c-format
-msgid "Scaling the image to the chosen size will make it use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)."
-msgstr "ç¸®æ?¾è?³é??å??å°ºå¯¸ç??è©±ï¼?å??ç??æ??è¶?å?ºå??å¥½è¨å®?ä¸ç??â??æ??å¤§å??ç??å¤§å°?â??æ??è¨å®?ç??è¨?æ?¶é«?ç?¨é??(ç?®å??ç?º %s)ã??"
+msgid ""
+"Scaling the image to the chosen size will make it use more memory than what "
+"is configured as \"Maximum Image Size\" in the Preferences dialog (currently "
+"%s)."
+msgstr ""
+"ç¸®æ?¾è?³é??å??å°ºå¯¸ç??è©±ï¼?å??ç??æ??è¶?å?ºå??å¥½è¨å®?ä¸ç??â??æ??å¤§å??ç??å¤§å°?â??æ??è¨å®?ç??è¨?æ?¶é«?ç?¨é??(ç?®"
+"å??ç?º %s)ã??"
 
 #: ../app/dialogs/image-scale-dialog.c:260
-msgid "Scaling the image to the chosen size will shrink some layers completely away."
+msgid ""
+"Scaling the image to the chosen size will shrink some layers completely away."
 msgstr "å??ç??ç¸®å°?è?³æ??å®?å°ºå¯¸ç??è©±ï¼?æ??ä»¤æ??äº?å??å±¤å®?å?¨æ¶?å¤±ã??"
 
 #: ../app/dialogs/image-scale-dialog.c:264
@@ -8955,7 +9088,9 @@ msgid "Configure Keyboard Shortcuts"
 msgstr "è¨å®?æ?·å¾?é?µ"
 
 #: ../app/dialogs/keyboard-shortcuts-dialog.c:73
-msgid "To edit a shortcut key, click on the corresponding row and type a new accelerator, or press backspace to clear."
+msgid ""
+"To edit a shortcut key, click on the corresponding row and type a new "
+"accelerator, or press backspace to clear."
 msgstr "è¦?ç·¨è¼¯æ?·å¾?é?µï¼?æ??ä¸?å°?æ??ç??å??ä¸¦è¼¸å?¥æ?°ç??æ?·å¾?é?µï¼?æ??æ?? backspace æ¸?é?¤å®?ã??"
 
 #: ../app/dialogs/keyboard-shortcuts-dialog.c:81
@@ -8978,13 +9113,14 @@ msgstr "å??å??é?®ç½©(_V)"
 msgid "Layer _name:"
 msgstr "å??å±¤å??ç¨±(_N):"
 
+#. The size labels
 #: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1075
+#: ../app/tools/gimpmeasuretool.c:1076
 msgid "Width:"
 msgstr "å¯¬åº¦:"
 
 #: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1103
+#: ../app/tools/gimpmeasuretool.c:1104
 msgid "Height:"
 msgstr "é«?åº¦:"
 
@@ -9048,24 +9184,23 @@ msgstr "å??å±¤é?®ç½©å??ç§»"
 msgid "Offset Channel"
 msgstr "è?²ç??å??ç§»"
 
-#: ../app/dialogs/offset-dialog.c:118
-#: ../app/dialogs/offset-dialog.c:152
-#: ../app/dialogs/resize-dialog.c:198
-#: ../app/widgets/gimpgrideditor.c:275
+#. The offset frame
+#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152
+#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:246
+#: ../app/widgets/gimpgrideditor.c:277
 msgid "Offset"
 msgstr "å??ç§»"
 
+#. offset, used as a verb
 #: ../app/dialogs/offset-dialog.c:127
 msgid "_Offset"
 msgstr "å??ç§»(_O)"
 
-#: ../app/dialogs/offset-dialog.c:184
-#: ../app/dialogs/resize-dialog.c:227
+#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:227
 msgid "_X:"
 msgstr "_X:"
 
-#: ../app/dialogs/offset-dialog.c:186
-#: ../app/dialogs/resize-dialog.c:228
+#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:228
 msgid "_Y:"
 msgstr "_Y:"
 
@@ -9073,6 +9208,7 @@ msgstr "_Y:"
 msgid "Offset by  x/_2, y/2"
 msgstr "å??ç§»è?³ä¸?å??å¯¬åº¦å??é«?åº¦ç??ä½?ç½®(_2)"
 
+#. The edge behavior frame
 #: ../app/dialogs/offset-dialog.c:222
 msgid "Edge Behavior"
 msgstr "é??ç·£è¡?ç?º"
@@ -9097,6 +9233,7 @@ msgstr "å?¯å?¥æ?°ç??èª¿è?²ç?¤"
 msgid "_Import"
 msgstr "å?¯å?¥(_I)"
 
+#. The "Source" frame
 #: ../app/dialogs/palette-import-dialog.c:203
 msgid "Select Source"
 msgstr "é?¸å??ä¾?æº?"
@@ -9122,10 +9259,12 @@ msgstr "å?ªæ??é?¸å??ç??å??ç´ (_S)"
 msgid "Palette _file"
 msgstr "èª¿è?²ç?¤æª?æ¡?(_F)"
 
+#. Palette file name entry
 #: ../app/dialogs/palette-import-dialog.c:292
 msgid "Select Palette File"
-msgstr "é?¸æ??èª¿è?²ç?¤æª?æ¡?"
+msgstr "é?¸å??èª¿è?²ç?¤æª?æ¡?"
 
+#. The "Import" frame
 #: ../app/dialogs/palette-import-dialog.c:303
 msgid "Import Options"
 msgstr "å?¯å?¥é?¸é ?"
@@ -9150,6 +9289,7 @@ msgstr "æ¬?(_O):"
 msgid "I_nterval:"
 msgstr "é??é??(_N):"
 
+#. The "Preview" frame
 #: ../app/dialogs/palette-import-dialog.c:361
 msgid "Preview"
 msgstr "é ?è¦½"
@@ -9171,7 +9311,9 @@ msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr "æ?¨å¿?é ?é??æ?°å??å?? GIMP ä»¤ä»¥ä¸?ç??è¨å®?ç??æ??ï¼?"
 
 #: ../app/dialogs/preferences-dialog.c:538
-msgid "Your keyboard shortcuts will be reset to default values the next time you start GIMP."
+msgid ""
+"Your keyboard shortcuts will be reset to default values the next time you "
+"start GIMP."
 msgstr "ä¸?æ¬¡å??å?? GIMP æ??æ??å°?æ??æ??æ?·å¾?é?µé??å??ç?ºé ?è¨å?¼ã??"
 
 #: ../app/dialogs/preferences-dialog.c:549
@@ -9183,15 +9325,21 @@ msgid "Do you really want to remove all keyboard shortcuts from all menus?"
 msgstr "æ?¨æ?¯å?¦ç¢ºå®?è¦?ç§»é?¤æ??æ??é?¸å?®ç??é?µç?¤æ?·å¾?é?µï¼?"
 
 #: ../app/dialogs/preferences-dialog.c:612
-msgid "Your window setup will be reset to default values the next time you start GIMP."
+msgid ""
+"Your window setup will be reset to default values the next time you start "
+"GIMP."
 msgstr "ä¸?æ¬¡å??å?? GIMP æ??æ??å°?æ??æ??è¦?çª?çµ?æ??é??å??ç?ºé ?è¨å?¼ã??"
 
 #: ../app/dialogs/preferences-dialog.c:647
-msgid "Your input device settings will be reset to default values the next time you start GIMP."
+msgid ""
+"Your input device settings will be reset to default values the next time you "
+"start GIMP."
 msgstr "ä¸?æ¬¡å??å?? GIMP æ??æ??å°?æ??æ??è¼¸å?¥è£?ç½®ç??è¨å®?é??å??ç?ºé ?è¨å?¼ã??"
 
 #: ../app/dialogs/preferences-dialog.c:682
-msgid "Your tool options will be reset to default values the next time you start GIMP."
+msgid ""
+"Your tool options will be reset to default values the next time you start "
+"GIMP."
 msgstr "ä¸?æ¬¡å??å?? GIMP æ??æ??å°?æ?¨ç??å·¥å?·é?¸é ?é??å??ç?ºé ?è¨å?¼ã??"
 
 #: ../app/dialogs/preferences-dialog.c:1266
@@ -9243,7 +9391,7 @@ msgid "Preferences"
 msgstr "å??å¥½è¨å®?"
 
 #: ../app/dialogs/preferences-dialog.c:1507
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2758
 msgid "Environment"
 msgstr "ç³»çµ±ç?°å¢?"
 
@@ -9271,6 +9419,7 @@ msgstr "æ?°ç??å??ç??ç??ä½?ç?¨è¨?æ?¶ä¸?é??(_N):"
 msgid "Number of _processors to use:"
 msgstr "æ??ä½¿ç?¨ç?? C_PU æ?¸ç?®:"
 
+#. Image Thumbnails
 #: ../app/dialogs/preferences-dialog.c:1550
 msgid "Image Thumbnails"
 msgstr "ç¸®å??"
@@ -9283,6 +9432,7 @@ msgstr "ç¸®å??å°ºå¯¸(_T):"
 msgid "Maximum _filesize for thumbnailing:"
 msgstr "æ??è?ªå??ç?¢ç??ç¸®å??ç??å??å??å¤§å°?ä¸?é??(_F):"
 
+#. File Saving
 #: ../app/dialogs/preferences-dialog.c:1563
 msgid "Saving Images"
 msgstr "å?²å?å??ç??"
@@ -9307,6 +9457,7 @@ msgstr "ä»?é?¢"
 msgid "Language"
 msgstr "èª?è¨?"
 
+#. Previews
 #: ../app/dialogs/preferences-dialog.c:1604
 msgid "Previews"
 msgstr "é ?è¦½"
@@ -9323,6 +9474,7 @@ msgstr "é ?è¨å??å±¤å??è?²ç??ç??é ?è¦½å??å°ºå¯¸(_D)ï¼?"
 msgid "Na_vigation preview size:"
 msgstr "å°?è¦½å??å°ºå¯¸(_N):"
 
+#. Keyboard Shortcuts
 #: ../app/dialogs/preferences-dialog.c:1620
 msgid "Keyboard Shortcuts"
 msgstr "æ?·å¾?é?µ"
@@ -9368,10 +9520,11 @@ msgstr "é??æ?°è¼?å?¥ç?®å??ç??ä½?æ?¯ä¸»é¡?(_U)"
 msgid "Help System"
 msgstr "èªªæ??æ??ä»¶ç³»çµ±"
 
+#. General
 #: ../app/dialogs/preferences-dialog.c:1782
 #: ../app/dialogs/preferences-dialog.c:1866
-#: ../app/dialogs/preferences-dialog.c:2066
-#: ../app/widgets/gimpcontrollereditor.c:188
+#: ../app/dialogs/preferences-dialog.c:2065
+#: ../app/widgets/gimpcontrollereditor.c:191
 msgid "General"
 msgstr "ä¸?è?¬"
 
@@ -9403,6 +9556,7 @@ msgstr "é??è£¡æ??æ?¬å?°ç«¯å®?è£?ç??ä½¿ç?¨è??æ??å??ã??"
 msgid "The user manual is not installed locally."
 msgstr "ä½¿ç?¨è??æ??å??ä¸¦æ²?æ??å?¨æ?¬å?°ç«¯å®?è£?ã??"
 
+#. Help Browser
 #: ../app/dialogs/preferences-dialog.c:1838
 msgid "Help Browser"
 msgstr "èªªæ??æ??ä»¶ç??è¦½å?¨"
@@ -9423,6 +9577,7 @@ msgstr "ç«?å?»å?²å?å·¥å?·é?¸é ?(_N)"
 msgid "_Reset Saved Tool Options to Default Values"
 msgstr "å°?å·¥å?·é?¸é ?è¨å®?ç?ºé ?è¨å?¼(_R)"
 
+#. Snapping Distance
 #: ../app/dialogs/preferences-dialog.c:1890
 msgid "Guide & Grid Snapping"
 msgstr "è²¼ç·?å??è??ç·? & æ ¼ç·?"
@@ -9435,6 +9590,7 @@ msgstr "è?ªå??è²¼é½?ç??æ??è·?é?¢(_S):"
 msgid "Default _interpolation:"
 msgstr "é ?è¨ä½¿ç?¨ç??å??ç??å?§æ??æ³?(_I):"
 
+#. Global Brush, Pattern, ...
 #: ../app/dialogs/preferences-dialog.c:1910
 msgid "Paint Options Shared Between Tools"
 msgstr "æ??æ??å·¥å?·å?¯ä»¥å?±ç?¨ç??ç¹ªå??é?¸é ?"
@@ -9459,9 +9615,10 @@ msgstr "ç§»å??å·¥å?·"
 msgid "Set layer or path as active"
 msgstr "è¨å®?å??å±¤æ??è·¯å¾?ç?ºä½¿ç?¨ä¸"
 
+#. Appearance
 #: ../app/dialogs/preferences-dialog.c:1955
-#: ../app/dialogs/preferences-dialog.c:2139
-#: ../app/widgets/gimpgrideditor.c:203
+#: ../app/dialogs/preferences-dialog.c:2138
+#: ../app/widgets/gimpgrideditor.c:205
 msgid "Appearance"
 msgstr "å¤?è§?"
 
@@ -9477,6 +9634,7 @@ msgstr "é¡¯ç¤ºä½¿ç?¨ä¸ç??ç?å?·ã??å??æ¨£å??æ¼¸å±¤(_B)"
 msgid "Show active _image"
 msgstr "é¡¯ç¤ºä½¿ç?¨ä¸ç??å??ç??(_I)"
 
+#. Tool Editor
 #: ../app/dialogs/preferences-dialog.c:1975
 msgid "Tools configuration"
 msgstr "å·¥å?·é??ç½®"
@@ -9497,424 +9655,430 @@ msgstr "é ?è¨å??ç??æ ¼ç·?"
 msgid "Default Grid"
 msgstr "é ?è¨æ ¼ç·?"
 
-#: ../app/dialogs/preferences-dialog.c:2054
+#: ../app/dialogs/preferences-dialog.c:2053
 msgid "Image Windows"
 msgstr "å??ç??è¦?çª?"
 
-#: ../app/dialogs/preferences-dialog.c:2069
+#: ../app/dialogs/preferences-dialog.c:2068
 msgid "Use \"_Dot for dot\" by default"
 msgstr "é ?è¨ä½¿ç?¨ã??é»?å°?é»?ã??æ¨¡å¼?(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2075
+#: ../app/dialogs/preferences-dialog.c:2074
 msgid "Marching _ants speed:"
 msgstr "é?¸å??å??å??è??ç·? (Marching _Ants) ç§»å??é??åº¦:"
 
-#: ../app/dialogs/preferences-dialog.c:2079
+#. Zoom & Resize Behavior
+#: ../app/dialogs/preferences-dialog.c:2078
 msgid "Zoom & Resize Behavior"
 msgstr "ç¸®æ?¾å??èª¿æ?´å°ºå¯¸ç??é??ä½?æ?¹å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2083
+#: ../app/dialogs/preferences-dialog.c:2082
 msgid "Resize window on _zoom"
 msgstr "ç¸®æ?¾å??ç??æ??èª¿æ?´è¦?çª?å°ºå¯¸(_Z)"
 
-#: ../app/dialogs/preferences-dialog.c:2086
+#: ../app/dialogs/preferences-dialog.c:2085
 msgid "Resize window on image _size change"
 msgstr "å??ç??å°ºå¯¸æ?´æ?¹æ??èª¿æ?´è¦?çª?å°ºå¯¸(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2092
+#: ../app/dialogs/preferences-dialog.c:2091
 msgid "Fit to window"
 msgstr "ç¬¦å??è¦?çª?å°ºå¯¸"
 
-#: ../app/dialogs/preferences-dialog.c:2094
+#: ../app/dialogs/preferences-dialog.c:2093
 msgid "Initial zoom _ratio:"
 msgstr "æ??å??ç¸®æ?¾æ¯?ä¾?(_R):"
 
-#: ../app/dialogs/preferences-dialog.c:2098
+#. Space Bar
+#: ../app/dialogs/preferences-dialog.c:2097
 msgid "Space Bar"
 msgstr "ç©ºç?½é?µ"
 
-#: ../app/dialogs/preferences-dialog.c:2104
+#: ../app/dialogs/preferences-dialog.c:2103
 msgid "_While space bar is pressed:"
 msgstr "ç©ºç?½é?µè¢«æ??ä¸?(_W):"
 
-#: ../app/dialogs/preferences-dialog.c:2108
+#. Mouse Pointers
+#: ../app/dialogs/preferences-dialog.c:2107
 msgid "Mouse Pointers"
 msgstr "æ»?é¼ æ??æ¨?"
 
-#: ../app/dialogs/preferences-dialog.c:2112
+#: ../app/dialogs/preferences-dialog.c:2111
 msgid "Show _brush outline"
 msgstr "é¡¯ç¤ºç?å?·è¼ªå»?(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:2115
+#: ../app/dialogs/preferences-dialog.c:2114
 msgid "Show pointer for paint _tools"
 msgstr "ä½¿ç?¨ç¹ªç?«å·¥å?·æ??é¡¯ç¤ºæ»?é¼ æ??æ¨?(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2121
+#: ../app/dialogs/preferences-dialog.c:2120
 msgid "Pointer _mode:"
 msgstr "æ»?é¼ æ??æ¨?æ¨¡å¼?(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:2124
+#: ../app/dialogs/preferences-dialog.c:2123
 msgid "Pointer re_ndering:"
 msgstr "æ??æ¨?ç¹ªè£½(_N):"
 
-#: ../app/dialogs/preferences-dialog.c:2136
+#: ../app/dialogs/preferences-dialog.c:2135
 msgid "Image Window Appearance"
 msgstr "å??ç??è¦?çª?å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2147
+#: ../app/dialogs/preferences-dialog.c:2146
 msgid "Default Appearance in Normal Mode"
 msgstr "å?¨æ£å¸¸æ¨¡å¼?ç??é ?è¨å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2152
+#: ../app/dialogs/preferences-dialog.c:2151
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "å?¨è?¢å¹?æ¨¡å¼?ä¸ç??é ?è¨å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2161
+#: ../app/dialogs/preferences-dialog.c:2160
 msgid "Image Title & Statusbar Format"
 msgstr "å??ç??æ¨?é¡?å??ç??æ??å??é¡¯ç¤ºæ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2164
+#: ../app/dialogs/preferences-dialog.c:2163
 msgid "Title & Status"
 msgstr "æ¨?é¡?å??ç??æ??"
 
-#: ../app/dialogs/preferences-dialog.c:2182
+#: ../app/dialogs/preferences-dialog.c:2181
 msgid "Current format"
 msgstr "ç?®å??ç??æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2183
+#: ../app/dialogs/preferences-dialog.c:2182
 msgid "Default format"
 msgstr "é ?è¨ç??æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2184
+#: ../app/dialogs/preferences-dialog.c:2183
 msgid "Show zoom percentage"
 msgstr "é¡¯ç¤ºç¸®æ?¾ç?¾å??æ¯?"
 
-#: ../app/dialogs/preferences-dialog.c:2185
+#: ../app/dialogs/preferences-dialog.c:2184
 msgid "Show zoom ratio"
 msgstr "é¡¯ç¤ºç¸®æ?¾æ¯?ä¾?"
 
-#: ../app/dialogs/preferences-dialog.c:2186
+#: ../app/dialogs/preferences-dialog.c:2185
 msgid "Show image size"
 msgstr "é¡¯ç¤ºå??ç??å°ºå¯¸"
 
-#: ../app/dialogs/preferences-dialog.c:2199
+#: ../app/dialogs/preferences-dialog.c:2198
 msgid "Image Title Format"
 msgstr "å??ç??æ¨?é¡?æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2201
+#: ../app/dialogs/preferences-dialog.c:2200
 msgid "Image Statusbar Format"
 msgstr "å??ç??ç??æ??å??é¡¯ç¤ºæ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2286
+#: ../app/dialogs/preferences-dialog.c:2285
 msgid "Display"
 msgstr "é¡¯ç¤º"
 
-#: ../app/dialogs/preferences-dialog.c:2298
+#. Transparency
+#: ../app/dialogs/preferences-dialog.c:2297
 msgid "Transparency"
 msgstr "é??æ??"
 
-#: ../app/dialogs/preferences-dialog.c:2302
+#: ../app/dialogs/preferences-dialog.c:2301
 msgid "_Check style:"
 msgstr "æª¢æ?¥æ¨£å¼?(_C):"
 
-#: ../app/dialogs/preferences-dialog.c:2305
+#: ../app/dialogs/preferences-dialog.c:2304
 msgid "Check _size:"
 msgstr "æª¢æ?¥å¤§å°?(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:2308
+#: ../app/dialogs/preferences-dialog.c:2307
 msgid "Monitor Resolution"
 msgstr "è?¢å¹?è§£æ??åº¦"
 
-#: ../app/dialogs/preferences-dialog.c:2312
-#: ../app/display/gimpcursorview.c:200
-#: ../app/widgets/gimpgrideditor.c:268
-#: ../app/widgets/gimpgrideditor.c:300
+#. Pixels
+#: ../app/dialogs/preferences-dialog.c:2311
+#: ../app/display/gimpcursorview.c:200 ../app/widgets/gimpgrideditor.c:270
+#: ../app/widgets/gimpgrideditor.c:302
 msgid "Pixels"
 msgstr "å??ç´ "
 
-#: ../app/dialogs/preferences-dialog.c:2330
+#: ../app/dialogs/preferences-dialog.c:2329
 msgid "Horizontal"
 msgstr "æ°´å¹³"
 
-#: ../app/dialogs/preferences-dialog.c:2332
+#: ../app/dialogs/preferences-dialog.c:2331
 msgid "Vertical"
 msgstr "å??ç?´"
 
-#: ../app/dialogs/preferences-dialog.c:2334
+#: ../app/dialogs/preferences-dialog.c:2333
 #: ../app/widgets/gimpimagepropview.c:475
 msgid "ppi"
 msgstr "ppi"
 
-#: ../app/dialogs/preferences-dialog.c:2350
+#: ../app/dialogs/preferences-dialog.c:2349
 #, c-format
 msgid "_Detect automatically (currently %d Ã? %d ppi)"
 msgstr "è?ªå??å?µæ¸¬ï¼?ç?®å?? %d Ã? %d ppiï¼?(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2370
+#: ../app/dialogs/preferences-dialog.c:2368
 msgid "_Enter manually"
 msgstr "æ??å??è¼¸å?¥(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:2385
+#: ../app/dialogs/preferences-dialog.c:2383
 msgid "C_alibrate..."
 msgstr "å¾®èª¿(_A)..."
 
-#: ../app/dialogs/preferences-dialog.c:2408
+#: ../app/dialogs/preferences-dialog.c:2406
 msgid "Color Management"
 msgstr "è?²å½©ç®¡ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2428
+#: ../app/dialogs/preferences-dialog.c:2426
 msgid "_RGB profile:"
 msgstr "_RGB é??ç½®æª?ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2429
+#: ../app/dialogs/preferences-dialog.c:2427
 msgid "Select RGB Color Profile"
 msgstr "é?¸æ?? RGB è?²å½©é??ç½®æª?"
 
-#: ../app/dialogs/preferences-dialog.c:2430
+#: ../app/dialogs/preferences-dialog.c:2428
 msgid "_CMYK profile:"
 msgstr "_CMYK é??ç½®æª?ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2431
+#: ../app/dialogs/preferences-dialog.c:2429
 msgid "Select CMYK Color Profile"
 msgstr "é?¸æ?? CMYK è?²å½©é??ç½®æª?"
 
-#: ../app/dialogs/preferences-dialog.c:2432
+#: ../app/dialogs/preferences-dialog.c:2430
 msgid "_Monitor profile:"
 msgstr "è?¢å¹?é??ç½®æª?(_M)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2433
+#: ../app/dialogs/preferences-dialog.c:2431
 msgid "Select Monitor Color Profile"
 msgstr "é?¸æ??è?¢å¹?è?²å½©é??ç½®æª?"
 
-#: ../app/dialogs/preferences-dialog.c:2434
+#: ../app/dialogs/preferences-dialog.c:2432
 msgid "_Print simulation profile:"
 msgstr "å??å?°æ¨¡æ?¬é??ç½®æª?(_P):"
 
-#: ../app/dialogs/preferences-dialog.c:2435
+#: ../app/dialogs/preferences-dialog.c:2433
 msgid "Select Printer Color Profile"
 msgstr "é?¸æ??å?°è¡¨æ©?è?²å½©é??ç½®æª?"
 
-#: ../app/dialogs/preferences-dialog.c:2446
+#: ../app/dialogs/preferences-dialog.c:2444
 msgid "_Mode of operation:"
 msgstr "æ??ä½?æ¨¡å¼?(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:2476
+#: ../app/dialogs/preferences-dialog.c:2474
 msgid "_Try to use the system monitor profile"
 msgstr "å??è©¦ä½¿ç?¨ç³»çµ±è?¢å¹?é??ç½®æª?(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2486
+#: ../app/dialogs/preferences-dialog.c:2484
 msgid "_Display rendering intent:"
 msgstr "é¡¯ç¤ºæ¼?è?²æ??æ¶µ(_D):"
 
-#: ../app/dialogs/preferences-dialog.c:2495
+#: ../app/dialogs/preferences-dialog.c:2493
 msgid "_Softproof rendering intent:"
 msgstr "è»?å¼?æ??æ¨£æ¼?è?²æ??æ¶µ(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:2508
+#: ../app/dialogs/preferences-dialog.c:2506
 msgid "Mark out of gamut colors"
 msgstr "æ¨?è¨?è¶?å?ºå?¨è?²å½©ç¯?å??"
 
-#: ../app/dialogs/preferences-dialog.c:2513
+#: ../app/dialogs/preferences-dialog.c:2511
 msgid "Select Warning Color"
 msgstr "é?¸æ??è¦å??é¡?è?²"
 
-#: ../app/dialogs/preferences-dialog.c:2526
+#: ../app/dialogs/preferences-dialog.c:2524
 msgid "File Open behaviour:"
 msgstr "æª?æ¡?é??å??è¡?ç?º:"
 
-#: ../app/dialogs/preferences-dialog.c:2538
+#: ../app/dialogs/preferences-dialog.c:2536
 msgid "Input Devices"
 msgstr "è¼¸å?¥è£?ç½®"
 
-#: ../app/dialogs/preferences-dialog.c:2548
+#. Extended Input Devices
+#: ../app/dialogs/preferences-dialog.c:2546
 msgid "Extended Input Devices"
 msgstr "é¡?å¤?è¼¸å?¥è£?ç½®"
 
-#: ../app/dialogs/preferences-dialog.c:2552
+#: ../app/dialogs/preferences-dialog.c:2550
 msgid "Configure E_xtended Input Devices..."
 msgstr "è¨å®?é¡?å¤?ç??è¼¸å?¥è£?ç½®(_X)..."
 
-#: ../app/dialogs/preferences-dialog.c:2559
+#: ../app/dialogs/preferences-dialog.c:2557
 msgid "_Save input device settings on exit"
 msgstr "çµ?æ??æ??å?²å?è¼¸å?¥è£?ç½®ç??è¨å®?(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2563
+#: ../app/dialogs/preferences-dialog.c:2561
 msgid "Save Input Device Settings _Now"
 msgstr "ç«?å?»å?²å?è¼¸å?¥è£?ç½®ç??è¨å®?(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2570
+#: ../app/dialogs/preferences-dialog.c:2568
 msgid "_Reset Saved Input Device Settings to Default Values"
 msgstr "é??æ?°è¼?å?¥å·²å?²å?ç??è¼¸å?¥è£?ç½®è¨å®?(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2585
+#: ../app/dialogs/preferences-dialog.c:2583
 msgid "Additional Input Controllers"
 msgstr "é¡?å¤?è¼¸å?¥è£?ç½®"
 
-#: ../app/dialogs/preferences-dialog.c:2588
+#: ../app/dialogs/preferences-dialog.c:2586
 msgid "Input Controllers"
 msgstr "è¼¸å?¥è£?ç½®"
 
-#: ../app/dialogs/preferences-dialog.c:2604
+#: ../app/dialogs/preferences-dialog.c:2602
 msgid "Window Management"
 msgstr "è¦?çª?ç®¡ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2613
+#: ../app/dialogs/preferences-dialog.c:2611
 msgid "Window Manager Hints"
 msgstr "è¦?çª?ç¸½ç®¡ç??æ??ç¤º"
 
-#: ../app/dialogs/preferences-dialog.c:2619
+#: ../app/dialogs/preferences-dialog.c:2617
 msgid "Hint for _docks and toolbox:"
 msgstr "çµ¦å??é§?å¼?å°?è©±ç??å??å·¥å?·ç®±ç??æ??ç¤º(_D)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2622
+#: ../app/dialogs/preferences-dialog.c:2620
 msgid "Focus"
 msgstr "ç?¦é»?"
 
-#: ../app/dialogs/preferences-dialog.c:2626
+#: ../app/dialogs/preferences-dialog.c:2624
 msgid "Activate the _focused image"
 msgstr "ä½¿ç?¨å·²ç?²ç?¦é»?ç??å??ç??(_F)"
 
-#: ../app/dialogs/preferences-dialog.c:2630
+#. Window Positions
+#: ../app/dialogs/preferences-dialog.c:2628
 msgid "Window Positions"
 msgstr "è¦?çª?ä½?ç½®"
 
-#: ../app/dialogs/preferences-dialog.c:2633
+#: ../app/dialogs/preferences-dialog.c:2631
 msgid "_Save window positions on exit"
 msgstr "çµ?æ??ç¨?å¼?æ??å?²å?è¦?çª?ä½?ç½®(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2637
+#: ../app/dialogs/preferences-dialog.c:2635
 msgid "Save Window Positions _Now"
 msgstr "ç«?å?»å?²å?è¦?çª?ä½?ç½®(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2644
+#: ../app/dialogs/preferences-dialog.c:2642
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr "å°?è¦?çª?ä½?ç½®è¨å®?ç?ºç¨?å¼?æ?¬èº«ç??é ?è¨å?¼(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2659
+#: ../app/dialogs/preferences-dialog.c:2657
 msgid "Folders"
 msgstr "è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2679
+#: ../app/dialogs/preferences-dialog.c:2677
 msgid "Temporary folder:"
 msgstr "æ?«å?è³?æ??å¤¾:"
 
-#: ../app/dialogs/preferences-dialog.c:2680
+#: ../app/dialogs/preferences-dialog.c:2678
 msgid "Select Folder for Temporary Files"
 msgstr "é?¸æ??æ?«å?æª?æ¡?ä½¿ç?¨ç??è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2684
+#: ../app/dialogs/preferences-dialog.c:2682
 msgid "Swap folder:"
 msgstr "äº¤æ??è¨?æ?¶æª?è³?æ??å¤¾:"
 
-#: ../app/dialogs/preferences-dialog.c:2685
+#: ../app/dialogs/preferences-dialog.c:2683
 msgid "Select Swap Folder"
 msgstr "é?¸å??äº¤æ??æª?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2720
+#: ../app/dialogs/preferences-dialog.c:2718
 msgid "Brush Folders"
 msgstr "ç?å?·è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2722
+#: ../app/dialogs/preferences-dialog.c:2720
 msgid "Select Brush Folders"
 msgstr "é?¸å??ç?å?·è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2724
+#: ../app/dialogs/preferences-dialog.c:2722
 msgid "Dynamics Folders"
 msgstr "ç?å?·å??æ??è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2726
+#: ../app/dialogs/preferences-dialog.c:2724
 msgid "Select Dynamics Folders"
 msgstr "é?¸å??ç?å?·å??æ??è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2728
+#: ../app/dialogs/preferences-dialog.c:2726
 msgid "Pattern Folders"
 msgstr "å??æ¨£è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2730
+#: ../app/dialogs/preferences-dialog.c:2728
 msgid "Select Pattern Folders"
 msgstr "é?¸å??å??æ¨£è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2732
+#: ../app/dialogs/preferences-dialog.c:2730
 msgid "Palette Folders"
 msgstr "èª¿è?²ç?¤è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2734
+#: ../app/dialogs/preferences-dialog.c:2732
 msgid "Select Palette Folders"
 msgstr "é?¸å??èª¿è?²ç?¤è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2736
+#: ../app/dialogs/preferences-dialog.c:2734
 msgid "Gradient Folders"
 msgstr "æ¼¸å±¤è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2738
+#: ../app/dialogs/preferences-dialog.c:2736
 msgid "Select Gradient Folders"
 msgstr "é?¸å??æ¼¸å±¤è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/dialogs/preferences-dialog.c:2738
 msgid "Font Folders"
 msgstr "å?å??è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2740
 msgid "Select Font Folders"
 msgstr "é?¸å??å?å??è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/dialogs/preferences-dialog.c:2742
 msgid "Plug-In Folders"
 msgstr "å¢?æ??æ¨¡çµ?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2744
 msgid "Select Plug-In Folders"
 msgstr "é?¸å??å¢?æ??æ¨¡çµ?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2746
 msgid "Scripts"
 msgstr "å?½ä»¤ç¨¿"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2746
 msgid "Script-Fu Folders"
 msgstr "Script-Fu è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2748
 msgid "Select Script-Fu Folders"
 msgstr "é?¸å?? Script-Fu è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2752
+#: ../app/dialogs/preferences-dialog.c:2750
 msgid "Module Folders"
 msgstr "æ¨¡çµ?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2754
+#: ../app/dialogs/preferences-dialog.c:2752
 msgid "Select Module Folders"
 msgstr "é?¸å??æ¨¡çµ?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2754
 msgid "Interpreters"
 msgstr "è§£è¯å?¨"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2754
 msgid "Interpreter Folders"
 msgstr "è§£è¯å?¨è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2758
+#: ../app/dialogs/preferences-dialog.c:2756
 msgid "Select Interpreter Folders"
 msgstr "é?¸å??è§£è¯å?¨è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2758
 msgid "Environment Folders"
 msgstr "ç?°å¢?è®?æ?¸è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2762
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Select Environment Folders"
 msgstr "é?¸å??ç?°å¢?è®?æ?¸è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2762
 msgid "Themes"
 msgstr "ä½?æ?¯ä¸»é¡?"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2762
 msgid "Theme Folders"
 msgstr "ä½?æ?¯ä¸»é¡?è³?æ??å¤¾"
 
-#: ../app/dialogs/preferences-dialog.c:2766
+#: ../app/dialogs/preferences-dialog.c:2764
 msgid "Select Theme Folders"
 msgstr "é?¸å??ä½?æ?¯ä¸»é¡?è³?æ??å¤¾"
 
@@ -9922,33 +10086,29 @@ msgstr "é?¸å??ä½?æ?¯ä¸»é¡?è³?æ??å¤¾"
 msgid "Print Size"
 msgstr "å??å?°å°ºå¯¸"
 
-#: ../app/dialogs/print-size-dialog.c:165
-#: ../app/widgets/gimpsizebox.c:198
-#: ../app/widgets/gimptemplateeditor.c:160
+#. the image size labels
+#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:201
+#: ../app/widgets/gimptemplateeditor.c:163
 msgid "_Width:"
 msgstr "å¯¬åº¦(_W):"
 
-#: ../app/dialogs/print-size-dialog.c:172
-#: ../app/widgets/gimpsizebox.c:202
-#: ../app/widgets/gimptemplateeditor.c:167
+#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:205
+#: ../app/widgets/gimptemplateeditor.c:170
 msgid "H_eight:"
 msgstr "é«?åº¦(_E):"
 
-#: ../app/dialogs/print-size-dialog.c:222
-#: ../app/widgets/gimpsizebox.c:260
-#: ../app/widgets/gimptemplateeditor.c:287
+#. the resolution labels
+#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:263
+#: ../app/widgets/gimptemplateeditor.c:290
 msgid "_X resolution:"
 msgstr "æ°´å¹³è§£æ??åº¦(_X):"
 
-#: ../app/dialogs/print-size-dialog.c:229
-#: ../app/widgets/gimpsizebox.c:263
-#: ../app/widgets/gimptemplateeditor.c:294
+#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:266
+#: ../app/widgets/gimptemplateeditor.c:297
 msgid "_Y resolution:"
 msgstr "å??ç?´è§£æ??åº¦(_Y):"
 
-#: ../app/dialogs/print-size-dialog.c:240
-#: ../app/widgets/gimpsizebox.c:256
-#: ../app/widgets/gimptemplateeditor.c:307
+#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:259
 #, c-format
 msgid "pixels/%a"
 msgstr "å??ç´ /%a"
@@ -9984,8 +10144,7 @@ msgstr "æ?¾æ£?æ?´æ?¹(_D)"
 msgid "Canvas Size"
 msgstr "ç?«å¸?å°ºå¯¸"
 
-#: ../app/dialogs/resize-dialog.c:130
-#: ../app/dialogs/scale-dialog.c:109
+#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:109
 msgid "Layer Size"
 msgstr "å??å±¤å°ºå¯¸"
 
@@ -10009,8 +10168,8 @@ msgstr "æ°´å¹³(_H):"
 msgid "_Vertical:"
 msgstr "å??ç?´(_V):"
 
-#: ../app/dialogs/scale-dialog.c:98
-#: ../app/widgets/gimptemplateeditor.c:138
+#. Image size frame
+#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:141
 msgid "Image Size"
 msgstr "å??ç??å°ºå¯¸"
 
@@ -10023,8 +10182,11 @@ msgid "I_nterpolation:"
 msgstr "å?§æ??æ³?(_N):"
 
 #: ../app/dialogs/scale-dialog.c:207
-msgid "Indexed color layers are always scaled without interpolation. The chosen interpolation type will affect channels and layer masks only."
-msgstr "ç´¢å¼?è?²å??å±¤æ°¸é? ä¸?ä½¿ç?¨å?§æ??æ³?ç¸®æ?¾ã??é?¸å??ç??å?§æ??æ³?é¡?å??å°?å?ªå½±é?¿è?²ç??å??å??å±¤é?®ç½©ã??"
+msgid ""
+"Indexed color layers are always scaled without interpolation. The chosen "
+"interpolation type will affect channels and layer masks only."
+msgstr ""
+"ç´¢å¼?è?²å??å±¤æ°¸é? ä¸?ä½¿ç?¨å?§æ??æ³?ç¸®æ?¾ã??é?¸å??ç??å?§æ??æ³?é¡?å??å°?å?ªå½±é?¿è?²ç??å??å??å±¤é?®ç½©ã??"
 
 #: ../app/dialogs/stroke-dialog.c:97
 msgid "Choose Stroke Style"
@@ -10067,10 +10229,16 @@ msgstr "ä¸?ä¸?å??å¯?è¨£(_P)"
 msgid "_Next Tip"
 msgstr "ä¸?ä¸?å??å¯?è¨£(_N)"
 
+#. a link to the related section in the user manual
 #: ../app/dialogs/tips-dialog.c:193
 msgid "Learn more"
 msgstr "äº?è§£æ?´å¤?"
 
+#. This is a special string to specify the language identifier to
+#. look for in the gimp-tips.xml file. Please translate the C in it
+#. according to the name of the po file used for gimp-tips.xml.
+#. E.g. for the german translation, that would be "tips-locale:de".
+#.
 #: ../app/dialogs/tips-parser.c:187
 msgid "tips-locale:C"
 msgstr "tips-locale:zh_TW"
@@ -10128,54 +10296,48 @@ msgstr "ç¸®æ?¾å?¯å?¥ç??è·¯å¾?ä»¥ç¬¦å??å??ç??(_S)"
 msgid "Path name:"
 msgstr "è·¯å¾?å??ç¨±:"
 
-#: ../app/display/gimpcursorview.c:210
-#: ../app/display/gimpcursorview.c:216
-#: ../app/display/gimpcursorview.c:235
-#: ../app/display/gimpcursorview.c:241
-#: ../app/display/gimpcursorview.c:260
-#: ../app/display/gimpcursorview.c:266
-#: ../app/display/gimpcursorview.c:282
-#: ../app/display/gimpcursorview.c:289
-#: ../app/display/gimpcursorview.c:664
-#: ../app/display/gimpcursorview.c:665
-#: ../app/display/gimpcursorview.c:666
-#: ../app/display/gimpcursorview.c:667
-#: ../app/display/gimpcursorview.c:780
-#: ../app/display/gimpcursorview.c:781
-#: ../app/display/gimpcursorview.c:782
-#: ../app/display/gimpcursorview.c:783
-#: ../app/widgets/gimpcolorframe.c:630
+#: ../app/display/gimpcursorview.c:210 ../app/display/gimpcursorview.c:216
+#: ../app/display/gimpcursorview.c:235 ../app/display/gimpcursorview.c:241
+#: ../app/display/gimpcursorview.c:260 ../app/display/gimpcursorview.c:266
+#: ../app/display/gimpcursorview.c:282 ../app/display/gimpcursorview.c:289
+#: ../app/display/gimpcursorview.c:664 ../app/display/gimpcursorview.c:665
+#: ../app/display/gimpcursorview.c:666 ../app/display/gimpcursorview.c:667
+#: ../app/display/gimpcursorview.c:780 ../app/display/gimpcursorview.c:781
+#: ../app/display/gimpcursorview.c:782 ../app/display/gimpcursorview.c:783
+#: ../app/widgets/gimpcolorframe.c:633
 msgid "n/a"
 msgstr "ç?¡"
 
-#: ../app/display/gimpcursorview.c:213
-#: ../app/display/gimpcursorview.c:238
+#: ../app/display/gimpcursorview.c:213 ../app/display/gimpcursorview.c:238
 #: ../app/display/gimpcursorview.c:263
 #: ../app/widgets/gimpdeviceinfoeditor.c:140
 msgid "X"
 msgstr "X"
 
-#: ../app/display/gimpcursorview.c:219
-#: ../app/display/gimpcursorview.c:244
+#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244
 #: ../app/display/gimpcursorview.c:269
 #: ../app/widgets/gimpdeviceinfoeditor.c:141
 msgid "Y"
 msgstr "Y"
 
+#. Units
 #: ../app/display/gimpcursorview.c:225
 msgid "Units"
 msgstr "é?·åº¦å?®ä½?"
 
+#. Selection Bounding Box
 #: ../app/display/gimpcursorview.c:250
 #, fuzzy
 msgid "Selection Bounding Box"
 msgstr "ä¸?è¼?æ¤ç¶?å®?æ?¹å¡?"
 
+#. Width
 #: ../app/display/gimpcursorview.c:286
 #, fuzzy
 msgid "W"
 msgstr "è¥¿"
 
+#. Height
 #: ../app/display/gimpcursorview.c:293
 #, fuzzy
 msgid "H"
@@ -10185,25 +10347,24 @@ msgstr "H"
 msgid "_Sample Merged"
 msgstr "å??ä½µæ¨£æ?¬(_S)"
 
-#: ../app/display/gimpdisplayshell.c:502
+#: ../app/display/gimpdisplayshell.c:506
 msgid "Access the image menu"
 msgstr "å?å??å??ç??é?¸å?®"
 
-#: ../app/display/gimpdisplayshell.c:616
+#: ../app/display/gimpdisplayshell.c:617
 msgid "Zoom image when window size changes"
 msgstr "è¦?çª?å°ºå¯¸æ?´æ?¹æ??èª¿æ?´ç¸®æ?¾æ¯?ç??"
 
-#: ../app/display/gimpdisplayshell.c:645
+#: ../app/display/gimpdisplayshell.c:646
 msgid "Toggle Quick Mask"
 msgstr "å??æ??å¿«é??é?®ç½©"
 
-#: ../app/display/gimpdisplayshell.c:668
+#: ../app/display/gimpdisplayshell.c:669
 msgid "Navigate the image display"
 msgstr "å°?è¦½è?³å??ç??é¡¯ç¤º"
 
-#: ../app/display/gimpdisplayshell.c:736
-#: ../app/display/gimpdisplayshell.c:1328
-#: ../app/widgets/gimptoolbox.c:315
+#: ../app/display/gimpdisplayshell.c:737
+#: ../app/display/gimpdisplayshell.c:1323 ../app/widgets/gimptoolbox.c:270
 msgid "Drop image files here to open them"
 msgstr "å°?å??ç??æª?æ¡?æ??æ?¾è?³æ¤ä»¥é??å??å®?å??"
 
@@ -10225,21 +10386,27 @@ msgstr "é??é??è¦?çª?ä¹?å??æ?¯å?¦å?²å?å??ç?? â??%sâ??ï¼?"
 #: ../app/display/gimpdisplayshell-close.c:254
 #, c-format
 msgid "If you don't save the image, changes from the last hour will be lost."
-msgid_plural "If you don't save the image, changes from the last %d hours will be lost."
+msgid_plural ""
+"If you don't save the image, changes from the last %d hours will be lost."
 msgstr[0] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? 1 å°?æ??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 msgstr[1] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? %d å°?æ??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 
 #: ../app/display/gimpdisplayshell-close.c:264
 #, c-format
-msgid "If you don't save the image, changes from the last hour and %d minute will be lost."
-msgid_plural "If you don't save the image, changes from the last hour and %d minutes will be lost."
+msgid ""
+"If you don't save the image, changes from the last hour and %d minute will "
+"be lost."
+msgid_plural ""
+"If you don't save the image, changes from the last hour and %d minutes will "
+"be lost."
 msgstr[0] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? 1 å°?æ?? %d å??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 msgstr[1] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? 1 å°?æ?? %d å??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 
 #: ../app/display/gimpdisplayshell-close.c:275
 #, c-format
 msgid "If you don't save the image, changes from the last minute will be lost."
-msgid_plural "If you don't save the image, changes from the last %d minutes will be lost."
+msgid_plural ""
+"If you don't save the image, changes from the last %d minutes will be lost."
 msgstr[0] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? 1 å??é??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 msgstr[1] "å¦?æ??ç?¾å?¨ä¸?å?²å?å??ç??ï¼?å°?æ??å¤±å?»æ??å¾? %d å??é??æ??ä¿®æ?¹ç??é?¨ä»½ã??"
 
@@ -10254,22 +10421,16 @@ msgid "Drop New Path"
 msgstr "æ??æ?¾æ?°ç??è·¯å¾?"
 
 #: ../app/display/gimpdisplayshell-dnd.c:347
-#: ../app/display/gimpdisplayshell-dnd.c:442
-#: ../app/tools/gimpblendtool.c:174
-#: ../app/tools/gimpbucketfilltool.c:135
-#: ../app/tools/gimpimagemaptool.c:279
+#: ../app/display/gimpdisplayshell-dnd.c:442 ../app/tools/gimpblendtool.c:171
+#: ../app/tools/gimpbucketfilltool.c:135 ../app/tools/gimpimagemaptool.c:280
 msgid "Cannot modify the pixels of layer groups."
 msgstr "ä¸?è?½ä¿®æ?¹å??å±¤ç¾¤çµ?ç??å??ç´ ã??"
 
 #: ../app/display/gimpdisplayshell-dnd.c:355
-#: ../app/display/gimpdisplayshell-dnd.c:450
-#: ../app/tools/gimpblendtool.c:181
-#: ../app/tools/gimpbucketfilltool.c:142
-#: ../app/tools/gimpcroptool.c:335
-#: ../app/tools/gimpimagemaptool.c:286
-#: ../app/tools/gimppainttool.c:286
-#: ../app/tools/gimptransformtool.c:350
-#: ../app/tools/gimptransformtool.c:1174
+#: ../app/display/gimpdisplayshell-dnd.c:450 ../app/tools/gimpblendtool.c:178
+#: ../app/tools/gimpbucketfilltool.c:142 ../app/tools/gimpcroptool.c:342
+#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:285
+#: ../app/tools/gimptransformtool.c:315 ../app/tools/gimptransformtool.c:1261
 msgid "The active layer's pixels are locked."
 msgstr "ä½¿ç?¨ä¸ç??å??å±¤å??ç´ è¢«é??å®?ã??"
 
@@ -10280,8 +10441,7 @@ msgstr "æ??æ?¾å??å±¤"
 
 #: ../app/display/gimpdisplayshell-dnd.c:635
 #: ../app/display/gimpdisplayshell-dnd.c:657
-#: ../app/widgets/gimplayertreeview.c:811
-#: ../app/widgets/gimptoolbox-dnd.c:274
+#: ../app/widgets/gimplayertreeview.c:811 ../app/widgets/gimptoolbox-dnd.c:276
 msgid "Dropped Buffer"
 msgstr "æ??æ?¾ç·©è¡?å??"
 
@@ -10293,12 +10453,12 @@ msgstr "æ¿¾è?²ç??"
 msgid "Configure Color Display Filters"
 msgstr "è¨å®?æ¿¾è?²ç??"
 
-#: ../app/display/gimpdisplayshell-handlers.c:749
+#: ../app/display/gimpdisplayshell-handlers.c:802
 #, c-format
 msgid "Image saved to '%s'"
 msgstr "å??ç??å?²å?ç?ºâ??%sâ??"
 
-#: ../app/display/gimpdisplayshell-handlers.c:763
+#: ../app/display/gimpdisplayshell-handlers.c:816
 #, c-format
 msgid "Image exported to '%s'"
 msgstr "å??ç??å?¯å?ºå?° %s"
@@ -10343,19 +10503,18 @@ msgstr "(å?¯å?º)"
 
 #: ../app/display/gimpdisplayshell-title.c:506
 msgid " (overwritten)"
-msgstr ""
+msgstr "(è¦?è??)"
 
 #: ../app/display/gimpdisplayshell-title.c:512
 msgid " (imported)"
 msgstr "(å?¯å?¥)"
 
-#: ../app/display/gimpstatusbar.c:358
+#: ../app/display/gimpstatusbar.c:356
 #, c-format
 msgid "Cancel <i>%s</i>"
 msgstr "å??æ¶? <i>%s</i>"
 
-#: ../app/file/file-open.c:136
-#: ../app/file/file-save.c:112
+#: ../app/file/file-open.c:136 ../app/file/file-save.c:112
 msgid "Not a regular file"
 msgstr "ä¸?æ?¯æ?®é??æª?æ¡?"
 
@@ -10379,7 +10538,9 @@ msgid "Opening '%s' failed: %s"
 msgstr "é??å??â??%sâ??å¤±æ??ï¼?%s"
 
 #: ../app/file/file-open.c:678
-msgid "Color management has been disabled. It can be enabled again in the Preferences dialog."
+msgid ""
+"Color management has been disabled. It can be enabled again in the "
+"Preferences dialog."
 msgstr "è?²å½©ç®¡ç??å·²ç¶?è¢«å??ç?¨ã??å®?å?¯ä»¥å?¨å??å¥½è¨å®?å°?è©±ç??ä¸å??æ¬¡å??ç?¨ã??"
 
 #: ../app/file/file-procedure.c:198
@@ -10396,17 +10557,27 @@ msgstr "%s å¢?æ??æ¨¡çµ?ç?¡æ³?å?²å?å??ç??"
 msgid "'%s:' is not a valid URI scheme"
 msgstr "ã??%s:ã??ä¸?æ?¯æ??æ??ç?? URI æ?¶æ§?"
 
-#: ../app/file/file-utils.c:90
-#: ../app/file/file-utils.c:126
+#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126
 msgid "Invalid character sequence in URI"
 msgstr "URI ä¸å?ºç?¾ç?¡æ??ç??å?ç¬¦æ¬¡åº?"
 
+#: ../app/gegl/gimp-gegl-enums.c:24
+#, fuzzy
+msgctxt "cage-mode"
+msgid "Create or adjust the cage"
+msgstr "è£½ä½?æ?°ç??å??ç??"
+
+#: ../app/gegl/gimp-gegl-enums.c:25
+#, fuzzy
+msgctxt "cage-mode"
+msgid "Deform the cage to deform the image"
+msgstr "èª¿æ?´å??å±¤ç?ºå??ç??ç??å¤§å°?"
+
 #: ../app/gegl/gimpcurvesconfig.c:384
 msgid "not a GIMP Curves file"
 msgstr "ä¸?æ?¯ GIMP æ?²ç·?æª?æ¡?"
 
-#: ../app/gegl/gimpcurvesconfig.c:399
-#: ../app/gegl/gimplevelsconfig.c:710
+#: ../app/gegl/gimpcurvesconfig.c:399 ../app/gegl/gimplevelsconfig.c:710
 msgid "parse error"
 msgstr "å??æ??é?¯èª¤"
 
@@ -10414,7 +10585,8 @@ msgstr "å??æ??é?¯èª¤"
 msgid "not a GIMP Levels file"
 msgstr "ä¸¦é?? GIMP è?²é??æª?æ¡?"
 
-#: ../app/gui/gui.c:425
+#. initialize the document history
+#: ../app/gui/gui.c:422
 msgid "Documents"
 msgstr "æ??ä»¶"
 
@@ -10422,21 +10594,19 @@ msgstr "æ??ä»¶"
 msgid "GIMP Startup"
 msgstr "å??å?? GIMP"
 
-#: ../app/paint/gimpairbrush.c:72
-#: ../app/tools/gimpairbrushtool.c:53
+#: ../app/paint/gimpairbrush.c:72 ../app/tools/gimpairbrushtool.c:54
 msgid "Airbrush"
 msgstr "å?´æ§?"
 
-#: ../app/paint/gimpbrushcore.c:435
+#: ../app/paint/gimpbrushcore.c:432
 msgid "No brushes available for use with this tool."
 msgstr "æ²?æ??ç?å?·å?¯é??å??æ¤å·¥å?·ä½¿ç?¨ã??"
 
-#: ../app/paint/gimpbrushcore.c:442
+#: ../app/paint/gimpbrushcore.c:439
 msgid "No paint dynamics available for use with this tool."
 msgstr "æ²?æ??ç?å?·å??æ??å?¯é??å??æ¤å·¥å?·ä½¿ç?¨ã??"
 
-#: ../app/paint/gimpclone.c:102
-#: ../app/tools/gimpclonetool.c:60
+#: ../app/paint/gimpclone.c:102 ../app/tools/gimpclonetool.c:60
 msgid "Clone"
 msgstr "æ¨¡ä»¿"
 
@@ -10452,13 +10622,11 @@ msgstr "æ?²ç©?"
 msgid "Dodge/Burn"
 msgstr "æ¼?ç?½/ç?»é»?"
 
-#: ../app/paint/gimperaser.c:65
-#: ../app/tools/gimperasertool.c:65
+#: ../app/paint/gimperaser.c:65 ../app/tools/gimperasertool.c:65
 msgid "Eraser"
 msgstr "æ©¡ç?®æ?¦"
 
-#: ../app/paint/gimpheal.c:118
-#: ../app/tools/gimphealtool.c:52
+#: ../app/paint/gimpheal.c:118 ../app/tools/gimphealtool.c:52
 msgid "Heal"
 msgstr "ä¿®è£?"
 
@@ -10466,8 +10634,7 @@ msgstr "ä¿®è£?"
 msgid "Healing does not operate on indexed layers."
 msgstr "ä¿®è£?ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
 
-#: ../app/paint/gimpink.c:97
-#: ../app/tools/gimpinktool.c:54
+#: ../app/paint/gimpink.c:97 ../app/tools/gimpinktool.c:54
 msgid "Ink"
 msgstr "å¢¨æ°´ç?"
 
@@ -10483,30 +10650,25 @@ msgstr "å¢¨æ°´æ??é»?é?·å¯¬æ¯?"
 msgid "Ink Blob Angle"
 msgstr "å¢¨æ°´æ??é»?è§?åº¦"
 
-#: ../app/paint/gimppaintbrush.c:65
-#: ../app/tools/gimppaintbrushtool.c:50
+#: ../app/paint/gimppaintbrush.c:65 ../app/tools/gimppaintbrushtool.c:50
 msgid "Paintbrush"
 msgstr "ç?«ç?"
 
-#: ../app/paint/gimppaintcore-stroke.c:335
-msgid "Not enough points to stroke"
-msgstr "æ²?æ??è¶³å¤ ç??ç?å??é»?"
-
 #: ../app/paint/gimppaintcore.c:140
 msgid "Paint"
 msgstr "ç¹ªå??"
 
 #: ../app/paint/gimppaintoptions.c:138
-msgid "Brush Scale"
-msgstr "ç?å?·ç¸®æ?¾"
+#, fuzzy
+msgid "Brush Size"
+msgstr "ç·¨è¼¯é?·é??"
 
-#: ../app/paint/gimppencil.c:41
-#: ../app/tools/gimppenciltool.c:50
+#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50
 msgid "Pencil"
 msgstr "é??ç?"
 
 #: ../app/paint/gimpperspectiveclone.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:128
+#: ../app/tools/gimpperspectiveclonetool.c:124
 msgid "Perspective Clone"
 msgstr "é??è¦?æ³?ä»¿è£½"
 
@@ -10514,8 +10676,7 @@ msgstr "é??è¦?æ³?ä»¿è£½"
 msgid "Perspective Clone does not operate on indexed layers."
 msgstr "é??è¦?æ³?ä»¿è£½ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²å??å±¤ã??"
 
-#: ../app/paint/gimpsmudge.c:83
-#: ../app/tools/gimpsmudgetool.c:52
+#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:53
 msgid "Smudge"
 msgstr "å¡?æ?¹"
 
@@ -10573,23 +10734,20 @@ msgstr "å¢?æ??æ¨¡çµ?"
 
 #: ../app/pdb/drawable-transform-cmds.c:319
 #: ../app/pdb/drawable-transform-cmds.c:406
-#: ../app/pdb/item-transform-cmds.c:256
-#: ../app/pdb/transform-tools-cmds.c:153
+#: ../app/pdb/item-transform-cmds.c:256 ../app/pdb/transform-tools-cmds.c:153
 #: ../app/tools/gimpperspectivetool.c:69
 msgid "Perspective"
 msgstr "é??è¦?æ³?"
 
 #: ../app/pdb/drawable-transform-cmds.c:862
 #: ../app/pdb/drawable-transform-cmds.c:936
-#: ../app/pdb/item-transform-cmds.c:597
-#: ../app/pdb/transform-tools-cmds.c:375
+#: ../app/pdb/item-transform-cmds.c:597 ../app/pdb/transform-tools-cmds.c:375
 #: ../app/tools/gimpsheartool.c:110
 msgid "Shearing"
 msgstr "æ?¨ç§»"
 
 #: ../app/pdb/drawable-transform-cmds.c:1023
-#: ../app/pdb/item-transform-cmds.c:693
-#: ../app/pdb/transform-tools-cmds.c:453
+#: ../app/pdb/item-transform-cmds.c:693 ../app/pdb/transform-tools-cmds.c:453
 msgid "2D Transform"
 msgstr "2D è®?æ??"
 
@@ -10600,8 +10758,7 @@ msgstr "2D è®?æ??"
 msgid "2D Transforming"
 msgstr "2D è®?æ??"
 
-#: ../app/pdb/edit-cmds.c:725
-#: ../app/tools/gimpblendtool.c:243
+#: ../app/pdb/edit-cmds.c:725 ../app/tools/gimpblendtool.c:240
 msgid "Blending"
 msgstr "é?²è¡?æ··è?²"
 
@@ -10614,11 +10771,12 @@ msgid "Cannot anchor this layer because it is not a floating selection."
 msgstr "ç?¡æ³?å?ºå®?é??å??å??å±¤ï¼?å? ç?ºå®?ä¸?æ?¯æµ®å??ç??é?¸å??å??å??ã??"
 
 #: ../app/pdb/floating-sel-cmds.c:128
-msgid "Cannot convert this layer to a normal layer because it is not a floating selection."
+msgid ""
+"Cannot convert this layer to a normal layer because it is not a floating "
+"selection."
 msgstr "ç?¡æ³?è½?æ??é??å??å??å±¤ç?ºä¸?è?¬å??å±¤ï¼?å? ç?ºå®?ä¸?æ?¯æµ®å??ç??é?¸å??å??å??ã??"
 
-#: ../app/pdb/gimppdb-query.c:299
-#: ../app/pdb/gimppdb.c:306
+#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:306
 #: ../app/pdb/gimppdb.c:376
 #, c-format
 msgid "Procedure '%s' not found"
@@ -10719,12 +10877,16 @@ msgstr "ä¸?è?½ä½¿ç?¨é ?ç?®â??%sâ??(%d) å? ç?ºå®?å°?æ?ªè¢«å? å?¥å??ç??ä¸"
 
 #: ../app/pdb/gimppdb-utils.c:357
 #, fuzzy, c-format
-msgid "Item '%s' (%d) cannot be used because it is not a direct child of an item tree"
+msgid ""
+"Item '%s' (%d) cannot be used because it is not a direct child of an item "
+"tree"
 msgstr "ä¸?è?½ä½¿ç?¨é ?ç?®â??%sâ??(%d) å? ç?ºå®?å°?æ?ªè¢«å? å?¥å??ç??ä¸"
 
 #: ../app/pdb/gimppdb-utils.c:385
 #, fuzzy, c-format
-msgid "Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of the same item tree"
+msgid ""
+"Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of "
+"the same item tree"
 msgstr "ä¸?è?½ä½¿ç?¨é ?ç?®â??%sâ??(%d) å? ç?ºå®?å°?æ?ªè¢«å? å?¥å??ç??ä¸"
 
 #: ../app/pdb/gimppdb-utils.c:410
@@ -10779,8 +10941,11 @@ msgstr "å??é??ç?©ä»¶ %d ä¸?å??å?« ID %d ç??ç?å??"
 
 #: ../app/pdb/gimppdb.c:410
 #, c-format
-msgid "Procedure '%s' has been called with a wrong type for argument #%d. Expected %s, got %s."
-msgstr "å?¨å¼?æ?¸ #%2$d ä½¿ç?¨äº?é?¯èª¤ç??é¡?å??å?¼å?«ç¨?åº?ã??%1$sã??ã??é ?æ??ç?º %3$sï¼?å?»æ?¶å?° %4$sã??"
+msgid ""
+"Procedure '%s' has been called with a wrong type for argument #%d. Expected "
+"%s, got %s."
+msgstr ""
+"å?¨å¼?æ?¸ #%2$d ä½¿ç?¨äº?é?¯èª¤ç??é¡?å??å?¼å?«ç¨?åº?ã??%1$sã??ã??é ?æ??ç?º %3$sï¼?å?»æ?¶å?° %4$sã??"
 
 #: ../app/pdb/gimppdbcontext.c:78
 #: ../app/tools/gimpforegroundselectoptions.c:79
@@ -10788,85 +10953,107 @@ msgstr "å?¨å¼?æ?¸ #%2$d ä½¿ç?¨äº?é?¯èª¤ç??é¡?å??å?¼å?«ç¨?åº?ã??%1$sã??ã??é ?æ??
 msgid "Smooth edges"
 msgstr "å°?é??ç·£å¹³æ»?å??"
 
-#: ../app/pdb/gimpprocedure.c:371
-#: ../app/plug-in/gimppluginprocframe.c:208
+#: ../app/pdb/gimpprocedure.c:371 ../app/plug-in/gimppluginprocframe.c:208
 #, c-format
 msgid "Procedure '%s' returned no return values"
 msgstr "ç¨?åº?ã??%sã??å?³å??ã??æ²?æ??å??å?³æ?¸å?¼ã??"
 
 #: ../app/pdb/gimpprocedure.c:634
 #, c-format
-msgid "Procedure '%s' returned a wrong value type for return value '%s' (#%d). Expected %s, got %s."
-msgstr "ç¨?åº?ã??%sã??å?¨å??å?³æ?¸å?¼ã??%sã??(#%d)å?³å??é?¯èª¤ç??æ?¸å?¼é¡?å??ã??é ?æ??ç?º %sï¼?å?»æ?¶å?° %sã??"
+msgid ""
+"Procedure '%s' returned a wrong value type for return value '%s' (#%d). "
+"Expected %s, got %s."
+msgstr ""
+"ç¨?åº?ã??%sã??å?¨å??å?³æ?¸å?¼ã??%sã??(#%d)å?³å??é?¯èª¤ç??æ?¸å?¼é¡?å??ã??é ?æ??ç?º %sï¼?å?»æ?¶å?° %sã??"
 
 #: ../app/pdb/gimpprocedure.c:646
 #, c-format
-msgid "Procedure '%s' has been called with a wrong value type for argument '%s' (#%d). Expected %s, got %s."
-msgstr "å?¨å¼?æ?¸ã??%2$sã??(#%3$d)ä½¿ç?¨äº?é?¯èª¤ç??æ?¸å?¼é¡?å??å?¼å?«ç¨?åº?ã??%1$sã??ã??é ?æ??ç?º %4$sï¼?å?»æ?¶å?° %5$sã??"
+msgid ""
+"Procedure '%s' has been called with a wrong value type for argument '%s' (#"
+"%d). Expected %s, got %s."
+msgstr ""
+"å?¨å¼?æ?¸ã??%2$sã??(#%3$d)ä½¿ç?¨äº?é?¯èª¤ç??æ?¸å?¼é¡?å??å?¼å?«ç¨?åº?ã??%1$sã??ã??é ?æ??ç?º %4$sï¼?å?»æ?¶"
+"å?° %5$sã??"
 
 #: ../app/pdb/gimpprocedure.c:678
 #, c-format
-msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer."
-msgstr "ç¨?åº?ã??%sã??å?³å??å¼?æ?¸ã??%sã??ç??ç?¡æ?? IDã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??ç??å·²ä¸?å?å?¨ç??å??å±¤ã??"
+msgid ""
+"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
+"in is trying to work on a layer that doesn't exist any longer."
+msgstr ""
+"ç¨?åº?ã??%sã??å?³å??å¼?æ?¸ã??%sã??ç??ç?¡æ?? IDã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??ç??å·²ä¸?å?å?¨ç??å??"
+"å±¤ã??"
 
 #: ../app/pdb/gimpprocedure.c:690
 #, c-format
-msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer."
-msgstr "å?¨å¼?æ?¸ã??%2$sã??ä½¿ç?¨äº?ç?¡æ??ç?? ID å?¼å?«ç¨?åº?ã??%1$sã??ã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??ç??å·²ä¸?å?å?¨ç??å??å±¤ã??"
+msgid ""
+"Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
+"likely a plug-in is trying to work on a layer that doesn't exist any longer."
+msgstr ""
+"å?¨å¼?æ?¸ã??%2$sã??ä½¿ç?¨äº?ç?¡æ??ç?? ID å?¼å?«ç¨?åº?ã??%1$sã??ã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??"
+"ç??å·²ä¸?å?å?¨ç??å??å±¤ã??"
 
 #: ../app/pdb/gimpprocedure.c:706
 #, c-format
-msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer."
-msgstr "ç¨?åº?ã??%sã??å?³å??å¼?æ?¸ã??%sã??ç??ç?¡æ?? IDã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??ç??å·²ä¸?å?å?¨ç??å??ç??ã??"
+msgid ""
+"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
+"in is trying to work on an image that doesn't exist any longer."
+msgstr ""
+"ç¨?åº?ã??%sã??å?³å??å¼?æ?¸ã??%sã??ç??ç?¡æ?? IDã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??ç??å·²ä¸?å?å?¨ç??å??"
+"ç??ã??"
 
 #: ../app/pdb/gimpprocedure.c:718
 #, c-format
-msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer."
-msgstr "å?¨å¼?æ?¸ã??%2$sã??ä½¿ç?¨äº?ç?¡æ??ç?? ID å?¼å?«ç¨?åº?ã??%1$sã??ã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??ç??å·²ä¸?å?å?¨ç??å??ç??ã??"
+msgid ""
+"Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
+"likely a plug-in is trying to work on an image that doesn't exist any longer."
+msgstr ""
+"å?¨å¼?æ?¸ã??%2$sã??ä½¿ç?¨äº?ç?¡æ??ç?? ID å?¼å?«ç¨?åº?ã??%1$sã??ã??æ??æ??å?¯è?½ç??æ?¯æ??å¢?æ??æ¨¡çµ?å??è©¦è??"
+"ç??å·²ä¸?å?å?¨ç??å??ç??ã??"
 
 #: ../app/pdb/gimpprocedure.c:738
 #, c-format
-msgid "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value is out of range."
-msgstr "ç¨?åº?ã??%sã??å?³å??ã??%sã??å??ç?ºå??å?³æ?¸å?¼ã??%sã??(#%dï¼?é¡?å?? %s)ã??é??å??æ?¸å?¼è¶?å?ºäº?ç¯?å??ã??"
+msgid ""
+"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value "
+"is out of range."
+msgstr ""
+"ç¨?åº?ã??%sã??å?³å??ã??%sã??å??ç?ºå??å?³æ?¸å?¼ã??%sã??(#%dï¼?é¡?å?? %s)ã??é??å??æ?¸å?¼è¶?å?ºäº?ç¯?å??ã??"
 
 #: ../app/pdb/gimpprocedure.c:751
 #, c-format
-msgid "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %s). This value is out of range."
-msgstr "å?¨å¼?æ?¸ã??%3$sã??(#%4$dï¼?é¡?å?? %5$s) ä½¿ç?¨æ?¸å?¼ã??%2$sã??å?¼å?«ç¨?åº?ã??%1$sã??ã??é??å??æ?¸å?¼è¶?å?ºäº?ç¯?å??ã??"
+msgid ""
+"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type "
+"%s). This value is out of range."
+msgstr ""
+"å?¨å¼?æ?¸ã??%3$sã??(#%4$dï¼?é¡?å?? %5$s) ä½¿ç?¨æ?¸å?¼ã??%2$sã??å?¼å?«ç¨?åº?ã??%1$sã??ã??é??å??æ?¸å?¼è¶?"
+"å?ºäº?ç¯?å??ã??"
 
 #: ../app/pdb/image-cmds.c:2650
-msgid "Image resolution is out of bounds, using the default resolution instead."
+msgid ""
+"Image resolution is out of bounds, using the default resolution instead."
 msgstr "å??ç??ç??è§£æ??åº¦è¶?å?ºç¯?å??ï¼?æ??ä½¿ç?¨é ?è¨ç??è§£æ??åº¦ä»£æ?¿ã??"
 
-#: ../app/pdb/layer-cmds.c:478
-#: ../app/pdb/layer-cmds.c:516
-msgid "Move Layer"
-msgstr "ç§»å??å??å±¤"
-
-#: ../app/pdb/selection-tools-cmds.c:217
-#: ../app/tools/gimpfreeselecttool.c:199
+#: ../app/pdb/image-select-cmds.c:164 ../app/pdb/selection-tools-cmds.c:217
+#: ../app/tools/gimpfreeselecttool.c:198
 msgid "Free Select"
 msgstr "è?ªç?±é?¸å??å??å??"
 
+#: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516
+msgid "Move Layer"
+msgstr "ç§»å??å??å±¤"
+
 #: ../app/pdb/text-layer-cmds.c:89
 #, c-format
 msgid "Failed to create text layer"
 msgstr "å»ºç«?æ??å?å??å±¤å¤±æ??"
 
-#: ../app/pdb/text-layer-cmds.c:162
-#: ../app/pdb/text-layer-cmds.c:272
-#: ../app/pdb/text-layer-cmds.c:351
-#: ../app/pdb/text-layer-cmds.c:424
-#: ../app/pdb/text-layer-cmds.c:496
-#: ../app/pdb/text-layer-cmds.c:568
-#: ../app/pdb/text-layer-cmds.c:640
-#: ../app/pdb/text-layer-cmds.c:712
-#: ../app/pdb/text-layer-cmds.c:784
-#: ../app/pdb/text-layer-cmds.c:854
-#: ../app/pdb/text-layer-cmds.c:926
-#: ../app/pdb/text-layer-cmds.c:998
-#: ../app/pdb/text-layer-cmds.c:1070
-#: ../app/pdb/text-layer-cmds.c:1106
+#: ../app/pdb/text-layer-cmds.c:162 ../app/pdb/text-layer-cmds.c:272
+#: ../app/pdb/text-layer-cmds.c:351 ../app/pdb/text-layer-cmds.c:424
+#: ../app/pdb/text-layer-cmds.c:496 ../app/pdb/text-layer-cmds.c:568
+#: ../app/pdb/text-layer-cmds.c:640 ../app/pdb/text-layer-cmds.c:712
+#: ../app/pdb/text-layer-cmds.c:784 ../app/pdb/text-layer-cmds.c:854
+#: ../app/pdb/text-layer-cmds.c:926 ../app/pdb/text-layer-cmds.c:998
+#: ../app/pdb/text-layer-cmds.c:1070 ../app/pdb/text-layer-cmds.c:1106
 #: ../app/pdb/text-layer-cmds.c:1185
 msgid "Set text layer attribute"
 msgstr "è¨å®?æ??å?å??å±¤å±¬æ?§"
@@ -10892,19 +11079,16 @@ msgstr "ç¸®æ?¾è·¯å¾?æ??é??"
 msgid "Rotate path stroke"
 msgstr "æ??è½?è·¯å¾?æ??é??"
 
-#: ../app/pdb/vectors-cmds.c:521
-#: ../app/pdb/vectors-cmds.c:565
+#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565
 msgid "Flip path stroke"
 msgstr "ç¿»è½?è·¯å¾?æ??é??"
 
-#: ../app/pdb/vectors-cmds.c:694
-#: ../app/pdb/vectors-cmds.c:816
+#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:816
 #: ../app/pdb/vectors-cmds.c:1035
 msgid "Add path stroke"
 msgstr "å? å?¥è·¯å¾?æ??é??"
 
-#: ../app/pdb/vectors-cmds.c:868
-#: ../app/pdb/vectors-cmds.c:921
+#: ../app/pdb/vectors-cmds.c:868 ../app/pdb/vectors-cmds.c:921
 #: ../app/pdb/vectors-cmds.c:982
 msgid "Extend path stroke"
 msgstr "æ?´å¤§è·¯å¾?æ??é??"
@@ -10957,12 +11141,14 @@ msgid ""
 "Plug-in crashed: \"%s\"\n"
 "(%s)\n"
 "\n"
-"The dying plug-in may have messed up GIMP's internal state. You may want to save your images and restart GIMP to be on the safe side."
+"The dying plug-in may have messed up GIMP's internal state. You may want to "
+"save your images and restart GIMP to be on the safe side."
 msgstr ""
 "å¢?æ??æ¨¡çµ?ç?°å¸¸çµ?æ¢ï¼?â??%sâ??\n"
 "(%s)\n"
 "\n"
-"å·²çµ?æ¢ç??å¢?æ??æ¨¡çµ?å?¯è?½æ??æ?¾äº? GIMP ç??å?§é?¨ç??æ??ã??ç?ºå®?å?¨èµ·è¦?ï¼?æ?¨æ??è¨±æ??è©²å?²å?å??ç??ä¸¦é??æ?°å??å?? GIMPã??"
+"å·²çµ?æ¢ç??å¢?æ??æ¨¡çµ?å?¯è?½æ??æ?¾äº? GIMP ç??å?§é?¨ç??æ??ã??ç?ºå®?å?¨èµ·è¦?ï¼?æ?¨æ??è¨±æ??è©²å?²å?å??ç??ä¸¦"
+"é??æ?°å??å?? GIMPã??"
 
 #: ../app/plug-in/gimppluginmanager-call.c:173
 #: ../app/plug-in/gimppluginmanager-call.c:223
@@ -11046,58 +11232,59 @@ msgstr "æ??å®?å??ç¤ºé¡?å??ç??å?¼ â??%sâ?? ç?¡æ??"
 msgid "invalid value '%ld' for icon type"
 msgstr "æ??å®?å??ç¤ºé¡?å??ç??å?¼ â??%ldâ?? ç?¡æ??"
 
+#. This is a so-called pangram; it's supposed to
+#. contain all characters found in the alphabet.
 #: ../app/text/gimpfont.c:43
 msgid ""
 "Pack my box with\n"
 "five dozen liquor jugs."
 msgstr "This is Chinese test: 'ä¸æ??æ¸¬è©¦'"
 
-#: ../app/text/gimptext-compat.c:107
-#: ../app/tools/gimptexttool.c:1383
+#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:1394
 msgid "Add Text Layer"
 msgstr "å? å?¥æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:141
+#: ../app/text/gimptextlayer.c:142
 msgid "Text Layer"
 msgstr "æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:142
+#: ../app/text/gimptextlayer.c:143
 msgid "Rename Text Layer"
 msgstr "æ?´æ?¹æ??å?å??å±¤å??ç¨±"
 
-#: ../app/text/gimptextlayer.c:143
+#: ../app/text/gimptextlayer.c:144
 msgid "Move Text Layer"
 msgstr "ç§»å??æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:144
+#: ../app/text/gimptextlayer.c:145
 msgid "Scale Text Layer"
 msgstr "ç¸®æ?¾æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:145
+#: ../app/text/gimptextlayer.c:146
 msgid "Resize Text Layer"
 msgstr "èª¿æ?´æ??å?å??å±¤å°ºå¯¸"
 
-#: ../app/text/gimptextlayer.c:146
+#: ../app/text/gimptextlayer.c:147
 msgid "Flip Text Layer"
 msgstr "ç¿»è½?æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:147
+#: ../app/text/gimptextlayer.c:148
 msgid "Rotate Text Layer"
 msgstr "æ??è½?æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:148
+#: ../app/text/gimptextlayer.c:149
 msgid "Transform Text Layer"
 msgstr "è®?æ??æ??å?å??å±¤"
 
-#: ../app/text/gimptextlayer.c:509
+#: ../app/text/gimptextlayer.c:522
 msgid "Discard Text Information"
 msgstr "æ?¾æ£?æ??å?è³?è¨?"
 
-#: ../app/text/gimptextlayer.c:562
+#: ../app/text/gimptextlayer.c:575
 msgid "Due to lack of any fonts, text functionality is not available."
 msgstr "å? ç?ºç¼ºä¹?å?¯ä½¿ç?¨ç??å?å??ï¼?æ??ä»¥ç?¡æ³?æ??ä¾?æ??å?å??è?½ã??"
 
-#: ../app/text/gimptextlayer.c:613
+#: ../app/text/gimptextlayer.c:626
 msgid "Empty Text Layer"
 msgstr "ç©ºç?½æ??å?å??å±¤"
 
@@ -11107,7 +11294,8 @@ msgid ""
 "Problems parsing the text parasite for layer '%s':\n"
 "%s\n"
 "\n"
-"Some text properties may be wrong. Unless you want to edit the text layer, you don't need to worry about this."
+"Some text properties may be wrong. Unless you want to edit the text layer, "
+"you don't need to worry about this."
 msgstr ""
 "å??æ??å??å±¤ã??%sã??ç??é??å¸¶æ??å?å?ºç?¾å??é¡?ï¼?\n"
 "%s\n"
@@ -11132,31 +11320,31 @@ msgstr ""
 "æ?¬å·¥å?·\n"
 "ä¸¦æ²?æ??é?¸é ?ã??"
 
-#: ../app/tools/gimpairbrushtool.c:54
+#: ../app/tools/gimpairbrushtool.c:55
 msgid "Airbrush Tool: Paint using a brush, with variable pressure"
 msgstr "å?´æ§?å·¥å?·ï¼?ä½¿ç?¨å?¯è®?å£?ç??å?´æ§?"
 
-#: ../app/tools/gimpairbrushtool.c:55
+#: ../app/tools/gimpairbrushtool.c:56
 msgid "_Airbrush"
 msgstr "å?´æ§?(_A)"
 
-#: ../app/tools/gimpairbrushtool.c:88
+#: ../app/tools/gimpairbrushtool.c:86
 #, fuzzy
 msgid "Motion only"
 msgstr "å?¯è®?"
 
-#: ../app/tools/gimpairbrushtool.c:97
-#: ../app/tools/gimpconvolvetool.c:216
-#: ../app/tools/gimpsmudgetool.c:96
-msgid "Rate:"
-msgstr "å¼·åº¦:"
+#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:211
+#: ../app/tools/gimpsmudgetool.c:91
+#, fuzzy
+msgid "Rate"
+msgstr "Rate"
 
-#: ../app/tools/gimpairbrushtool.c:103
-msgid "Flow:"
-msgstr "æµ?å??ï¼?"
+#: ../app/tools/gimpairbrushtool.c:97
+#, fuzzy
+msgid "Flow"
+msgstr "æµ?å??"
 
-#: ../app/tools/gimpaligntool.c:135
-#: ../app/tools/gimpaligntool.c:764
+#: ../app/tools/gimpaligntool.c:135 ../app/tools/gimpaligntool.c:780
 msgid "Align"
 msgstr "å°?é½?"
 
@@ -11196,124 +11384,114 @@ msgstr "æ??ä¸?é??è£¡å°?é??å??è·¯å¾?è¨ç?ºç¬¬ä¸?é ?ç?®"
 msgid "Click to add this path to the list"
 msgstr "æ??ä¸?é??è£¡å°?é??å??è·¯å¾?å? å?¥æ¸?å?®"
 
-#: ../app/tools/gimpaligntool.c:776
+#: ../app/tools/gimpaligntool.c:792
 msgid "Relative to:"
 msgstr "ç?¸å°?æ?¼:"
 
-#: ../app/tools/gimpaligntool.c:794
+#: ../app/tools/gimpaligntool.c:810
 msgid "Align left edge of target"
 msgstr "å°?é½?ç?®æ¨?ç??å·¦ç·£"
 
-#: ../app/tools/gimpaligntool.c:800
+#: ../app/tools/gimpaligntool.c:816
 msgid "Align center of target"
 msgstr "å°?é½?ç?®æ¨?ç??ä¸é??"
 
-#: ../app/tools/gimpaligntool.c:806
+#: ../app/tools/gimpaligntool.c:822
 msgid "Align right edge of target"
 msgstr "å°?é½?ç?®æ¨?ç??å?³ç·£"
 
-#: ../app/tools/gimpaligntool.c:816
+#: ../app/tools/gimpaligntool.c:832
 msgid "Align top edge of target"
 msgstr "å°?é½?ç?®æ¨?ç??ä¸?ç·£"
 
-#: ../app/tools/gimpaligntool.c:822
+#: ../app/tools/gimpaligntool.c:838
 msgid "Align middle of target"
 msgstr "å°?é½?ç?®æ¨?ç??ä¸å¤®"
 
-#: ../app/tools/gimpaligntool.c:828
+#: ../app/tools/gimpaligntool.c:844
 msgid "Align bottom of target"
 msgstr "å°?é½?ç?®æ¨?ç??ä¸?ç·£"
 
-#: ../app/tools/gimpaligntool.c:832
+#: ../app/tools/gimpaligntool.c:848
 msgid "Distribute"
 msgstr "å??å¸?"
 
-#: ../app/tools/gimpaligntool.c:846
+#: ../app/tools/gimpaligntool.c:862
 msgid "Distribute left edges of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??å·¦ç·£"
 
-#: ../app/tools/gimpaligntool.c:853
+#: ../app/tools/gimpaligntool.c:869
 msgid "Distribute horizontal centers of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??ä¸é??"
 
-#: ../app/tools/gimpaligntool.c:860
+#: ../app/tools/gimpaligntool.c:876
 msgid "Distribute right edges of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??å?³ç·£"
 
-#: ../app/tools/gimpaligntool.c:870
+#: ../app/tools/gimpaligntool.c:886
 msgid "Distribute top edges of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??ä¸?ç·£"
 
-#: ../app/tools/gimpaligntool.c:877
+#: ../app/tools/gimpaligntool.c:893
 msgid "Distribute vertical centers of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??ä¸é??"
 
-#: ../app/tools/gimpaligntool.c:883
+#: ../app/tools/gimpaligntool.c:899
 msgid "Distribute bottoms of targets"
 msgstr "å??å¸?æ?¼ç?®æ¨?ç??ä¸?ç·£"
 
-#: ../app/tools/gimpaligntool.c:891
-#: ../app/tools/gimpblendoptions.c:221
+#: ../app/tools/gimpaligntool.c:907
 msgid "Offset:"
 msgstr "å??ç§»ï¼?"
 
-#: ../app/tools/gimpblendoptions.c:215
-#: ../app/tools/gimppaintoptions-gui.c:307
-msgid "Gradient:"
-msgstr "æ¼¸å±¤:"
+#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:285
+msgid "Gradient"
+msgstr "æ¼¸å±¤"
 
-#: ../app/tools/gimpblendoptions.c:231
-#: ../app/widgets/gimpbrusheditor.c:145
+#: ../app/tools/gimpblendoptions.c:230 ../app/widgets/gimpbrusheditor.c:145
 msgid "Shape:"
 msgstr "å½¢ç??:"
 
-#: ../app/tools/gimpblendoptions.c:238
-#: ../app/tools/gimppaintoptions-gui.c:238
+#: ../app/tools/gimpblendoptions.c:237 ../app/tools/gimppaintoptions-gui.c:269
 msgid "Repeat:"
 msgstr "é??è¤?:"
 
-#: ../app/tools/gimpblendoptions.c:256
+#: ../app/tools/gimpblendoptions.c:260
 msgid "Adaptive supersampling"
 msgstr "æ??é?©æ?§è¶?å??ç??å??æ¨£"
 
-#: ../app/tools/gimpblendoptions.c:264
-msgid "Max depth:"
+#: ../app/tools/gimpblendoptions.c:267
+#, fuzzy
+msgid "Max depth"
 msgstr "æ??å¤§æ·±åº¦:"
 
-#: ../app/tools/gimpblendoptions.c:271
-#: ../app/tools/gimpbucketfilloptions.c:287
-#: ../app/tools/gimpregionselectoptions.c:219
-msgid "Threshold:"
-msgstr "è?¨ç??å?¼ï¼?"
-
-#: ../app/tools/gimpblendtool.c:109
+#: ../app/tools/gimpblendtool.c:106
 msgid "Blend"
 msgstr "æ··è?²"
 
-#: ../app/tools/gimpblendtool.c:110
+#: ../app/tools/gimpblendtool.c:107
 msgid "Blend Tool: Fill selected area with a color gradient"
-msgstr "æ··è?²å·¥å?·ï¼?å°?é?¸å??ç??å??å??å¡«ä¸?è?²å½©æ¼¸å±¤"
+msgstr "æ··è?²å·¥å?·ï¼?ç?¨é¡?è?²æ¼¸å±¤å¡«å??é?¸å??å??å??"
 
-#: ../app/tools/gimpblendtool.c:111
+#: ../app/tools/gimpblendtool.c:108
 msgid "Blen_d"
 msgstr "æ··è?²(_D)"
 
-#: ../app/tools/gimpblendtool.c:167
+#: ../app/tools/gimpblendtool.c:164
 msgid "Blend does not operate on indexed layers."
 msgstr "æ··è?²ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
 
-#: ../app/tools/gimpblendtool.c:420
-#: ../app/tools/gimppainttool.c:634
+#: ../app/tools/gimpblendtool.c:417 ../app/tools/gimppainttool.c:637
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%s å?¯é??å®?è§?åº¦"
 
-#: ../app/tools/gimpblendtool.c:421
+#: ../app/tools/gimpblendtool.c:418
 #, c-format
 msgid "%s to move the whole line"
 msgstr "%s æ??ç§»å??æ?´æ¢?ç·?"
 
-#: ../app/tools/gimpblendtool.c:425
+#: ../app/tools/gimpblendtool.c:422
 msgid "Blend: "
 msgstr "æ··è?²ï¼?"
 
@@ -11357,55 +11535,55 @@ msgstr "å°?æ¯?(_T):"
 msgid "Edit these Settings as Levels"
 msgstr "å°?é??äº?è¨å®?å?¼ç?¶ä½?è?²é??ç·¨è¼¯"
 
-#: ../app/tools/gimpbucketfilloptions.c:99
+#: ../app/tools/gimpbucketfilloptions.c:100
 msgid "Allow completely transparent regions to be filled"
 msgstr "å??è¨±å°?å®?å?¨é??æ??ç??å??å??å¡«è?²"
 
-#: ../app/tools/gimpbucketfilloptions.c:105
+#: ../app/tools/gimpbucketfilloptions.c:106
 msgid "Base filled area on all visible layers"
 msgstr "æ??æ??å?¯è¦?ç??å??å±¤ä¸?ç??å?ºç¤?å¡«æ»¿å??å??"
 
-#: ../app/tools/gimpbucketfilloptions.c:111
+#: ../app/tools/gimpbucketfilloptions.c:112
 #: ../app/tools/gimpregionselectoptions.c:95
 msgid "Maximum color difference"
 msgstr "æ??å¤§é¡?è?²å·®ç?°"
 
-#: ../app/tools/gimpbucketfilloptions.c:225
+#. fill type
+#: ../app/tools/gimpbucketfilloptions.c:227
 #, c-format
 msgid "Fill Type  (%s)"
 msgstr "å¡«æ»¿é¡?å??  (%s)"
 
-#: ../app/tools/gimpbucketfilloptions.c:239
+#. fill selection
+#: ../app/tools/gimpbucketfilloptions.c:242
 #, c-format
 msgid "Affected Area  (%s)"
 msgstr "å½±é?¿å??å??  (%s)"
 
-#: ../app/tools/gimpbucketfilloptions.c:243
+#: ../app/tools/gimpbucketfilloptions.c:246
 msgid "Fill whole selection"
 msgstr "å¡«æ»¿æ?´å??é?¸å??å??å??"
 
-#: ../app/tools/gimpbucketfilloptions.c:244
+#: ../app/tools/gimpbucketfilloptions.c:247
 msgid "Fill similar colors"
 msgstr "å?ªå°?è¿?ä¼¼ç??é¡?è?²å¡«è?²"
 
-#: ../app/tools/gimpbucketfilloptions.c:253
+#: ../app/tools/gimpbucketfilloptions.c:256
 msgid "Finding Similar Colors"
 msgstr "å°?æ?¾ç?¸è¿?ç??é¡?è?²"
 
-#: ../app/tools/gimpbucketfilloptions.c:269
+#: ../app/tools/gimpbucketfilloptions.c:272
 msgid "Fill transparent areas"
 msgstr "å°?é??æ??å??å??å¡«è?²"
 
-#: ../app/tools/gimpbucketfilloptions.c:275
-#: ../app/tools/gimpclonetool.c:113
-#: ../app/tools/gimpcolorpickeroptions.c:150
-#: ../app/tools/gimphealtool.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:959
-#: ../app/tools/gimpregionselectoptions.c:207
+#: ../app/tools/gimpbucketfilloptions.c:278 ../app/tools/gimpclonetool.c:113
+#: ../app/tools/gimpcolorpickeroptions.c:150 ../app/tools/gimphealtool.c:98
+#: ../app/tools/gimpperspectiveclonetool.c:952
+#: ../app/tools/gimpregionselectoptions.c:208
 msgid "Sample merged"
 msgstr "å??ä½µæ¨£æ?¬"
 
-#: ../app/tools/gimpbucketfilloptions.c:294
+#: ../app/tools/gimpbucketfilloptions.c:297
 msgid "Fill by:"
 msgstr "å¡«ä¸?:"
 
@@ -11438,6 +11616,37 @@ msgctxt "command"
 msgid "Select by Color"
 msgstr "ä¾?é¡?è?²é?¸å??"
 
+#: ../app/tools/gimpcageoptions.c:144
+msgid "Fill from first point"
+msgstr ""
+
+#: ../app/tools/gimpcagetool.c:136
+#, fuzzy
+msgid "Cage Transform"
+msgstr "è®?æ??"
+
+#: ../app/tools/gimpcagetool.c:137
+msgid "Cage Transform: Deform a selection with a cage"
+msgstr ""
+
+#: ../app/tools/gimpcagetool.c:138
+#, fuzzy
+msgid "_Cage Transform"
+msgstr "è®?æ??(_T)"
+
+#: ../app/tools/gimpcagetool.c:402
+msgid "Press ENTER to commit the transform"
+msgstr ""
+
+#: ../app/tools/gimpcagetool.c:680
+msgid "Coefficient computation"
+msgstr ""
+
+#: ../app/tools/gimpcagetool.c:783
+#, fuzzy
+msgid "Cage transform"
+msgstr "è®?æ??"
+
 #: ../app/tools/gimpclonetool.c:61
 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush"
 msgstr "ä»¿è£½å·¥å?·ï¼?ä½¿ç?¨ç?å?·ï¼?é?¸æ??æ?§ç??è¤?è£½å??ç??æ??å??æ¨£"
@@ -11446,13 +11655,11 @@ msgstr "ä»¿è£½å·¥å?·ï¼?ä½¿ç?¨ç?å?·ï¼?é?¸æ??æ?§ç??è¤?è£½å??ç??æ??å??æ¨£"
 msgid "_Clone"
 msgstr "ä»¿è£½(_C)"
 
-#: ../app/tools/gimpclonetool.c:85
-#: ../app/tools/gimpclonetool.c:88
+#: ../app/tools/gimpclonetool.c:85 ../app/tools/gimpclonetool.c:88
 msgid "Click to clone"
 msgstr "é»?é?¸ä»¥ä»¿è£½"
 
-#: ../app/tools/gimpclonetool.c:86
-#: ../app/tools/gimpclonetool.c:90
+#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:90
 #, c-format
 msgid "%s to set a new clone source"
 msgstr "%s å?¯ä»¥è¨å®?æ?°ç??è¤?è£½ä¾?æº?"
@@ -11462,13 +11669,12 @@ msgid "Click to set a new clone source"
 msgstr "æ??ä¸?é??è£¡å?¯ä»¥è¨å®?æ?°ç??è¤?è£½ä¾?æº?"
 
 #: ../app/tools/gimpclonetool.c:108
-#: ../app/tools/gimpperspectiveclonetool.c:954
+#: ../app/tools/gimpperspectiveclonetool.c:947
 msgid "Source"
 msgstr "ä¾?æº?"
 
-#: ../app/tools/gimpclonetool.c:129
-#: ../app/tools/gimphealtool.c:110
-#: ../app/tools/gimpperspectiveclonetool.c:975
+#: ../app/tools/gimpclonetool.c:130 ../app/tools/gimphealtool.c:110
+#: ../app/tools/gimpperspectiveclonetool.c:969
 msgid "Alignment:"
 msgstr "æ??å??:"
 
@@ -11504,8 +11710,7 @@ msgstr "è?²å½©å¹³è¡¡å?ªé?©ç?¨æ?¼ RGB è?²ç³»ç??å??å±¤ã??"
 msgid "Select Range to Adjust"
 msgstr "é?¸æ??è¦?èª¿æ?´ç??ç¯?å??"
 
-#: ../app/tools/gimpcolorbalancetool.c:276
-#: ../app/tools/gimplevelstool.c:172
+#: ../app/tools/gimpcolorbalancetool.c:276 ../app/tools/gimplevelstool.c:172
 msgid "Adjust Color Levels"
 msgstr "èª¿æ?´è?²é??"
 
@@ -11594,26 +11799,27 @@ msgstr "é£½å??åº¦(_S):"
 msgid "_Lightness:"
 msgstr "äº®åº¦(_L):"
 
-#: ../app/tools/gimpcoloroptions.c:75
+#: ../app/tools/gimpcoloroptions.c:77
 msgid "Color Picker Average Radius"
 msgstr "é¡?è?²æ??é?¸å?¨å¹³å??å??å¾?"
 
-#: ../app/tools/gimpcoloroptions.c:161
+#: ../app/tools/gimpcoloroptions.c:157
+#: ../app/tools/gimprectangleselectoptions.c:160
+#: ../app/tools/gimpselectionoptions.c:270
+msgid "Radius"
+msgstr "å??å¾?"
+
+#: ../app/tools/gimpcoloroptions.c:163
 msgid "Sample average"
 msgstr "å¹³å??å??æ¨£"
 
-#: ../app/tools/gimpcoloroptions.c:171
-#: ../app/tools/gimprectangleselectoptions.c:175
-#: ../app/tools/gimpselectionoptions.c:280
-#: ../app/widgets/gimpbrusheditor.c:153
-msgid "Radius:"
-msgstr "å??å¾?:"
-
+#. the pick FG/BG frame
 #: ../app/tools/gimpcolorpickeroptions.c:155
 #, c-format
 msgid "Pick Mode  (%s)"
 msgstr "æ??é?¸æ¨¡å¼?  (%s)"
 
+#. the use_info_window toggle button
 #: ../app/tools/gimpcolorpickeroptions.c:164
 #, c-format
 msgid "Use info window  (%s)"
@@ -11635,13 +11841,11 @@ msgstr "é¡?è?²æ??é?¸å?¨(_O)"
 msgid "Click in any image to view its color"
 msgstr "é»?é?¸Gimpé??å??ç??ä»»ä½?å??ç??ä»¥æª¢è¦?å®?ç??é¡?è?²"
 
-#: ../app/tools/gimpcolorpickertool.c:249
-#: ../app/tools/gimppainttool.c:493
+#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:493
 msgid "Click in any image to pick the foreground color"
 msgstr "é»?é?¸Gimpé??å??ç??ä»»ä½?å??ç??ä»¥æ??é?¸å??æ?¯é¡?è?²"
 
-#: ../app/tools/gimpcolorpickertool.c:257
-#: ../app/tools/gimppainttool.c:499
+#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:499
 msgid "Click in any image to pick the background color"
 msgstr "é»?é?¸Gimpé??å??ç??ä»»ä½?å??ç??ä»¥æ??é?¸è??æ?¯é¡?è?²"
 
@@ -11649,66 +11853,67 @@ msgstr "é»?é?¸Gimpé??å??ç??ä»»ä½?å??ç??ä»¥æ??é?¸è??æ?¯é¡?è?²"
 msgid "Click in any image to add the color to the palette"
 msgstr "é»?é?¸Gimpé??å??ç??ä»»ä½?å??ç??ä»¥å°?é¡?è?²å? å?¥èª¿è?²ç?¤"
 
+#. tool->display->shell
 #: ../app/tools/gimpcolorpickertool.c:318
 msgid "Color Picker Information"
 msgstr "æ??é??é¡?è?²æ??é?¸å?¨ç??è³?è¨?"
 
-#: ../app/tools/gimpcolortool.c:225
-#: ../app/tools/gimpcolortool.c:398
+#: ../app/tools/gimpcolortool.c:228 ../app/tools/gimpcolortool.c:401
 msgid "Move Sample Point: "
 msgstr "ç§»å??å??æ¨£é»?ï¼?"
 
-#: ../app/tools/gimpcolortool.c:390
+#: ../app/tools/gimpcolortool.c:393
 msgid "Remove Sample Point"
 msgstr "ç§»é?¤å??æ¨£é»?"
 
-#: ../app/tools/gimpcolortool.c:391
+#: ../app/tools/gimpcolortool.c:394
 msgid "Cancel Sample Point"
 msgstr "å??æ¶?å??æ¨£é»?"
 
-#: ../app/tools/gimpcolortool.c:399
+#: ../app/tools/gimpcolortool.c:402
 msgid "Add Sample Point: "
 msgstr "å? å?¥å??æ¨£é»?ï¼?"
 
-#: ../app/tools/gimpconvolvetool.c:72
+#: ../app/tools/gimpconvolvetool.c:73
 msgid "Blur / Sharpen"
 msgstr "æ¨¡ç³?å?? / é?³å?©å??"
 
-#: ../app/tools/gimpconvolvetool.c:73
+#: ../app/tools/gimpconvolvetool.c:74
 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush"
 msgstr "æ¨¡ç³?/é?³å?©å??å·¥å?·ï¼?ä½¿ç?¨ç?å?·é?¸æ??æ?§ç??æ¨¡ç³?æ??é?³å?©å??"
 
-#: ../app/tools/gimpconvolvetool.c:74
+#: ../app/tools/gimpconvolvetool.c:75
 msgid "Bl_ur / Sharpen"
 msgstr "æ¨¡ç³?å??/é?³å?©å??(_U)"
 
-#: ../app/tools/gimpconvolvetool.c:169
+#: ../app/tools/gimpconvolvetool.c:170
 msgid "Click to blur"
 msgstr "é»?é?¸ä½¿å?¶æ¨¡ç³?"
 
-#: ../app/tools/gimpconvolvetool.c:170
+#: ../app/tools/gimpconvolvetool.c:171
 msgid "Click to blur the line"
 msgstr "è«?æ??é??è£¡ä»¥æ¨¡ç³?æ¤ç·?æ¢?"
 
-#: ../app/tools/gimpconvolvetool.c:171
+#: ../app/tools/gimpconvolvetool.c:172
 #, c-format
 msgid "%s to sharpen"
 msgstr "è®? %s æ?´é?³å?©"
 
-#: ../app/tools/gimpconvolvetool.c:175
+#: ../app/tools/gimpconvolvetool.c:176
 msgid "Click to sharpen"
 msgstr "è«?æ??é??è£¡é?³å?©å??"
 
-#: ../app/tools/gimpconvolvetool.c:176
+#: ../app/tools/gimpconvolvetool.c:177
 msgid "Click to sharpen the line"
 msgstr "è«?æ??é??è£¡è®?ç·?æ¢?æ?´é?³å?©"
 
-#: ../app/tools/gimpconvolvetool.c:177
+#: ../app/tools/gimpconvolvetool.c:178
 #, c-format
 msgid "%s to blur"
 msgstr "è®? %s æ?´æ¨¡ç³?"
 
-#: ../app/tools/gimpconvolvetool.c:198
+#. the type radio box
+#: ../app/tools/gimpconvolvetool.c:199
 #, c-format
 msgid "Convolve Type  (%s)"
 msgstr "æ?²ç©?é¡?å?? (%s)"
@@ -11721,23 +11926,23 @@ msgstr "å??é?©ç?¨æ?¼ç?®å??å??å±¤"
 msgid "Allow growing"
 msgstr "å??è¨±å¢?å¤§"
 
-#: ../app/tools/gimpcroptool.c:127
+#: ../app/tools/gimpcroptool.c:128
 msgid "Crop"
 msgstr "è£?å?ª"
 
-#: ../app/tools/gimpcroptool.c:128
+#: ../app/tools/gimpcroptool.c:129
 msgid "Crop Tool: Remove edge areas from image or layer"
 msgstr "å?ªè£?å·¥å?·ï¼?è?ªå??ç??æ??å??å±¤ç§»é?¤é??ç·£å??å??"
 
-#: ../app/tools/gimpcroptool.c:129
+#: ../app/tools/gimpcroptool.c:130
 msgid "_Crop"
 msgstr "å?ªè£?(_C)"
 
-#: ../app/tools/gimpcroptool.c:271
+#: ../app/tools/gimpcroptool.c:272
 msgid "Click or press Enter to crop"
 msgstr "é»?é?¸æ??æ?? Enter é?²è¡?å?ªè£?"
 
-#: ../app/tools/gimpcroptool.c:328
+#: ../app/tools/gimpcroptool.c:335
 msgid "There is no active layer to crop."
 msgstr "ç?®å??æ²?æ??ä»»ä½?ä½¿ç?¨ä¸ç??å??å±¤å?¯ä»¥å?ªä¸?ã??"
 
@@ -11781,23 +11986,19 @@ msgstr "é»?é?¸ä»¥å? å?¥æ?§å?¶é»?å?°æ??æ??è?²ç??"
 msgid "Click to locate on curve (try Shift, Ctrl)"
 msgstr ""
 
-#: ../app/tools/gimpcurvestool.c:453
-#: ../app/tools/gimplevelstool.c:384
+#: ../app/tools/gimpcurvestool.c:453 ../app/tools/gimplevelstool.c:384
 msgid "Cha_nnel:"
 msgstr "è?²ç??(_N):"
 
-#: ../app/tools/gimpcurvestool.c:479
-#: ../app/tools/gimplevelstool.c:408
+#: ../app/tools/gimpcurvestool.c:479 ../app/tools/gimplevelstool.c:408
 msgid "R_eset Channel"
 msgstr "é??è¨è?²ç??(_E)"
 
-#: ../app/tools/gimpcurvestool.c:571
-#: ../app/widgets/gimpdeviceinfoeditor.c:460
+#: ../app/tools/gimpcurvestool.c:571 ../app/widgets/gimpdeviceinfoeditor.c:463
 msgid "Curve _type:"
 msgstr "æ?²ç·?é¡?å??(_T):"
 
-#: ../app/tools/gimpcurvestool.c:646
-#: ../app/tools/gimplevelstool.c:756
+#: ../app/tools/gimpcurvestool.c:646 ../app/tools/gimplevelstool.c:756
 #, c-format
 msgid "Could not read header from '%s': %s"
 msgstr "ç?¡æ³?å¾?â??%sâ??è®?å??æ¨?é ï¼?%s"
@@ -11826,68 +12027,71 @@ msgstr "å?»é£½å??åº¦å?ªé?©ç?¨æ?¼ RGB è?²å½©ç??å??å±¤ã??"
 msgid "Choose shade of gray based on:"
 msgstr "é?¸æ??ç?°é??ç??å?ºç¤?ï¼?"
 
-#: ../app/tools/gimpdodgeburntool.c:72
+#: ../app/tools/gimpdodgeburntool.c:73
 msgid "Dodge / Burn"
 msgstr "æ¼?ç?½ / ç?»é»?"
 
-#: ../app/tools/gimpdodgeburntool.c:73
+#: ../app/tools/gimpdodgeburntool.c:74
 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush"
 msgstr "æ¼?ç?½ / ç?»é»?å·¥å?·ï¼?ä½¿ç?¨ç?å?·ä¾?å¢?äº®æ??è®?æ??"
 
-#: ../app/tools/gimpdodgeburntool.c:74
+#: ../app/tools/gimpdodgeburntool.c:75
 msgid "Dod_ge / Burn"
 msgstr "æ¼?ç?½ / ç?»é»?(_G)"
 
-#: ../app/tools/gimpdodgeburntool.c:172
+#: ../app/tools/gimpdodgeburntool.c:173
 msgid "Click to dodge"
 msgstr "è«?æ??é??è£¡æ¼?ç?½"
 
-#: ../app/tools/gimpdodgeburntool.c:173
+#: ../app/tools/gimpdodgeburntool.c:174
 msgid "Click to dodge the line"
 msgstr "è«?æ??é??è£¡æ¼?ç?½ç·?æ¢?"
 
-#: ../app/tools/gimpdodgeburntool.c:174
+#: ../app/tools/gimpdodgeburntool.c:175
 #, c-format
 msgid "%s to burn"
 msgstr "å°? %s ç?»é»?"
 
-#: ../app/tools/gimpdodgeburntool.c:178
+#: ../app/tools/gimpdodgeburntool.c:179
 msgid "Click to burn"
 msgstr "è«?æ??é??è£¡ç?»é»?"
 
-#: ../app/tools/gimpdodgeburntool.c:179
+#: ../app/tools/gimpdodgeburntool.c:180
 msgid "Click to burn the line"
 msgstr "è«?æ??é??è£¡ç?»é»?ç·?æ¢?"
 
-#: ../app/tools/gimpdodgeburntool.c:180
+#: ../app/tools/gimpdodgeburntool.c:181
 #, c-format
 msgid "%s to dodge"
 msgstr "å°? %s æ¼?ç?½"
 
-#: ../app/tools/gimpdodgeburntool.c:201
+#. the type (dodge or burn)
+#: ../app/tools/gimpdodgeburntool.c:202
 #, c-format
 msgid "Type  (%s)"
 msgstr "é¡?å??  (%s)"
 
-#: ../app/tools/gimpdodgeburntool.c:212
+#. mode (highlights, midtones, or shadows)
+#: ../app/tools/gimpdodgeburntool.c:213
 msgid "Range"
 msgstr "ç¯?å??"
 
-#: ../app/tools/gimpdodgeburntool.c:224
-msgid "Exposure:"
+#: ../app/tools/gimpdodgeburntool.c:219
+#, fuzzy
+msgid "Exposure"
 msgstr "æ??å??åº¦:"
 
-#: ../app/tools/gimpeditselectiontool.c:240
+#: ../app/tools/gimpeditselectiontool.c:239
 msgid "Move Selection"
 msgstr "ç§»å??é?¸å??å??å??"
 
-#: ../app/tools/gimpeditselectiontool.c:244
-#: ../app/tools/gimpeditselectiontool.c:1233
+#: ../app/tools/gimpeditselectiontool.c:243
+#: ../app/tools/gimpeditselectiontool.c:1235
 msgid "Move Floating Selection"
 msgstr "ç§»å??æµ®å??é?¸å??å??å??"
 
-#: ../app/tools/gimpeditselectiontool.c:453
-#: ../app/tools/gimpeditselectiontool.c:728
+#: ../app/tools/gimpeditselectiontool.c:452
+#: ../app/tools/gimpeditselectiontool.c:727
 msgid "Move: "
 msgstr "ç§»å??ï¼?"
 
@@ -11924,6 +12128,7 @@ msgstr "è«?æ??é??è£¡æ?¦æ??ç·?æ¢?"
 msgid "%s to pick a background color"
 msgstr "%s ä»¥æ??é?¸è??æ?¯é¡?è?²"
 
+#. the anti_erase toggle
 #: ../app/tools/gimperasertool.c:145
 #, c-format
 msgid "Anti erase  (%s)"
@@ -11933,6 +12138,7 @@ msgstr "å??æ¶?æ?¦å?»  (%s)"
 msgid "Affect:"
 msgstr "æ??æ??ï¼?"
 
+#. tool toggle
 #: ../app/tools/gimpflipoptions.c:138
 #, c-format
 msgid "Flip Type  (%s)"
@@ -11943,7 +12149,8 @@ msgid "Flip"
 msgstr "ç¿»è½?"
 
 #: ../app/tools/gimpfliptool.c:80
-msgid "Flip Tool: Reverse the layer, selection or path horizontally or vertically"
+msgid ""
+"Flip Tool: Reverse the layer, selection or path horizontally or vertically"
 msgstr "ç¿»è½?å·¥å?·ï¼?æ°´å¹³æ??å??ç?´å??è½?å??å±¤ã??é?¸å??å??å??æ??è·¯å¾?"
 
 #: ../app/tools/gimpfliptool.c:82
@@ -11964,7 +12171,9 @@ msgid "Size of the brush used for refinements"
 msgstr "ç?¨ä¾?ç²¾è£½ç??ç?å?·å¤§å°?"
 
 #: ../app/tools/gimpforegroundselectoptions.c:102
-msgid "Smaller values give a more accurate selection border but may introduce holes in the selection"
+msgid ""
+"Smaller values give a more accurate selection border but may introduce holes "
+"in the selection"
 msgstr "è¼?å°?ç??æ?¸å?¼å?¯ä»¥ç?¢ç??æ?´ç²¾ç¢ºç??é?¸å??å??å??æ¡?ç·?ï¼?ä½?ä¹?æ??é? æ??é?¸å??å??å??å?ºç?¾æ¼?æ´?"
 
 #: ../app/tools/gimpforegroundselectoptions.c:121
@@ -11979,10 +12188,12 @@ msgstr "ç´?/ç¶ å??ç´ ç??é??æ??åº¦"
 msgid "Sensitivity for yellow/blue component"
 msgstr "é»?/è??å??ç´ ç??é??æ??åº¦"
 
+#. single / multiple objects
 #: ../app/tools/gimpforegroundselectoptions.c:276
 msgid "Contiguous"
 msgstr "é?£çº?"
 
+#. foreground / background
 #: ../app/tools/gimpforegroundselectoptions.c:281
 #, c-format
 msgid "Interactive refinement  (%s)"
@@ -12012,6 +12223,7 @@ msgstr "å¹³æ»?å??:"
 msgid "Preview color:"
 msgstr "é ?è¦½é¡?è?²:"
 
+#. granularity
 #: ../app/tools/gimpforegroundselectoptions.c:343
 msgid "Color Sensitivity"
 msgstr "é¡?è?²é??æ??åº¦"
@@ -12037,40 +12249,40 @@ msgid "Mark foreground by painting on the object to extract"
 msgstr "å?¨ç?©ä»¶ä¸?ç¹ªç?«ä»¥æ¨?è¨?å?ºè¦?æ??å??ç??å??æ?¯"
 
 #: ../app/tools/gimpforegroundselecttool.c:327
-#, fuzzy
 msgid "Roughly outline the object to extract"
-msgstr "å?¨ç?©ä»¶ä¸?ç²?ç?¥ç¹ªå?ºè¦?æ??å??ç??è¼ªå»?"
+msgstr "ç²?ç?¥å?°æ??ç?«ç?©ä»¶ç??è¼ªå»?ä»¥æ??å??"
 
 #: ../app/tools/gimpforegroundselecttool.c:779
 msgctxt "command"
 msgid "Foreground Select"
 msgstr "å??æ?¯é?¸å??"
 
-#: ../app/tools/gimpfreeselecttool.c:200
-msgid "Free Select Tool: Select a hand-drawn region with free and polygonal segments"
+#: ../app/tools/gimpfreeselecttool.c:199
+msgid ""
+"Free Select Tool: Select a hand-drawn region with free and polygonal segments"
 msgstr "è?ªç?±é?¸å??å·¥å?·ï¼?ä»¥æ??ç¹ªæ?¹å¼?é?¸å??ä»»æ??å??å¤?é??å½¢ç??æ®µç??å??å??"
 
-#: ../app/tools/gimpfreeselecttool.c:201
+#: ../app/tools/gimpfreeselecttool.c:200
 msgid "_Free Select"
 msgstr "è?ªç?±é?¸å??(_F)"
 
-#: ../app/tools/gimpfreeselecttool.c:1120
+#: ../app/tools/gimpfreeselecttool.c:1119
 msgid "Click to complete selection"
 msgstr "è«?æ??é??è£¡å®?æ??é?¸å??å??å??"
 
-#: ../app/tools/gimpfreeselecttool.c:1124
+#: ../app/tools/gimpfreeselecttool.c:1123
 msgid "Click-Drag to move segment vertex"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??å??æ®µç«¯é»?"
 
-#: ../app/tools/gimpfreeselecttool.c:1129
+#: ../app/tools/gimpfreeselecttool.c:1128
 msgid "Return commits, Escape cancels, Backspace removes last segment"
 msgstr "Enter ç?ºé??å?ºã??Escape ç?ºå??æ¶?ã??Backspace ç?ºç§»é?¤ä¸?ä¸?å??å??æ®µ"
 
-#: ../app/tools/gimpfreeselecttool.c:1133
+#: ../app/tools/gimpfreeselecttool.c:1132
 msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
 msgstr "æ??æ?³å?¯å? å?¥è?ªç?±å??æ®µï¼?é»?é?¸æ??å? å?¥å¤?é??å½¢å??æ®µ"
 
-#: ../app/tools/gimpfreeselecttool.c:1639
+#: ../app/tools/gimpfreeselecttool.c:1633
 msgctxt "command"
 msgid "Free Select"
 msgstr "æ?ºæ?§å??é?¸å??"
@@ -12092,8 +12304,7 @@ msgctxt "command"
 msgid "Fuzzy Select"
 msgstr "æ?ºæ?§å??é?¸å??"
 
-#: ../app/tools/gimpgegltool.c:93
-#: ../app/tools/gimpgegltool.c:112
+#: ../app/tools/gimpgegltool.c:93 ../app/tools/gimpgegltool.c:112
 msgid "GEGL Operation"
 msgstr "GEGL æ??ä½?"
 
@@ -12113,6 +12324,7 @@ msgstr "GEGL æ??ä½?ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²ç??å??å±¤ã??"
 msgid "_Operation:"
 msgstr "æ??ä½?(_O):"
 
+#. The options vbox
 #: ../app/tools/gimpgegltool.c:430
 msgid "Operation Settings"
 msgstr "æ??ä½?è¨å®?"
@@ -12130,13 +12342,11 @@ msgstr "ä¿®è£?å·¥å?·ï¼?ä¿®è£?å??ç??ç??ç??ç?µ"
 msgid "_Heal"
 msgstr "ä¿®è£?(_H)"
 
-#: ../app/tools/gimphealtool.c:76
-#: ../app/tools/gimphealtool.c:79
+#: ../app/tools/gimphealtool.c:76 ../app/tools/gimphealtool.c:79
 msgid "Click to heal"
 msgstr "é»?é?¸ä»¥é??å§?ä¿®è£?"
 
-#: ../app/tools/gimphealtool.c:77
-#: ../app/tools/gimphealtool.c:81
+#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:81
 #, c-format
 msgid "%s to set a new heal source"
 msgstr "%s è¨å®?æ?°ç??ä¿®è£?ä¾?æº?"
@@ -12230,45 +12440,43 @@ msgstr "é ?å??è¨å®?(_S):"
 msgid "Settings saved to '%s'"
 msgstr "è¨å®?å?¼å·²å?²å?ç?ºâ??%sâ??"
 
-#: ../app/tools/gimpimagemaptool.c:367
+#: ../app/tools/gimpimagemaptool.c:368
 msgid "_Preview"
 msgstr "é ?è¦½(_P)"
 
-#: ../app/tools/gimpinkoptions-gui.c:55
+#. adjust sliders
+#: ../app/tools/gimpinkoptions-gui.c:54
 msgid "Adjustment"
 msgstr "èª¿æ?´"
 
-#: ../app/tools/gimpinkoptions-gui.c:67
-#: ../app/tools/gimpinkoptions-gui.c:92
-#: ../app/tools/gimprectangleoptions.c:972
-#: ../app/tools/gimptextoptions.c:489
-msgid "Size:"
-msgstr "å°ºå¯¸:"
+#: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87
+#: ../app/tools/gimppaintoptions-gui.c:127
+#, fuzzy
+msgid "Size"
+msgstr "å¤§å°?"
 
-#: ../app/tools/gimpinkoptions-gui.c:75
-#: ../app/tools/gimpmeasuretool.c:1047
-#: ../app/tools/gimppaintoptions-gui.c:139
-#: ../app/widgets/gimpbrusheditor.c:207
-msgid "Angle:"
-msgstr "è§?åº¦:"
+#: ../app/tools/gimpinkoptions-gui.c:71
+#: ../app/tools/gimppaintoptions-gui.c:153
+msgid "Angle"
+msgstr "è§?åº¦"
 
-#: ../app/tools/gimpinkoptions-gui.c:80
+#. sens sliders
+#: ../app/tools/gimpinkoptions-gui.c:77
 msgid "Sensitivity"
 msgstr "é??æ??åº¦"
 
-#: ../app/tools/gimpinkoptions-gui.c:99
-msgid "Tilt:"
-msgstr "å?¾æ??ï¼?"
-
-#: ../app/tools/gimpinkoptions-gui.c:106
-msgid "Speed:"
-msgstr "é??åº¦:"
+#: ../app/tools/gimpinkoptions-gui.c:94
+#: ../app/widgets/gimpdynamicseditor.c:146
+#: ../app/widgets/gimpdynamicsoutputeditor.c:233
+msgid "Tilt"
+msgstr "å?¾æ??"
 
-#: ../app/tools/gimpinkoptions-gui.c:117
-msgid "Type"
-msgstr "é¡?å??"
+#: ../app/tools/gimpinkoptions-gui.c:101
+msgid "Speed"
+msgstr "é??åº¦"
 
-#: ../app/tools/gimpinkoptions-gui.c:148
+#. Blob shape widgets
+#: ../app/tools/gimpinkoptions-gui.c:107
 msgid "Shape"
 msgstr "å½¢ç??"
 
@@ -12284,46 +12492,44 @@ msgstr "å¢¨æ°´ç?(_K)"
 msgid "Interactive boundary"
 msgstr "äº?å??å¼?é??ç??"
 
-#: ../app/tools/gimpiscissorstool.c:279
+#: ../app/tools/gimpiscissorstool.c:277
 msgid "Scissors"
 msgstr "å?ªå??"
 
-#: ../app/tools/gimpiscissorstool.c:280
+#: ../app/tools/gimpiscissorstool.c:278
 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting"
 msgstr "å?ªå??é?¸å??å·¥å?·ï¼?ä½¿ç?¨è?°æ??å?¤æ?·é??ç·£æ?¯å?¦å??é?©ç??æ?¹æ³?ï¼?ä¾?é?¸å??å½¢ç??"
 
-#: ../app/tools/gimpiscissorstool.c:281
+#: ../app/tools/gimpiscissorstool.c:279
 msgid "Intelligent _Scissors"
 msgstr "æ?ºæ?§å??å?ªå??(_S)"
 
-#: ../app/tools/gimpiscissorstool.c:931
-#: ../app/tools/gimpmeasuretool.c:608
+#: ../app/tools/gimpiscissorstool.c:931 ../app/tools/gimpmeasuretool.c:609
 msgid "Click-Drag to move this point"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??é??å??é»?"
 
-#: ../app/tools/gimpiscissorstool.c:933
-#: ../app/tools/gimpiscissorstool.c:997
+#: ../app/tools/gimpiscissorstool.c:933 ../app/tools/gimpiscissorstool.c:998
 #, c-format
 msgid "%s: disable auto-snap"
 msgstr "%sï¼?å??ç?¨è?ªå??è²¼é½?"
 
-#: ../app/tools/gimpiscissorstool.c:949
+#: ../app/tools/gimpiscissorstool.c:950
 msgid "Click to close the curve"
 msgstr "è«?æ??é??è£¡ä»¥é??é??æ?²ç·?"
 
-#: ../app/tools/gimpiscissorstool.c:955
+#: ../app/tools/gimpiscissorstool.c:956
 msgid "Click to add a point on this segment"
 msgstr "æ??ä¸?é??è£¡å?¨æ¤å??æ®µä¸å? å?¥æ?§å?¶é»?"
 
-#: ../app/tools/gimpiscissorstool.c:969
+#: ../app/tools/gimpiscissorstool.c:970
 msgid "Click or press Enter to convert to a selection"
 msgstr "é»?é?¸æ??æ?? Enter ä¾?è½?æ??ç?ºæ??é?¸å??å??"
 
-#: ../app/tools/gimpiscissorstool.c:979
+#: ../app/tools/gimpiscissorstool.c:980
 msgid "Press Enter to convert to a selection"
 msgstr "æ?? Enter ä¾?è½?æ??ç?ºæ??é?¸å??å??"
 
-#: ../app/tools/gimpiscissorstool.c:994
+#: ../app/tools/gimpiscissorstool.c:995
 msgid "Click or Click-Drag to add a point"
 msgstr "æ??ä¸?é??è£¡æ??æ??æ?³å?¯ä»¥å? å?¥ä¸?å??é»?"
 
@@ -12359,24 +12565,26 @@ msgstr "é?¸å??ç?°è?²ä½?ç½®"
 msgid "Pick white point"
 msgstr "é?¸å??ç?½è?²ä½?ç½®"
 
+#. Input levels frame
 #: ../app/tools/gimplevelstool.c:423
 msgid "Input Levels"
-msgstr "è¼¸å?¥ç?ç´?"
+msgstr "è¼¸å?¥è?²é??"
 
 #: ../app/tools/gimplevelstool.c:526
 msgid "Gamma"
 msgstr "Gamma"
 
+#. Output levels frame
 #: ../app/tools/gimplevelstool.c:568
 msgid "Output Levels"
-msgstr "è¼¸å?ºç?ç´?"
+msgstr "è¼¸å?ºè?²é??"
 
+#. all channels frame
 #: ../app/tools/gimplevelstool.c:645
 msgid "All Channels"
 msgstr "æ??æ??è?²ç??"
 
-#: ../app/tools/gimplevelstool.c:657
-#: ../app/tools/gimpthresholdtool.c:268
+#: ../app/tools/gimplevelstool.c:657 ../app/tools/gimpthresholdtool.c:268
 msgid "_Auto"
 msgstr "è?ªå??(_A)"
 
@@ -12396,8 +12604,8 @@ msgstr "ä½¿ç?¨è??ç??è?²é??æª?æ¡?æ ¼å¼?(_O)"
 msgid "Auto-resize window"
 msgstr "è?ªå??èª¿æ?´è¦?çª?å°ºå¯¸"
 
-#: ../app/tools/gimpmagnifyoptions.c:171
-#: ../app/tools/gimpmoveoptions.c:187
+#. tool toggle
+#: ../app/tools/gimpmagnifyoptions.c:171 ../app/tools/gimpmoveoptions.c:187
 #, c-format
 msgid "Tool Toggle  (%s)"
 msgstr "å·¥å?·å??æ??  (%s)"
@@ -12408,7 +12616,7 @@ msgstr "ç¸®æ?¾"
 
 #: ../app/tools/gimpmagnifytool.c:88
 msgid "Zoom Tool: Adjust the zoom level"
-msgstr "ç¸®æ?¾å·¥å?·ï¼?èª¿æ?´ç¸®æ?¾ç¨?åº¦"
+msgstr "ç¸®æ?¾é¡¯ç¤ºå·¥å?·ï¼?èª¿æ?´ç¸®æ?¾ç¨?åº¦"
 
 #: ../app/tools/gimpmagnifytool.c:89
 msgctxt "tool"
@@ -12419,15 +12627,15 @@ msgstr "ç¸®æ?¾(_Z)"
 msgid "Use info window"
 msgstr "ä½¿ç?¨è³?è¨?è¦?çª?"
 
-#: ../app/tools/gimpmeasuretool.c:125
+#: ../app/tools/gimpmeasuretool.c:124
 msgid "Measure"
 msgstr "æ¸¬é??"
 
-#: ../app/tools/gimpmeasuretool.c:126
+#: ../app/tools/gimpmeasuretool.c:125
 msgid "Measure Tool: Measure distances and angles"
 msgstr "æ¸¬é??å·¥å?·ï¼?æ¸¬é??è·?é?¢å??è§?åº¦"
 
-#: ../app/tools/gimpmeasuretool.c:127
+#: ../app/tools/gimpmeasuretool.c:126
 msgid "_Measure"
 msgstr "æ¸¬é??(_M)"
 
@@ -12435,42 +12643,45 @@ msgstr "æ¸¬é??(_M)"
 msgid "Add Guides"
 msgstr "æ?°å¢?å??è??ç·?"
 
-#: ../app/tools/gimpmeasuretool.c:559
+#: ../app/tools/gimpmeasuretool.c:560
 msgid "Click to place vertical and horizontal guides"
 msgstr "é»?é?¸ä»¥æ?¾ç½®æ°´å¹³å??å??ç?´å??è??ç·?"
 
-#: ../app/tools/gimpmeasuretool.c:568
+#: ../app/tools/gimpmeasuretool.c:569
 msgid "Click to place a horizontal guide"
 msgstr "è«?æ??é??è£¡æ?¾ç½®æ°´å¹³å??è??ç·?"
 
-#: ../app/tools/gimpmeasuretool.c:583
+#: ../app/tools/gimpmeasuretool.c:584
 msgid "Click to place a vertical guide"
 msgstr "è«?æ??é??è£¡æ?¾ç½®å??ç?´å??è??ç·?"
 
-#: ../app/tools/gimpmeasuretool.c:597
+#: ../app/tools/gimpmeasuretool.c:598
 msgid "Click-Drag to add a new point"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥å? å?¥æ?°ç??é»?"
 
-#: ../app/tools/gimpmeasuretool.c:628
+#: ../app/tools/gimpmeasuretool.c:629
 msgid "Click-Drag to move all points"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??æ??æ??ç??é»?"
 
-#: ../app/tools/gimpmeasuretool.c:885
-#: ../app/tools/gimpmeasuretool.c:1030
-#: ../app/tools/gimpmeasuretool.c:1086
-#: ../app/tools/gimpmeasuretool.c:1114
-#: ../app/tools/gimppainttool.c:643
+#: ../app/tools/gimpmeasuretool.c:886 ../app/tools/gimpmeasuretool.c:1031
+#: ../app/tools/gimpmeasuretool.c:1087 ../app/tools/gimpmeasuretool.c:1115
+#: ../app/tools/gimppainttool.c:646
 msgid "pixels"
 msgstr "å??ç´ "
 
-#: ../app/tools/gimpmeasuretool.c:998
+#. tool->display->shell
+#: ../app/tools/gimpmeasuretool.c:999
 msgid "Measure Distances and Angles"
 msgstr "æ¸¬é??è·?é?¢å??è§?åº¦"
 
-#: ../app/tools/gimpmeasuretool.c:1019
+#: ../app/tools/gimpmeasuretool.c:1020
 msgid "Distance:"
 msgstr "è·?é?¢:"
 
+#: ../app/tools/gimpmeasuretool.c:1048 ../app/widgets/gimpbrusheditor.c:207
+msgid "Angle:"
+msgstr "è§?åº¦:"
+
 #: ../app/tools/gimpmoveoptions.c:139
 msgid "Pick a layer or guide"
 msgstr "é?¸æ??å??å±¤æ??å??è??ç·?"
@@ -12495,33 +12706,32 @@ msgstr "ç§»å??ä½¿ç?¨ä¸ç??è·¯å¾?"
 msgid "Move:"
 msgstr "ç§»å??:"
 
-#: ../app/tools/gimpmovetool.c:126
+#: ../app/tools/gimpmovetool.c:128
 msgctxt "tool"
 msgid "Move"
 msgstr "ç§»å??"
 
-#: ../app/tools/gimpmovetool.c:127
+#: ../app/tools/gimpmovetool.c:129
 msgid "Move Tool: Move layers, selections, and other objects"
 msgstr "ç§»å??å·¥å?·ï¼?ç§»å??å??å±¤ã??é?¸å??å??å??å??å?¶ä»?ç?©ä»¶"
 
-#: ../app/tools/gimpmovetool.c:128
+#: ../app/tools/gimpmovetool.c:130
 msgid "_Move"
 msgstr "ç§»å??(_M)"
 
-#: ../app/tools/gimpmovetool.c:246
-#: ../app/tools/gimpmovetool.c:537
+#: ../app/tools/gimpmovetool.c:247 ../app/tools/gimpmovetool.c:538
 msgid "Move Guide: "
 msgstr "ç§»å??å??è??ç·?ï¼?"
 
-#: ../app/tools/gimpmovetool.c:531
+#: ../app/tools/gimpmovetool.c:532
 msgid "Remove Guide"
 msgstr "ç§»é?¤å??è??ç·?"
 
-#: ../app/tools/gimpmovetool.c:531
+#: ../app/tools/gimpmovetool.c:532
 msgid "Cancel Guide"
 msgstr "å??æ¶?å??è??ç·?"
 
-#: ../app/tools/gimpmovetool.c:537
+#: ../app/tools/gimpmovetool.c:538
 msgid "Add Guide: "
 msgstr "å? å?¥å??è??ç·?ï¼?"
 
@@ -12533,83 +12743,84 @@ msgstr "ç?«ç?å·¥å?·ï¼?ä½¿ç?¨ç?å?·ç¹ªè£½æ»?é ?ç??ç?å??æ??æ??"
 msgid "_Paintbrush"
 msgstr "ç?«ç?(_P)"
 
-#: ../app/tools/gimppaintoptions-gui.c:90
+#: ../app/tools/gimppaintoptions-gui.c:93
 #: ../app/tools/gimpselectionoptions.c:210
-#: ../app/widgets/gimpbrushselect.c:193
-#: ../app/widgets/gimplayertreeview.c:266
+#: ../app/widgets/gimpbrushselect.c:193 ../app/widgets/gimplayertreeview.c:266
 msgid "Mode:"
 msgstr "æ¨¡å¼?:"
 
-#: ../app/tools/gimppaintoptions-gui.c:105
-#: ../app/tools/gimptransformoptions.c:347
-#: ../app/widgets/gimpbrushselect.c:180
-#: ../app/widgets/gimplayertreeview.c:289
-msgid "Opacity:"
-msgstr "ä¸?é??æ??åº¦:"
-
-#: ../app/tools/gimppaintoptions-gui.c:118
-msgid "Brush:"
-msgstr "ç?å?·:"
+#: ../app/tools/gimppaintoptions-gui.c:117
+msgid "Brush"
+msgstr "ç?å?·"
 
-#: ../app/tools/gimppaintoptions-gui.c:123
-msgid "Scale:"
-msgstr "ç¸®æ?¾:"
+#: ../app/tools/gimppaintoptions-gui.c:144
+msgid "Reset size to brush's native size"
+msgstr ""
 
-#: ../app/tools/gimppaintoptions-gui.c:132
-msgid "Aspect:"
-msgstr "é?·å¯¬æ¯?ï¼?"
+#: ../app/tools/gimppaintoptions-gui.c:147
+msgid "Aspect Ratio"
+msgstr "é?·å¯¬æ¯?"
 
-#: ../app/tools/gimppaintoptions-gui.c:164
+#: ../app/tools/gimppaintoptions-gui.c:182
 msgid "Incremental"
 msgstr "é??å¢?æ¨¡å¼?"
 
-#: ../app/tools/gimppaintoptions-gui.c:180
+#: ../app/tools/gimppaintoptions-gui.c:198
 msgid "Hard edge"
 msgstr "é??ç??è¼?å??æ??"
 
-#: ../app/tools/gimppaintoptions-gui.c:214
-msgid "Fade out"
-msgstr "æ·¡å?º"
+#: ../app/tools/gimppaintoptions-gui.c:227
+#, fuzzy
+msgid "Dynamics Options"
+msgstr "ç?å?·å??æ??è³?æ??å¤¾"
+
+#: ../app/tools/gimppaintoptions-gui.c:233
+#, fuzzy
+msgid "Fade Options"
+msgstr "å·²å?²å?é?¸é ?"
 
-#: ../app/tools/gimppaintoptions-gui.c:223
-msgid "Length:"
-msgstr "é?·åº¦:"
+#: ../app/tools/gimppaintoptions-gui.c:247
+#, fuzzy
+msgid "Fade length"
+msgstr "æ·¡å?º"
 
-#: ../app/tools/gimppaintoptions-gui.c:243
-#: ../app/widgets/gimpviewablebox.c:223
+#: ../app/tools/gimppaintoptions-gui.c:273
+#: ../app/widgets/gimpviewablebox.c:288
 msgid "Reverse"
 msgstr "ç?¸å??æ?¹å??"
 
-#: ../app/tools/gimppaintoptions-gui.c:263
-msgid "Apply Jitter"
-msgstr "å¥?ç?¨æ??å??"
+#: ../app/tools/gimppaintoptions-gui.c:280
+#, fuzzy
+msgid "Color Options"
+msgstr "å·¥å?·é?¸é ?"
 
-#: ../app/tools/gimppaintoptions-gui.c:268
-msgid "Amount:"
+#: ../app/tools/gimppaintoptions-gui.c:305
+#, fuzzy
+msgid "Amount"
 msgstr "ç¸½é¡?:"
 
-#: ../app/tools/gimppaintoptions-gui.c:290
-msgid "Use color from gradient"
-msgstr "ä½¿ç?¨æ¼¸å±¤ä¸ç??é¡?è?²"
+#: ../app/tools/gimppaintoptions-gui.c:309
+msgid "Apply Jitter"
+msgstr "å¥?ç?¨æ??å??"
 
-#: ../app/tools/gimppainttool.c:142
+#: ../app/tools/gimppainttool.c:140
 msgid "Click to paint"
 msgstr "è«?æ??é??è£¡ç¹ªè£½"
 
-#: ../app/tools/gimppainttool.c:143
+#: ../app/tools/gimppainttool.c:141
 msgid "Click to draw the line"
 msgstr "è«?æ??é??è£¡ç¹ªè£½ç·?æ¢?"
 
-#: ../app/tools/gimppainttool.c:144
+#: ../app/tools/gimppainttool.c:142
 #, c-format
 msgid "%s to pick a color"
 msgstr "%s ä»¥æ??é?¸é¡?è?²"
 
-#: ../app/tools/gimppainttool.c:279
+#: ../app/tools/gimppainttool.c:278
 msgid "Cannot paint on layer groups."
 msgstr "ç?¡æ³?å?¨å??å±¤é?®ç½©ä¸?ç¹ªç?«"
 
-#: ../app/tools/gimppainttool.c:689
+#: ../app/tools/gimppainttool.c:692
 #, c-format
 msgid "%s for a straight line"
 msgstr "%s å?¯ç¹ªå?ºç?´ç·?"
@@ -12622,15 +12833,17 @@ msgstr "é??ç?å·¥å?·ï¼?ä½¿ç?¨ç?å?·ç¹ªå?ºå ?ç¡¬é??ç·£ç??ç?è§¸"
 msgid "Pe_ncil"
 msgstr "é??ç?(_N)"
 
-#: ../app/tools/gimpperspectiveclonetool.c:129
-msgid "Perspective Clone Tool: Clone from an image source after applying a perspective transformation"
+#: ../app/tools/gimpperspectiveclonetool.c:125
+msgid ""
+"Perspective Clone Tool: Clone from an image source after applying a "
+"perspective transformation"
 msgstr "é??è¦?æ³?ä»¿è£½å·¥å?·ï¼?å?¨å¥?ç?¨é??è¦?æ³?è®?æ??å¾?å¾?å??ç??ä¾?æº?ä»¿è£½"
 
-#: ../app/tools/gimpperspectiveclonetool.c:131
+#: ../app/tools/gimpperspectiveclonetool.c:127
 msgid "_Perspective Clone"
 msgstr "é??è¦?æ³?ä»¿è£½(_P)"
 
-#: ../app/tools/gimpperspectiveclonetool.c:704
+#: ../app/tools/gimpperspectiveclonetool.c:700
 msgid "Ctrl-Click to set a clone source"
 msgstr "è«?æ?? Ctrl ä¸¦é»?é?¸ä»¥è¨å®?è¤?è£½ä¾?æº?"
 
@@ -12679,52 +12892,57 @@ msgstr "è?²èª¿å??é?¢ç¨?åº¦(_L):"
 msgid "Use all visible layers when shrinking the selection"
 msgstr "å?¨æ?¶ç¸®é?¸å??å??å??æ??ä½¿ç?¨æ??æ??ç??å¾?è¦?ç??å??å±¤"
 
-#: ../app/tools/gimprectangleoptions.c:728
+#. Current, as in what is currently in use.
+#: ../app/tools/gimprectangleoptions.c:745
 msgid "Current"
 msgstr "ç?®å??ç??"
 
-#: ../app/tools/gimprectangleoptions.c:806
+#: ../app/tools/gimprectangleoptions.c:823
 msgid "Expand from center"
 msgstr "å¾?ä¸å¤®æ?´å±?"
 
-#: ../app/tools/gimprectangleoptions.c:829
+#: ../app/tools/gimprectangleoptions.c:846
 msgid "Fixed:"
 msgstr "å?ºå®?:"
 
-#: ../app/tools/gimprectangleoptions.c:962
+#: ../app/tools/gimprectangleoptions.c:979
 msgid "Position:"
 msgstr "ä½?ç½®:"
 
-#: ../app/tools/gimprectangleoptions.c:980
+#: ../app/tools/gimprectangleoptions.c:989 ../app/tools/gimptextoptions.c:489
+msgid "Size:"
+msgstr "å°ºå¯¸:"
+
+#: ../app/tools/gimprectangleoptions.c:997
 msgid "Highlight"
 msgstr "çª?é¡¯"
 
-#: ../app/tools/gimprectangleoptions.c:990
+#. Auto Shrink
+#: ../app/tools/gimprectangleoptions.c:1007
 msgid "Auto Shrink"
 msgstr "è?ªå??æ?¶ç¸®"
 
-#: ../app/tools/gimprectangleoptions.c:997
+#: ../app/tools/gimprectangleoptions.c:1014
 msgid "Shrink merged"
 msgstr "æ?¶ç¸®å??ä½µ"
 
-#: ../app/tools/gimprectangleselectoptions.c:163
+#: ../app/tools/gimprectangleselectoptions.c:164
 msgid "Rounded corners"
 msgstr "å??è§?"
 
-#: ../app/tools/gimprectangleselecttool.c:168
+#: ../app/tools/gimprectangleselecttool.c:169
 msgid "Rectangle Select"
 msgstr "ç?©å½¢é?¸å??"
 
-#: ../app/tools/gimprectangleselecttool.c:169
+#: ../app/tools/gimprectangleselecttool.c:170
 msgid "Rectangle Select Tool: Select a rectangular region"
 msgstr "ç?©å½¢é?¸å??å·¥å?·ï¼?é?¸å??ç?©å½¢å??å??"
 
-#: ../app/tools/gimprectangleselecttool.c:170
+#: ../app/tools/gimprectangleselecttool.c:171
 msgid "_Rectangle Select"
 msgstr "ç?©å½¢é?¸å??(_R)"
 
-#: ../app/tools/gimprectangletool.c:1158
-#: ../app/tools/gimprectangletool.c:2216
+#: ../app/tools/gimprectangletool.c:1169 ../app/tools/gimprectangletool.c:2165
 msgid "Rectangle: "
 msgstr "ç?©å½¢: "
 
@@ -12737,11 +12955,11 @@ msgstr "å?¯é?¸å??å®?å?¨é??æ??ç??å??å??"
 msgid "Base selection on all visible layers"
 msgstr "å??å??é?¸æ??ä»¥æ??æ??å?¯è¦?ç??å??å±¤ç?ºå?ºç¤?"
 
-#: ../app/tools/gimpregionselectoptions.c:201
+#: ../app/tools/gimpregionselectoptions.c:202
 msgid "Select transparent areas"
 msgstr "é?¸å??é??æ??å??å??"
 
-#: ../app/tools/gimpregionselectoptions.c:226
+#: ../app/tools/gimpregionselectoptions.c:228
 msgid "Select by:"
 msgstr "é?¸æ??ä¾?:"
 
@@ -12784,7 +13002,7 @@ msgstr "ç¸®æ?¾"
 
 #: ../app/tools/gimpscaletool.c:78
 msgid "Scale Tool: Scale the layer, selection or path"
-msgstr "ç¸®æ?¾å·¥å?·ï¼?ç¸®æ?¾å??å±¤ã??é?¸å??å??å??æ??è·¯å¾?"
+msgstr "ç¸®æ?¾æ¯?ä¾?å·¥å?·ï¼?ç¸®æ?¾å??å±¤ã??é?¸å??å??å??æ??è·¯å¾?"
 
 #: ../app/tools/gimpscaletool.c:79
 msgid "_Scale"
@@ -12795,12 +13013,11 @@ msgctxt "command"
 msgid "Scale"
 msgstr "ç¸®æ?¾"
 
-#: ../app/tools/gimpselectionoptions.c:257
-#: ../app/tools/gimptextoptions.c:502
+#: ../app/tools/gimpselectionoptions.c:257 ../app/tools/gimptextoptions.c:502
 msgid "Antialiasing"
 msgstr "å??é?¸é½?"
 
-#: ../app/tools/gimpselectionoptions.c:272
+#: ../app/tools/gimpselectionoptions.c:274
 msgid "Feather edges"
 msgstr "ç¾½å??é??ç·£"
 
@@ -12865,24 +13082,25 @@ msgstr "æ?¨ç§»é?? _X:"
 msgid "Shear magnitude _Y:"
 msgstr "æ?¨ç§»é?? _Y:"
 
-#: ../app/tools/gimpsmudgetool.c:53
+#: ../app/tools/gimpsmudgetool.c:54
 msgid "Smudge Tool: Smudge selectively using a brush"
 msgstr "å¡?æ?¹å·¥å?·ï¼?ä½¿ç?¨ç?å?·é?²è¡?é?¸æ??æ?§ç??å¡?æ?¹"
 
-#: ../app/tools/gimpsmudgetool.c:54
+#: ../app/tools/gimpsmudgetool.c:55
 msgid "_Smudge"
 msgstr "å¡?æ?¹(_S)"
 
-#: ../app/tools/gimpsmudgetool.c:73
+#: ../app/tools/gimpsmudgetool.c:74
 msgid "Click to smudge"
 msgstr "è«?æ??é??è£¡å¡?æ?¹"
 
-#: ../app/tools/gimpsmudgetool.c:74
+#: ../app/tools/gimpsmudgetool.c:75
 msgid "Click to smudge the line"
 msgstr "è«?æ??é??è£¡å¡?æ?¹ç·?æ¢?"
 
 #: ../app/tools/gimptextoptions.c:137
-msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes"
+msgid ""
+"Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr "å¾®èª¿ä¿®æ£å?å??ç??è¼ªå»?ä»¥ä¾¿å?¨å°?å?å??æ??è?½ç?¢ç??æ¸?æ?°ç??é»?é?£å??"
 
 #: ../app/tools/gimptextoptions.c:145
@@ -12907,12 +13125,14 @@ msgid "Text box resize mode"
 msgstr "ç´?æ??å?ç·¨è¼¯æ¨¡å¼?"
 
 #: ../app/tools/gimptextoptions.c:186
-msgid "Use an external editor window for text entry, instead of direct-on-canvas editing"
+msgid ""
+"Use an external editor window for text entry, instead of direct-on-canvas "
+"editing"
 msgstr "ç?ºæ??å?è¼¸å?¥ä½¿ç?¨å¤?é?¨ç·¨è¼¯å?¨è¦?çª?ï¼?å??ä»£ç?´æ?¥å?¨ç?«å¸?ä¸?ç·¨è¼¯"
 
-#: ../app/tools/gimptextoptions.c:482
-msgid "Font:"
-msgstr "å?å??:"
+#: ../app/tools/gimptextoptions.c:474
+msgid "Font"
+msgstr "å?å??"
 
 #: ../app/tools/gimptextoptions.c:498
 msgid "Use editor"
@@ -12955,30 +13175,32 @@ msgstr "æ??å?å·¥å?·ï¼?å»ºç«?æ??ç·¨è¼¯æ??å?å??å±¤"
 msgid "Te_xt"
 msgstr "æ??å?(_X)"
 
-#: ../app/tools/gimptexttool.c:956
+#: ../app/tools/gimptexttool.c:958
 msgid "Reshape Text Layer"
 msgstr "ä¿®æ?´æ??å?å??å±¤"
 
-#: ../app/tools/gimptexttool.c:1494
-#: ../app/tools/gimptexttool.c:1497
+#: ../app/tools/gimptexttool.c:1505 ../app/tools/gimptexttool.c:1508
 msgid "Confirm Text Editing"
 msgstr "ç¢ºèª?æ??å?ç·¨è¼¯"
 
-#: ../app/tools/gimptexttool.c:1501
+#: ../app/tools/gimptexttool.c:1512
 msgid "Create _New Layer"
 msgstr "å»ºç«?ä¸?å??æ?°ç??å??å±¤(_N)"
 
-#: ../app/tools/gimptexttool.c:1525
+#: ../app/tools/gimptexttool.c:1536
 msgid ""
-"The layer you selected is a text layer but it has been modified using other tools. Editing the layer with the text tool will discard these modifications.\n"
+"The layer you selected is a text layer but it has been modified using other "
+"tools. Editing the layer with the text tool will discard these "
+"modifications.\n"
 "\n"
 "You can edit the layer or create a new text layer from its text attributes."
 msgstr ""
-"æ?¨é?¸å??ç??æ?¯æ??å?å??å±¤ï¼?ä½?æ?¯å®?å·²ç¶?è¢«å?¶ä»?ç??å·¥å?·ä¿®æ?¹é??äº?ã??ä½¿ç?¨æ??å?å·¥å?·ä¾?ç·¨è¼¯æ¤å??å±¤æ??å??æ¶?å??å??ç??ä¿®æ?¹ã??\n"
+"æ?¨é?¸å??ç??æ?¯æ??å?å??å±¤ï¼?ä½?æ?¯å®?å·²ç¶?è¢«å?¶ä»?ç??å·¥å?·ä¿®æ?¹é??äº?ã??ä½¿ç?¨æ??å?å·¥å?·ä¾?ç·¨è¼¯æ¤å??å±¤"
+"æ??å??æ¶?å??å??ç??ä¿®æ?¹ã??\n"
 "\n"
 "æ?¨å?¯ä»¥ç·¨è¼¯æ¤å??å±¤æ??ä»¥å®?ç??æ??å?å±¬æ?§å»ºç«?ä¸?å??æ?°ç??æ??å?å??å±¤ã??"
 
-#: ../app/tools/gimptexttool-editor.c:1118
+#: ../app/tools/gimptexttool-editor.c:1158
 msgid "GIMP Text Editor"
 msgstr "GIMP æ??å?ç·¨è¼¯å?¨"
 
@@ -13004,61 +13226,62 @@ msgstr "å?¯å?ºè?¨ç??å?¼è¨å®?"
 
 #: ../app/tools/gimpthresholdtool.c:162
 msgid "Threshold does not operate on indexed layers."
-msgstr "è?¨ç??å?¼ä¸?é?©ç?¨æ?¼ç´¢å¼?å??å±¤ã??"
+msgstr "è?¨ç??å?¼ä¸?é?©ç?¨æ?¼ç´¢å¼?è?²å??å±¤ã??"
 
 #: ../app/tools/gimpthresholdtool.c:270
 msgid "Automatically adjust to optimal binarization threshold"
 msgstr "è?ªå??èª¿æ?´å?°æ??ä½³ç??äº?å??å??è?¨ç??å?¼"
 
-#: ../app/tools/gimptool.c:886
+#: ../app/tools/gimptool.c:917
 msgid "Can't work on an empty image, add a layer first"
-msgstr ""
+msgstr "ç?¡æ³?æ??ä½?å?¨ä¸?ç©ºç??å??ç??ä¸?ï¼?æ??ä»¥æ?¨é¦?å??è¦?å? å?¥ä¸?å??å??å±¤"
 
-#: ../app/tools/gimptransformoptions.c:272
+#: ../app/tools/gimptransformoptions.c:273
 msgid "Transform:"
 msgstr "è®?æ??:"
 
-#: ../app/tools/gimptransformoptions.c:281
-#: ../app/widgets/gimpdynamicseditor.c:150
-#: ../app/widgets/gimpdynamicsoutputeditor.c:227
+#: ../app/tools/gimptransformoptions.c:282
+#: ../app/widgets/gimpdynamicseditor.c:145
+#: ../app/widgets/gimpdynamicsoutputeditor.c:226
 msgid "Direction"
 msgstr "æ?¹å??"
 
-#: ../app/tools/gimptransformoptions.c:286
+#. the interpolation menu
+#: ../app/tools/gimptransformoptions.c:287
 msgid "Interpolation:"
 msgstr "å?§æ??æ³?:"
 
-#: ../app/tools/gimptransformoptions.c:299
+#: ../app/tools/gimptransformoptions.c:300
 msgid "Clipping:"
 msgstr "å?ªè¼¯ï¼?"
 
-#: ../app/tools/gimptransformoptions.c:317
+#: ../app/tools/gimptransformoptions.c:318
 msgid "Preview:"
 msgstr "é ?è¦½:"
 
-#: ../app/tools/gimptransformoptions.c:388
+#: ../app/tools/gimptransformoptions.c:364
 #, c-format
 msgid "15 degrees  (%s)"
 msgstr "15 åº¦  (%s)"
 
-#: ../app/tools/gimptransformoptions.c:392
+#: ../app/tools/gimptransformoptions.c:368
 #, c-format
 msgid "Keep aspect  (%s)"
 msgstr "ä¿?æ??é?·å¯¬æ¯?  (%s)"
 
-#: ../app/tools/gimptransformtool.c:240
+#: ../app/tools/gimptransformtool.c:237
 msgid "Transforming"
 msgstr "æ£å?¨é?²è¡?è®?æ??"
 
-#: ../app/tools/gimptransformtool.c:1173
+#: ../app/tools/gimptransformtool.c:1260
 msgid "There is no layer to transform."
 msgstr "ç?®å??æ²?æ??è¦?è®?æ??ç??å??å±¤ã??"
 
-#: ../app/tools/gimptransformtool.c:1186
+#: ../app/tools/gimptransformtool.c:1273
 msgid "There is no path to transform."
 msgstr "ç?®å??æ²?æ??è¦?è®?æ??ç??è·¯å¾?ã??"
 
-#: ../app/tools/gimptransformtool.c:1187
+#: ../app/tools/gimptransformtool.c:1274
 msgid "The active path's strokes are locked."
 msgstr "ä½¿ç?¨ä¸è·¯å¾?ç??æ??é??æ?¯é??ä½?ç??ã??"
 
@@ -13087,19 +13310,20 @@ msgstr ""
 " %s å?ªæ¸?\n"
 " %s äº¤é??"
 
+#. Create a selection from the current path
 #: ../app/tools/gimpvectoroptions.c:188
 msgid "Selection from Path"
 msgstr "è·¯å¾?è½?ç?ºé?¸å??å??å??"
 
-#: ../app/tools/gimpvectortool.c:163
+#: ../app/tools/gimpvectortool.c:161
 msgid "Paths Tool: Create and edit paths"
 msgstr "è·¯å¾?å·¥å?·ï¼?å»ºç«?å??ç·¨è¼¯è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:164
+#: ../app/tools/gimpvectortool.c:162
 msgid "Pat_hs"
 msgstr "è·¯å¾?(_H)"
 
-#: ../app/tools/gimpvectortool.c:254
+#: ../app/tools/gimpvectortool.c:252
 msgid "The active path is locked."
 msgstr "ä½¿ç?¨ä¸è·¯å¾?æ?¯é??ä½?ç??ã??"
 
@@ -13119,119 +13343,117 @@ msgstr "æ??å?¥é?¨é»?"
 msgid "Drag Handle"
 msgstr "æ??æ?³æ?§å?¶æ??"
 
-#: ../app/tools/gimpvectortool.c:453
+#: ../app/tools/gimpvectortool.c:454
 msgid "Drag Anchor"
 msgstr "æ??æ?³é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:471
+#: ../app/tools/gimpvectortool.c:472
 msgid "Drag Anchors"
 msgstr "æ??æ?³é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:494
+#: ../app/tools/gimpvectortool.c:495
 msgid "Drag Curve"
 msgstr "æ??æ?³æ?²ç·?"
 
-#: ../app/tools/gimpvectortool.c:523
+#: ../app/tools/gimpvectortool.c:524
 msgid "Connect Strokes"
 msgstr "é?£æ?¥ç?å??"
 
-#: ../app/tools/gimpvectortool.c:555
+#: ../app/tools/gimpvectortool.c:556
 msgid "Drag Path"
 msgstr "æ??æ?³è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:566
+#: ../app/tools/gimpvectortool.c:567
 msgid "Convert Edge"
 msgstr "è½?æ??é??ç·£"
 
-#: ../app/tools/gimpvectortool.c:597
+#: ../app/tools/gimpvectortool.c:598
 msgid "Delete Anchor"
 msgstr "å?ªé?¤å??é??"
 
-#: ../app/tools/gimpvectortool.c:620
+#: ../app/tools/gimpvectortool.c:621
 msgid "Delete Segment"
 msgstr "å?ªé?¤å??æ®µ"
 
-#: ../app/tools/gimpvectortool.c:839
+#: ../app/tools/gimpvectortool.c:840
 msgid "Move Anchors"
 msgstr "ç§»å??é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1199
+#: ../app/tools/gimpvectortool.c:1203
 msgid "Click to pick path to edit"
 msgstr "æ??ä¸?é??è£¡å?¯ä»¥é?¸æ??æ?¨æº?å??ç·¨è¼¯ç??è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:1203
+#: ../app/tools/gimpvectortool.c:1207
 msgid "Click to create a new path"
 msgstr "æ??ä¸?é??è£¡å?¯ä»¥è£½ä½?æ?°ç??è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:1207
+#: ../app/tools/gimpvectortool.c:1211
 msgid "Click to create a new component of the path"
 msgstr "æ??ä¸?é??è£¡å?¯ä»¥è£½ä½?è·¯å¾?ç??æ?°å??ä»¶"
 
-#: ../app/tools/gimpvectortool.c:1211
+#: ../app/tools/gimpvectortool.c:1215
 msgid "Click or Click-Drag to create a new anchor"
 msgstr "æ??ä¸?å¾?æ??æ?³ä»¥å»ºç«?æ?°ç??é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1221
-#: ../app/tools/gimpvectortool.c:1228
+#: ../app/tools/gimpvectortool.c:1225 ../app/tools/gimpvectortool.c:1232
 msgid "Click-Drag to move the anchor around"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1232
-#: ../app/tools/gimpvectortool.c:1255
+#: ../app/tools/gimpvectortool.c:1236 ../app/tools/gimpvectortool.c:1259
 msgid "Click-Drag to move the anchors around"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1238
+#: ../app/tools/gimpvectortool.c:1242
 msgid "Click-Drag to move the handle around"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??æ?§å?¶æ??"
 
-#: ../app/tools/gimpvectortool.c:1245
+#: ../app/tools/gimpvectortool.c:1249
 #, fuzzy
 msgid "Click-Drag to move the handles around symmetrically"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??æ?§å?¶æ??"
 
-#: ../app/tools/gimpvectortool.c:1260
+#: ../app/tools/gimpvectortool.c:1264
 msgid "Click-Drag to change the shape of the curve"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥æ?¹è®?æ?²ç·?ç??å½¢ç??"
 
-#: ../app/tools/gimpvectortool.c:1263
+#: ../app/tools/gimpvectortool.c:1267
 #, c-format
 msgid "%s: symmetrical"
 msgstr "%sï¼?å°?ç¨±å¼?"
 
-#: ../app/tools/gimpvectortool.c:1268
+#: ../app/tools/gimpvectortool.c:1272
 msgid "Click-Drag to move the component around"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??å??ä»¶"
 
-#: ../app/tools/gimpvectortool.c:1276
+#: ../app/tools/gimpvectortool.c:1280
 msgid "Click-Drag to move the path around"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥ç§»å??è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:1280
+#: ../app/tools/gimpvectortool.c:1284
 msgid "Click-Drag to insert an anchor on the path"
 msgstr "æ??ä¸?å¾?æ??æ?³å?¯ä»¥å?¨è·¯å¾?ä¸æ??å?¥é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1288
+#: ../app/tools/gimpvectortool.c:1292
 msgid "Click to delete this anchor"
 msgstr "é»?é?¸ä»¥å?ªé?¤é??å??é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1292
+#: ../app/tools/gimpvectortool.c:1296
 msgid "Click to connect this anchor with the selected endpoint"
 msgstr "é»?é?¸ä»¥å°?é??å??é?¨é»?è??é?¸å??ç??çµ?æ??é»?é?£æ?¥"
 
-#: ../app/tools/gimpvectortool.c:1297
+#: ../app/tools/gimpvectortool.c:1301
 msgid "Click to open up the path"
 msgstr "æ??ä¸?é??è£¡å?¯ä»¥é??å??è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:1301
+#: ../app/tools/gimpvectortool.c:1305
 msgid "Click to make this node angular"
 msgstr "é»?é?¸è®?é??å??ç¯?é»?æ??ç?ºç¨?è§?"
 
-#: ../app/tools/gimpvectortool.c:1813
+#: ../app/tools/gimpvectortool.c:1805
 msgid "Delete Anchors"
 msgstr "å?ªé?¤é?¨é»?"
 
-#: ../app/tools/gimpvectortool.c:1984
+#: ../app/tools/gimpvectortool.c:1976
 msgid "There is no active layer or channel to stroke to"
 msgstr "ç?®å??æ²?æ??ä»»ä½?ä½¿ç?¨ä¸ç??å??å±¤æ??è??è?²ç??å?¯ä»¥ç?¨ä¾?æ??é??"
 
@@ -13286,10 +13508,9 @@ msgid "Size"
 msgstr "å¤§å°?"
 
 #: ../app/tools/tools-enums.c:219
-#, fuzzy
 msgctxt "rect-select-mode"
 msgid "Free select"
-msgstr "é?¸æ??é??æ?²"
+msgstr "è?ªç?±é?¸å??"
 
 #: ../app/tools/tools-enums.c:220
 msgctxt "rect-select-mode"
@@ -13361,97 +13582,97 @@ msgctxt "vector-mode"
 msgid "Move"
 msgstr "ç§»å??"
 
-#: ../app/vectors/gimpvectors.c:206
+#: ../app/vectors/gimpvectors.c:208
 msgctxt "undo-type"
 msgid "Rename Path"
 msgstr "æ?´æ?¹è·¯å¾?å??ç¨±"
 
-#: ../app/vectors/gimpvectors.c:207
+#: ../app/vectors/gimpvectors.c:209
 msgctxt "undo-type"
 msgid "Move Path"
 msgstr "ç§»å??è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:208
+#: ../app/vectors/gimpvectors.c:210
 msgctxt "undo-type"
 msgid "Scale Path"
 msgstr "ç¸®æ?¾è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:209
+#: ../app/vectors/gimpvectors.c:211
 msgctxt "undo-type"
 msgid "Resize Path"
 msgstr "èª¿æ?´è·¯å¾?å¤§å°?"
 
-#: ../app/vectors/gimpvectors.c:210
+#: ../app/vectors/gimpvectors.c:212
 msgctxt "undo-type"
 msgid "Flip Path"
 msgstr "ç¿»è½?è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:211
+#: ../app/vectors/gimpvectors.c:213
 msgctxt "undo-type"
 msgid "Rotate Path"
 msgstr "æ??è½?è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:212
+#: ../app/vectors/gimpvectors.c:214
 msgctxt "undo-type"
 msgid "Transform Path"
 msgstr "è®?æ??è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:213
+#: ../app/vectors/gimpvectors.c:215
 msgctxt "undo-type"
 msgid "Stroke Path"
 msgstr "æ²¿è??è·¯å¾?æ??é??"
 
-#: ../app/vectors/gimpvectors.c:214
+#: ../app/vectors/gimpvectors.c:216
 msgctxt "undo-type"
 msgid "Path to Selection"
 msgstr "è·¯å¾?è½?ç?ºé?¸å??å??å??"
 
-#: ../app/vectors/gimpvectors.c:215
+#: ../app/vectors/gimpvectors.c:217
 msgctxt "undo-type"
 msgid "Reorder Path"
 msgstr "é??æ?°ç·¨æ??è·¯å¾?æ¬¡åº?"
 
-#: ../app/vectors/gimpvectors.c:216
+#: ../app/vectors/gimpvectors.c:218
 msgctxt "undo-type"
 msgid "Raise Path"
 msgstr "æ??å??è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:217
+#: ../app/vectors/gimpvectors.c:219
 msgctxt "undo-type"
 msgid "Raise Path to Top"
 msgstr "æ??å??è·¯å¾?å?°æ??ä¸?å±¤"
 
-#: ../app/vectors/gimpvectors.c:218
+#: ../app/vectors/gimpvectors.c:220
 msgctxt "undo-type"
 msgid "Lower Path"
 msgstr "é??ä½?è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:219
+#: ../app/vectors/gimpvectors.c:221
 msgctxt "undo-type"
 msgid "Lower Path to Bottom"
 msgstr "é??ä½?è·¯å¾?å?°æ??ä¸?å±¤"
 
-#: ../app/vectors/gimpvectors.c:220
+#: ../app/vectors/gimpvectors.c:222
 msgid "Path cannot be raised higher."
 msgstr "è·¯å¾?ç?¡æ³?å??å??ä¸?ç§»ã??"
 
-#: ../app/vectors/gimpvectors.c:221
+#: ../app/vectors/gimpvectors.c:223
 msgid "Path cannot be lowered more."
 msgstr "è·¯å¾?ç?¡æ³?å??å??ä¸?ç§»ã??"
 
-#: ../app/vectors/gimpvectors.c:364
+#: ../app/vectors/gimpvectors.c:365
 msgid "Move Path"
 msgstr "ç§»å??è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:463
+#: ../app/vectors/gimpvectors.c:464
 msgid "Flip Path"
 msgstr "ç¿»è½?è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:494
+#: ../app/vectors/gimpvectors.c:495
 msgid "Rotate Path"
 msgstr "æ??è½?è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:524
+#: ../app/vectors/gimpvectors.c:525
 msgid "Transform Path"
 msgstr "è®?æ??è·¯å¾?"
 
@@ -13482,7 +13703,7 @@ msgstr "ç·©è¡?å??ä¸æ²?æ??ä»»ä½?è·¯å¾?"
 msgid "Failed to import paths from '%s': %s"
 msgstr "ç?¡æ³?å¾?â??%sâ??å?¯å?¥è·¯å¾?ï¼?%s"
 
-#: ../app/widgets/gimpactioneditor.c:66
+#: ../app/widgets/gimpactioneditor.c:69
 msgid "_Search:"
 msgstr "æ??å°?(_S):"
 
@@ -13492,7 +13713,7 @@ msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 msgstr "RGBA (%0.3fï¼?%0.3fï¼?%0.3fï¼?%0.3f)"
 
 #: ../app/widgets/gimpactionview.c:337
-#: ../app/widgets/gimpcontrollereditor.c:344
+#: ../app/widgets/gimpcontrollereditor.c:347
 msgid "Action"
 msgstr "å??ä½?"
 
@@ -13504,8 +13725,7 @@ msgstr "æ?·å¾?é?µ"
 msgid "Name"
 msgstr "å??ç¨±"
 
-#: ../app/widgets/gimpactionview.c:632
-#: ../app/widgets/gimpactionview.c:832
+#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832
 msgid "Changing shortcut failed."
 msgstr "ç?¡æ³?æ?´æ?¹æ?·å¾?é?µã??"
 
@@ -13535,6 +13755,10 @@ msgstr "æ?·å¾?é?µä¸?å??æ³?ã??"
 msgid "Removing shortcut failed."
 msgstr "ç?¡æ³?ç§»é?¤æ?·å¾?é?µã??"
 
+#: ../app/widgets/gimpbrusheditor.c:153
+msgid "Radius:"
+msgstr "å??å¾?:"
+
 #: ../app/widgets/gimpbrusheditor.c:168
 msgid "Spikes:"
 msgstr "å°?ç«¯æ?¸ï¼?"
@@ -13557,9 +13781,12 @@ msgstr "é??é??ï¼?"
 msgid "Percentage of width of brush"
 msgstr "ç?å?·å¯¬åº¦ç?¾å??æ¯?"
 
-#: ../app/widgets/gimpbufferview.c:173
-#: ../app/widgets/gimpbufferview.c:257
-#: ../app/widgets/gimpeditor.c:735
+#: ../app/widgets/gimpbrushselect.c:180 ../app/widgets/gimplayertreeview.c:289
+msgid "Opacity:"
+msgstr "ä¸?é??æ??åº¦:"
+
+#: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257
+#: ../app/widgets/gimpeditor.c:737
 msgid "(None)"
 msgstr "(ç?¡)"
 
@@ -13567,109 +13794,107 @@ msgstr "(ç?¡)"
 msgid "Add the current color to the color history"
 msgstr "å°?ç?®å??ç??é¡?è?²å? å?¥è?²å½©ä½¿ç?¨ç´?é??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:151
+#: ../app/widgets/gimpcolordisplayeditor.c:154
 msgid "Available Filters"
 msgstr "å?¯ä½¿ç?¨ç??æ¿¾è?²ç??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:212
+#: ../app/widgets/gimpcolordisplayeditor.c:215
 msgid "Move the selected filter up"
 msgstr "å°?é?¸å??ç??æ¿¾è?²ç??ä¸?ç§»"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:221
+#: ../app/widgets/gimpcolordisplayeditor.c:224
 msgid "Move the selected filter down"
 msgstr "å°?é?¸å??ç??æ¿¾è?²ç??ä¸?ç§»"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:267
+#: ../app/widgets/gimpcolordisplayeditor.c:270
 msgid "Active Filters"
 msgstr "ä½¿ç?¨ä¸ç??æ¿¾è?²ç??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:318
+#: ../app/widgets/gimpcolordisplayeditor.c:321
 msgid "Reset the selected filter to default values"
 msgstr "é??å??é?¸å??ç??æ¿¾é?¡ç?ºé ?è¨æ?¸å?¼"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:492
+#: ../app/widgets/gimpcolordisplayeditor.c:495
 #, c-format
 msgid "Add '%s' to the list of active filters"
 msgstr "å°?ã??%sã??å? å?¥ä½¿ç?¨ä¸æ¿¾é?¡æ¸?å?®"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:529
+#: ../app/widgets/gimpcolordisplayeditor.c:532
 #, c-format
 msgid "Remove '%s' from the list of active filters"
 msgstr "å¾?ä½¿ç?¨ä¸æ¿¾é?¡æ¸?å?®ä¸ç§»é?¤ã??%sã??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:560
+#: ../app/widgets/gimpcolordisplayeditor.c:563
 msgid "No filter selected"
 msgstr "æ?ªé?¸å??æ¿¾é?¡"
 
 #: ../app/widgets/gimpcoloreditor.c:259
-msgid "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts CSS color names."
+msgid ""
+"Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
+"CSS color names."
 msgstr "å¸¸ç?¨æ?¼ HTML å?? CSS ç??å??å?é?²ä½?é¡?è?²ç¢¼ã??é??å??é ?ç?®ä¹?å?¯ä»¥ä½¿ç?¨ CSS è?²å½©å??ç¨±ã??"
 
-#: ../app/widgets/gimpcolorframe.c:508
+#: ../app/widgets/gimpcolorframe.c:511
 msgid "Index:"
 msgstr "ç´¢å¼?:"
 
-#: ../app/widgets/gimpcolorframe.c:521
-#: ../app/widgets/gimpcolorframe.c:547
+#: ../app/widgets/gimpcolorframe.c:524 ../app/widgets/gimpcolorframe.c:550
 msgid "Red:"
 msgstr "ç´?:"
 
-#: ../app/widgets/gimpcolorframe.c:522
-#: ../app/widgets/gimpcolorframe.c:548
+#: ../app/widgets/gimpcolorframe.c:525 ../app/widgets/gimpcolorframe.c:551
 msgid "Green:"
 msgstr "ç¶ :"
 
-#: ../app/widgets/gimpcolorframe.c:523
-#: ../app/widgets/gimpcolorframe.c:549
+#: ../app/widgets/gimpcolorframe.c:526 ../app/widgets/gimpcolorframe.c:552
 msgid "Blue:"
 msgstr "è??:"
 
-#: ../app/widgets/gimpcolorframe.c:536
-#: ../app/widgets/gimpcolorframe.c:569
+#: ../app/widgets/gimpcolorframe.c:539 ../app/widgets/gimpcolorframe.c:572
 msgid "Value:"
 msgstr "äº®åº¦:"
 
-#: ../app/widgets/gimpcolorframe.c:560
+#: ../app/widgets/gimpcolorframe.c:563
 msgid "Hex:"
 msgstr "16 é?²å?¶:"
 
-#: ../app/widgets/gimpcolorframe.c:567
+#: ../app/widgets/gimpcolorframe.c:570
 msgid "Hue:"
 msgstr "è?²ç?¸:"
 
-#: ../app/widgets/gimpcolorframe.c:568
+#: ../app/widgets/gimpcolorframe.c:571
 msgid "Sat.:"
 msgstr "é£½å??åº¦:"
 
-#: ../app/widgets/gimpcolorframe.c:586
+#: ../app/widgets/gimpcolorframe.c:589
 msgid "Cyan:"
 msgstr "æ°°è??:"
 
-#: ../app/widgets/gimpcolorframe.c:587
+#: ../app/widgets/gimpcolorframe.c:590
 msgid "Magenta:"
 msgstr "æ´?ç´?:"
 
-#: ../app/widgets/gimpcolorframe.c:588
+#: ../app/widgets/gimpcolorframe.c:591
 msgid "Yellow:"
 msgstr "é»?:"
 
-#: ../app/widgets/gimpcolorframe.c:589
+#: ../app/widgets/gimpcolorframe.c:592
 msgid "Black:"
 msgstr "é»?:"
 
-#: ../app/widgets/gimpcolorframe.c:609
+#: ../app/widgets/gimpcolorframe.c:612
 msgid "Alpha:"
 msgstr "é??æ??:"
 
-#: ../app/widgets/gimpcolormapeditor.c:208
+#: ../app/widgets/gimpcolormapeditor.c:201
 msgid "Color index:"
 msgstr "è?²å½©ç´¢å¼?:"
 
-#: ../app/widgets/gimpcolormapeditor.c:218
+#: ../app/widgets/gimpcolormapeditor.c:211
 msgid "HTML notation:"
 msgstr "HTML æ?¹å¼?è¡¨ç¤º:"
 
-#: ../app/widgets/gimpcolormapeditor.c:472
+#: ../app/widgets/gimpcolormapeditor.c:473
 msgid "Only indexed images have a colormap."
 msgstr "å?ªæ??ç´¢å¼?å¼?å??ç??æ??é¡?è?²å°?æ??è¡¨ã??"
 
@@ -13685,50 +13910,50 @@ msgstr "å°?é ?è¦½å??ç¸®å°?"
 msgid "Larger Previews"
 msgstr "å°?é ?è¦½å??æ?¾å¤§"
 
-#: ../app/widgets/gimpcontrollereditor.c:201
+#: ../app/widgets/gimpcontrollereditor.c:204
 msgid "_Dump events from this controller"
 msgstr "å?¾å?°é??å??æ?§å?¶å?¨ç??äº?ä»¶(_D)"
 
-#: ../app/widgets/gimpcontrollereditor.c:206
+#: ../app/widgets/gimpcontrollereditor.c:209
 msgid "_Enable this controller"
 msgstr "å??ç?¨é??å??æ?§å?¶å?¨(_E)"
 
-#: ../app/widgets/gimpcontrollereditor.c:227
+#: ../app/widgets/gimpcontrollereditor.c:230
 msgid "Name:"
 msgstr "å??ç¨±(_N):"
 
-#: ../app/widgets/gimpcontrollereditor.c:233
+#: ../app/widgets/gimpcontrollereditor.c:236
 msgid "State:"
 msgstr "ç??æ??:"
 
-#: ../app/widgets/gimpcontrollereditor.c:338
+#: ../app/widgets/gimpcontrollereditor.c:341
 msgid "Event"
 msgstr "äº?ä»¶"
 
-#: ../app/widgets/gimpcontrollereditor.c:363
+#: ../app/widgets/gimpcontrollereditor.c:366
 msgid "_Grab event"
 msgstr "æ??å??äº?ä»¶(_G)"
 
-#: ../app/widgets/gimpcontrollereditor.c:372
+#: ../app/widgets/gimpcontrollereditor.c:375
 msgid "Select the next event arriving from the controller"
 msgstr "é?¸æ??ä¸?ä¸?å??é??é??æ¤æ?§å?¶å?¨ç??äº?ä»¶"
 
-#: ../app/widgets/gimpcontrollereditor.c:530
+#: ../app/widgets/gimpcontrollereditor.c:533
 #, c-format
 msgid "Remove the action assigned to '%s'"
 msgstr "ç§»é?¤æ??æ´¾çµ¦â??%sâ??ç??å??ä½?"
 
-#: ../app/widgets/gimpcontrollereditor.c:535
+#: ../app/widgets/gimpcontrollereditor.c:538
 #, c-format
 msgid "Assign an action to '%s'"
 msgstr "æ??æ´¾å??ä½?çµ¦â??%sâ??"
 
-#: ../app/widgets/gimpcontrollereditor.c:656
+#: ../app/widgets/gimpcontrollereditor.c:659
 #, c-format
 msgid "Select Action for Event '%s'"
 msgstr "é?¸æ??äº?ä»¶â??%sâ??ç??å??ä½?"
 
-#: ../app/widgets/gimpcontrollereditor.c:661
+#: ../app/widgets/gimpcontrollereditor.c:664
 msgid "Select Controller Event Action"
 msgstr "é?¸æ??æ?§å?¶å?¨äº?ä»¶å??ä½?"
 
@@ -13789,37 +14014,37 @@ msgstr "é?µç?¤äº?ä»¶"
 msgid "Ready"
 msgstr "å°±ç·?"
 
-#: ../app/widgets/gimpcontrollerlist.c:181
+#: ../app/widgets/gimpcontrollerlist.c:184
 msgid "Available Controllers"
 msgstr "å?¯ç?¨ç??æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:273
+#: ../app/widgets/gimpcontrollerlist.c:276
 msgid "Active Controllers"
 msgstr "ä½¿ç?¨ä¸æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:289
+#: ../app/widgets/gimpcontrollerlist.c:292
 msgid "Configure the selected controller"
 msgstr "è¨å®?é?¸å??ç??æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:297
+#: ../app/widgets/gimpcontrollerlist.c:300
 msgid "Move the selected controller up"
 msgstr "å°?é?¸å??ç??æ?§å?¶å?¨ä¸?ç§»"
 
-#: ../app/widgets/gimpcontrollerlist.c:305
+#: ../app/widgets/gimpcontrollerlist.c:308
 msgid "Move the selected controller down"
 msgstr "å°?é?¸å??ç??æ?§å?¶å?¨å¾?ä¸?ç§»å??"
 
-#: ../app/widgets/gimpcontrollerlist.c:429
+#: ../app/widgets/gimpcontrollerlist.c:432
 #, c-format
 msgid "Add '%s' to the list of active controllers"
 msgstr "å°?â??%sâ??å? å?¥ä½¿ç?¨ä¸æ?§å?¶å?¨ç??æ¸?å?®"
 
-#: ../app/widgets/gimpcontrollerlist.c:480
+#: ../app/widgets/gimpcontrollerlist.c:483
 #, c-format
 msgid "Remove '%s' from the list of active controllers"
 msgstr "å¾?ä½¿ç?¨ä¸æ?§å?¶å?¨æ¸?å?®ç§»é?¤ã??%sã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:514
+#: ../app/widgets/gimpcontrollerlist.c:517
 msgid ""
 "There can only be one active keyboard controller.\n"
 "\n"
@@ -13829,7 +14054,7 @@ msgstr ""
 "\n"
 "æ?¨ç??ä½¿ç?¨ä¸æ?§å?¶å?¨æ¸?å?®ä¸å·²ç¶?æ??é?µç?¤æ?§å?¶å?¨äº?ã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:525
+#: ../app/widgets/gimpcontrollerlist.c:528
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
@@ -13839,34 +14064,36 @@ msgstr ""
 "\n"
 "æ?¨ç??ä½¿ç?¨ä¸æ?§å?¶å?¨æ¸?å?®ä¸å·²ç¶?æ?? wheel æ?§å?¶å?¨äº?ã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:551
+#: ../app/widgets/gimpcontrollerlist.c:554
 msgid "Remove Controller?"
 msgstr "æ?¯å?¦ç§»é?¤æ?§å?¶å?¨ï¼?"
 
-#: ../app/widgets/gimpcontrollerlist.c:556
+#: ../app/widgets/gimpcontrollerlist.c:559
 msgid "Disable Controller"
 msgstr "å??ç?¨æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:558
+#: ../app/widgets/gimpcontrollerlist.c:561
 msgid "Remove Controller"
 msgstr "ç§»é?¤æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:570
+#: ../app/widgets/gimpcontrollerlist.c:573
 #, c-format
 msgid "Remove Controller '%s'?"
 msgstr "æ?¯å?¦ç§»é?¤æ?§å?¶å?¨â??%sâ??ï¼?"
 
-#: ../app/widgets/gimpcontrollerlist.c:574
+#: ../app/widgets/gimpcontrollerlist.c:577
 msgid ""
-"Removing this controller from the list of active controllers will permanently delete all event mappings you have configured.\n"
+"Removing this controller from the list of active controllers will "
+"permanently delete all event mappings you have configured.\n"
 "\n"
-"Selecting \"Disable Controller\" will disable the controller without removing it."
+"Selecting \"Disable Controller\" will disable the controller without "
+"removing it."
 msgstr ""
 "å¾?ä½¿ç?¨ä¸æ?§å?¶å?¨æ¸?å?®ç§»é?¤é??å??æ?§å?¶å?¨æ??æ°¸é? å?ªé?¤æ??æ??æ?¨è¨å®?é??ç??äº?ä»¶å°?æ? ã??\n"
 "\n"
 "é?¸æ??ã??å??ç?¨æ?§å?¶å?¨ã??å?ªæ??å??ç?¨è©²æ?§å?¶å?¨è??ä¸?æ??ç§»é?¤å®?ã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:626
+#: ../app/widgets/gimpcontrollerlist.c:629
 msgid "Configure Input Controller"
 msgstr "è¨å®?è¼¸å?¥æ?§å?¶å?¨"
 
@@ -13935,28 +14162,30 @@ msgstr "é??å??"
 msgid "%s (read only)"
 msgstr "%s (å?¯è®?)"
 
-#: ../app/widgets/gimpdeviceeditor.c:161
+#: ../app/widgets/gimpdeviceeditor.c:168
 msgid "Delete the selected device"
 msgstr "å?ªé?¤é?¸å??ç??è£?ç½®"
 
-#: ../app/widgets/gimpdeviceeditor.c:469
+#: ../app/widgets/gimpdeviceeditor.c:510
 msgid "Delete Device Settings"
 msgstr "å?ªé?¤è£?ç½®ç??è¨å®?ï¼?"
 
-#: ../app/widgets/gimpdeviceeditor.c:490
+#: ../app/widgets/gimpdeviceeditor.c:531
 #, c-format
 msgid "Delete \"%s\"?"
 msgstr "å?ªé?¤[%s] ?"
 
-#: ../app/widgets/gimpdeviceeditor.c:493
+#: ../app/widgets/gimpdeviceeditor.c:534
 msgid ""
 "You are about to delete this device's stored settings.\n"
 "The next time this device is plugged, default settings will be used."
 msgstr ""
+"æ?¨å°?è¦?å?ªé?¤é??å??è£?ç½®ç??å?²å?è¨å®?ã??\n"
+"ä¸?æ¬¡é??å??è£?ç½®æ??å?¥æ??ï¼?é ?è¨ç??è¨å®?å°?è¢«ä½¿ç?¨ã??"
 
 #: ../app/widgets/gimpdeviceinfoeditor.c:142
-#: ../app/widgets/gimpdynamicseditor.c:148
-#: ../app/widgets/gimpdynamicsoutputeditor.c:213
+#: ../app/widgets/gimpdynamicseditor.c:143
+#: ../app/widgets/gimpdynamicsoutputeditor.c:212
 msgid "Pressure"
 msgstr "å£?å??"
 
@@ -13969,52 +14198,54 @@ msgid "Y tilt"
 msgstr "Y å?¾æ??"
 
 #: ../app/widgets/gimpdeviceinfoeditor.c:145
-#: ../app/widgets/gimpdynamicseditor.c:152
-#: ../app/widgets/gimpdynamicsoutputeditor.c:241
+#: ../app/widgets/gimpdynamicseditor.c:147
+#: ../app/widgets/gimpdynamicsoutputeditor.c:240
 msgid "Wheel"
 msgstr "æ??è½?"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:192
+#. the axes
+#: ../app/widgets/gimpdeviceinfoeditor.c:195
 #, fuzzy
 msgid "Axes"
 msgstr "è»¸"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:266
+#. the keys
+#: ../app/widgets/gimpdeviceinfoeditor.c:269
 #, fuzzy
 msgid "Keys"
 msgstr "æ?¥é?µ"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:366
-#: ../app/widgets/gimpdeviceinfoeditor.c:584
+#: ../app/widgets/gimpdeviceinfoeditor.c:369
+#: ../app/widgets/gimpdeviceinfoeditor.c:587
 #, c-format
 msgid "none"
 msgstr "ç?¡"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:414
+#: ../app/widgets/gimpdeviceinfoeditor.c:417
 #, c-format
 msgid "%s Curve"
 msgstr "%s æ?²ç·?"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:473
-#: ../app/widgets/gimpdynamicsoutputeditor.c:196
+#: ../app/widgets/gimpdeviceinfoeditor.c:476
+#: ../app/widgets/gimpdynamicsoutputeditor.c:195
 msgid "_Reset Curve"
 msgstr "é??è¨æ?²ç·?(_R)"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:486
+#: ../app/widgets/gimpdeviceinfoeditor.c:489
 #, fuzzy, c-format
 msgid "The axis '%s' has no curve"
 msgstr "æ²?æ??æ??ç?¨ç¨?å¼?å??å¾?ç?¦é»?ã??"
 
-#: ../app/widgets/gimpdevicestatus.c:139
+#: ../app/widgets/gimpdevicestatus.c:136
 msgid "Save device status"
 msgstr "å?²å?è£?ç½®ç??æ??"
 
-#: ../app/widgets/gimpdevicestatus.c:448
+#: ../app/widgets/gimpdevicestatus.c:440
 #, c-format
 msgid "Foreground: %d, %d, %d"
 msgstr "å??æ?¯é¡?è?²ï¼?%dï¼?%dï¼?%d"
 
-#: ../app/widgets/gimpdevicestatus.c:453
+#: ../app/widgets/gimpdevicestatus.c:445
 #, c-format
 msgid "Background: %d, %d, %d"
 msgstr "è??æ?¯é¡?è?²ï¼?%dï¼?%dï¼?%d"
@@ -14040,17 +14271,24 @@ msgstr "å??ç¨±ç?º â??%sâ?? ç??æª?æ¡?å·²ç¶?å?å?¨ã??"
 msgid "Do you want to replace it with the image you are saving?"
 msgstr "æ?¯å?¦å°?æº?å??å?²å?ç??å??ç??å??ä»£å??ä¾?ç??å??ç??ï¼?"
 
+#. String used to separate dockables, e.g. "Tool Options, Layers"
 #: ../app/widgets/gimpdock.h:34
 #, fuzzy
 msgctxt "dock"
 msgid ", "
 msgstr " "
 
+#. String used to separate books (GtkNotebooks) within a dock,
+#. e.g. "Tool Options, Layers - Brushes"
+#.
 #: ../app/widgets/gimpdock.h:39
 msgctxt "dock"
 msgid " - "
 msgstr "-"
 
+#. String used to separate dock columns,
+#. e.g. "Tool Options, Layers - Brushes | Gradients"
+#.
 #: ../app/widgets/gimpdock.h:44
 msgctxt "dock"
 msgid " | "
@@ -14060,40 +14298,36 @@ msgstr "|"
 msgid "Configure this tab"
 msgstr "è¨å®?é??å??å??é ?"
 
+#. Auto button
 #: ../app/widgets/gimpdockwindow.c:353
 msgid "Auto"
 msgstr "è?ªå??"
 
 #: ../app/widgets/gimpdockwindow.c:364
-msgid "When enabled the dialog automatically follows the image you are working on."
+msgid ""
+"When enabled the dialog automatically follows the image you are working on."
 msgstr "å??ç?¨æ??ï¼?å°?è©±ç??æ??è?ªå??é?¨æ?¨æ£å?¨æ??ä½?ç??å??ç??è??è®?å??ã??"
 
 #: ../app/widgets/gimpdrawabletreeview.c:124
 msgid "Lock pixels"
 msgstr "é??å®?å??ç´ "
 
-#: ../app/widgets/gimpdynamicseditor.c:133
-#: ../app/widgets/gimpdynamicseditor.c:139
+#: ../app/widgets/gimpdynamicseditor.c:137
 msgid "Mapping matrix"
 msgstr "æ? å°?ç?©é?£"
 
-#: ../app/widgets/gimpdynamicseditor.c:149
-#: ../app/widgets/gimpdynamicsoutputeditor.c:220
+#: ../app/widgets/gimpdynamicseditor.c:144
+#: ../app/widgets/gimpdynamicsoutputeditor.c:219
 msgid "Velocity"
 msgstr "é??åº¦"
 
-#: ../app/widgets/gimpdynamicseditor.c:151
-#: ../app/widgets/gimpdynamicsoutputeditor.c:234
-msgid "Tilt"
-msgstr "å?¾æ??"
-
-#: ../app/widgets/gimpdynamicseditor.c:153
-#: ../app/widgets/gimpdynamicsoutputeditor.c:248
+#: ../app/widgets/gimpdynamicseditor.c:148
+#: ../app/widgets/gimpdynamicsoutputeditor.c:247
 msgid "Random"
 msgstr "é?¨æ©?"
 
-#: ../app/widgets/gimpdynamicseditor.c:154
-#: ../app/widgets/gimpdynamicsoutputeditor.c:255
+#: ../app/widgets/gimpdynamicseditor.c:149
+#: ../app/widgets/gimpdynamicsoutputeditor.c:254
 msgid "Fade"
 msgstr "æ·¡å??"
 
@@ -14110,23 +14344,23 @@ msgstr "è¨?æ?¯æ??é??æ?°å°?å??è?³æ¨?æº?é?¯èª¤è¼¸å?ºã??"
 msgid "%s Message"
 msgstr "%s æ??ç¤ºè¨?æ?¯"
 
-#: ../app/widgets/gimpfiledialog.c:326
+#: ../app/widgets/gimpfiledialog.c:327
 msgid "Automatically Detected"
 msgstr "è?ªå??å?µæ¸¬"
 
-#: ../app/widgets/gimpfiledialog.c:343
+#: ../app/widgets/gimpfiledialog.c:344
 msgid "By Extension"
 msgstr "ä¾?å»¶ä¼¸æª?å??"
 
-#: ../app/widgets/gimpfiledialog.c:799
+#: ../app/widgets/gimpfiledialog.c:800
 msgid "All files"
 msgstr "æ??æ??æª?æ¡?"
 
-#: ../app/widgets/gimpfiledialog.c:804
+#: ../app/widgets/gimpfiledialog.c:805
 msgid "All images"
 msgstr "æ??æ??å??ç??"
 
-#: ../app/widgets/gimpfiledialog.c:980
+#: ../app/widgets/gimpfiledialog.c:981
 #, c-format
 msgid "Select File _Type (%s)"
 msgstr "é?¸æ??æª?æ¡?æ ¼å¼? [%s] (_T)"
@@ -14139,131 +14373,130 @@ msgstr "æª?æ¡?æ ¼å¼?"
 msgid "Extensions"
 msgstr "ä¾?å»¶ä¼¸æª?å??"
 
-#: ../app/widgets/gimpfilleditor.c:127
+#: ../app/widgets/gimpfilleditor.c:130
 msgid "Fill Color"
 msgstr "å¡«å?¥è?²å½©"
 
-#: ../app/widgets/gimpfilleditor.c:145
+#: ../app/widgets/gimpfilleditor.c:149
 msgid "_Antialiasing"
 msgstr "å??é?¸é½?(_A)"
 
-#: ../app/widgets/gimpgradienteditor.c:413
+#. Instant update toggle
+#: ../app/widgets/gimpgradienteditor.c:411
 msgid "Instant update"
 msgstr "å?³æ??æ?´æ?°"
 
-#: ../app/widgets/gimpgradienteditor.c:775
+#: ../app/widgets/gimpgradienteditor.c:773
 #, c-format
 msgid "Zoom factor: %d:1"
 msgstr "ç¸®æ?¾å??ç??ï¼? %d:1"
 
-#: ../app/widgets/gimpgradienteditor.c:778
+#: ../app/widgets/gimpgradienteditor.c:776
 #, c-format
 msgid "Displaying [%0.4f, %0.4f]"
 msgstr "é¡¯ç¤º [%0.4f, %0.4f]"
 
-#: ../app/widgets/gimpgradienteditor.c:997
+#: ../app/widgets/gimpgradienteditor.c:995
 #, c-format
 msgid "Position: %0.4f"
 msgstr "ä½?ç½®ï¼?%0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:998
+#: ../app/widgets/gimpgradienteditor.c:996
 #, c-format
 msgid "RGB (%0.3f, %0.3f, %0.3f)"
 msgstr "RGB (%0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpgradienteditor.c:1000
+#: ../app/widgets/gimpgradienteditor.c:998
 #, c-format
 msgid "HSV (%0.1f, %0.1f, %0.1f)"
 msgstr "HSV (%0.1f, %0.1f, %0.1f)"
 
-#: ../app/widgets/gimpgradienteditor.c:1002
+#: ../app/widgets/gimpgradienteditor.c:1000
 #, c-format
 msgid "Luminance: %0.1f    Opacity: %0.1f"
 msgstr "äº®åº¦ï¼?%0.1f  ä¸?é??æ??åº¦(é??æ??=0)ï¼?%0.1f"
 
-#: ../app/widgets/gimpgradienteditor.c:1033
+#: ../app/widgets/gimpgradienteditor.c:1031
 #, c-format
 msgid "RGB (%d, %d, %d)"
 msgstr "RGB (%dï¼?%dï¼?%d)"
 
-#: ../app/widgets/gimpgradienteditor.c:1044
+#: ../app/widgets/gimpgradienteditor.c:1042
 msgid "Foreground color set to:"
 msgstr "å??æ?¯é¡?è?²è¨å®?ç?º:"
 
-#: ../app/widgets/gimpgradienteditor.c:1051
+#: ../app/widgets/gimpgradienteditor.c:1049
 msgid "Background color set to:"
 msgstr "è??æ?¯é¡?è?²è¨å®?ç?º:"
 
-#: ../app/widgets/gimpgradienteditor.c:1285
-#: ../app/widgets/gimpgradienteditor.c:1351
+#: ../app/widgets/gimpgradienteditor.c:1283
+#: ../app/widgets/gimpgradienteditor.c:1349
 #, c-format
 msgid "%s%sDrag: move & compress"
 msgstr "%s%sæ??æ?³ï¼?ç§»å??å??å£?ç¸®"
 
-#: ../app/widgets/gimpgradienteditor.c:1291
+#: ../app/widgets/gimpgradienteditor.c:1289
 msgid "Drag: move"
 msgstr "æ??æ?³ï¼?ç§»å??"
 
-#: ../app/widgets/gimpgradienteditor.c:1298
-#: ../app/widgets/gimpgradienteditor.c:1312
-#: ../app/widgets/gimpgradienteditor.c:1326
-#: ../app/widgets/gimpgradienteditor.c:1348
+#: ../app/widgets/gimpgradienteditor.c:1296
+#: ../app/widgets/gimpgradienteditor.c:1310
+#: ../app/widgets/gimpgradienteditor.c:1324
+#: ../app/widgets/gimpgradienteditor.c:1346
 #, c-format
 msgid "%s%sClick: extend selection"
 msgstr "%s%sæ??ä¸?æ??é??ï¼?æ?´å±?é?¸æ??å??"
 
-#: ../app/widgets/gimpgradienteditor.c:1304
-#: ../app/widgets/gimpgradienteditor.c:1318
+#: ../app/widgets/gimpgradienteditor.c:1302
+#: ../app/widgets/gimpgradienteditor.c:1316
 msgid "Click: select"
 msgstr "æ??ä¸?æ??é??ï¼?é?¸å??"
 
-#: ../app/widgets/gimpgradienteditor.c:1332
-#: ../app/widgets/gimpgradienteditor.c:1356
+#: ../app/widgets/gimpgradienteditor.c:1330
+#: ../app/widgets/gimpgradienteditor.c:1354
 msgid "Click: select    Drag: move"
 msgstr "æ??ä¸?æ??é??ï¼?é?¸å??    æ??æ?³ï¼?ç§»å??"
 
-#: ../app/widgets/gimpgradienteditor.c:1571
-#: ../app/widgets/gimpgradienteditor.c:1579
+#: ../app/widgets/gimpgradienteditor.c:1569
+#: ../app/widgets/gimpgradienteditor.c:1577
 #, c-format
 msgid "Handle position: %0.4f"
 msgstr "æ?§å?¶æ??ä½?ç½®ï¼? %0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:1596
+#: ../app/widgets/gimpgradienteditor.c:1594
 #, c-format
 msgid "Distance: %0.4f"
 msgstr "è·?é?¢ï¼?%0.4f"
 
-#: ../app/widgets/gimpgrideditor.c:216
+#: ../app/widgets/gimpgrideditor.c:218
 msgid "Line _style:"
 msgstr "ç·?æ¢?æ¨£å¼?(_S):"
 
-#: ../app/widgets/gimpgrideditor.c:220
+#: ../app/widgets/gimpgrideditor.c:222
 msgid "Change grid foreground color"
 msgstr "æ?´æ?¹æ ¼ç·?å??æ?¯é¡?è?²"
 
-#: ../app/widgets/gimpgrideditor.c:227
+#: ../app/widgets/gimpgrideditor.c:229
 msgid "_Foreground color:"
 msgstr "å??æ?¯é¡?è?²(_F):"
 
-#: ../app/widgets/gimpgrideditor.c:231
+#: ../app/widgets/gimpgrideditor.c:233
 msgid "Change grid background color"
 msgstr "æ?´æ?¹æ ¼ç·?è??æ?¯é¡?è?²"
 
-#: ../app/widgets/gimpgrideditor.c:238
+#: ../app/widgets/gimpgrideditor.c:240
 msgid "_Background color:"
 msgstr "è??æ?¯é¡?è?²(_B):"
 
-#: ../app/widgets/gimpgrideditor.c:243
+#: ../app/widgets/gimpgrideditor.c:245
 msgid "Spacing"
 msgstr "é??é??"
 
-#: ../app/widgets/gimpgrideditor.c:264
-#: ../app/widgets/gimpgrideditor.c:296
+#: ../app/widgets/gimpgrideditor.c:266 ../app/widgets/gimpgrideditor.c:298
 msgid "Width"
 msgstr "å¯¬åº¦"
 
-#: ../app/widgets/gimpgrideditor.c:266
-#: ../app/widgets/gimpgrideditor.c:298
+#: ../app/widgets/gimpgrideditor.c:268 ../app/widgets/gimpgrideditor.c:300
 msgid "Height"
 msgstr "é«?åº¦"
 
@@ -14276,8 +14509,12 @@ msgid "The GIMP help browser is not available."
 msgstr "GIMP èªªæ??æ??ä»¶ç??è¦½å?¨ç?¡æ³?ä½¿ç?¨ã??"
 
 #: ../app/widgets/gimphelp.c:295
-msgid "The GIMP help browser plug-in appears to be missing from your installation. You may instead use the web browser for reading the help pages."
-msgstr "å®?è£? GIMP æ??ä¼¼ä¹?æ²?æ??å??æ??å®?è£?æ??é??èªªæ??æ??ä»¶ç??è¦½å?¨ç??å¢?æ??æ¨¡çµ?ã??æ?¨å?¯ä»¥ä½¿ç?¨ç¶²é ?ç??è¦½å?¨é?±è®?èªªæ??æ??ä»¶ã??"
+msgid ""
+"The GIMP help browser plug-in appears to be missing from your installation. "
+"You may instead use the web browser for reading the help pages."
+msgstr ""
+"å®?è£? GIMP æ??ä¼¼ä¹?æ²?æ??å??æ??å®?è£?æ??é??èªªæ??æ??ä»¶ç??è¦½å?¨ç??å¢?æ??æ¨¡çµ?ã??æ?¨å?¯ä»¥ä½¿ç?¨ç¶²é ?ç??è¦½"
+"å?¨é?±è®?èªªæ??æ??ä»¶ã??"
 
 #: ../app/widgets/gimphelp.c:336
 msgid "Help browser doesn't start"
@@ -14304,7 +14541,9 @@ msgid "The GIMP user manual is not installed on your computer."
 msgstr "GIMP ä½¿ç?¨è??æ??å??ä¸¦æ?ªå®?è£?å?¨æ?¨ç??é?»è?¦ä¸?ã??"
 
 #: ../app/widgets/gimphelp.c:644
-msgid "You may either install the additional help package or change your preferences to use the online version."
+msgid ""
+"You may either install the additional help package or change your "
+"preferences to use the online version."
 msgstr "æ?¨å?¯ä»¥å®?è£?é¡?å¤?ç??èªªæ??æª?å¥?ä»¶æ??æ?¹è®?å??å¥½è¨å®?ä¾?ä½¿ç?¨ç·?ä¸?ç??æ?¬ã??"
 
 #: ../app/widgets/gimphistogrameditor.c:99
@@ -14335,12 +14574,15 @@ msgstr "ç?¾å??å?¼:"
 msgid "Channel:"
 msgstr "è?²ç??:"
 
+#. Button
 #: ../app/widgets/gimpimagecommenteditor.c:107
 msgid "Use default comment"
 msgstr "ä½¿ç?¨é ?è¨å??è¨»"
 
 #: ../app/widgets/gimpimagecommenteditor.c:109
-msgid "Replace the current image comment with the default comment set in Editâ??Preferencesâ??Default Image."
+msgid ""
+"Replace the current image comment with the default comment set in "
+"Editâ??Preferencesâ??Default Image."
 msgstr "æ?¿æ??ç?®å??ç??å??ç??å??è¨»ï¼?ç?¨è¨ç½®å?¨[ç·¨è¼¯]â??[å??å¥½è¨å®?]â??[é ?è¨å??ç??]ä¸ç??å??è¨»å?§å®¹ã??"
 
 #: ../app/widgets/gimpimageprofileview.c:200
@@ -14348,9 +14590,8 @@ msgid "Querying..."
 msgstr "æ?¥è©¢ä¸..."
 
 #: ../app/widgets/gimpimagepropview.c:122
-#, fuzzy
 msgid "Size in pixels:"
-msgstr "Topmargin in pixels"
+msgstr "å°ºå¯¸ä»¥å??ç´ è¨?ï¼?"
 
 #: ../app/widgets/gimpimagepropview.c:125
 msgid "Print size:"
@@ -14404,11 +14645,13 @@ msgstr "è?²ç??æ?¸ç?®:"
 msgid "Number of paths:"
 msgstr "è·¯å¾?æ?¸ç?®:"
 
+#. no undo (or redo) steps available
 #: ../app/widgets/gimpimagepropview.c:416
 msgid "None"
 msgstr "ç?¡"
 
 #: ../app/widgets/gimpimagepropview.c:470
+#: ../app/widgets/gimptemplateeditor.c:310
 #, c-format
 msgid "pixels/%s"
 msgstr "å??ç´ /%s"
@@ -14422,15 +14665,15 @@ msgstr "%g Ã? %g %s"
 msgid "colors"
 msgstr "é¡?è?²"
 
-#: ../app/widgets/gimpitemtreeview.c:708
+#: ../app/widgets/gimpitemtreeview.c:705
 msgid "Lock:"
 msgstr "é??å®?:"
 
-#: ../app/widgets/gimpitemtreeview.c:1481
+#: ../app/widgets/gimpitemtreeview.c:1478
 msgid "Set Item Exclusive Visible"
 msgstr "è¨å®?é ?ç?®æ??é?¤å?¯è¦?æ?§"
 
-#: ../app/widgets/gimpitemtreeview.c:1489
+#: ../app/widgets/gimpitemtreeview.c:1486
 msgid "Set Item Exclusive Linked"
 msgstr "è¨å®?é ?ç?®æ??é?¤é?£çµ?"
 
@@ -14438,21 +14681,21 @@ msgstr "è¨å®?é ?ç?®æ??é?¤é?£çµ?"
 msgid "Lock alpha channel"
 msgstr "é??å®?é??æ??è?²ç??"
 
-#: ../app/widgets/gimpmessagebox.c:439
+#: ../app/widgets/gimpmessagebox.c:442
 #, c-format
 msgid "Message repeated %d times."
 msgstr "è¨?æ?¯å·²é??è¤? %d æ¬¡ã??"
 
-#: ../app/widgets/gimpmessagebox.c:441
+#: ../app/widgets/gimpmessagebox.c:444
 msgid "Message repeated once."
 msgstr "è¨?æ?¯å·²é??è¤? 1 æ¬¡ã??"
 
-#: ../app/widgets/gimppaletteeditor.c:252
-#: ../app/widgets/gimppaletteeditor.c:743
+#: ../app/widgets/gimppaletteeditor.c:228
+#: ../app/widgets/gimppaletteeditor.c:693
 msgid "Undefined"
 msgstr "æ?ªæ??å®?"
 
-#: ../app/widgets/gimppaletteeditor.c:260
+#: ../app/widgets/gimppaletteeditor.c:236
 msgid "Columns:"
 msgstr "ç?´è¡?è¡?æ?¸:"
 
@@ -14479,60 +14722,60 @@ msgstr ""
 msgid "Invalid UTF-8"
 msgstr "ç?¡æ??ç?? UTF-8 å?ä¸²"
 
-#: ../app/widgets/gimpsettingsbox.c:241
+#: ../app/widgets/gimpsettingsbox.c:244
 msgid "Pick a setting from the list"
 msgstr "å¾?æ¸?å?®é?¸æ??è¨å®?å?¼"
 
-#: ../app/widgets/gimpsettingsbox.c:262
+#: ../app/widgets/gimpsettingsbox.c:265
 msgid "Add settings to favorites"
 msgstr "å°?è¨å®?å?¼å? å?¥æ??ç??æ??æ??"
 
-#: ../app/widgets/gimpsettingsbox.c:290
+#: ../app/widgets/gimpsettingsbox.c:293
 msgid "_Import Settings from File..."
 msgstr "ç?±æª?æ¡?å?¯å?¥è¨å®?å?¼(_I)..."
 
-#: ../app/widgets/gimpsettingsbox.c:296
+#: ../app/widgets/gimpsettingsbox.c:299
 msgid "_Export Settings to File..."
 msgstr "å?¯å?ºè¨å®?å?¼å?°æª?æ¡?(_E)..."
 
-#: ../app/widgets/gimpsettingsbox.c:303
+#: ../app/widgets/gimpsettingsbox.c:306
 msgid "_Manage Settings..."
 msgstr "ç®¡ç??è¨å®?å?¼(_M)..."
 
-#: ../app/widgets/gimpsettingsbox.c:590
+#: ../app/widgets/gimpsettingsbox.c:593
 msgid "Add Settings to Favorites"
 msgstr "å°?è¨å®?å?¼å? å?¥æ??ç??æ??æ??"
 
-#: ../app/widgets/gimpsettingsbox.c:593
+#: ../app/widgets/gimpsettingsbox.c:596
 msgid "Enter a name for the settings"
 msgstr "è«?è¼¸å?¥è¨å®?å?¼ç??å??ç¨±"
 
-#: ../app/widgets/gimpsettingsbox.c:594
+#: ../app/widgets/gimpsettingsbox.c:597
 msgid "Saved Settings"
 msgstr "å·²å?²å?ç??è¨å®?å?¼"
 
-#: ../app/widgets/gimpsettingsbox.c:630
+#: ../app/widgets/gimpsettingsbox.c:633
 msgid "Manage Saved Settings"
 msgstr "ç®¡ç??å·²å?²å?ç??è¨å®?å?¼"
 
-#: ../app/widgets/gimpsettingseditor.c:174
+#: ../app/widgets/gimpsettingseditor.c:177
 msgid "Import settings from a file"
 msgstr "ç?±æª?æ¡?å?¯å?¥è¨å®?å?¼"
 
-#: ../app/widgets/gimpsettingseditor.c:183
+#: ../app/widgets/gimpsettingseditor.c:186
 msgid "Export the selected settings to a file"
 msgstr "å?¯å?ºé?¸å??ç??è¨å®?å?¼å?°æª?æ¡?"
 
-#: ../app/widgets/gimpsettingseditor.c:192
+#: ../app/widgets/gimpsettingseditor.c:195
 msgid "Delete the selected settings"
 msgstr "å?ªé?¤é?¸å??ç??è¨å®?å?¼"
 
-#: ../app/widgets/gimpsizebox.c:460
+#: ../app/widgets/gimpsizebox.c:463
 #, c-format
 msgid "%d Ã? %d ppi"
 msgstr "%d Ã? %d dpi"
 
-#: ../app/widgets/gimpsizebox.c:462
+#: ../app/widgets/gimpsizebox.c:465
 #, c-format
 msgid "%d ppi"
 msgstr "%d ppi"
@@ -14575,45 +14818,49 @@ msgstr "é??æ¿¾æ¢?ä»¶(_F)"
 msgid "enter tags"
 msgstr "API æ¨?ç±¤"
 
+#. Seperator for tags
+#. * IMPORTANT: use only one of Unicode terminal punctuation chars.
+#. * http://unicode.org/review/pr-23.html
+#.
 #: ../app/widgets/gimptagentry.c:1716
 msgid ","
 msgstr ","
 
-#: ../app/widgets/gimptemplateeditor.c:179
+#: ../app/widgets/gimptemplateeditor.c:182
 #, c-format
 msgid "%p"
 msgstr "%p"
 
-#: ../app/widgets/gimptemplateeditor.c:254
+#: ../app/widgets/gimptemplateeditor.c:257
 msgid "_Advanced Options"
 msgstr "é?²é??é?¸é ?(_A)"
 
-#: ../app/widgets/gimptemplateeditor.c:361
+#: ../app/widgets/gimptemplateeditor.c:364
 msgid "Color _space:"
 msgstr "è?²å½©ç©ºé??(_S):"
 
-#: ../app/widgets/gimptemplateeditor.c:369
+#: ../app/widgets/gimptemplateeditor.c:372
 msgid "_Fill with:"
 msgstr "å¡«ä¸?(_F):"
 
-#: ../app/widgets/gimptemplateeditor.c:379
+#: ../app/widgets/gimptemplateeditor.c:382
 msgid "Comme_nt:"
 msgstr "å??è¨»(_N):"
 
-#: ../app/widgets/gimptemplateeditor.c:529
+#: ../app/widgets/gimptemplateeditor.c:532
 msgid "_Name:"
 msgstr "å??ç¨±(_N):"
 
-#: ../app/widgets/gimptemplateeditor.c:542
+#: ../app/widgets/gimptemplateeditor.c:545
 msgid "_Icon:"
 msgstr "å??ç¤º(_I)ï¼?"
 
-#: ../app/widgets/gimptemplateeditor.c:670
+#: ../app/widgets/gimptemplateeditor.c:673
 #, c-format
 msgid "%d Ã? %d ppi, %s"
 msgstr "%d Ã? %d ppiï¼?%s"
 
-#: ../app/widgets/gimptemplateeditor.c:672
+#: ../app/widgets/gimptemplateeditor.c:675
 #, c-format
 msgid "%d ppi, %s"
 msgstr "%d ppiï¼?%s"
@@ -14637,26 +14884,26 @@ msgstr "æª?æ¡? â??%sâ?? ä¸å?«æ??ç?¡æ??ç?? UTF-8 æ??å?ã??"
 msgid "_Use selected font"
 msgstr "ä½¿ç?¨é?¸å??ç??å?å??(_U)"
 
-#: ../app/widgets/gimptextstyleeditor.c:200
+#: ../app/widgets/gimptextstyleeditor.c:203
 #, fuzzy
 msgid "Change size of selected text"
 msgstr "å°?å·²é?¸æ??å?è®?ç?ºå¤§å¯«"
 
-#: ../app/widgets/gimptextstyleeditor.c:207
+#: ../app/widgets/gimptextstyleeditor.c:210
 msgid "Change color of selected text"
 msgstr "æ?¹è®?é?¸å??ç??æ??å?é¡?è?²"
 
-#: ../app/widgets/gimptextstyleeditor.c:232
+#: ../app/widgets/gimptextstyleeditor.c:235
 #, fuzzy
 msgid "Clear style of selected text"
 msgstr "æ?¥è©¢å·²é?¸å?è©?(_L)"
 
-#: ../app/widgets/gimptextstyleeditor.c:252
+#: ../app/widgets/gimptextstyleeditor.c:255
 #, fuzzy
 msgid "Change kerning of selected text"
 msgstr "å°?å·²é?¸æ??å?è®?ç?ºå¤§å¯«"
 
-#: ../app/widgets/gimptextstyleeditor.c:268
+#: ../app/widgets/gimptextstyleeditor.c:271
 #, fuzzy
 msgid "Change baseline of selected text"
 msgstr "å°?å·²é?¸æ??å?è®?ç?ºå¤§å¯«"
@@ -14674,19 +14921,16 @@ msgstr ""
 msgid "Pr_eview"
 msgstr "é ?è¦½(_E)"
 
-#: ../app/widgets/gimpthumbbox.c:403
-#: ../app/widgets/gimpthumbbox.c:467
+#: ../app/widgets/gimpthumbbox.c:403 ../app/widgets/gimpthumbbox.c:467
 msgid "No selection"
 msgstr "æ?ªé?¸æ??æª?æ¡?"
 
-#: ../app/widgets/gimpthumbbox.c:595
-#: ../app/widgets/gimpthumbbox.c:616
+#: ../app/widgets/gimpthumbbox.c:595 ../app/widgets/gimpthumbbox.c:616
 #, c-format
 msgid "Thumbnail %d of %d"
 msgstr "ç¸®å?? %2$d ä¹? %1$d"
 
-#: ../app/widgets/gimpthumbbox.c:729
-#: ../app/widgets/gimpthumbbox.c:739
+#: ../app/widgets/gimpthumbbox.c:729 ../app/widgets/gimpthumbbox.c:739
 msgid "Creating preview..."
 msgstr "æ£å?¨å»ºç«?é ?è¦½..."
 
@@ -14767,19 +15011,19 @@ msgstr "é??ä½?é??å??å·¥å?·è?³åº?å±¤"
 msgid "Reset tool order and visibility"
 msgstr "é??è¨å·¥å?·é ?åº?è??å?¯è¦?æ?§"
 
-#: ../app/widgets/gimptooloptionseditor.c:218
+#: ../app/widgets/gimptooloptionseditor.c:219
 msgid "Save options to..."
 msgstr "å?²å?é?¸é ?å?°..."
 
-#: ../app/widgets/gimptooloptionseditor.c:226
+#: ../app/widgets/gimptooloptionseditor.c:227
 msgid "Restore options from..."
 msgstr "é??å??é?¸é ?è?ª..."
 
-#: ../app/widgets/gimptooloptionseditor.c:234
+#: ../app/widgets/gimptooloptionseditor.c:235
 msgid "Delete saved options..."
 msgstr "å?ªé?¤å·²å?²å?ç??é?¸é ?..."
 
-#: ../app/widgets/gimptooloptionseditor.c:592
+#: ../app/widgets/gimptooloptionseditor.c:591
 #, c-format
 msgid "Error saving tool options presets: %s"
 msgstr "å?²å?å·¥å?·é?¸é ?é ?å??è¨å®?æ??ç?¼ç??é?¯èª¤ï¼?%s"
@@ -14843,42 +15087,47 @@ msgstr "[ å?ºæ?¬å??ç?? ]"
 msgid "Lock path strokes"
 msgstr "é??ä½?è·¯å¾?æ??é??"
 
-#: ../app/widgets/gimpviewablebox.c:80
+#: ../app/widgets/gimpviewablebox.c:82
 msgid "Open the brush selection dialog"
 msgstr "é??å??ç?å?·é?¸æ??å°?è©±ç??ã??"
 
-#: ../app/widgets/gimpviewablebox.c:137
+#: ../app/widgets/gimpviewablebox.c:141
+#, fuzzy
+msgid "Open the dynamics selection dialog"
+msgstr "é??å??é?¸å??å?å??ç??å°?è©±ç??"
+
+#: ../app/widgets/gimpviewablebox.c:202
 msgid "Open the pattern selection dialog"
 msgstr "é??å??å??æ¨£é?¸æ??å°?è©±ç??ã??"
 
-#: ../app/widgets/gimpviewablebox.c:203
+#: ../app/widgets/gimpviewablebox.c:268
 msgid "Open the gradient selection dialog"
 msgstr "é??å??æ¼¸å±¤é?¸æ??å°?è©±ç??ã??"
 
-#: ../app/widgets/gimpviewablebox.c:305
+#: ../app/widgets/gimpviewablebox.c:373
 msgid "Open the palette selection dialog"
 msgstr "é??å??èª¿è?²ç?¤é?¸æ??å°?è©±ç??"
 
-#: ../app/widgets/gimpviewablebox.c:363
+#: ../app/widgets/gimpviewablebox.c:434
 msgid "Open the font selection dialog"
 msgstr "é??å??é?¸å??å?å??ç??å°?è©±ç??"
 
-#: ../app/widgets/gimpwidgets-utils.c:670
+#: ../app/widgets/gimpwidgets-utils.c:673
 #, c-format
 msgid "%s (try %s)"
 msgstr "%s (å??è©¦ %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:670
+#: ../app/widgets/gimpwidgets-utils.c:673
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:674
+#: ../app/widgets/gimpwidgets-utils.c:677
 #, c-format
 msgid "%s (try %s, %s)"
 msgstr "%s (å??è©¦ %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:678
+#: ../app/widgets/gimpwidgets-utils.c:681
 #, c-format
 msgid "%s (try %s, %s, %s)"
 msgstr "%s (å??è©¦ %s, %s, %s)"
@@ -14990,14 +15239,18 @@ msgid "Undefined"
 msgstr "æ?ªæ??å®?"
 
 #: ../app/xcf/xcf-load.c:332
-msgid "This XCF file is corrupt!  I have loaded as much of it as I can, but it is incomplete."
+msgid ""
+"This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
+"incomplete."
 msgstr "é??å?? XCF æª?æ¡?å·²æ??æ¯?ï¼?æ??å·²å??å?¯è?½è¼?å?¥å®?ï¼?ä½?æ?¯ä¸¦ä¸?å®?æ?´ã??"
 
 #: ../app/xcf/xcf-load.c:343
-msgid "This XCF file is corrupt!  I could not even salvage any partial image data from it."
+msgid ""
+"This XCF file is corrupt!  I could not even salvage any partial image data "
+"from it."
 msgstr "é??å?? XCF æª?æ¡?å·²æ??æ¯?ï¼?æ??ç??è?³ç?¡æ³?å¾?å®?å??å¾?ä»»ä½?é?¨å??ç??å??ç??è³?æ??ã??"
 
-#: ../app/xcf/xcf-load.c:407
+#: ../app/xcf/xcf-load.c:416
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -15006,7 +15259,7 @@ msgstr ""
 "XCF è¦å??ã??ç??æ?¬ 0 ç?? XCF æª?æ¡?æ ¼å¼?ç?¡æ³?\n"
 " æ£ç¢ºå?°å?²å?ç´¢å¼?ç??é¡?è?²å°?æ??è¡¨ã??ä»¥ç?°é??å??ä»£æ?¿ã??"
 
-#: ../app/xcf/xcf-read.c:108
+#: ../app/xcf/xcf-read.c:115
 msgid "Invalid UTF-8 string in XCF file"
 msgstr "XCF æª?æ¡?ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²"
 
@@ -15015,15 +15268,12 @@ msgstr "XCF æª?æ¡?ä¸å?«æ??ç?¡æ??ç?? UTF-8 å?ä¸²"
 msgid "Error writing XCF: %s"
 msgstr "å¯«å?¥ XCF æª?æ¡?æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../app/xcf/xcf-seek.c:43
-#: ../app/xcf/xcf-seek.c:60
-#: ../app/xcf/xcf-seek.c:71
+#: ../app/xcf/xcf-seek.c:43 ../app/xcf/xcf-seek.c:60 ../app/xcf/xcf-seek.c:71
 #, c-format
 msgid "Could not seek in XCF file: %s"
 msgstr "ç?¡æ³?å?¨ XCF æª?æ¡?ä¸æ??å°?è³?æ??ï¼?%s"
 
-#: ../app/xcf/xcf.c:99
-#: ../app/xcf/xcf.c:167
+#: ../app/xcf/xcf.c:99 ../app/xcf/xcf.c:167
 msgid "GIMP XCF image"
 msgstr "GIMP XCF å??ç??"
 
@@ -15088,8 +15338,8 @@ msgstr "ç?¡æ³?é?£ç·?è?³ GIMPã??"
 msgid "Make sure that the Toolbox is visible!"
 msgstr "ç¢ºå®?å·¥å?·ç®±ç?ºå?¯è¦?ï¼?"
 
+#. if execv and execvp return, there was an error
 #: ../tools/gimp-remote-x11.c:247
 #, c-format
 msgid "Couldn't start '%s': %s"
 msgstr "ç?¡æ³?å??å??â??%sâ??ï¼?%s"
-
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]