[gimp/gimp-2-6] Updated Simplified Chinese translations.



commit 8fcfd6cd11893ba0c235e8f538a535a08a2ab83d
Author: Kappa8086 <kappa8086 gmail com>
Date:   Thu May 28 17:20:02 2009 +0800

    Updated Simplified Chinese translations.
---
 po-libgimp/zh_CN.po | 1563 ++++++-----
 po/zh_CN.po         | 7567 +++++++++++++++++++++++++++++++--------------------
 2 files changed, 5446 insertions(+), 3684 deletions(-)

diff --git a/po-libgimp/zh_CN.po b/po-libgimp/zh_CN.po
index 7d0050f..a5c1443 100644
--- a/po-libgimp/zh_CN.po
+++ b/po-libgimp/zh_CN.po
@@ -2,186 +2,187 @@
 # Copyright (C) 2008 Free Software Foundation, Inc.
 # Yuheng Xie <elephant linux net cn>, 2001-2004.
 # ���人 <kappa8086 gmail com>, 2008.
-# Aron Xu <aronmalache 163 com>, 2008.
+#
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp-libgimp 2.6\n"
+"Project-Id-Version: gimp-libgimp\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gimp&component=general\n"
-"POT-Creation-Date: 2009-01-26 05:51+0000\n"
-"PO-Revision-Date: 2009-01-18 18:25+0800\n"
-"Last-Translator: Aron Xu <aronmalache 163 com>\n"
+"POT-Creation-Date: 2009-05-24 15:24+0000\n"
+"PO-Revision-Date: 2009-05-02 22:15+0800\n"
+"Last-Translator: ���人 <kappa8086 gmail com>\n"
 "Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. procedure executed successfully
-#: ../libgimp/gimp.c:1045
+#: ../libgimp/gimp.c:1044
 msgid "success"
 msgstr "æ??å??"
 
 #. procedure execution failed
-#: ../libgimp/gimp.c:1049
+#: ../libgimp/gimp.c:1048
 msgid "execution error"
 msgstr "æ?§è¡?é??误"
 
 #. procedure called incorrectly
-#: ../libgimp/gimp.c:1053
+#: ../libgimp/gimp.c:1052
 msgid "calling error"
 msgstr "è°?ç?¨é??误"
 
 #. procedure execution cancelled
-#: ../libgimp/gimp.c:1057
+#: ../libgimp/gimp.c:1056
 msgid "cancelled"
 msgstr "å·²å??æ¶?"
 
-#: ../libgimp/gimpbrushselectbutton.c:170
+#: ../libgimp/gimpbrushselectbutton.c:169
 msgid "Brush Selection"
 msgstr "ç?»ç¬?é??æ?©"
 
-#: ../libgimp/gimpbrushselectbutton.c:913
-#: ../libgimp/gimppatternselectbutton.c:714
+#: ../libgimp/gimpbrushselectbutton.c:915
+#: ../libgimp/gimppatternselectbutton.c:716
 msgid "_Browse..."
 msgstr "��(_B)..."
 
-#: ../libgimp/gimpexport.c:217 ../libgimp/gimpexport.c:253
+#: ../libgimp/gimpexport.c:223 ../libgimp/gimpexport.c:259
 #, c-format
 msgid "%s plug-in can't handle layers"
 msgstr "%s æ??件æ? æ³?å¤?ç??å?¾å±?"
 
-#: ../libgimp/gimpexport.c:218 ../libgimp/gimpexport.c:227
-#: ../libgimp/gimpexport.c:236 ../libgimp/gimpexport.c:254
+#: ../libgimp/gimpexport.c:224 ../libgimp/gimpexport.c:233
+#: ../libgimp/gimpexport.c:242 ../libgimp/gimpexport.c:260
 msgid "Merge Visible Layers"
 msgstr "å??并å?¯è§?å?¾å±?"
 
-#: ../libgimp/gimpexport.c:226
+#: ../libgimp/gimpexport.c:232
 #, c-format
 msgid "%s plug-in can't handle layer offsets, size or opacity"
 msgstr "%s æ??件æ? æ³?å¤?ç??å?¾å±?ä½?移ã??大å°?æ??ä¸?é??æ??度"
 
-#: ../libgimp/gimpexport.c:235 ../libgimp/gimpexport.c:244
+#: ../libgimp/gimpexport.c:241 ../libgimp/gimpexport.c:250
 #, c-format
 msgid "%s plug-in can only handle layers as animation frames"
-msgstr "%s æ??件å?ªè?½ä»¥å?¨ç?»ç??帧æ?¹å¼?å¤?ç??å?¾å±?"
+msgstr "%s æ??件å?ªè?½ä»¥å?¨ç?»ç??帧ç??æ?¹å¼?å¤?ç??å?¾å±?"
 
-#: ../libgimp/gimpexport.c:236 ../libgimp/gimpexport.c:245
+#: ../libgimp/gimpexport.c:242 ../libgimp/gimpexport.c:251
 msgid "Save as Animation"
-msgstr "��为��"
+msgstr "以����"
 
-#: ../libgimp/gimpexport.c:245 ../libgimp/gimpexport.c:254
-#: ../libgimp/gimpexport.c:263
+#: ../libgimp/gimpexport.c:251 ../libgimp/gimpexport.c:260
+#: ../libgimp/gimpexport.c:269
 msgid "Flatten Image"
 msgstr "å¹³æ?´å?¾å??"
 
-#: ../libgimp/gimpexport.c:262
+#: ../libgimp/gimpexport.c:268
 #, c-format
 msgid "%s plug-in can't handle transparency"
 msgstr "%s æ??件æ? æ³?å¤?ç??é??æ??度"
 
-#: ../libgimp/gimpexport.c:271
+#: ../libgimp/gimpexport.c:277
 #, c-format
 msgid "%s plug-in can't handle layer masks"
 msgstr "%s æ??件æ? æ³?å¤?ç??å?¾å±?è??æ?¿"
 
-#: ../libgimp/gimpexport.c:272
+#: ../libgimp/gimpexport.c:278
 msgid "Apply Layer Masks"
 msgstr "åº?ç?¨å?¾å±?è??æ?¿"
 
-#: ../libgimp/gimpexport.c:280
+#: ../libgimp/gimpexport.c:286
 #, c-format
 msgid "%s plug-in can only handle RGB images"
 msgstr "%s æ??件å?ªè?½å¤?ç?? RGB å?¾å??"
 
-#: ../libgimp/gimpexport.c:281 ../libgimp/gimpexport.c:319
-#: ../libgimp/gimpexport.c:328
+#: ../libgimp/gimpexport.c:287 ../libgimp/gimpexport.c:325
+#: ../libgimp/gimpexport.c:334
 msgid "Convert to RGB"
 msgstr "转�� RGB"
 
-#: ../libgimp/gimpexport.c:289
+#: ../libgimp/gimpexport.c:295
 #, c-format
 msgid "%s plug-in can only handle grayscale images"
 msgstr "%s æ??件å?ªè?½å¤?ç??ç?°åº¦å?¾å??"
 
-#: ../libgimp/gimpexport.c:290 ../libgimp/gimpexport.c:319
-#: ../libgimp/gimpexport.c:340
+#: ../libgimp/gimpexport.c:296 ../libgimp/gimpexport.c:325
+#: ../libgimp/gimpexport.c:346
 msgid "Convert to Grayscale"
 msgstr "转���度"
 
-#: ../libgimp/gimpexport.c:298
+#: ../libgimp/gimpexport.c:304
 #, c-format
 msgid "%s plug-in can only handle indexed images"
 msgstr "%s æ??件å?ªè?½å¤?ç??ç´¢å¼?å?¾å??"
 
-#: ../libgimp/gimpexport.c:299 ../libgimp/gimpexport.c:328
-#: ../libgimp/gimpexport.c:338
+#: ../libgimp/gimpexport.c:305 ../libgimp/gimpexport.c:334
+#: ../libgimp/gimpexport.c:344
 msgid ""
 "Convert to Indexed using default settings\n"
 "(Do it manually to tune the result)"
 msgstr ""
-"使ç?¨é»?认ç??设置转æ?¢å?°ç´¢å¼?å?¾å??\n"
+"使ç?¨é»?认ç??设置转æ?¢å?°ç´¢å¼?\n"
 "(å¦?é??è°?è??请æ??å?¨è½¬æ?¢)"
 
-#: ../libgimp/gimpexport.c:308
+#: ../libgimp/gimpexport.c:314
 #, c-format
 msgid "%s plug-in can only handle bitmap (two color) indexed images"
 msgstr "%s æ??件å?ªè?½å¤?ç??ä½?å?¾(两è?²)ç´¢å¼?å?¾å??"
 
-#: ../libgimp/gimpexport.c:309
+#: ../libgimp/gimpexport.c:315
 msgid ""
 "Convert to Indexed using bitmap default settings\n"
 "(Do it manually to tune the result)"
 msgstr ""
-"使ç?¨é»?认ç??ä½?å?¾è®¾ç½®è½¬æ?¢å?°ç´¢å¼?å?¾å??\n"
+"使ç?¨é»?认ç??ä½?å?¾è®¾ç½®è½¬æ?¢å?°ç´¢å¼?\n"
 "(å¦?é??è°?è??请æ??å?¨è½¬æ?¢)"
 
-#: ../libgimp/gimpexport.c:318
+#: ../libgimp/gimpexport.c:324
 #, c-format
 msgid "%s plug-in can only handle RGB or grayscale images"
 msgstr "%s æ??件å?ªè?½å¤?ç?? RGB æ??ç?°åº¦å?¾å??"
 
-#: ../libgimp/gimpexport.c:327
-#, fuzzy, c-format
+#: ../libgimp/gimpexport.c:333
+#, c-format
 msgid "%s plug-in  can only handle RGB or indexed images"
 msgstr "%s æ??件å?ªè?½å¤?ç?? RGB æ??ç´¢å¼?å?¾å??"
 
-#: ../libgimp/gimpexport.c:337
+#: ../libgimp/gimpexport.c:343
 #, c-format
 msgid "%s plug-in can only handle grayscale or indexed images"
 msgstr "%s æ??件å?ªè?½å¤?ç??ç?°åº¦æ??ç´¢å¼?å?¾å??"
 
-#: ../libgimp/gimpexport.c:348
+#: ../libgimp/gimpexport.c:354
 #, c-format
 msgid "%s plug-in needs an alpha channel"
-msgstr "%s æ??件é??è¦?ä¸?个 Alpha é??é??"
+msgstr "%s æ??件é??è¦?ä¸?个 alpha é??é??"
 
-#: ../libgimp/gimpexport.c:349
+#: ../libgimp/gimpexport.c:355
 msgid "Add Alpha Channel"
 msgstr "æ·»å?  Alpha é??é??"
 
-#: ../libgimp/gimpexport.c:383
+#: ../libgimp/gimpexport.c:410
 msgid "Confirm Save"
 msgstr "确认��"
 
-#: ../libgimp/gimpexport.c:389
+#: ../libgimp/gimpexport.c:416
 msgid "Confirm"
-msgstr "确�"
+msgstr "确认"
 
-#: ../libgimp/gimpexport.c:464
+#: ../libgimp/gimpexport.c:492
 msgid "Export File"
 msgstr "导å?ºæ??件"
 
-#: ../libgimp/gimpexport.c:468
+#: ../libgimp/gimpexport.c:496
 msgid "_Ignore"
 msgstr "忽�(_I)"
 
-#: ../libgimp/gimpexport.c:470
+#: ../libgimp/gimpexport.c:498
 msgid "_Export"
 msgstr "导�(_E)"
 
 #. the headline
-#: ../libgimp/gimpexport.c:499
+#: ../libgimp/gimpexport.c:528
 #, c-format
 msgid ""
 "Your image should be exported before it can be saved as %s for the following "
@@ -189,49 +190,49 @@ msgid ""
 msgstr "æ?¨ç??å?¾å??å?¨ä¿?å­?为 %s ä¹?å??åº?该å??è¿?è¡?导å?ºï¼?å? ä¸ºï¼?"
 
 #. the footline
-#: ../libgimp/gimpexport.c:573
+#: ../libgimp/gimpexport.c:602
 msgid "The export conversion won't modify your original image."
 msgstr "导å?ºè½¬æ?¢ä¸?ä¼?æ?¹å??æ?¨å??æ?¥ç??å?¾å??ã??"
 
-#: ../libgimp/gimpexport.c:673
+#: ../libgimp/gimpexport.c:701
 #, c-format
 msgid ""
 "You are about to save a layer mask as %s.\n"
 "This will not save the visible layers."
 msgstr ""
-"æ?¨å°?è¦?æ??å?¾å±?è??æ?¿ä¿?å­?为 %s ã??\n"
+"æ?¨å°?è¦?æ??å?¾å±?è??æ?¿ä¿?å­?为 %sã??\n"
 "è¿?å°?ä¸?ä¼?ä¿?å­?å?¯è§?ç??å?¾å±?ã??"
 
-#: ../libgimp/gimpexport.c:679
+#: ../libgimp/gimpexport.c:707
 #, c-format
 msgid ""
 "You are about to save a channel (saved selection) as %s.\n"
 "This will not save the visible layers."
 msgstr ""
-"æ?¨å°?è¦?æ??é??é??(å·²ä¿?å­?ç??é??å?º)ä¿?å­?为 %s ã??\n"
+"æ?¨å°?è¦?æ??é??é??(å·²ä¿?å­?ç??é??å?º)ä¿?å­?为 %sã??\n"
 "è¿?å°?ä¸?ä¼?ä¿?å­?å?¯è§?ç??å?¾å±?ã??"
 
-#: ../libgimp/gimpfontselectbutton.c:130
+#: ../libgimp/gimpfontselectbutton.c:129
 msgid "Font Selection"
 msgstr "å­?ä½?é??æ?©"
 
-#: ../libgimp/gimpfontselectbutton.c:145
+#: ../libgimp/gimpfontselectbutton.c:144
 msgid "Sans"
 msgstr "Sans"
 
-#: ../libgimp/gimpgradientselectbutton.c:148
+#: ../libgimp/gimpgradientselectbutton.c:147
 msgid "Gradient Selection"
 msgstr "æ¸?å??é??æ?©"
 
-#: ../libgimp/gimpmenu.c:450 ../libgimpwidgets/gimpintstore.c:239
+#: ../libgimp/gimpmenu.c:449 ../libgimpwidgets/gimpintstore.c:238
 msgid "(Empty)"
 msgstr "(空)"
 
-#: ../libgimp/gimppaletteselectbutton.c:130
+#: ../libgimp/gimppaletteselectbutton.c:129
 msgid "Palette Selection"
 msgstr "è?²æ?¿é??æ?©"
 
-#: ../libgimp/gimppatternselectbutton.c:156
+#: ../libgimp/gimppatternselectbutton.c:155
 msgid "Pattern Selection"
 msgstr "å?¾æ¡?é??æ?©"
 
@@ -263,503 +264,633 @@ msgstr "æ??æ?¥æ??"
 msgid "by type"
 msgstr "æ??ç±»å??"
 
-#: ../libgimp/gimpprocbrowserdialog.c:377
+#. count label
+#: ../libgimp/gimpprocbrowserdialog.c:385
+#: ../libgimp/gimpprocbrowserdialog.c:536 ../libgimpwidgets/gimpbrowser.c:130
+msgid "No matches"
+msgstr "æ? å?¹é??"
+
+#: ../libgimp/gimpprocbrowserdialog.c:388
+msgid "Search term invalid or incomplete"
+msgstr "æ??ç´¢æ?¡ä»¶æ? æ??æ??ä¸?å®?æ?´"
+
+#: ../libgimp/gimpprocbrowserdialog.c:397
 msgid "Searching"
 msgstr "æ??ç´¢"
 
-#: ../libgimp/gimpprocbrowserdialog.c:388
+#: ../libgimp/gimpprocbrowserdialog.c:408
 msgid "Searching by name"
 msgstr "æ??å??称æ??ç´¢"
 
-#: ../libgimp/gimpprocbrowserdialog.c:409
+#: ../libgimp/gimpprocbrowserdialog.c:429
 msgid "Searching by description"
 msgstr "æ??æ??è¿°æ??ç´¢"
 
-#: ../libgimp/gimpprocbrowserdialog.c:416
+#: ../libgimp/gimpprocbrowserdialog.c:436
 msgid "Searching by help"
 msgstr "æ??帮å?©æ??ç´¢"
 
-#: ../libgimp/gimpprocbrowserdialog.c:423
+#: ../libgimp/gimpprocbrowserdialog.c:443
 msgid "Searching by author"
 msgstr "æ??ä½?è??æ??ç´¢"
 
-#: ../libgimp/gimpprocbrowserdialog.c:430
+#: ../libgimp/gimpprocbrowserdialog.c:450
 msgid "Searching by copyright"
 msgstr "æ??ç??æ??æ??ç´¢"
 
-#: ../libgimp/gimpprocbrowserdialog.c:437
+#: ../libgimp/gimpprocbrowserdialog.c:457
 msgid "Searching by date"
 msgstr "æ??æ?¥æ??æ??ç´¢"
 
-#: ../libgimp/gimpprocbrowserdialog.c:444
+#: ../libgimp/gimpprocbrowserdialog.c:464
 msgid "Searching by type"
 msgstr "æ??ç±»å??æ??ç´¢"
 
-#: ../libgimp/gimpprocbrowserdialog.c:454
-#, fuzzy, c-format
+#: ../libgimp/gimpprocbrowserdialog.c:474
+#, c-format
 msgid "%d procedure"
 msgid_plural "%d procedures"
 msgstr[0] "%d 个��"
-msgstr[1] "%d 个��"
 
-#: ../libgimp/gimpprocbrowserdialog.c:463
+#: ../libgimp/gimpprocbrowserdialog.c:483
 msgid "No matches for your query"
 msgstr "æ?¨ç??æ?¥è¯¢æ? å?¹é??项"
 
-#: ../libgimp/gimpprocbrowserdialog.c:467
-#, fuzzy, c-format
+#: ../libgimp/gimpprocbrowserdialog.c:487
+#, c-format
 msgid "%d procedure matches your query"
 msgid_plural "%d procedures match your query"
-msgstr[0] "æ?¨ç??æ?¥è¯¢æ?? %d 个è¿?ç¨?å?¹é??"
-msgstr[1] "æ?¨ç??æ?¥è¯¢æ?? %d 个è¿?ç¨?å?¹é??"
+msgstr[0] "%d 个è¿?ç¨?ä¸?æ?¨ç??æ?¥è¯¢ç?¸å?¹é??"
 
-#. count label
-#: ../libgimp/gimpprocbrowserdialog.c:516 ../libgimpwidgets/gimpbrowser.c:114
-msgid "No matches"
-msgstr "æ? å?¹é??项"
-
-#: ../libgimp/gimpprocview.c:143
+#: ../libgimp/gimpprocview.c:162
 msgid "Parameters"
 msgstr "å??æ?°"
 
-#: ../libgimp/gimpprocview.c:156
+#: ../libgimp/gimpprocview.c:175
 msgid "Return Values"
 msgstr "è¿?å??å?¼"
 
-#: ../libgimp/gimpprocview.c:169
+#: ../libgimp/gimpprocview.c:188
 msgid "Additional Information"
 msgstr "é??å? ä¿¡æ?¯"
 
-#: ../libgimp/gimpprocview.c:209
+#: ../libgimp/gimpprocview.c:228
 msgid "Author:"
 msgstr "ä½?è??ï¼?"
 
-#: ../libgimp/gimpprocview.c:221
+#: ../libgimp/gimpprocview.c:240
 msgid "Date:"
 msgstr "æ?¥æ??ï¼?"
 
-#: ../libgimp/gimpprocview.c:233
+#: ../libgimp/gimpprocview.c:252
 msgid "Copyright:"
 msgstr "ç??æ??ï¼?"
 
-#: ../libgimp/gimpunitcache.c:57
+#: ../libgimp/gimpunitcache.c:56
 msgid "percent"
-msgstr "ç?¾å??æ¯?"
+msgstr "ç?¾å??ç?¹"
 
 #: ../libgimpbase/gimpbaseenums.c:28
+msgctxt "add-mask-type"
 msgid "_White (full opacity)"
 msgstr "ç?½è?²(å?¨ä¸?é??æ??)(_W)"
 
 #: ../libgimpbase/gimpbaseenums.c:29
+msgctxt "add-mask-type"
 msgid "_Black (full transparency)"
 msgstr "é»?è?²(å?¨é??æ??)(_B)"
 
 #: ../libgimpbase/gimpbaseenums.c:30
+msgctxt "add-mask-type"
 msgid "Layer's _alpha channel"
-msgstr "å?¾å±?ç?? alpha é??é??(_A)"
+msgstr "å?¾å±?ç?? _Alpha é??é??"
 
 #: ../libgimpbase/gimpbaseenums.c:31
+msgctxt "add-mask-type"
 msgid "_Transfer layer's alpha channel"
-msgstr "转移å?¾å±?ç?? alpha é??é??(_T)"
+msgstr "转移å?¾å±?ç?? Alpha é??é??(_T)"
 
 #: ../libgimpbase/gimpbaseenums.c:32
+msgctxt "add-mask-type"
 msgid "_Selection"
 msgstr "é??å?º(_S)"
 
 #: ../libgimpbase/gimpbaseenums.c:33
+msgctxt "add-mask-type"
 msgid "_Grayscale copy of layer"
 msgstr "å?¾å±?ç??ç?°åº¦å?¯æ?¬(_G)"
 
 #: ../libgimpbase/gimpbaseenums.c:34
+msgctxt "add-mask-type"
 msgid "C_hannel"
-msgstr "é??é??(_C)"
+msgstr "é??é??(_H)"
 
-#: ../libgimpbase/gimpbaseenums.c:64
+#: ../libgimpbase/gimpbaseenums.c:65
+msgctxt "blend-mode"
 msgid "FG to BG (RGB)"
 msgstr "å??æ?¯å?°è??æ?¯(RGB)"
 
-#: ../libgimpbase/gimpbaseenums.c:65
+#: ../libgimpbase/gimpbaseenums.c:66
+msgctxt "blend-mode"
 msgid "FG to BG (HSV)"
 msgstr "å??æ?¯å?°è??æ?¯(HSV)"
 
-#: ../libgimpbase/gimpbaseenums.c:66
+#: ../libgimpbase/gimpbaseenums.c:67
+msgctxt "blend-mode"
 msgid "FG to transparent"
 msgstr "å??æ?¯å?°é??æ??"
 
-#: ../libgimpbase/gimpbaseenums.c:67
+#: ../libgimpbase/gimpbaseenums.c:68
+msgctxt "blend-mode"
 msgid "Custom gradient"
 msgstr "è?ªå®?ä¹?æ¸?å??"
 
-#: ../libgimpbase/gimpbaseenums.c:96
+#: ../libgimpbase/gimpbaseenums.c:98
+msgctxt "bucket-fill-mode"
 msgid "FG color fill"
 msgstr "å??æ?¯è?²å¡«å??"
 
-#: ../libgimpbase/gimpbaseenums.c:97
+#: ../libgimpbase/gimpbaseenums.c:99
+msgctxt "bucket-fill-mode"
 msgid "BG color fill"
 msgstr "è??æ?¯è?²å¡«å??"
 
-#: ../libgimpbase/gimpbaseenums.c:98
+#: ../libgimpbase/gimpbaseenums.c:100
+msgctxt "bucket-fill-mode"
 msgid "Pattern fill"
 msgstr "å?¾æ¡?å¡«å??"
 
-#: ../libgimpbase/gimpbaseenums.c:128
+#: ../libgimpbase/gimpbaseenums.c:131
+msgctxt "channel-ops"
 msgid "Add to the current selection"
 msgstr "å??并å?°å½?å??é??å?º"
 
-#: ../libgimpbase/gimpbaseenums.c:129
+#: ../libgimpbase/gimpbaseenums.c:132
+msgctxt "channel-ops"
 msgid "Subtract from the current selection"
 msgstr "ä»?å½?å??é??å?ºä¸­å??å?»"
 
-#: ../libgimpbase/gimpbaseenums.c:130
+#: ../libgimpbase/gimpbaseenums.c:133
+msgctxt "channel-ops"
 msgid "Replace the current selection"
 msgstr "æ?¿æ?¢å½?å??é??å?º"
 
-#: ../libgimpbase/gimpbaseenums.c:131
+#: ../libgimpbase/gimpbaseenums.c:134
+msgctxt "channel-ops"
 msgid "Intersect with the current selection"
 msgstr "ä¸?å½?å??é??å?ºç?¸äº¤"
 
-#: ../libgimpbase/gimpbaseenums.c:163 ../libgimpwidgets/gimpwidgetsenums.c:126
+#: ../libgimpbase/gimpbaseenums.c:167
+msgctxt "channel-type"
 msgid "Red"
 msgstr "红�"
 
-#: ../libgimpbase/gimpbaseenums.c:164 ../libgimpwidgets/gimpwidgetsenums.c:127
+#: ../libgimpbase/gimpbaseenums.c:168
+msgctxt "channel-type"
 msgid "Green"
 msgstr "绿�"
 
-#: ../libgimpbase/gimpbaseenums.c:165 ../libgimpwidgets/gimpwidgetsenums.c:128
+#: ../libgimpbase/gimpbaseenums.c:169
+msgctxt "channel-type"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libgimpbase/gimpbaseenums.c:166
+#: ../libgimpbase/gimpbaseenums.c:170
+msgctxt "channel-type"
 msgid "Gray"
 msgstr "�度"
 
-#: ../libgimpbase/gimpbaseenums.c:167 ../libgimpbase/gimpbaseenums.c:532
+#: ../libgimpbase/gimpbaseenums.c:171
+msgctxt "channel-type"
 msgid "Indexed"
 msgstr "索�"
 
-#: ../libgimpbase/gimpbaseenums.c:168 ../libgimpwidgets/gimpwidgetsenums.c:129
+#: ../libgimpbase/gimpbaseenums.c:172
+msgctxt "channel-type"
 msgid "Alpha"
 msgstr "Alpha"
 
-#: ../libgimpbase/gimpbaseenums.c:197
+#: ../libgimpbase/gimpbaseenums.c:202
+msgctxt "check-size"
 msgid "Small"
 msgstr "å°?"
 
-#: ../libgimpbase/gimpbaseenums.c:198
+#: ../libgimpbase/gimpbaseenums.c:203
+msgctxt "check-size"
 msgid "Medium"
 msgstr "中"
 
-#: ../libgimpbase/gimpbaseenums.c:199
+#: ../libgimpbase/gimpbaseenums.c:204
+msgctxt "check-size"
 msgid "Large"
 msgstr "大"
 
-#: ../libgimpbase/gimpbaseenums.c:231
+#: ../libgimpbase/gimpbaseenums.c:237
+msgctxt "check-type"
 msgid "Light checks"
-msgstr "æµ?è?²å??å­?"
+msgstr "���格"
 
-#: ../libgimpbase/gimpbaseenums.c:232
+#: ../libgimpbase/gimpbaseenums.c:238
+msgctxt "check-type"
 msgid "Mid-tone checks"
-msgstr "中ç­?è?²è°?å??å­?"
+msgstr "中����格"
 
-#: ../libgimpbase/gimpbaseenums.c:233
+#: ../libgimpbase/gimpbaseenums.c:239
+msgctxt "check-type"
 msgid "Dark checks"
-msgstr "æ·±è?²å??å­?"
+msgstr "深��格"
 
-#: ../libgimpbase/gimpbaseenums.c:234
+#: ../libgimpbase/gimpbaseenums.c:240
+msgctxt "check-type"
 msgid "White only"
 msgstr "���"
 
-#: ../libgimpbase/gimpbaseenums.c:235
+#: ../libgimpbase/gimpbaseenums.c:241
+msgctxt "check-type"
 msgid "Gray only"
 msgstr "ä»?ç?°è?²"
 
-#: ../libgimpbase/gimpbaseenums.c:236
+#: ../libgimpbase/gimpbaseenums.c:242
+msgctxt "check-type"
 msgid "Black only"
 msgstr "ä»?é»?è?²"
 
-#: ../libgimpbase/gimpbaseenums.c:264
+#: ../libgimpbase/gimpbaseenums.c:271
+msgctxt "clone-type"
 msgid "Image"
 msgstr "å?¾å??"
 
-#: ../libgimpbase/gimpbaseenums.c:265
+#: ../libgimpbase/gimpbaseenums.c:272
+msgctxt "clone-type"
 msgid "Pattern"
 msgstr "��"
 
-#: ../libgimpbase/gimpbaseenums.c:294
+#: ../libgimpbase/gimpbaseenums.c:302
+msgctxt "desaturate-mode"
 msgid "Lightness"
 msgstr "亮度"
 
-#: ../libgimpbase/gimpbaseenums.c:295
+#: ../libgimpbase/gimpbaseenums.c:303
+msgctxt "desaturate-mode"
 msgid "Luminosity"
-msgstr "亮度"
+msgstr "å??å??度"
 
-#: ../libgimpbase/gimpbaseenums.c:296
+#: ../libgimpbase/gimpbaseenums.c:304
+msgctxt "desaturate-mode"
 msgid "Average"
 msgstr "å¹³å??"
 
-#: ../libgimpbase/gimpbaseenums.c:324
+#: ../libgimpbase/gimpbaseenums.c:333
+msgctxt "dodge-burn-type"
 msgid "Dodge"
 msgstr "å??æ·¡"
 
-#: ../libgimpbase/gimpbaseenums.c:325
+#: ../libgimpbase/gimpbaseenums.c:334
+msgctxt "dodge-burn-type"
 msgid "Burn"
 msgstr "å? æ·±"
 
-#: ../libgimpbase/gimpbaseenums.c:389
-msgid "gradient|Linear"
+#: ../libgimpbase/gimpbaseenums.c:400
+msgctxt "gradient-type"
+msgid "Linear"
 msgstr "线�"
 
-#: ../libgimpbase/gimpbaseenums.c:390
+#: ../libgimpbase/gimpbaseenums.c:401
+msgctxt "gradient-type"
 msgid "Bi-linear"
 msgstr "对称线�"
 
-#: ../libgimpbase/gimpbaseenums.c:391
+#: ../libgimpbase/gimpbaseenums.c:402
+msgctxt "gradient-type"
 msgid "Radial"
 msgstr "å¾?å??"
 
-#: ../libgimpbase/gimpbaseenums.c:392 ../libgimpwidgets/gimpwidgetsenums.c:24
+#: ../libgimpbase/gimpbaseenums.c:403
+msgctxt "gradient-type"
 msgid "Square"
-msgstr "正�"
+msgstr "正�形"
 
-#: ../libgimpbase/gimpbaseenums.c:393
+#: ../libgimpbase/gimpbaseenums.c:404
+msgctxt "gradient-type"
 msgid "Conical (sym)"
 msgstr "å??é?¥(对称)"
 
-#: ../libgimpbase/gimpbaseenums.c:394
+#: ../libgimpbase/gimpbaseenums.c:405
+msgctxt "gradient-type"
 msgid "Conical (asym)"
 msgstr "å??é?¥(ä¸?对称)"
 
-#: ../libgimpbase/gimpbaseenums.c:395
+#: ../libgimpbase/gimpbaseenums.c:406
+msgctxt "gradient-type"
 msgid "Shaped (angular)"
 msgstr "形�(��)"
 
-#: ../libgimpbase/gimpbaseenums.c:396
+#: ../libgimpbase/gimpbaseenums.c:407
+msgctxt "gradient-type"
 msgid "Shaped (spherical)"
 msgstr "å½¢ç?¶(ç??ç?¶)"
 
-#: ../libgimpbase/gimpbaseenums.c:397
+#: ../libgimpbase/gimpbaseenums.c:408
+msgctxt "gradient-type"
 msgid "Shaped (dimpled)"
 msgstr "形�(�漪)"
 
-#: ../libgimpbase/gimpbaseenums.c:398
+#: ../libgimpbase/gimpbaseenums.c:409
+msgctxt "gradient-type"
 msgid "Spiral (cw)"
 msgstr "è?ºæ??(顺æ?¶é??)"
 
-#: ../libgimpbase/gimpbaseenums.c:399
+#: ../libgimpbase/gimpbaseenums.c:410
+msgctxt "gradient-type"
 msgid "Spiral (ccw)"
 msgstr "è?ºæ??(é??æ?¶é??)"
 
-#: ../libgimpbase/gimpbaseenums.c:430
+#: ../libgimpbase/gimpbaseenums.c:442
+msgctxt "grid-style"
 msgid "Intersections (dots)"
 msgstr "交é??(ç?¹)"
 
-#: ../libgimpbase/gimpbaseenums.c:431
+#: ../libgimpbase/gimpbaseenums.c:443
+msgctxt "grid-style"
 msgid "Intersections (crosshairs)"
 msgstr "交é??(交å??线)"
 
-#: ../libgimpbase/gimpbaseenums.c:432
+#: ../libgimpbase/gimpbaseenums.c:444
+msgctxt "grid-style"
 msgid "Dashed"
 msgstr "è??线"
 
-#: ../libgimpbase/gimpbaseenums.c:433
+#: ../libgimpbase/gimpbaseenums.c:445
+msgctxt "grid-style"
 msgid "Double dashed"
 msgstr "å??è??线"
 
-#: ../libgimpbase/gimpbaseenums.c:434
+#: ../libgimpbase/gimpbaseenums.c:446
+msgctxt "grid-style"
 msgid "Solid"
 msgstr "�线"
 
-#: ../libgimpbase/gimpbaseenums.c:463
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:476
+msgctxt "icon-type"
 msgid "Stock ID"
 msgstr "å­?å?¨ ID"
 
-#: ../libgimpbase/gimpbaseenums.c:464
+#: ../libgimpbase/gimpbaseenums.c:477
+msgctxt "icon-type"
 msgid "Inline pixbuf"
 msgstr "åµ?å?¥ pixbuf"
 
-#: ../libgimpbase/gimpbaseenums.c:465
+#: ../libgimpbase/gimpbaseenums.c:478
+msgctxt "icon-type"
 msgid "Image file"
 msgstr "å?¾å??æ??件"
 
-#: ../libgimpbase/gimpbaseenums.c:494
+#: ../libgimpbase/gimpbaseenums.c:508
+msgctxt "image-base-type"
 msgid "RGB color"
 msgstr "RGB ��"
 
-#: ../libgimpbase/gimpbaseenums.c:495 ../libgimpbase/gimpbaseenums.c:530
+#: ../libgimpbase/gimpbaseenums.c:509
+msgctxt "image-base-type"
 msgid "Grayscale"
 msgstr "�度"
 
-#: ../libgimpbase/gimpbaseenums.c:496
+#: ../libgimpbase/gimpbaseenums.c:510
+msgctxt "image-base-type"
 msgid "Indexed color"
 msgstr "索���"
 
-#: ../libgimpbase/gimpbaseenums.c:528
+#: ../libgimpbase/gimpbaseenums.c:543
+msgctxt "image-type"
 msgid "RGB"
 msgstr "RGB"
 
-#: ../libgimpbase/gimpbaseenums.c:529
+#: ../libgimpbase/gimpbaseenums.c:544
+msgctxt "image-type"
 msgid "RGB-alpha"
-msgstr "RGB -alpha"
+msgstr "RGB-alpha"
+
+#: ../libgimpbase/gimpbaseenums.c:545
+msgctxt "image-type"
+msgid "Grayscale"
+msgstr "�度"
 
-#: ../libgimpbase/gimpbaseenums.c:531
+#: ../libgimpbase/gimpbaseenums.c:546
+msgctxt "image-type"
 msgid "Grayscale-alpha"
 msgstr "�度 -alpha"
 
-#: ../libgimpbase/gimpbaseenums.c:533
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:547
+msgctxt "image-type"
+msgid "Indexed"
+msgstr "索��"
+
+#: ../libgimpbase/gimpbaseenums.c:548
+msgctxt "image-type"
 msgid "Indexed-alpha"
-msgstr "索� -alpha"
+msgstr "索�� -alpha"
 
-#: ../libgimpbase/gimpbaseenums.c:563
-msgid "interpolation|None"
+#: ../libgimpbase/gimpbaseenums.c:579
+msgctxt "interpolation-type"
+msgid "None"
 msgstr "æ? "
 
-#: ../libgimpbase/gimpbaseenums.c:564
-msgid "interpolation|Linear"
+#: ../libgimpbase/gimpbaseenums.c:580
+msgctxt "interpolation-type"
+msgid "Linear"
 msgstr "线�"
 
-#: ../libgimpbase/gimpbaseenums.c:565
+#: ../libgimpbase/gimpbaseenums.c:581
+msgctxt "interpolation-type"
 msgid "Cubic"
 msgstr "ç«?æ?¹"
 
-#: ../libgimpbase/gimpbaseenums.c:566
+#: ../libgimpbase/gimpbaseenums.c:582
+msgctxt "interpolation-type"
 msgid "Sinc (Lanczos3)"
-msgstr ""
+msgstr "正弦 (Lanczos3)"
 
-#: ../libgimpbase/gimpbaseenums.c:594
+#: ../libgimpbase/gimpbaseenums.c:611
+msgctxt "paint-application-mode"
 msgid "Constant"
 msgstr "常é??"
 
-#: ../libgimpbase/gimpbaseenums.c:595
+#: ../libgimpbase/gimpbaseenums.c:612
+msgctxt "paint-application-mode"
 msgid "Incremental"
-msgstr "å¢?é??"
+msgstr "��"
 
-#: ../libgimpbase/gimpbaseenums.c:624 ../modules/display-filter-lcms.c:191
+#: ../libgimpbase/gimpbaseenums.c:642
+msgctxt "repeat-mode"
 msgid "None"
 msgstr "æ? "
 
-#: ../libgimpbase/gimpbaseenums.c:625
+#: ../libgimpbase/gimpbaseenums.c:643
+msgctxt "repeat-mode"
 msgid "Sawtooth wave"
 msgstr "�齿波"
 
-#: ../libgimpbase/gimpbaseenums.c:626
+#: ../libgimpbase/gimpbaseenums.c:644
+msgctxt "repeat-mode"
 msgid "Triangular wave"
 msgstr "��波"
 
-#: ../libgimpbase/gimpbaseenums.c:655
+#: ../libgimpbase/gimpbaseenums.c:674
+msgctxt "run-mode"
 msgid "Run interactively"
 msgstr "交����"
 
-#: ../libgimpbase/gimpbaseenums.c:656
+#: ../libgimpbase/gimpbaseenums.c:675
+msgctxt "run-mode"
 msgid "Run non-interactively"
 msgstr "é??交äº?å¼?è¿?è¡?"
 
-#: ../libgimpbase/gimpbaseenums.c:657
+#: ../libgimpbase/gimpbaseenums.c:676
+msgctxt "run-mode"
 msgid "Run with last used values"
 msgstr "使ç?¨ä¸?ä¸?次ç??å?¼è¿?è¡?"
 
-#: ../libgimpbase/gimpbaseenums.c:685
+#: ../libgimpbase/gimpbaseenums.c:705
+msgctxt "size-type"
 msgid "Pixels"
 msgstr "å??ç´ "
 
-#: ../libgimpbase/gimpbaseenums.c:686
+#: ../libgimpbase/gimpbaseenums.c:706
+msgctxt "size-type"
 msgid "Points"
 msgstr "ç?¹"
 
-#: ../libgimpbase/gimpbaseenums.c:715
+#: ../libgimpbase/gimpbaseenums.c:736
+msgctxt "transfer-mode"
 msgid "Shadows"
 msgstr "é?´å½±"
 
-#: ../libgimpbase/gimpbaseenums.c:716
+#: ../libgimpbase/gimpbaseenums.c:737
+msgctxt "transfer-mode"
 msgid "Midtones"
 msgstr "中�深�"
 
-#: ../libgimpbase/gimpbaseenums.c:717
+#: ../libgimpbase/gimpbaseenums.c:738
+msgctxt "transfer-mode"
 msgid "Highlights"
 msgstr "�亮"
 
-#: ../libgimpbase/gimpbaseenums.c:745
+#: ../libgimpbase/gimpbaseenums.c:767
+msgctxt "transform-direction"
 msgid "Normal (Forward)"
 msgstr "正常(å??å??)"
 
-#: ../libgimpbase/gimpbaseenums.c:746
+#: ../libgimpbase/gimpbaseenums.c:768
+msgctxt "transform-direction"
 msgid "Corrective (Backward)"
 msgstr "è¡¥å?¿(å??å??)"
 
-#: ../libgimpbase/gimpbaseenums.c:776
+#: ../libgimpbase/gimpbaseenums.c:799
+msgctxt "transform-resize"
 msgid "Adjust"
 msgstr "è°?æ?´"
 
-#: ../libgimpbase/gimpbaseenums.c:777
+#: ../libgimpbase/gimpbaseenums.c:800
+msgctxt "transform-resize"
 msgid "Clip"
 msgstr "修�"
 
-#: ../libgimpbase/gimpbaseenums.c:778
+#: ../libgimpbase/gimpbaseenums.c:801
+msgctxt "transform-resize"
 msgid "Crop to result"
 msgstr "å?ªè£?å?°ç»?æ??"
 
-#: ../libgimpbase/gimpbaseenums.c:779
+#: ../libgimpbase/gimpbaseenums.c:802
+msgctxt "transform-resize"
 msgid "Crop with aspect"
 msgstr "æ??æ¯?ä¾?å?ªè£?"
 
-#: ../libgimpbase/gimpbaseenums.c:909
+#: ../libgimpbase/gimpbaseenums.c:935
+msgctxt "pdb-proc-type"
 msgid "Internal GIMP procedure"
 msgstr "GIMP å??é?¨è¿?ç¨?"
 
-#: ../libgimpbase/gimpbaseenums.c:910
+#: ../libgimpbase/gimpbaseenums.c:936
+msgctxt "pdb-proc-type"
 msgid "GIMP Plug-In"
 msgstr "GIMP æ??件"
 
-#: ../libgimpbase/gimpbaseenums.c:911
+#: ../libgimpbase/gimpbaseenums.c:937
+msgctxt "pdb-proc-type"
 msgid "GIMP Extension"
 msgstr "GIMP æ?©å±?"
 
-#: ../libgimpbase/gimpbaseenums.c:912
+#: ../libgimpbase/gimpbaseenums.c:938
+msgctxt "pdb-proc-type"
 msgid "Temporary Procedure"
 msgstr "临���"
 
-#: ../libgimpbase/gimpbaseenums.c:1074
+#: ../libgimpbase/gimpbaseenums.c:1105
+msgctxt "text-direction"
 msgid "From left to right"
 msgstr "�左��"
 
-#: ../libgimpbase/gimpbaseenums.c:1075
+#: ../libgimpbase/gimpbaseenums.c:1106
+msgctxt "text-direction"
 msgid "From right to left"
 msgstr "���左"
 
-#: ../libgimpbase/gimpbaseenums.c:1105
+#: ../libgimpbase/gimpbaseenums.c:1137
+msgctxt "text-hint-style"
+msgid "None"
+msgstr "æ? "
+
+#: ../libgimpbase/gimpbaseenums.c:1138
+msgctxt "text-hint-style"
+msgid "Slight"
+msgstr "轻微"
+
+#: ../libgimpbase/gimpbaseenums.c:1139
+msgctxt "text-hint-style"
+msgid "Medium"
+msgstr "中�"
+
+#: ../libgimpbase/gimpbaseenums.c:1140
+msgctxt "text-hint-style"
+msgid "Full"
+msgstr "å®?å?¨"
+
+#: ../libgimpbase/gimpbaseenums.c:1171
+msgctxt "text-justification"
 msgid "Left justified"
 msgstr "左对�"
 
-#: ../libgimpbase/gimpbaseenums.c:1106
+#: ../libgimpbase/gimpbaseenums.c:1172
+msgctxt "text-justification"
 msgid "Right justified"
 msgstr "�对�"
 
-#: ../libgimpbase/gimpbaseenums.c:1107
+#: ../libgimpbase/gimpbaseenums.c:1173
+msgctxt "text-justification"
 msgid "Centered"
 msgstr "�中"
 
-#: ../libgimpbase/gimpbaseenums.c:1108
+#: ../libgimpbase/gimpbaseenums.c:1174
+msgctxt "text-justification"
 msgid "Filled"
 msgstr "å¡«å??"
 
-#: ../libgimpbase/gimputils.c:170 ../libgimpbase/gimputils.c:175
-#: ../modules/display-filter-lcms.c:183
-#: ../modules/color-selector-cmyk-lcms.c:407
-#: ../modules/color-selector-cmyk-lcms.c:413
+#: ../libgimpbase/gimputils.c:169 ../libgimpbase/gimputils.c:174
+#: ../modules/color-selector-cmyk-lcms.c:406
+#: ../modules/color-selector-cmyk-lcms.c:412
+#: ../modules/display-filter-lcms.c:182
 msgid "(invalid UTF-8 string)"
 msgstr "(æ? æ??ç?? UTF-8 å­?符串)"
 
-#: ../libgimpconfig/gimpcolorconfig.c:42
+#: ../libgimpconfig/gimpcolorconfig.c:41
 msgid "Mode of operation for color management."
 msgstr "é¢?è?²ç®¡ç??ç??æ??ä½?模å¼?ã??"
 
-#: ../libgimpconfig/gimpcolorconfig.c:44
+#: ../libgimpconfig/gimpcolorconfig.c:43
 msgid "The color profile of your (primary) monitor."
 msgstr "æ?¨(主è¦?)æ?¾ç¤ºå?¨ç??è?²å½©é??ç½®æ??件"
 
-#: ../libgimpconfig/gimpcolorconfig.c:46
+#: ../libgimpconfig/gimpcolorconfig.c:45
 msgid ""
 "When enabled, GIMP will try to use the display color profile from the "
 "windowing system.  The configured monitor profile is then only used as a "
@@ -768,122 +899,129 @@ msgstr ""
 "å½?å?¯ç?¨æ?¶ï¼?GIMP å°?è¯?å?¾ä½¿ç?¨çª?å?£ç³»ç»?æ?¾ç¤ºè?²å½©é??ç½®æ??件ã??è¿?样已设置好ç??é??ç½®æ??件å°?å?ª"
 "ç?¨æ?¥ä½?为å??å¤?ã??"
 
-#: ../libgimpconfig/gimpcolorconfig.c:50
+#: ../libgimpconfig/gimpcolorconfig.c:49
 msgid "The default RGB working space color profile."
 msgstr "é»?认 RGB å·¥ä½?空é?´é¢?è?²é??ç½®æ??件ã??"
 
-#: ../libgimpconfig/gimpcolorconfig.c:52
+#: ../libgimpconfig/gimpcolorconfig.c:51
 msgid "The CMYK color profile used to convert between RGB and CMYK."
 msgstr "CMYK é¢?è?²é??ç½®æ??件ç?¨æ?¥å?¨ RGB å?? CMYK ä¹?é?´è½¬æ?¢ã??"
 
-#: ../libgimpconfig/gimpcolorconfig.c:54
+#: ../libgimpconfig/gimpcolorconfig.c:53
 msgid "The color profile used for simulating a printed version (softproof)."
 msgstr "ç?¨äº?模æ??æ??å?°ç??æ?¬ç??è?²å½©é??ç½®æ??件(软å¼?æ??æ ·)ã??"
 
-#: ../libgimpconfig/gimpcolorconfig.c:56
+#: ../libgimpconfig/gimpcolorconfig.c:55
 msgid "Sets how colors are mapped for your display."
 msgstr "设å®?è?²å½©å¦?ä½?æ? å°?å?°æ?¨ç??æ?¾ç¤ºå?¨ã??"
 
-#: ../libgimpconfig/gimpcolorconfig.c:58
+#: ../libgimpconfig/gimpcolorconfig.c:57
 msgid ""
 "Sets how colors are converted from RGB working space to the print simulation "
 "device."
 msgstr "设å®?è?²å½©å¦?ä½?ä»? RGB å·¥ä½?空é?´è½¬æ?¢å?°æ??å?°ä»¿ç??设å¤?ã??"
 
-#: ../libgimpconfig/gimpcolorconfig.c:61
+#: ../libgimpconfig/gimpcolorconfig.c:60
 msgid ""
 "When enabled, the print simulation will mark colors which can not be "
 "represented in the target color space."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ??å?°æ¨¡æ??å°?æ ?è®°å?ºä¸?è?½å?¨ç?®æ ?è?²å½©ç©ºé?´è¡¨ç¤ºç??é¢?è?²ã??"
 
-#: ../libgimpconfig/gimpcolorconfig.c:64
+#: ../libgimpconfig/gimpcolorconfig.c:63
 msgid "The color to use for marking colors which are out of gamut."
 msgstr "ç?¨äº?æ ?è®°è¶?è¿?è?²å??ç??è?²å½©ç??é¢?è?²ã??"
 
 #: ../libgimpconfig/gimpcolorconfig-enums.c:24
+msgctxt "color-management-mode"
 msgid "No color management"
 msgstr "æ? è?²å½©ç®¡ç??"
 
 #: ../libgimpconfig/gimpcolorconfig-enums.c:25
+msgctxt "color-management-mode"
 msgid "Color managed display"
 msgstr "é¢?è?²ç®¡ç??ç??æ?¾ç¤º"
 
 #: ../libgimpconfig/gimpcolorconfig-enums.c:26
+msgctxt "color-management-mode"
 msgid "Print simulation"
 msgstr "æ??å?°æ¨¡æ??"
 
-#: ../libgimpconfig/gimpcolorconfig-enums.c:56
-#, fuzzy
+#: ../libgimpconfig/gimpcolorconfig-enums.c:57
+msgctxt "color-rendering-intent"
 msgid "Perceptual"
 msgstr "æ??å®?"
 
-#: ../libgimpconfig/gimpcolorconfig-enums.c:57
+#: ../libgimpconfig/gimpcolorconfig-enums.c:58
+msgctxt "color-rendering-intent"
 msgid "Relative colorimetric"
 msgstr "�对�度"
 
-#: ../libgimpconfig/gimpcolorconfig-enums.c:58
-msgid "intent|Saturation"
+#: ../libgimpconfig/gimpcolorconfig-enums.c:59
+msgctxt "color-rendering-intent"
+msgid "Saturation"
 msgstr "饱å??度"
 
-#: ../libgimpconfig/gimpcolorconfig-enums.c:59
+#: ../libgimpconfig/gimpcolorconfig-enums.c:60
+msgctxt "color-rendering-intent"
 msgid "Absolute colorimetric"
 msgstr "�对�度"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:97
+#: ../libgimpconfig/gimpconfig-deserialize.c:96
 #, c-format
 msgid "value for token %s is not a valid UTF-8 string"
 msgstr "%s ç??å?¼ä¸?æ?¯æ??æ??ç?? UTF-8 å­?符串"
 
 #. please don't translate 'yes' and 'no'
-#: ../libgimpconfig/gimpconfig-deserialize.c:436
+#: ../libgimpconfig/gimpconfig-deserialize.c:435
 #, c-format
 msgid "expected 'yes' or 'no' for boolean token %s, got '%s'"
 msgstr "æ??å¾?å¸?å°?å?¼ %s 为 â??yesâ?? æ?? â??noâ??ï¼?ä½?å¾?å?° â??%sâ??"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:510
+#: ../libgimpconfig/gimpconfig-deserialize.c:509
 #, c-format
 msgid "invalid value '%s' for token %s"
 msgstr "%2$s ç??å?¼ â??%1$sâ?? æ? æ??"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:525
+#: ../libgimpconfig/gimpconfig-deserialize.c:524
 #, c-format
 msgid "invalid value '%ld' for token %s"
 msgstr "%2$s ç??å?¼ â??%1$ldâ?? æ? æ??"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:594
+#: ../libgimpconfig/gimpconfig-deserialize.c:593
 #, c-format
 msgid "while parsing token '%s': %s"
 msgstr "解æ?? â??%sâ?? æ?¶ï¼?%s"
 
-#: ../libgimpconfig/gimpconfig-iface.c:474
-#: ../libgimpconfig/gimpconfig-iface.c:487 ../libgimpconfig/gimpscanner.c:498
-#: ../libgimpconfig/gimpscanner.c:579
-#: ../libgimpwidgets/gimpcolorprofilestore.c:656
+#: ../libgimpconfig/gimpconfig-iface.c:473
+#: ../libgimpconfig/gimpconfig-iface.c:486 ../libgimpconfig/gimpscanner.c:497
+#: ../libgimpconfig/gimpscanner.c:578
+#: ../libgimpwidgets/gimpcolorprofilestore.c:655
 msgid "fatal parse error"
 msgstr "严é??解æ??é??误"
 
-#: ../libgimpconfig/gimpconfig-path.c:377
+#: ../libgimpconfig/gimpconfig-path.c:378
 #, c-format
 msgid "Cannot expand ${%s}"
 msgstr "æ? æ³?æ?©å±? ${%s}"
 
-#: ../libgimpconfig/gimpconfigwriter.c:78
-#: ../libgimpconfig/gimpconfigwriter.c:693
+#: ../libgimpconfig/gimpconfigwriter.c:77
+#: ../libgimpconfig/gimpconfigwriter.c:718
 #, c-format
 msgid "Error writing to '%s': %s"
 msgstr "å??å?¥ â??%sâ?? æ?¶å?ºé??ï¼?%s"
 
-#: ../libgimpconfig/gimpconfigwriter.c:136
+#: ../libgimpconfig/gimpconfigwriter.c:135
 #, c-format
 msgid "Could not create temporary file for '%s': %s"
 msgstr "æ? æ³?为 â??%sâ?? å??建临æ?¶æ??件ï¼?%s"
 
-#: ../libgimpconfig/gimpconfigwriter.c:149
+#: ../libgimpconfig/gimpconfigwriter.c:148
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "æ? æ³?为å??å?¥æ??å¼? â??%sâ??ï¼?%s"
 
-#: ../libgimpconfig/gimpconfigwriter.c:674
+#: ../libgimpconfig/gimpconfigwriter.c:679
+#: ../libgimpconfig/gimpconfigwriter.c:699
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -892,7 +1030,7 @@ msgstr ""
 "å??â??%sâ??ç??临æ?¶æ??件æ?¶å?ºé??ï¼?%s\n"
 "å??å§?æ??件没æ??被修æ?¹ã??"
 
-#: ../libgimpconfig/gimpconfigwriter.c:682
+#: ../libgimpconfig/gimpconfigwriter.c:707
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -901,45 +1039,45 @@ msgstr ""
 "å?? â??%sâ?? ç??临æ?¶æ??件æ?¶å?ºé??ï¼?%s\n"
 "没æ??å??建æ??件ã??"
 
-#: ../libgimpconfig/gimpconfigwriter.c:711
+#: ../libgimpconfig/gimpconfigwriter.c:731
 #, c-format
 msgid "Could not create '%s': %s"
 msgstr "æ? æ³?å??建â??%sâ??ï¼?%s"
 
-#: ../libgimpconfig/gimpscanner.c:255
+#: ../libgimpconfig/gimpscanner.c:254
 #, c-format
 msgid "invalid UTF-8 string"
 msgstr "æ? æ??ç?? UTF-8 å­?符串"
 
-#: ../libgimpconfig/gimpscanner.c:606
+#: ../libgimpconfig/gimpscanner.c:605
 #, c-format
 msgid "Error while parsing '%s' in line %d: %s"
 msgstr "解æ?? â??%sâ?? 第 %d è¡?æ?¶å?ºé??ï¼?%s"
 
-#: ../libgimpmodule/gimpmodule.c:153 ../libgimpmodule/gimpmodule.c:171
-#: ../libgimpmodule/gimpmodule.c:280 ../libgimpmodule/gimpmodule.c:307
-#: ../libgimpmodule/gimpmodule.c:418
+#: ../libgimpmodule/gimpmodule.c:152 ../libgimpmodule/gimpmodule.c:170
+#: ../libgimpmodule/gimpmodule.c:279 ../libgimpmodule/gimpmodule.c:306
+#: ../libgimpmodule/gimpmodule.c:432
 #, c-format
 msgid "Module '%s' load error: %s"
 msgstr "模å??â??%sâ??å? è½½é??误ï¼?%s"
 
-#: ../libgimpmodule/gimpmodule.c:375
+#: ../libgimpmodule/gimpmodule.c:374
 msgid "Module error"
 msgstr "模å??é??误"
 
-#: ../libgimpmodule/gimpmodule.c:376
+#: ../libgimpmodule/gimpmodule.c:375
 msgid "Loaded"
 msgstr "已�载"
 
-#: ../libgimpmodule/gimpmodule.c:377
+#: ../libgimpmodule/gimpmodule.c:376
 msgid "Load failed"
 msgstr "�载失败"
 
-#: ../libgimpmodule/gimpmodule.c:378
+#: ../libgimpmodule/gimpmodule.c:377
 msgid "Not loaded"
 msgstr "��载"
 
-#: ../libgimpthumb/gimpthumb-utils.c:123
+#: ../libgimpthumb/gimpthumb-utils.c:122
 #, c-format
 msgid ""
 "Cannot determine a valid home directory.\n"
@@ -948,944 +1086,925 @@ msgstr ""
 "æ? æ³?ç¡®å®?æ??æ??ç??主ç?®å½?ã??\n"
 "å°?缩ç?¥å?¾æ?¹æ?¾å?¨ä¸´æ?¶æ??件ç??ç?®å½?(%s)中ã??"
 
-#: ../libgimpthumb/gimpthumb-utils.c:247 ../libgimpthumb/gimpthumb-utils.c:315
+#: ../libgimpthumb/gimpthumb-utils.c:246 ../libgimpthumb/gimpthumb-utils.c:314
 #, c-format
 msgid "Failed to create thumbnail folder '%s'."
 msgstr "æ? æ³?å??建缩ç?¥å?¾æ??件夹â??%sâ??ã??"
 
-#: ../libgimpthumb/gimpthumbnail.c:498
+#: ../libgimpthumb/gimpthumbnail.c:497
 #, c-format
 msgid "Thumbnail contains no Thumb::URI tag"
 msgstr "缩ç?¥å?¾æ²¡æ??å??å?« Thumb::URI æ ?ç­¾"
 
-#: ../libgimpthumb/gimpthumbnail.c:898
+#: ../libgimpthumb/gimpthumbnail.c:893
 #, c-format
 msgid "Could not create thumbnail for %s: %s"
 msgstr "æ? æ³?为 â??%sâ?? å??建缩ç?¥å?¾ï¼?%s"
 
-#: ../libgimpwidgets/gimpbrowser.c:98
+#: ../libgimpwidgets/gimpbrowser.c:103
 msgid "_Search:"
 msgstr "æ??ç´¢(_S)ï¼?"
 
-#: ../libgimpwidgets/gimpcolorbutton.c:118
+#: ../libgimpwidgets/gimpcolorbutton.c:117
 msgid "_Foreground Color"
 msgstr "å??æ?¯è?²(_F)"
 
-#: ../libgimpwidgets/gimpcolorbutton.c:122
+#: ../libgimpwidgets/gimpcolorbutton.c:121
 msgid "_Background Color"
 msgstr "è??æ?¯è?²(_B)"
 
-#: ../libgimpwidgets/gimpcolorbutton.c:126
+#: ../libgimpwidgets/gimpcolorbutton.c:125
 msgid "Blac_k"
 msgstr "é»?(_K)"
 
-#: ../libgimpwidgets/gimpcolorbutton.c:130
+#: ../libgimpwidgets/gimpcolorbutton.c:129
 msgid "_White"
 msgstr "ç?½(_W)"
 
-#: ../libgimpwidgets/gimpcolorprofilestore.c:144
+#: ../libgimpwidgets/gimpcolorprofilestore.c:143
 msgid "Select color profile from disk..."
 msgstr "ä»?ç£?ç??é??æ?©è?²å½©é??ç½®æ??件..."
 
-#: ../libgimpwidgets/gimpcolorprofilestore.c:280
-#, fuzzy
+#: ../libgimpwidgets/gimpcolorprofilestore.c:279
 msgctxt "profile"
 msgid "None"
 msgstr "æ? "
 
-#: ../libgimpwidgets/gimpcolorscales.c:98
+#: ../libgimpwidgets/gimpcolorscales.c:97
 msgid "Scales"
 msgstr "缩�"
 
-#: ../libgimpwidgets/gimpcolorselection.c:210
+#: ../libgimpwidgets/gimpcolorselection.c:209
 msgid "Current:"
 msgstr "å½?å??ï¼?"
 
-#: ../libgimpwidgets/gimpcolorselection.c:232
+#: ../libgimpwidgets/gimpcolorselection.c:231
 msgid "Old:"
 msgstr "æ?§ç??ï¼?"
 
-#: ../libgimpwidgets/gimpcolorselection.c:286
+#: ../libgimpwidgets/gimpcolorselection.c:285
 msgid ""
 "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
 "CSS color names."
 msgstr "HTML å?? CSS 中æ??使ç?¨ç??å??å?­è¿?å?¶é¢?è?²æ ¼å¼?ã??æ­¤å¤?ä¹?å??许使ç?¨ CSS è?²å½©å??ã??"
 
-#: ../libgimpwidgets/gimpcolorselection.c:292
+#: ../libgimpwidgets/gimpcolorselection.c:291
 msgid "HTML _notation:"
 msgstr "HTML 格�(_N)�"
 
-#: ../libgimpwidgets/gimphelpui.c:420
-msgid "Press F1 for more help"
-msgstr "æ?? F1 以è?·å¾?æ?´å¤?帮å?©"
-
-#: ../libgimpwidgets/gimpfileentry.c:174
+#: ../libgimpwidgets/gimpfileentry.c:173
 msgid "Open a file selector to browse your folders"
 msgstr "æ??å¼?ä¸?个æ??件é??æ?©å?¨ä»¥æµ?è§?æ?¨ç??æ??件夹"
 
-#: ../libgimpwidgets/gimpfileentry.c:175
+#: ../libgimpwidgets/gimpfileentry.c:174
 msgid "Open a file selector to browse your files"
 msgstr "æ??å¼?ä¸?个æ??件é??æ?©å?¨ä»¥æµ?è§?æ?¨ç??æ??件"
 
-#: ../libgimpwidgets/gimpfileentry.c:335
+#: ../libgimpwidgets/gimpfileentry.c:334
 msgid "Select Folder"
 msgstr "é??æ?©æ??件夹"
 
-#: ../libgimpwidgets/gimpfileentry.c:337
+#: ../libgimpwidgets/gimpfileentry.c:336
 msgid "Select File"
 msgstr "é??æ?©æ??件"
 
-#: ../libgimpwidgets/gimpmemsizeentry.c:204
+#: ../libgimpwidgets/gimphelpui.c:419
+msgid "Press F1 for more help"
+msgstr "æ?? F1 以è?·å¾?æ?´å¤?帮å?©"
+
+#: ../libgimpwidgets/gimpmemsizeentry.c:205
 msgid "Kilobytes"
 msgstr "KB"
 
-#: ../libgimpwidgets/gimpmemsizeentry.c:205
+#: ../libgimpwidgets/gimpmemsizeentry.c:206
 msgid "Megabytes"
 msgstr "MB"
 
-#: ../libgimpwidgets/gimpmemsizeentry.c:206
+#: ../libgimpwidgets/gimpmemsizeentry.c:207
 msgid "Gigabytes"
 msgstr "GB"
 
 #. Count label
-#: ../libgimpwidgets/gimppageselector.c:269
-#: ../libgimpwidgets/gimppageselector.c:1166
+#: ../libgimpwidgets/gimppageselector.c:268
+#: ../libgimpwidgets/gimppageselector.c:1165
 msgid "Nothing selected"
 msgstr "æ?ªé??中"
 
-#: ../libgimpwidgets/gimppageselector.c:287
+#: ../libgimpwidgets/gimppageselector.c:286
 msgid "Select _All"
 msgstr "å?¨é?¨é??中(_A)"
 
-#: ../libgimpwidgets/gimppageselector.c:307
+#: ../libgimpwidgets/gimppageselector.c:306
 msgid "Select _range:"
 msgstr "é??æ?©è??å?´(_R)ï¼?"
 
-#: ../libgimpwidgets/gimppageselector.c:319
+#: ../libgimpwidgets/gimppageselector.c:318
 msgid "Open _pages as"
 msgstr "æ??å¼?页é?¢ä¸º(_P)..."
 
-#: ../libgimpwidgets/gimppageselector.c:420
+#: ../libgimpwidgets/gimppageselector.c:419
 msgid "Page 000"
 msgstr "第 000 页"
 
-#: ../libgimpwidgets/gimppageselector.c:508
-#: ../libgimpwidgets/gimppageselector.c:744
+#: ../libgimpwidgets/gimppageselector.c:507
+#: ../libgimpwidgets/gimppageselector.c:743
 #, c-format
 msgid "Page %d"
 msgstr "第 %d 页"
 
-#: ../libgimpwidgets/gimppageselector.c:1171
+#: ../libgimpwidgets/gimppageselector.c:1170
 msgid "One page selected"
 msgstr "å·²é??中ä¸?页"
 
-#: ../libgimpwidgets/gimppageselector.c:1178
-#: ../libgimpwidgets/gimppageselector.c:1182
-#, fuzzy, c-format
+#: ../libgimpwidgets/gimppageselector.c:1177
+#: ../libgimpwidgets/gimppageselector.c:1181
+#, c-format
 msgid "%d page selected"
 msgid_plural "All %d pages selected"
 msgstr[0] "å·²é??中 %d 页"
-msgstr[1] "å·²é??中 %d 页"
 
-#: ../libgimpwidgets/gimppatheditor.c:214
+#: ../libgimpwidgets/gimppatheditor.c:213
 msgid "Writable"
 msgstr "å?¯å??"
 
-#: ../libgimpwidgets/gimppatheditor.c:223
+#: ../libgimpwidgets/gimppatheditor.c:222
 msgid "Folder"
 msgstr "æ??件夹"
 
-#: ../libgimpwidgets/gimppickbutton.c:107
+#: ../libgimpwidgets/gimppickbutton.c:106
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
 msgstr "ç?¹å?»æ»´ç®¡ï¼?ç?¶å??ç?¹å?»æ?¨ç??å±?å¹?ä¸?ä»»ä½?ä½?ç½®ç??é¢?è?²å?³å?¯é??å??该é¢?è?²ã??"
 
-#: ../libgimpwidgets/gimppreviewarea.c:94
+#. toggle button to (de)activate the instant preview
+#: ../libgimpwidgets/gimppreview.c:276
+msgid "_Preview"
+msgstr "��(_P)"
+
+#: ../libgimpwidgets/gimppreviewarea.c:93
 msgid "Check Size"
 msgstr "�格大�"
 
-#: ../libgimpwidgets/gimppreviewarea.c:101
+#: ../libgimpwidgets/gimppreviewarea.c:100
 msgid "Check Style"
 msgstr "�格�格"
 
-#. toggle button to (de)activate the instant preview
-#: ../libgimpwidgets/gimppreview.c:277
-msgid "_Preview"
-msgstr "��(_P)"
-
-#: ../libgimpwidgets/gimppropwidgets.c:1860
-#, fuzzy, c-format
+#: ../libgimpwidgets/gimppropwidgets.c:1859
+#, c-format
 msgid "This text input field is limited to %d character."
 msgid_plural "This text input field is limited to %d characters."
-msgstr[0] "æ­¤æ??æ?¬è¾?å?¥æ¡?é??å?¶ä¸º %d 个å­?符ã??"
-msgstr[1] "æ­¤æ??æ?¬è¾?å?¥æ¡?é??å?¶ä¸º %d 个å­?符ã??"
+msgstr[0] "æ­¤æ??æ?¬è¾?å?¥å?ºå??é??å?¶ä¸º %d 个å­?符ã??"
 
-#: ../libgimpwidgets/gimpstock.c:112
+#: ../libgimpwidgets/gimpstock.c:111
 msgid "Anchor"
 msgstr "��"
 
-#: ../libgimpwidgets/gimpstock.c:113
+#: ../libgimpwidgets/gimpstock.c:112
 msgid "C_enter"
 msgstr "�中(_E)"
 
-#: ../libgimpwidgets/gimpstock.c:114
+#: ../libgimpwidgets/gimpstock.c:113
 msgid "_Duplicate"
 msgstr "��(_D)"
 
-#: ../libgimpwidgets/gimpstock.c:115
+#: ../libgimpwidgets/gimpstock.c:114
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
-#: ../libgimpwidgets/gimpstock.c:116
+#: ../libgimpwidgets/gimpstock.c:115
 msgid "Linked"
 msgstr "已��"
 
-#: ../libgimpwidgets/gimpstock.c:117
+#: ../libgimpwidgets/gimpstock.c:116
 msgid "Paste as New"
 msgstr "ç²?贴为æ?°å?¾å??"
 
-#: ../libgimpwidgets/gimpstock.c:118
+#: ../libgimpwidgets/gimpstock.c:117
 msgid "Paste Into"
 msgstr "ç²?è´´è¿?å?¥"
 
-#: ../libgimpwidgets/gimpstock.c:119
+#: ../libgimpwidgets/gimpstock.c:118
 msgid "_Reset"
 msgstr "é??ç½®(_R)"
 
-#: ../libgimpwidgets/gimpstock.c:120
+#: ../libgimpwidgets/gimpstock.c:119
 msgid "Visible"
 msgstr "��"
 
-#: ../libgimpwidgets/gimpstock.c:156 ../libgimpwidgets/gimpstock.c:160
+#: ../libgimpwidgets/gimpstock.c:155 ../libgimpwidgets/gimpstock.c:159
 msgid "_Stroke"
 msgstr "��(_S)"
 
-#: ../libgimpwidgets/gimpstock.c:172
+#: ../libgimpwidgets/gimpstock.c:171
 msgid "L_etter Spacing"
 msgstr "����(_E)"
 
-#: ../libgimpwidgets/gimpstock.c:173
+#: ../libgimpwidgets/gimpstock.c:172
 msgid "L_ine Spacing"
 msgstr "è¡?è·?(_I)"
 
-#: ../libgimpwidgets/gimpstock.c:189
+#: ../libgimpwidgets/gimpstock.c:188
 msgid "_Resize"
 msgstr "æ?¹å??大å°?(_R)"
 
-#: ../libgimpwidgets/gimpstock.c:190 ../libgimpwidgets/gimpstock.c:320
+#: ../libgimpwidgets/gimpstock.c:189 ../libgimpwidgets/gimpstock.c:319
 msgid "_Scale"
 msgstr "缩�(_S)"
 
-#: ../libgimpwidgets/gimpstock.c:296
+#: ../libgimpwidgets/gimpstock.c:295
 msgid "Cr_op"
 msgstr "��(_O)"
 
-#: ../libgimpwidgets/gimpstock.c:315
+#: ../libgimpwidgets/gimpstock.c:314
 msgid "_Transform"
 msgstr "å??æ?¢(_T)"
 
-#: ../libgimpwidgets/gimpstock.c:319
+#: ../libgimpwidgets/gimpstock.c:318
 msgid "_Rotate"
 msgstr "æ??转(_R)"
 
-#: ../libgimpwidgets/gimpstock.c:321
+#: ../libgimpwidgets/gimpstock.c:320
 msgid "_Shear"
 msgstr "å??å??(_S)"
 
-#: ../libgimpwidgets/gimpunitmenu.c:266
+#: ../libgimpwidgets/gimpunitmenu.c:265
 msgid "More..."
 msgstr "��..."
 
-#: ../libgimpwidgets/gimpunitmenu.c:581
+#: ../libgimpwidgets/gimpunitmenu.c:580
 msgid "Unit Selection"
 msgstr "å??ä½?é??æ?©"
 
-#: ../libgimpwidgets/gimpunitmenu.c:629
+#: ../libgimpwidgets/gimpunitmenu.c:628
 msgid "Unit"
 msgstr "å??ä½?"
 
-#: ../libgimpwidgets/gimpunitmenu.c:633
+#: ../libgimpwidgets/gimpunitmenu.c:632
 msgid "Factor"
 msgstr "å? å­?"
 
-#: ../libgimpwidgets/gimpwidgets.c:511
+#: ../libgimpwidgets/gimpwidgets.c:510
 msgid ""
 "Use this value for random number generator seed - this allows you to repeat "
 "a given \"random\" operation"
 msgstr "使ç?¨è¿?个å?¼ä½?为é??æ?ºæ?°ç??æ??ç§?å­? - è¿?å°?å??许æ?¨é??å¤?ä¸?个æ??å®?ç??â??é??æ?ºâ??æ??ä½?"
 
-#: ../libgimpwidgets/gimpwidgets.c:515
+#: ../libgimpwidgets/gimpwidgets.c:514
 msgid "_New Seed"
 msgstr "���(_N)"
 
-#: ../libgimpwidgets/gimpwidgets.c:528
+#: ../libgimpwidgets/gimpwidgets.c:527
 msgid "Seed random number generator with a generated random number"
 msgstr "以ç??æ??ç??é??æ?ºæ?°ä½?为é??æ?ºæ?°ç??æ??å?¨ç??ç§?å­?"
 
-#: ../libgimpwidgets/gimpwidgets.c:532
+#: ../libgimpwidgets/gimpwidgets.c:531
 msgid "_Randomize"
 msgstr "é??æ?º(_R)"
 
+#: ../libgimpwidgets/gimpwidgetsenums.c:24
+msgctxt "aspect-type"
+msgid "Square"
+msgstr "正�形"
+
 #: ../libgimpwidgets/gimpwidgetsenums.c:25
+msgctxt "aspect-type"
 msgid "Portrait"
 msgstr "纵å??"
 
 #: ../libgimpwidgets/gimpwidgetsenums.c:26
+msgctxt "aspect-type"
 msgid "Landscape"
 msgstr "横å??"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:123
-#, fuzzy
+#: ../libgimpwidgets/gimpwidgetsenums.c:126
+msgctxt "color-selector-channel"
 msgid "_H"
-msgstr "��(_H)"
+msgstr "_H"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:123
+#: ../libgimpwidgets/gimpwidgetsenums.c:126
 msgid "Hue"
 msgstr "��"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:124
-#, fuzzy
+#: ../libgimpwidgets/gimpwidgetsenums.c:127
+msgctxt "color-selector-channel"
 msgid "_S"
-msgstr "饱å??度(_S)"
+msgstr "_S"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:124
+#: ../libgimpwidgets/gimpwidgetsenums.c:127
 msgid "Saturation"
 msgstr "饱å??度"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:125
-#, fuzzy
+#: ../libgimpwidgets/gimpwidgetsenums.c:128
+msgctxt "color-selector-channel"
 msgid "_V"
-msgstr "亮度(_V)"
+msgstr "_V"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:125
-#, fuzzy
+#: ../libgimpwidgets/gimpwidgetsenums.c:128
 msgid "Value"
 msgstr "亮度"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:126
-#, fuzzy
+#: ../libgimpwidgets/gimpwidgetsenums.c:129
+msgctxt "color-selector-channel"
 msgid "_R"
-msgstr "红(_R)"
+msgstr "_R"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:127
-#, fuzzy
+#: ../libgimpwidgets/gimpwidgetsenums.c:129
+msgid "Red"
+msgstr "红�"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:130
+msgctxt "color-selector-channel"
 msgid "_G"
-msgstr "绿(_G)"
+msgstr "_G"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:128
-#, fuzzy
+#: ../libgimpwidgets/gimpwidgetsenums.c:130
+msgid "Green"
+msgstr "绿�"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:131
+msgctxt "color-selector-channel"
 msgid "_B"
-msgstr "è??(_B)"
+msgstr "_B"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:129
-#, fuzzy
+#: ../libgimpwidgets/gimpwidgetsenums.c:131
+msgid "Blue"
+msgstr "è??è?²"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:132
+msgctxt "color-selector-channel"
 msgid "_A"
 msgstr "_A"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:157
+#: ../libgimpwidgets/gimpwidgetsenums.c:132
+msgid "Alpha"
+msgstr "Alpha"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:161
+msgctxt "page-selector-target"
 msgid "Layers"
 msgstr "��"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:158
+#: ../libgimpwidgets/gimpwidgetsenums.c:162
+msgctxt "page-selector-target"
 msgid "Images"
 msgstr "å?¾å??"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:217
+#: ../libgimpwidgets/gimpwidgetsenums.c:223
+msgctxt "zoom-type"
 msgid "Zoom in"
 msgstr "�大"
 
-#: ../libgimpwidgets/gimpwidgetsenums.c:218
+#: ../libgimpwidgets/gimpwidgetsenums.c:224
+msgctxt "zoom-type"
 msgid "Zoom out"
 msgstr "缩�"
 
-#: ../modules/display-filter-color-blind.c:67
-msgid "Protanopia (insensitivity to red)"
-msgstr "红è?²ç?²(对红è?²ä¸?æ??æ??)"
-
-#: ../modules/display-filter-color-blind.c:69
-msgid "Deuteranopia (insensitivity to green)"
-msgstr "绿è?²ç?²(对绿è?²ä¸?æ??æ??)"
-
-#: ../modules/display-filter-color-blind.c:71
-msgid "Tritanopia (insensitivity to blue)"
-msgstr "è??è?²ç?²(对è??è?²ä¸?æ??æ??)"
-
-#: ../modules/display-filter-color-blind.c:198
-msgid "Color deficit simulation filter (Brettel-Vienot-Mollon algorithm)"
-msgstr "è?²å½©ç¼ºå¤±æ¨¡æ??滤é??(Brettel-Vienot-Mollon ç®?æ³?)"
-
-#: ../modules/display-filter-color-blind.c:261
-msgid "Color Deficient Vision"
-msgstr "���彩缺失"
-
-#: ../modules/display-filter-color-blind.c:483
-msgid "Color _deficiency type:"
-msgstr "è?²å½©ç¼ºå¤±ç±»å??(_D)ï¼?"
-
-#: ../modules/display-filter-gamma.c:90
-msgid "Gamma color display filter"
-msgstr "Gamma é¢?è?²æ?¾ç¤ºæ»¤é??"
-
-#: ../modules/display-filter-gamma.c:129
-msgid "Gamma"
-msgstr "Gamma"
-
-#: ../modules/display-filter-gamma.c:232
-msgid "_Gamma:"
-msgstr "Gamma(_G)ï¼?"
-
-#: ../modules/display-filter-high-contrast.c:90
-msgid "High Contrast color display filter"
-msgstr "é«?对æ¯?度é¢?è?²æ?¾ç¤ºæ»¤é??"
-
-#: ../modules/display-filter-high-contrast.c:129
-msgid "Contrast"
-msgstr "对�度"
-
-#: ../modules/display-filter-high-contrast.c:232
-msgid "Contrast c_ycles:"
-msgstr "对�循�(_Y)�"
-
-#: ../modules/display-filter-lcms.c:102
-msgid "Color management display filter using ICC color profiles"
-msgstr "使ç?¨ ICC é¢?è?²é??ç½®æ??件ç??é¢?è?²æ ¡å¯¹æ»¤é??"
-
-#: ../modules/display-filter-lcms.c:134
-msgid "Color Management"
-msgstr "é¢?è?²ç®¡ç??"
-
-#: ../modules/display-filter-lcms.c:212
-msgid ""
-"This filter takes its configuration from the Color Management section in the "
-"Preferences dialog."
-msgstr "此滤é??ä»?é¦?é??项对è¯?项中ç??è?²å½©ç®¡ç??é?¨å??è?·å¾?å?¶é??ç½®ã??"
-
-#: ../modules/display-filter-lcms.c:226
-msgid "Mode of operation:"
-msgstr "æ??ä½?模å¼?ï¼?"
-
-#: ../modules/display-filter-lcms.c:233
-msgid "Image profile:"
-msgstr "å?¾å??é??ç½®æ??件"
-
-#: ../modules/display-filter-lcms.c:241
-msgid "Monitor profile:"
-msgstr "æ?¾ç¤ºå?¨é??ç½®æ??件ï¼?"
-
-#: ../modules/display-filter-lcms.c:249
-msgid "Print simulation profile:"
-msgstr "æ??å?°æ¨¡æ??é??ç½®æ??件ï¼?"
-
-#: ../modules/display-filter-proof.c:97
-msgid "Color proof filter using ICC color profile"
-msgstr "使ç?¨ ICC é¢?è?²é??ç½®æ??件ç??é¢?è?²æ ¡å¯¹æ»¤é??"
-
-#: ../modules/display-filter-proof.c:145
-msgid "Color Proof"
-msgstr "��校对"
-
-#: ../modules/display-filter-proof.c:311
-msgid "Choose an ICC Color Profile"
-msgstr "é??æ?© ICC é¢?è?²é??ç½®æ??件"
-
-#: ../modules/display-filter-proof.c:338
-msgid "All files (*.*)"
-msgstr "æ??æ??æ??件(*.*)"
-
-#: ../modules/display-filter-proof.c:343
-msgid "ICC color profile (*.icc, *.icm)"
-msgstr "ICCè?²å½©é??ç½®æ??件(*.icc, *.icm)"
-
-#: ../modules/display-filter-proof.c:401
-msgid "_Profile:"
-msgstr "é??ç½®æ??件(_P)ï¼?"
-
-#: ../modules/display-filter-proof.c:407
-msgid "_Intent:"
-msgstr "��(_I)�"
-
-#: ../modules/display-filter-proof.c:412
-msgid "_Black Point Compensation"
-msgstr "��补�(_B)"
-
-#: ../modules/color-selector-cmyk.c:71
-msgid "CMYK color selector"
-msgstr "CMYK é¢?è?²é??æ?©å?¨"
+#: ../modules/color-selector-cmyk-lcms.c:86
+msgid "CMYK color selector (using color profile)"
+msgstr "CMYK é¢?è?²é??æ?©å?¨(使ç?¨é¢?è?²é??ç½®æ??件)"
 
-#: ../modules/color-selector-cmyk.c:102
-#: ../modules/color-selector-cmyk-lcms.c:150
+#: ../modules/color-selector-cmyk-lcms.c:149
+#: ../modules/color-selector-cmyk.c:101
 msgid "CMYK"
 msgstr "CMYK"
 
 #. Cyan
-#: ../modules/color-selector-cmyk.c:125
-#: ../modules/color-selector-cmyk-lcms.c:169
-#, fuzzy
+#: ../modules/color-selector-cmyk-lcms.c:168
+#: ../modules/color-selector-cmyk.c:124
 msgid "_C"
-msgstr "é??(_C)"
+msgstr "_C"
 
 #. Magenta
-#: ../modules/color-selector-cmyk.c:127
-#: ../modules/color-selector-cmyk-lcms.c:171
-#, fuzzy
+#: ../modules/color-selector-cmyk-lcms.c:170
+#: ../modules/color-selector-cmyk.c:126
 msgid "_M"
-msgstr "红(_M)"
+msgstr "_M"
 
 #. Yellow
-#: ../modules/color-selector-cmyk.c:129
-#: ../modules/color-selector-cmyk-lcms.c:173
-#, fuzzy
+#: ../modules/color-selector-cmyk-lcms.c:172
+#: ../modules/color-selector-cmyk.c:128
 msgid "_Y"
-msgstr "é»?(_Y)"
+msgstr "_Y"
 
 #. Key (Black)
-#: ../modules/color-selector-cmyk.c:131
-#: ../modules/color-selector-cmyk-lcms.c:175
-#, fuzzy
+#: ../modules/color-selector-cmyk-lcms.c:174
+#: ../modules/color-selector-cmyk.c:130
 msgid "_K"
-msgstr "é»?(_K)"
+msgstr "_K"
 
-#: ../modules/color-selector-cmyk.c:135
-#: ../modules/color-selector-cmyk-lcms.c:179
+#: ../modules/color-selector-cmyk-lcms.c:178
+#: ../modules/color-selector-cmyk.c:134
 msgid "Cyan"
 msgstr "é??è?²"
 
-#: ../modules/color-selector-cmyk.c:136
-#: ../modules/color-selector-cmyk-lcms.c:180
+#: ../modules/color-selector-cmyk-lcms.c:179
+#: ../modules/color-selector-cmyk.c:135
 msgid "Magenta"
 msgstr "å??红"
 
-#: ../modules/color-selector-cmyk.c:137
-#: ../modules/color-selector-cmyk-lcms.c:181
+#: ../modules/color-selector-cmyk-lcms.c:180
+#: ../modules/color-selector-cmyk.c:136
 msgid "Yellow"
 msgstr "é»?è?²"
 
-#: ../modules/color-selector-cmyk.c:138
-#: ../modules/color-selector-cmyk-lcms.c:182
+#: ../modules/color-selector-cmyk-lcms.c:181
+#: ../modules/color-selector-cmyk.c:137
 msgid "Black"
 msgstr "é»?è?²"
 
-#: ../modules/color-selector-cmyk.c:172
-msgid "Black _pullout:"
-msgstr "é»?è?²é??(_P)ï¼?"
-
-#: ../modules/color-selector-cmyk.c:189
-msgid "The percentage of black to pull out of the colored inks."
-msgstr "彩è?²å¢¨æ°´ä¸­é»?è?²æ??å? ç??ç?¾å??æ¯?ã??"
-
-#: ../modules/color-selector-cmyk-lcms.c:87
-msgid "CMYK color selector (using color profile)"
-msgstr "CMYK é¢?è?²é??æ?©å?¨(使ç?¨é¢?è?²é??ç½®æ??件)"
-
-#: ../modules/color-selector-cmyk-lcms.c:395
+#: ../modules/color-selector-cmyk-lcms.c:394
 msgid "Profile: (none)"
 msgstr "é??ç½®æ??件ï¼?(æ? )"
 
-#: ../modules/color-selector-cmyk-lcms.c:416
+#: ../modules/color-selector-cmyk-lcms.c:415
 #, c-format
 msgid "Profile: %s"
 msgstr "é??ç½®æ??件ï¼?%s"
 
-#: ../modules/color-selector-water.c:82
+#: ../modules/color-selector-cmyk.c:70
+msgid "CMYK color selector"
+msgstr "CMYK é¢?è?²é??æ?©å?¨"
+
+#: ../modules/color-selector-cmyk.c:171
+msgid "Black _pullout:"
+msgstr "é»?è?²é??(_P)ï¼?"
+
+#: ../modules/color-selector-cmyk.c:188
+msgid "The percentage of black to pull out of the colored inks."
+msgstr "彩è?²å¢¨æ°´ä¸­é»?è?²æ??å? ç??ç?¾å??æ¯?ã??"
+
+#: ../modules/color-selector-water.c:81
 msgid "Watercolor style color selector"
 msgstr "水彩é£?æ ¼ç??é¢?è?²é??æ?©å?¨"
 
-#: ../modules/color-selector-water.c:118
+#: ../modules/color-selector-water.c:117
 msgid "Watercolor"
 msgstr "水彩"
 
-#: ../modules/color-selector-water.c:186
+#: ../modules/color-selector-water.c:185
 msgid "Pressure"
 msgstr "å??å??"
 
-#: ../modules/color-selector-wheel.c:103
+#: ../modules/color-selector-wheel.c:74
 msgid "HSV color wheel"
 msgstr "HSV �轮"
 
-#: ../modules/color-selector-wheel.c:134
+#: ../modules/color-selector-wheel.c:105
 msgid "Wheel"
 msgstr "è½®"
 
-#: ../modules/controller-linux-input.c:58
+#: ../modules/controller-dx-dinput.c:155
+msgid "DirectX DirectInput event controller"
+msgstr "DirectX DirectInput �件���"
+
+#: ../modules/controller-dx-dinput.c:195
+#: ../modules/controller-linux-input.c:217 ../modules/controller-midi.c:211
+msgid "Device:"
+msgstr "设��"
+
+#: ../modules/controller-dx-dinput.c:196
+msgid "The device to read DirectInput events from."
+msgstr "è¦?读å?? DirectInput äº?件ç??设å¤?ã??"
+
+#: ../modules/controller-dx-dinput.c:205
+msgid "DirectX DirectInput"
+msgstr "DirectX DirectInput"
+
+#: ../modules/controller-dx-dinput.c:419
+#, c-format
+msgid "Button %d"
+msgstr "æ??é?® %d"
+
+#: ../modules/controller-dx-dinput.c:422
+#, c-format
+msgid "Button %d Press"
+msgstr "æ??é?® %d æ??ä¸?"
+
+#: ../modules/controller-dx-dinput.c:425
+#, c-format
+msgid "Button %d Release"
+msgstr "æ??é?® %d é??æ?¾"
+
+#: ../modules/controller-dx-dinput.c:442
+#: ../modules/controller-linux-input.c:89
+msgid "X Move Left"
+msgstr "X 左移"
+
+#: ../modules/controller-dx-dinput.c:445
+#: ../modules/controller-linux-input.c:90
+msgid "X Move Right"
+msgstr "X �移"
+
+#: ../modules/controller-dx-dinput.c:451
+msgid "Y Move Away"
+msgstr "Y 移�"
+
+#: ../modules/controller-dx-dinput.c:454
+msgid "Y Move Near"
+msgstr "Y 移�"
+
+#: ../modules/controller-dx-dinput.c:460
+#: ../modules/controller-linux-input.c:93
+msgid "Z Move Up"
+msgstr "Z �移"
+
+#: ../modules/controller-dx-dinput.c:463
+#: ../modules/controller-linux-input.c:94
+msgid "Z Move Down"
+msgstr "Z �移"
+
+#: ../modules/controller-dx-dinput.c:469
+msgid "X Axis Tilt Away"
+msgstr "X 轴��"
+
+#: ../modules/controller-dx-dinput.c:472
+msgid "X Axis Tilt Near"
+msgstr "X è½´æ??è¿?"
+
+#: ../modules/controller-dx-dinput.c:478
+#: ../modules/controller-linux-input.c:98
+msgid "Y Axis Tilt Right"
+msgstr "Y è½´å??å?³æ??å?¨"
+
+#: ../modules/controller-dx-dinput.c:481
+#: ../modules/controller-linux-input.c:99
+msgid "Y Axis Tilt Left"
+msgstr "Y è½´å??å·¦æ??å?¨"
+
+#: ../modules/controller-dx-dinput.c:487
+#: ../modules/controller-linux-input.c:100
+msgid "Z Axis Turn Left"
+msgstr "Z è½´å??左转"
+
+#: ../modules/controller-dx-dinput.c:490
+#: ../modules/controller-linux-input.c:101
+msgid "Z Axis Turn Right"
+msgstr "Z è½´å??å?³è½¬"
+
+#: ../modules/controller-dx-dinput.c:501
+#, c-format
+msgid "Slider %d Increase"
+msgstr "æ»?å?? %d å¢?å? "
+
+#: ../modules/controller-dx-dinput.c:504
+#, c-format
+msgid "Slider %d Decrease"
+msgstr "æ»?å?? %d å??å°?"
+
+#: ../modules/controller-dx-dinput.c:514
+#, c-format
+msgid "POV %d X View"
+msgstr "POV %d X ��"
+
+#: ../modules/controller-dx-dinput.c:517
+#, c-format
+msgid "POV %d Y View"
+msgstr "POV %d Y ��"
+
+#: ../modules/controller-dx-dinput.c:520
+#, c-format
+msgid "POV %d Return"
+msgstr "POV %d è¿?å??"
+
+#: ../modules/controller-dx-dinput.c:1083
+msgid "DirectInput Events"
+msgstr "DirectInput �件"
+
+#: ../modules/controller-dx-dinput.c:1094
+#: ../modules/controller-linux-input.c:524 ../modules/controller-midi.c:504
+msgid "No device configured"
+msgstr "æ?ªé??置设å¤?"
+
+#: ../modules/controller-dx-dinput.c:1119
+#: ../modules/controller-linux-input.c:587
+msgid "Device not available"
+msgstr "设����"
+
+#: ../modules/controller-linux-input.c:57
 msgid "Button 0"
 msgstr "æ??é?® 0"
 
-#: ../modules/controller-linux-input.c:59
+#: ../modules/controller-linux-input.c:58
 msgid "Button 1"
 msgstr "æ??é?® 1"
 
-#: ../modules/controller-linux-input.c:60
+#: ../modules/controller-linux-input.c:59
 msgid "Button 2"
 msgstr "æ??é?® 2"
 
-#: ../modules/controller-linux-input.c:61
+#: ../modules/controller-linux-input.c:60
 msgid "Button 3"
 msgstr "æ??é?® 3"
 
-#: ../modules/controller-linux-input.c:62
+#: ../modules/controller-linux-input.c:61
 msgid "Button 4"
 msgstr "æ??é?® 4"
 
-#: ../modules/controller-linux-input.c:63
+#: ../modules/controller-linux-input.c:62
 msgid "Button 5"
 msgstr "æ??é?® 5"
 
-#: ../modules/controller-linux-input.c:64
+#: ../modules/controller-linux-input.c:63
 msgid "Button 6"
 msgstr "æ??é?® 6"
 
-#: ../modules/controller-linux-input.c:65
+#: ../modules/controller-linux-input.c:64
 msgid "Button 7"
 msgstr "æ??é?® 7"
 
-#: ../modules/controller-linux-input.c:66
+#: ../modules/controller-linux-input.c:65
 msgid "Button 8"
 msgstr "æ??é?® 8"
 
-#: ../modules/controller-linux-input.c:67
+#: ../modules/controller-linux-input.c:66
 msgid "Button 9"
 msgstr "æ??é?® 9"
 
-#: ../modules/controller-linux-input.c:68
+#: ../modules/controller-linux-input.c:67
 msgid "Button Mouse"
 msgstr "é¼ æ ?æ??é?®"
 
-#: ../modules/controller-linux-input.c:69
+#: ../modules/controller-linux-input.c:68
 msgid "Button Left"
 msgstr "左�"
 
-#: ../modules/controller-linux-input.c:70
+#: ../modules/controller-linux-input.c:69
 msgid "Button Right"
 msgstr "��"
 
-#: ../modules/controller-linux-input.c:71
+#: ../modules/controller-linux-input.c:70
 msgid "Button Middle"
 msgstr "中�"
 
-#: ../modules/controller-linux-input.c:72
+#: ../modules/controller-linux-input.c:71
 msgid "Button Side"
 msgstr "侧�"
 
-#: ../modules/controller-linux-input.c:73
+#: ../modules/controller-linux-input.c:72
 msgid "Button Extra"
 msgstr "���"
 
-#: ../modules/controller-linux-input.c:74
+#: ../modules/controller-linux-input.c:73
 msgid "Button Forward"
 msgstr "å??è¿?æ??é?®"
 
-#: ../modules/controller-linux-input.c:75
+#: ../modules/controller-linux-input.c:74
 msgid "Button Back"
 msgstr "å??é??æ??é?®"
 
-#: ../modules/controller-linux-input.c:76
+#: ../modules/controller-linux-input.c:75
 msgid "Button Task"
 msgstr "ä»»å?¡æ??é?®"
 
-#: ../modules/controller-linux-input.c:78
+#: ../modules/controller-linux-input.c:77
 msgid "Button Wheel"
 msgstr "æ?¶é©¶ç??æ??é?®"
 
-#: ../modules/controller-linux-input.c:81
+#: ../modules/controller-linux-input.c:80
 msgid "Button Gear Down"
 msgstr "å? é??æ¡£æ??é?®"
 
-#: ../modules/controller-linux-input.c:84
+#: ../modules/controller-linux-input.c:83
 msgid "Button Gear Up"
 msgstr "å??é??æ¡£æ??é?®"
 
-#: ../modules/controller-linux-input.c:90
-#: ../modules/controller-dx-dinput.c:443
-msgid "X Move Left"
-msgstr "X 左移"
-
 #: ../modules/controller-linux-input.c:91
-#: ../modules/controller-dx-dinput.c:446
-msgid "X Move Right"
-msgstr "X �移"
-
-#: ../modules/controller-linux-input.c:92
 msgid "Y Move Forward"
 msgstr "Y å??移"
 
-#: ../modules/controller-linux-input.c:93
+#: ../modules/controller-linux-input.c:92
 msgid "Y Move Back"
 msgstr "Y å??移"
 
-#: ../modules/controller-linux-input.c:94
-#: ../modules/controller-dx-dinput.c:461
-msgid "Z Move Up"
-msgstr "Z �移"
-
-#: ../modules/controller-linux-input.c:95
-#: ../modules/controller-dx-dinput.c:464
-msgid "Z Move Down"
-msgstr "Z �移"
-
-#: ../modules/controller-linux-input.c:97
+#: ../modules/controller-linux-input.c:96
 msgid "X Axis Tilt Forward"
 msgstr "X è½´å??å??æ??å?¨"
 
-#: ../modules/controller-linux-input.c:98
+#: ../modules/controller-linux-input.c:97
 msgid "X Axis Tilt Back"
 msgstr "X è½´å??å??æ??å?¨"
 
-#: ../modules/controller-linux-input.c:99
-#: ../modules/controller-dx-dinput.c:479
-msgid "Y Axis Tilt Right"
-msgstr "Y è½´å??å?³æ??å?¨"
-
-#: ../modules/controller-linux-input.c:100
-#: ../modules/controller-dx-dinput.c:482
-msgid "Y Axis Tilt Left"
-msgstr "Y è½´å??å·¦æ??å?¨"
-
-#: ../modules/controller-linux-input.c:101
-#: ../modules/controller-dx-dinput.c:488
-msgid "Z Axis Turn Left"
-msgstr "Z è½´å??左转"
-
-#: ../modules/controller-linux-input.c:102
-#: ../modules/controller-dx-dinput.c:491
-msgid "Z Axis Turn Right"
-msgstr "Z è½´å??å?³è½¬"
-
-#: ../modules/controller-linux-input.c:104
+#: ../modules/controller-linux-input.c:103
 msgid "Horiz. Wheel Turn Back"
 msgstr "水平轮å??å??转"
 
-#: ../modules/controller-linux-input.c:105
+#: ../modules/controller-linux-input.c:104
 msgid "Horiz. Wheel Turn Forward"
 msgstr "水平轮å??å??转"
 
-#: ../modules/controller-linux-input.c:106
+#: ../modules/controller-linux-input.c:105
 msgid "Dial Turn Left"
 msgstr "表ç??å??左转"
 
-#: ../modules/controller-linux-input.c:107
+#: ../modules/controller-linux-input.c:106
 msgid "Dial Turn Right"
 msgstr "表ç??å??å?³è½¬"
 
-#: ../modules/controller-linux-input.c:108
+#: ../modules/controller-linux-input.c:107
 msgid "Wheel Turn Left"
 msgstr "è½®å??å??左转"
 
-#: ../modules/controller-linux-input.c:109
+#: ../modules/controller-linux-input.c:108
 msgid "Wheel Turn Right"
 msgstr "è½®å??å??å?³è½¬"
 
-#: ../modules/controller-linux-input.c:178
+#: ../modules/controller-linux-input.c:177
 msgid "Linux input event controller"
 msgstr "Linux ���件���"
 
 #: ../modules/controller-linux-input.c:218
-#: ../modules/controller-dx-dinput.c:196 ../modules/controller-midi.c:212
-msgid "Device:"
-msgstr "设��"
-
-#: ../modules/controller-linux-input.c:219
 msgid "The name of the device to read Linux Input events from."
 msgstr "è¦?读å?? Linux è¾?å?¥äº?件ç??设å¤?å??称ã??"
 
-#: ../modules/controller-linux-input.c:230
+#: ../modules/controller-linux-input.c:229
 msgid "Linux Input"
 msgstr "Linux è¾?å?¥"
 
-#: ../modules/controller-linux-input.c:513
+#: ../modules/controller-linux-input.c:512
 msgid "Linux Input Events"
 msgstr "Linux ���件"
 
-#: ../modules/controller-linux-input.c:525
-#: ../modules/controller-dx-dinput.c:1095 ../modules/controller-midi.c:505
-msgid "No device configured"
-msgstr "æ?ªé??置设å¤?"
-
-#: ../modules/controller-linux-input.c:551 ../modules/controller-midi.c:454
-#: ../modules/controller-midi.c:480
+#: ../modules/controller-linux-input.c:550 ../modules/controller-midi.c:453
+#: ../modules/controller-midi.c:479
 #, c-format
 msgid "Reading from %s"
 msgstr "ä»? %s 读å??"
 
-#: ../modules/controller-linux-input.c:569
-#: ../modules/controller-linux-input.c:623 ../modules/controller-midi.c:436
-#: ../modules/controller-midi.c:497 ../modules/controller-midi.c:568
+#: ../modules/controller-linux-input.c:568
+#: ../modules/controller-linux-input.c:622 ../modules/controller-midi.c:435
+#: ../modules/controller-midi.c:496 ../modules/controller-midi.c:567
 #, c-format
 msgid "Device not available: %s"
 msgstr "设�����%s"
 
-#: ../modules/controller-linux-input.c:588
-#: ../modules/controller-dx-dinput.c:1120
-msgid "Device not available"
-msgstr "设����"
-
-#: ../modules/controller-linux-input.c:632 ../modules/controller-midi.c:577
+#: ../modules/controller-linux-input.c:631 ../modules/controller-midi.c:576
 msgid "End of file"
 msgstr "æ??件ç»?å°¾"
 
-#: ../modules/controller-dx-dinput.c:156
-msgid "DirectX DirectInput event controller"
-msgstr "DirectX DirectInput �件���"
-
-#: ../modules/controller-dx-dinput.c:197
-msgid "The device to read DirectInput events from."
-msgstr "è¦?读å?? DirectInput äº?件ç??设å¤?ã??"
-
-#: ../modules/controller-dx-dinput.c:206
-msgid "DirectX DirectInput"
-msgstr "DirectX DirectInput"
-
-#: ../modules/controller-dx-dinput.c:420
-#, c-format
-msgid "Button %d"
-msgstr "æ??é?® %d"
-
-#: ../modules/controller-dx-dinput.c:423
-#, c-format
-msgid "Button %d Press"
-msgstr "æ??é?® %d æ??ä¸?"
-
-#: ../modules/controller-dx-dinput.c:426
-#, c-format
-msgid "Button %d Release"
-msgstr "æ??é?® %d é??æ?¾"
-
-#: ../modules/controller-dx-dinput.c:452
-msgid "Y Move Away"
-msgstr "Y 移�"
-
-#: ../modules/controller-dx-dinput.c:455
-msgid "Y Move Near"
-msgstr "Y 移�"
-
-#: ../modules/controller-dx-dinput.c:470
-msgid "X Axis Tilt Away"
-msgstr "X 轴��"
-
-#: ../modules/controller-dx-dinput.c:473
-msgid "X Axis Tilt Near"
-msgstr "X è½´æ??è¿?"
-
-#: ../modules/controller-dx-dinput.c:502
-#, c-format
-msgid "Slider %d Increase"
-msgstr "æ»?å?? %d å¢?å? "
-
-#: ../modules/controller-dx-dinput.c:505
-#, c-format
-msgid "Slider %d Decrease"
-msgstr "æ»?å?? %d å??å°?"
-
-#: ../modules/controller-dx-dinput.c:515
-#, c-format
-msgid "POV %d X View"
-msgstr "POV %d X ��"
-
-#: ../modules/controller-dx-dinput.c:518
-#, c-format
-msgid "POV %d Y View"
-msgstr "POV %d Y ��"
-
-#: ../modules/controller-dx-dinput.c:521
-#, c-format
-msgid "POV %d Return"
-msgstr "POV %d è¿?å??"
-
-#: ../modules/controller-dx-dinput.c:1084
-msgid "DirectInput Events"
-msgstr "DirectInput �件"
-
-#: ../modules/controller-midi.c:164
+#: ../modules/controller-midi.c:163
 msgid "MIDI event controller"
 msgstr "MIDI �件���"
 
-#: ../modules/controller-midi.c:203
+#: ../modules/controller-midi.c:202
 msgid "The name of the device to read MIDI events from."
 msgstr "è¦?读å??ç?? MIDI äº?件ç??设å¤?å??称ã??"
 
-#: ../modules/controller-midi.c:206
+#: ../modules/controller-midi.c:205
 msgid "Enter 'alsa' to use the ALSA sequencer."
 msgstr "è¾?å?¥ â??alsaâ?? å?¯ä½¿ç?¨ ALSA é?³åº?å?¨ã??"
 
-#: ../modules/controller-midi.c:221
+#: ../modules/controller-midi.c:220
 msgid "Channel:"
 msgstr "é??é??ï¼?"
 
-#: ../modules/controller-midi.c:222
+#: ../modules/controller-midi.c:221
 msgid ""
 "The MIDI channel to read events from. Set to -1 for reading from all MIDI "
 "channels."
 msgstr "è¦?读å??äº?件ç?? MIDI é??é??ã??设为 -1 å?¯ä»?å?¨é?¨ MIDI é??é??中读å??ã??"
 
-#: ../modules/controller-midi.c:226
+#: ../modules/controller-midi.c:225
 msgid "MIDI"
 msgstr "MIDI"
 
-#: ../modules/controller-midi.c:355
+#: ../modules/controller-midi.c:354
 #, c-format
 msgid "Note %02x on"
 msgstr "�符 %02x �"
 
-#: ../modules/controller-midi.c:358
+#: ../modules/controller-midi.c:357
 #, c-format
 msgid "Note %02x off"
 msgstr "�符 %02x �"
 
-#: ../modules/controller-midi.c:361
+#: ../modules/controller-midi.c:360
 #, c-format
 msgid "Controller %03d"
 msgstr "��� %03d"
 
-#: ../modules/controller-midi.c:408
+#: ../modules/controller-midi.c:407
 msgid "MIDI Events"
 msgstr "MIDI �件"
 
-#: ../modules/controller-midi.c:426
+#: ../modules/controller-midi.c:425
 msgid "GIMP"
 msgstr "GIMP"
 
-#: ../modules/controller-midi.c:428
+#: ../modules/controller-midi.c:427
 msgid "GIMP MIDI Input Controller"
 msgstr "GIMP MIDI �����"
 
-#~ msgid "%d Byte"
-#~ msgstr "%d å­?è??"
+#: ../modules/display-filter-color-blind.c:66
+msgid "Protanopia (insensitivity to red)"
+msgstr "红è?²ç?²(对红è?²ä¸?æ??æ??)"
+
+#: ../modules/display-filter-color-blind.c:68
+msgid "Deuteranopia (insensitivity to green)"
+msgstr "绿è?²ç?²(对绿è?²ä¸?æ??æ??)"
 
-#~ msgid "%.2f KB"
-#~ msgstr "%.2f KB"
+#: ../modules/display-filter-color-blind.c:70
+msgid "Tritanopia (insensitivity to blue)"
+msgstr "è??è?²ç?²(对è??è?²ä¸?æ??æ??)"
 
-#~ msgid "%.1f KB"
-#~ msgstr "%.1f KB"
+#: ../modules/display-filter-color-blind.c:197
+msgid "Color deficit simulation filter (Brettel-Vienot-Mollon algorithm)"
+msgstr "è?²å½©ç¼ºå¤±æ¨¡æ??滤é??(Brettel-Vienot-Mollon ç®?æ³?)"
 
-#~ msgid "%d KB"
-#~ msgstr "%d KB"
+#: ../modules/display-filter-color-blind.c:260
+msgid "Color Deficient Vision"
+msgstr "���彩缺失"
 
-#~ msgid "%.2f MB"
-#~ msgstr "%.2f MB"
+#: ../modules/display-filter-color-blind.c:482
+msgid "Color _deficiency type:"
+msgstr "è?²å½©ç¼ºå¤±ç±»å??(_D)ï¼?"
 
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
+#: ../modules/display-filter-gamma.c:89
+msgid "Gamma color display filter"
+msgstr "Gamma é¢?è?²æ?¾ç¤ºæ»¤é??"
 
-#~ msgid "%d MB"
-#~ msgstr "%d MB"
+#: ../modules/display-filter-gamma.c:128
+msgid "Gamma"
+msgstr "Gamma"
 
-#~ msgid "%.2f GB"
-#~ msgstr "%.2f GB"
+#: ../modules/display-filter-gamma.c:231
+msgid "_Gamma:"
+msgstr "_Gammaï¼?"
 
-#~ msgid "%.1f GB"
-#~ msgstr "%.1f GB"
+#: ../modules/display-filter-high-contrast.c:89
+msgid "High Contrast color display filter"
+msgstr "é«?对æ¯?度é¢?è?²æ?¾ç¤ºæ»¤é??"
 
-#~ msgid "%d GB"
-#~ msgstr "%d GB"
+#: ../modules/display-filter-high-contrast.c:128
+msgid "Contrast"
+msgstr "对�度"
 
-#, fuzzy
-#~ msgid "profile|None"
-#~ msgstr "é??ç½®æ??件|æ? "
+#: ../modules/display-filter-high-contrast.c:231
+msgid "Contrast c_ycles:"
+msgstr "对�循�(_Y)�"
 
-#, fuzzy
-#~ msgid "Painter-style triangle color selector"
-#~ msgstr "水彩é£?æ ¼ç??é¢?è?²é??æ?©å?¨"
+#: ../modules/display-filter-lcms.c:101
+msgid "Color management display filter using ICC color profiles"
+msgstr "使ç?¨ ICC é¢?è?²é??ç½®æ??件ç??é¢?è?²æ ¡å¯¹æ»¤é??"
 
-#, fuzzy
-#~ msgid "Triangle"
-#~ msgstr "��波"
+#: ../modules/display-filter-lcms.c:133
+msgid "Color Management"
+msgstr "é¢?è?²ç®¡ç??"
+
+#: ../modules/display-filter-lcms.c:190
+msgid "None"
+msgstr "æ? "
+
+#: ../modules/display-filter-lcms.c:211
+msgid ""
+"This filter takes its configuration from the Color Management section in the "
+"Preferences dialog."
+msgstr "此滤é??ä»?é¦?é??项对è¯?项中ç??è?²å½©ç®¡ç??é?¨å??è?·å¾?å?¶é??ç½®ã??"
+
+#: ../modules/display-filter-lcms.c:225
+msgid "Mode of operation:"
+msgstr "æ??ä½?模å¼?ï¼?"
+
+#: ../modules/display-filter-lcms.c:232
+msgid "Image profile:"
+msgstr "å?¾å??é??ç½®æ??件"
+
+#: ../modules/display-filter-lcms.c:240
+msgid "Monitor profile:"
+msgstr "æ?¾ç¤ºå?¨é??ç½®æ??件ï¼?"
+
+#: ../modules/display-filter-lcms.c:248
+msgid "Print simulation profile:"
+msgstr "æ??å?°æ¨¡æ??é??ç½®æ??件ï¼?"
+
+#: ../modules/display-filter-proof.c:96
+msgid "Color proof filter using ICC color profile"
+msgstr "使ç?¨ ICC é¢?è?²é??ç½®æ??件ç??é¢?è?²æ ¡å¯¹æ»¤é??"
+
+#: ../modules/display-filter-proof.c:144
+msgid "Color Proof"
+msgstr "��校对"
+
+#: ../modules/display-filter-proof.c:310
+msgid "Choose an ICC Color Profile"
+msgstr "é??æ?© ICC é¢?è?²é??ç½®æ??件"
+
+#: ../modules/display-filter-proof.c:337
+msgid "All files (*.*)"
+msgstr "æ??æ??æ??件(*.*)"
+
+#: ../modules/display-filter-proof.c:342
+msgid "ICC color profile (*.icc, *.icm)"
+msgstr "ICCè?²å½©é??ç½®æ??件(*.icc, *.icm)"
+
+#: ../modules/display-filter-proof.c:400
+msgid "_Profile:"
+msgstr "é??ç½®æ??件(_P)ï¼?"
+
+#: ../modules/display-filter-proof.c:406
+msgid "_Intent:"
+msgstr "��(_I)�"
+
+#: ../modules/display-filter-proof.c:411
+msgid "_Black Point Compensation"
+msgstr "��补�(_B)"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 53ffd21..e851fb5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,11 +1,11 @@
 # zh_CN translation of gimp.
-# Copyright (C) 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001-2009 Free Software Foundation, Inc.
 # Yuheng Xie <elephant linux net cn>, 2001-2004.
 # Funda Wang <fundawang linux net cn>, 2003.
 # Cai Qian <caiqian gnome org>, 2005.
-# ���人 <kappa8086 gmail com>, 2008.
-# Aron Xuã??<aronmalache 163 com>, 2008.
 # Shawn Syu <shawn msn cn>, 2008.
+# Aron Xuã??<aronmalache 163 com>, 2008-2009.
+# ���人 <kappa8086 gmail com>, 2008-2009.
 #
 #
 msgid ""
@@ -13,35 +13,36 @@ msgstr ""
 "Project-Id-Version: gimp HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gimp&component=general\n"
-"POT-Creation-Date: 2009-02-22 17:14+0000\n"
-"PO-Revision-Date: 2009-01-23 20:21+0800\n"
-"Last-Translator: Shawn Syu <shawn msn cn>\n"
+"POT-Creation-Date: 2009-05-25 19:15+0000\n"
+"PO-Revision-Date: 2009-05-24 21:50+0800\n"
+"Last-Translator: ���人 <kappa8086 gmail com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation lists linux net cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../app/about.h:24
+#: ../app/about.h:23
 msgid "GIMP"
 msgstr "GIMP"
 
-#: ../app/about.h:27 ../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 å?¾å??å¤?ç??ç¨?åº?"
 
-#: ../app/about.h:30
+#: ../app/about.h:29
 msgid ""
-"Copyright © 1995-2008\n"
+"Copyright © 1995-2009\n"
 "Spencer Kimball, Peter Mattis and the GIMP Development Team"
 msgstr ""
-"ç??æ??æ??æ?? (C) 1995-2008\n"
+"ç??æ??æ??æ?? (C) 1995-2009\n"
 "Spencer Kimballï¼?Peter Mattis å?? GIMP å¼?å??å°?ç»?"
 
-#: ../app/about.h:34
+#: ../app/about.h:33
 msgid ""
-"GIMP is free software; you can redistribute it and/or modify it under the "
+"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 2 of the License, or (at your option) any later "
+"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 "
@@ -50,20 +51,19 @@ msgid ""
 "details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with "
-"GIMP; if not, write to the Free Software Foundation, Inc., 59 Temple Place - "
-"Suite 330, Boston, MA 02111-1307, USA."
+"GIMP.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 "GIMP æ?¯ä¸?个è?ªç?±è½¯ä»¶ï¼?æ?¨å?¯ä»¥å?¨é?µå®?ç?±è?ªç?±è½¯ä»¶å?ºé??ä¼?å??å¸?ç?? GNU é??ç?¨å?¬å?±è®¸å?¯å??è®®"
-"ç??æ??å?µä¸?é??æ?°å??å??并ä¸?(æ??è??)ä¿®æ?¹è½¯ä»¶ï¼?æ??第äº?ç??许å?¯å??è®®ï¼?æ??ä»»ä½?æ?´æ?°ç??æ?¬ã??\n"
+"ç??æ??å?µä¸?é??æ?°å??å??并ä¸?(æ??è??)ä¿®æ?¹è½¯ä»¶ï¼?æ??第ä¸?ç??许å?¯å??è®®ï¼?æ??(æ ¹æ?®æ?¨ç??é??æ?©)ä»»ä½?æ?´"
+"æ?°ç??æ?¬ã??\n"
 "\n"
 "GIMP æ?¬ç??å?¯åº?ç?¨ç??æ??æ?¿å??å??ï¼?ä½?ä¸?å??ä»»ä½?ä¿?è¯?ï¼?ç??è?³æ²¡æ??å??ä¸?æ?§ç??æ??对ç?¹å®?ç?®ç??é??ç?¨æ?§"
 "ç??æ??æ??ã??æ?´å¤?ç»?è??请å??ç?? GNU é??ç?¨å?¬å?±è®¸å?¯å??è®®ã??\n"
 "\n"
-"æ?¨åº?该已ç»?é?? GIMP æ?¶å?°ä¸?份 GNU é??ç?¨å?¬å?±è®¸å?¯å??è®®ï¼?å¦?æ??没æ??ï¼?请è?´è?ªç?±è½¯ä»¶å?ºé??"
-"ä¼? Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA "
-"02111-1307, USA."
+"æ?¨åº?该已ç»?é?? GIMP æ?¶å?°ä¸?份 GNU é??ç?¨å?¬å?±è®¸å?¯å??è®®ï¼?å¦?æ??没æ??ï¼?è§? <http://www.";
+"gnu.org/licenses/>ã??"
 
-#: ../app/app.c:214
+#: ../app/app.c:213
 #, c-format
 msgid ""
 "Unable to open a test swap file.\n"
@@ -86,101 +86,101 @@ msgstr "没æ??æ??å®?æ?¹å¤?ç??解é??å?¨ï¼?使ç?¨é»?认ç??â??%sâ??ã??\n"
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
 msgstr "æ?¹å¤?ç??解æ??ç¨?åº?â??%sâ??ä¸?å?¯ç?¨ã??æ?¹å¤?ç??模å¼?已被ç¦?ç?¨ã??"
 
-#: ../app/main.c:144 ../tools/gimp-remote.c:60
+#: ../app/main.c:135 ../tools/gimp-remote.c:59
 msgid "Show version information and exit"
 msgstr "æ?¾ç¤ºç??æ?¬ä¿¡æ?¯å¹¶é??å?º"
 
-#: ../app/main.c:149
+#: ../app/main.c:140
 msgid "Show license information and exit"
 msgstr "æ?¾ç¤ºè®¸å?¯ä¿¡æ?¯å¹¶é??å?º"
 
-#: ../app/main.c:154
+#: ../app/main.c:145
 msgid "Be more verbose"
 msgstr "�详�"
 
-#: ../app/main.c:159
+#: ../app/main.c:150
 msgid "Start a new GIMP instance"
 msgstr "å?¯å?¨ä¸?个æ?°ç?? GIMP å®?ä¾?"
 
-#: ../app/main.c:164
+#: ../app/main.c:155
 msgid "Open images as new"
 msgstr "ä½?为æ?°å»ºå?¾å??æ??å¼?"
 
-#: ../app/main.c:169
+#: ../app/main.c:160
 msgid "Run without a user interface"
 msgstr "è¿?è¡?æ?¶ä¸?æ??ä¾?ç?¨æ?·ç??é?¢"
 
-#: ../app/main.c:174
+#: ../app/main.c:165
 msgid "Do not load brushes, gradients, patterns, ..."
 msgstr "ä¸?å? è½½ç?»ç¬?ã??æ¸?å??ã??å?¾æ¡?ç­?"
 
-#: ../app/main.c:179
+#: ../app/main.c:170
 msgid "Do not load any fonts"
 msgstr "���任���"
 
-#: ../app/main.c:184
+#: ../app/main.c:175
 msgid "Do not show a startup window"
 msgstr "��示����"
 
-#: ../app/main.c:189
+#: ../app/main.c:180
 msgid "Do not use shared memory between GIMP and plugins"
 msgstr "ä¸?å?¨ GIMP å??æ??件ä¹?é?´ä½¿ç?¨å?±äº«å??å­?"
 
-#: ../app/main.c:194
+#: ../app/main.c:185
 msgid "Do not use special CPU acceleration functions"
 msgstr "ä¸?使ç?¨ç?¹å®? CPU å? é??"
 
-#: ../app/main.c:199
+#: ../app/main.c:190
 msgid "Use an alternate sessionrc file"
 msgstr "使ç?¨å?«ç?? sessionrc æ??件"
 
-#: ../app/main.c:204
+#: ../app/main.c:195
 msgid "Use an alternate user gimprc file"
 msgstr "使ç?¨å?«ç??ç?¨æ?· gimprc æ??件"
 
-#: ../app/main.c:209
+#: ../app/main.c:200
 msgid "Use an alternate system gimprc file"
 msgstr "使ç?¨å?«ç??ç³»ç»? gimprc æ??件"
 
-#: ../app/main.c:214
+#: ../app/main.c:205
 msgid "Batch command to run (can be used multiple times)"
 msgstr "è¦?è¿?è¡?ç??æ?¹å¤?ç??å?½ä»¤(å?¯ä»¥ä½¿ç?¨å¤?次)"
 
-#: ../app/main.c:219
+#: ../app/main.c:210
 msgid "The procedure to process batch commands with"
 msgstr "å¤?ç??æ?¹å¤?ç??å?½ä»¤ç??è¿?ç¨?"
 
-#: ../app/main.c:224
+#: ../app/main.c:215
 msgid "Send messages to console instead of using a dialog"
 msgstr "å?¨æ?§å?¶å?°è??ä¸?æ?¯å¯¹è¯?æ¡?中æ?¾ç¤ºè­¦å??ä¿¡æ?¯"
 
 #. don't translate the mode names (off|on|warn)
-#: ../app/main.c:230
+#: ../app/main.c:221
 msgid "PDB compatibility mode (off|on|warn)"
 msgstr "PDB �容模�(off|on|warn)"
 
 #. don't translate the mode names (never|query|always)
-#: ../app/main.c:236
+#: ../app/main.c:227
 msgid "Debug in case of a crash (never|query|always)"
 msgstr "崩����(never|query|always)"
 
-#: ../app/main.c:241
+#: ../app/main.c:232
 msgid "Enable non-fatal debugging signal handlers"
 msgstr "å?¯ç?¨é??è?´å?½è°?è¯?ä¿¡å?·å¤?ç??ç¨?åº?"
 
-#: ../app/main.c:246
+#: ../app/main.c:237
 msgid "Make all warnings fatal"
 msgstr "å°?æ??æ??è­¦å??ä½?为è?´å?½ç??"
 
-#: ../app/main.c:251
+#: ../app/main.c:242
 msgid "Output a gimprc file with default settings"
 msgstr "è¾?å?ºé»?认设置ç?? gimprc æ??件"
 
-#: ../app/main.c:355
+#: ../app/main.c:346
 msgid "[FILE|URI...]"
 msgstr "[æ??件|URI...]"
 
-#: ../app/main.c:373
+#: ../app/main.c:364
 msgid ""
 "GIMP could not initialize the graphical user interface.\n"
 "Make sure a proper setup for your display environment exists."
@@ -188,24 +188,24 @@ msgstr ""
 "GIMP æ? æ³?å??å§?å??å?¾å½¢ç?¨æ?·ç??é?¢ã??\n"
 "请确å®?æ?¨ç??æ?¾ç¤ºç?¯å¢?å·²ç»?正确å®?è£?ã??"
 
-#: ../app/main.c:392
+#: ../app/main.c:383
 msgid "Another GIMP instance is already running."
 msgstr "å?¦ä¸?个 GIMP å®?ä¾?å·²å?¨è¿?è¡?中ã??"
 
-#: ../app/main.c:462
+#: ../app/main.c:453
 msgid "GIMP output. Type any character to close this window."
 msgstr "GIMP è¾?å?ºã??é?®å?¥ä»»æ??å­?符å?³é?­æ­¤çª?å?£ã??"
 
-#: ../app/main.c:463
+#: ../app/main.c:454
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(é?®å?¥ä»»æ??å­?符å?³é?­æ?¬çª?å?£)\n"
 
-#: ../app/main.c:480
+#: ../app/main.c:471
 msgid "GIMP output. You can minimize this window, but don't close it."
 msgstr "GIMP è¾?å?ºã??æ?¨å?¯ä»¥æ??å°?å??æ­¤çª?å?£ï¼?ä½?ä¸?è¦?å?³é?­å®?ã??"
 
-#: ../app/sanity.c:342
+#: ../app/sanity.c:363
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -216,7 +216,7 @@ msgstr ""
 "\n"
 "请æ£?æ?¥ç?¯å¢?å??é?? G_FILENAME_ENCODING ç??å?¼ã??"
 
-#: ../app/sanity.c:361
+#: ../app/sanity.c:382
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -232,405 +232,467 @@ msgstr ""
 "ç?¹ã??请设置ç?¯å¢?å??é?? G_FILENAME_ENCODINGã??"
 
 #. show versions of libraries used by GIMP
-#: ../app/version.c:64
+#: ../app/version.c:63
 #, c-format
 msgid "using %s version %s (compiled against version %s)"
 msgstr "使ç?¨%sç??æ?¬ %s (以%s为å?ºç¡?ç¼?è¯?)"
 
-#: ../app/version.c:127 ../tools/gimp-remote.c:95
+#: ../app/version.c:126 ../tools/gimp-remote.c:94
 #, c-format
 msgid "%s version %s"
 msgstr "%s ç??æ?¬ %s"
 
-#: ../app/actions/actions.c:101 ../app/actions/dialogs-actions.c:123
-#: ../app/dialogs/dialogs.c:224 ../app/widgets/gimpbrusheditor.c:90
+#: ../app/actions/actions.c:105 ../app/dialogs/dialogs.c:225
+#: ../app/widgets/gimpbrusheditor.c:89
 msgid "Brush Editor"
 msgstr "�����"
 
 #. initialize the list of gimp brushes
-#: ../app/actions/actions.c:104 ../app/core/gimp.c:838
-#: ../app/dialogs/dialogs.c:157 ../app/dialogs/preferences-dialog.c:2744
+#: ../app/actions/actions.c:108 ../app/core/gimp.c:855
+#: ../app/dialogs/dialogs.c:158 ../app/dialogs/preferences-dialog.c:2743
 msgid "Brushes"
 msgstr "��"
 
-#: ../app/actions/actions.c:107 ../app/dialogs/dialogs.c:169
+#: ../app/actions/actions.c:111 ../app/dialogs/dialogs.c:170
 msgid "Buffers"
 msgstr "���"
 
-#: ../app/actions/actions.c:110 ../app/dialogs/dialogs.c:182
+#: ../app/actions/actions.c:114 ../app/dialogs/dialogs.c:183
 msgid "Channels"
 msgstr "é??é??"
 
-#: ../app/actions/actions.c:113 ../app/dialogs/convert-dialog.c:174
-#: ../app/dialogs/dialogs.c:190
+#: ../app/actions/actions.c:117 ../app/dialogs/convert-dialog.c:174
+#: ../app/dialogs/dialogs.c:191
 msgid "Colormap"
 msgstr "��表"
 
-#: ../app/actions/actions.c:116
+#: ../app/actions/actions.c:120
 msgid "Configuration"
 msgstr "é??ç½®"
 
-#: ../app/actions/actions.c:119
+#: ../app/actions/actions.c:123
 msgid "Context"
 msgstr "��"
 
-#: ../app/actions/actions.c:122 ../app/dialogs/dialogs.c:150
+#: ../app/actions/actions.c:126 ../app/dialogs/dialogs.c:151
 msgid "Pointer Information"
 msgstr "æ??é??ä¿¡æ?¯"
 
-#: ../app/actions/actions.c:125
+#: ../app/actions/actions.c:129
 msgid "Debug"
 msgstr "��"
 
-#: ../app/actions/actions.c:128
+#: ../app/actions/actions.c:132
 msgid "Dialogs"
 msgstr "对��"
 
-#: ../app/actions/actions.c:131
+#: ../app/actions/actions.c:135
 msgid "Dock"
 msgstr "å??é? "
 
-#: ../app/actions/actions.c:134
+#: ../app/actions/actions.c:138
 msgid "Dockable"
 msgstr "å?¯å??é? "
 
 #. Document History
-#: ../app/actions/actions.c:137 ../app/dialogs/dialogs.c:171
-#: ../app/dialogs/preferences-dialog.c:1595
+#: ../app/actions/actions.c:141 ../app/dialogs/dialogs.c:172
+#: ../app/dialogs/preferences-dialog.c:1594
 msgid "Document History"
 msgstr "æ??æ¡£å??å?²"
 
-#: ../app/actions/actions.c:140
+#: ../app/actions/actions.c:144
 msgid "Drawable"
 msgstr "��对象"
 
-#: ../app/actions/actions.c:143 ../app/tools/tools-enums.c:300
+#: ../app/actions/actions.c:147
 msgid "Edit"
 msgstr "ç¼?è¾?"
 
-#: ../app/actions/actions.c:146 ../app/dialogs/dialogs.c:146
+#: ../app/actions/actions.c:150 ../app/dialogs/dialogs.c:147
 msgid "Error Console"
 msgstr "é??误æ?§å?¶å?°"
 
-#: ../app/actions/actions.c:149
+#: ../app/actions/actions.c:153
 msgid "File"
 msgstr "æ??件"
 
-#: ../app/actions/actions.c:152 ../app/dialogs/dialogs.c:165
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/actions/actions.c:156 ../app/dialogs/dialogs.c:166
+#: ../app/dialogs/preferences-dialog.c:2759
 msgid "Fonts"
 msgstr "å­?ä½?"
 
-#: ../app/actions/actions.c:155 ../app/actions/dialogs-actions.c:141
-#: ../app/dialogs/dialogs.c:228 ../app/widgets/gimpgradienteditor.c:276
+#: ../app/actions/actions.c:159 ../app/dialogs/dialogs.c:229
+#: ../app/widgets/gimpgradienteditor.c:275
 msgid "Gradient Editor"
 msgstr "æ¸?å??ç¼?è¾?å?¨"
 
 #. initialize the list of gimp gradients
-#: ../app/actions/actions.c:158 ../app/core/gimp.c:850
-#: ../app/dialogs/dialogs.c:161 ../app/dialogs/preferences-dialog.c:2756
+#: ../app/actions/actions.c:162 ../app/core/gimp.c:867
+#: ../app/dialogs/dialogs.c:162 ../app/dialogs/preferences-dialog.c:2755
 msgid "Gradients"
 msgstr "æ¸?å??"
 
-#: ../app/actions/actions.c:161
+#: ../app/actions/actions.c:165
 msgid "Help"
 msgstr "帮�"
 
-#: ../app/actions/actions.c:164 ../app/core/core-enums.c:212
-#: ../app/tools/tools-enums.c:242
+#: ../app/actions/actions.c:168
 msgid "Image"
 msgstr "å?¾å??"
 
 #. list & grid views
-#: ../app/actions/actions.c:167 ../app/dialogs/dialogs.c:155
+#: ../app/actions/actions.c:171 ../app/dialogs/dialogs.c:156
 msgid "Images"
 msgstr "å?¾å??"
 
-#: ../app/actions/actions.c:170 ../app/dialogs/dialogs.c:178
+#: ../app/actions/actions.c:174 ../app/dialogs/dialogs.c:179
 #: ../app/dialogs/resize-dialog.c:286
 msgid "Layers"
 msgstr "��"
 
-#: ../app/actions/actions.c:173 ../app/actions/dialogs-actions.c:153
-#: ../app/dialogs/dialogs.c:232 ../app/widgets/gimppaletteeditor.c:155
+#: ../app/actions/actions.c:177 ../app/dialogs/dialogs.c:233
+#: ../app/widgets/gimppaletteeditor.c:154
 msgid "Palette Editor"
 msgstr "�����"
 
 #. initialize the list of gimp palettes
-#: ../app/actions/actions.c:176 ../app/core/gimp.c:846
-#: ../app/dialogs/dialogs.c:163 ../app/dialogs/preferences-dialog.c:2752
+#: ../app/actions/actions.c:180 ../app/core/gimp.c:863
+#: ../app/dialogs/dialogs.c:164 ../app/dialogs/preferences-dialog.c:2751
 msgid "Palettes"
 msgstr "��"
 
 #. initialize the list of gimp patterns
-#: ../app/actions/actions.c:179 ../app/core/gimp.c:842
-#: ../app/dialogs/dialogs.c:159 ../app/dialogs/preferences-dialog.c:2748
+#: ../app/actions/actions.c:183 ../app/core/gimp.c:859
+#: ../app/dialogs/dialogs.c:160 ../app/dialogs/preferences-dialog.c:2747
 msgid "Patterns"
 msgstr "��"
 
-#: ../app/actions/actions.c:182 ../app/dialogs/preferences-dialog.c:2764
+#: ../app/actions/actions.c:186 ../app/dialogs/preferences-dialog.c:2763
 msgid "Plug-Ins"
 msgstr "æ??件"
 
-#: ../app/actions/actions.c:185 ../app/core/core-enums.c:860
-#: ../app/core/gimpchannel.c:362
+#: ../app/actions/actions.c:189 ../app/core/gimpchannel.c:368
 msgid "Quick Mask"
 msgstr "å¿«é??è??æ?¿"
 
-#: ../app/actions/actions.c:188 ../app/dialogs/dialogs.c:206
+#: ../app/actions/actions.c:192 ../app/dialogs/dialogs.c:207
 msgid "Sample Points"
 msgstr "é??æ ·ç?¹"
 
-#: ../app/actions/actions.c:191
+#: ../app/actions/actions.c:195
 msgid "Select"
 msgstr "é??æ?©"
 
 #. initialize the template list
-#: ../app/actions/actions.c:194 ../app/core/gimp.c:859
-#: ../app/dialogs/dialogs.c:173
+#: ../app/actions/actions.c:198 ../app/core/gimp.c:876
+#: ../app/dialogs/dialogs.c:174
 msgid "Templates"
 msgstr "模�"
 
-#: ../app/actions/actions.c:197
+#: ../app/actions/actions.c:201
+msgid "Text Tool"
+msgstr "æ??å­?å·¥å?·"
+
+#: ../app/actions/actions.c:204
 msgid "Text Editor"
 msgstr "æ??æ?¬ç¼?è¾?å?¨"
 
-#: ../app/actions/actions.c:200 ../app/dialogs/dialogs.c:138
-#: ../app/dialogs/preferences-dialog.c:1880 ../app/gui/gui.c:423
+#: ../app/actions/actions.c:207 ../app/dialogs/dialogs.c:139
+#: ../app/dialogs/preferences-dialog.c:1879 ../app/gui/gui.c:428
 msgid "Tool Options"
 msgstr "å·¥å?·é??项"
 
-#: ../app/actions/actions.c:203 ../app/dialogs/dialogs.c:167
+#: ../app/actions/actions.c:210 ../app/dialogs/dialogs.c:168
 msgid "Tools"
 msgstr "工�"
 
-#: ../app/actions/actions.c:206 ../app/dialogs/dialogs.c:186
+#: ../app/actions/actions.c:213 ../app/dialogs/dialogs.c:187
 #: ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "路�"
 
-#: ../app/actions/actions.c:209
+#: ../app/actions/actions.c:216
 msgid "View"
 msgstr "æ?¥ç??"
 
-#: ../app/actions/actions.c:212
+#: ../app/actions/actions.c:219
 msgid "Windows"
 msgstr "��"
 
-#: ../app/actions/brush-editor-actions.c:43
+#. value description and new value shown in the status bar
+#: ../app/actions/actions.c:510
+#, c-format
+msgid "%s: %.2f"
+msgstr "%s: %.2f"
+
+#. value description and new value shown in the status bar
+#: ../app/actions/actions.c:536
+#, c-format
+msgid "%s: %d"
+msgstr "%sï¼?%d"
+
+#: ../app/actions/brush-editor-actions.c:42
+msgctxt "brush-editor-action"
 msgid "Brush Editor Menu"
 msgstr "ç?»ç¬?ç¼?è¾?å?¨è??å??"
 
-#: ../app/actions/brush-editor-actions.c:50
+#: ../app/actions/brush-editor-actions.c:49
+msgctxt "brush-editor-action"
 msgid "Edit Active Brush"
 msgstr "��活���"
 
-#: ../app/actions/brushes-actions.c:43
+#: ../app/actions/brushes-actions.c:42
+msgctxt "brushes-action"
 msgid "Brushes Menu"
 msgstr "ç?»ç¬?è??å??"
 
-#: ../app/actions/brushes-actions.c:47
+#: ../app/actions/brushes-actions.c:46
+msgctxt "brushes-action"
 msgid "_Open Brush as Image"
 msgstr "ä½?为å?¾å??æ??å¼?ç?»ç¬?(_O)"
 
-#: ../app/actions/brushes-actions.c:48
+#: ../app/actions/brushes-actions.c:47
+msgctxt "brushes-action"
 msgid "Open brush as image"
 msgstr "ä½?为å?¾å??æ??å¼?ç?»ç¬?"
 
-#: ../app/actions/brushes-actions.c:53
+#: ../app/actions/brushes-actions.c:52
+msgctxt "brushes-action"
 msgid "_New Brush"
 msgstr "�建��(_N)"
 
-#: ../app/actions/brushes-actions.c:54
-msgid "New brush"
-msgstr "�建��"
+#: ../app/actions/brushes-actions.c:53
+msgctxt "brushes-action"
+msgid "Create a new brush"
+msgstr "å??建æ?°ç?»ç¬?"
 
-#: ../app/actions/brushes-actions.c:59
+#: ../app/actions/brushes-actions.c:58
+msgctxt "brushes-action"
 msgid "D_uplicate Brush"
 msgstr "����(_U)"
 
-#: ../app/actions/brushes-actions.c:60
-msgid "Duplicate brush"
-msgstr "����"
+#: ../app/actions/brushes-actions.c:59
+msgctxt "brushes-action"
+msgid "Duplicate this brush"
+msgstr "��此��"
 
-#: ../app/actions/brushes-actions.c:65
+#: ../app/actions/brushes-actions.c:64
+msgctxt "brushes-action"
 msgid "Copy Brush _Location"
 msgstr "�����置(_L)"
 
-#: ../app/actions/brushes-actions.c:66
+#: ../app/actions/brushes-actions.c:65
+msgctxt "brushes-action"
 msgid "Copy brush file location to clipboard"
 msgstr "å°?ç?»ç¬?æ??件ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/brushes-actions.c:71
+#: ../app/actions/brushes-actions.c:70
+msgctxt "brushes-action"
 msgid "_Delete Brush"
 msgstr "����(_D)"
 
-#: ../app/actions/brushes-actions.c:72
-msgid "Delete brush"
-msgstr "����"
+#: ../app/actions/brushes-actions.c:71
+msgctxt "brushes-action"
+msgid "Delete this brush"
+msgstr "��此��"
 
-#: ../app/actions/brushes-actions.c:77
+#: ../app/actions/brushes-actions.c:76
+msgctxt "brushes-action"
 msgid "_Refresh Brushes"
 msgstr "����(_R)"
 
-#: ../app/actions/brushes-actions.c:78
+#: ../app/actions/brushes-actions.c:77
+msgctxt "brushes-action"
 msgid "Refresh brushes"
 msgstr "����"
 
-#: ../app/actions/brushes-actions.c:86
+#: ../app/actions/brushes-actions.c:85
+msgctxt "brushes-action"
 msgid "_Edit Brush..."
 msgstr "����(_E)..."
 
-#: ../app/actions/brushes-actions.c:87
-msgid "Edit brush"
-msgstr "����"
+#: ../app/actions/brushes-actions.c:86
+msgctxt "brushes-action"
+msgid "Edit this brush"
+msgstr "��此��"
 
-#: ../app/actions/buffers-actions.c:42
+#: ../app/actions/buffers-actions.c:41
+msgctxt "buffers-action"
 msgid "Buffers Menu"
 msgstr "ç¼?å?²å?ºè??å??"
 
-#: ../app/actions/buffers-actions.c:46
+#: ../app/actions/buffers-actions.c:45
+msgctxt "buffers-action"
 msgid "_Paste Buffer"
 msgstr "�贴���(_P)"
 
-#: ../app/actions/buffers-actions.c:47
+#: ../app/actions/buffers-actions.c:46
+msgctxt "buffers-action"
 msgid "Paste the selected buffer"
 msgstr "ç²?è´´é??中ç??ç¼?å?²å?º"
 
-#: ../app/actions/buffers-actions.c:52
+#: ../app/actions/buffers-actions.c:51
+msgctxt "buffers-action"
 msgid "Paste Buffer _Into"
 msgstr "�贴�����(_I)"
 
-#: ../app/actions/buffers-actions.c:53
+#: ../app/actions/buffers-actions.c:52
+msgctxt "buffers-action"
 msgid "Paste the selected buffer into the selection"
 msgstr "å°?é??中ç??ç¼?å?²å?ºç²?è´´å?°é??å?ºä¸­"
 
-#: ../app/actions/buffers-actions.c:58
+#: ../app/actions/buffers-actions.c:57
+msgctxt "buffers-action"
 msgid "Paste Buffer as _New"
 msgstr "ç²?è´´ç¼?å?²å?ºä¸ºæ?°å?¾å??(_N)"
 
-#: ../app/actions/buffers-actions.c:59
-msgid "Paste the selected buffer as new image"
+#: ../app/actions/buffers-actions.c:58
+msgctxt "buffers-action"
+msgid "Paste the selected buffer as a new image"
 msgstr "å°?é??中ç??ç¼?å?²å?ºç²?贴为æ?°å?¾å??"
 
-#: ../app/actions/buffers-actions.c:64
+#: ../app/actions/buffers-actions.c:63
+msgctxt "buffers-action"
 msgid "_Delete Buffer"
 msgstr "�����(_D)"
 
-#: ../app/actions/buffers-actions.c:65
+#: ../app/actions/buffers-actions.c:64
+msgctxt "buffers-action"
 msgid "Delete the selected buffer"
 msgstr "å? é?¤é??中ç??ç¼?å?²å?º"
 
-#: ../app/actions/channels-actions.c:44
+#: ../app/actions/channels-actions.c:43
+msgctxt "channels-action"
 msgid "Channels Menu"
 msgstr "é??é??è??å??"
 
-#: ../app/actions/channels-actions.c:48
+#: ../app/actions/channels-actions.c:47
+msgctxt "channels-action"
 msgid "_Edit Channel Attributes..."
 msgstr "ç¼?è¾?é??é??å±?æ?§(_E)..."
 
-#: ../app/actions/channels-actions.c:49
+#: ../app/actions/channels-actions.c:48
+msgctxt "channels-action"
 msgid "Edit the channel's name, color and opacity"
 msgstr "ç¼?è¾?é??é??å??称ã??é¢?è?²å??ä¸?é??æ??度"
 
-#: ../app/actions/channels-actions.c:54
+#: ../app/actions/channels-actions.c:53
+msgctxt "channels-action"
 msgid "_New Channel..."
 msgstr "æ?°å»ºé??é??(_N)..."
 
-#: ../app/actions/channels-actions.c:55
+#: ../app/actions/channels-actions.c:54
+msgctxt "channels-action"
 msgid "Create a new channel"
 msgstr "å??建æ?°é??é??"
 
-#: ../app/actions/channels-actions.c:60
+#: ../app/actions/channels-actions.c:59
+msgctxt "channels-action"
 msgid "_New Channel"
 msgstr "æ?°å»ºé??é??(_N)"
 
-#: ../app/actions/channels-actions.c:61
+#: ../app/actions/channels-actions.c:60
+msgctxt "channels-action"
 msgid "Create a new channel with last used values"
 msgstr "æ??ä¸?次使ç?¨ç??å?¼æ?°å»ºé??é??"
 
-#: ../app/actions/channels-actions.c:66
+#: ../app/actions/channels-actions.c:65
+msgctxt "channels-action"
 msgid "D_uplicate Channel"
 msgstr "å¤?å?¶é??é??(_U)"
 
 #: ../app/actions/channels-actions.c:67
+msgctxt "channels-action"
 msgid "Create a duplicate of this channel and add it to the image"
 msgstr "å??建此é??é??ç??å¤?æ?¬å¹¶æ·»å? å?°å?¾å??"
 
 #: ../app/actions/channels-actions.c:72
+msgctxt "channels-action"
 msgid "_Delete Channel"
 msgstr "å? é?¤é??é??(_D)"
 
 #: ../app/actions/channels-actions.c:73
+msgctxt "channels-action"
 msgid "Delete this channel"
 msgstr "å? é?¤æ­¤é??é??"
 
 #: ../app/actions/channels-actions.c:78
+msgctxt "channels-action"
 msgid "_Raise Channel"
 msgstr "å??é«?é??é??(_R)"
 
 #: ../app/actions/channels-actions.c:79
+msgctxt "channels-action"
 msgid "Raise this channel one step in the channel stack"
 msgstr "å?¨é??é??æ ?中使此é??é??å??é«?ä¸?æ­¥"
 
 #: ../app/actions/channels-actions.c:84
+msgctxt "channels-action"
 msgid "Raise Channel to _Top"
 msgstr "é??é??å??è?³é¡¶ç«¯(_T)"
 
-#: ../app/actions/channels-actions.c:85
+#: ../app/actions/channels-actions.c:86
+msgctxt "channels-action"
 msgid "Raise this channel to the top of the channel stack"
 msgstr "å??é«?æ­¤é??é??è?³é??é??æ ?ç??顶端"
 
-#: ../app/actions/channels-actions.c:90
+#: ../app/actions/channels-actions.c:91
+msgctxt "channels-action"
 msgid "_Lower Channel"
 msgstr "é??ä½?é??é??(_L)"
 
-#: ../app/actions/channels-actions.c:91
+#: ../app/actions/channels-actions.c:92
+msgctxt "channels-action"
 msgid "Lower this channel one step in the channel stack"
 msgstr "å?¨é??é??æ ?中使此é??é??é??ä½?ä¸?æ­¥"
 
-#: ../app/actions/channels-actions.c:96
+#: ../app/actions/channels-actions.c:97
+msgctxt "channels-action"
 msgid "Lower Channel to _Bottom"
 msgstr "é??é??é??è?³åº?端(_B)"
 
-#: ../app/actions/channels-actions.c:97
+#: ../app/actions/channels-actions.c:99
+msgctxt "channels-action"
 msgid "Lower this channel to the bottom of the channel stack"
-msgstr "é??é??é??è?³é??é??æ ?åº?端"
+msgstr "é??ä½?æ­¤é??é??è?³é??é??æ ?åº?端"
 
-#: ../app/actions/channels-actions.c:105
+#: ../app/actions/channels-actions.c:107
+msgctxt "channels-action"
 msgid "Channel to Sele_ction"
 msgstr "é??é??å?°é??å?º(_C)"
 
-#: ../app/actions/channels-actions.c:106
+#: ../app/actions/channels-actions.c:108
+msgctxt "channels-action"
 msgid "Replace the selection with this channel"
 msgstr "ç?¨æ­¤é??é??æ?¿æ?¢é??å?º"
 
-#: ../app/actions/channels-actions.c:111 ../app/actions/layers-actions.c:266
-#: ../app/actions/vectors-actions.c:173
+#: ../app/actions/channels-actions.c:113
+msgctxt "channels-action"
 msgid "_Add to Selection"
 msgstr "æ·»å? å?°é??å?º(_A)"
 
-#: ../app/actions/channels-actions.c:112
+#: ../app/actions/channels-actions.c:114
+msgctxt "channels-action"
 msgid "Add this channel to the current selection"
 msgstr "å°?æ­¤é??é??æ·»å? å?°å½?å??é??å?º"
 
-#: ../app/actions/channels-actions.c:117 ../app/actions/layers-actions.c:272
-#: ../app/actions/layers-actions.c:299 ../app/actions/layers-actions.c:326
-#: ../app/actions/vectors-actions.c:179
+#: ../app/actions/channels-actions.c:119
+msgctxt "channels-action"
 msgid "_Subtract from Selection"
 msgstr "ä»?é??å?ºä¸­å??å?»(_S)"
 
-#: ../app/actions/channels-actions.c:118
+#: ../app/actions/channels-actions.c:120
+msgctxt "channels-action"
 msgid "Subtract this channel from the current selection"
 msgstr "ä»?å½?å??é??å?ºä¸­å??å?»æ­¤é??é??"
 
-#: ../app/actions/channels-actions.c:123 ../app/actions/layers-actions.c:278
-#: ../app/actions/layers-actions.c:305 ../app/actions/layers-actions.c:332
-#: ../app/actions/vectors-actions.c:185
+#: ../app/actions/channels-actions.c:125
+msgctxt "channels-action"
 msgid "_Intersect with Selection"
 msgstr "ä¸?é??å?ºç?¸äº¤(_I)"
 
-#: ../app/actions/channels-actions.c:124
+#: ../app/actions/channels-actions.c:126
+msgctxt "channels-action"
 msgid "Intersect this channel with the current selection"
 msgstr "å°?æ­¤é??é??ä¸?å½?å??é??å?ºç?¸äº¤"
 
@@ -656,7 +718,7 @@ msgstr "å¡«å??ä¸?é??æ??度(_F)ï¼?"
 #: ../app/actions/channels-commands.c:117
 #: ../app/actions/channels-commands.c:159
 #: ../app/actions/channels-commands.c:163
-#: ../app/widgets/gimpchanneltreeview.c:316
+#: ../app/widgets/gimpchanneltreeview.c:333
 msgid "New Channel"
 msgstr "æ?°å»ºé??é??"
 
@@ -670,44 +732,49 @@ msgstr "æ?°å»ºé??é??é¢?è?²"
 
 #: ../app/actions/channels-commands.c:243
 #: ../app/display/gimpdisplayshell-dnd.c:584
-#: ../app/widgets/gimpchanneltreeview.c:249
-#: ../app/widgets/gimplayertreeview.c:773 ../app/widgets/gimptoolbox-dnd.c:313
+#: ../app/widgets/gimpchanneltreeview.c:265
+#: ../app/widgets/gimplayertreeview.c:800 ../app/widgets/gimptoolbox-dnd.c:313
 #, c-format
 msgid "%s Channel Copy"
 msgstr "%s é??é??å?¯æ?¬"
 
-#: ../app/actions/channels-commands.c:307 ../app/core/gimpselection.c:549
-#: ../app/pdb/selection-cmds.c:454 ../app/pdb/selection-cmds.c:521
+#: ../app/actions/channels-commands.c:307 ../app/core/gimpselection.c:574
+#: ../app/pdb/selection-cmds.c:453 ../app/pdb/selection-cmds.c:520
 msgid "Channel to Selection"
 msgstr "é??é??å?°é??å?º"
 
 #: ../app/actions/colormap-actions.c:44
+msgctxt "colormap-action"
 msgid "Colormap Menu"
 msgstr "é¢?è?²è¡¨è??å??"
 
 #: ../app/actions/colormap-actions.c:48
-#: ../app/actions/palette-editor-actions.c:48
+msgctxt "colormap-action"
 msgid "_Edit Color..."
 msgstr "����(_E)..."
 
 #: ../app/actions/colormap-actions.c:49
-#: ../app/actions/palette-editor-actions.c:49
-msgid "Edit color"
-msgstr "����"
+msgctxt "colormap-action"
+msgid "Edit this color"
+msgstr "��此��"
 
 #: ../app/actions/colormap-actions.c:57
+msgctxt "colormap-action"
 msgid "_Add Color from FG"
 msgstr "æ·»å? å??æ?¯è?²(_A)"
 
 #: ../app/actions/colormap-actions.c:58
+msgctxt "colormap-action"
 msgid "Add current foreground color"
 msgstr "æ·»å? å½?å??å??æ?¯è?²"
 
 #: ../app/actions/colormap-actions.c:63
+msgctxt "colormap-action"
 msgid "_Add Color from BG"
 msgstr "æ·»å? è??æ?¯è?²(_A)"
 
 #: ../app/actions/colormap-actions.c:64
+msgctxt "colormap-action"
 msgid "Add current background color"
 msgstr "æ·»å? å½?å??è??æ?¯è?²"
 
@@ -720,120 +787,158 @@ msgstr "����表项 #%d"
 msgid "Edit Colormap Entry"
 msgstr "����表项"
 
-#: ../app/actions/config-actions.c:39
+#: ../app/actions/config-actions.c:38
+msgctxt "config-action"
 msgid "Use _GEGL"
-msgstr "使�_GEGL"
+msgstr "使� _GEGL"
 
-#: ../app/actions/config-actions.c:40
+#: ../app/actions/config-actions.c:39
+msgctxt "config-action"
 msgid "If possible, use GEGL for image processing"
-msgstr "å°½å?¯è?½ç??使ç?¨GEGLå¤?ç??å?¾å??"
+msgstr "å°½å?¯è?½ç??使ç?¨ GEGL å¤?ç??å?¾å??"
 
 #: ../app/actions/context-actions.c:46
+msgctxt "context-action"
 msgid "_Context"
 msgstr "��(_C)"
 
-#: ../app/actions/context-actions.c:47 ../app/actions/image-actions.c:59
+#: ../app/actions/context-actions.c:48
+msgctxt "context-action"
 msgid "_Colors"
 msgstr "��(_C)"
 
-#: ../app/actions/context-actions.c:48 ../app/actions/layers-actions.c:58
+#: ../app/actions/context-actions.c:50
+msgctxt "context-action"
 msgid "_Opacity"
 msgstr "ä¸?é??æ??度(_O)"
 
-#: ../app/actions/context-actions.c:49
+#: ../app/actions/context-actions.c:52
+msgctxt "context-action"
 msgid "Paint _Mode"
 msgstr "��模�(_M)"
 
-#: ../app/actions/context-actions.c:50
+#: ../app/actions/context-actions.c:54
+msgctxt "context-action"
 msgid "_Tool"
 msgstr "工�(_T)"
 
-#: ../app/actions/context-actions.c:51
-#: ../app/dialogs/preferences-dialog.c:1940
+#: ../app/actions/context-actions.c:56
+msgctxt "context-action"
 msgid "_Brush"
 msgstr "��(_B)"
 
-#: ../app/actions/context-actions.c:52 ../app/actions/plug-in-actions.c:99
-#: ../app/dialogs/preferences-dialog.c:1943
+#: ../app/actions/context-actions.c:58
+msgctxt "context-action"
 msgid "_Pattern"
 msgstr "��(_P)"
 
-#: ../app/actions/context-actions.c:53
+#: ../app/actions/context-actions.c:60
+msgctxt "context-action"
 msgid "_Palette"
 msgstr "��(_P)"
 
-#: ../app/actions/context-actions.c:54
-#: ../app/dialogs/palette-import-dialog.c:216
-#: ../app/dialogs/preferences-dialog.c:1946
+#: ../app/actions/context-actions.c:62
+msgctxt "context-action"
 msgid "_Gradient"
 msgstr "æ¸?å??(_G)"
 
-#: ../app/actions/context-actions.c:55
+#: ../app/actions/context-actions.c:64
+msgctxt "context-action"
 msgid "_Font"
 msgstr "å­?ä½?(_F)"
 
-#: ../app/actions/context-actions.c:57
+#: ../app/actions/context-actions.c:67
+msgctxt "context-action"
 msgid "_Shape"
 msgstr "形�(_S)"
 
-#: ../app/actions/context-actions.c:58
+#: ../app/actions/context-actions.c:69
+msgctxt "context-action"
 msgid "_Radius"
 msgstr "å??å¾?(_R)"
 
-#: ../app/actions/context-actions.c:59
+#: ../app/actions/context-actions.c:71
+msgctxt "context-action"
 msgid "S_pikes"
 msgstr "ç©?æ?°(_P)"
 
-#: ../app/actions/context-actions.c:60
+#: ../app/actions/context-actions.c:73
+msgctxt "context-action"
 msgid "_Hardness"
 msgstr "硬度(_H)"
 
-#: ../app/actions/context-actions.c:61
-msgid "_Aspect"
+#: ../app/actions/context-actions.c:75
+msgctxt "context-action"
+msgid "_Aspect Ratio"
 msgstr "宽��(_A)"
 
-#: ../app/actions/context-actions.c:62
+#: ../app/actions/context-actions.c:77
+msgctxt "context-action"
 msgid "A_ngle"
 msgstr "�度(_N)"
 
-#: ../app/actions/context-actions.c:65
+#: ../app/actions/context-actions.c:80
+msgctxt "context-action"
 msgid "_Default Colors"
 msgstr "�认��(_D)"
 
-#: ../app/actions/context-actions.c:66
+#: ../app/actions/context-actions.c:82
+msgctxt "context-action"
 msgid "Set foreground color to black, background color to white"
 msgstr "å°?å??æ?¯è®¾å®?为é»?è?²ï¼?è??æ?¯è®¾å®?为ç?½è?²"
 
-#: ../app/actions/context-actions.c:71
+#: ../app/actions/context-actions.c:87
+msgctxt "context-action"
 msgid "S_wap Colors"
 msgstr "交���(_W)"
 
-#: ../app/actions/context-actions.c:72
+#: ../app/actions/context-actions.c:88
+msgctxt "context-action"
 msgid "Exchange foreground and background colors"
 msgstr "交æ?¢å??æ?¯è?²å??è??æ?¯è?²"
 
+#: ../app/actions/context-commands.c:426
+#, c-format
+msgid "Paint Mode: %s"
+msgstr "��模��%s"
+
+#: ../app/actions/context-commands.c:551
+#, c-format
+msgid "Brush Shape: %s"
+msgstr "��形��%s"
+
+#: ../app/actions/context-commands.c:610
+#, c-format
+msgid "Brush Radius: %2.2f"
+msgstr "ç?»ç¬?å??å¾?ï¼?%2.2f"
+
+#: ../app/actions/context-commands.c:714
+#, c-format
+msgid "Brush Angle: %2.2f"
+msgstr "���度�%2.2f"
+
 #: ../app/actions/cursor-info-actions.c:40
+msgctxt "cursor-info-action"
 msgid "Pointer Information Menu"
 msgstr "æ??é??ä¿¡æ?¯è??å??"
 
 #: ../app/actions/cursor-info-actions.c:47
-#: ../app/actions/sample-points-actions.c:47
-#: ../app/widgets/gimpcursorview.c:192
+msgctxt "cursor-info-action"
 msgid "_Sample Merged"
 msgstr "ä½?æ ·å??并(_S)"
 
 #: ../app/actions/cursor-info-actions.c:48
-#: ../app/actions/sample-points-actions.c:48
-msgid "Sample Merged"
-msgstr "ä½?æ ·å??并"
-
-#: ../app/actions/data-commands.c:107 ../app/actions/documents-commands.c:344
-#: ../app/actions/file-commands.c:184 ../app/dialogs/file-open-dialog.c:220
-#: ../app/dialogs/file-open-dialog.c:264
-#: ../app/dialogs/file-open-location-dialog.c:213
-#: ../app/dialogs/file-open-location-dialog.c:225
+msgctxt "cursor-info-action"
+msgid "Use the composite color of all visible layers"
+msgstr "使ç?¨æ??æ??å?¯è§?å?¾å±?ç??æ··å??é¢?è?²"
+
+#: ../app/actions/data-commands.c:106 ../app/actions/documents-commands.c:342
+#: ../app/actions/file-commands.c:193 ../app/dialogs/file-open-dialog.c:221
+#: ../app/dialogs/file-open-dialog.c:265
+#: ../app/dialogs/file-open-location-dialog.c:212
+#: ../app/dialogs/file-open-location-dialog.c:224
 #: ../app/display/gimpdisplayshell-dnd.c:537
-#: ../app/widgets/gimplayertreeview.c:730 ../app/widgets/gimptoolbox-dnd.c:158
+#: ../app/widgets/gimplayertreeview.c:757 ../app/widgets/gimptoolbox-dnd.c:158
 #: ../app/widgets/gimptoolbox.c:979
 #, c-format
 msgid ""
@@ -845,793 +950,999 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/actions/data-commands.c:133
-#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1419
-#: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:222
-#: ../app/core/gimppalette.c:333 ../app/dialogs/palette-import-dialog.c:774
-#: ../app/pdb/image-cmds.c:2198 ../app/widgets/gimpdnd-xds.c:92
+#: ../app/actions/data-commands.c:132
+#: ../app/core/gimpbrushgenerated-load.c:124 ../app/core/gimpimage.c:1423
+#: ../app/core/gimppalette-import.c:210 ../app/core/gimppalette-load.c:222
+#: ../app/core/gimppalette.c:378 ../app/dialogs/palette-import-dialog.c:771
+#: ../app/widgets/gimpdnd-xds.c:92
 msgid "Untitled"
 msgstr "���"
 
-#: ../app/actions/data-commands.c:231
+#: ../app/actions/data-commands.c:232
 msgid "Delete Object"
 msgstr "��对象"
 
-#: ../app/actions/data-commands.c:254
+#: ../app/actions/data-commands.c:255
 #, c-format
 msgid "Delete '%s'?"
 msgstr "å? é?¤â??%sâ??ï¼?"
 
-#: ../app/actions/data-commands.c:257
+#: ../app/actions/data-commands.c:258
 #, c-format
 msgid ""
 "Are you sure you want to remove '%s' from the list and delete it on disk?"
 msgstr "æ?¨ç¡®è®¤è¦?ä»?å??表移é?¤â??%sâ??并å?¨ç£?ç??ä¸?å? é?¤å®?å??ï¼?"
 
-#: ../app/actions/dialogs-actions.c:39
+#: ../app/actions/dialogs-actions.c:38
+msgctxt "dialogs-action"
 msgid "Tool _Options"
 msgstr "å·¥å?·é??项(_O)"
 
-#: ../app/actions/dialogs-actions.c:40
+#: ../app/actions/dialogs-actions.c:39
+msgctxt "dialogs-action"
 msgid "Open the tool options dialog"
 msgstr "æ??å¼?å·¥å?·é??项对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:45
+#: ../app/actions/dialogs-actions.c:44
+msgctxt "dialogs-action"
 msgid "_Device Status"
 msgstr "设å¤?ç?¶æ??(_D)"
 
-#: ../app/actions/dialogs-actions.c:46
+#: ../app/actions/dialogs-actions.c:45
+msgctxt "dialogs-action"
 msgid "Open the device status dialog"
 msgstr "æ??å¼?设å¤?ç?¶æ??对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:51
+#: ../app/actions/dialogs-actions.c:50
+msgctxt "dialogs-action"
 msgid "_Layers"
 msgstr "��(_L)"
 
-#: ../app/actions/dialogs-actions.c:52
+#: ../app/actions/dialogs-actions.c:51
+msgctxt "dialogs-action"
 msgid "Open the layers dialog"
 msgstr "æ??å¼?å?¾å±?对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:57
+#: ../app/actions/dialogs-actions.c:56
+msgctxt "dialogs-action"
 msgid "_Channels"
 msgstr "é??é??(_C)"
 
-#: ../app/actions/dialogs-actions.c:58
+#: ../app/actions/dialogs-actions.c:57
+msgctxt "dialogs-action"
 msgid "Open the channels dialog"
 msgstr "æ??å¼?é??é??对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:63
+#: ../app/actions/dialogs-actions.c:62
+msgctxt "dialogs-action"
 msgid "_Paths"
 msgstr "路�(_P)"
 
-#: ../app/actions/dialogs-actions.c:64
+#: ../app/actions/dialogs-actions.c:63
+msgctxt "dialogs-action"
 msgid "Open the paths dialog"
 msgstr "æ??å¼?è·¯å¾?对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:69
+#: ../app/actions/dialogs-actions.c:68
+msgctxt "dialogs-action"
 msgid "Color_map"
 msgstr "��表(_M)"
 
-#: ../app/actions/dialogs-actions.c:70
+#: ../app/actions/dialogs-actions.c:69
+msgctxt "dialogs-action"
 msgid "Open the colormap dialog"
 msgstr "æ??å¼?é¢?è?²è¡¨å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:75
+#: ../app/actions/dialogs-actions.c:74
+msgctxt "dialogs-action"
 msgid "Histogra_m"
 msgstr "���(_M)"
 
-#: ../app/actions/dialogs-actions.c:76
+#: ../app/actions/dialogs-actions.c:75
+msgctxt "dialogs-action"
 msgid "Open the histogram dialog"
 msgstr "æ??å¼?ç?´æ?¹å?¾å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:81
+#: ../app/actions/dialogs-actions.c:80
+msgctxt "dialogs-action"
 msgid "_Selection Editor"
 msgstr "é??å?ºç¼?è¾?å?¨(_S)"
 
-#: ../app/actions/dialogs-actions.c:82
+#: ../app/actions/dialogs-actions.c:81
+msgctxt "dialogs-action"
 msgid "Open the selection editor"
 msgstr "æ??å¼?é??æ?©ç¼?è¾?å?¨"
 
-#: ../app/actions/dialogs-actions.c:87
+#: ../app/actions/dialogs-actions.c:86
+msgctxt "dialogs-action"
 msgid "Na_vigation"
 msgstr "导�(_V)"
 
-#: ../app/actions/dialogs-actions.c:88
+#: ../app/actions/dialogs-actions.c:87
+msgctxt "dialogs-action"
 msgid "Open the display navigation dialog"
 msgstr "æ??å¼?æ?¾ç¤ºå¯¼è?ªå¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:93
+#: ../app/actions/dialogs-actions.c:92
+msgctxt "dialogs-action"
 msgid "Undo _History"
 msgstr "æ?¤æ¶?å??å?²(_H)"
 
-#: ../app/actions/dialogs-actions.c:94
+#: ../app/actions/dialogs-actions.c:93
+msgctxt "dialogs-action"
 msgid "Open the undo history dialog"
 msgstr "æ??å¼?æ?¤æ¶?å??å?²å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:99 ../app/dialogs/dialogs.c:150
+#: ../app/actions/dialogs-actions.c:98
+msgctxt "dialogs-action"
 msgid "Pointer"
 msgstr "æ??é??"
 
-#: ../app/actions/dialogs-actions.c:100
+#: ../app/actions/dialogs-actions.c:99
+msgctxt "dialogs-action"
 msgid "Open the pointer information dialog"
 msgstr "æ??å¼?æ??é??ä¿¡æ?¯å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:105
+#: ../app/actions/dialogs-actions.c:104
+msgctxt "dialogs-action"
 msgid "_Sample Points"
 msgstr "é??æ ·ç?¹(_S)"
 
-#: ../app/actions/dialogs-actions.c:106
+#: ../app/actions/dialogs-actions.c:105
+msgctxt "dialogs-action"
 msgid "Open the sample points dialog"
 msgstr "æ??å¼?é??æ ·ç?¹å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:111
+#: ../app/actions/dialogs-actions.c:110
+msgctxt "dialogs-action"
 msgid "Colo_rs"
 msgstr "��(_R)"
 
-#: ../app/actions/dialogs-actions.c:112
+#: ../app/actions/dialogs-actions.c:111
+msgctxt "dialogs-action"
 msgid "Open the FG/BG color dialog"
 msgstr "æ??å¼?å??æ?¯/è??æ?¯è?²å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:117
+#: ../app/actions/dialogs-actions.c:116
+msgctxt "dialogs-action"
 msgid "_Brushes"
 msgstr "��(_B)"
 
-#: ../app/actions/dialogs-actions.c:118
+#: ../app/actions/dialogs-actions.c:117
+msgctxt "dialogs-action"
 msgid "Open the brushes dialog"
 msgstr "æ??å¼?ç?»ç¬?对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:124
+#: ../app/actions/dialogs-actions.c:122
+msgctxt "dialogs-action"
+msgid "Brush Editor"
+msgstr "�����"
+
+#: ../app/actions/dialogs-actions.c:123
+msgctxt "dialogs-action"
 msgid "Open the brush editor"
 msgstr "æ??å¼?ç?»ç¬?ç¼?è¾?å?¨"
 
-#: ../app/actions/dialogs-actions.c:129
+#: ../app/actions/dialogs-actions.c:128
+msgctxt "dialogs-action"
 msgid "P_atterns"
 msgstr "��(_A)"
 
-#: ../app/actions/dialogs-actions.c:130
+#: ../app/actions/dialogs-actions.c:129
+msgctxt "dialogs-action"
 msgid "Open the patterns dialog"
 msgstr "æ??å¼?å?¾æ¡?对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:135
+#: ../app/actions/dialogs-actions.c:134
+msgctxt "dialogs-action"
 msgid "_Gradients"
 msgstr "æ¸?å??(_G)"
 
-#: ../app/actions/dialogs-actions.c:136
+#: ../app/actions/dialogs-actions.c:135
+msgctxt "dialogs-action"
 msgid "Open the gradients dialog"
 msgstr "æ??å¼?æ¸?å??对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:142
+#: ../app/actions/dialogs-actions.c:140
+msgctxt "dialogs-action"
+msgid "Gradient Editor"
+msgstr "æ¸?å??ç¼?è¾?å?¨"
+
+#: ../app/actions/dialogs-actions.c:141
+msgctxt "dialogs-action"
 msgid "Open the gradient editor"
-msgstr "æ??å¼?æ¸?å??æ??æ??ç¼?è¾?å?¨"
+msgstr "æ??å¼?æ¸?å??ç¼?è¾?å?¨"
 
-#: ../app/actions/dialogs-actions.c:147
+#: ../app/actions/dialogs-actions.c:146
+msgctxt "dialogs-action"
 msgid "Pal_ettes"
 msgstr "��(_E)"
 
-#: ../app/actions/dialogs-actions.c:148
+#: ../app/actions/dialogs-actions.c:147
+msgctxt "dialogs-action"
 msgid "Open the palettes dialog"
 msgstr "æ??å¼?è?²æ?¿å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:154
+#: ../app/actions/dialogs-actions.c:152
+msgctxt "dialogs-action"
+msgid "Palette Editor"
+msgstr "�����"
+
+#: ../app/actions/dialogs-actions.c:153
+msgctxt "dialogs-action"
 msgid "Open the palette editor"
 msgstr "æ??å¼?è?²æ?¿ç¼?è¾?å?¨"
 
-#: ../app/actions/dialogs-actions.c:159
+#: ../app/actions/dialogs-actions.c:158
+msgctxt "dialogs-action"
 msgid "_Fonts"
 msgstr "å­?ä½?(_F)"
 
-#: ../app/actions/dialogs-actions.c:160
+#: ../app/actions/dialogs-actions.c:159
+msgctxt "dialogs-action"
 msgid "Open the fonts dialog"
 msgstr "æ??å¼?å­?ä½?对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:165
+#: ../app/actions/dialogs-actions.c:164
+msgctxt "dialogs-action"
 msgid "B_uffers"
 msgstr "���(_U)"
 
-#: ../app/actions/dialogs-actions.c:166
+#: ../app/actions/dialogs-actions.c:165
+msgctxt "dialogs-action"
 msgid "Open the named buffers dialog"
 msgstr "æ??å¼?å?½å??ç¼?å?²å?ºå¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:171
+#: ../app/actions/dialogs-actions.c:170
+msgctxt "dialogs-action"
 msgid "_Images"
 msgstr "å?¾å??(_I)"
 
-#: ../app/actions/dialogs-actions.c:172
+#: ../app/actions/dialogs-actions.c:171
+msgctxt "dialogs-action"
 msgid "Open the images dialog"
 msgstr "æ??å¼?å?¾å??对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:177
+#: ../app/actions/dialogs-actions.c:176
+msgctxt "dialogs-action"
 msgid "Document Histor_y"
 msgstr "æ??æ¡£å??å?²(_Y)"
 
-#: ../app/actions/dialogs-actions.c:178
+#: ../app/actions/dialogs-actions.c:177
+msgctxt "dialogs-action"
 msgid "Open the document history dialog"
-msgstr "æ??å¼?æ??æ¡£é??æ?©å¯¹è¯?æ¡?"
+msgstr "æ??å¼?æ??æ¡£å??å?²å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:183
+#: ../app/actions/dialogs-actions.c:182
+msgctxt "dialogs-action"
 msgid "_Templates"
 msgstr "模�(_T)"
 
-#: ../app/actions/dialogs-actions.c:184
+#: ../app/actions/dialogs-actions.c:183
+msgctxt "dialogs-action"
 msgid "Open the image templates dialog"
 msgstr "æ??å¼?å?¾å??模ç??对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:189
+#: ../app/actions/dialogs-actions.c:188
+msgctxt "dialogs-action"
 msgid "T_ools"
 msgstr "工�(_O)"
 
-#: ../app/actions/dialogs-actions.c:190
+#: ../app/actions/dialogs-actions.c:189
+msgctxt "dialogs-action"
 msgid "Open the tools dialog"
 msgstr "æ??å¼?å·¥å?·å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:195
+#: ../app/actions/dialogs-actions.c:194
+msgctxt "dialogs-action"
 msgid "Error Co_nsole"
 msgstr "é??误æ?§å?¶å?°(_N)"
 
-#: ../app/actions/dialogs-actions.c:196
+#: ../app/actions/dialogs-actions.c:195
+msgctxt "dialogs-action"
 msgid "Open the error console"
 msgstr "æ??å¼?é??误æ?§å?¶å?°"
 
-#: ../app/actions/dialogs-actions.c:206
+#: ../app/actions/dialogs-actions.c:205
+msgctxt "dialogs-action"
 msgid "_Preferences"
 msgstr "é¦?é??项(_P)"
 
-#: ../app/actions/dialogs-actions.c:207
+#: ../app/actions/dialogs-actions.c:206
+msgctxt "dialogs-action"
 msgid "Open the preferences dialog"
 msgstr "æ??å¼?é¦?é??项对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:212
+#: ../app/actions/dialogs-actions.c:211
+msgctxt "dialogs-action"
 msgid "_Keyboard Shortcuts"
 msgstr "å¿«æ?·é?®(_K)"
 
-#: ../app/actions/dialogs-actions.c:213
+#: ../app/actions/dialogs-actions.c:212
+msgctxt "dialogs-action"
 msgid "Open the keyboard shortcuts editor"
 msgstr "æ??å¼?å¿«æ?·é?®ç¼?è¾?å?¨"
 
-#: ../app/actions/dialogs-actions.c:218
+#: ../app/actions/dialogs-actions.c:217
+msgctxt "dialogs-action"
 msgid "_Modules"
 msgstr "模å??(_M)"
 
-#: ../app/actions/dialogs-actions.c:219
+#: ../app/actions/dialogs-actions.c:218
+msgctxt "dialogs-action"
 msgid "Open the module manager dialog"
 msgstr "æ??å¼?模å??管ç??å?¨å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:224
+#: ../app/actions/dialogs-actions.c:223
+msgctxt "dialogs-action"
 msgid "_Tip of the Day"
 msgstr "æ?¥ç§¯æ??ç´¯(_T)"
 
-#: ../app/actions/dialogs-actions.c:225
+#: ../app/actions/dialogs-actions.c:224
+msgctxt "dialogs-action"
 msgid "Show some helpful tips on using GIMP"
-msgstr "æ?¾ç¤ºä¸?äº?å?³äº?GIMPç??å°?贴士"
+msgstr "æ?¾ç¤ºä¸?äº?å?³äº? GIMP ç??å°?贴士"
 
-#: ../app/actions/dialogs-actions.c:230
+#: ../app/actions/dialogs-actions.c:229
+msgctxt "dialogs-action"
 msgid "_About"
 msgstr "��(_A)"
 
-#: ../app/actions/dialogs-actions.c:231 ../app/dialogs/about-dialog.c:114
-#: ../app/gui/gui.c:473
+#: ../app/actions/dialogs-actions.c:230
+msgctxt "dialogs-action"
 msgid "About GIMP"
 msgstr "�� GIMP"
 
-#: ../app/actions/dock-actions.c:43
+#: ../app/actions/dock-actions.c:42
+msgctxt "dock-action"
 msgid "M_ove to Screen"
 msgstr "移����(_O)"
 
-#: ../app/actions/dock-actions.c:47
+#: ../app/actions/dock-actions.c:46
+msgctxt "dock-action"
 msgid "Close Dock"
 msgstr "å?³é?­å??é? "
 
-#: ../app/actions/dock-actions.c:52 ../app/actions/view-actions.c:123
+#: ../app/actions/dock-actions.c:51
+msgctxt "dock-action"
 msgid "_Open Display..."
 msgstr "æ??å¼?æ?¾ç¤º(_O)..."
 
-#: ../app/actions/dock-actions.c:53 ../app/actions/view-actions.c:124
+#: ../app/actions/dock-actions.c:52
+msgctxt "dock-action"
 msgid "Connect to another display"
 msgstr "�����个�示"
 
-#: ../app/actions/dock-actions.c:61
+#: ../app/actions/dock-actions.c:60
+msgctxt "dock-action"
 msgid "_Show Image Selection"
 msgstr "æ?¾ç¤ºå?¾å??é??å?º(_S)"
 
-#: ../app/actions/dock-actions.c:67
+#: ../app/actions/dock-actions.c:66
+msgctxt "dock-action"
 msgid "Auto _Follow Active Image"
 msgstr "è?ªå?¨è·?é??æ´»å?¨å?¾å??(_F)"
 
-#: ../app/actions/dockable-actions.c:49
+#: ../app/actions/dockable-actions.c:48
+msgctxt "dockable-action"
 msgid "Dialogs Menu"
 msgstr "对è¯?æ¡?è??å??"
 
 #: ../app/actions/dockable-actions.c:53
+msgctxt "dockable-action"
 msgid "_Add Tab"
 msgstr "添�页签(_A)"
 
-#: ../app/actions/dockable-actions.c:54
+#: ../app/actions/dockable-actions.c:55
+msgctxt "dockable-action"
 msgid "_Preview Size"
 msgstr "��大�(_P)"
 
-#: ../app/actions/dockable-actions.c:55
+#: ../app/actions/dockable-actions.c:57
+msgctxt "dockable-action"
 msgid "_Tab Style"
 msgstr "页签�格(_T)"
 
-#: ../app/actions/dockable-actions.c:58
+#: ../app/actions/dockable-actions.c:60
+msgctxt "dockable-action"
 msgid "_Close Tab"
 msgstr "��页签(_C)"
 
-#: ../app/actions/dockable-actions.c:63
+#: ../app/actions/dockable-actions.c:65
+msgctxt "dockable-action"
 msgid "_Detach Tab"
 msgstr "�移页签(_D)"
 
-#: ../app/actions/dockable-actions.c:81
+#: ../app/actions/dockable-actions.c:84
+msgctxt "preview-size"
 msgid "_Tiny"
 msgstr "ç»?å°?(_T)"
 
-#: ../app/actions/dockable-actions.c:82
+#: ../app/actions/dockable-actions.c:86
+msgctxt "preview-size"
 msgid "E_xtra Small"
 msgstr "å? å°?(_X)"
 
-#: ../app/actions/dockable-actions.c:83
+#: ../app/actions/dockable-actions.c:88
+msgctxt "preview-size"
 msgid "_Small"
 msgstr "å°?(_S)"
 
-#: ../app/actions/dockable-actions.c:84
+#: ../app/actions/dockable-actions.c:90
+msgctxt "preview-size"
 msgid "_Medium"
 msgstr "中(_M)"
 
-#: ../app/actions/dockable-actions.c:85
+#: ../app/actions/dockable-actions.c:92
+msgctxt "preview-size"
 msgid "_Large"
 msgstr "大(_L)"
 
-#: ../app/actions/dockable-actions.c:86
+#: ../app/actions/dockable-actions.c:94
+msgctxt "preview-size"
 msgid "Ex_tra Large"
 msgstr "�大(_T)"
 
-#: ../app/actions/dockable-actions.c:87
+#: ../app/actions/dockable-actions.c:96
+msgctxt "preview-size"
 msgid "_Huge"
 msgstr "�大(_H)"
 
-#: ../app/actions/dockable-actions.c:88
+#: ../app/actions/dockable-actions.c:98
+msgctxt "preview-size"
 msgid "_Enormous"
 msgstr "巨大(_E)"
 
-#: ../app/actions/dockable-actions.c:89
+#: ../app/actions/dockable-actions.c:100
+msgctxt "preview-size"
 msgid "_Gigantic"
 msgstr "æ??大(_G)"
 
-#: ../app/actions/dockable-actions.c:94
+#: ../app/actions/dockable-actions.c:106
+msgctxt "tab-style"
 msgid "_Icon"
 msgstr "��(_I)"
 
-#: ../app/actions/dockable-actions.c:95
+#: ../app/actions/dockable-actions.c:108
+msgctxt "tab-style"
 msgid "Current _Status"
 msgstr "å½?å??ç?¶æ??(_S)"
 
-#: ../app/actions/dockable-actions.c:96
+#: ../app/actions/dockable-actions.c:110
+msgctxt "tab-style"
 msgid "_Text"
 msgstr "æ??å­?(_T)"
 
-#: ../app/actions/dockable-actions.c:97
+#: ../app/actions/dockable-actions.c:112
+msgctxt "tab-style"
 msgid "I_con & Text"
 msgstr "å?¾æ ?å??æ??å­?(_C)"
 
-#: ../app/actions/dockable-actions.c:98
+#: ../app/actions/dockable-actions.c:114
+msgctxt "tab-style"
 msgid "St_atus & Text"
 msgstr "ç?¶æ??å??æ??å­?(_A)"
 
-#: ../app/actions/dockable-actions.c:108
+#: ../app/actions/dockable-actions.c:124
+msgctxt "dockable-action"
 msgid "Loc_k Tab to Dock"
-msgstr "å°?æ ?ç­¾é??å®?å?°å??é? (_k)"
+msgstr "å°?页签é??å®?å?°å??é? (_k)"
 
-#: ../app/actions/dockable-actions.c:109
+#: ../app/actions/dockable-actions.c:126
+msgctxt "dockable-action"
 msgid "Protect this tab from being dragged with the mouse pointer"
-msgstr "��此�签"
+msgstr "ä¿?æ?¤æ­¤é¡µç­¾ä¸?被鼠æ ?æ??é??æ??æ?½"
 
-#: ../app/actions/dockable-actions.c:115
+#: ../app/actions/dockable-actions.c:132
+msgctxt "dockable-action"
 msgid "Show _Button Bar"
 msgstr "æ?¾ç¤ºæ??é?®æ ?(_B)"
 
-#: ../app/actions/dockable-actions.c:124
+#: ../app/actions/dockable-actions.c:141
+msgctxt "dockable-action"
 msgid "View as _List"
 msgstr "以å??表æ?¹å¼?æ?¥ç??(_L)"
 
-#: ../app/actions/dockable-actions.c:129
+#: ../app/actions/dockable-actions.c:146
+msgctxt "dockable-action"
 msgid "View as _Grid"
 msgstr "以é?µå??æ?¹å¼?æ?¥ç??(_G)"
 
-#: ../app/actions/documents-actions.c:42
+#: ../app/actions/documents-actions.c:41
+msgctxt "documents-action"
 msgid "Documents Menu"
 msgstr "æ??æ¡£è??å??"
 
-#: ../app/actions/documents-actions.c:46
+#: ../app/actions/documents-actions.c:45
+msgctxt "documents-action"
 msgid "_Open Image"
 msgstr "æ??å¼?å?¾å??(_O)"
 
-#: ../app/actions/documents-actions.c:47
+#: ../app/actions/documents-actions.c:46
+msgctxt "documents-action"
 msgid "Open the selected entry"
 msgstr "æ??å¼?é??中ç??项"
 
-#: ../app/actions/documents-actions.c:52
+#: ../app/actions/documents-actions.c:51
+msgctxt "documents-action"
 msgid "_Raise or Open Image"
 msgstr "å??é«?æ??æ??å¼?å?¾å??(_R)"
 
-#: ../app/actions/documents-actions.c:53
+#: ../app/actions/documents-actions.c:52
+msgctxt "documents-action"
 msgid "Raise window if already open"
 msgstr "å¦?æ??å·²æ??å¼?å??å??é«?çª?å?£"
 
-#: ../app/actions/documents-actions.c:58
+#: ../app/actions/documents-actions.c:57
+msgctxt "documents-action"
 msgid "File Open _Dialog"
 msgstr "æ??件æ??å¼?对è¯?æ¡?(_D)"
 
-#: ../app/actions/documents-actions.c:59
+#: ../app/actions/documents-actions.c:58
+msgctxt "documents-action"
 msgid "Open image dialog"
 msgstr "æ??å¼?å?¾å??对è¯?æ¡?"
 
-#: ../app/actions/documents-actions.c:64
+#: ../app/actions/documents-actions.c:63
+msgctxt "documents-action"
 msgid "Copy Image _Location"
 msgstr "å¤?å?¶å?¾å??ä½?ç½®(_L)"
 
-#: ../app/actions/documents-actions.c:65
+#: ../app/actions/documents-actions.c:64
+msgctxt "documents-action"
 msgid "Copy image location to clipboard"
 msgstr "å°?å?¾å??ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/documents-actions.c:70
+#: ../app/actions/documents-actions.c:69
+msgctxt "documents-action"
 msgid "Remove _Entry"
 msgstr "��项�(_E)"
 
-#: ../app/actions/documents-actions.c:71
+#: ../app/actions/documents-actions.c:70
+msgctxt "documents-action"
 msgid "Remove the selected entry"
 msgstr "å? é?¤é??中ç??项"
 
-#: ../app/actions/documents-actions.c:76
+#: ../app/actions/documents-actions.c:75
+msgctxt "documents-action"
 msgid "_Clear History"
 msgstr "æ¸?é?¤å??å?²(_C)"
 
-#: ../app/actions/documents-actions.c:77
+#: ../app/actions/documents-actions.c:76
+msgctxt "documents-action"
 msgid "Clear the entire document history"
 msgstr "æ¸?é?¤æ?´ä¸ªæ??æ¡£å??å?²"
 
-#: ../app/actions/documents-actions.c:82
+#: ../app/actions/documents-actions.c:81
+msgctxt "documents-action"
 msgid "Recreate _Preview"
 msgstr "é??æ?°ç??æ??é¢?è§?(_P)"
 
-#: ../app/actions/documents-actions.c:83
+#: ../app/actions/documents-actions.c:82
+msgctxt "documents-action"
 msgid "Recreate preview"
 msgstr "é??æ?°ç??æ??é¢?è§?"
 
-#: ../app/actions/documents-actions.c:88
+#: ../app/actions/documents-actions.c:87
+msgctxt "documents-action"
 msgid "Reload _all Previews"
 msgstr "é??æ?°å? è½½æ??æ??é¢?è§?(_A)"
 
-#: ../app/actions/documents-actions.c:89
+#: ../app/actions/documents-actions.c:88
+msgctxt "documents-action"
 msgid "Reload all previews"
 msgstr "é??æ?°å? è½½æ??æ??é¢?è§?"
 
-#: ../app/actions/documents-actions.c:94
+#: ../app/actions/documents-actions.c:93
+msgctxt "documents-action"
 msgid "Remove Dangling E_ntries"
 msgstr "å? é?¤å·²ä¸?å­?å?¨ç??项ç?®(_N)"
 
 #: ../app/actions/documents-actions.c:95
-msgid "Remove dangling entries"
-msgstr "å? é?¤å·²ä¸?å­?å?¨ç??项ç?®"
+msgctxt "documents-action"
+msgid "Remove entries for which the corresponding file is not available"
+msgstr "å°?ä¸?å?¯ç?¨ç??æ??件ç??ç?¸å?³é¡¹ç§»é?¤"
 
-#: ../app/actions/documents-commands.c:198
+#: ../app/actions/documents-commands.c:191
 msgid "Clear Document History"
 msgstr "æ¸?é?¤æ??æ¡£å??å?²"
 
-#: ../app/actions/documents-commands.c:221
+#: ../app/actions/documents-commands.c:214
 msgid "Clear the Recent Documents list?"
 msgstr "æ¸?é?¤æ??æ¡£å??å?²ï¼?"
 
-#: ../app/actions/documents-commands.c:224
+#: ../app/actions/documents-commands.c:217
 msgid ""
-"Clearing the document history will permanently remove all items from the "
-"recent documents list in all applications."
-msgstr "æ¸?é?¤æ??æ¡£å??å?²å°?æ°¸ä¹?å? é?¤å½?å??æ??æ??å??å?ºç??项ã??"
+"Clearing the document history will permanently remove all images from the "
+"recent documents list."
+msgstr "æ¸?é?¤æ??æ¡£å??å?²å°?ä»?æ??è¿?æ??æ¡£å??表中永ä¹?移é?¤æ??æ??å?¾å??ã??"
 
 #: ../app/actions/drawable-actions.c:45
+msgctxt "drawable-action"
 msgid "_Equalize"
 msgstr "è?²è°?å??å??(_E)"
 
 #: ../app/actions/drawable-actions.c:46
+msgctxt "drawable-action"
 msgid "Automatic contrast enhancement"
 msgstr "��对�度�强"
 
 #: ../app/actions/drawable-actions.c:51
+msgctxt "drawable-action"
 msgid "In_vert"
 msgstr "å??ç?¸(_V)"
 
 #: ../app/actions/drawable-actions.c:52
+msgctxt "drawable-action"
 msgid "Invert the colors"
 msgstr "å??转é¢?è?²"
 
 #: ../app/actions/drawable-actions.c:57
+msgctxt "drawable-action"
 msgid "_White Balance"
 msgstr "�平衡(_W)"
 
 #: ../app/actions/drawable-actions.c:58
+msgctxt "drawable-action"
 msgid "Automatic white balance correction"
 msgstr "��校正�平衡"
 
 #: ../app/actions/drawable-actions.c:63
+msgctxt "drawable-action"
 msgid "_Offset..."
 msgstr "�移(_O)..."
 
-#: ../app/actions/drawable-actions.c:64
+#: ../app/actions/drawable-actions.c:65
+msgctxt "drawable-action"
 msgid "Shift the pixels, optionally wrapping them at the borders"
 msgstr "å??移å??ç´ ï¼?å?¯é??æ?©å?¨è¾¹ç??å¤?å??å?·å??ç´ "
 
-#: ../app/actions/drawable-actions.c:72 ../app/actions/vectors-actions.c:153
+#: ../app/actions/drawable-actions.c:73
+msgctxt "drawable-action"
 msgid "_Linked"
 msgstr "��(_L)"
 
-#: ../app/actions/drawable-actions.c:73
+#: ../app/actions/drawable-actions.c:74
+msgctxt "drawable-action"
 msgid "Toggle the linked state"
 msgstr "å??æ?¢é?¾æ?¥ç?¶æ??"
 
-#: ../app/actions/drawable-actions.c:79 ../app/actions/vectors-actions.c:147
+#: ../app/actions/drawable-actions.c:80
+msgctxt "drawable-action"
 msgid "_Visible"
 msgstr "��(_V)"
 
-#: ../app/actions/drawable-actions.c:80
+#: ../app/actions/drawable-actions.c:81
+msgctxt "drawable-action"
 msgid "Toggle visibility"
 msgstr "å??æ?¢å?¯è§?æ?§"
 
-#: ../app/actions/drawable-actions.c:89 ../app/actions/image-actions.c:159
+#: ../app/actions/drawable-actions.c:90
+msgctxt "drawable-action"
 msgid "Flip _Horizontally"
 msgstr "水平翻转(_H)"
 
-#: ../app/actions/drawable-actions.c:90
+#: ../app/actions/drawable-actions.c:91
+msgctxt "drawable-action"
 msgid "Flip horizontally"
 msgstr "水平翻转"
 
-#: ../app/actions/drawable-actions.c:95 ../app/actions/image-actions.c:165
+#: ../app/actions/drawable-actions.c:96
+msgctxt "drawable-action"
 msgid "Flip _Vertically"
 msgstr "å??ç?´ç¿»è½¬(_V)"
 
-#: ../app/actions/drawable-actions.c:96
+#: ../app/actions/drawable-actions.c:97
+msgctxt "drawable-action"
 msgid "Flip vertically"
 msgstr "å??ç?´ç¿»è½¬"
 
-#: ../app/actions/drawable-actions.c:104 ../app/actions/image-actions.c:174
+#: ../app/actions/drawable-actions.c:105
+msgctxt "drawable-action"
 msgid "Rotate 90° _clockwise"
 msgstr "顺æ?¶é??æ??转 90 度(_C)"
 
-#: ../app/actions/drawable-actions.c:105
+#: ../app/actions/drawable-actions.c:106
+msgctxt "drawable-action"
 msgid "Rotate 90 degrees to the right"
 msgstr "顺æ?¶é??æ??转 90 度"
 
-#: ../app/actions/drawable-actions.c:110 ../app/actions/image-actions.c:180
+#: ../app/actions/drawable-actions.c:111
+msgctxt "drawable-action"
 msgid "Rotate _180°"
 msgstr "æ??转 180 度(_1)"
 
-#: ../app/actions/drawable-actions.c:111
+#: ../app/actions/drawable-actions.c:112
+msgctxt "drawable-action"
 msgid "Turn upside-down"
 msgstr "ä¸?ä¸?颠å??"
 
-#: ../app/actions/drawable-actions.c:116 ../app/actions/image-actions.c:186
+#: ../app/actions/drawable-actions.c:117
+msgctxt "drawable-action"
 msgid "Rotate 90° counter-clock_wise"
 msgstr "é??æ?¶é??æ??转 90 度(_W)"
 
-#: ../app/actions/drawable-actions.c:117
+#: ../app/actions/drawable-actions.c:118
+msgctxt "drawable-action"
 msgid "Rotate 90 degrees to the left"
 msgstr "é??æ?¶é??æ??转 90 度"
 
-#: ../app/actions/drawable-commands.c:62
+#: ../app/actions/drawable-commands.c:63
 msgid "Equalize does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?è?²è°?å??å??æ??ä½?ã??"
 
-#: ../app/actions/drawable-commands.c:85
+#: ../app/actions/drawable-commands.c:87
 msgid "Invert does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?å??ç?¸æ??ä½?ã??"
 
-#: ../app/actions/drawable-commands.c:108
+#: ../app/actions/drawable-commands.c:111
 msgid "White Balance operates only on RGB color layers."
 msgstr "å?ªè?½å¯¹ RGB é¢?è?²ç??å?¾å±?è¿?è¡?ç?½å¹³è¡¡æ??ä½?ã??"
 
 #: ../app/actions/edit-actions.c:63
+msgctxt "edit-action"
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
 #: ../app/actions/edit-actions.c:64
-msgid "_Paste as"
-msgstr "�贴为(_P)"
+msgctxt "edit-action"
+msgid "Paste _as"
+msgstr "�贴为(_A)"
 
 #: ../app/actions/edit-actions.c:65
+msgctxt "edit-action"
 msgid "_Buffer"
 msgstr "���(_B)"
 
 #: ../app/actions/edit-actions.c:68
+msgctxt "edit-action"
 msgid "Undo History Menu"
 msgstr "æ?¤æ¶?å??å?²è??å??"
 
-#: ../app/actions/edit-actions.c:72 ../app/actions/edit-actions.c:313
+#: ../app/actions/edit-actions.c:72
+msgctxt "edit-action"
 msgid "_Undo"
 msgstr "��(_U)"
 
 #: ../app/actions/edit-actions.c:73
+msgctxt "edit-action"
 msgid "Undo the last operation"
 msgstr "æ?¤æ¶?ä¸?次æ??ä½?"
 
-#: ../app/actions/edit-actions.c:78 ../app/actions/edit-actions.c:314
+#: ../app/actions/edit-actions.c:78
+msgctxt "edit-action"
 msgid "_Redo"
 msgstr "é??å??(_R)"
 
 #: ../app/actions/edit-actions.c:79
+msgctxt "edit-action"
 msgid "Redo the last operation that was undone"
 msgstr "é??å??ä¸?次æ?¤æ¶?ç??æ??ä½?"
 
 #: ../app/actions/edit-actions.c:84
+msgctxt "edit-action"
 msgid "Strong Undo"
 msgstr "强å??æ?¤æ¶?"
 
 #: ../app/actions/edit-actions.c:85
+msgctxt "edit-action"
 msgid "Undo the last operation, skipping visibility changes"
 msgstr "æ?¤æ¶?ä¸?次æ??ä½?ï¼?ç?¥è¿?å?¯è§?ç?¶æ??ç??æ?¹å??"
 
 #: ../app/actions/edit-actions.c:90
+msgctxt "edit-action"
 msgid "Strong Redo"
 msgstr "强å??é??å??"
 
-#: ../app/actions/edit-actions.c:91
+#: ../app/actions/edit-actions.c:92
+msgctxt "edit-action"
 msgid "Redo the last operation that was undone, skipping visibility changes"
 msgstr "é??å??ä¸?次æ?¤æ¶?ç??æ??ä½?ï¼?ç?¥è¿?å?¯è§?ç?¶æ??ç??æ?¹å??"
 
-#: ../app/actions/edit-actions.c:96
+#: ../app/actions/edit-actions.c:97
+msgctxt "edit-action"
 msgid "_Clear Undo History"
 msgstr "æ¸?é?¤æ?¤æ¶?å??å?²(_C)"
 
-#: ../app/actions/edit-actions.c:97
+#: ../app/actions/edit-actions.c:98
+msgctxt "edit-action"
 msgid "Remove all operations from the undo history"
-msgstr "ä»?æ?¤æ¶?å??å?²ä¸­å? é?¤å?¨é?¨æ??ä½?"
+msgstr "ä»?æ?¤æ¶?å??å?²ä¸­ç§»é?¤å?¨é?¨æ??ä½?"
 
-#: ../app/actions/edit-actions.c:102 ../app/actions/edit-actions.c:315
+#: ../app/actions/edit-actions.c:103
+msgctxt "edit-action"
 msgid "_Fade..."
 msgstr "æ·¡å?º(_F)..."
 
-#: ../app/actions/edit-actions.c:103
+#: ../app/actions/edit-actions.c:105
+msgctxt "edit-action"
 msgid "Modify paint mode and opacity of the last pixel manipulation"
 msgstr "ä¿®æ?¹æ??å??ä¸?次å??ç´ å¤?ç??ç??ç»?å?¾æ¨¡å¼?å??é??æ??度"
 
-#: ../app/actions/edit-actions.c:108
+#: ../app/actions/edit-actions.c:110
+msgctxt "edit-action"
 msgid "Cu_t"
 msgstr "å?ªå??(_T)"
 
-#: ../app/actions/edit-actions.c:109
+#: ../app/actions/edit-actions.c:111
+msgctxt "edit-action"
 msgid "Move the selected pixels to the clipboard"
 msgstr "å°?é??中ç??å??素移å?¨å?°å?ªè´´æ?¿"
 
-#: ../app/actions/edit-actions.c:114
+#: ../app/actions/edit-actions.c:116
+msgctxt "edit-action"
 msgid "_Copy"
 msgstr "��(_C)"
 
-#: ../app/actions/edit-actions.c:115
+#: ../app/actions/edit-actions.c:117
+msgctxt "edit-action"
 msgid "Copy the selected pixels to the clipboard"
 msgstr "å°?é??中ç??å??ç´ å¤?å?¶å?°å?ªè´´æ?¿"
 
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:120
+#: ../app/actions/edit-actions.c:122
+msgctxt "edit-action"
 msgid "Copy _Visible"
 msgstr "����(_V)"
 
-#: ../app/actions/edit-actions.c:121
+#: ../app/actions/edit-actions.c:123
+msgctxt "edit-action"
 msgid "Copy what is visible in the selected region"
 msgstr "æ? æ³?æµ®å?¨é??å?ºï¼?å? ä¸ºé??æ?©å?ºå??为空"
 
-#: ../app/actions/edit-actions.c:126
+#: ../app/actions/edit-actions.c:128
+msgctxt "edit-action"
 msgid "_Paste"
 msgstr "ç²?è´´(_P)"
 
-#: ../app/actions/edit-actions.c:127
+#: ../app/actions/edit-actions.c:129
+msgctxt "edit-action"
 msgid "Paste the content of the clipboard"
 msgstr "å°?å??容ç²?è´´å?°å?ªè´´æ?¿"
 
-#: ../app/actions/edit-actions.c:132
+#: ../app/actions/edit-actions.c:134
+msgctxt "edit-action"
 msgid "Paste _Into"
 msgstr "ç²?è´´è¿?å?¥(_I)"
 
-#: ../app/actions/edit-actions.c:133
+#: ../app/actions/edit-actions.c:136
+msgctxt "edit-action"
 msgid "Paste the content of the clipboard into the current selection"
 msgstr "å°?å?ªè´´æ?¿ä¸­ç??å??容ç²?è´´å?°å½?å??é??å?º"
 
-#: ../app/actions/edit-actions.c:138
+#: ../app/actions/edit-actions.c:141
+msgctxt "edit-action"
 msgid "From _Clipboard"
 msgstr "��贴�(_C)"
 
-#: ../app/actions/edit-actions.c:139 ../app/actions/edit-actions.c:145
+#: ../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 "ä»?å?ªè´´æ?¿å??建æ?°å?¾å??"
+msgstr "ä»?å?ªè´´æ?¿ä¸­ç??å??容å??建æ?°å?¾å??"
 
-#: ../app/actions/edit-actions.c:144
+#: ../app/actions/edit-actions.c:147
+msgctxt "edit-action"
 msgid "_New Image"
 msgstr "æ?°å»ºå?¾å??(_N)"
 
-#: ../app/actions/edit-actions.c:150
+#: ../app/actions/edit-actions.c:153
+msgctxt "edit-action"
 msgid "New _Layer"
 msgstr "�建��(_L)"
 
-#: ../app/actions/edit-actions.c:151
+#: ../app/actions/edit-actions.c:154
+msgctxt "edit-action"
 msgid "Create a new layer from the content of the clipboard"
-msgstr "ä»?å?ªè´´æ?¿å??建æ?°å?¾å??"
+msgstr "ä»?å?ªè´´æ?¿ä¸­ç??å??容å??建æ?°å?¾å±?"
 
-#: ../app/actions/edit-actions.c:156
+#: ../app/actions/edit-actions.c:159
+msgctxt "edit-action"
 msgid "Cu_t Named..."
 msgstr "å?½å??å?ªå??(_T)..."
 
-#: ../app/actions/edit-actions.c:157
+#: ../app/actions/edit-actions.c:160
+msgctxt "edit-action"
 msgid "Move the selected pixels to a named buffer"
 msgstr "å°?é??中ç??å??素移å?¨å?°å?½å??ç¼?å?²å?º"
 
-#: ../app/actions/edit-actions.c:162
+#: ../app/actions/edit-actions.c:165
+msgctxt "edit-action"
 msgid "_Copy Named..."
 msgstr "å?½å??å¤?å?¶(_C)..."
 
-#: ../app/actions/edit-actions.c:163
+#: ../app/actions/edit-actions.c:166
+msgctxt "edit-action"
 msgid "Copy the selected pixels to a named buffer"
 msgstr "å°?é??中ç??å??ç´ å¤?å?¶å?°å?½å??ç¼?å?²å?º"
 
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:168
+#: ../app/actions/edit-actions.c:171
+msgctxt "edit-action"
 msgid "Copy _Visible Named..."
 msgstr "å?½å??å¤?å?¶å?¯è§?(_V)..."
 
-#: ../app/actions/edit-actions.c:169
+#: ../app/actions/edit-actions.c:172
+msgctxt "edit-action"
 msgid "Copy the selected region to a named buffer"
 msgstr "å°?é??中ç??è??å?´å¤?å?¶å?°å?½å??ç¼?å?²å?º"
 
-#: ../app/actions/edit-actions.c:174
+#: ../app/actions/edit-actions.c:177
+msgctxt "edit-action"
 msgid "_Paste Named..."
 msgstr "å?½å??ç²?è´´(_P)..."
 
-#: ../app/actions/edit-actions.c:175
+#: ../app/actions/edit-actions.c:178
+msgctxt "edit-action"
 msgid "Paste the content of a named buffer"
 msgstr "ç²?è´´å?½å??ç¼?å?²å?ºä¸­ç??å??容"
 
-#: ../app/actions/edit-actions.c:180
+#: ../app/actions/edit-actions.c:183
+msgctxt "edit-action"
 msgid "Cl_ear"
 msgstr "��(_E)"
 
-#: ../app/actions/edit-actions.c:181
+#: ../app/actions/edit-actions.c:184
+msgctxt "edit-action"
 msgid "Clear the selected pixels"
 msgstr "æ¸?é?¤é??中ç??å??ç´ "
 
-#: ../app/actions/edit-actions.c:189
+#: ../app/actions/edit-actions.c:192
+msgctxt "edit-action"
 msgid "Fill with _FG Color"
 msgstr "以å??æ?¯è?²å¡«å??(_F)"
 
-#: ../app/actions/edit-actions.c:190
+#: ../app/actions/edit-actions.c:193
+msgctxt "edit-action"
 msgid "Fill the selection using the foreground color"
 msgstr "使ç?¨å??æ?¯é¢?è?²å¡«å?¥é??中å?ºå??"
 
-#: ../app/actions/edit-actions.c:195
+#: ../app/actions/edit-actions.c:198
+msgctxt "edit-action"
 msgid "Fill with B_G Color"
 msgstr "以è??æ?¯è?²å¡«å??(_G)"
 
-#: ../app/actions/edit-actions.c:196
+#: ../app/actions/edit-actions.c:199
+msgctxt "edit-action"
 msgid "Fill the selection using the background color"
 msgstr "使ç?¨è??æ?¯é¢?è?²å¡«å?¥é??中å?ºå??"
 
-#: ../app/actions/edit-actions.c:201
-msgid "Fill with P_attern"
-msgstr "以å?¾æ¡?å¡«å??(_A)"
+#: ../app/actions/edit-actions.c:204
+msgctxt "edit-action"
+msgid "Fill _with Pattern"
+msgstr "以å?¾æ¡?å¡«å??(_W)"
 
-#: ../app/actions/edit-actions.c:202
+#: ../app/actions/edit-actions.c:205
+msgctxt "edit-action"
 msgid "Fill the selection using the active pattern"
 msgstr "使ç?¨å½?å??å?¾æ¡?å¡«å?¥é??中å?ºå??"
 
-#: ../app/actions/edit-actions.c:279
+#: ../app/actions/edit-actions.c:282
 #, c-format
 msgid "_Undo %s"
 msgstr "�� %s(_U)"
 
-#: ../app/actions/edit-actions.c:286
+#: ../app/actions/edit-actions.c:289
 #, c-format
 msgid "_Redo %s"
 msgstr "é??å?? %s(_R)"
 
-#: ../app/actions/edit-actions.c:301
+#: ../app/actions/edit-actions.c:304
 #, c-format
 msgid "_Fade %s..."
 msgstr "æ·¡å?º(_F) %s..."
 
+#: ../app/actions/edit-actions.c:316
+msgid "_Undo"
+msgstr "��(_U)"
+
+#: ../app/actions/edit-actions.c:317
+msgid "_Redo"
+msgstr "é??å??(_R)"
+
+#: ../app/actions/edit-actions.c:318
+msgid "_Fade..."
+msgstr "æ·¡å?º(_F)..."
+
 #: ../app/actions/edit-commands.c:134
 msgid "Clear Undo History"
 msgstr "æ¸?é?¤æ?¤æ¶?å??å?²"
@@ -1645,89 +1956,98 @@ msgstr "ç??ç??è¦?æ¸?é?¤å?¾å??ç??æ?¤æ¶?å??å?²å??ï¼?"
 msgid "Clearing the undo history of this image will gain %s of memory."
 msgstr "æ¸?é?¤æ­¤å?¾å??ç??æ?¤æ¶?å??å?²å?¯é??æ?¾ %s ç??å??å­?ã??"
 
-#: ../app/actions/edit-commands.c:201
+#: ../app/actions/edit-commands.c:202
 msgid "Cut pixels to the clipboard"
 msgstr "å°?å??ç´ å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/edit-commands.c:228 ../app/actions/edit-commands.c:254
+#: ../app/actions/edit-commands.c:232 ../app/actions/edit-commands.c:261
 msgid "Copied pixels to the clipboard"
 msgstr "å°?å??ç´ å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/edit-commands.c:315 ../app/actions/edit-commands.c:349
-#: ../app/actions/edit-commands.c:525
+#: ../app/actions/edit-commands.c:324 ../app/actions/edit-commands.c:358
+#: ../app/actions/edit-commands.c:534
 msgid "There is no image data in the clipboard to paste."
 msgstr "å?ªè´´æ?¿ä¸­æ²¡æ??å?¯ç²?è´´ç??å?¾å??æ?°æ?®ã??"
 
-#: ../app/actions/edit-commands.c:338 ../app/core/gimpbrushclipboard.c:181
-#: ../app/core/gimppatternclipboard.c:181 ../app/widgets/gimpclipboard.c:296
+#: ../app/actions/edit-commands.c:347 ../app/core/gimpbrushclipboard.c:180
+#: ../app/core/gimppatternclipboard.c:180 ../app/widgets/gimpclipboard.c:295
 msgid "Clipboard"
 msgstr "�贴�"
 
-#: ../app/actions/edit-commands.c:363
+#: ../app/actions/edit-commands.c:372
 msgid "Cut Named"
 msgstr "å?½å??å?ªå??"
 
-#: ../app/actions/edit-commands.c:366 ../app/actions/edit-commands.c:407
-#: ../app/actions/edit-commands.c:427
+#: ../app/actions/edit-commands.c:375 ../app/actions/edit-commands.c:416
+#: ../app/actions/edit-commands.c:436
 msgid "Enter a name for this buffer"
 msgstr "为è¿?个ç¼?å?²å?ºè¾?å?¥ä¸?个å??å­?"
 
-#: ../app/actions/edit-commands.c:404
+#: ../app/actions/edit-commands.c:413
 msgid "Copy Named"
 msgstr "å?½å??å¤?å?¶"
 
-#: ../app/actions/edit-commands.c:424
+#: ../app/actions/edit-commands.c:433
 msgid "Copy Visible Named "
 msgstr "å?½å??å¤?å?¶å?¯è§?"
 
-#: ../app/actions/edit-commands.c:542
+#: ../app/actions/edit-commands.c:551
 msgid "There is no active layer or channel to cut from."
 msgstr "没æ??æ´»å?¨å?¾å±?æ??é??é??å?¯ä»¥å?ªå??ã??"
 
-#: ../app/actions/edit-commands.c:547 ../app/actions/edit-commands.c:579
-#: ../app/actions/edit-commands.c:603
+#: ../app/actions/edit-commands.c:556 ../app/actions/edit-commands.c:588
+#: ../app/actions/edit-commands.c:612
 msgid "(Unnamed Buffer)"
 msgstr "(æ?ªå?½å??ç¼?å?²å?º)"
 
-#: ../app/actions/edit-commands.c:574
+#: ../app/actions/edit-commands.c:583
 msgid "There is no active layer or channel to copy from."
 msgstr "没æ??æ´»å?¨å?¾å±?æ??é??é??å?¯ä»¥å¤?å?¶ã??"
 
-#: ../app/actions/error-console-actions.c:40
+#: ../app/actions/error-console-actions.c:39
+msgctxt "error-console-action"
 msgid "Error Console Menu"
 msgstr "é??误æ?§å?¶å?°è??å??"
 
-#: ../app/actions/error-console-actions.c:44
+#: ../app/actions/error-console-actions.c:43
+msgctxt "error-console-action"
 msgid "_Clear"
 msgstr "��(_C)"
 
-#: ../app/actions/error-console-actions.c:45
+#: ../app/actions/error-console-actions.c:44
+msgctxt "error-console-action"
 msgid "Clear error console"
 msgstr "æ¸?空é??误æ?§å?¶å?°"
 
-#: ../app/actions/error-console-actions.c:50
+#: ../app/actions/error-console-actions.c:49
+msgctxt "error-console-action"
 msgid "Select _All"
 msgstr "å?¨é?¨é??中(_A)"
 
-#: ../app/actions/error-console-actions.c:51
-msgid "Select all errors"
-msgstr "é??æ?©æ??æ??é??误"
+#: ../app/actions/error-console-actions.c:50
+msgctxt "error-console-action"
+msgid "Select all error messages"
+msgstr "é??æ?©æ??æ??é??误信æ?¯"
 
-#: ../app/actions/error-console-actions.c:59
+#: ../app/actions/error-console-actions.c:58
+msgctxt "error-console-action"
 msgid "_Save Error Log to File..."
 msgstr "å°?å?ºé??è®°å½?ä¿?å­?å?°æ??件(_S)..."
 
-#: ../app/actions/error-console-actions.c:60
-msgid "Save error log"
-msgstr "ä¿?å­?é??误记å½?"
+#: ../app/actions/error-console-actions.c:59
+msgctxt "error-console-action"
+msgid "Write all error messages to a file"
+msgstr "å°?æ??æ??é??误信æ?¯å??å?¥å?°æ??件"
 
-#: ../app/actions/error-console-actions.c:65
+#: ../app/actions/error-console-actions.c:64
+msgctxt "error-console-action"
 msgid "Save S_election to File..."
-msgstr "å°?é??å?ºä¿?å­?å?°æ??件(_S)..."
+msgstr "å°?é??å?ºä¿?å­?å?°æ??件(_E)..."
 
-#: ../app/actions/error-console-actions.c:66
-msgid "Save selection"
-msgstr "ä¿?å­?é??å?º"
+#: ../app/actions/error-console-actions.c:65
+msgctxt "error-console-action"
+msgid "Write the selected error messages to a file"
+msgstr "å°?é??中ç??é??误信æ?¯å??å?¥å?°æ??件"
 
 #: ../app/actions/error-console-commands.c:84
 msgid "Cannot save. Nothing is selected."
@@ -1746,176 +2066,215 @@ msgstr ""
 "å??æ??件â??%sâ??æ?¶å?ºé??ï¼?\n"
 "%s"
 
-#: ../app/actions/file-actions.c:66
+#: ../app/actions/file-actions.c:67
+msgctxt "file-action"
 msgid "_File"
 msgstr "æ??件(_F)"
 
-#: ../app/actions/file-actions.c:67
+#: ../app/actions/file-actions.c:68
+msgctxt "file-action"
 msgid "Create"
 msgstr "å??建"
 
-#: ../app/actions/file-actions.c:68
+#: ../app/actions/file-actions.c:69
+msgctxt "file-action"
 msgid "Open _Recent"
 msgstr "æ??è¿?æ??å¼?(_R)"
 
-#: ../app/actions/file-actions.c:71
+#: ../app/actions/file-actions.c:72
+msgctxt "file-action"
 msgid "_Open..."
 msgstr "æ??å¼?(_O)..."
 
-#: ../app/actions/file-actions.c:72
+#: ../app/actions/file-actions.c:73
+msgctxt "file-action"
 msgid "Open an image file"
 msgstr "æ??å¼?å?¾å??æ??件"
 
-#: ../app/actions/file-actions.c:77
+#: ../app/actions/file-actions.c:78
+msgctxt "file-action"
 msgid "Op_en as Layers..."
 msgstr "ä½?为å?¾å±?æ??å¼?(_E)..."
 
-#: ../app/actions/file-actions.c:78
+#: ../app/actions/file-actions.c:79
+msgctxt "file-action"
 msgid "Open an image file as layers"
 msgstr "ä½?为å?¾å±?æ??å¼?å?¾å??æ??件"
 
-#: ../app/actions/file-actions.c:83
+#: ../app/actions/file-actions.c:84
+msgctxt "file-action"
 msgid "Open _Location..."
 msgstr "æ??å¼?ä½?ç½®(_L)..."
 
-#: ../app/actions/file-actions.c:84
+#: ../app/actions/file-actions.c:85
+msgctxt "file-action"
 msgid "Open an image file from a specified location"
 msgstr "ä»?æ??å®?ç??ä½?ç½®æ??å¼?å?¾å??æ??件"
 
-#: ../app/actions/file-actions.c:89
-msgid "Save as _Template..."
-msgstr "��为模�(_T)..."
-
 #: ../app/actions/file-actions.c:90
+msgctxt "file-action"
+msgid "Create _Template..."
+msgstr "å??建模æ?¿(_T)..."
+
+#: ../app/actions/file-actions.c:91
+msgctxt "file-action"
 msgid "Create a new template from this image"
 msgstr "æ ¹æ?®æ­¤å?¾å??å??建æ?°æ¨¡æ?¿"
 
-#: ../app/actions/file-actions.c:95
+#: ../app/actions/file-actions.c:96
+msgctxt "file-action"
 msgid "Re_vert"
 msgstr "��(_V)"
 
-#: ../app/actions/file-actions.c:96
+#: ../app/actions/file-actions.c:97
+msgctxt "file-action"
 msgid "Reload the image file from disk"
 msgstr "ä»?ç£?ç??é??æ?°è£?å?¥å?¾å??æ??件"
 
-#: ../app/actions/file-actions.c:101
+#: ../app/actions/file-actions.c:102
+msgctxt "file-action"
 msgid "Close all"
 msgstr "����"
 
-#: ../app/actions/file-actions.c:102
+#: ../app/actions/file-actions.c:103
+msgctxt "file-action"
 msgid "Close all opened images"
 msgstr "å?³é?­å?¨é?¨æ??å¼?ç??å?¾å??"
 
-#: ../app/actions/file-actions.c:107
+#: ../app/actions/file-actions.c:108
+msgctxt "file-action"
 msgid "_Quit"
 msgstr "é??å?º(_Q)"
 
-#: ../app/actions/file-actions.c:108
+#: ../app/actions/file-actions.c:109
+msgctxt "file-action"
 msgid "Quit the GNU Image Manipulation Program"
 msgstr "é??å?º GNU å?¾å??å¤?ç??ç¨?åº?"
 
-#: ../app/actions/file-actions.c:116
+#: ../app/actions/file-actions.c:117
+msgctxt "file-action"
 msgid "_Save"
 msgstr "ä¿?å­?(_S)"
 
-#: ../app/actions/file-actions.c:117
+#: ../app/actions/file-actions.c:118
+msgctxt "file-action"
 msgid "Save this image"
 msgstr "ä¿?å­?æ­¤å?¾å??"
 
-#: ../app/actions/file-actions.c:122
+#: ../app/actions/file-actions.c:123
+msgctxt "file-action"
 msgid "Save _As..."
 msgstr "��为(_A)..."
 
-#: ../app/actions/file-actions.c:123
+#: ../app/actions/file-actions.c:124
+msgctxt "file-action"
 msgid "Save this image with a different name"
 msgstr "ç?¨ä¸?å??ç??å??å­?ä¿?å­?æ­¤å?¾å??"
 
-#: ../app/actions/file-actions.c:128
+#: ../app/actions/file-actions.c:129
+msgctxt "file-action"
 msgid "Save a Cop_y..."
 msgstr "����(_Y)..."
 
-#: ../app/actions/file-actions.c:129
+#: ../app/actions/file-actions.c:131
+msgctxt "file-action"
 msgid "Save this image with a different name, but keep its current name"
 msgstr "ç?¨ä¸?å??ç??å??å­?ä¿?å­?æ­¤å?¾å??ï¼?ä½?ä¿?æ??å®?å½?å??ç??å??å­?"
 
-#: ../app/actions/file-actions.c:134
+#: ../app/actions/file-actions.c:136
+msgctxt "file-action"
 msgid "Save and Close..."
 msgstr "��并��..."
 
-#: ../app/actions/file-actions.c:135
+#: ../app/actions/file-actions.c:137
+msgctxt "file-action"
 msgid "Save this image and close its window"
 msgstr "ä¿?å­?æ­¤å?¾å??并å?³é?­å®?ç??çª?å?£"
 
-#: ../app/actions/file-commands.c:104 ../app/actions/file-commands.c:456
-#: ../app/dialogs/file-open-dialog.c:76
+#: ../app/actions/file-actions.c:142
+msgctxt "file-action"
+msgid "Export..."
+msgstr "导�..."
+
+#: ../app/actions/file-actions.c:143
+msgctxt "file-action"
+msgid "Export the image to various file formats such as PNG or JPEG"
+msgstr "å°?å?¾å??导å?ºå?°å¦? PNG æ?? JPEG ç??å¤?ç§?æ??件格å¼?"
+
+#: ../app/actions/file-actions.c:148
+msgctxt "file-action"
+msgid "Export to"
+msgstr "导��"
+
+#: ../app/actions/file-actions.c:149
+msgctxt "file-action"
+msgid "Export the image back to the import source in the import format"
+msgstr "å°?å?¾å??以导å?¥ç??æ ¼å¼?å??ç?¸å¯¼å?ºå?°å¯¼å?¥æº?"
+
+#. Update file-export-to label
+#: ../app/actions/file-actions.c:269
+#, c-format
+msgid "Export to %s"
+msgstr "导�� %s"
+
+#: ../app/actions/file-actions.c:277
+msgid "Export to"
+msgstr "导��"
+
+#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:462
+#: ../app/dialogs/file-open-dialog.c:77
 msgid "Open Image"
 msgstr "æ??å¼?å?¾å??"
 
-#: ../app/actions/file-commands.c:125
+#: ../app/actions/file-commands.c:134
 msgid "Open Image as Layers"
 msgstr "ä½?为å?¾å±?æ??å¼?å?¾å??"
 
-#: ../app/actions/file-commands.c:266
-msgid "Saving canceled"
-msgstr "å·²å??æ¶?ä¿?å­?"
-
-#: ../app/actions/file-commands.c:275 ../app/dialogs/file-save-dialog.c:513
-#: ../app/widgets/gimpdnd-xds.c:173
-#, c-format
-msgid ""
-"Saving '%s' failed:\n"
-"\n"
-"%s"
-msgstr ""
-"ä¿?å­?â??%sâ??失败ï¼?\n"
-"\n"
-"%s"
-
-#: ../app/actions/file-commands.c:300
+#: ../app/actions/file-commands.c:264
 msgid "No changes need to be saved"
 msgstr "没æ??é??è¦?ä¿?å­?ç??ä¿®æ?¹"
 
-#: ../app/actions/file-commands.c:307 ../app/dialogs/file-save-dialog.c:88
+#: ../app/actions/file-commands.c:271 ../app/dialogs/file-save-dialog.c:95
 msgid "Save Image"
 msgstr "ä¿?å­?å?¾å??"
 
-#: ../app/actions/file-commands.c:313
+#: ../app/actions/file-commands.c:277
 msgid "Save a Copy of the Image"
 msgstr "ä¿?å­?å?¾å??ç??å?¯æ?¬"
 
-#: ../app/actions/file-commands.c:333
+#: ../app/actions/file-commands.c:326
 msgid "Create New Template"
 msgstr "å??建æ?°ç??模æ?¿"
 
-#: ../app/actions/file-commands.c:337
+#: ../app/actions/file-commands.c:330
 msgid "Enter a name for this template"
 msgstr "ç»?è¿?个模æ?¿è¾?å?¥ä¸?个å??å­?"
 
-#: ../app/actions/file-commands.c:363
+#: ../app/actions/file-commands.c:365
 msgid "Revert failed. No file name associated with this image."
 msgstr "æ?¢å¤?失败ã??没æ??æ??件å??ä¸?æ­¤å?¾å??ç?¸å?³è??ã??"
 
-#: ../app/actions/file-commands.c:376
+#: ../app/actions/file-commands.c:378
 msgid "Revert Image"
 msgstr "æ?¢å¤?å?¾å??"
 
-#: ../app/actions/file-commands.c:402
+#: ../app/actions/file-commands.c:408
 #, c-format
 msgid "Revert '%s' to '%s'?"
 msgstr "å°?â??%sâ??æ?¢å¤?å?°â??%sâ??ï¼?"
 
-#: ../app/actions/file-commands.c:408
+#: ../app/actions/file-commands.c:414
 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:563
+#: ../app/actions/file-commands.c:622
 msgid "(Unnamed Template)"
 msgstr "(æ?ªå?½å??模æ?¿)"
 
-#: ../app/actions/file-commands.c:611
+#: ../app/actions/file-commands.c:674
 #, c-format
 msgid ""
 "Reverting to '%s' failed:\n"
@@ -1926,298 +2285,335 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/actions/fonts-actions.c:44
+#: ../app/actions/fonts-actions.c:43
+msgctxt "fonts-action"
 msgid "Fonts Menu"
 msgstr "å­?ä½?è??å??"
 
-#: ../app/actions/fonts-actions.c:48
+#: ../app/actions/fonts-actions.c:47
+msgctxt "fonts-action"
 msgid "_Rescan Font List"
 msgstr "é??æ?°æ?«æ??å­?ä½?å??表(_R)"
 
-#: ../app/actions/fonts-actions.c:49
-msgid "Rescan font list"
-msgstr "é??æ?°æ?«æ??å­?ä½?å??表"
+#: ../app/actions/fonts-actions.c:48
+msgctxt "fonts-action"
+msgid "Rescan the installed fonts"
+msgstr "é??æ?°æ?«æ??å·²å®?è£?ç??å­?ä½?"
 
-#: ../app/actions/gradient-editor-actions.c:46
+#: ../app/actions/gradient-editor-actions.c:45
+msgctxt "gradient-editor-action"
 msgid "Gradient Editor Menu"
 msgstr "æ¸?å??ç¼?è¾?å?¨è??å??"
 
-#: ../app/actions/gradient-editor-actions.c:50
+#: ../app/actions/gradient-editor-actions.c:49
+msgctxt "gradient-editor-action"
 msgid "Left Color Type"
 msgstr "左端é¢?è?²ç±»å??"
 
-#: ../app/actions/gradient-editor-actions.c:52
+#: ../app/actions/gradient-editor-actions.c:51
+msgctxt "gradient-editor-action"
 msgid "_Load Left Color From"
 msgstr "左端���载�(_L)"
 
-#: ../app/actions/gradient-editor-actions.c:54
+#: ../app/actions/gradient-editor-actions.c:53
+msgctxt "gradient-editor-action"
 msgid "_Save Left Color To"
 msgstr "��左端���(_S)"
 
-#: ../app/actions/gradient-editor-actions.c:57
+#: ../app/actions/gradient-editor-actions.c:56
+msgctxt "gradient-editor-action"
 msgid "Right Color Type"
 msgstr "å?³ç«¯é¢?è?²ç±»å??"
 
-#: ../app/actions/gradient-editor-actions.c:59
+#: ../app/actions/gradient-editor-actions.c:58
+msgctxt "gradient-editor-action"
 msgid "Load Right Color Fr_om"
 msgstr "�端���载�(_O)"
 
-#: ../app/actions/gradient-editor-actions.c:61
+#: ../app/actions/gradient-editor-actions.c:60
+msgctxt "gradient-editor-action"
 msgid "Sa_ve Right Color To"
 msgstr "���端���(_V)"
 
-#: ../app/actions/gradient-editor-actions.c:67
+#: ../app/actions/gradient-editor-actions.c:66
+msgctxt "gradient-editor-action"
 msgid "L_eft Endpoint's Color..."
 msgstr "左端ç?¹ç??é¢?è?²(_E)..."
 
-#: ../app/actions/gradient-editor-actions.c:72
+#: ../app/actions/gradient-editor-actions.c:71
+msgctxt "gradient-editor-action"
 msgid "R_ight Endpoint's Color..."
 msgstr "å?³ç«¯ç?¹ç??é¢?è?²(_I)..."
 
-#: ../app/actions/gradient-editor-actions.c:112
+#: ../app/actions/gradient-editor-actions.c:111
+msgctxt "gradient-editor-action"
 msgid "Ble_nd Endpoints' Colors"
 msgstr "æ··å??端ç?¹ç??é¢?è?²(_N)"
 
-#: ../app/actions/gradient-editor-actions.c:117
+#: ../app/actions/gradient-editor-actions.c:116
+msgctxt "gradient-editor-action"
 msgid "Blend Endpoints' Opacit_y"
 msgstr "æ··å??端ç?¹ç??ä¸?é??æ??度(_Y)"
 
-#: ../app/actions/gradient-editor-actions.c:125
+#: ../app/actions/gradient-editor-actions.c:124
+msgctxt "gradient-editor-action"
 msgid "Edit Active Gradient"
 msgstr "ç¼?è¾?æ´»å?¨æ¸?å??"
 
-#: ../app/actions/gradient-editor-actions.c:156
+#: ../app/actions/gradient-editor-actions.c:155
+msgctxt "gradient-editor-action"
 msgid "_Left Neighbor's Right Endpoint"
 msgstr "å·¦é?»ç??å?³ç«¯ç?¹(_L)"
 
-#: ../app/actions/gradient-editor-actions.c:161
+#: ../app/actions/gradient-editor-actions.c:160
+msgctxt "gradient-editor-action"
 msgid "_Right Endpoint"
 msgstr "�端�(_R)"
 
-#: ../app/actions/gradient-editor-actions.c:166
-#: ../app/actions/gradient-editor-actions.c:214
+#: ../app/actions/gradient-editor-actions.c:165
+#: ../app/actions/gradient-editor-actions.c:213
+msgctxt "gradient-editor-action"
 msgid "_Foreground Color"
 msgstr "å??æ?¯è?²(_F)"
 
-#: ../app/actions/gradient-editor-actions.c:171
-#: ../app/actions/gradient-editor-actions.c:219
-#: ../app/actions/gradient-editor-actions.c:273
-#: ../app/actions/gradient-editor-actions.c:301
+#: ../app/actions/gradient-editor-actions.c:170
+#: ../app/actions/gradient-editor-actions.c:218
+msgctxt "gradient-editor-action"
 msgid "_Background Color"
 msgstr "è??æ?¯è?²(_B)"
 
-#: ../app/actions/gradient-editor-actions.c:204
+#: ../app/actions/gradient-editor-actions.c:203
+msgctxt "gradient-editor-action"
 msgid "_Right Neighbor's Left Endpoint"
 msgstr "å?³é?»ç??左端ç?¹(_R)"
 
-#: ../app/actions/gradient-editor-actions.c:209
+#: ../app/actions/gradient-editor-actions.c:208
+msgctxt "gradient-editor-action"
 msgid "_Left Endpoint"
 msgstr "左端�(_L)"
 
-#: ../app/actions/gradient-editor-actions.c:258
-#: ../app/actions/gradient-editor-actions.c:286
+#: ../app/actions/gradient-editor-actions.c:257
+#: ../app/actions/gradient-editor-actions.c:287
+msgctxt "gradient-editor-color-type"
 msgid "_Fixed"
 msgstr "��(_F)"
 
-#: ../app/actions/gradient-editor-actions.c:263
-#: ../app/actions/gradient-editor-actions.c:291
+#: ../app/actions/gradient-editor-actions.c:262
+#: ../app/actions/gradient-editor-actions.c:292
+msgctxt "gradient-editor-color-type"
 msgid "F_oreground Color"
 msgstr "å??æ?¯è?²(_O)"
 
 #: ../app/actions/gradient-editor-actions.c:268
-#: ../app/actions/gradient-editor-actions.c:296
+#: ../app/actions/gradient-editor-actions.c:298
+msgctxt "gradient-editor-color-type"
 msgid "Fo_reground Color (Transparent)"
 msgstr "å??æ?¯è?²(é??æ??)(_R)"
 
-#: ../app/actions/gradient-editor-actions.c:278
-#: ../app/actions/gradient-editor-actions.c:306
+#: ../app/actions/gradient-editor-actions.c:273
+#: ../app/actions/gradient-editor-actions.c:303
+msgctxt "gradient-editor-color-type"
+msgid "_Background Color"
+msgstr "è??æ?¯è?²(_B)"
+
+#: ../app/actions/gradient-editor-actions.c:279
+#: ../app/actions/gradient-editor-actions.c:309
+msgctxt "gradient-editor-color-type"
 msgid "B_ackground Color (Transparent)"
 msgstr "å??æ?¯è?²(é??æ??)(_A)"
 
-#: ../app/actions/gradient-editor-actions.c:314
+#: ../app/actions/gradient-editor-actions.c:317
+msgctxt "gradient-editor-blending"
 msgid "_Linear"
 msgstr "线�(_L)"
 
-#: ../app/actions/gradient-editor-actions.c:319
+#: ../app/actions/gradient-editor-actions.c:322
+msgctxt "gradient-editor-blending"
 msgid "_Curved"
 msgstr "�线(_C)"
 
-#: ../app/actions/gradient-editor-actions.c:324
+#: ../app/actions/gradient-editor-actions.c:327
+msgctxt "gradient-editor-blending"
 msgid "_Sinusoidal"
 msgstr "正弦(_S)"
 
-#: ../app/actions/gradient-editor-actions.c:329
+#: ../app/actions/gradient-editor-actions.c:332
+msgctxt "gradient-editor-blending"
 msgid "Spherical (i_ncreasing)"
 msgstr "ç??ç?¶(ä¸?å??)(_N)"
 
-#: ../app/actions/gradient-editor-actions.c:334
+#: ../app/actions/gradient-editor-actions.c:337
+msgctxt "gradient-editor-blending"
 msgid "Spherical (_decreasing)"
 msgstr "ç??ç?¶(ä¸?é??)(_D)"
 
-#: ../app/actions/gradient-editor-actions.c:339
-#: ../app/actions/gradient-editor-actions.c:362
+#: ../app/actions/gradient-editor-actions.c:342
+msgctxt "gradient-editor-blending"
 msgid "(Varies)"
 msgstr "(��)"
 
-#: ../app/actions/gradient-editor-actions.c:347
-#: ../app/actions/image-actions.c:141
+#: ../app/actions/gradient-editor-actions.c:350
+msgctxt "gradient-editor-coloring"
 msgid "_RGB"
-msgstr "RGB(_R)"
+msgstr "_RGB"
 
-#: ../app/actions/gradient-editor-actions.c:352
+#: ../app/actions/gradient-editor-actions.c:355
+msgctxt "gradient-editor-coloring"
 msgid "HSV (_counter-clockwise hue)"
 msgstr "HSV (é??æ?¶é??è?²è°?)(_C)"
 
-#: ../app/actions/gradient-editor-actions.c:357
+#: ../app/actions/gradient-editor-actions.c:360
+msgctxt "gradient-editor-coloring"
 msgid "HSV (clockwise _hue)"
 msgstr "HSV (顺æ?¶é??è?²è°?)(_H)"
 
-#: ../app/actions/gradient-editor-actions.c:370
-#: ../app/actions/view-actions.c:273
+#: ../app/actions/gradient-editor-actions.c:365
+msgctxt "gradient-editor-coloring"
+msgid "(Varies)"
+msgstr "(��)"
+
+#: ../app/actions/gradient-editor-actions.c:373
 msgid "Zoom In"
 msgstr "�大"
 
-#: ../app/actions/gradient-editor-actions.c:371
-#: ../app/actions/palette-editor-actions.c:88
-#: ../app/actions/view-actions.c:262 ../app/actions/view-actions.c:274
+#: ../app/actions/gradient-editor-actions.c:374
+#: ../app/actions/palette-editor-actions.c:89
 msgid "Zoom in"
 msgstr "�大"
 
-#: ../app/actions/gradient-editor-actions.c:376
-#: ../app/actions/view-actions.c:267
+#: ../app/actions/gradient-editor-actions.c:379
 msgid "Zoom Out"
 msgstr "缩�"
 
-#: ../app/actions/gradient-editor-actions.c:377
-#: ../app/actions/palette-editor-actions.c:94
-#: ../app/actions/view-actions.c:256 ../app/actions/view-actions.c:268
+#: ../app/actions/gradient-editor-actions.c:380
+#: ../app/actions/palette-editor-actions.c:95
 msgid "Zoom out"
 msgstr "缩�"
 
-#: ../app/actions/gradient-editor-actions.c:382
+#: ../app/actions/gradient-editor-actions.c:385
 msgid "Zoom All"
 msgstr "���示"
 
-#: ../app/actions/gradient-editor-actions.c:383
-#: ../app/actions/palette-editor-actions.c:100
+#: ../app/actions/gradient-editor-actions.c:386
+#: ../app/actions/palette-editor-actions.c:101
 msgid "Zoom all"
 msgstr "���示"
 
-#: ../app/actions/gradient-editor-actions.c:773
+#: ../app/actions/gradient-editor-actions.c:776
 msgid "_Blending Function for Segment"
 msgstr "段混å??å?½æ?°(_B)"
 
-#: ../app/actions/gradient-editor-actions.c:775
+#: ../app/actions/gradient-editor-actions.c:778
 msgid "Coloring _Type for Segment"
 msgstr "段ç??è?²ç±»å??(_T)"
 
-#: ../app/actions/gradient-editor-actions.c:778
+#: ../app/actions/gradient-editor-actions.c:781
 msgid "_Flip Segment"
 msgstr "翻转段(_F)"
 
-#: ../app/actions/gradient-editor-actions.c:780
+#: ../app/actions/gradient-editor-actions.c:783
 msgid "_Replicate Segment..."
 msgstr "��段(_R)..."
 
-#: ../app/actions/gradient-editor-actions.c:782
+#: ../app/actions/gradient-editor-actions.c:785
 msgid "Split Segment at _Midpoint"
 msgstr "å?¨ä¸­ç?¹å¤?å??å?²æ®µ(_M)"
 
-#: ../app/actions/gradient-editor-actions.c:784
+#: ../app/actions/gradient-editor-actions.c:787
 msgid "Split Segment _Uniformly..."
 msgstr "ç­?å??å??å?²æ®µ(_U)..."
 
-#: ../app/actions/gradient-editor-actions.c:786
+#: ../app/actions/gradient-editor-actions.c:789
 msgid "_Delete Segment"
 msgstr "��段(_D)"
 
-#: ../app/actions/gradient-editor-actions.c:788
+#: ../app/actions/gradient-editor-actions.c:791
 msgid "Re-_center Segment's Midpoint"
 msgstr "é??置段中ç?¹(_C)"
 
-#: ../app/actions/gradient-editor-actions.c:790
+#: ../app/actions/gradient-editor-actions.c:793
 msgid "Re-distribute _Handles in Segment"
 msgstr "é??置段æ?¯ç?¹(_H)"
 
-#: ../app/actions/gradient-editor-actions.c:795
+#: ../app/actions/gradient-editor-actions.c:798
 msgid "_Blending Function for Selection"
 msgstr "é??å?ºç??æ··å??å?½æ?°(_B)"
 
-#: ../app/actions/gradient-editor-actions.c:797
+#: ../app/actions/gradient-editor-actions.c:800
 msgid "Coloring _Type for Selection"
 msgstr "é??å?ºç??ç??è?²ç±»å??(_T)"
 
-#: ../app/actions/gradient-editor-actions.c:800
+#: ../app/actions/gradient-editor-actions.c:803
 msgid "_Flip Selection"
 msgstr "翻转é??å?º(_F)"
 
-#: ../app/actions/gradient-editor-actions.c:802
+#: ../app/actions/gradient-editor-actions.c:805
 msgid "_Replicate Selection..."
 msgstr "å¤?å?¶é??å?º(_R)..."
 
-#: ../app/actions/gradient-editor-actions.c:804
+#: ../app/actions/gradient-editor-actions.c:807
 msgid "Split Segments at _Midpoints"
 msgstr "å?¨ä¸­ç?¹å¤?å??å?²æ®µ(_M)"
 
-#: ../app/actions/gradient-editor-actions.c:806
+#: ../app/actions/gradient-editor-actions.c:809
 msgid "Split Segments _Uniformly..."
 msgstr "ç­?å??å??å?²æ®µ(_U)..."
 
-#: ../app/actions/gradient-editor-actions.c:808
+#: ../app/actions/gradient-editor-actions.c:811
 msgid "_Delete Selection"
 msgstr "å? é?¤é??中å?ºå??(_D)"
 
-#: ../app/actions/gradient-editor-actions.c:810
+#: ../app/actions/gradient-editor-actions.c:813
 msgid "Re-_center Midpoints in Selection"
 msgstr "é??ç½®é??中å?ºå??ç??中ç?¹(_C)"
 
-#: ../app/actions/gradient-editor-actions.c:812
+#: ../app/actions/gradient-editor-actions.c:815
 msgid "Re-distribute _Handles in Selection"
 msgstr "é??ç½®é??中å?ºå??ç??æ?¯ç?¹(_H)"
 
-#: ../app/actions/gradient-editor-commands.c:86
+#: ../app/actions/gradient-editor-commands.c:85
 msgid "Left Endpoint Color"
 msgstr "左端ç?¹ç??é¢?è?²"
 
-#: ../app/actions/gradient-editor-commands.c:88
+#: ../app/actions/gradient-editor-commands.c:87
 msgid "Gradient Segment's Left Endpoint Color"
 msgstr "æ¸?å??段ç??左端ç?¹ç??é¢?è?²"
 
-#: ../app/actions/gradient-editor-commands.c:237
+#: ../app/actions/gradient-editor-commands.c:236
 msgid "Right Endpoint Color"
 msgstr "å?³ç«¯ç?¹ç??é¢?è?²"
 
-#: ../app/actions/gradient-editor-commands.c:239
+#: ../app/actions/gradient-editor-commands.c:238
 msgid "Gradient Segment's Right Endpoint Color"
 msgstr "æ¸?å??段ç??å?³ç«¯ç?¹ç??é¢?è?²"
 
-#: ../app/actions/gradient-editor-commands.c:453
+#: ../app/actions/gradient-editor-commands.c:452
 msgid "Replicate Segment"
 msgstr "��段"
 
-#: ../app/actions/gradient-editor-commands.c:454
+#: ../app/actions/gradient-editor-commands.c:453
 msgid "Replicate Gradient Segment"
 msgstr "å¤?å?¶æ¸?å??段"
 
-#: ../app/actions/gradient-editor-commands.c:458
+#: ../app/actions/gradient-editor-commands.c:457
 msgid "Replicate Selection"
 msgstr "å¤?å?¶é??中å?ºå??"
 
-#: ../app/actions/gradient-editor-commands.c:459
+#: ../app/actions/gradient-editor-commands.c:458
 msgid "Replicate Gradient Selection"
 msgstr "å¤?å?¶æ¸?å??ç??é??中å?ºå??"
 
-#: ../app/actions/gradient-editor-commands.c:472
+#: ../app/actions/gradient-editor-commands.c:471
 msgid "Replicate"
 msgstr "��"
 
-#: ../app/actions/gradient-editor-commands.c:492
+#: ../app/actions/gradient-editor-commands.c:491
 msgid ""
 "Select the number of times\n"
 "to replicate the selected segment."
 msgstr "é??æ?©å¤?å?¶é??中ç??段ç??次æ?°ã??"
 
-#: ../app/actions/gradient-editor-commands.c:495
+#: ../app/actions/gradient-editor-commands.c:494
 msgid ""
 "Select the number of times\n"
 "to replicate the selection."
@@ -2225,729 +2621,964 @@ msgstr ""
 "é??æ?©å¤?å?¶æ??æ??é??中ç??\n"
 "段ç??次æ?°ã??"
 
-#: ../app/actions/gradient-editor-commands.c:554
+#: ../app/actions/gradient-editor-commands.c:553
 msgid "Split Segment Uniformly"
 msgstr "ç­?å??å??å?²æ®µ"
 
-#: ../app/actions/gradient-editor-commands.c:555
+#: ../app/actions/gradient-editor-commands.c:554
 msgid "Split Gradient Segment Uniformly"
 msgstr "ç­?å??å??å?²æ¸?å??段"
 
-#: ../app/actions/gradient-editor-commands.c:559
+#: ../app/actions/gradient-editor-commands.c:558
 msgid "Split Segments Uniformly"
 msgstr "ç­?å??å??å?²æ®µ"
 
-#: ../app/actions/gradient-editor-commands.c:560
+#: ../app/actions/gradient-editor-commands.c:559
 msgid "Split Gradient Segments Uniformly"
 msgstr "ç­?å??å??å?²æ¸?å??段"
 
-#: ../app/actions/gradient-editor-commands.c:573
+#: ../app/actions/gradient-editor-commands.c:572
 msgid "Split"
 msgstr "å??å?²"
 
-#: ../app/actions/gradient-editor-commands.c:594
+#: ../app/actions/gradient-editor-commands.c:593
 msgid ""
 "Select the number of uniform parts\n"
 "in which to split the selected segment."
 msgstr "é??æ?©ç­?å??å??å?²é??中ç??段ç??份æ?°ã??"
 
-#: ../app/actions/gradient-editor-commands.c:597
+#: ../app/actions/gradient-editor-commands.c:596
 msgid ""
 "Select the number of uniform parts\n"
 "in which to split the segments in the selection."
 msgstr "é??æ?©ç­?å??å??å?²æ??æ??é??中ç??段ç??份æ?°ã??"
 
-#: ../app/actions/gradients-actions.c:44
+#: ../app/actions/gradients-actions.c:43
+msgctxt "gradients-action"
 msgid "Gradients Menu"
 msgstr "æ¸?å??è??å??"
 
-#: ../app/actions/gradients-actions.c:48
+#: ../app/actions/gradients-actions.c:47
+msgctxt "gradients-action"
 msgid "_New Gradient"
 msgstr "æ?°å»ºæ¸?å??(_N)"
 
-#: ../app/actions/gradients-actions.c:49
-msgid "New gradient"
-msgstr "æ?°å»ºæ¸?å??"
+#: ../app/actions/gradients-actions.c:48
+msgctxt "gradients-action"
+msgid "Create a new gradient"
+msgstr "å??建æ?°ç??æ¸?å??"
 
-#: ../app/actions/gradients-actions.c:54
+#: ../app/actions/gradients-actions.c:53
+msgctxt "gradients-action"
 msgid "D_uplicate Gradient"
 msgstr "å¤?å?¶æ¸?å??(_U)"
 
-#: ../app/actions/gradients-actions.c:55
-msgid "Duplicate gradient"
+#: ../app/actions/gradients-actions.c:54
+msgctxt "gradients-action"
+msgid "Duplicate this gradient"
 msgstr "å¤?å?¶æ¸?å??"
 
-#: ../app/actions/gradients-actions.c:60
+#: ../app/actions/gradients-actions.c:59
+msgctxt "gradients-action"
 msgid "Copy Gradient _Location"
 msgstr "å¤?å?¶æ¸?å??ä½?ç½®(_L)"
 
-#: ../app/actions/gradients-actions.c:61
+#: ../app/actions/gradients-actions.c:60
+msgctxt "gradients-action"
 msgid "Copy gradient file location to clipboard"
 msgstr "å°?æ¸?å??æ??件ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/gradients-actions.c:66
+#: ../app/actions/gradients-actions.c:65
+msgctxt "gradients-action"
 msgid "Save as _POV-Ray..."
-msgstr "��为 POV-Ray(_P)..."
+msgstr "��为 _POV-Ray..."
 
-#: ../app/actions/gradients-actions.c:67
+#: ../app/actions/gradients-actions.c:66
+msgctxt "gradients-action"
 msgid "Save gradient as POV-Ray"
 msgstr "å°?æ¸?å??ä¿?å­?为 POV-Ray"
 
-#: ../app/actions/gradients-actions.c:72
+#: ../app/actions/gradients-actions.c:71
+msgctxt "gradients-action"
 msgid "_Delete Gradient"
 msgstr "å? é?¤æ¸?å??(_D)"
 
-#: ../app/actions/gradients-actions.c:73
-msgid "Delete gradient"
-msgstr "å? é?¤æ¸?å??"
+#: ../app/actions/gradients-actions.c:72
+msgctxt "gradients-action"
+msgid "Delete this gradient"
+msgstr "å? é?¤æ­¤æ¸?å??"
 
-#: ../app/actions/gradients-actions.c:78
+#: ../app/actions/gradients-actions.c:77
+msgctxt "gradients-action"
 msgid "_Refresh Gradients"
 msgstr "å?·æ?°æ¸?å??(_R)"
 
-#: ../app/actions/gradients-actions.c:79
+#: ../app/actions/gradients-actions.c:78
+msgctxt "gradients-action"
 msgid "Refresh gradients"
 msgstr "å?·æ?°æ¸?å??"
 
-#: ../app/actions/gradients-actions.c:87
+#: ../app/actions/gradients-actions.c:86
+msgctxt "gradients-action"
 msgid "_Edit Gradient..."
 msgstr "ç¼?è¾?æ¸?å??(_E)..."
 
-#: ../app/actions/gradients-actions.c:88
+#: ../app/actions/gradients-actions.c:87
+msgctxt "gradients-action"
 msgid "Edit gradient"
 msgstr "ç¼?è¾?æ¸?å??"
 
-#: ../app/actions/gradients-commands.c:66
+#: ../app/actions/gradients-commands.c:65
 #, c-format
 msgid "Save '%s' as POV-Ray"
 msgstr "å°?â??%sâ??ä¿?å­?为 POV-Ray"
 
-#: ../app/actions/help-actions.c:38 ../app/actions/help-actions.c:41
+#: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40
+msgctxt "help-action"
 msgid "_Help"
 msgstr "帮�(_H)"
 
-#: ../app/actions/help-actions.c:42
+#: ../app/actions/help-actions.c:41
+msgctxt "help-action"
 msgid "Open the GIMP user manual"
 msgstr "æ??å¼? GIMP ç?¨æ?·æ??å??"
 
-#: ../app/actions/help-actions.c:47
+#: ../app/actions/help-actions.c:46
+msgctxt "help-action"
 msgid "_Context Help"
 msgstr "��帮�(_C)"
 
-#: ../app/actions/help-actions.c:48
+#: ../app/actions/help-actions.c:47
+msgctxt "help-action"
 msgid "Show the help for a specific user interface item"
 msgstr "为æ??å®?ç?¨æ?·ç??é?¢é¡¹æ?¾ç¤ºå¸®å?©"
 
 #: ../app/actions/image-actions.c:47 ../app/actions/image-actions.c:51
+msgctxt "image-action"
 msgid "Image Menu"
 msgstr "å?¾å??è??å??"
 
 #: ../app/actions/image-actions.c:54
+msgctxt "image-action"
 msgid "_Image"
 msgstr "å?¾å??(_I)"
 
 #: ../app/actions/image-actions.c:55
+msgctxt "image-action"
 msgid "_Mode"
 msgstr "模�(_M)"
 
-#: ../app/actions/image-actions.c:56 ../app/actions/layers-actions.c:56
+#: ../app/actions/image-actions.c:56
+msgctxt "image-action"
 msgid "_Transform"
 msgstr "å??æ?¢(_T)"
 
 #: ../app/actions/image-actions.c:57
+msgctxt "image-action"
 msgid "_Guides"
 msgstr "å??è??线(_G)"
 
+#: ../app/actions/image-actions.c:59
+msgctxt "image-action"
+msgid "_Colors"
+msgstr "��(_C)"
+
 #: ../app/actions/image-actions.c:60
+msgctxt "image-action"
 msgid "I_nfo"
 msgstr "ä¿¡æ?¯(_N)"
 
-#: ../app/actions/image-actions.c:61 ../app/tools/gimplevelstool.c:653
-#: ../app/tools/gimpthresholdtool.c:264
+#: ../app/actions/image-actions.c:61
+msgctxt "image-action"
 msgid "_Auto"
 msgstr "��(_A)"
 
-#: ../app/actions/image-actions.c:62 ../app/actions/plug-in-actions.c:95
+#: ../app/actions/image-actions.c:62
+msgctxt "image-action"
 msgid "_Map"
 msgstr "æ? å°?(_M)"
 
 #: ../app/actions/image-actions.c:63
+msgctxt "image-action"
 msgid "C_omponents"
 msgstr "å??é??(_O)"
 
 #: ../app/actions/image-actions.c:66
+msgctxt "image-action"
 msgid "_New..."
 msgstr "�建(_N)..."
 
 #: ../app/actions/image-actions.c:67
+msgctxt "image-action"
 msgid "Create a new image"
 msgstr "å??建æ?°ç??å?¾å??"
 
 #: ../app/actions/image-actions.c:72
+msgctxt "image-action"
 msgid "Can_vas Size..."
 msgstr "��大�(_V)..."
 
 #: ../app/actions/image-actions.c:73
+msgctxt "image-action"
 msgid "Adjust the image dimensions"
 msgstr "è°?æ?´å?¾å??尺寸"
 
 #: ../app/actions/image-actions.c:78
-msgid "F_it Canvas to Layers"
-msgstr "ç?»å¸?é??é??å?¾å±?(_I)"
+msgctxt "image-action"
+msgid "Fit Canvas to L_ayers"
+msgstr "ç?»å¸?é??é??å?¾å±?(_A)"
 
 #: ../app/actions/image-actions.c:79
+msgctxt "image-action"
 msgid "Resize the image to enclose all layers"
 msgstr "é??ç½®å?¾å??大å°?以容纳æ??æ??å?¾å±?"
 
 #: ../app/actions/image-actions.c:84
+msgctxt "image-action"
 msgid "F_it Canvas to Selection"
 msgstr "使ç?»å¸?é??å??é??å?º(_I)"
 
 #: ../app/actions/image-actions.c:85
+msgctxt "image-action"
 msgid "Resize the image to the extents of the selection"
 msgstr "æ?¹å??å?¾å??尺寸å?°é??å?ºç??è??å?´"
 
 #: ../app/actions/image-actions.c:90
+msgctxt "image-action"
 msgid "_Print Size..."
 msgstr "æ??å?°å¤§å°?(_P)..."
 
 #: ../app/actions/image-actions.c:91
+msgctxt "image-action"
 msgid "Adjust the print resolution"
 msgstr "è°?æ?´æ??å?°å??辨ç??"
 
 #: ../app/actions/image-actions.c:96
+msgctxt "image-action"
 msgid "_Scale Image..."
 msgstr "缩æ?¾å?¾å??(_S)..."
 
 #: ../app/actions/image-actions.c:97
+msgctxt "image-action"
 msgid "Change the size of the image content"
 msgstr "æ?´æ?¹å?¾å??å??容ç??大å°?"
 
-#: ../app/actions/image-actions.c:102 ../app/actions/layers-actions.c:188
+#: ../app/actions/image-actions.c:102
+msgctxt "image-action"
 msgid "_Crop to Selection"
 msgstr "å?ªè£?å?°é??å?º(_C)"
 
 #: ../app/actions/image-actions.c:103
+msgctxt "image-action"
 msgid "Crop the image to the extents of the selection"
 msgstr "å?ªè£?å?¾å??å?°é??å?ºç??è??å?´"
 
 #: ../app/actions/image-actions.c:108
+msgctxt "image-action"
 msgid "_Duplicate"
 msgstr "��(_D)"
 
 #: ../app/actions/image-actions.c:109
+msgctxt "image-action"
 msgid "Create a duplicate of this image"
 msgstr "å??建此å?¾å??ç??å¤?æ?¬"
 
 #: ../app/actions/image-actions.c:114
+msgctxt "image-action"
 msgid "Merge Visible _Layers..."
 msgstr "å??并å?¯è§?å?¾å±?(_L)..."
 
-#: ../app/actions/image-actions.c:115 ../app/actions/layers-actions.c:141
+#: ../app/actions/image-actions.c:115
+msgctxt "image-action"
 msgid "Merge all visible layers into one layer"
 msgstr "å°?æ??æ??ç??å?¯è§?å?¾å±?å??并为ä¸?个å?¾å±?"
 
-#: ../app/actions/image-actions.c:120 ../app/actions/layers-actions.c:146
+#: ../app/actions/image-actions.c:120
+msgctxt "image-action"
 msgid "_Flatten Image"
 msgstr "å¹³æ?´å?¾å??(_F)"
 
-#: ../app/actions/image-actions.c:121 ../app/actions/layers-actions.c:147
+#: ../app/actions/image-actions.c:121
+msgctxt "image-action"
 msgid "Merge all layers into one and remove transparency"
 msgstr "å°?æ??æ??ç??å?¾å±?å??并为ä¸?个并移é?¤é??æ??"
 
 #: ../app/actions/image-actions.c:126
+msgctxt "image-action"
 msgid "Configure G_rid..."
 msgstr "é??ç½®ç½?æ ¼(_R)..."
 
 #: ../app/actions/image-actions.c:127
+msgctxt "image-action"
 msgid "Configure the grid for this image"
 msgstr "é??ç½®å?¾å??ç??ç½?æ ¼"
 
 #: ../app/actions/image-actions.c:132
+msgctxt "image-action"
 msgid "Image Pr_operties"
 msgstr "å?¾å??å±?æ?§(_O)"
 
 #: ../app/actions/image-actions.c:133
+msgctxt "image-action"
 msgid "Display information about this image"
 msgstr "æ?¾ç¤ºå?³äº?æ­¤å?¾å??ç??ä¿¡æ?¯"
 
+#: ../app/actions/image-actions.c:141
+msgctxt "image-convert-action"
+msgid "_RGB"
+msgstr "_RGB"
+
 #: ../app/actions/image-actions.c:142
+msgctxt "image-convert-action"
 msgid "Convert the image to the RGB colorspace"
-msgstr "å°?å?¾å??转æ?¢å?° RGB é¢?è?²ç©ºé?´"
+msgstr "å°?å?¾å??转æ?¢å?° RGB è?²å½©ç©ºé?´"
 
 #: ../app/actions/image-actions.c:146
+msgctxt "image-convert-action"
 msgid "_Grayscale"
 msgstr "�度(_G)"
 
 #: ../app/actions/image-actions.c:147
+msgctxt "image-convert-action"
 msgid "Convert the image to grayscale"
 msgstr "å°?å?¾å??转æ?¢ä¸ºç?°åº¦"
 
 #: ../app/actions/image-actions.c:151
+msgctxt "image-convert-action"
 msgid "_Indexed..."
 msgstr "索�(_I)..."
 
 #: ../app/actions/image-actions.c:152
+msgctxt "image-convert-action"
 msgid "Convert the image to indexed colors"
 msgstr "å°?å?¾å??转æ?¢ä¸ºç´¢å¼?é¢?è?²"
 
+#: ../app/actions/image-actions.c:159
+msgctxt "image-action"
+msgid "Flip _Horizontally"
+msgstr "水平翻转(_H)"
+
 #: ../app/actions/image-actions.c:160
+msgctxt "image-action"
 msgid "Flip image horizontally"
 msgstr "水平翻转"
 
+#: ../app/actions/image-actions.c:165
+msgctxt "image-action"
+msgid "Flip _Vertically"
+msgstr "å??ç?´ç¿»è½¬(_V)"
+
 #: ../app/actions/image-actions.c:166
+msgctxt "image-action"
 msgid "Flip image vertically"
 msgstr "å??ç?´ç¿»è½¬"
 
+#: ../app/actions/image-actions.c:174
+msgctxt "image-action"
+msgid "Rotate 90° _clockwise"
+msgstr "顺æ?¶é??æ??转 90 度(_C)"
+
 #: ../app/actions/image-actions.c:175
+msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the right"
-msgstr "顺æ?¶é??æ??转å?¾å?? 90 度"
+msgstr "å°?å?¾å??å??å?³æ??转 90 度"
+
+#: ../app/actions/image-actions.c:180
+msgctxt "image-action"
+msgid "Rotate _180°"
+msgstr "æ??转 _180 度"
 
 #: ../app/actions/image-actions.c:181
+msgctxt "image-action"
 msgid "Turn the image upside-down"
-msgstr "æ??转å?¾å?? 180 度"
+msgstr "使å?¾å??ä¸?ä¸?颠å??"
+
+#: ../app/actions/image-actions.c:186
+msgctxt "image-action"
+msgid "Rotate 90° counter-clock_wise"
+msgstr "é??æ?¶é??æ??转 90 度(_W)"
 
 #: ../app/actions/image-actions.c:187
+msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the left"
-msgstr "é??æ?¶é??æ??转å?¾å?? 90 度"
+msgstr "å°?å?¾å??å??å·¦æ??转 90 度"
 
-#: ../app/actions/image-commands.c:235
+#: ../app/actions/image-commands.c:236
 msgid "Set Image Canvas Size"
 msgstr "设置å?¾å??ç?»å¸?大å°?"
 
-#: ../app/actions/image-commands.c:261 ../app/actions/image-commands.c:282
-#: ../app/actions/image-commands.c:559
+#: ../app/actions/image-commands.c:262 ../app/actions/image-commands.c:283
+#: ../app/actions/image-commands.c:561
 msgid "Resizing"
 msgstr "æ?¹å??大å°?"
 
-#: ../app/actions/image-commands.c:306
+#: ../app/actions/image-commands.c:307
 msgid "Set Image Print Resolution"
 msgstr "设置å?¾å??æ??å?°å??辨ç??"
 
-#: ../app/actions/image-commands.c:362
-#: ../app/pdb/drawable-transform-cmds.c:148
-#: ../app/pdb/drawable-transform-cmds.c:223
+#: ../app/actions/image-commands.c:363
+#: ../app/pdb/drawable-transform-cmds.c:147
+#: ../app/pdb/drawable-transform-cmds.c:222
 msgid "Flipping"
 msgstr "翻转"
 
-#: ../app/actions/image-commands.c:383
-#: ../app/pdb/drawable-transform-cmds.c:525
-#: ../app/pdb/drawable-transform-cmds.c:604 ../app/pdb/image-cmds.c:533
-#: ../app/pdb/transform-tools-cmds.c:215 ../app/tools/gimprotatetool.c:122
+#: ../app/actions/image-commands.c:384
+#: ../app/pdb/drawable-transform-cmds.c:524
+#: ../app/pdb/drawable-transform-cmds.c:603 ../app/pdb/image-cmds.c:532
+#: ../app/pdb/transform-tools-cmds.c:214 ../app/tools/gimprotatetool.c:122
 msgid "Rotating"
 msgstr "æ??转"
 
-#: ../app/actions/image-commands.c:408 ../app/actions/layers-commands.c:639
+#: ../app/actions/image-commands.c:410 ../app/actions/layers-commands.c:637
 msgid "Cannot crop because the current selection is empty."
 msgstr "æ? æ³?å?ªè£?ï¼?å? ä¸ºå½?å??é??å?ºä¸ºç©ºã??"
 
-#: ../app/actions/image-commands.c:606
+#: ../app/actions/image-commands.c:608
 msgid "Change Print Size"
 msgstr "æ?¹å??æ??å?°å¤§å°?"
 
-#: ../app/actions/image-commands.c:647 ../app/core/gimpimage-scale.c:82
+#: ../app/actions/image-commands.c:649 ../app/core/gimpimage-scale.c:81
 msgid "Scale Image"
 msgstr "缩æ?¾å?¾å??"
 
 #. Scaling
-#: ../app/actions/image-commands.c:658 ../app/actions/layers-commands.c:1101
-#: ../app/dialogs/preferences-dialog.c:1925
-#: ../app/pdb/drawable-transform-cmds.c:682
-#: ../app/pdb/drawable-transform-cmds.c:758 ../app/pdb/image-cmds.c:405
-#: ../app/pdb/image-cmds.c:441 ../app/pdb/layer-cmds.c:289
-#: ../app/pdb/layer-cmds.c:334 ../app/pdb/transform-tools-cmds.c:291
+#: ../app/actions/image-commands.c:660 ../app/actions/layers-commands.c:1100
+#: ../app/dialogs/preferences-dialog.c:1924
+#: ../app/pdb/drawable-transform-cmds.c:681
+#: ../app/pdb/drawable-transform-cmds.c:757 ../app/pdb/image-cmds.c:404
+#: ../app/pdb/image-cmds.c:440 ../app/pdb/layer-cmds.c:288
+#: ../app/pdb/layer-cmds.c:333 ../app/pdb/transform-tools-cmds.c:290
 #: ../app/tools/gimpscaletool.c:107
 msgid "Scaling"
 msgstr "缩�"
 
 #: ../app/actions/images-actions.c:43
+msgctxt "images-action"
 msgid "Images Menu"
-msgstr "æ?¾ç¤ºå?¾å??è??å??"
+msgstr "å?¾å??è??å??"
 
 #: ../app/actions/images-actions.c:47
+msgctxt "images-action"
 msgid "_Raise Views"
 msgstr "å??é«?è§?å?¾(_R)"
 
 #: ../app/actions/images-actions.c:48
+msgctxt "images-action"
 msgid "Raise this image's displays"
 msgstr "å??é«?æ­¤å?¾å??ç??æ?¾ç¤º"
 
-#: ../app/actions/images-actions.c:53 ../app/actions/view-actions.c:75
+#: ../app/actions/images-actions.c:53
+msgctxt "images-action"
 msgid "_New View"
 msgstr "�建��(_N)"
 
 #: ../app/actions/images-actions.c:54
+msgctxt "images-action"
 msgid "Create a new display for this image"
 msgstr "为此å?¾å??å??建æ?°ç??æ?¾ç¤º"
 
 #: ../app/actions/images-actions.c:59
+msgctxt "images-action"
 msgid "_Delete Image"
 msgstr "å? é?¤å?¾å??(_D)"
 
 #: ../app/actions/images-actions.c:60
+msgctxt "images-action"
 msgid "Delete this image"
 msgstr "å? é?¤æ­¤å?¾å??"
 
-#: ../app/actions/layers-actions.c:48
+#: ../app/actions/layers-actions.c:47
+msgctxt "layers-action"
 msgid "Layers Menu"
 msgstr "å?¾å±?è??å??"
 
 #: ../app/actions/layers-actions.c:51
+msgctxt "layers-action"
 msgid "_Layer"
 msgstr "��(_L)"
 
-#: ../app/actions/layers-actions.c:52
+#: ../app/actions/layers-actions.c:53
+msgctxt "layers-action"
 msgid "Stac_k"
 msgstr "å ?æ ?(_K)"
 
-#: ../app/actions/layers-actions.c:53
+#: ../app/actions/layers-actions.c:55
+msgctxt "layers-action"
 msgid "Te_xt to Selection"
 msgstr "æ??å­?å?°é??å?º(_X)"
 
-#: ../app/actions/layers-actions.c:54
+#: ../app/actions/layers-actions.c:57
+msgctxt "layers-action"
 msgid "_Mask"
 msgstr "è??æ?¿(_M)"
 
-#: ../app/actions/layers-actions.c:55
+#: ../app/actions/layers-actions.c:59
+msgctxt "layers-action"
 msgid "Tr_ansparency"
 msgstr "é??æ??(_A)"
 
-#: ../app/actions/layers-actions.c:57
+#: ../app/actions/layers-actions.c:61
+msgctxt "layers-action"
+msgid "_Transform"
+msgstr "å??æ?¢(_T)"
+
+#: ../app/actions/layers-actions.c:63
+msgctxt "layers-action"
 msgid "_Properties"
 msgstr "å±?æ?§(_P)"
 
-#: ../app/actions/layers-actions.c:59
+#: ../app/actions/layers-actions.c:65
+msgctxt "layers-action"
+msgid "_Opacity"
+msgstr "ä¸?é??æ??度(_O)"
+
+#: ../app/actions/layers-actions.c:67
+msgctxt "layers-action"
 msgid "Layer _Mode"
 msgstr "��模�(_M)"
 
-#: ../app/actions/layers-actions.c:62
+#: ../app/actions/layers-actions.c:70
+msgctxt "layers-action"
 msgid "Te_xt Tool"
 msgstr "æ??å­?å·¥å?·(_X)"
 
-#: ../app/actions/layers-actions.c:63
+#: ../app/actions/layers-actions.c:71
+msgctxt "layers-action"
 msgid "Activate the text tool on this text layer"
 msgstr "å?¨æ­¤æ??å­?å±?ä¸?æ¿?æ´»æ??æ?¬å·¥å?·"
 
-#: ../app/actions/layers-actions.c:68
+#: ../app/actions/layers-actions.c:76
+msgctxt "layers-action"
 msgid "_Edit Layer Attributes..."
 msgstr "������(_E)..."
 
-#: ../app/actions/layers-actions.c:69
+#: ../app/actions/layers-actions.c:77
+msgctxt "layers-action"
 msgid "Edit the layer's name"
 msgstr "ç¼?è¾?å?¾å±?å??称"
 
-#: ../app/actions/layers-actions.c:74
+#: ../app/actions/layers-actions.c:82
+msgctxt "layers-action"
 msgid "_New Layer..."
 msgstr "�建��(_N)..."
 
-#: ../app/actions/layers-actions.c:75
+#: ../app/actions/layers-actions.c:83
+msgctxt "layers-action"
 msgid "Create a new layer and add it to the image"
-msgstr "å??建æ?°å?¾æ?¾å¹¶å°?å?¶æ·»å? å?°å?¾å??"
+msgstr "å??建æ?°å?¾å±?并å°?å?¶æ·»å? å?°å?¾å??"
 
-#: ../app/actions/layers-actions.c:80
+#: ../app/actions/layers-actions.c:88
+msgctxt "layers-action"
 msgid "_New Layer"
 msgstr "�建��(_N)"
 
-#: ../app/actions/layers-actions.c:81
+#: ../app/actions/layers-actions.c:89
+msgctxt "layers-action"
 msgid "Create a new layer with last used values"
 msgstr "æ??ä¸?次使ç?¨ç??å?¼æ?°å»ºå?¾å±?"
 
-#: ../app/actions/layers-actions.c:86
+#: ../app/actions/layers-actions.c:94
+msgctxt "layers-action"
 msgid "New from _Visible"
 msgstr "ä»?å?¯è§?项å??建(_V)"
 
-#: ../app/actions/layers-actions.c:87
+#: ../app/actions/layers-actions.c:96
+msgctxt "layers-action"
 msgid "Create a new layer from what is visible in this image"
-msgstr "æ ¹æ?®å?¯è§?项å??建æ?°å?¾å±?"
+msgstr "ä»?æ­¤å?¾å??中ç??å?¯è§?å??容å??建æ?°å?¾å±?"
 
-#: ../app/actions/layers-actions.c:92
+#: ../app/actions/layers-actions.c:101
+msgctxt "layers-action"
 msgid "D_uplicate Layer"
 msgstr "����(_U)"
 
-#: ../app/actions/layers-actions.c:93
+#: ../app/actions/layers-actions.c:103
+msgctxt "layers-action"
 msgid "Create a duplicate of the layer and add it to the image"
 msgstr "å??建å?¾å±?ç??å?¯æ?¬ï¼?并å°?å?¶æ·»å? å?°å?¾å??"
 
-#: ../app/actions/layers-actions.c:98
+#: ../app/actions/layers-actions.c:108
+msgctxt "layers-action"
 msgid "_Delete Layer"
 msgstr "����(_D)"
 
-#: ../app/actions/layers-actions.c:99
+#: ../app/actions/layers-actions.c:109
+msgctxt "layers-action"
 msgid "Delete this layer"
 msgstr "��此��"
 
-#: ../app/actions/layers-actions.c:104
+#: ../app/actions/layers-actions.c:114
+msgctxt "layers-action"
 msgid "_Raise Layer"
 msgstr "å??é«?å?¾å±?(_R)"
 
-#: ../app/actions/layers-actions.c:105
+#: ../app/actions/layers-actions.c:115
+msgctxt "layers-action"
 msgid "Raise this layer one step in the layer stack"
 msgstr "å?¨å?¾å±?æ ?中使此å?¾å±?å??é«?ä¸?æ­¥"
 
-#: ../app/actions/layers-actions.c:110
+#: ../app/actions/layers-actions.c:120
+msgctxt "layers-action"
 msgid "Layer to _Top"
 msgstr "å?¾å±?å??è?³é¡¶ç«¯(_T)"
 
-#: ../app/actions/layers-actions.c:111
+#: ../app/actions/layers-actions.c:121
+msgctxt "layers-action"
 msgid "Move this layer to the top of the layer stack"
 msgstr "å°?æ­¤å?¾å±?移å?¨è?³å?¾å±?æ ?ç??顶端"
 
-#: ../app/actions/layers-actions.c:116
+#: ../app/actions/layers-actions.c:126
+msgctxt "layers-action"
 msgid "_Lower Layer"
 msgstr "é??ä½?å?¾å±?(_L)"
 
-#: ../app/actions/layers-actions.c:117
+#: ../app/actions/layers-actions.c:127
+msgctxt "layers-action"
 msgid "Lower this layer one step in the layer stack"
 msgstr "å?¨å?¾å±?æ ?中使此å?¾å±?é??ä½?ä¸?æ­¥"
 
-#: ../app/actions/layers-actions.c:122
+#: ../app/actions/layers-actions.c:132
+msgctxt "layers-action"
 msgid "Layer to _Bottom"
 msgstr "å?¾å±?é??è?³åº?端(_B)"
 
-#: ../app/actions/layers-actions.c:123
+#: ../app/actions/layers-actions.c:133
+msgctxt "layers-action"
 msgid "Move this layer to the bottom of the layer stack"
 msgstr "å°?æ­¤å?¾å±?移å?¨è?³å?¾å±?æ ?ç??åº?端"
 
-#: ../app/actions/layers-actions.c:128
+#: ../app/actions/layers-actions.c:138
+msgctxt "layers-action"
 msgid "_Anchor Layer"
 msgstr "����(_A)"
 
-#: ../app/actions/layers-actions.c:129
+#: ../app/actions/layers-actions.c:139
+msgctxt "layers-action"
 msgid "Anchor the floating layer"
 msgstr "��浮���"
 
-#: ../app/actions/layers-actions.c:134
+#: ../app/actions/layers-actions.c:144
+msgctxt "layers-action"
 msgid "Merge Do_wn"
 msgstr "å??ä¸?å??并(_W)"
 
-#: ../app/actions/layers-actions.c:135
+#: ../app/actions/layers-actions.c:145
+msgctxt "layers-action"
 msgid "Merge this layer with the one below it"
 msgstr "å°?æ­¤å?¾å±?ä¸?å?¶ä¸?ç??ä¸?å±?å??并"
 
-#: ../app/actions/layers-actions.c:140
+#: ../app/actions/layers-actions.c:150
+msgctxt "layers-action"
 msgid "Merge _Visible Layers..."
 msgstr "å??并å?¯è§?å?¾å±?(_V)..."
 
-#: ../app/actions/layers-actions.c:152
+#: ../app/actions/layers-actions.c:151
+msgctxt "layers-action"
+msgid "Merge all visible layers into one layer"
+msgstr "å°?æ??æ??ç??å?¯è§?å?¾å±?å??并为ä¸?个å?¾å±?"
+
+#: ../app/actions/layers-actions.c:156
+msgctxt "layers-action"
+msgid "_Flatten Image"
+msgstr "å¹³æ?´å?¾å??(_F)"
+
+#: ../app/actions/layers-actions.c:157
+msgctxt "layers-action"
+msgid "Merge all layers into one and remove transparency"
+msgstr "å°?æ??æ??ç??å?¾å±?å??并为ä¸?个并移é?¤é??æ??"
+
+#: ../app/actions/layers-actions.c:162
+msgctxt "layers-action"
 msgid "_Discard Text Information"
 msgstr "æ?¾å¼?æ??å­?ä¿¡æ?¯(_D)"
 
-#: ../app/actions/layers-actions.c:153
+#: ../app/actions/layers-actions.c:163
+msgctxt "layers-action"
 msgid "Turn this text layer into a normal layer"
 msgstr "å°?æ­¤æ??å­?å?¾å±?转æ?¢ä¸ºæ?®é??å?¾å±?"
 
-#: ../app/actions/layers-actions.c:158
+#: ../app/actions/layers-actions.c:168
+msgctxt "layers-action"
 msgid "Text to _Path"
 msgstr "æ??å­?å?°è·¯å¾?(_P)"
 
-#: ../app/actions/layers-actions.c:159
+#: ../app/actions/layers-actions.c:169
+msgctxt "layers-action"
 msgid "Create a path from this text layer"
 msgstr "æ ¹æ?®æ­¤æ??å­?å?¾å±?å??建路å¾?"
 
-#: ../app/actions/layers-actions.c:164
+#: ../app/actions/layers-actions.c:174
+msgctxt "layers-action"
 msgid "Text alon_g Path"
-msgstr "æ??å­?对é½?è·¯å¾?"
+msgstr "æ??å­?对é½?è·¯å¾?(_G)"
 
-#: ../app/actions/layers-actions.c:165
+#: ../app/actions/layers-actions.c:175
+msgctxt "layers-action"
 msgid "Warp this layer's text along the current path"
 msgstr "沿活å?¨è·¯å¾?ç?¯ç»?æ­¤å±?ç??æ??å­?"
 
-#: ../app/actions/layers-actions.c:170
+#: ../app/actions/layers-actions.c:180
+msgctxt "layers-action"
 msgid "Layer B_oundary Size..."
 msgstr "å?¾å±?è¾¹ç??大å°?(_O)..."
 
-#: ../app/actions/layers-actions.c:171
+#: ../app/actions/layers-actions.c:181
+msgctxt "layers-action"
 msgid "Adjust the layer dimensions"
-msgstr "���尺寸"
+msgstr "����尺寸"
 
-#: ../app/actions/layers-actions.c:176
+#: ../app/actions/layers-actions.c:186
+msgctxt "layers-action"
 msgid "Layer to _Image Size"
 msgstr "å?¾å±?å?°å?¾å??大å°?(_I)"
 
-#: ../app/actions/layers-actions.c:177
+#: ../app/actions/layers-actions.c:187
+msgctxt "layers-action"
 msgid "Resize the layer to the size of the image"
 msgstr "å°?å?¾å±?ç??大å°?é??设为å?¾å??ç??尺寸"
 
-#: ../app/actions/layers-actions.c:182
+#: ../app/actions/layers-actions.c:192
+msgctxt "layers-action"
 msgid "_Scale Layer..."
 msgstr "缩���(_S)..."
 
-#: ../app/actions/layers-actions.c:183
+#: ../app/actions/layers-actions.c:193
+msgctxt "layers-action"
 msgid "Change the size of the layer content"
 msgstr "æ?¹å??æ­¤å?¾å±?å??容ç??大å°?"
 
-#: ../app/actions/layers-actions.c:189
+#: ../app/actions/layers-actions.c:198
+msgctxt "layers-action"
+msgid "_Crop to Selection"
+msgstr "å?ªè£?å?°é??å?º(_C)"
+
+#: ../app/actions/layers-actions.c:199
+msgctxt "layers-action"
 msgid "Crop the layer to the extents of the selection"
 msgstr "å?ªè£?å?¾å±?å?°é??å?ºç??è??å?´"
 
-#: ../app/actions/layers-actions.c:194
+#: ../app/actions/layers-actions.c:204
+msgctxt "layers-action"
 msgid "Add La_yer Mask..."
 msgstr "æ·»å? å?¾å±?è??æ?¿(_Y)..."
 
-#: ../app/actions/layers-actions.c:195
+#: ../app/actions/layers-actions.c:206
+msgctxt "layers-action"
 msgid "Add a mask that allows non-destructive editing of transparency"
 msgstr "æ·»å? è??ç??以å??许对é??æ??度ç??é??ç ´å??æ?§ç¼?è¾?"
 
-#: ../app/actions/layers-actions.c:200
+#: ../app/actions/layers-actions.c:211
+msgctxt "layers-action"
 msgid "Add Alpha C_hannel"
 msgstr "æ·»å?  Alpha é??é??(_H)"
 
-#: ../app/actions/layers-actions.c:201
+#: ../app/actions/layers-actions.c:212
+msgctxt "layers-action"
 msgid "Add transparency information to the layer"
 msgstr "æ·»å? é??æ??度信æ?¯å?°å?¾å±?"
 
-#: ../app/actions/layers-actions.c:206
+#: ../app/actions/layers-actions.c:217
+msgctxt "layers-action"
 msgid "_Remove Alpha Channel"
-msgstr "å? é?¤ Alpha é??é??(_R)"
+msgstr "移é?¤ Alpha é??é??(_R)"
 
-#: ../app/actions/layers-actions.c:207
+#: ../app/actions/layers-actions.c:218
+msgctxt "layers-action"
 msgid "Remove transparency information from the layer"
-msgstr "å? é?¤å?¾å±?ç??é??æ??度信æ?¯"
+msgstr "移é?¤å?¾å±?ç??é??æ??度信æ?¯"
 
-#: ../app/actions/layers-actions.c:215
+#: ../app/actions/layers-actions.c:226
+msgctxt "layers-action"
 msgid "Lock Alph_a Channel"
-msgstr "é??å®? Alpha é??é??(_A)"
+msgstr "é??å®? Alph_a é??é??"
 
-#: ../app/actions/layers-actions.c:216
+#: ../app/actions/layers-actions.c:228
+msgctxt "layers-action"
 msgid "Keep transparency information on this layer from being modified"
 msgstr "å?¨å?¾å??ä¸?æ?´æ?¹æ?¶ä¿?ç??é??æ??度信æ?¯"
 
-#: ../app/actions/layers-actions.c:222
+#: ../app/actions/layers-actions.c:234
+msgctxt "layers-action"
 msgid "_Edit Layer Mask"
 msgstr "ç¼?è¾?å?¾å±?è??æ?¿(_E)"
 
-#: ../app/actions/layers-actions.c:223
+#: ../app/actions/layers-actions.c:235
+msgctxt "layers-action"
 msgid "Work on the layer mask"
 msgstr "å?¨å?¾å±?è??æ?¿ä¸?å·¥ä½?"
 
-#: ../app/actions/layers-actions.c:229
+#: ../app/actions/layers-actions.c:241
+msgctxt "layers-action"
 msgid "S_how Layer Mask"
 msgstr "æ?¾ç¤ºå?¾å±?è??æ?¿(_H)"
 
-#: ../app/actions/layers-actions.c:235
+#: ../app/actions/layers-actions.c:247
+msgctxt "layers-action"
 msgid "_Disable Layer Mask"
 msgstr "ç¦?ç?¨å?¾å±?è??æ?¿(_D)"
 
-#: ../app/actions/layers-actions.c:236
+#: ../app/actions/layers-actions.c:248
+msgctxt "layers-action"
 msgid "Dismiss the effect of the layer mask"
 msgstr "æ??å¼?å?¾å±?è??æ?¿æ??æ??"
 
-#: ../app/actions/layers-actions.c:245
+#: ../app/actions/layers-actions.c:257
+msgctxt "layers-action"
 msgid "Apply Layer _Mask"
 msgstr "åº?ç?¨å?¾å±?è??æ?¿(_M)"
 
-#: ../app/actions/layers-actions.c:246
+#: ../app/actions/layers-actions.c:258
+msgctxt "layers-action"
 msgid "Apply the effect of the layer mask and remove it"
-msgstr "åº?ç?¨å?¾å±?è??æ?¿æ??æ??并å? é?¤å®?"
+msgstr "åº?ç?¨å?¾å±?è??æ?¿æ??æ??并移é?¤å®?"
 
-#: ../app/actions/layers-actions.c:251
+#: ../app/actions/layers-actions.c:263
+msgctxt "layers-action"
 msgid "Delete Layer Mas_k"
 msgstr "å? é?¤å?¾å±?è??æ?¿(_K)"
 
-#: ../app/actions/layers-actions.c:252
+#: ../app/actions/layers-actions.c:264
+msgctxt "layers-action"
 msgid "Remove the layer mask and its effect"
 msgstr "移å? å?¾å±?è??æ?¿å??å?¶æ??æ??"
 
-#: ../app/actions/layers-actions.c:260
+#: ../app/actions/layers-actions.c:272
+msgctxt "layers-action"
 msgid "_Mask to Selection"
 msgstr "è??æ?¿å?°é??å?º(_M)"
 
-#: ../app/actions/layers-actions.c:261
+#: ../app/actions/layers-actions.c:273
+msgctxt "layers-action"
 msgid "Replace the selection with the layer mask"
 msgstr "ç?¨å?¾å±?è??æ?¿æ?¿ä»£é??å?º"
 
-#: ../app/actions/layers-actions.c:267
+#: ../app/actions/layers-actions.c:278
+msgctxt "layers-action"
+msgid "_Add to Selection"
+msgstr "æ·»å? å?°é??å?º(_A)"
+
+#: ../app/actions/layers-actions.c:279
+msgctxt "layers-action"
 msgid "Add the layer mask to the current selection"
 msgstr "å°?å?¾å±?è??æ?¿æ·»å? å?°å½?å??é??å?º"
 
-#: ../app/actions/layers-actions.c:273
+#: ../app/actions/layers-actions.c:284 ../app/actions/layers-actions.c:313
+#: ../app/actions/layers-actions.c:343
+msgctxt "layers-action"
+msgid "_Subtract from Selection"
+msgstr "ä»?é??å?ºä¸­å??å?»(_S)"
+
+#: ../app/actions/layers-actions.c:285
+msgctxt "layers-action"
 msgid "Subtract the layer mask from the current selection"
 msgstr "ä»?å½?å??é??å?ºå??å?»å?¾å±?è??ç??"
 
-#: ../app/actions/layers-actions.c:279
+#: ../app/actions/layers-actions.c:290 ../app/actions/layers-actions.c:320
+#: ../app/actions/layers-actions.c:350
+msgctxt "layers-action"
+msgid "_Intersect with Selection"
+msgstr "ä¸?é??å?ºç?¸äº¤(_I)"
+
+#: ../app/actions/layers-actions.c:291
+msgctxt "layers-action"
 msgid "Intersect the layer mask with the current selection"
 msgstr "交å??å?¾å±?è??ç??å??å½?å??é??å?º"
 
-#: ../app/actions/layers-actions.c:287
+#: ../app/actions/layers-actions.c:299
+msgctxt "layers-action"
 msgid "Al_pha to Selection"
-msgstr "Alpha å?°é??å?º(_P)"
+msgstr "Al_pha å?°é??å?º"
 
-#: ../app/actions/layers-actions.c:288
+#: ../app/actions/layers-actions.c:301
+msgctxt "layers-action"
 msgid "Replace the selection with the layer's alpha channel"
-msgstr "ç?¨å?¾å±?ç?? alpha é??é??æ?¿æ?¢é??å?º"
+msgstr "ç?¨å?¾å±?ç?? Alpha é??é??æ?¿æ?¢é??å?º"
 
-#: ../app/actions/layers-actions.c:293 ../app/actions/layers-actions.c:320
+#: ../app/actions/layers-actions.c:306 ../app/actions/layers-actions.c:336
+msgctxt "layers-action"
 msgid "A_dd to Selection"
 msgstr "æ·»å? å?°é??å?º(_D)"
 
-#: ../app/actions/layers-actions.c:294
+#: ../app/actions/layers-actions.c:308
+msgctxt "layers-action"
 msgid "Add the layer's alpha channel to the current selection"
-msgstr "å°?å?¾å±?ç?? alpha é??é??æ·»å? å?°å½?å??é??å?º"
+msgstr "å°?å?¾å±?ç?? Alpha é??é??æ·»å? å?°å½?å??é??å?º"
 
-#: ../app/actions/layers-actions.c:300
+#: ../app/actions/layers-actions.c:315
+msgctxt "layers-action"
 msgid "Subtract the layer's alpha channel from the current selection"
-msgstr "ä»?å½?å??é??å?ºå??å?»å?¾å±?ç?? alpha é??é??"
+msgstr "ä»?å½?å??é??å?ºå??å?»å?¾å±?ç?? Alpha é??é??"
 
-#: ../app/actions/layers-actions.c:306
+#: ../app/actions/layers-actions.c:322
+msgctxt "layers-action"
 msgid "Intersect the layer's alpha channel with the current selection"
-msgstr "交å??å?¾å±?ç?? alpha é??é??å??å½?å??é??å?º"
+msgstr "交å??å?¾å±?ç?? Alpha é??é??å??å½?å??é??å?º"
 
-#: ../app/actions/layers-actions.c:314
+#: ../app/actions/layers-actions.c:330
+msgctxt "layers-action"
 msgid "_Text to Selection"
 msgstr "æ??å­?å?°é??å?º(_T)"
 
-#: ../app/actions/layers-actions.c:315
+#: ../app/actions/layers-actions.c:331
+msgctxt "layers-action"
 msgid "Replace the selection with the text layer's outline"
 msgstr "ç?¨æ??å­?å?¾å±?ç??è½®å»?æ?¿æ?¢é??å?º"
 
-#: ../app/actions/layers-actions.c:321
+#: ../app/actions/layers-actions.c:338
+msgctxt "layers-action"
 msgid "Add the text layer's outline to the current selection"
 msgstr "å°?æ??å­?å?¾å±?ç??è½®å»?æ·»å? å?°å½?å??é??å?º"
 
-#: ../app/actions/layers-actions.c:327
+#: ../app/actions/layers-actions.c:345
+msgctxt "layers-action"
 msgid "Subtract the text layer's outline from the current selection"
 msgstr "ä»?å½?å??é??å?ºå??å?»æ??å­?å?¾å±?ç??è½®å»?"
 
-#: ../app/actions/layers-actions.c:333
+#: ../app/actions/layers-actions.c:352
+msgctxt "layers-action"
 msgid "Intersect the text layer's outline with the current selection"
 msgstr "交å??æ??å­?å?¾å±?ç??è½®å»?å??å½?å??é??å?º"
 
-#: ../app/actions/layers-actions.c:341
+#: ../app/actions/layers-actions.c:360
+msgctxt "layers-action"
 msgid "Select _Top Layer"
 msgstr "é??æ?©é¡¶ç«¯å?¾å±?(_T)"
 
-#: ../app/actions/layers-actions.c:342
+#: ../app/actions/layers-actions.c:361
+msgctxt "layers-action"
 msgid "Select the topmost layer"
 msgstr "é??æ?©æ??顶端å?¾å±?"
 
-#: ../app/actions/layers-actions.c:347
+#: ../app/actions/layers-actions.c:366
+msgctxt "layers-action"
 msgid "Select _Bottom Layer"
 msgstr "é??æ?©åº?端å?¾å±?(_B)"
 
-#: ../app/actions/layers-actions.c:348
+#: ../app/actions/layers-actions.c:367
+msgctxt "layers-action"
 msgid "Select the bottommost layer"
 msgstr "é??æ?©æ??åº?端å?¾å±?"
 
-#: ../app/actions/layers-actions.c:353
+#: ../app/actions/layers-actions.c:372
+msgctxt "layers-action"
 msgid "Select _Previous Layer"
 msgstr "é??æ?©å??ä¸?å?¾å±?(_P)"
 
-#: ../app/actions/layers-actions.c:354
+#: ../app/actions/layers-actions.c:373
+msgctxt "layers-action"
 msgid "Select the layer above the current layer"
 msgstr "é??æ?©æ´»å?¨å?¾å±?ä¸?æ?¹ç??å?¾å±?"
 
-#: ../app/actions/layers-actions.c:359
+#: ../app/actions/layers-actions.c:378
+msgctxt "layers-action"
 msgid "Select _Next Layer"
 msgstr "é??æ?©å??ä¸?å?¾å±?(_N)"
 
-#: ../app/actions/layers-actions.c:360
+#: ../app/actions/layers-actions.c:379
+msgctxt "layers-action"
 msgid "Select the layer below the current layer"
 msgstr "é??æ?©æ´»å?¨å?¾å±?ä¸?æ?¹ç??å?¾å±?"
 
-#: ../app/actions/layers-actions.c:368
-msgid "Set Opacity"
-msgstr "设置ä¸?é??æ??度"
-
 #: ../app/actions/layers-commands.c:203
 msgid "Layer Attributes"
 msgstr "����"
@@ -2956,343 +3587,424 @@ msgstr "����"
 msgid "Edit Layer Attributes"
 msgstr "������"
 
-#: ../app/actions/layers-commands.c:249 ../app/actions/layers-commands.c:251
-#: ../app/actions/layers-commands.c:319 ../app/actions/layers-commands.c:323
-#: ../app/widgets/gimpdrawabletreeview.c:326
-#: ../app/widgets/gimplayertreeview.c:835
+#: ../app/actions/layers-commands.c:250 ../app/actions/layers-commands.c:252
+#: ../app/actions/layers-commands.c:320 ../app/actions/layers-commands.c:324
+#: ../app/widgets/gimpdrawabletreeview.c:327
+#: ../app/widgets/gimplayertreeview.c:862
 msgid "New Layer"
 msgstr "�建��"
 
-#: ../app/actions/layers-commands.c:254
+#: ../app/actions/layers-commands.c:255
 msgid "Create a New Layer"
 msgstr "å??建æ?°å?¾å±?"
 
-#: ../app/actions/layers-commands.c:352
+#: ../app/actions/layers-commands.c:353
 msgid "Visible"
 msgstr "��"
 
-#: ../app/actions/layers-commands.c:571
+#: ../app/actions/layers-commands.c:568
 msgid "Set Layer Boundary Size"
 msgstr "设置å?¾å±?è¾¹ç??大å°?"
 
-#: ../app/actions/layers-commands.c:612 ../app/core/gimplayer.c:251
+#: ../app/actions/layers-commands.c:609 ../app/core/gimplayer.c:252
 msgid "Scale Layer"
 msgstr "缩���"
 
-#: ../app/actions/layers-commands.c:649
+#: ../app/actions/layers-commands.c:647
 msgid "Crop Layer"
 msgstr "����"
 
-#: ../app/actions/layers-commands.c:788
+#: ../app/actions/layers-commands.c:786
 msgid "Layer Mask to Selection"
 msgstr "å?¾å±?è??æ?¿å?°é??å?º"
 
-#: ../app/actions/layers-commands.c:1036
+#: ../app/actions/layers-commands.c:1035
 msgid "Please select a channel first"
 msgstr "请å??é??æ?©é??é??"
 
-#: ../app/actions/layers-commands.c:1044 ../app/core/gimplayer.c:1282
+#: ../app/actions/layers-commands.c:1043 ../app/core/gimplayer.c:1310
 #: ../app/dialogs/layer-add-mask-dialog.c:81
 msgid "Add Layer Mask"
 msgstr "æ·»å? å?¾å±?è??æ?¿"
 
-#: ../app/actions/palette-editor-actions.c:44
+#: ../app/actions/palette-editor-actions.c:43
+msgctxt "palette-editor-action"
 msgid "Palette Editor Menu"
 msgstr "è?²æ?¿ç¼?è¾?å?¨è??å??"
 
-#: ../app/actions/palette-editor-actions.c:54
+#: ../app/actions/palette-editor-actions.c:47
+msgctxt "palette-editor-action"
+msgid "_Edit Color..."
+msgstr "����(_E)..."
+
+#: ../app/actions/palette-editor-actions.c:48
+msgctxt "palette-editor-action"
+msgid "Edit this entry"
+msgstr "��此项"
+
+#: ../app/actions/palette-editor-actions.c:53
+msgctxt "palette-editor-action"
 msgid "_Delete Color"
 msgstr "����(_D)"
 
-#: ../app/actions/palette-editor-actions.c:55
-msgid "Delete color"
-msgstr "����"
+#: ../app/actions/palette-editor-actions.c:54
+msgctxt "palette-editor-action"
+msgid "Delete this entry"
+msgstr "��此项"
 
-#: ../app/actions/palette-editor-actions.c:63
+#: ../app/actions/palette-editor-actions.c:62
+msgctxt "palette-editor-action"
 msgid "Edit Active Palette"
 msgstr "��活���"
 
-#: ../app/actions/palette-editor-actions.c:72
+#: ../app/actions/palette-editor-actions.c:71
+msgctxt "palette-editor-action"
 msgid "New Color from _FG"
-msgstr "æ·»å? å??æ?¯è?²(_F)"
+msgstr "ä»?å??æ?¯è?²æ?°å»ºé¢?è?²(_F)"
 
 #: ../app/actions/palette-editor-actions.c:73
-msgid "New color from foreground color"
-msgstr "ä»?å??æ?¯è?²æ?°å»ºé¢?è?²"
+msgctxt "palette-editor-action"
+msgid "Create a new entry from the foreground color"
+msgstr "ä»?å??æ?¯è?²æ?°å»ºé¢?è?²é¡¹"
 
 #: ../app/actions/palette-editor-actions.c:78
+msgctxt "palette-editor-action"
 msgid "New Color from _BG"
-msgstr "æ·»å? è??æ?¯è?²(_B)"
+msgstr "ä»?è??æ?¯è?²æ?°å»ºé¢?è?²(_B)"
 
-#: ../app/actions/palette-editor-actions.c:79
-msgid "New color from background color"
-msgstr "ä»?è??æ?¯è?²æ?°å»ºé¢?è?²"
+#: ../app/actions/palette-editor-actions.c:80
+msgctxt "palette-editor-action"
+msgid "Create a new entry from the background color"
+msgstr "ä»?è??æ?¯è?²æ?°å»ºé¢?è?²é¡¹"
 
-#: ../app/actions/palette-editor-actions.c:87
-#: ../app/actions/view-actions.c:261
+#: ../app/actions/palette-editor-actions.c:88
 msgid "Zoom _In"
 msgstr "�大(_I)"
 
-#: ../app/actions/palette-editor-actions.c:93
-#: ../app/actions/view-actions.c:255
+#: ../app/actions/palette-editor-actions.c:94
 msgid "Zoom _Out"
 msgstr "缩�(_O)"
 
-#: ../app/actions/palette-editor-actions.c:99
+#: ../app/actions/palette-editor-actions.c:100
 msgid "Zoom _All"
 msgstr "���示(_A)"
 
-#: ../app/actions/palette-editor-commands.c:69
+#: ../app/actions/palette-editor-commands.c:68
 msgid "Edit Palette Color"
 msgstr "������"
 
-#: ../app/actions/palette-editor-commands.c:71
+#: ../app/actions/palette-editor-commands.c:70
 msgid "Edit Color Palette Entry"
 msgstr "������"
 
-#: ../app/actions/palettes-actions.c:44
+#: ../app/actions/palettes-actions.c:43
+msgctxt "palettes-action"
 msgid "Palettes Menu"
 msgstr "è?²æ?¿è??å??"
 
-#: ../app/actions/palettes-actions.c:48
+#: ../app/actions/palettes-actions.c:47
+msgctxt "palettes-action"
 msgid "_New Palette"
 msgstr "�建��(_N)"
 
-#: ../app/actions/palettes-actions.c:49
-msgid "New palette"
-msgstr "�建��"
+#: ../app/actions/palettes-actions.c:48
+msgctxt "palettes-action"
+msgid "Create a new palette"
+msgstr "å??建æ?°ç??模æ?¿"
 
-#: ../app/actions/palettes-actions.c:54
+#: ../app/actions/palettes-actions.c:53
+msgctxt "palettes-action"
 msgid "_Import Palette..."
 msgstr "导���(_I)..."
 
-#: ../app/actions/palettes-actions.c:55
+#: ../app/actions/palettes-actions.c:54
+msgctxt "palettes-action"
 msgid "Import palette"
 msgstr "导���"
 
-#: ../app/actions/palettes-actions.c:60
+#: ../app/actions/palettes-actions.c:59
+msgctxt "palettes-action"
 msgid "D_uplicate Palette"
 msgstr "����(_U)"
 
-#: ../app/actions/palettes-actions.c:61
-msgid "Duplicate palette"
+#: ../app/actions/palettes-actions.c:60
+msgctxt "palettes-action"
+msgid "Duplicate this palette"
 msgstr "����"
 
-#: ../app/actions/palettes-actions.c:66
+#: ../app/actions/palettes-actions.c:65
+msgctxt "palettes-action"
 msgid "_Merge Palettes..."
 msgstr "å??并è?²æ?¿(_M)..."
 
-#: ../app/actions/palettes-actions.c:67
+#: ../app/actions/palettes-actions.c:66
+msgctxt "palettes-action"
 msgid "Merge palettes"
 msgstr "å??并è?²æ?¿"
 
-#: ../app/actions/palettes-actions.c:72
+#: ../app/actions/palettes-actions.c:71
+msgctxt "palettes-action"
 msgid "Copy Palette _Location"
 msgstr "�����置(_L)"
 
-#: ../app/actions/palettes-actions.c:73
+#: ../app/actions/palettes-actions.c:72
+msgctxt "palettes-action"
 msgid "Copy palette file location to clipboard"
 msgstr "å°?è?²æ?¿æ??件ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/palettes-actions.c:78
+#: ../app/actions/palettes-actions.c:77
+msgctxt "palettes-action"
 msgid "_Delete Palette"
 msgstr "����(_D)"
 
-#: ../app/actions/palettes-actions.c:79
-msgid "Delete palette"
-msgstr "����"
+#: ../app/actions/palettes-actions.c:78
+msgctxt "palettes-action"
+msgid "Delete this palette"
+msgstr "��此��"
 
-#: ../app/actions/palettes-actions.c:84
+#: ../app/actions/palettes-actions.c:83
+msgctxt "palettes-action"
 msgid "_Refresh Palettes"
 msgstr "����(_R)"
 
-#: ../app/actions/palettes-actions.c:85
+#: ../app/actions/palettes-actions.c:84
+msgctxt "palettes-action"
 msgid "Refresh palettes"
 msgstr "����"
 
-#: ../app/actions/palettes-actions.c:93
+#: ../app/actions/palettes-actions.c:92
+msgctxt "palettes-action"
 msgid "_Edit Palette..."
 msgstr "����(_E)..."
 
-#: ../app/actions/palettes-actions.c:94
+#: ../app/actions/palettes-actions.c:93
+msgctxt "palettes-action"
 msgid "Edit palette"
 msgstr "����"
 
-#: ../app/actions/palettes-commands.c:74
+#: ../app/actions/palettes-commands.c:73
 msgid "Merge Palette"
 msgstr "å??并è?²æ?¿"
 
-#: ../app/actions/palettes-commands.c:78
+#: ../app/actions/palettes-commands.c:77
 msgid "Enter a name for the merged palette"
 msgstr "ç»?å·²å??并ç??è?²æ?¿è¾?å?¥ä¸?个å??å­?"
 
-#: ../app/actions/patterns-actions.c:43
+#: ../app/actions/patterns-actions.c:42
+msgctxt "patterns-action"
 msgid "Patterns Menu"
 msgstr "å?¾æ¡?è??å??"
 
-#: ../app/actions/patterns-actions.c:47
+#: ../app/actions/patterns-actions.c:46
+msgctxt "patterns-action"
 msgid "_Open Pattern as Image"
 msgstr "ä½?为å?¾å??æ??å¼?å?¾æ¡?(_O)"
 
-#: ../app/actions/patterns-actions.c:48
-msgid "Open pattern as image"
+#: ../app/actions/patterns-actions.c:47
+msgctxt "patterns-action"
+msgid "Open this pattern as an image"
 msgstr "ä½?为å?¾å??æ??å¼?å?¾æ¡?"
 
-#: ../app/actions/patterns-actions.c:53
+#: ../app/actions/patterns-actions.c:52
+msgctxt "patterns-action"
 msgid "_New Pattern"
 msgstr "�建��(_N)"
 
-#: ../app/actions/patterns-actions.c:54
-msgid "New pattern"
-msgstr "�建��"
+#: ../app/actions/patterns-actions.c:53
+msgctxt "patterns-action"
+msgid "Create a new pattern"
+msgstr "å??建æ?°ç??å?¾æ¡?"
 
-#: ../app/actions/patterns-actions.c:59
+#: ../app/actions/patterns-actions.c:58
+msgctxt "patterns-action"
 msgid "D_uplicate Pattern"
 msgstr "����(_U)"
 
-#: ../app/actions/patterns-actions.c:60
-msgid "Duplicate pattern"
-msgstr "����"
+#: ../app/actions/patterns-actions.c:59
+msgctxt "patterns-action"
+msgid "Duplicate this pattern"
+msgstr "��此��"
 
-#: ../app/actions/patterns-actions.c:65
+#: ../app/actions/patterns-actions.c:64
+msgctxt "patterns-action"
 msgid "Copy Pattern _Location"
 msgstr "�����置(_L)"
 
-#: ../app/actions/patterns-actions.c:66
+#: ../app/actions/patterns-actions.c:65
+msgctxt "patterns-action"
 msgid "Copy pattern file location to clipboard"
 msgstr "å°?å?¾æ¡?æ??件ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/patterns-actions.c:71
+#: ../app/actions/patterns-actions.c:70
+msgctxt "patterns-action"
 msgid "_Delete Pattern"
 msgstr "����(_D)"
 
-#: ../app/actions/patterns-actions.c:72
-msgid "Delete pattern"
-msgstr "����"
+#: ../app/actions/patterns-actions.c:71
+msgctxt "patterns-action"
+msgid "Delete this pattern"
+msgstr "��此��"
 
-#: ../app/actions/patterns-actions.c:77
+#: ../app/actions/patterns-actions.c:76
+msgctxt "patterns-action"
 msgid "_Refresh Patterns"
 msgstr "����(_R)"
 
-#: ../app/actions/patterns-actions.c:78
+#: ../app/actions/patterns-actions.c:77
+msgctxt "patterns-action"
 msgid "Refresh patterns"
 msgstr "����"
 
-#: ../app/actions/patterns-actions.c:86
+#: ../app/actions/patterns-actions.c:85
+msgctxt "patterns-action"
 msgid "_Edit Pattern..."
 msgstr "����(_E)..."
 
-#: ../app/actions/patterns-actions.c:87
+#: ../app/actions/patterns-actions.c:86
+msgctxt "patterns-action"
 msgid "Edit pattern"
 msgstr "����"
 
-#: ../app/actions/plug-in-actions.c:83
+#: ../app/actions/plug-in-actions.c:84
+msgctxt "plug-in-action"
 msgid "Filte_rs"
 msgstr "滤é??(_R)"
 
-#: ../app/actions/plug-in-actions.c:84
+#: ../app/actions/plug-in-actions.c:86
+msgctxt "plug-in-action"
 msgid "Recently Used"
 msgstr "æ??è¿?使ç?¨ç??"
 
-#: ../app/actions/plug-in-actions.c:85
+#: ../app/actions/plug-in-actions.c:88
+msgctxt "plug-in-action"
 msgid "_Blur"
 msgstr "模�(_B)"
 
-#: ../app/actions/plug-in-actions.c:86
+#: ../app/actions/plug-in-actions.c:90
+msgctxt "plug-in-action"
 msgid "_Noise"
 msgstr "��(_N)"
 
-#: ../app/actions/plug-in-actions.c:87
+#: ../app/actions/plug-in-actions.c:92
+msgctxt "plug-in-action"
 msgid "Edge-De_tect"
 msgstr "边���(_T)"
 
-#: ../app/actions/plug-in-actions.c:88
+#: ../app/actions/plug-in-actions.c:94
+msgctxt "plug-in-action"
 msgid "En_hance"
 msgstr "�强(_H)"
 
-#: ../app/actions/plug-in-actions.c:89
+#: ../app/actions/plug-in-actions.c:96
+msgctxt "plug-in-action"
 msgid "C_ombine"
 msgstr "ç»?å??(_O)"
 
-#: ../app/actions/plug-in-actions.c:90
+#: ../app/actions/plug-in-actions.c:98
+msgctxt "plug-in-action"
 msgid "_Generic"
 msgstr "常�(_G)"
 
-#: ../app/actions/plug-in-actions.c:91
+#: ../app/actions/plug-in-actions.c:100
+msgctxt "plug-in-action"
 msgid "_Light and Shadow"
 msgstr "å??æº?å??é?´å½±(_L)"
 
-#: ../app/actions/plug-in-actions.c:92
+#: ../app/actions/plug-in-actions.c:102
+msgctxt "plug-in-action"
 msgid "_Distorts"
 msgstr "æ?­æ?²(_D)"
 
-#: ../app/actions/plug-in-actions.c:93
+#: ../app/actions/plug-in-actions.c:104
+msgctxt "plug-in-action"
 msgid "_Artistic"
 msgstr "��(_A)"
 
-#: ../app/actions/plug-in-actions.c:94
+#: ../app/actions/plug-in-actions.c:106
+msgctxt "plug-in-action"
 msgid "_Decor"
 msgstr "�饰"
 
-#: ../app/actions/plug-in-actions.c:96
+#: ../app/actions/plug-in-actions.c:108
+msgctxt "plug-in-action"
+msgid "_Map"
+msgstr "æ? å°?(_M)"
+
+#: ../app/actions/plug-in-actions.c:110
+msgctxt "plug-in-action"
 msgid "_Render"
 msgstr "ç»?å?¶(_R)"
 
-#: ../app/actions/plug-in-actions.c:97
+#: ../app/actions/plug-in-actions.c:112
+msgctxt "plug-in-action"
 msgid "_Clouds"
 msgstr "�彩(_C)"
 
-#: ../app/actions/plug-in-actions.c:98
+#: ../app/actions/plug-in-actions.c:114
+msgctxt "plug-in-action"
 msgid "_Nature"
 msgstr "��(_N)"
 
-#: ../app/actions/plug-in-actions.c:100
+#: ../app/actions/plug-in-actions.c:116
+msgctxt "plug-in-action"
+msgid "_Pattern"
+msgstr "��(_P)"
+
+#: ../app/actions/plug-in-actions.c:118
+msgctxt "plug-in-action"
 msgid "_Web"
 msgstr "�页(_W)"
 
-#: ../app/actions/plug-in-actions.c:101
+#: ../app/actions/plug-in-actions.c:120
+msgctxt "plug-in-action"
 msgid "An_imation"
 msgstr "��(_I)"
 
-#: ../app/actions/plug-in-actions.c:104
+#: ../app/actions/plug-in-actions.c:123
+msgctxt "plug-in-action"
 msgid "Reset all _Filters"
 msgstr "é??ç½®æ??æ??滤é??(_F)"
 
-#: ../app/actions/plug-in-actions.c:105
+#: ../app/actions/plug-in-actions.c:124
+msgctxt "plug-in-action"
 msgid "Reset all plug-ins to their default settings"
 msgstr "å°?å?¨é?¨æ??件é??置为å?¶é»?认设置"
 
-#: ../app/actions/plug-in-actions.c:113
+#: ../app/actions/plug-in-actions.c:132
+msgctxt "plug-in-action"
 msgid "Re_peat Last"
 msgstr "é??å¤?ä¸?次(_P)"
 
-#: ../app/actions/plug-in-actions.c:114
+#: ../app/actions/plug-in-actions.c:134
+msgctxt "plug-in-action"
 msgid "Rerun the last used plug-in using the same settings"
 msgstr "ç?¨å??æ ·ç??设置é??æ?°è¿?è¡?ä¸?次使ç?¨ç??æ??件"
 
-#: ../app/actions/plug-in-actions.c:119
+#: ../app/actions/plug-in-actions.c:139
+msgctxt "plug-in-action"
 msgid "R_e-Show Last"
 msgstr "���次(_E)"
 
-#: ../app/actions/plug-in-actions.c:120
+#: ../app/actions/plug-in-actions.c:140
+msgctxt "plug-in-action"
 msgid "Show the last used plug-in dialog again"
 msgstr "å??次æ?¾ç¤ºä¸?次使ç?¨ç??æ??件对è¯?æ¡?"
 
-#: ../app/actions/plug-in-actions.c:503
+#: ../app/actions/plug-in-actions.c:523
 #, c-format
 msgid "Re_peat \"%s\""
 msgstr "é??å¤?â??%sâ??(_P)"
 
-#: ../app/actions/plug-in-actions.c:504
+#: ../app/actions/plug-in-actions.c:524
 #, c-format
 msgid "R_e-Show \"%s\""
 msgstr "é??æ?°æ?¾ç¤ºâ??%sâ??(_E)"
 
-#: ../app/actions/plug-in-actions.c:520
+#: ../app/actions/plug-in-actions.c:540
 msgid "Repeat Last"
 msgstr "é??å¤?ä¸?次"
 
-#: ../app/actions/plug-in-actions.c:522
+#: ../app/actions/plug-in-actions.c:542
 msgid "Re-Show Last"
 msgstr "���次"
 
@@ -3305,27 +4017,32 @@ msgid "Do you really want to reset all filters to default values?"
 msgstr "æ?¨ç??ç??è¦?å°?æ??æ??滤é??é??ç½®å?°é»?认å?¼å??ï¼?"
 
 #: ../app/actions/quick-mask-actions.c:42
+msgctxt "quick-mask-action"
 msgid "Quick Mask Menu"
 msgstr "å¿«é??è??æ?¿è??å??"
 
 #: ../app/actions/quick-mask-actions.c:46
+msgctxt "quick-mask-action"
 msgid "_Configure Color and Opacity..."
 msgstr "é??ç½®é¢?è?²å??ä¸?é??æ??度(_C)..."
 
 #: ../app/actions/quick-mask-actions.c:54
+msgctxt "quick-mask-action"
 msgid "Toggle _Quick Mask"
 msgstr "å??æ?¢å¿«é??è??æ?¿(_Q)"
 
-#: ../app/actions/quick-mask-actions.c:54
-#: ../app/display/gimpdisplayshell.c:1167
-msgid "Toggle Quick Mask"
-msgstr "å??æ?¢å¿«é??è??æ?¿"
+#: ../app/actions/quick-mask-actions.c:55
+msgctxt "quick-mask-action"
+msgid "Toggle Quick Mask on/off"
+msgstr "å??æ?¢å¿«é??è??æ?¿å¼?/å?³"
 
-#: ../app/actions/quick-mask-actions.c:63
+#: ../app/actions/quick-mask-actions.c:64
+msgctxt "quick-mask-action"
 msgid "Mask _Selected Areas"
 msgstr "æ?©è?½é??中å?ºå??(_S)"
 
-#: ../app/actions/quick-mask-actions.c:68
+#: ../app/actions/quick-mask-actions.c:69
+msgctxt "quick-mask-action"
 msgid "Mask _Unselected Areas"
 msgstr "æ?©è?½é??é??中å?ºå??(_U)"
 
@@ -3345,219 +4062,267 @@ msgstr "ç¼?è¾?å¿«é??è??æ?¿é¢?è?²"
 msgid "_Mask opacity:"
 msgstr "è??æ?¿ä¸?é??æ??度(_M)ï¼?"
 
-#: ../app/actions/sample-points-actions.c:40
+#: ../app/actions/sample-points-actions.c:39
+msgctxt "sample-points-action"
 msgid "Sample Point Menu"
 msgstr "é??æ ·ç?¹è??å??"
 
+#: ../app/actions/sample-points-actions.c:46
+msgctxt "sample-points-action"
+msgid "_Sample Merged"
+msgstr "ä½?æ ·å??并(_S)"
+
+#: ../app/actions/sample-points-actions.c:48
+msgctxt "sample-points-action"
+msgid "Use the composite color of all visible layers"
+msgstr "使ç?¨æ??æ??å?¯è§?å?¾å±?ç??æ··å??é¢?è?²"
+
 #: ../app/actions/select-actions.c:44
+msgctxt "select-action"
 msgid "Selection Editor Menu"
 msgstr "é??å?ºç¼?è¾?å?¨è??å??"
 
 #: ../app/actions/select-actions.c:47
+msgctxt "select-action"
 msgid "_Select"
 msgstr "é??æ?©(_S)"
 
 #: ../app/actions/select-actions.c:50
-msgid "select|_All"
+msgctxt "select-action"
+msgid "_All"
 msgstr "��(_A)"
 
 #: ../app/actions/select-actions.c:51
+msgctxt "select-action"
 msgid "Select everything"
 msgstr "é??æ?©å?¨é?¨"
 
 #: ../app/actions/select-actions.c:56
-msgid "select|_None"
-msgstr "æ? (_N)"
+msgctxt "select-action"
+msgid "_None"
+msgstr "æ? "
 
 #: ../app/actions/select-actions.c:57
+msgctxt "select-action"
 msgid "Dismiss the selection"
 msgstr "æ??å¼?é??å?º"
 
 #: ../app/actions/select-actions.c:62
+msgctxt "select-action"
 msgid "_Invert"
 msgstr "å??转(_I)"
 
 #: ../app/actions/select-actions.c:63
+msgctxt "select-action"
 msgid "Invert the selection"
 msgstr "å??转é??å?º"
 
 #: ../app/actions/select-actions.c:68
+msgctxt "select-action"
 msgid "_Float"
 msgstr "浮�(_F)"
 
 #: ../app/actions/select-actions.c:69
+msgctxt "select-action"
 msgid "Create a floating selection"
 msgstr "å??建浮å?¨é??å?º"
 
 #: ../app/actions/select-actions.c:74
+msgctxt "select-action"
 msgid "Fea_ther..."
 msgstr "ç¾½å??(_T)..."
 
-#: ../app/actions/select-actions.c:75
+#: ../app/actions/select-actions.c:76
+msgctxt "select-action"
 msgid "Blur the selection border so that it fades out smoothly"
 msgstr "模ç³?é??å?ºè¾¹ç??以使å?¶å¹³æ»?æ·¡å?º"
 
-#: ../app/actions/select-actions.c:80
+#: ../app/actions/select-actions.c:81
+msgctxt "select-action"
 msgid "_Sharpen"
 msgstr "é??å??(_S)"
 
-#: ../app/actions/select-actions.c:81
+#: ../app/actions/select-actions.c:82
+msgctxt "select-action"
 msgid "Remove fuzzyness from the selection"
 msgstr "移é?¤é??å?ºä¸­ç??模ç³?"
 
-#: ../app/actions/select-actions.c:86
+#: ../app/actions/select-actions.c:87
+msgctxt "select-action"
 msgid "S_hrink..."
 msgstr "�缩(_H)..."
 
-#: ../app/actions/select-actions.c:87
+#: ../app/actions/select-actions.c:88
+msgctxt "select-action"
 msgid "Contract the selection"
 msgstr "æ?¶ç¼©é??å?º"
 
-#: ../app/actions/select-actions.c:92
+#: ../app/actions/select-actions.c:93
+msgctxt "select-action"
 msgid "_Grow..."
 msgstr "��(_G)..."
 
-#: ../app/actions/select-actions.c:93
+#: ../app/actions/select-actions.c:94
+msgctxt "select-action"
 msgid "Enlarge the selection"
 msgstr "æ?©å¤§é??å?º"
 
-#: ../app/actions/select-actions.c:98
+#: ../app/actions/select-actions.c:99
+msgctxt "select-action"
 msgid "Bo_rder..."
 msgstr "è¾¹ç??(_R)..."
 
-#: ../app/actions/select-actions.c:99
+#: ../app/actions/select-actions.c:100
+msgctxt "select-action"
 msgid "Replace the selection by its border"
 msgstr "ç?¨é??å?ºç??è¾¹ç??æ?¿æ?¢é??å?º"
 
-#: ../app/actions/select-actions.c:104
+#: ../app/actions/select-actions.c:105
+msgctxt "select-action"
 msgid "Save to _Channel"
 msgstr "ä¿?å­?å?°é??é??(_C)"
 
-#: ../app/actions/select-actions.c:105
+#: ../app/actions/select-actions.c:106
+msgctxt "select-action"
 msgid "Save the selection to a channel"
 msgstr "å°?é??å?ºä¿?å­?å?°é??é??"
 
-#: ../app/actions/select-actions.c:110
+#: ../app/actions/select-actions.c:111
+msgctxt "select-action"
 msgid "_Stroke Selection..."
 msgstr "å?¾ç?»é??å?º(_S)..."
 
-#: ../app/actions/select-actions.c:111
+#: ../app/actions/select-actions.c:112
+msgctxt "select-action"
 msgid "Paint along the selection outline"
 msgstr "沿é??å?ºç??è½®å»?æ¶?ç?»"
 
-#: ../app/actions/select-actions.c:116
+#: ../app/actions/select-actions.c:117
+msgctxt "select-action"
 msgid "_Stroke Selection"
 msgstr "å?¾ç?»é??å?º(_S)"
 
-#: ../app/actions/select-actions.c:117
+#: ../app/actions/select-actions.c:118
+msgctxt "select-action"
 msgid "Stroke the selection with last used values"
 msgstr "æ??ä¸?次使ç?¨ç??å?¼å?¾ç?»é??å?º"
 
-#: ../app/actions/select-commands.c:153 ../app/core/gimpselection.c:167
+#: ../app/actions/select-commands.c:154 ../app/core/gimpselection.c:169
 msgid "Feather Selection"
 msgstr "ç¾½å??é??å?º"
 
-#: ../app/actions/select-commands.c:157
+#: ../app/actions/select-commands.c:158
 msgid "Feather selection by"
 msgstr "ç¾½å??å??å¾?"
 
-#: ../app/actions/select-commands.c:191 ../app/core/gimpselection.c:174
+#: ../app/actions/select-commands.c:192 ../app/core/gimpselection.c:176
 msgid "Shrink Selection"
 msgstr "é??å?ºæ?¶ç¼©"
 
-#: ../app/actions/select-commands.c:195
+#: ../app/actions/select-commands.c:196
 msgid "Shrink selection by"
 msgstr "�缩�离"
 
-#: ../app/actions/select-commands.c:203
+#: ../app/actions/select-commands.c:204
 msgid "_Shrink from image border"
 msgstr "ä»?å?¾å??è¾¹ç??æ?¶ç¼©(_S)"
 
-#: ../app/actions/select-commands.c:228 ../app/core/gimpselection.c:173
+#: ../app/actions/select-commands.c:229 ../app/core/gimpselection.c:175
 msgid "Grow Selection"
 msgstr "é??å?ºå¢?é?¿"
 
-#: ../app/actions/select-commands.c:232
+#: ../app/actions/select-commands.c:233
 msgid "Grow selection by"
 msgstr "���离"
 
-#: ../app/actions/select-commands.c:255 ../app/core/gimpselection.c:172
+#: ../app/actions/select-commands.c:256 ../app/core/gimpselection.c:174
 msgid "Border Selection"
 msgstr "å??é??å?ºè¾¹ç??"
 
-#: ../app/actions/select-commands.c:259
+#: ../app/actions/select-commands.c:260
 msgid "Border selection by"
 msgstr "è¾¹ç??å??å¾?"
 
 #. Feather button
-#: ../app/actions/select-commands.c:268
+#: ../app/actions/select-commands.c:269
 msgid "_Feather border"
 msgstr "ç¾½å??è¾¹ç??(_F)"
 
 #. Edge lock button
-#: ../app/actions/select-commands.c:281
+#: ../app/actions/select-commands.c:282
 msgid "_Lock selection to image edges"
 msgstr "é??å®?é??å?ºå?°å?¾å??è¾¹ç¼?"
 
-#: ../app/actions/select-commands.c:330 ../app/actions/select-commands.c:362
-#: ../app/actions/vectors-commands.c:379 ../app/actions/vectors-commands.c:412
-#: ../app/dialogs/stroke-dialog.c:299
+#: ../app/actions/select-commands.c:332 ../app/actions/select-commands.c:365
+#: ../app/actions/vectors-commands.c:383 ../app/actions/vectors-commands.c:417
+#: ../app/dialogs/stroke-dialog.c:288
 msgid "There is no active layer or channel to stroke to."
 msgstr "没æ??æ´»å?¨å?¾å±?æ??é??é??å?¯ä»¥å?¾ç?»ã??"
 
-#: ../app/actions/select-commands.c:336 ../app/core/gimpselection.c:151
+#: ../app/actions/select-commands.c:338 ../app/core/gimpselection.c:153
 msgid "Stroke Selection"
 msgstr "å?¾ç?»é??å?º"
 
-#: ../app/actions/templates-actions.c:42
+#: ../app/actions/templates-actions.c:41
+msgctxt "templates-action"
 msgid "Templates Menu"
 msgstr "模æ?¿è??å??"
 
-#: ../app/actions/templates-actions.c:46
+#: ../app/actions/templates-actions.c:45
+msgctxt "templates-action"
 msgid "_Create Image from Template"
-msgstr "ä»?模æ?¿å??建å?¾å??(_C)..."
+msgstr "ä»?模æ?¿å??建å?¾å??(_C)"
 
-#: ../app/actions/templates-actions.c:47
+#: ../app/actions/templates-actions.c:46
+msgctxt "templates-action"
 msgid "Create a new image from the selected template"
 msgstr "ä»?é??中ç??模æ?¿å??建æ?°ç??å?¾å??"
 
-#: ../app/actions/templates-actions.c:52
+#: ../app/actions/templates-actions.c:51
+msgctxt "templates-action"
 msgid "_New Template..."
 msgstr "�建模�(_N)..."
 
-#: ../app/actions/templates-actions.c:53
+#: ../app/actions/templates-actions.c:52
+msgctxt "templates-action"
 msgid "Create a new template"
 msgstr "å??建æ?°ç??模æ?¿"
 
-#: ../app/actions/templates-actions.c:58
+#: ../app/actions/templates-actions.c:57
+msgctxt "templates-action"
 msgid "D_uplicate Template..."
 msgstr "��模�(_U)..."
 
-#: ../app/actions/templates-actions.c:59
-msgid "Duplicate the selected template"
+#: ../app/actions/templates-actions.c:58
+msgctxt "templates-action"
+msgid "Duplicate this template"
 msgstr "å¤?å?¶é??中ç??模æ?¿"
 
-#: ../app/actions/templates-actions.c:64
+#: ../app/actions/templates-actions.c:63
+msgctxt "templates-action"
 msgid "_Edit Template..."
 msgstr "��模�(_E)..."
 
-#: ../app/actions/templates-actions.c:65
-msgid "Edit the selected template"
-msgstr "ç¼?è¾?é??中ç??模æ?¿"
+#: ../app/actions/templates-actions.c:64
+msgctxt "templates-action"
+msgid "Edit this template"
+msgstr "��模�"
 
-#: ../app/actions/templates-actions.c:70
+#: ../app/actions/templates-actions.c:69
+msgctxt "templates-action"
 msgid "_Delete Template"
 msgstr "��模�(_D)"
 
-#: ../app/actions/templates-actions.c:71
-msgid "Delete the selected template"
-msgstr "å? é?¤é??中ç??模æ?¿"
+#: ../app/actions/templates-actions.c:70
+msgctxt "templates-action"
+msgid "Delete this template"
+msgstr "��此模�"
 
-#: ../app/actions/templates-commands.c:113
+#: ../app/actions/templates-commands.c:112
 msgid "New Template"
 msgstr "�建模�"
 
-#: ../app/actions/templates-commands.c:116
+#: ../app/actions/templates-commands.c:115
 msgid "Create a New Template"
 msgstr "å??建æ?°ç??模æ?¿"
 
@@ -3574,369 +4339,555 @@ msgstr "��模�"
 #, c-format
 msgid ""
 "Are you sure you want to delete template '%s' from the list and from disk?"
-msgstr "æ?¨ç¡®è®¤è¦?ä»?å??表以å??ç£?ç??中å? é?¤æ¨¡æ?¿â??%sâ??å??ï¼?"
+msgstr "æ?¨ç¡®è®¤è¦?ä»?å??表以å??ç£?ç??中å? é?¤â??%sâ??模æ?¿å??ï¼?"
 
-#: ../app/actions/text-editor-actions.c:44
+#: ../app/actions/text-editor-actions.c:43
+msgctxt "text-editor-action"
 msgid "Open"
 msgstr "æ??å¼?"
 
-#: ../app/actions/text-editor-actions.c:45
+#: ../app/actions/text-editor-actions.c:44
+msgctxt "text-editor-action"
 msgid "Load text from file"
 msgstr "ä»?æ??件中å? è½½æ??æ?¬"
 
-#: ../app/actions/text-editor-actions.c:50 ../app/core/gimp-edit.c:445
+#: ../app/actions/text-editor-actions.c:49
+msgctxt "text-editor-action"
 msgid "Clear"
 msgstr "��"
 
-#: ../app/actions/text-editor-actions.c:51
+#: ../app/actions/text-editor-actions.c:50
+msgctxt "text-editor-action"
 msgid "Clear all text"
 msgstr "æ¸?é?¤æ??æ??æ??æ?¬"
 
-#: ../app/actions/text-editor-actions.c:59
+#: ../app/actions/text-editor-actions.c:58
+msgctxt "text-editor-action"
 msgid "LTR"
 msgstr "左��"
 
-#: ../app/actions/text-editor-actions.c:60
+#: ../app/actions/text-editor-actions.c:59
+msgctxt "text-editor-action"
 msgid "From left to right"
 msgstr "�左��"
 
-#: ../app/actions/text-editor-actions.c:65
+#: ../app/actions/text-editor-actions.c:64
+msgctxt "text-editor-action"
 msgid "RTL"
 msgstr "��左"
 
-#: ../app/actions/text-editor-actions.c:66
+#: ../app/actions/text-editor-actions.c:65
+msgctxt "text-editor-action"
 msgid "From right to left"
 msgstr "���左"
 
-#: ../app/actions/text-editor-commands.c:63
+#: ../app/actions/text-editor-commands.c:62
+#: ../app/actions/text-tool-commands.c:111
 msgid "Open Text File (UTF-8)"
 msgstr "æ??å¼?æ??æ?¬æ??件(UTF-8)"
 
-#: ../app/actions/text-editor-commands.c:144
-#: ../app/config/gimpconfig-file.c:59 ../app/core/gimpbrush-load.c:140
-#: ../app/core/gimpbrush-load.c:420 ../app/core/gimpbrushgenerated-load.c:73
-#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:55
-#: ../app/core/gimpgradient-load.c:62 ../app/core/gimppalette-load.c:76
-#: ../app/core/gimppalette-load.c:270 ../app/core/gimppalette-load.c:314
-#: ../app/core/gimppalette-load.c:368 ../app/core/gimppalette-load.c:456
-#: ../app/core/gimppalette-load.c:599 ../app/core/gimppattern-load.c:76
-#: ../app/tools/gimpcurvestool.c:623 ../app/tools/gimplevelstool.c:743
-#: ../app/xcf/xcf.c:329
+#: ../app/actions/text-editor-commands.c:143
+#: ../app/actions/text-tool-commands.c:219 ../app/config/gimpconfig-file.c:58
+#: ../app/core/gimpbrush-load.c:139 ../app/core/gimpbrush-load.c:419
+#: ../app/core/gimpbrushgenerated-load.c:72
+#: ../app/core/gimpbrushpipe-load.c:80 ../app/core/gimpcurve-load.c:54
+#: ../app/core/gimpgradient-load.c:61 ../app/core/gimppalette-load.c:75
+#: ../app/core/gimppalette-load.c:271 ../app/core/gimppalette-load.c:316
+#: ../app/core/gimppalette-load.c:372 ../app/core/gimppalette-load.c:461
+#: ../app/core/gimppalette-load.c:627 ../app/core/gimppattern-load.c:75
+#: ../app/tools/gimpcurvestool.c:631 ../app/tools/gimplevelstool.c:743
+#: ../app/xcf/xcf.c:328
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "æ? æ³?æ??å¼?â??%sâ??并读å??ï¼?%s"
 
-#: ../app/actions/tool-options-actions.c:56
+#: ../app/actions/text-tool-actions.c:49
+msgctxt "text-tool-action"
+msgid "Text Tool Menu"
+msgstr "æ??å­?å·¥å?·è??å??"
+
+#: ../app/actions/text-tool-actions.c:53
+msgctxt "text-tool-action"
+msgid "Input _Methods"
+msgstr "���(_M)"
+
+#: ../app/actions/text-tool-actions.c:57
+msgctxt "text-tool-action"
+msgid "Cu_t"
+msgstr "å?ªå??(_T)"
+
+#: ../app/actions/text-tool-actions.c:62
+msgctxt "text-tool-action"
+msgid "_Copy"
+msgstr "��(_C)"
+
+#: ../app/actions/text-tool-actions.c:67
+msgctxt "text-tool-action"
+msgid "_Paste"
+msgstr "ç²?è´´(_P)"
+
+#: ../app/actions/text-tool-actions.c:72
+msgctxt "text-tool-action"
+msgid "_Delete"
+msgstr "å? é?¤(_D)"
+
+#: ../app/actions/text-tool-actions.c:77
+msgctxt "text-tool-action"
+msgid "_Open text file..."
+msgstr "æ??å¼?æ??æ?¬æ??件(_O)..."
+
+#: ../app/actions/text-tool-actions.c:82
+msgctxt "text-tool-action"
+msgid "Cl_ear"
+msgstr "��(_E)"
+
+#: ../app/actions/text-tool-actions.c:83
+msgctxt "text-tool-action"
+msgid "Clear all text"
+msgstr "æ¸?é?¤æ??æ??æ??æ?¬"
+
+#: ../app/actions/text-tool-actions.c:88
+msgctxt "text-tool-action"
+msgid "_Path from Text"
+msgstr "ä»?æ??å­?å??建路å¾?(_P)"
+
+#: ../app/actions/text-tool-actions.c:90
+msgctxt "text-tool-action"
+msgid "Create a path from the outlines of the current text"
+msgstr "å??å½?å??æ??å­?ç??è½®å»?å??建路å¾?"
+
+#: ../app/actions/text-tool-actions.c:95
+msgctxt "text-tool-action"
+msgid "Text _along Path"
+msgstr "æ??å­?对é½?è·¯å¾?(_A)"
+
+#: ../app/actions/text-tool-actions.c:97
+msgctxt "text-tool-action"
+msgid "Bend the text along the currently active path"
+msgstr "沿å½?å??ç??æ´»å?¨è·¯å¾?弯æ?²æ??å­?"
+
+#: ../app/actions/text-tool-actions.c:105
+msgctxt "text-tool-action"
+msgid "From left to right"
+msgstr "�左��"
+
+#: ../app/actions/text-tool-actions.c:110
+msgctxt "text-tool-action"
+msgid "From right to left"
+msgstr "���左"
+
+#: ../app/actions/tool-options-actions.c:55
+msgctxt "tool-options-action"
 msgid "Tool Options Menu"
 msgstr "å·¥å?·é??项è??å??"
 
-#: ../app/actions/tool-options-actions.c:60
+#: ../app/actions/tool-options-actions.c:59
+msgctxt "tool-options-action"
 msgid "_Save Options To"
 msgstr "é??项ä¿?å­?å?°(_S)"
 
-#: ../app/actions/tool-options-actions.c:64
+#: ../app/actions/tool-options-actions.c:63
+msgctxt "tool-options-action"
 msgid "_Restore Options From"
 msgstr "é??项æ?¢å¤?è?ª(_R)"
 
-#: ../app/actions/tool-options-actions.c:68
+#: ../app/actions/tool-options-actions.c:67
+msgctxt "tool-options-action"
 msgid "Re_name Saved Options"
 msgstr "é??å?½å??å·²ä¿?å­?ç??é??项(_N)"
 
-#: ../app/actions/tool-options-actions.c:72
+#: ../app/actions/tool-options-actions.c:71
+msgctxt "tool-options-action"
 msgid "_Delete Saved Options"
 msgstr "å? é?¤å·²ä¿?å­?ç??é??项(_D)"
 
-#: ../app/actions/tool-options-actions.c:76
+#: ../app/actions/tool-options-actions.c:75
+msgctxt "tool-options-action"
 msgid "_New Entry..."
-msgstr "�建路�(_N)..."
+msgstr "�建项(_N)..."
 
-#: ../app/actions/tool-options-actions.c:81
+#: ../app/actions/tool-options-actions.c:80
+msgctxt "tool-options-action"
 msgid "R_eset Tool Options"
 msgstr "é??置工å?·é??项(_E)"
 
-#: ../app/actions/tool-options-actions.c:82
+#: ../app/actions/tool-options-actions.c:81
+msgctxt "tool-options-action"
 msgid "Reset to default values"
 msgstr "é??ç½®å?°é»?认å?¼"
 
-#: ../app/actions/tool-options-actions.c:87
+#: ../app/actions/tool-options-actions.c:86
+msgctxt "tool-options-action"
 msgid "Reset _all Tool Options"
-msgstr "é??ç½®æ??æ??å·¥å?·é??项(_A)..."
+msgstr "é??ç½®æ??æ??å·¥å?·é??项(_A)"
 
-#: ../app/actions/tool-options-actions.c:88
+#: ../app/actions/tool-options-actions.c:87
+msgctxt "tool-options-action"
 msgid "Reset all tool options"
 msgstr "é??ç½®æ??æ??å·¥å?·é??项"
 
-#: ../app/actions/tool-options-commands.c:72
+#: ../app/actions/tool-options-commands.c:70
 msgid "Save Tool Options"
 msgstr "ä¿?å­?å·¥å?·é??项"
 
-#: ../app/actions/tool-options-commands.c:76
+#: ../app/actions/tool-options-commands.c:74
 msgid "Enter a name for the saved options"
 msgstr "ç»?å·²ä¿?å­?ç??é??项è¾?å?¥ä¸?个å??å­?"
 
-#: ../app/actions/tool-options-commands.c:77
-#: ../app/actions/tool-options-commands.c:247
-#: ../app/actions/tool-options-commands.c:264
+#: ../app/actions/tool-options-commands.c:75
+#: ../app/actions/tool-options-commands.c:245
+#: ../app/actions/tool-options-commands.c:262
 msgid "Saved Options"
 msgstr "å·²ä¿?å­?ç??é??项"
 
-#: ../app/actions/tool-options-commands.c:140
+#: ../app/actions/tool-options-commands.c:138
 msgid "Rename Saved Tool Options"
 msgstr "é??å?½å??å·²ä¿?å­?ç??å·¥å?·é??项"
 
-#: ../app/actions/tool-options-commands.c:144
+#: ../app/actions/tool-options-commands.c:142
 msgid "Enter a new name for the saved options"
 msgstr "ç»?å·²ä¿?å­?ç??é??项è¾?å?¥ä¸?个æ?°å??å­?"
 
-#: ../app/actions/tool-options-commands.c:187
+#: ../app/actions/tool-options-commands.c:185
 msgid "Reset Tool Options"
 msgstr "é??置工å?·é??项"
 
-#: ../app/actions/tool-options-commands.c:210
+#: ../app/actions/tool-options-commands.c:208
 msgid "Do you really want to reset all tool options to default values?"
 msgstr "æ?¨ç??ç??è¦?å°?æ??æ??å·¥å?·é??项é??ç½®å?°é»?认å?¼å??ï¼?"
 
-#: ../app/actions/tools-actions.c:47
+#: ../app/actions/tools-actions.c:46
+msgctxt "tools-action"
 msgid "Tools Menu"
 msgstr "å·¥å?·è??å??"
 
-#: ../app/actions/tools-actions.c:50
+#: ../app/actions/tools-actions.c:49
+msgctxt "tools-action"
 msgid "_Tools"
 msgstr "工�(_T)"
 
-#: ../app/actions/tools-actions.c:51
+#: ../app/actions/tools-actions.c:50
+msgctxt "tools-action"
 msgid "_Selection Tools"
 msgstr "é??æ?©å·¥å?·(_S)"
 
-#: ../app/actions/tools-actions.c:52
+#: ../app/actions/tools-actions.c:51
+msgctxt "tools-action"
 msgid "_Paint Tools"
 msgstr "��工�(_P)"
 
-#: ../app/actions/tools-actions.c:53
+#: ../app/actions/tools-actions.c:52
+msgctxt "tools-action"
 msgid "_Transform Tools"
 msgstr "å??æ?¢å·¥å?·(_T)"
 
-#: ../app/actions/tools-actions.c:54
+#: ../app/actions/tools-actions.c:53
+msgctxt "tools-action"
 msgid "_Color Tools"
 msgstr "��工�(_C)"
 
-#: ../app/actions/tools-actions.c:57
+#: ../app/actions/tools-actions.c:56
+msgctxt "tools-action"
 msgid "R_aise Tool"
 msgstr "æ??å??å·¥å?·(_A)"
 
-#: ../app/actions/tools-actions.c:58
-msgid "Raise tool"
-msgstr "æ??å??å·¥å?·"
+#: ../app/actions/tools-actions.c:57
+msgctxt "tools-action"
+msgid "Raise this tool"
+msgstr "æ??å??此工å?·ç®±"
 
-#: ../app/actions/tools-actions.c:63
+#: ../app/actions/tools-actions.c:62
+msgctxt "tools-action"
 msgid "Ra_ise to Top"
 msgstr "æ??å?°æ??å??(_I)"
 
-#: ../app/actions/tools-actions.c:64
-msgid "Raise tool to top"
-msgstr "æ??å?°æ??å??"
+#: ../app/actions/tools-actions.c:63
+msgctxt "tools-action"
+msgid "Raise this tool to the top"
+msgstr "å°?此工å?·ç®±æ??å?°æ??å??"
 
-#: ../app/actions/tools-actions.c:69
+#: ../app/actions/tools-actions.c:68
+msgctxt "tools-action"
 msgid "L_ower Tool"
 msgstr "æ?¨å??å·¥å?·(_O)"
 
-#: ../app/actions/tools-actions.c:70
-msgid "Lower tool"
-msgstr "æ?¨å??å·¥å?·"
+#: ../app/actions/tools-actions.c:69
+msgctxt "tools-action"
+msgid "Lower this tool"
+msgstr "æ?¨å??此工å?·ç®±"
 
-#: ../app/actions/tools-actions.c:75
+#: ../app/actions/tools-actions.c:74
+msgctxt "tools-action"
 msgid "Lo_wer to Bottom"
 msgstr "æ?¨å?°æ??å??(_W)"
 
-#: ../app/actions/tools-actions.c:76
-msgid "Lower tool to bottom"
-msgstr "æ?¨å?°æ??å??"
+#: ../app/actions/tools-actions.c:75
+msgctxt "tools-action"
+msgid "Lower this tool to the bottom"
+msgstr "å°?此工å?·ç®±æ?¨å?°æ??å??"
 
-#: ../app/actions/tools-actions.c:81
+#: ../app/actions/tools-actions.c:80
+msgctxt "tools-action"
 msgid "_Reset Order & Visibility"
 msgstr "é??置顺åº?å??å?¯è§?å±?æ?§(_R)"
 
-#: ../app/actions/tools-actions.c:82
+#: ../app/actions/tools-actions.c:81
+msgctxt "tools-action"
 msgid "Reset tool order and visibility"
 msgstr "é??置工å?·ç??顺åº?å??å?¯è§?å±?æ?§"
 
-#: ../app/actions/tools-actions.c:90
+#: ../app/actions/tools-actions.c:89
+msgctxt "tools-action"
 msgid "_Show in Toolbox"
 msgstr "�工�箱中�示(_S)"
 
-#: ../app/actions/tools-actions.c:99
+#: ../app/actions/tools-actions.c:98
+msgctxt "tools-action"
 msgid "_By Color"
 msgstr "æ??é¢?è?²(_B)"
 
-#: ../app/actions/tools-actions.c:100
+#: ../app/actions/tools-actions.c:99
+msgctxt "tools-action"
 msgid "Select regions with similar colors"
 msgstr "æ??ç?¸ä¼¼ç??é¢?è?²é??æ?©å?ºå??"
 
-#: ../app/actions/tools-actions.c:105
+#: ../app/actions/tools-actions.c:104
+msgctxt "tools-action"
 msgid "_Arbitrary Rotation..."
 msgstr "ä»»æ??æ??转(_A)..."
 
-#: ../app/actions/tools-actions.c:106
+#: ../app/actions/tools-actions.c:105
+msgctxt "tools-action"
 msgid "Rotate by an arbitrary angle"
 msgstr "ä»»æ??è§?度æ??转"
 
 #: ../app/actions/vectors-actions.c:44
+msgctxt "vectors-action"
 msgid "Paths Menu"
 msgstr "è·¯å¾?è??å??"
 
 #: ../app/actions/vectors-actions.c:48
+msgctxt "vectors-action"
 msgid "Path _Tool"
 msgstr "路�工�(_T)"
 
 #: ../app/actions/vectors-actions.c:53
+msgctxt "vectors-action"
 msgid "_Edit Path Attributes..."
 msgstr "��路���(_E)..."
 
 #: ../app/actions/vectors-actions.c:54
+msgctxt "vectors-action"
 msgid "Edit path attributes"
 msgstr "��路���"
 
 #: ../app/actions/vectors-actions.c:59
+msgctxt "vectors-action"
 msgid "_New Path..."
 msgstr "�建路�(_N)..."
 
 #: ../app/actions/vectors-actions.c:60
-msgid "New path..."
-msgstr "�建路�..."
+msgctxt "vectors-action"
+msgid "Create a new path..."
+msgstr "å??建æ?°ç??è·¯å¾?..."
 
 #: ../app/actions/vectors-actions.c:65
-msgid "_New Path"
-msgstr "�建路�(_N)"
+msgctxt "vectors-action"
+msgid "_New Path with last values"
+msgstr "æ??ä¸?次ç??å?¼æ?°å»ºè·¯å¾?(_N)"
 
 #: ../app/actions/vectors-actions.c:66
-msgid "New path with last values"
-msgstr "æ??ä¸?次ç??å?¼æ?°å»ºè·¯å¾?"
+msgctxt "vectors-action"
+msgid "Create a new path with last used values"
+msgstr "æ??ä¸?次使ç?¨ç??å?¼æ?°å»ºè·¯å¾?"
 
 #: ../app/actions/vectors-actions.c:71
+msgctxt "vectors-action"
 msgid "D_uplicate Path"
 msgstr "��路�(_U)"
 
 #: ../app/actions/vectors-actions.c:72
-msgid "Duplicate path"
-msgstr "��路�"
+msgctxt "vectors-action"
+msgid "Duplicate this path"
+msgstr "��此路�"
 
 #: ../app/actions/vectors-actions.c:77
+msgctxt "vectors-action"
 msgid "_Delete Path"
 msgstr "��路�(_D)"
 
-#: ../app/actions/vectors-actions.c:78 ../app/core/core-enums.c:920
-msgid "Delete path"
-msgstr "��路�"
+#: ../app/actions/vectors-actions.c:78
+msgctxt "vectors-action"
+msgid "Delete this path"
+msgstr "��此路�"
 
 #: ../app/actions/vectors-actions.c:83
+msgctxt "vectors-action"
 msgid "Merge _Visible Paths"
 msgstr "å??并å?¯è§?è·¯å¾?(_V)"
 
 #: ../app/actions/vectors-actions.c:88
+msgctxt "vectors-action"
 msgid "_Raise Path"
 msgstr "å??é«?è·¯å¾?(_R)"
 
 #: ../app/actions/vectors-actions.c:89
-msgid "Raise path"
-msgstr "å??é«?è·¯å¾?"
+msgctxt "vectors-action"
+msgid "Raise this path"
+msgstr "å??é«?此路å¾?"
 
 #: ../app/actions/vectors-actions.c:94
+msgctxt "vectors-action"
 msgid "Raise Path to _Top"
 msgstr "è·¯å¾?å??è?³é¡¶ç«¯(_T)"
 
 #: ../app/actions/vectors-actions.c:95
-msgid "Raise path to top"
-msgstr "è·¯å¾?å??è?³é¡¶ç«¯"
+msgctxt "vectors-action"
+msgid "Raise this path to the top"
+msgstr "æ??å??此路å¾?è?³é¡¶ç«¯"
 
 #: ../app/actions/vectors-actions.c:100
+msgctxt "vectors-action"
 msgid "_Lower Path"
 msgstr "é??ä½?è·¯å¾?(_L)"
 
 #: ../app/actions/vectors-actions.c:101
-msgid "Lower path"
-msgstr "é??ä½?è·¯å¾?"
+msgctxt "vectors-action"
+msgid "Lower this path"
+msgstr "é??ä½?此路å¾?"
 
 #: ../app/actions/vectors-actions.c:106
+msgctxt "vectors-action"
 msgid "Lower Path to _Bottom"
 msgstr "è·¯å¾?é??è?³åº?端(_B)"
 
 #: ../app/actions/vectors-actions.c:107
-msgid "Lower path to bottom"
-msgstr "è·¯å¾?é??è?³åº?端"
+msgctxt "vectors-action"
+msgid "Lower this path to the bottom"
+msgstr "é??ä½?此路å¾?è?³åº?端"
 
 #: ../app/actions/vectors-actions.c:112
+msgctxt "vectors-action"
 msgid "Stro_ke Path..."
 msgstr "��路�(_K)..."
 
 #: ../app/actions/vectors-actions.c:113
+msgctxt "vectors-action"
 msgid "Paint along the path"
 msgstr "沿路���"
 
 #: ../app/actions/vectors-actions.c:118
+msgctxt "vectors-action"
 msgid "Stro_ke Path"
 msgstr "��路�(_K)"
 
 #: ../app/actions/vectors-actions.c:119
+msgctxt "vectors-action"
 msgid "Paint along the path with last values"
 msgstr "æ??ä¸?次使ç?¨ç??å?¼å?¾ç?»è·¯å¾?"
 
 #: ../app/actions/vectors-actions.c:124
+msgctxt "vectors-action"
 msgid "Co_py Path"
 msgstr "��路�(_P)"
 
 #: ../app/actions/vectors-actions.c:129
+msgctxt "vectors-action"
 msgid "Paste Pat_h"
 msgstr "�贴路�(_H)"
 
 #: ../app/actions/vectors-actions.c:134
+msgctxt "vectors-action"
 msgid "E_xport Path..."
 msgstr "导�路�(_X)..."
 
 #: ../app/actions/vectors-actions.c:139
+msgctxt "vectors-action"
 msgid "I_mport Path..."
 msgstr "导�路�(_M)..."
 
+#: ../app/actions/vectors-actions.c:147
+msgctxt "vectors-action"
+msgid "_Visible"
+msgstr "��(_V)"
+
+#: ../app/actions/vectors-actions.c:153
+msgctxt "vectors-action"
+msgid "_Linked"
+msgstr "��(_L)"
+
 #: ../app/actions/vectors-actions.c:162
+msgctxt "vectors-action"
 msgid "Path to Sele_ction"
 msgstr "è·¯å¾?å?°é??å?º(_C)"
 
-#: ../app/actions/vectors-actions.c:163 ../app/tools/gimpvectortool.c:1912
+#: ../app/actions/vectors-actions.c:163
+msgctxt "vectors-action"
 msgid "Path to selection"
 msgstr "è·¯å¾?å?°é??å?º"
 
 #: ../app/actions/vectors-actions.c:168
+msgctxt "vectors-action"
 msgid "Fr_om Path"
 msgstr "�路�(_O)"
 
+#: ../app/actions/vectors-actions.c:169
+msgctxt "vectors-action"
+msgid "Replace selection with path"
+msgstr "ç?¨æ­¤è·¯å¾?æ?¿æ?¢é??å?º"
+
 #: ../app/actions/vectors-actions.c:174
-msgid "Add"
-msgstr "添�"
+msgctxt "vectors-action"
+msgid "_Add to Selection"
+msgstr "æ·»å? å?°é??å?º(_A)"
 
-#: ../app/actions/vectors-actions.c:180 ../app/base/base-enums.c:119
-msgid "Subtract"
-msgstr "å??å?»"
+#: ../app/actions/vectors-actions.c:175
+msgctxt "vectors-action"
+msgid "Add path to selection"
+msgstr "å°?è·¯å¾?æ·»å? å?°é??å?º"
+
+#: ../app/actions/vectors-actions.c:180
+msgctxt "vectors-action"
+msgid "_Subtract from Selection"
+msgstr "ä»?é??å?ºä¸­å??å?»(_S)"
+
+#: ../app/actions/vectors-actions.c:181
+msgctxt "vectors-action"
+msgid "Subtract path from selection"
+msgstr "ä»?é??å?ºä¸­å??å?»è·¯å¾?"
 
 #: ../app/actions/vectors-actions.c:186
-msgid "Intersect"
-msgstr "�交"
+msgctxt "vectors-action"
+msgid "_Intersect with Selection"
+msgstr "ä¸?é??å?ºç?¸äº¤(_I)"
 
-#: ../app/actions/vectors-actions.c:194
+#: ../app/actions/vectors-actions.c:187
+msgctxt "vectors-action"
+msgid "Intersect path with selection"
+msgstr "å°?è·¯å¾?ä¸?é??å?ºç?¸äº¤"
+
+#: ../app/actions/vectors-actions.c:195
+msgctxt "vectors-action"
 msgid "Selecti_on to Path"
 msgstr "é??å?ºå?°è·¯å¾?(_O)"
 
-#: ../app/actions/vectors-actions.c:195 ../app/actions/vectors-actions.c:201
+#: ../app/actions/vectors-actions.c:196 ../app/actions/vectors-actions.c:202
+msgctxt "vectors-action"
 msgid "Selection to path"
 msgstr "é??å?ºå?°è·¯å¾?"
 
-#: ../app/actions/vectors-actions.c:200
+#: ../app/actions/vectors-actions.c:201
+msgctxt "vectors-action"
 msgid "To _Path"
 msgstr "�路�(_P)"
 
-#: ../app/actions/vectors-actions.c:206
+#: ../app/actions/vectors-actions.c:207
+msgctxt "vectors-action"
 msgid "Selection to Path (_Advanced)"
 msgstr "é??å?ºå?°è·¯å¾?(é«?级)(_A)"
 
-#: ../app/actions/vectors-actions.c:207
+#: ../app/actions/vectors-actions.c:208
+msgctxt "vectors-action"
 msgid "Advanced options"
 msgstr "é«?级é??项"
 
@@ -3957,352 +4908,480 @@ msgstr "�建路�"
 msgid "New Path Options"
 msgstr "æ?°å»ºè·¯å¾?é??项"
 
-#: ../app/actions/vectors-commands.c:305 ../app/pdb/paths-cmds.c:640
-#: ../app/pdb/vectors-cmds.c:1253
+#: ../app/actions/vectors-commands.c:306 ../app/pdb/paths-cmds.c:641
+#: ../app/pdb/vectors-cmds.c:1252
 msgid "Path to Selection"
 msgstr "è·¯å¾?å?°é??å?º"
 
-#: ../app/actions/vectors-commands.c:385 ../app/tools/gimpvectoroptions.c:199
+#: ../app/actions/vectors-commands.c:389 ../app/tools/gimpvectoroptions.c:198
 #: ../app/tools/gimpvectortool.c:1945 ../app/vectors/gimpvectors.c:200
 msgid "Stroke Path"
 msgstr "��路�"
 
-#: ../app/actions/view-actions.c:67
+#: ../app/actions/view-actions.c:68
+msgctxt "view-action"
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../app/actions/view-actions.c:68
+#: ../app/actions/view-actions.c:69
+msgctxt "view-action"
 msgid "_Zoom"
 msgstr "缩�(_Z)"
 
-#: ../app/actions/view-actions.c:69
+#: ../app/actions/view-actions.c:70
+msgctxt "view-action"
 msgid "_Padding Color"
 msgstr "衬���(_P)"
 
-#: ../app/actions/view-actions.c:71
+#: ../app/actions/view-actions.c:72
+msgctxt "view-action"
 msgid "Move to Screen"
 msgstr "移����"
 
 #: ../app/actions/view-actions.c:76
+msgctxt "view-action"
+msgid "_New View"
+msgstr "�建��(_N)"
+
+#: ../app/actions/view-actions.c:77
+msgctxt "view-action"
 msgid "Create another view on this image"
 msgstr "å?¨æ­¤å?¾å??ä¸?å??建å?¦ä¸?个æ?¾ç¤º"
 
-#: ../app/actions/view-actions.c:81
+#: ../app/actions/view-actions.c:82
+msgctxt "view-action"
 msgid "_Close"
 msgstr "��(_C)"
 
-#: ../app/actions/view-actions.c:82
+#: ../app/actions/view-actions.c:83
+msgctxt "view-action"
 msgid "Close this image window"
 msgstr "å?³é?­æ­¤å?¾å??çª?å?£"
 
-#: ../app/actions/view-actions.c:87
+#: ../app/actions/view-actions.c:88
+msgctxt "view-action"
 msgid "_Fit Image in Window"
 msgstr "å?¾å??é??é??äº?çª?å?£(_F)"
 
-#: ../app/actions/view-actions.c:88
+#: ../app/actions/view-actions.c:89
+msgctxt "view-action"
 msgid "Adjust the zoom ratio so that the image becomes fully visible"
 msgstr "è°?æ?´ç¼©æ?¾æ¯?ç??以使å?¾å??å®?æ?´æ?¾ç¤º"
 
-#: ../app/actions/view-actions.c:93
+#: ../app/actions/view-actions.c:94
+msgctxt "view-action"
 msgid "Fi_ll Window"
 msgstr "é??å??çª?å?£(_I)"
 
-#: ../app/actions/view-actions.c:94
+#: ../app/actions/view-actions.c:95
+msgctxt "view-action"
 msgid "Adjust the zoom ratio so that the entire window is used"
 msgstr "è°?æ?´ç¼©æ?¾æ¯?ç??以使çª?å?£æ??ä½³å??使ç?¨"
 
-#: ../app/actions/view-actions.c:99 ../app/actions/view-actions.c:579
+#: ../app/actions/view-actions.c:100
+msgctxt "view-action"
 msgid "Re_vert Zoom"
 msgstr "��缩�(_V)"
 
-#: ../app/actions/view-actions.c:100
+#: ../app/actions/view-actions.c:101
+msgctxt "view-action"
 msgid "Restore the previous zoom level"
 msgstr "æ?¢å¤?å?°ä¸?ä¸?次ç??缩æ?¾çº§å?«"
 
-#: ../app/actions/view-actions.c:105
+#: ../app/actions/view-actions.c:106
+msgctxt "view-action"
 msgid "Na_vigation Window"
 msgstr "导���(_V)"
 
-#: ../app/actions/view-actions.c:106
+#: ../app/actions/view-actions.c:107
+msgctxt "view-action"
 msgid "Show an overview window for this image"
 msgstr "为此å?¾å??æ?¾ç¤ºæ¦?è§?çª?å?£"
 
-#: ../app/actions/view-actions.c:111
+#: ../app/actions/view-actions.c:112
+msgctxt "view-action"
 msgid "Display _Filters..."
 msgstr "æ?¾ç¤ºæ»¤é??(_F)..."
 
-#: ../app/actions/view-actions.c:112
+#: ../app/actions/view-actions.c:113
+msgctxt "view-action"
 msgid "Configure filters applied to this view"
 msgstr "é??ç½®åº?ç?¨å?°æ­¤æ?¾ç¤ºç??滤é??"
 
-#: ../app/actions/view-actions.c:117
+#: ../app/actions/view-actions.c:118
+msgctxt "view-action"
 msgid "Shrink _Wrap"
 msgstr "紧贴(_W)"
 
-#: ../app/actions/view-actions.c:118
+#: ../app/actions/view-actions.c:119
+msgctxt "view-action"
 msgid "Reduce the image window to the size of the image display"
 msgstr "缩å°?å?¾å??çª?å?£å?°å?¾å??æ?¾ç¤ºç??尺寸"
 
-#: ../app/actions/view-actions.c:132
+#: ../app/actions/view-actions.c:124
+msgctxt "view-action"
+msgid "_Open Display..."
+msgstr "æ??å¼?æ?¾ç¤º(_O)..."
+
+#: ../app/actions/view-actions.c:125
+msgctxt "view-action"
+msgid "Connect to another display"
+msgstr "�����个�示"
+
+#: ../app/actions/view-actions.c:133
+msgctxt "view-action"
 msgid "_Dot for Dot"
 msgstr "�对�(_D)"
 
-#: ../app/actions/view-actions.c:133
+#: ../app/actions/view-actions.c:134
+msgctxt "view-action"
 msgid "A pixel on the screen represents an image pixel"
 msgstr "ä¸?个å±?å¹?ä¸?ç??å??素代表ä¸?个å?¾å??å??ç´ "
 
-#: ../app/actions/view-actions.c:139
+#: ../app/actions/view-actions.c:140
+msgctxt "view-action"
 msgid "Show _Selection"
 msgstr "æ?¾ç¤ºé??å?º(_S)"
 
-#: ../app/actions/view-actions.c:140
+#: ../app/actions/view-actions.c:141
+msgctxt "view-action"
 msgid "Display the selection outline"
 msgstr "æ?¾ç¤ºé??å?ºç??è½®å»?"
 
-#: ../app/actions/view-actions.c:146
+#: ../app/actions/view-actions.c:147
+msgctxt "view-action"
 msgid "Show _Layer Boundary"
 msgstr "æ?¾ç¤ºå?¾å±?è¾¹ç??(_L)"
 
-#: ../app/actions/view-actions.c:147
+#: ../app/actions/view-actions.c:148
+msgctxt "view-action"
 msgid "Draw a border around the active layer"
-msgstr "�活�������边�"
+msgstr "�活�������边�"
 
-#: ../app/actions/view-actions.c:153
+#: ../app/actions/view-actions.c:154
+msgctxt "view-action"
 msgid "Show _Guides"
 msgstr "æ?¾ç¤ºå??è??线(_G)"
 
-#: ../app/actions/view-actions.c:154
+#: ../app/actions/view-actions.c:155
+msgctxt "view-action"
 msgid "Display the image's guides"
 msgstr "æ?¾ç¤ºå?¾å??ç??å??è??线"
 
-#: ../app/actions/view-actions.c:160
+#: ../app/actions/view-actions.c:161
+msgctxt "view-action"
 msgid "S_how Grid"
 msgstr "�示�格(_H)"
 
-#: ../app/actions/view-actions.c:161
+#: ../app/actions/view-actions.c:162
+msgctxt "view-action"
 msgid "Display the image's grid"
 msgstr "æ?¾ç¤ºå?¾å??ç??ç½?æ ¼"
 
-#: ../app/actions/view-actions.c:167
+#: ../app/actions/view-actions.c:168
+msgctxt "view-action"
 msgid "Show Sample Points"
 msgstr "æ?¾ç¤ºé??æ ·ç?¹"
 
-#: ../app/actions/view-actions.c:168
+#: ../app/actions/view-actions.c:169
+msgctxt "view-action"
 msgid "Display the image's color sample points"
 msgstr "æ?¾ç¤ºå?¾å??ç??é¢?è?²é??æ ·ç?¹"
 
-#: ../app/actions/view-actions.c:174
+#: ../app/actions/view-actions.c:175
+msgctxt "view-action"
 msgid "Sn_ap to Guides"
 msgstr "å?¸é??å?°å??è??线(_A)"
 
-#: ../app/actions/view-actions.c:175
+#: ../app/actions/view-actions.c:176
+msgctxt "view-action"
 msgid "Tool operations snap to guides"
 msgstr "å·¥å?·æ??ä½?å?¸é??å?°å??è??线"
 
-#: ../app/actions/view-actions.c:181
+#: ../app/actions/view-actions.c:182
+msgctxt "view-action"
 msgid "Sna_p to Grid"
 msgstr "å?¸é??å?°ç½?æ ¼(_P)"
 
-#: ../app/actions/view-actions.c:182
+#: ../app/actions/view-actions.c:183
+msgctxt "view-action"
 msgid "Tool operations snap to the grid"
 msgstr "å·¥å?·æ??ä½?å?¸é??å?°ç½?æ ¼"
 
-#: ../app/actions/view-actions.c:188
+#: ../app/actions/view-actions.c:189
+msgctxt "view-action"
 msgid "Snap to _Canvas Edges"
 msgstr "å?¸é??å?°ç?»å¸?è¾¹ç¼?(_C)"
 
-#: ../app/actions/view-actions.c:189
+#: ../app/actions/view-actions.c:190
+msgctxt "view-action"
 msgid "Tool operations snap to the canvas edges"
 msgstr "å·¥å?·æ??ä½?å?¸é??å?°ç?»å¸?è¾¹ç¼?"
 
-#: ../app/actions/view-actions.c:195
+#: ../app/actions/view-actions.c:196
+msgctxt "view-action"
 msgid "Snap t_o Active Path"
 msgstr "å?¸é??å?°æ´»å?¨è·¯å¾?(_O)"
 
-#: ../app/actions/view-actions.c:196
+#: ../app/actions/view-actions.c:197
+msgctxt "view-action"
 msgid "Tool operations snap to the active path"
 msgstr "å·¥å?·æ??ä½?å?¸é??å?°æ´»å?¨è·¯å¾?"
 
-#: ../app/actions/view-actions.c:202
+#: ../app/actions/view-actions.c:203
+msgctxt "view-action"
 msgid "Show _Menubar"
 msgstr "æ?¾ç¤ºè??å??æ ?(_M)"
 
-#: ../app/actions/view-actions.c:203
+#: ../app/actions/view-actions.c:204
+msgctxt "view-action"
 msgid "Show this window's menubar"
 msgstr "æ?¾ç¤ºæ­¤çª?å?£ç??è??å??æ ?"
 
-#: ../app/actions/view-actions.c:209
+#: ../app/actions/view-actions.c:210
+msgctxt "view-action"
 msgid "Show R_ulers"
 msgstr "�示�尺(_U)"
 
-#: ../app/actions/view-actions.c:210
+#: ../app/actions/view-actions.c:211
+msgctxt "view-action"
 msgid "Show this window's rulers"
 msgstr "æ?¾ç¤ºæ­¤çª?å?£ç??æ ?å°º"
 
-#: ../app/actions/view-actions.c:216
+#: ../app/actions/view-actions.c:217
+msgctxt "view-action"
 msgid "Show Scroll_bars"
 msgstr "�示���(_B)"
 
-#: ../app/actions/view-actions.c:217
+#: ../app/actions/view-actions.c:218
+msgctxt "view-action"
 msgid "Show this window's scrollbars"
 msgstr "æ?¾ç¤ºæ­¤çª?å?£ç??æ»?å?¨æ?¡"
 
-#: ../app/actions/view-actions.c:223
+#: ../app/actions/view-actions.c:224
+msgctxt "view-action"
 msgid "Show S_tatusbar"
 msgstr "æ?¾ç¤ºç?¶æ??æ ?(_T)"
 
-#: ../app/actions/view-actions.c:224
+#: ../app/actions/view-actions.c:225
+msgctxt "view-action"
 msgid "Show this window's statusbar"
 msgstr "æ?¾ç¤ºæ­¤çª?å?£ç??ç?¶æ??æ ?"
 
-#: ../app/actions/view-actions.c:230
+#: ../app/actions/view-actions.c:231
+msgctxt "view-action"
 msgid "Fullscr_een"
 msgstr "��(_E)"
 
-#: ../app/actions/view-actions.c:231
+#: ../app/actions/view-actions.c:232
+msgctxt "view-action"
 msgid "Toggle fullscreen view"
 msgstr "å??æ?¢å?¨å±?æ?¾ç¤º"
 
-#: ../app/actions/view-actions.c:292
+#: ../app/actions/view-actions.c:263
+msgctxt "view-zoom-action"
+msgid "Zoom _Out"
+msgstr "缩�(_O)"
+
+#: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276
+msgctxt "view-action"
+msgid "Zoom out"
+msgstr "缩�"
+
+#: ../app/actions/view-actions.c:269
+msgctxt "view-zoom-action"
+msgid "Zoom _In"
+msgstr "�大(_I)"
+
+#: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282
+msgctxt "view-action"
+msgid "Zoom in"
+msgstr "�大"
+
+#: ../app/actions/view-actions.c:275
+msgctxt "view-zoom-action"
+msgid "Zoom Out"
+msgstr "缩�"
+
+#: ../app/actions/view-actions.c:281
+msgctxt "view-zoom-action"
+msgid "Zoom In"
+msgstr "�大"
+
+#: ../app/actions/view-actions.c:300
+msgctxt "view-zoom-action"
 msgid "1_6:1  (1600%)"
 msgstr "1_6:1 (1600%)"
 
-#: ../app/actions/view-actions.c:293
+#: ../app/actions/view-actions.c:301
+msgctxt "view-zoom-action"
 msgid "Zoom 16:1"
 msgstr "缩� 16:1"
 
-#: ../app/actions/view-actions.c:298
+#: ../app/actions/view-actions.c:306
+msgctxt "view-zoom-action"
 msgid "_8:1  (800%)"
 msgstr "_8:1 (800%)"
 
-#: ../app/actions/view-actions.c:299
+#: ../app/actions/view-actions.c:307
+msgctxt "view-zoom-action"
 msgid "Zoom 8:1"
 msgstr "缩� 8:1"
 
-#: ../app/actions/view-actions.c:304
+#: ../app/actions/view-actions.c:312
+msgctxt "view-zoom-action"
 msgid "_4:1  (400%)"
 msgstr "_4:1 (400%)"
 
-#: ../app/actions/view-actions.c:305
+#: ../app/actions/view-actions.c:313
+msgctxt "view-zoom-action"
 msgid "Zoom 4:1"
 msgstr "缩� 4:1"
 
-#: ../app/actions/view-actions.c:310
+#: ../app/actions/view-actions.c:318
+msgctxt "view-zoom-action"
 msgid "_2:1  (200%)"
 msgstr "_2:1 (200%)"
 
-#: ../app/actions/view-actions.c:311
+#: ../app/actions/view-actions.c:319
+msgctxt "view-zoom-action"
 msgid "Zoom 2:1"
 msgstr "缩� 2:1"
 
-#: ../app/actions/view-actions.c:316
+#: ../app/actions/view-actions.c:324
+msgctxt "view-zoom-action"
 msgid "_1:1  (100%)"
 msgstr "_1:1 (100%)"
 
-#: ../app/actions/view-actions.c:317
+#: ../app/actions/view-actions.c:325
+msgctxt "view-zoom-action"
 msgid "Zoom 1:1"
 msgstr "缩� 1:1"
 
-#: ../app/actions/view-actions.c:322
+#: ../app/actions/view-actions.c:330
+msgctxt "view-zoom-action"
 msgid "1:_2  (50%)"
 msgstr "1:_2 (50%)"
 
-#: ../app/actions/view-actions.c:323
+#: ../app/actions/view-actions.c:331
+msgctxt "view-zoom-action"
 msgid "Zoom 1:2"
 msgstr "缩� 1:2"
 
-#: ../app/actions/view-actions.c:328
+#: ../app/actions/view-actions.c:336
+msgctxt "view-zoom-action"
 msgid "1:_4  (25%)"
 msgstr "1:_4 (25%)"
 
-#: ../app/actions/view-actions.c:329
+#: ../app/actions/view-actions.c:337
+msgctxt "view-zoom-action"
 msgid "Zoom 1:4"
 msgstr "缩� 1:4"
 
-#: ../app/actions/view-actions.c:334
+#: ../app/actions/view-actions.c:342
+msgctxt "view-zoom-action"
 msgid "1:_8  (12.5%)"
 msgstr "1:_8 (12.5%)"
 
-#: ../app/actions/view-actions.c:335
+#: ../app/actions/view-actions.c:343
+msgctxt "view-zoom-action"
 msgid "Zoom 1:8"
 msgstr "缩� 1:8"
 
-#: ../app/actions/view-actions.c:340
+#: ../app/actions/view-actions.c:348
+msgctxt "view-zoom-action"
 msgid "1:1_6  (6.25%)"
 msgstr "1:1_6 (6.25%)"
 
-#: ../app/actions/view-actions.c:341
+#: ../app/actions/view-actions.c:349
+msgctxt "view-zoom-action"
 msgid "Zoom 1:16"
 msgstr "缩� 1:16"
 
-#: ../app/actions/view-actions.c:346
+#: ../app/actions/view-actions.c:354
+msgctxt "view-zoom-action"
 msgid "Othe_r..."
 msgstr "��(_R)..."
 
-#: ../app/actions/view-actions.c:347
+#: ../app/actions/view-actions.c:355
+msgctxt "view-zoom-action"
 msgid "Set a custom zoom factor"
 msgstr "设置���缩���"
 
-#: ../app/actions/view-actions.c:355
+#: ../app/actions/view-actions.c:363
+msgctxt "view-padding-color"
 msgid "From _Theme"
 msgstr "å??è?ªä¸»é¢?(_T)"
 
-#: ../app/actions/view-actions.c:356
+#: ../app/actions/view-actions.c:364
+msgctxt "view-padding-color"
 msgid "Use the current theme's background color"
 msgstr "使ç?¨å½?å??主é¢?ç??è??æ?¯è?²"
 
-#: ../app/actions/view-actions.c:361
+#: ../app/actions/view-actions.c:369
+msgctxt "view-padding-color"
 msgid "_Light Check Color"
 msgstr "æµ?è?²æ?¹æ ¼ç??é¢?è?²(_L)"
 
-#: ../app/actions/view-actions.c:362
+#: ../app/actions/view-actions.c:370
+msgctxt "view-padding-color"
 msgid "Use the light check color"
 msgstr "使ç?¨æµ?è?²æ?¹æ ¼ç??é¢?è?²"
 
-#: ../app/actions/view-actions.c:367
+#: ../app/actions/view-actions.c:375
+msgctxt "view-padding-color"
 msgid "_Dark Check Color"
 msgstr "æ·±è?²æ?¹æ ¼ç??é¢?è?²(_D)"
 
-#: ../app/actions/view-actions.c:368
+#: ../app/actions/view-actions.c:376
+msgctxt "view-padding-color"
 msgid "Use the dark check color"
 msgstr "使ç?¨æ·±è?²æ?¹æ ¼ç??é¢?è?²"
 
-#: ../app/actions/view-actions.c:373
+#: ../app/actions/view-actions.c:381
+msgctxt "view-padding-color"
 msgid "Select _Custom Color..."
 msgstr "é??æ?©è?ªå®?ä¹?é¢?è?²(_C)..."
 
-#: ../app/actions/view-actions.c:374
+#: ../app/actions/view-actions.c:382
+msgctxt "view-padding-color"
 msgid "Use an arbitrary color"
 msgstr "使ç?¨ä»»æ??é¢?è?²"
 
-#: ../app/actions/view-actions.c:379
+#: ../app/actions/view-actions.c:387
+msgctxt "view-padding-color"
 msgid "As in _Preferences"
 msgstr "æ??é¦?é??项中设å®?(_P)"
 
-#: ../app/actions/view-actions.c:380
+#: ../app/actions/view-actions.c:389
+msgctxt "view-padding-color"
 msgid "Reset padding color to what's configured in preferences"
 msgstr "å°?å¡«å??é¢?è?²é??置为å?¨é¦?é??项中ç??é??ç½®"
 
-#: ../app/actions/view-actions.c:571
+#: ../app/actions/view-actions.c:580
 #, c-format
 msgid "Re_vert Zoom (%d%%)"
 msgstr "��缩�(_V)(%d%%)"
 
-#: ../app/actions/view-actions.c:708
+#: ../app/actions/view-actions.c:588
+msgid "Re_vert Zoom"
+msgstr "��缩�(_V)"
+
+#: ../app/actions/view-actions.c:718
 #, c-format
 msgid "Othe_r (%s)..."
 msgstr "��(_R)(%s)..."
 
-#: ../app/actions/view-actions.c:717
+#: ../app/actions/view-actions.c:727
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "缩�(_Z)(%s)"
 
-#: ../app/actions/view-commands.c:613
+#: ../app/actions/view-commands.c:614
 msgid "Set Canvas Padding Color"
 msgstr "设置ç?»å¸?衬å?«ç??é¢?è?²"
 
-#: ../app/actions/view-commands.c:615
+#: ../app/actions/view-commands.c:616
 msgid "Set Custom Canvas Padding Color"
 msgstr "设置è?ªå®?ä¹?ç?»å¸?衬å?«ç??é¢?è?²"
 
@@ -4316,163 +5395,202 @@ msgstr "å±?å¹? %s"
 msgid "Move this window to screen %s"
 msgstr "移�此����� %s"
 
-#: ../app/actions/windows-actions.c:79
+#: ../app/actions/windows-actions.c:80
+msgctxt "windows-action"
 msgid "_Windows"
 msgstr "��(_W)"
 
-#: ../app/actions/windows-actions.c:80
+#: ../app/actions/windows-actions.c:82
+msgctxt "windows-action"
 msgid "_Recently Closed Docks"
-msgstr "æ??è¿?å?³é?­(_R)"
+msgstr "æ??è¿?å?³é?­ç??å??é? (_R)"
 
-#: ../app/actions/windows-actions.c:81
+#: ../app/actions/windows-actions.c:84
+msgctxt "windows-action"
 msgid "_Dockable Dialogs"
 msgstr "å?¯å??é? å¯¹è¯?æ¡?"
 
-#: ../app/actions/windows-actions.c:84
+#: ../app/actions/windows-actions.c:87
+msgctxt "windows-action"
 msgid "Tool_box"
 msgstr "工�箱(_B)"
 
-#: ../app/actions/windows-actions.c:85
+#: ../app/actions/windows-actions.c:88
+msgctxt "windows-action"
 msgid "Raise the toolbox"
 msgstr "æ??å??å·¥å?·ç®±"
 
 #: ../app/base/base-enums.c:23
+msgctxt "curve-type"
 msgid "Smooth"
 msgstr "å??æ»?"
 
 #: ../app/base/base-enums.c:24
+msgctxt "curve-type"
 msgid "Freehand"
 msgstr "æ??ç?»"
 
-#: ../app/base/base-enums.c:55 ../app/base/base-enums.c:125
-#: ../app/core/core-enums.c:1202
+#: ../app/base/base-enums.c:56
+msgctxt "histogram-channel"
 msgid "Value"
 msgstr "æ??度"
 
-#: ../app/base/base-enums.c:56 ../app/core/core-enums.c:1197
-#: ../app/tools/gimpcolorbalancetool.c:296
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/base/base-enums.c:57
+msgctxt "histogram-channel"
 msgid "Red"
 msgstr "红�"
 
-#: ../app/base/base-enums.c:57 ../app/core/core-enums.c:1198
-#: ../app/tools/gimpcolorbalancetool.c:305
-#: ../app/tools/gimphuesaturationtool.c:254
+#: ../app/base/base-enums.c:58
+msgctxt "histogram-channel"
 msgid "Green"
 msgstr "绿�"
 
-#: ../app/base/base-enums.c:58 ../app/core/core-enums.c:1199
-#: ../app/tools/gimpcolorbalancetool.c:314
-#: ../app/tools/gimphuesaturationtool.c:256
+#: ../app/base/base-enums.c:59
+msgctxt "histogram-channel"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../app/base/base-enums.c:59
+#: ../app/base/base-enums.c:60
+msgctxt "histogram-channel"
 msgid "Alpha"
 msgstr "Alpha"
 
-#: ../app/base/base-enums.c:60 ../app/display/gimpdisplayshell-title.c:233
-#: ../app/widgets/widgets-enums.c:84
+#: ../app/base/base-enums.c:61
+msgctxt "histogram-channel"
 msgid "RGB"
 msgstr "RGB"
 
-#: ../app/base/base-enums.c:111
+#: ../app/base/base-enums.c:113
+msgctxt "layer-mode-effects"
 msgid "Normal"
 msgstr "正常"
 
-#: ../app/base/base-enums.c:112
+#: ../app/base/base-enums.c:114
+msgctxt "layer-mode-effects"
 msgid "Dissolve"
 msgstr "è??å??"
 
-#: ../app/base/base-enums.c:113
+#: ../app/base/base-enums.c:115
+msgctxt "layer-mode-effects"
 msgid "Behind"
 msgstr "è??å??"
 
-#: ../app/base/base-enums.c:114
+#: ../app/base/base-enums.c:116
+msgctxt "layer-mode-effects"
 msgid "Multiply"
 msgstr "��"
 
-#: ../app/base/base-enums.c:115
+#: ../app/base/base-enums.c:117
+msgctxt "layer-mode-effects"
 msgid "Screen"
 msgstr "æ?©è?½"
 
-#: ../app/base/base-enums.c:116
+#: ../app/base/base-enums.c:118
+msgctxt "layer-mode-effects"
 msgid "Overlay"
 msgstr "è¦?ç??"
 
-#: ../app/base/base-enums.c:117
+#: ../app/base/base-enums.c:119
+msgctxt "layer-mode-effects"
 msgid "Difference"
 msgstr "差�"
 
-#: ../app/base/base-enums.c:118
+#: ../app/base/base-enums.c:120
+msgctxt "layer-mode-effects"
 msgid "Addition"
 msgstr "��"
 
-#: ../app/base/base-enums.c:120
+#: ../app/base/base-enums.c:121
+msgctxt "layer-mode-effects"
+msgid "Subtract"
+msgstr "å??å?»"
+
+#: ../app/base/base-enums.c:122
+msgctxt "layer-mode-effects"
 msgid "Darken only"
 msgstr "ä»?å??æ??"
 
-#: ../app/base/base-enums.c:121
+#: ../app/base/base-enums.c:123
+msgctxt "layer-mode-effects"
 msgid "Lighten only"
 msgstr "ä»?å??亮"
 
-#: ../app/base/base-enums.c:122 ../app/core/core-enums.c:1200
+#: ../app/base/base-enums.c:124
+msgctxt "layer-mode-effects"
 msgid "Hue"
 msgstr "��"
 
-#: ../app/base/base-enums.c:123 ../app/core/core-enums.c:1201
+#: ../app/base/base-enums.c:125
+msgctxt "layer-mode-effects"
 msgid "Saturation"
 msgstr "饱å??度"
 
-#: ../app/base/base-enums.c:124 ../app/tools/gimppaintoptions-gui.c:174
+#: ../app/base/base-enums.c:126
+msgctxt "layer-mode-effects"
 msgid "Color"
 msgstr "��"
 
-#: ../app/base/base-enums.c:126
+#: ../app/base/base-enums.c:127
+msgctxt "layer-mode-effects"
+msgid "Value"
+msgstr "æ??度"
+
+#: ../app/base/base-enums.c:128
+msgctxt "layer-mode-effects"
 msgid "Divide"
 msgstr "��"
 
-#: ../app/base/base-enums.c:127
+#: ../app/base/base-enums.c:129
+msgctxt "layer-mode-effects"
 msgid "Dodge"
 msgstr "å??æ·¡"
 
-#: ../app/base/base-enums.c:128
+#: ../app/base/base-enums.c:130
+msgctxt "layer-mode-effects"
 msgid "Burn"
 msgstr "å? æ·±"
 
-#: ../app/base/base-enums.c:129
+#: ../app/base/base-enums.c:131
+msgctxt "layer-mode-effects"
 msgid "Hard light"
 msgstr "硬å??"
 
-#: ../app/base/base-enums.c:130
+#: ../app/base/base-enums.c:132
+msgctxt "layer-mode-effects"
 msgid "Soft light"
 msgstr "æ??å??"
 
-#: ../app/base/base-enums.c:131
+#: ../app/base/base-enums.c:133
+msgctxt "layer-mode-effects"
 msgid "Grain extract"
 msgstr "å¢?ç??æ??å??"
 
-#: ../app/base/base-enums.c:132
+#: ../app/base/base-enums.c:134
+msgctxt "layer-mode-effects"
 msgid "Grain merge"
 msgstr "å¢?ç??å??并"
 
-#: ../app/base/base-enums.c:133
+#: ../app/base/base-enums.c:135
+msgctxt "layer-mode-effects"
 msgid "Color erase"
 msgstr "����"
 
-#: ../app/base/base-enums.c:134
+#: ../app/base/base-enums.c:136
+msgctxt "layer-mode-effects"
 msgid "Erase"
 msgstr "��"
 
-#: ../app/base/base-enums.c:135
+#: ../app/base/base-enums.c:137
+msgctxt "layer-mode-effects"
 msgid "Replace"
 msgstr "æ?¿æ?¢"
 
-#: ../app/base/base-enums.c:136
+#: ../app/base/base-enums.c:138
+msgctxt "layer-mode-effects"
 msgid "Anti erase"
 msgstr "å??æ?¦é?¤"
 
-#: ../app/base/tile-swap.c:553
+#: ../app/base/tile-swap.c:552
 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 "
@@ -4483,32 +5601,32 @@ msgstr ""
 "è?½ä¼?被æ??å??ã??请å°?è¯?使ç?¨ä¸?å??ç??æ??件å??ä¿?å­?æ?¨ç??å·¥ä½?ï¼?é??æ?°å?¯å?¨ GIMP 并æ£?æ?¥æ?¨ç??é¦?é??"
 "项中交æ?¢ç?®å½?ç??ä½?ç½®ã??"
 
-#: ../app/base/tile-swap.c:568
+#: ../app/base/tile-swap.c:567
 #, c-format
 msgid "Failed to resize swap file: %s"
 msgstr "è°?æ?´äº¤æ?¢æ??件大å°?失败ï¼?%s"
 
-#: ../app/config/gimpconfig-file.c:68 ../app/core/gimpbrushgenerated-save.c:63
-#: ../app/core/gimpcurve-save.c:53 ../app/core/gimpgradient-save.c:51
-#: ../app/core/gimpgradient-save.c:145 ../app/core/gimppalette-save.c:56
-#: ../app/gui/themes.c:239 ../app/tools/gimpcurvestool.c:676
-#: ../app/tools/gimplevelstool.c:796 ../app/vectors/gimpvectors-export.c:83
-#: ../app/xcf/xcf.c:422
+#: ../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:684
+#: ../app/tools/gimplevelstool.c:796 ../app/vectors/gimpvectors-export.c:82
+#: ../app/xcf/xcf.c:421
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "æ? æ³?æ??å¼?â??%sâ??并å??å?¥ï¼?%s"
 
-#: ../app/config/gimpconfig-file.c:79 ../app/config/gimpconfig-file.c:102
+#: ../app/config/gimpconfig-file.c:78 ../app/config/gimpconfig-file.c:101
 #, c-format
 msgid "Error writing '%s': %s"
 msgstr "å??å?¥â??%sâ??å?ºé??ï¼?%s"
 
-#: ../app/config/gimpconfig-file.c:90
+#: ../app/config/gimpconfig-file.c:89
 #, c-format
 msgid "Error reading '%s': %s"
 msgstr "读å??â??%sâ??æ?¶å?ºé??ï¼?%s"
 
-#: ../app/config/gimpconfig-file.c:132
+#: ../app/config/gimpconfig-file.c:131
 #, c-format
 msgid ""
 "There was an error parsing your '%s' file. Default values will be used. A "
@@ -4572,7 +5690,7 @@ msgstr "å¦?æ??å?¯ç?¨ï¼?å°?ç¡®ä¿?å?¾å??ç??æ¯?个ç?¹é?½å¯¹åº?å±?å¹?ä¸?ç??ä¸?个å??
 msgid "This is the distance in pixels where Guide and Grid snapping activates."
 msgstr "è¿?æ?¯å??è??线å??ç½?格产ç??å?¸é??ä½?ç?¨ç??å??ç´ è·?离ã??"
 
-#: ../app/config/gimprc-blurbs.h:79
+#: ../app/config/gimprc-blurbs.h:91
 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 "
@@ -4584,7 +5702,7 @@ msgstr ""
 "个å??å§?é??中ç??å??ç´ å¼?å§?并å??å??个æ?¹å??æ?¨è¿?ï¼?ç?´å?°ä¸?å??ç´ å??å§?ç??é¢?è?²å·®å?«å¤§äº?ä¸?个æ??å®?ç??"
 "é??å?¼ã??该å?¼å°±æ?¯é»?认ç??é??å?¼ã??"
 
-#: ../app/config/gimprc-blurbs.h:92
+#: ../app/config/gimprc-blurbs.h:104
 msgid ""
 "The window type hint that is set on dock windows. This may affect the way "
 "your window manager decorates and handles dock windows."
@@ -4592,74 +5710,74 @@ msgstr ""
 "å??é? å¼?çª?å?£ç??çª?å?£ç±»å??æ??示设置ã??è¿?å°?å½±å??æ?¨ç??çª?å?£ç®¡ç??å?¨è£?饰å??å¤?ç??å??é? å¼?çª?å?£ç??è¡?"
 "为ã??"
 
-#: ../app/config/gimprc-blurbs.h:123
+#: ../app/config/gimprc-blurbs.h:135
 msgid "When enabled, the selected brush will be used for all tools."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ??æ??ç??å·¥å?·é?½å°?使ç?¨é??中ç??ç?»ç¬?ã??"
 
-#: ../app/config/gimprc-blurbs.h:129
+#: ../app/config/gimprc-blurbs.h:141
 msgid "When enabled, the selected gradient will be used for all tools."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ??æ??ç??å·¥å?·é?½å°?使ç?¨é??中ç??æ¸?å??ã??"
 
-#: ../app/config/gimprc-blurbs.h:132
+#: ../app/config/gimprc-blurbs.h:144
 msgid "When enabled, the selected pattern will be used for all tools."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ??æ??ç??å·¥å?·é?½å°?使ç?¨é??中ç??å?¾æ¡?ã??"
 
-#: ../app/config/gimprc-blurbs.h:146
+#: ../app/config/gimprc-blurbs.h:158
 msgid "Sets the browser used by the help system."
 msgstr "设置帮å?©ç³»ç»?æ??使ç?¨ç??æµ?è§?å?¨ã??"
 
-#: ../app/config/gimprc-blurbs.h:154
+#: ../app/config/gimprc-blurbs.h:169
 msgid "Sets the text to appear in image window status bars."
 msgstr "设置å?¾å??çª?å?£ç?¶æ??æ ?æ??æ?¾ç¤ºç??æ??å­?ã??"
 
-#: ../app/config/gimprc-blurbs.h:157
+#: ../app/config/gimprc-blurbs.h:172
 msgid "Sets the text to appear in image window titles."
 msgstr "设置å?¾å??çª?å?£æ ?é¢?æ??æ?¾ç¤ºç??æ??å­?ã??"
 
-#: ../app/config/gimprc-blurbs.h:160
+#: ../app/config/gimprc-blurbs.h:175
 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 "å¦?æ??å?¯ç?¨ï¼?å°?ç¡®ä¿?æ??å¼?æ??件以å??å?¾å??å®?æ?´å?¯è§?ï¼?å?¦å??å°?æ?? 1:1 ç??æ¯?ä¾?æ?¥æ?¾ç¤ºã??"
 
-#: ../app/config/gimprc-blurbs.h:164
+#: ../app/config/gimprc-blurbs.h:179
 msgid ""
 "Install a private colormap; might be useful on 8-bit (256 colors) displays."
 msgstr "å®?è£?ç§?ç?¨é¢?è?²è¡¨ï¼?对 8 ä½?(256 è?²)æ?¾ç¤ºå?¯è?½æ??ç?¨ã??"
 
-#: ../app/config/gimprc-blurbs.h:167
+#: ../app/config/gimprc-blurbs.h:182
 msgid ""
 "Sets the level of interpolation used for scaling and other transformations."
 msgstr "设置æ??å?¼è®¡ç®?ç??ç­?级ï¼?ç?¨äº?缩æ?¾å??å?¶å®?å??æ?¢æ??ä½?ã??"
 
-#: ../app/config/gimprc-blurbs.h:174
+#: ../app/config/gimprc-blurbs.h:189
 msgid "How many recently opened image filenames to keep on the File menu."
 msgstr "å?¨æ??件è??å??中ä¿?ç??å¤?å°?个æ??è¿?æ??å¼?å?¾å??ç??æ??件å??ã??"
 
-#: ../app/config/gimprc-blurbs.h:177
+#: ../app/config/gimprc-blurbs.h:192
 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:181
+#: ../app/config/gimprc-blurbs.h:196
 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:185
+#: ../app/config/gimprc-blurbs.h:200
 msgid "When enabled, GIMP will show mnemonics in menus."
 msgstr "å¦?æ??å?¯ç?¨ï¼?GIMP å°?å?¨è??å??中æ?¾ç¤ºå?©è®°ç¬¦ã??"
 
-#: ../app/config/gimprc-blurbs.h:188
+#: ../app/config/gimprc-blurbs.h:203
 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:198
+#: ../app/config/gimprc-blurbs.h:213
 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 "
@@ -4668,7 +5786,7 @@ msgstr ""
 "设置ç??è§?å?¨ç??æ°´å¹³å??辨ç??ï¼?以æ¯?è?±å¯¸ç??ç?¹æ?°ä¸ºå??ä½?ã??å¦?æ??设置为 0 å??强å?¶å?? X æ??å?¡å?¨"
 "æ?¥è¯¢æ°´å¹³å??å??ç?´å??辨ç??ä¿¡æ?¯ã??"
 
-#: ../app/config/gimprc-blurbs.h:203
+#: ../app/config/gimprc-blurbs.h:218
 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 "
@@ -4677,7 +5795,7 @@ msgstr ""
 "设置ç??è§?å?¨ç??å??ç?´å??辨ç??ï¼?以æ¯?è?±å¯¸ç??ç?¹æ?°ä¸ºå??ä½?ã??å¦?æ??设置为 0 å??强å?¶å?? X æ??å?¡å?¨"
 "æ?¥è¯¢æ°´å¹³å??å??ç?´å??辨ç??ä¿¡æ?¯ã??"
 
-#: ../app/config/gimprc-blurbs.h:208
+#: ../app/config/gimprc-blurbs.h:223
 msgid ""
 "If enabled, the move tool sets the edited layer or path as active.  This "
 "used to be the default behaviour in older versions."
@@ -4685,17 +5803,17 @@ msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?移å?¨å·¥å?·ä¼?å°?被ç¼?è¾?ç??å?¾å±?æ??è·¯å¾?设置为活å?¨ç??ã??å?¨æ?§ç??ç??æ?¬ä¸­ï¼?è¿?æ?¯é»?认"
 "ç??è¡?为ã??"
 
-#: ../app/config/gimprc-blurbs.h:212
+#: ../app/config/gimprc-blurbs.h:227
 msgid ""
 "Sets the size of the navigation preview available in the lower right corner "
 "of the image window."
 msgstr "设置å?¾å??çª?å?£å?³ä¸?è§?ç??导è?ªé¢?è§?ç??大å°?ã??"
 
-#: ../app/config/gimprc-blurbs.h:216
+#: ../app/config/gimprc-blurbs.h:231
 msgid "Sets how many processors GIMP should try to use simultaneously."
 msgstr "设置 GIMP å°?è¯?å?¾å??æ?¶ä½¿ç?¨å¤?å°?个å¤?ç??å?¨ã??"
 
-#: ../app/config/gimprc-blurbs.h:229
+#: ../app/config/gimprc-blurbs.h:244
 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 "
@@ -4707,7 +5825,7 @@ msgstr ""
 "ç½®æ??示ã??è¿?æ??å?³ç??ç?¨å¤§ç??ç?»ç¬?æ¶?ç?»ç??æ?¶å??å°?æ?´å? ç²¾ç¡®ï¼?ä¸?è¿?å?¯è?½ä¹?æ?´æ?¢ã??å??常ç??æ?¯ï¼?å?¨"
 "æ??äº? X æ??å?¡å?¨ä¸?å?¯ç?¨è¯¥é??项å°?ä¼?å? å¿«æ¶?ç?»é??度ã??"
 
-#: ../app/config/gimprc-blurbs.h:245
+#: ../app/config/gimprc-blurbs.h:260
 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 "
@@ -4716,54 +5834,54 @@ msgstr ""
 "æ??å®? GIMP æ?¯å?¦åº?该å??建å?¾å±?å??é??é??ç??é¢?è§?ã??å?¨å?¾å±?å??é??é??对è¯?æ¡?中æ?¾ç¤ºé¢?è§?æ?¯ä¸?é??"
 "ç??ï¼?ä½?æ?¯å½?å?¾å??å¾?大ç??æ?¶å??å°?ä¼?使é??度å??æ?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:250
+#: ../app/config/gimprc-blurbs.h:265
 msgid ""
 "Sets the preview size used for layers and channel previews in newly created "
 "dialogs."
 msgstr "设置æ?°å??建ç??对è¯?æ¡?中å?¾å±?å??é??é??ç??é¢?è§?大å°?ã??"
 
-#: ../app/config/gimprc-blurbs.h:254
+#: ../app/config/gimprc-blurbs.h:269
 msgid ""
 "When enabled, the image window will automatically resize itself whenever the "
 "physical image size changes."
 msgstr "å¦?æ??å?¯ç?¨ï¼?å½?å?¾å??å®?é??大å°?å??ç??å??å??æ?¶ï¼?å?¾å??çª?å?£å¤§å°?å°?è?ªå?¨é??ç½®ã??"
 
-#: ../app/config/gimprc-blurbs.h:258
+#: ../app/config/gimprc-blurbs.h:273
 msgid ""
 "When enabled, the image window will automatically resize itself when zooming "
 "into and out of images."
 msgstr "å¦?æ??å?¯ç?¨ï¼?å½?æ?¾å¤§æ??缩å°?æ?¥ç??å?¾å??æ?¶ï¼?å?¾å??çª?å?£å¤§å°?å°?è?ªå?¨é??ç½®ã??"
 
-#: ../app/config/gimprc-blurbs.h:262
+#: ../app/config/gimprc-blurbs.h:277
 msgid "Let GIMP try to restore your last saved session on each startup."
 msgstr "æ¯?次å?¯å?¨æ?¶è®© GIMP å°?è¯?æ?¢å¤?æ?¨ä¸?次ä¿?å­?ç??ä¼?è¯?ã??"
 
-#: ../app/config/gimprc-blurbs.h:265
+#: ../app/config/gimprc-blurbs.h:280
 msgid ""
 "Remember the current tool, pattern, color, and brush across GIMP sessions."
-msgstr "GIMP ä¼?è¯?中记ä½?å½?å??ç??å·¥å?·ã??å?¾æ¡?ã??é¢?è?²å??ç?»ç¬?ã??"
+msgstr "å?¨å¤?个 GIMP ä¼?è¯?é?´è®°ä½?å½?å??ç??å·¥å?·ã??å?¾æ¡?ã??é¢?è?²å??ç?»ç¬?ã??"
 
-#: ../app/config/gimprc-blurbs.h:269
+#: ../app/config/gimprc-blurbs.h:284
 msgid ""
 "Keep a permanent record of all opened and saved files in the Recent "
 "Documents list."
 msgstr "å°?å?¨é?¨æ??å¼?å??ä¿?å­?ç??æ??件添å? å?°ç£?ç??ä¸?ç??æ??æ¡£å??å?²è®°å½?ã??"
 
-#: ../app/config/gimprc-blurbs.h:273
+#: ../app/config/gimprc-blurbs.h:288
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
 msgstr "GIMP é??å?ºæ?¶ä¿?å­?主è¦?ç??对è¯?æ¡?ç??ä½?ç½®å??大å°?ã??"
 
-#: ../app/config/gimprc-blurbs.h:276
+#: ../app/config/gimprc-blurbs.h:291
 msgid "Save the tool options when GIMP exits."
 msgstr "GIMP é??å?ºæ?¶ä¿?å­?å·¥å?·é??项ã??"
 
-#: ../app/config/gimprc-blurbs.h:282
+#: ../app/config/gimprc-blurbs.h:297
 msgid ""
 "When enabled, all paint tools will show a preview of the current brush's "
 "outline."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ??æ??æ¶?ç?»å·¥å?·é?½å°?æ?¾ç¤ºå½?å??ç?»ç¬?ç??è½®å»?é¢?è§?ã??"
 
-#: ../app/config/gimprc-blurbs.h:286
+#: ../app/config/gimprc-blurbs.h:301
 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 "
@@ -4772,81 +5890,81 @@ msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?对è¯?æ¡?中å°?æ?¾ç¤ºä¸?个å?°è¾¾ç?¸å?³å¸®å?©é¡µé?¢ç??æ??é?®ã??å¦?æ??没æ??è¿?个æ??é?®ï¼?ä»?ç?¶å?¯"
 "以æ?? F1 æ??å¼?帮å?©é¡µé?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:291
+#: ../app/config/gimprc-blurbs.h:306
 msgid ""
 "When enabled, the mouse pointer will be shown over the image while using a "
 "paint tool."
 msgstr "å¦?æ??å?¯ç?¨ï¼?å½?使ç?¨æ¶?ç?»å·¥å?·æ?¶ï¼?é¼ æ ?æ??é??å°?æ?¾ç¤ºå?¨å?¾å??ä¸?æ?¹ã??"
 
-#: ../app/config/gimprc-blurbs.h:295
+#: ../app/config/gimprc-blurbs.h:310
 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:299
+#: ../app/config/gimprc-blurbs.h:314
 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:303
+#: ../app/config/gimprc-blurbs.h:318
 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:307
+#: ../app/config/gimprc-blurbs.h:322
 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:311
+#: ../app/config/gimprc-blurbs.h:326
 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:315
+#: ../app/config/gimprc-blurbs.h:330
 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:319
+#: ../app/config/gimprc-blurbs.h:334
 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:323
+#: ../app/config/gimprc-blurbs.h:338
 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:327
+#: ../app/config/gimprc-blurbs.h:342
 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:331
+#: ../app/config/gimprc-blurbs.h:346
 msgid "Show a tooltip when the pointer hovers over an item."
 msgstr "å½?æ??é??æ?¬å??å?¨é¡¹ç?®ä¸?æ?¶æ?¾ç¤ºå·¥å?·æ??示ã??"
 
-#: ../app/config/gimprc-blurbs.h:334
+#: ../app/config/gimprc-blurbs.h:349
 msgid "What to do when the space bar is pressed in the image window."
-msgstr "å½?å?¨å?¾å??çª?å?£ä¸­ç©ºç?½é?®æ??ä¸?æ?¶ç??è¡?为ã??"
+msgstr "å½?å?¨å?¾å??çª?å?£ä¸­ç©ºæ ¼é?®æ??ä¸?æ?¶ç??è¡?为ã??"
 
-#: ../app/config/gimprc-blurbs.h:337
+#: ../app/config/gimprc-blurbs.h:352
 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 "
@@ -4860,11 +5978,11 @@ msgstr ""
 "å??å¾?å¾?大ã??å?¦å¤?ï¼?å¦?æ??交æ?¢æ??件æ??å?¨ç?®å½?æ?¯é??è¿? NFS å? è½½ç??è¯?ï¼?ç¨?åº?å??å¾?æ??为ç¼?æ?¢ã??ç?±"
 "äº?è¿?äº?å??å? ï¼?æ??好æ?¯å°?æ?¨ç??交æ?¢æ??件æ?¾å?°â??/tmpâ??ç?®å½?ã??"
 
-#: ../app/config/gimprc-blurbs.h:346
+#: ../app/config/gimprc-blurbs.h:361
 msgid "When enabled, menus can be torn off."
 msgstr "å¦?æ??å?¯ç?¨ï¼?è??å??å?¯è¢«æ??ä¸?ã??"
 
-#: ../app/config/gimprc-blurbs.h:349
+#: ../app/config/gimprc-blurbs.h:364
 msgid ""
 "When enabled, dock windows (the toolbox and palettes) are set to be "
 "transient to the active image window. Most window managers will keep the "
@@ -4873,21 +5991,21 @@ msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?å°?å??é? çª?å?£(å·¥å?·ç®±å??è°?è?²æ?¿)对äº?æ´»å?¨å?¾å??çª?å?£è®¾ç½®ä¸ºä¸´æ?¶ç??ã??è¿?æ ·å¤?æ?°çª?"
 "å?£ç®¡ç??å?¨å°?ä¼?æ??å??é? çª?å?£ä¿?æ??å?¨å?¾å??çª?å?£ä¹?ä¸?ï¼?ä½?ä¹?å?¯è?½æ??å?¶ä»?æ??æ??ã??"
 
-#: ../app/config/gimprc-blurbs.h:355
+#: ../app/config/gimprc-blurbs.h:370
 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:359
+#: ../app/config/gimprc-blurbs.h:374
 msgid "Save changed keyboard shortcuts when GIMP exits."
 msgstr "GIMP é??å?ºæ?¶ä¿?å­?å·²æ?¹å??ç??å¿«æ?·é?®ã??"
 
-#: ../app/config/gimprc-blurbs.h:362
+#: ../app/config/gimprc-blurbs.h:377
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "GIMP å?¯å?¨æ?¶æ?¢å¤?å·²ä¿?å­?ç??å¿«æ?·é?®ã??"
 
-#: ../app/config/gimprc-blurbs.h:365
+#: ../app/config/gimprc-blurbs.h:380
 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 "
@@ -4898,17 +6016,17 @@ msgstr ""
 "å?ºä»¥å??å°?æ¶?失ï¼?ä½?æ?¯ä¸ªå?«æ??件å?¯è?½ä¼?ç??ä¸?æ?¥ï¼?å? æ­¤æ??好ä¸?è¦?æ??è¿?个ç?®å½?ä¸?å?«ç??ç?¨æ?·å?±"
 "享ã??"
 
-#: ../app/config/gimprc-blurbs.h:377
+#: ../app/config/gimprc-blurbs.h:392
 msgid "Sets the size of the thumbnail shown in the Open dialog."
 msgstr "设置æ??å¼?对è¯?æ¡?中缩ç?¥å?¾ç??尺寸ã??"
 
-#: ../app/config/gimprc-blurbs.h:380
+#: ../app/config/gimprc-blurbs.h:395
 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:384
+#: ../app/config/gimprc-blurbs.h:399
 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 "
@@ -4919,40 +6037,40 @@ msgstr ""
 "å¾?å¤?ç??æ? æ³?è£?å?¥å??å­?ç??å?¾å??æ??为å?¯è?½ã??å¦?æ??æ?¨ç??å??å­?å¾?å¤?ï¼?æ?¨å?¯è?½å¸?æ??设置ä¸?个æ?´å¤§ç??"
 "å?¼ã??"
 
-#: ../app/config/gimprc-blurbs.h:390
+#: ../app/config/gimprc-blurbs.h:405
 msgid "Show the current foreground and background colors in the toolbox."
-msgstr "交æ?¢å??æ?¯è?²å??è??æ?¯è?²"
+msgstr "å?¨å·¥å?·ç®±ä¸­æ?¾ç¤ºå½?å??ç??å??æ?¯è?²å??è??æ?¯è?²"
 
-#: ../app/config/gimprc-blurbs.h:393
+#: ../app/config/gimprc-blurbs.h:408
 msgid "Show the currently selected brush, pattern and gradient in the toolbox."
-msgstr "æ?¾ç¤ºæ´»å?¨ç?»ç¬?ã??å?¾æ¡?å??æ¸?å??(_B)"
+msgstr "å?¨å·¥å?·ç®±ä¸­æ?¾ç¤ºæ´»å?¨ç?»ç¬?ã??å?¾æ¡?å??æ¸?å??"
 
-#: ../app/config/gimprc-blurbs.h:396
+#: ../app/config/gimprc-blurbs.h:411
 msgid "Show the currently active image in the toolbox."
-msgstr "å?¨å·¥å?·ç®±ä¸­æ?¾ç¤ºæ´»å?¨å?¾å??"
+msgstr "å?¨å·¥å?·ç®±ä¸­æ?¾ç¤ºå½?å??æ´»å?¨ç??å?¾å??"
 
-#: ../app/config/gimprc-blurbs.h:402
+#: ../app/config/gimprc-blurbs.h:417
 msgid ""
 "The window type hint that is set on the toolbox. This may affect how your "
 "window manager decorates and handles the toolbox window."
 msgstr ""
 "å·¥å?·ç®±ç??çª?å?£ç±»å??æ??示设置ã??è¿?å°?å½±å??æ?¨ç??çª?å?£ç®¡ç??å?¨è£?饰å??å¤?ç??å·¥å?·ç®±ç??è¡?为ã??"
 
-#: ../app/config/gimprc-blurbs.h:406
+#: ../app/config/gimprc-blurbs.h:421
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "设置å?¾å??中é??æ??é?¨å??ç??æ?¾ç¤ºæ?¹å¼?ã??"
 
-#: ../app/config/gimprc-blurbs.h:409
+#: ../app/config/gimprc-blurbs.h:424
 msgid "Sets the size of the checkerboard used to display transparency."
 msgstr "设置ç?¨äº?表示é??æ??ç??æ£?ç??æ ¼å­?ç??大å°?ã??"
 
-#: ../app/config/gimprc-blurbs.h:412
+#: ../app/config/gimprc-blurbs.h:427
 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:416
+#: ../app/config/gimprc-blurbs.h:431
 msgid ""
 "Sets the minimal number of operations that can be undone. More undo levels "
 "are kept available until the undo-size limit is reached."
@@ -4960,7 +6078,7 @@ msgstr ""
 "设置å??许æ?¤æ¶?ç??æ??ä½?ç??æ??å°?æ?°ç?®ã??å?ªè¦?è¿?没æ??è¾¾å?°æ?¤æ¶?大å°?ç??é??å?¶ï¼?å°±å?¯å·²ä¿?å­?æ?´å¤?ç??"
 "æ?¤æ¶?æ??ä½?ã??"
 
-#: ../app/config/gimprc-blurbs.h:420
+#: ../app/config/gimprc-blurbs.h:435
 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 "
@@ -4969,15 +6087,15 @@ msgstr ""
 "设置æ¯?å¹?å?¾å??ç?¨äº?ä¿?å­?æ?¤æ¶?å ?æ ?中ç??æ??ä½?ç??å??å­?ä¸?é??ã??ä¸?此设置æ? å?³ï¼?æ?¤æ¶?æ??ä½?è?³å°?å?¯"
 "以达å?°æ??å®?ç??æ?¤æ¶?次æ?°ã??"
 
-#: ../app/config/gimprc-blurbs.h:425
+#: ../app/config/gimprc-blurbs.h:440
 msgid "Sets the size of the previews in the Undo History."
 msgstr "设置æ?¤æ¶?å??å?²ç??é¢?è§?大å°?ã??"
 
-#: ../app/config/gimprc-blurbs.h:428
+#: ../app/config/gimprc-blurbs.h:443
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ?? F1 å°?æ??å¼?帮å?©æµ?è§?å?¨ã??"
 
-#: ../app/config/gimprc-blurbs.h:439
+#: ../app/config/gimprc-blurbs.h:454
 #, c-format
 msgid ""
 "Sets the external web browser to be used.  This can be an absolute path or "
@@ -4989,607 +6107,805 @@ msgstr ""
 "åº?ç??å??å­?ã??å¦?æ??å?½ä»¤å?«æ??â??%sâ??ï¼?å®?å°?被æ?¿æ?¢ä¸º URLï¼?å?¦å?? URL å°?以空格å??é??ç??å½¢å¼?æ?¥å?¨"
 "å?½ä»¤ä¹?å??ã??"
 
-#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:134
-#: ../app/core/gimp-units.c:164 ../app/gui/session.c:206
-#: ../app/plug-in/plug-in-rc.c:213
+#: ../app/config/gimprc-deserialize.c:134 ../app/core/gimp-modules.c:133
+#: ../app/core/gimp-units.c:163 ../app/gui/session.c:205
+#: ../app/plug-in/plug-in-rc.c:212
 msgid "fatal parse error"
 msgstr "严é??解æ??é??误"
 
-#: ../app/config/gimprc-deserialize.c:163
+#: ../app/config/gimprc-deserialize.c:162
 #, c-format
 msgid "value for token %s is not a valid UTF-8 string"
 msgstr "%s ç??å?¼ä¸?æ?¯æ??æ??ç?? UTF-8 å­?符串"
 
-#. no undo (or redo) steps available
-#: ../app/core/core-enums.c:53 ../app/core/core-enums.c:252
-#: ../app/core/core-enums.c:504 ../app/paint/paint-enums.c:81
-#: ../app/widgets/gimpimagepropview.c:416
+#: ../app/core/core-enums.c:54
+msgctxt "convert-dither-type"
 msgid "None"
 msgstr "æ? "
 
-#: ../app/core/core-enums.c:54
+#: ../app/core/core-enums.c:55
+msgctxt "convert-dither-type"
 msgid "Floyd-Steinberg (normal)"
 msgstr "Floyd-Steinberg (æ?®é??)"
 
-#: ../app/core/core-enums.c:55
+#: ../app/core/core-enums.c:56
+msgctxt "convert-dither-type"
 msgid "Floyd-Steinberg (reduced color bleeding)"
 msgstr "Floyd-Steinberg (å??å°?é¢?è?²æ??失)"
 
-#: ../app/core/core-enums.c:56
+#: ../app/core/core-enums.c:57
+msgctxt "convert-dither-type"
 msgid "Positioned"
 msgstr "å®?ä½?"
 
-#: ../app/core/core-enums.c:85
+#: ../app/core/core-enums.c:87
+msgctxt "convert-palette-type"
 msgid "Generate optimum palette"
 msgstr "ç??æ??ä¼?å??è?²æ?¿"
 
-#: ../app/core/core-enums.c:86
+#: ../app/core/core-enums.c:88
+msgctxt "convert-palette-type"
 msgid "Use web-optimized palette"
 msgstr "使ç?¨ç½?页ä¼?å??è?²æ?¿"
 
-#: ../app/core/core-enums.c:87
+#: ../app/core/core-enums.c:89
+msgctxt "convert-palette-type"
 msgid "Use black and white (1-bit) palette"
 msgstr "使���(1 �)��"
 
-#: ../app/core/core-enums.c:88
+#: ../app/core/core-enums.c:90
+msgctxt "convert-palette-type"
 msgid "Use custom palette"
 msgstr "使������"
 
-#: ../app/core/core-enums.c:211
+#: ../app/core/core-enums.c:216
+msgctxt "align-reference-type"
 msgid "First item"
 msgstr "第�项"
 
-#: ../app/core/core-enums.c:213 ../app/dialogs/dialogs.c:198
-#: ../app/tools/tools-enums.c:210
+#: ../app/core/core-enums.c:217
+msgctxt "align-reference-type"
+msgid "Image"
+msgstr "å?¾å??"
+
+#: ../app/core/core-enums.c:218
+msgctxt "align-reference-type"
 msgid "Selection"
 msgstr "é??å?º"
 
-#: ../app/core/core-enums.c:214
+#: ../app/core/core-enums.c:219
+msgctxt "align-reference-type"
 msgid "Active layer"
 msgstr "活���"
 
-#: ../app/core/core-enums.c:215
+#: ../app/core/core-enums.c:220
+msgctxt "align-reference-type"
 msgid "Active channel"
 msgstr "æ´»å?¨é??é??"
 
-#: ../app/core/core-enums.c:216
+#: ../app/core/core-enums.c:221
+msgctxt "align-reference-type"
 msgid "Active path"
 msgstr "活�路�"
 
-#: ../app/core/core-enums.c:247
+#: ../app/core/core-enums.c:253
+msgctxt "fill-type"
 msgid "Foreground color"
 msgstr "å??æ?¯è?²"
 
-#: ../app/core/core-enums.c:248
+#: ../app/core/core-enums.c:254
+msgctxt "fill-type"
 msgid "Background color"
 msgstr "è??æ?¯è?²"
 
-#: ../app/core/core-enums.c:249
+#: ../app/core/core-enums.c:255
+msgctxt "fill-type"
 msgid "White"
 msgstr "��"
 
-#. Transparency
-#: ../app/core/core-enums.c:250 ../app/dialogs/preferences-dialog.c:2311
+#: ../app/core/core-enums.c:256
+msgctxt "fill-type"
 msgid "Transparency"
 msgstr "é??æ??"
 
-#: ../app/core/core-enums.c:251 ../app/core/core-enums.c:308
+#: ../app/core/core-enums.c:257
+msgctxt "fill-type"
 msgid "Pattern"
 msgstr "��"
 
-#: ../app/core/core-enums.c:279
+#: ../app/core/core-enums.c:258
+msgctxt "fill-type"
+msgid "None"
+msgstr "æ? "
+
+#: ../app/core/core-enums.c:286
+msgctxt "fill-style"
+msgid "Solid color"
+msgstr "纯�"
+
+#: ../app/core/core-enums.c:287
+msgctxt "fill-style"
+msgid "Pattern"
+msgstr "��"
+
+#: ../app/core/core-enums.c:315
+msgctxt "stroke-method"
 msgid "Stroke line"
 msgstr "��线�"
 
-#: ../app/core/core-enums.c:280
+#: ../app/core/core-enums.c:316
+msgctxt "stroke-method"
 msgid "Stroke with a paint tool"
 msgstr "使���工�����"
 
-#: ../app/core/core-enums.c:307
-msgid "Solid color"
-msgstr "纯�"
-
-#: ../app/core/core-enums.c:336
+#: ../app/core/core-enums.c:345
+msgctxt "join-style"
 msgid "Miter"
 msgstr "æ??æ?¥"
 
-#: ../app/core/core-enums.c:337 ../app/core/core-enums.c:367
+#: ../app/core/core-enums.c:346
+msgctxt "join-style"
 msgid "Round"
 msgstr "å??è§?"
 
-#: ../app/core/core-enums.c:338
+#: ../app/core/core-enums.c:347
+msgctxt "join-style"
 msgid "Bevel"
 msgstr "æ??é?¢"
 
-#: ../app/core/core-enums.c:366
+#: ../app/core/core-enums.c:376
+msgctxt "cap-style"
 msgid "Butt"
 msgstr "对�"
 
-#: ../app/core/core-enums.c:368 ../app/core/core-enums.c:443
+#: ../app/core/core-enums.c:377
+msgctxt "cap-style"
+msgid "Round"
+msgstr "å??è§?"
+
+#: ../app/core/core-enums.c:378
+msgctxt "cap-style"
 msgid "Square"
 msgstr "正�"
 
-#: ../app/core/core-enums.c:404
+#: ../app/core/core-enums.c:415
+msgctxt "dash-preset"
 msgid "Custom"
 msgstr "���"
 
-#: ../app/core/core-enums.c:405
+#: ../app/core/core-enums.c:416
+msgctxt "dash-preset"
 msgid "Line"
 msgstr "线"
 
-#: ../app/core/core-enums.c:406
+#: ../app/core/core-enums.c:417
+msgctxt "dash-preset"
 msgid "Long dashes"
 msgstr "é?¿å??"
 
-#: ../app/core/core-enums.c:407
+#: ../app/core/core-enums.c:418
+msgctxt "dash-preset"
 msgid "Medium dashes"
 msgstr "中å??"
 
-#: ../app/core/core-enums.c:408
+#: ../app/core/core-enums.c:419
+msgctxt "dash-preset"
 msgid "Short dashes"
 msgstr "ç?­å??"
 
-#: ../app/core/core-enums.c:409
+#: ../app/core/core-enums.c:420
+msgctxt "dash-preset"
 msgid "Sparse dots"
 msgstr "ç¨?ç??ç?¹"
 
-#: ../app/core/core-enums.c:410
+#: ../app/core/core-enums.c:421
+msgctxt "dash-preset"
 msgid "Normal dots"
 msgstr "正常�"
 
-#: ../app/core/core-enums.c:411
+#: ../app/core/core-enums.c:422
+msgctxt "dash-preset"
 msgid "Dense dots"
 msgstr "å¯?é??ç?¹"
 
-#: ../app/core/core-enums.c:412
+#: ../app/core/core-enums.c:423
+msgctxt "dash-preset"
 msgid "Stipples"
 msgstr "��"
 
-#: ../app/core/core-enums.c:413
+#: ../app/core/core-enums.c:424
+msgctxt "dash-preset"
 msgid "Dash, dot"
 msgstr "å??ç?¹"
 
-#: ../app/core/core-enums.c:414
+#: ../app/core/core-enums.c:425
+msgctxt "dash-preset"
 msgid "Dash, dot, dot"
 msgstr "å??ç?¹ç?¹"
 
-#: ../app/core/core-enums.c:442
+#: ../app/core/core-enums.c:454
+msgctxt "brush-generated-shape"
 msgid "Circle"
 msgstr "å??"
 
-#: ../app/core/core-enums.c:444
+#: ../app/core/core-enums.c:455
+msgctxt "brush-generated-shape"
+msgid "Square"
+msgstr "正�"
+
+#: ../app/core/core-enums.c:456
+msgctxt "brush-generated-shape"
 msgid "Diamond"
 msgstr "�形"
 
-#: ../app/core/core-enums.c:472 ../app/dialogs/preferences-dialog.c:2343
+#: ../app/core/core-enums.c:485
+msgctxt "orientation-type"
 msgid "Horizontal"
 msgstr "æ°´å¹³"
 
-#: ../app/core/core-enums.c:473 ../app/dialogs/preferences-dialog.c:2345
+#: ../app/core/core-enums.c:486
+msgctxt "orientation-type"
 msgid "Vertical"
 msgstr "å??ç?´"
 
-#: ../app/core/core-enums.c:474
+#: ../app/core/core-enums.c:487
+msgctxt "orientation-type"
 msgid "Unknown"
 msgstr "��"
 
-#: ../app/core/core-enums.c:505
+#: ../app/core/core-enums.c:518
+msgctxt "item-set"
+msgid "None"
+msgstr "æ? "
+
+#: ../app/core/core-enums.c:519
+msgctxt "item-set"
 msgid "All layers"
 msgstr "����"
 
-#: ../app/core/core-enums.c:506
+#: ../app/core/core-enums.c:520
+msgctxt "item-set"
 msgid "Image-sized layers"
 msgstr "å?¾å??大å°?ç??å?¾å±?"
 
-#: ../app/core/core-enums.c:507
+#: ../app/core/core-enums.c:521
+msgctxt "item-set"
 msgid "All visible layers"
 msgstr "������"
 
-#: ../app/core/core-enums.c:508
+#: ../app/core/core-enums.c:522
+msgctxt "item-set"
 msgid "All linked layers"
 msgstr "������"
 
-#: ../app/core/core-enums.c:572
+#: ../app/core/core-enums.c:588
+msgctxt "view-size"
 msgid "Tiny"
 msgstr "ç»?å°?"
 
-#: ../app/core/core-enums.c:573
+#: ../app/core/core-enums.c:589
+msgctxt "view-size"
 msgid "Very small"
 msgstr "å¾?å°?"
 
-#: ../app/core/core-enums.c:574
+#: ../app/core/core-enums.c:590
+msgctxt "view-size"
 msgid "Small"
 msgstr "å°?"
 
-#: ../app/core/core-enums.c:575
+#: ../app/core/core-enums.c:591
+msgctxt "view-size"
 msgid "Medium"
 msgstr "中"
 
-#: ../app/core/core-enums.c:576
+#: ../app/core/core-enums.c:592
+msgctxt "view-size"
 msgid "Large"
 msgstr "大"
 
-#: ../app/core/core-enums.c:577
+#: ../app/core/core-enums.c:593
+msgctxt "view-size"
 msgid "Very large"
 msgstr "�大"
 
-#: ../app/core/core-enums.c:578
+#: ../app/core/core-enums.c:594
+msgctxt "view-size"
 msgid "Huge"
 msgstr "�大"
 
-#: ../app/core/core-enums.c:579
+#: ../app/core/core-enums.c:595
+msgctxt "view-size"
 msgid "Enormous"
 msgstr "巨大"
 
-#: ../app/core/core-enums.c:580
+#: ../app/core/core-enums.c:596
+msgctxt "view-size"
 msgid "Gigantic"
 msgstr "æ??大"
 
-#: ../app/core/core-enums.c:607
+#: ../app/core/core-enums.c:624
+msgctxt "view-type"
 msgid "View as list"
 msgstr "以å??表æ?¹å¼?æ?¥ç??"
 
-#: ../app/core/core-enums.c:608
+#: ../app/core/core-enums.c:625
+msgctxt "view-type"
 msgid "View as grid"
 msgstr "以é?µå??æ?¹å¼?æ?¥ç??"
 
-#: ../app/core/core-enums.c:672
+#: ../app/core/core-enums.c:691
+msgctxt "thumbnail-size"
 msgid "No thumbnails"
 msgstr "�缩��"
 
-#: ../app/core/core-enums.c:673
+#: ../app/core/core-enums.c:692
+msgctxt "thumbnail-size"
 msgid "Normal (128x128)"
 msgstr "æ?®é??(128x128)"
 
-#: ../app/core/core-enums.c:674
+#: ../app/core/core-enums.c:693
+msgctxt "thumbnail-size"
 msgid "Large (256x256)"
 msgstr "大(256x256)"
 
-#: ../app/core/core-enums.c:850
+#: ../app/core/core-enums.c:869
+msgctxt "undo-type"
 msgid "<<invalid>>"
 msgstr "<< æ? æ?? >>"
 
-#: ../app/core/core-enums.c:851
+#: ../app/core/core-enums.c:870
+msgctxt "undo-type"
 msgid "Scale image"
 msgstr "缩æ?¾å?¾å??"
 
-#: ../app/core/core-enums.c:852
+#: ../app/core/core-enums.c:871
+msgctxt "undo-type"
 msgid "Resize image"
 msgstr "å?¾å??æ?¹å??大å°?"
 
-#: ../app/core/core-enums.c:853
+#: ../app/core/core-enums.c:872
+msgctxt "undo-type"
 msgid "Flip image"
 msgstr "翻转å?¾å??"
 
-#: ../app/core/core-enums.c:854
+#: ../app/core/core-enums.c:873
+msgctxt "undo-type"
 msgid "Rotate image"
 msgstr "æ??转å?¾å??"
 
-#: ../app/core/core-enums.c:855
+#: ../app/core/core-enums.c:874
+msgctxt "undo-type"
 msgid "Crop image"
 msgstr "å?ªè£?å?¾å??"
 
-#: ../app/core/core-enums.c:856
+#: ../app/core/core-enums.c:875
+msgctxt "undo-type"
 msgid "Convert image"
 msgstr "转æ?¢å?¾å??"
 
-#: ../app/core/core-enums.c:857
+#: ../app/core/core-enums.c:876
+msgctxt "undo-type"
 msgid "Remove item"
-msgstr "��项�"
+msgstr "移�项�"
 
-#: ../app/core/core-enums.c:858
+#: ../app/core/core-enums.c:877
+msgctxt "undo-type"
 msgid "Merge layers"
 msgstr "å??并å?¾å±?"
 
-#: ../app/core/core-enums.c:859
+#: ../app/core/core-enums.c:878
+msgctxt "undo-type"
 msgid "Merge paths"
 msgstr "å??并路å¾?"
 
-#: ../app/core/core-enums.c:861 ../app/core/core-enums.c:892
-#: ../app/core/gimpimage-grid.c:58 ../app/dialogs/grid-dialog.c:152
-#: ../app/tools/tools-enums.c:241
+#: ../app/core/core-enums.c:879
+msgctxt "undo-type"
+msgid "Quick Mask"
+msgstr "å¿«é??è??æ?¿"
+
+#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:910
+msgctxt "undo-type"
 msgid "Grid"
 msgstr "ç½?æ ¼"
 
-#: ../app/core/core-enums.c:862 ../app/core/core-enums.c:894
+#: ../app/core/core-enums.c:881 ../app/core/core-enums.c:912
+msgctxt "undo-type"
 msgid "Guide"
 msgstr "å??è??线"
 
-#: ../app/core/core-enums.c:863 ../app/core/core-enums.c:895
+#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:913
+msgctxt "undo-type"
 msgid "Sample Point"
 msgstr "é??æ ·ç?¹"
 
-#: ../app/core/core-enums.c:864 ../app/core/core-enums.c:896
+#: ../app/core/core-enums.c:883 ../app/core/core-enums.c:914
+msgctxt "undo-type"
 msgid "Layer/Channel"
 msgstr "å?¾å±?/é??é??"
 
-#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:897
+#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:915
+msgctxt "undo-type"
 msgid "Layer/Channel modification"
 msgstr "å?¾å±?/é??é??ä¿®æ?¹"
 
-#: ../app/core/core-enums.c:866 ../app/core/core-enums.c:898
+#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:916
+msgctxt "undo-type"
 msgid "Selection mask"
 msgstr "é??å?ºè??æ?¿"
 
-#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:901
+#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:919
+msgctxt "undo-type"
 msgid "Item visibility"
 msgstr "项����"
 
-#: ../app/core/core-enums.c:868 ../app/core/core-enums.c:902
+#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:920
+msgctxt "undo-type"
 msgid "Link/Unlink item"
 msgstr "é?¾æ?¥/å??æ¶?é?¾æ?¥é¡¹ç?®"
 
-#: ../app/core/core-enums.c:869
+#: ../app/core/core-enums.c:888
+msgctxt "undo-type"
 msgid "Item properties"
 msgstr "项���"
 
-#: ../app/core/core-enums.c:870 ../app/core/core-enums.c:900
+#: ../app/core/core-enums.c:889 ../app/core/core-enums.c:918
+msgctxt "undo-type"
 msgid "Move item"
 msgstr "移�项�"
 
-#: ../app/core/core-enums.c:871
+#: ../app/core/core-enums.c:890
+msgctxt "undo-type"
 msgid "Scale item"
 msgstr "缩�项�"
 
-#: ../app/core/core-enums.c:872
+#: ../app/core/core-enums.c:891
+msgctxt "undo-type"
 msgid "Resize item"
 msgstr "��项�大�"
 
-#: ../app/core/core-enums.c:873
+#: ../app/core/core-enums.c:892
+msgctxt "undo-type"
 msgid "Add layer"
 msgstr "添���"
 
-#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:911
+#: ../app/core/core-enums.c:893 ../app/core/core-enums.c:929
+msgctxt "undo-type"
 msgid "Add layer mask"
 msgstr "æ·»å? å?¾å±?è??æ?¿"
 
-#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:913
+#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:931
+msgctxt "undo-type"
 msgid "Apply layer mask"
 msgstr "åº?ç?¨å?¾å±?è??æ?¿"
 
-#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:923
+#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:941
+msgctxt "undo-type"
 msgid "Floating selection to layer"
 msgstr "æµ®å?¨é??å?ºå?°å?¾å±?"
 
-#: ../app/core/core-enums.c:877
+#: ../app/core/core-enums.c:896
+msgctxt "undo-type"
 msgid "Float selection"
 msgstr "æµ®å?¨é??å?º"
 
-#: ../app/core/core-enums.c:878
+#: ../app/core/core-enums.c:897
+msgctxt "undo-type"
 msgid "Anchor floating selection"
 msgstr "å?ºå®?æµ®å?¨é??å?º"
 
-#: ../app/core/core-enums.c:879
-msgid "Remove floating selection"
-msgstr "å? é?¤æµ®å?¨é??å?º"
-
-#: ../app/core/core-enums.c:880 ../app/core/gimp-edit.c:262
+#: ../app/core/core-enums.c:898
+msgctxt "undo-type"
 msgid "Paste"
 msgstr "ç²?è´´"
 
-#: ../app/core/core-enums.c:881 ../app/core/gimp-edit.c:557
+#: ../app/core/core-enums.c:899
+msgctxt "undo-type"
 msgid "Cut"
 msgstr "å?ªå??"
 
-#: ../app/core/core-enums.c:882 ../app/tools/gimptexttool.c:160
-#: ../app/widgets/widgets-enums.c:265
+#: ../app/core/core-enums.c:900
+msgctxt "undo-type"
 msgid "Text"
 msgstr "æ??å­?"
 
-#: ../app/core/core-enums.c:883 ../app/core/core-enums.c:926
-#: ../app/core/gimpdrawable-transform.c:567
+#: ../app/core/core-enums.c:901 ../app/core/core-enums.c:942
+msgctxt "undo-type"
 msgid "Transform"
 msgstr "å??æ?¢"
 
-#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:927
-#: ../app/paint/gimppaintcore.c:137
+#: ../app/core/core-enums.c:902 ../app/core/core-enums.c:943
+msgctxt "undo-type"
 msgid "Paint"
 msgstr "��"
 
-#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:930
+#: ../app/core/core-enums.c:903 ../app/core/core-enums.c:946
+msgctxt "undo-type"
 msgid "Attach parasite"
 msgstr "æ·»å? å¯?ç??ç?©"
 
-#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:931
+#: ../app/core/core-enums.c:904 ../app/core/core-enums.c:947
+msgctxt "undo-type"
 msgid "Remove parasite"
 msgstr "å? é?¤å¯?ç??ç?©"
 
-#: ../app/core/core-enums.c:887
+#: ../app/core/core-enums.c:905
+msgctxt "undo-type"
 msgid "Import paths"
 msgstr "导�路�"
 
-#: ../app/core/core-enums.c:888 ../app/pdb/drawable-cmds.c:885
+#: ../app/core/core-enums.c:906
+msgctxt "undo-type"
 msgid "Plug-In"
 msgstr "æ??件"
 
-#: ../app/core/core-enums.c:889
+#: ../app/core/core-enums.c:907
+msgctxt "undo-type"
 msgid "Image type"
 msgstr "å?¾å??ç±»å??"
 
-#: ../app/core/core-enums.c:890
+#: ../app/core/core-enums.c:908
+msgctxt "undo-type"
 msgid "Image size"
 msgstr "å?¾å??大å°?"
 
-#: ../app/core/core-enums.c:891
+#: ../app/core/core-enums.c:909
+msgctxt "undo-type"
 msgid "Image resolution change"
 msgstr "å?¾å??å??辨ç??æ?´æ?¹"
 
-#: ../app/core/core-enums.c:893
+#: ../app/core/core-enums.c:911
+msgctxt "undo-type"
 msgid "Change indexed palette"
 msgstr "��索���"
 
-#: ../app/core/core-enums.c:899
+#: ../app/core/core-enums.c:917
+msgctxt "undo-type"
 msgid "Rename item"
 msgstr "é??å?½å??项ç?®"
 
-#: ../app/core/core-enums.c:903
+#: ../app/core/core-enums.c:921
+msgctxt "undo-type"
 msgid "New layer"
 msgstr "�建��"
 
-#: ../app/core/core-enums.c:904
+#: ../app/core/core-enums.c:922
+msgctxt "undo-type"
 msgid "Delete layer"
 msgstr "����"
 
-#: ../app/core/core-enums.c:905
+#: ../app/core/core-enums.c:923
+msgctxt "undo-type"
 msgid "Reposition layer"
 msgstr "é??å®?ä½?å?¾å±?"
 
-#: ../app/core/core-enums.c:906
+#: ../app/core/core-enums.c:924
+msgctxt "undo-type"
 msgid "Set layer mode"
 msgstr "设置��模�"
 
-#: ../app/core/core-enums.c:907
+#: ../app/core/core-enums.c:925
+msgctxt "undo-type"
 msgid "Set layer opacity"
 msgstr "设置å?¾å±?ä¸?é??æ??度"
 
-#: ../app/core/core-enums.c:908
+#: ../app/core/core-enums.c:926
+msgctxt "undo-type"
 msgid "Lock/Unlock alpha channel"
 msgstr "é??å®?/å??æ¶?é??å®? Alpha é??é??"
 
-#: ../app/core/core-enums.c:909
+#: ../app/core/core-enums.c:927
+msgctxt "undo-type"
 msgid "Text layer"
 msgstr "æ??å­?å?¾å±?"
 
-#: ../app/core/core-enums.c:910
+#: ../app/core/core-enums.c:928
+msgctxt "undo-type"
 msgid "Text layer modification"
 msgstr "æ??å­?å?¾å±?ä¿®æ?¹"
 
-#: ../app/core/core-enums.c:912
+#: ../app/core/core-enums.c:930
+msgctxt "undo-type"
 msgid "Delete layer mask"
 msgstr "å? é?¤å?¾å±?è??æ?¿"
 
-#: ../app/core/core-enums.c:914
+#: ../app/core/core-enums.c:932
+msgctxt "undo-type"
 msgid "Show layer mask"
 msgstr "æ?¾ç¤ºå?¾å±?è??æ?¿"
 
-#: ../app/core/core-enums.c:915
+#: ../app/core/core-enums.c:933
+msgctxt "undo-type"
 msgid "New channel"
 msgstr "æ?°å»ºé??é??"
 
-#: ../app/core/core-enums.c:916
+#: ../app/core/core-enums.c:934
+msgctxt "undo-type"
 msgid "Delete channel"
 msgstr "å? é?¤é??é??"
 
-#: ../app/core/core-enums.c:917
+#: ../app/core/core-enums.c:935
+msgctxt "undo-type"
 msgid "Reposition channel"
 msgstr "é??å®?ä½?é??é??"
 
-#: ../app/core/core-enums.c:918
+#: ../app/core/core-enums.c:936
+msgctxt "undo-type"
 msgid "Channel color"
 msgstr "é??é??é¢?è?²"
 
-#: ../app/core/core-enums.c:919
+#: ../app/core/core-enums.c:937
+msgctxt "undo-type"
 msgid "New path"
 msgstr "�建路�"
 
-#: ../app/core/core-enums.c:921
+#: ../app/core/core-enums.c:938
+msgctxt "undo-type"
+msgid "Delete path"
+msgstr "��路�"
+
+#: ../app/core/core-enums.c:939
+msgctxt "undo-type"
 msgid "Path modification"
 msgstr "路�修�"
 
-#: ../app/core/core-enums.c:922
+#: ../app/core/core-enums.c:940
+msgctxt "undo-type"
 msgid "Reposition path"
 msgstr "é??å®?ä½?è·¯å¾?"
 
-#: ../app/core/core-enums.c:924
-msgid "Rigor floating selection"
-msgstr "å?ºå®?æµ®å?¨é??å?º"
-
-#: ../app/core/core-enums.c:925
-msgid "Relax floating selection"
-msgstr "å? é?¤æµ®å?¨é??å?º"
-
-#: ../app/core/core-enums.c:928 ../app/paint/gimpink.c:95
-#: ../app/tools/gimpinktool.c:55
+#: ../app/core/core-enums.c:944
+msgctxt "undo-type"
 msgid "Ink"
 msgstr "墨水"
 
-#: ../app/core/core-enums.c:929
+#: ../app/core/core-enums.c:945
+msgctxt "undo-type"
 msgid "Select foreground"
 msgstr "é??æ?©å??æ?¯"
 
-#: ../app/core/core-enums.c:932
+#: ../app/core/core-enums.c:948
+msgctxt "undo-type"
 msgid "Not undoable"
 msgstr "����"
 
-#: ../app/core/core-enums.c:1196
+#: ../app/core/core-enums.c:1220
+msgctxt "select-criterion"
 msgid "Composite"
 msgstr "å??æ??"
 
-#: ../app/core/core-enums.c:1230
+#: ../app/core/core-enums.c:1221
+msgctxt "select-criterion"
+msgid "Red"
+msgstr "红�"
+
+#: ../app/core/core-enums.c:1222
+msgctxt "select-criterion"
+msgid "Green"
+msgstr "绿�"
+
+#: ../app/core/core-enums.c:1223
+msgctxt "select-criterion"
+msgid "Blue"
+msgstr "è??è?²"
+
+#: ../app/core/core-enums.c:1224
+msgctxt "select-criterion"
+msgid "Hue"
+msgstr "��"
+
+#: ../app/core/core-enums.c:1225
+msgctxt "select-criterion"
+msgid "Saturation"
+msgstr "饱å??度"
+
+#: ../app/core/core-enums.c:1226
+msgctxt "select-criterion"
+msgid "Value"
+msgstr "æ??度"
+
+#: ../app/core/core-enums.c:1255
+msgctxt "message-severity"
 msgid "Message"
 msgstr "��"
 
-#: ../app/core/core-enums.c:1231
+#: ../app/core/core-enums.c:1256
+msgctxt "message-severity"
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../app/core/core-enums.c:1232
+#: ../app/core/core-enums.c:1257
+msgctxt "message-severity"
 msgid "Error"
 msgstr "é??误"
 
-#: ../app/core/core-enums.c:1260
+#: ../app/core/core-enums.c:1286
+msgctxt "color-profile-policy"
 msgid "Ask what to do"
 msgstr "询é?®æ??ä¹?å??"
 
-#: ../app/core/core-enums.c:1261
+#: ../app/core/core-enums.c:1287
+msgctxt "color-profile-policy"
 msgid "Keep embedded profile"
 msgstr "ä¿?æ??å??åµ?ç??é??ç½®æ??件"
 
-#: ../app/core/core-enums.c:1262
+#: ../app/core/core-enums.c:1288
+msgctxt "color-profile-policy"
 msgid "Convert to RGB workspace"
 msgstr "转�为 RGB 工�空�"
 
-#: ../app/core/gimp-contexts.c:155 ../app/core/gimptooloptions.c:231
-#: ../app/gui/session.c:307 ../app/menus/menus.c:433
+#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:232
+#: ../app/gui/session.c:307 ../app/menus/menus.c:441
 #: ../app/widgets/gimpdevices.c:258
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
 msgstr "å? é?¤â??%sâ??失败ï¼?%s"
 
-#: ../app/core/gimp-edit.c:190 ../app/core/gimp-edit.c:326
+#: ../app/core/gimp-edit.c:189 ../app/core/gimp-edit.c:324
 msgid "Pasted Layer"
 msgstr "被ç²?è´´ç??å?¾å±?"
 
-#: ../app/core/gimp-edit.c:464
+#: ../app/core/gimp-edit.c:260
+msgid "Paste"
+msgstr "ç²?è´´"
+
+#: ../app/core/gimp-edit.c:443
+msgid "Clear"
+msgstr "��"
+
+#: ../app/core/gimp-edit.c:462
 msgid "Fill with Foreground Color"
 msgstr "以å??æ?¯è?²å¡«å??"
 
-#: ../app/core/gimp-edit.c:468
+#: ../app/core/gimp-edit.c:466
 msgid "Fill with Background Color"
 msgstr "以è??æ?¯è?²å¡«å??"
 
-#: ../app/core/gimp-edit.c:472
+#: ../app/core/gimp-edit.c:470
 msgid "Fill with White"
 msgstr "以ç?½è?²å¡«å??"
 
-#: ../app/core/gimp-edit.c:476
+#: ../app/core/gimp-edit.c:474
 msgid "Fill with Transparency"
 msgstr "以é??æ??å¡«å??"
 
-#: ../app/core/gimp-edit.c:480
+#: ../app/core/gimp-edit.c:478
 msgid "Fill with Pattern"
 msgstr "以å?¾æ¡?å¡«å??"
 
-#: ../app/core/gimp-edit.c:573
+#: ../app/core/gimp-edit.c:555
+msgid "Cut"
+msgstr "å?ªå??"
+
+#: ../app/core/gimp-edit.c:572
 msgid "Global Buffer"
 msgstr "�����"
 
-#: ../app/core/gimp-gradients.c:61
+#: ../app/core/gimp-gradients.c:60
 msgid "FG to BG (RGB)"
 msgstr "å??æ?¯å?°è??æ?¯(RGB)"
 
-#: ../app/core/gimp-gradients.c:66
+#: ../app/core/gimp-gradients.c:65
 msgid "FG to BG (HSV counter-clockwise)"
 msgstr "å??æ?¯å?°è??æ?¯(HSV é??æ?¶é??è?²è°?)"
 
-#: ../app/core/gimp-gradients.c:71
+#: ../app/core/gimp-gradients.c:70
 msgid "FG to BG (HSV clockwise hue)"
 msgstr "å??æ?¯å?°è??æ?¯(HSV 顺æ?¶é??è?²è°?)"
 
-#: ../app/core/gimp-gradients.c:76
+#: ../app/core/gimp-gradients.c:75
 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
+msgid "tags-locale:C"
+msgstr "tags-locale:zh_CN"
+
 #: ../app/core/gimp-user-install.c:153
 #, c-format
 msgid ""
@@ -5614,275 +6930,315 @@ msgstr "æ­£å?¨ä»?â??%2$sâ??å¤?å?¶æ??件â??%1$sâ??..."
 #: ../app/core/gimp-user-install.c:324 ../app/core/gimp-user-install.c:350
 #, c-format
 msgid "Creating folder '%s'..."
-msgstr "æ­£å?¨å??建æ??件夹â??%sâ??..."
+msgstr "æ­£å?¨å??建â??%sâ??æ??件夹..."
 
 #: ../app/core/gimp-user-install.c:335 ../app/core/gimp-user-install.c:361
 #, c-format
 msgid "Cannot create folder '%s': %s"
-msgstr "æ? æ³?å??建æ??件夹â??%sâ??ï¼?%s"
+msgstr "æ? æ³?å??建â??%sâ??æ??件夹ï¼?%s"
 
-#: ../app/core/gimp.c:543
+#: ../app/core/gimp.c:554
 msgid "Initialization"
 msgstr "å??å§?å??"
 
 #. register all internal procedures
-#: ../app/core/gimp.c:618
+#: ../app/core/gimp.c:633
 msgid "Internal Procedures"
 msgstr "å??é?¨è¿?ç¨?"
 
 #. initialize  the global parasite table
-#: ../app/core/gimp.c:834
+#: ../app/core/gimp.c:851
 msgid "Looking for data files"
 msgstr "æ­£å?¨æ?¥æ?¾æ?°æ?®æ??件"
 
-#: ../app/core/gimp.c:834
+#: ../app/core/gimp.c:851
 msgid "Parasites"
 msgstr "å¯?ç??ç?©"
 
 #. initialize the list of fonts
-#: ../app/core/gimp.c:854
+#: ../app/core/gimp.c:871
 msgid "Fonts (this may take a while)"
 msgstr "å­?ä½?(è¿?å°?è??è´¹ä¸?äº?æ?¶é?´)"
 
 #. initialize the module list
-#: ../app/core/gimp.c:863 ../app/dialogs/preferences-dialog.c:2772
+#: ../app/core/gimp.c:880 ../app/dialogs/preferences-dialog.c:2771
 msgid "Modules"
 msgstr "模å??"
 
-#: ../app/core/gimpbrush-load.c:177
+#. update tag cache
+#: ../app/core/gimp.c:884
+msgid "Updating tag cache"
+msgstr "正����签��"
+
+#: ../app/core/gimpbrush-load.c:176
 #, c-format
 msgid "Could not read %d bytes from '%s': %s"
 msgstr "æ? æ³?ä»?â??%2$sâ??中读å?? %1$d å­?è??ï¼?%3$s"
 
-#: ../app/core/gimpbrush-load.c:197
+#: ../app/core/gimpbrush-load.c:196
 #, c-format
 msgid "Fatal parse error in brush file '%s': Width = 0."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?宽度 = 0ã??"
 
-#: ../app/core/gimpbrush-load.c:206
+#: ../app/core/gimpbrush-load.c:205
 #, c-format
 msgid "Fatal parse error in brush file '%s': Height = 0."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?é«?度 = 0ã??"
 
-#: ../app/core/gimpbrush-load.c:215
+#: ../app/core/gimpbrush-load.c:214
 #, c-format
 msgid "Fatal parse error in brush file '%s': Bytes = 0."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?å­?è??æ?° = 0ã??"
 
-#: ../app/core/gimpbrush-load.c:239
+#: ../app/core/gimpbrush-load.c:238
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown depth %d."
-msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ?ªç?¥æ·±åº¦ %dã??"
+msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ?ªç?¥è?²æ·± %dã??"
 
-#: ../app/core/gimpbrush-load.c:252
+#: ../app/core/gimpbrush-load.c:251
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown version %d."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ?ªç?¥ç??æ?¬ %dã??"
 
-#: ../app/core/gimpbrush-load.c:268 ../app/core/gimpbrush-load.c:388
-#: ../app/core/gimpbrush-load.c:720
+#: ../app/core/gimpbrush-load.c:267 ../app/core/gimpbrush-load.c:387
+#: ../app/core/gimpbrush-load.c:719
 #, c-format
 msgid "Fatal parse error in brush file '%s': File appears truncated."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ??件ç??æ?¥å·²è¢«æ?ªæ?­ã??"
 
-#: ../app/core/gimpbrush-load.c:276 ../app/core/gimpbrushgenerated-load.c:128
-#: ../app/core/gimpbrushpipe-load.c:97
+#: ../app/core/gimpbrush-load.c:275 ../app/core/gimpbrushgenerated-load.c:127
+#: ../app/core/gimpbrushpipe-load.c:96
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "ç?»ç¬?æ??件â??%sâ??中å?«æ??æ? æ??ç?? UTF-8 å­?符串ã??"
 
-#: ../app/core/gimpbrush-load.c:283 ../app/core/gimpitem.c:505
-#: ../app/core/gimppattern-load.c:146
-#: ../app/dialogs/template-options-dialog.c:83
+#: ../app/core/gimpbrush-load.c:282 ../app/core/gimpitem.c:619
+#: ../app/core/gimppattern-load.c:145
+#: ../app/dialogs/template-options-dialog.c:82
 #: ../app/tools/gimpvectortool.c:299
 msgid "Unnamed"
 msgstr "æ?ªå?½å??"
 
-#: ../app/core/gimpbrush-load.c:377
+#: ../app/core/gimpbrush-load.c:376
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': Unsupported brush depth %d\n"
 "GIMP brushes must be GRAY or RGBA."
 msgstr ""
-"ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?ä¸?æ?¯æ??ç??ç?»ç¬?深度 %d\n"
+"ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?ä¸?æ?¯æ??ç??ç?»ç¬?è?²æ·± %d\n"
 "GIMP ç?»ç¬?å¿?须为ç?°åº¦æ?? RGBAã??"
 
-#: ../app/core/gimpbrush-load.c:448
+#: ../app/core/gimpbrush-load.c:447
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': unable to decode abr format version %d."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ? æ³?解ç ? abr æ ¼å¼?ç??æ?¬ %dã??"
 
-#: ../app/core/gimpbrush-load.c:615
+#: ../app/core/gimpbrush-load.c:614
 #, c-format
 msgid "Fatal parse error in brush file '%s': Wide brushes are not supported."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?ä¸?æ?¯æ??宽ç?»ç¬?ã??"
 
-#: ../app/core/gimpbrushgenerated-load.c:87
+#: ../app/core/gimpbrush.c:136
+msgid "Brush Spacing"
+msgstr "����"
+
+#: ../app/core/gimpbrushgenerated-load.c:86
 #, c-format
 msgid "Fatal parse error in brush file '%s': Not a GIMP brush file."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?ä¸?æ?¯ GIMP ç?»ç¬?æ??件ã??"
 
-#: ../app/core/gimpbrushgenerated-load.c:104
+#: ../app/core/gimpbrushgenerated-load.c:103
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
-msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?第%dè¡?æ?ªç?¥ GIMP ç?»ç¬?ç??æ?¬ã??"
+msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?第 %d è¡?æ?ªç?¥ GIMP ç?»ç¬?ç??æ?¬ã??"
 
-#: ../app/core/gimpbrushgenerated-load.c:150
+#: ../app/core/gimpbrushgenerated-load.c:149
 #, c-format
 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
+#: ../app/core/gimpbrushgenerated-load.c:225
 #, c-format
 msgid "Line %d: %s"
 msgstr "第 %d ��%s"
 
-#: ../app/core/gimpbrushgenerated-load.c:228
+#: ../app/core/gimpbrushgenerated-load.c:227
 #, c-format
 msgid "File is truncated in line %d"
 msgstr "æ??件å?¨ç¬¬ %d è¡?被æ?ªæ?­"
 
-#: ../app/core/gimpbrushgenerated-load.c:231
+#: ../app/core/gimpbrushgenerated-load.c:230
 #, c-format
 msgid "Error while reading brush file '%s': %s"
 msgstr "读å??ç?»ç¬?æ??件â??%sâ??æ?¶å?ºé??ï¼?%s"
 
-#: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133
-#: ../app/core/gimpbrushpipe-load.c:223
+#: ../app/core/gimpbrushgenerated.c:128
+msgid "Brush Shape"
+msgstr "��形�"
+
+#: ../app/core/gimpbrushgenerated.c:136
+msgid "Brush Radius"
+msgstr "ç?»ç¬?å??å¾?"
+
+#: ../app/core/gimpbrushgenerated.c:143
+msgid "Brush Spikes"
+msgstr "����"
+
+#: ../app/core/gimpbrushgenerated.c:150
+msgid "Brush Hardness"
+msgstr "��硬度"
+
+#: ../app/core/gimpbrushgenerated.c:158 ../app/paint/gimppaintoptions.c:250
+msgid "Brush Aspect Ratio"
+msgstr "��宽��"
+
+#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:254
+msgid "Brush Angle"
+msgstr "���度"
+
+#: ../app/core/gimpbrushpipe-load.c:112 ../app/core/gimpbrushpipe-load.c:132
+#: ../app/core/gimpbrushpipe-load.c:222
 #, c-format
 msgid "Fatal parse error in brush file '%s': File is corrupt."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ??件已æ??å??ã??"
 
-#: ../app/core/gimpchannel-select.c:60
+#: ../app/core/gimpchannel-select.c:59
 msgctxt "command"
 msgid "Rectangle Select"
 msgstr "ç?©å½¢é??æ?©"
 
-#: ../app/core/gimpchannel-select.c:111
+#: ../app/core/gimpchannel-select.c:110
 msgctxt "command"
 msgid "Ellipse Select"
 msgstr "椭å??é??æ?©"
 
-#: ../app/core/gimpchannel-select.c:165
+#: ../app/core/gimpchannel-select.c:164
 msgctxt "command"
 msgid "Rounded Rectangle Select"
 msgstr "å??è§?ç?©å½¢é??æ?©"
 
-#: ../app/core/gimpchannel-select.c:434
+#: ../app/core/gimpchannel-select.c:433
 msgid "Alpha to Selection"
 msgstr "Alpha å?°é??å?º"
 
-#: ../app/core/gimpchannel-select.c:472
+#: ../app/core/gimpchannel-select.c:471
 #, c-format
 msgid "%s Channel to Selection"
 msgstr "%s é??é??å?°é??å?º"
 
-#: ../app/core/gimpchannel-select.c:520 ../app/tools/gimpfuzzyselecttool.c:80
+#: ../app/core/gimpchannel-select.c:519 ../app/tools/gimpfuzzyselecttool.c:80
 msgctxt "command"
 msgid "Fuzzy Select"
 msgstr "模ç³?é??æ?©"
 
-#: ../app/core/gimpchannel-select.c:567
+#: ../app/core/gimpchannel-select.c:566
 #: ../app/tools/gimpbycolorselecttool.c:82
 msgctxt "command"
 msgid "Select by Color"
 msgstr "æ??é¢?è?²é??æ?©"
 
-#: ../app/core/gimpchannel.c:257
+#: ../app/core/gimpchannel.c:262
 msgid "Channel"
 msgstr "é??é??"
 
-#: ../app/core/gimpchannel.c:258
+#: ../app/core/gimpchannel.c:263
 msgid "Rename Channel"
 msgstr "é??å?½å??é??é??"
 
-#: ../app/core/gimpchannel.c:259
+#: ../app/core/gimpchannel.c:264
 msgid "Move Channel"
 msgstr "移å?¨é??é??"
 
-#: ../app/core/gimpchannel.c:260
+#: ../app/core/gimpchannel.c:265
 msgid "Scale Channel"
 msgstr "缩æ?¾é??é??"
 
-#: ../app/core/gimpchannel.c:261
+#: ../app/core/gimpchannel.c:266
 msgid "Resize Channel"
-msgstr "é??é??æ?¹å??大å°?"
+msgstr "æ?¹å??é??é??大å°?"
 
-#: ../app/core/gimpchannel.c:262
+#: ../app/core/gimpchannel.c:267
 msgid "Flip Channel"
 msgstr "翻转é??é??"
 
-#: ../app/core/gimpchannel.c:263
+#: ../app/core/gimpchannel.c:268
 msgid "Rotate Channel"
 msgstr "æ??转é??é??"
 
-#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:843
+#: ../app/core/gimpchannel.c:269 ../app/core/gimpdrawable-transform.c:842
 msgid "Transform Channel"
 msgstr "å??æ?¢é??é??"
 
-#: ../app/core/gimpchannel.c:265
+#: ../app/core/gimpchannel.c:270
 msgid "Stroke Channel"
 msgstr "å?¾ç?»é??é??"
 
-#: ../app/core/gimpchannel.c:286
+#: ../app/core/gimpchannel.c:292
 msgid "Feather Channel"
 msgstr "ç¾½å??é??é??"
 
-#: ../app/core/gimpchannel.c:287
+#: ../app/core/gimpchannel.c:293
 msgid "Sharpen Channel"
 msgstr "é??å??é??é??"
 
-#: ../app/core/gimpchannel.c:288
+#: ../app/core/gimpchannel.c:294
 msgid "Clear Channel"
 msgstr "æ¸?é?¤é??é??"
 
-#: ../app/core/gimpchannel.c:289
+#: ../app/core/gimpchannel.c:295
 msgid "Fill Channel"
 msgstr "å¡«å??é??é??"
 
-#: ../app/core/gimpchannel.c:290
+#: ../app/core/gimpchannel.c:296
 msgid "Invert Channel"
 msgstr "å??转é??é??"
 
-#: ../app/core/gimpchannel.c:291
+#: ../app/core/gimpchannel.c:297
 msgid "Border Channel"
 msgstr "å??é??é??è¾¹ç??"
 
-#: ../app/core/gimpchannel.c:292
+#: ../app/core/gimpchannel.c:298
 msgid "Grow Channel"
-msgstr "é??é??å¢?é?¿"
+msgstr "å¢?é?¿é??é??"
 
-#: ../app/core/gimpchannel.c:293
+#: ../app/core/gimpchannel.c:299
 msgid "Shrink Channel"
-msgstr "é??é??æ?¶ç¼©"
+msgstr "æ?¶ç¼©é??é??"
 
-#: ../app/core/gimpchannel.c:710
-#, c-format
+#: ../app/core/gimpchannel.c:712
 msgid "Cannot stroke empty channel."
 msgstr "æ? æ³?å?¾ç?»ç©ºé??é??ã??"
 
-#: ../app/core/gimpchannel.c:1631
+#: ../app/core/gimpchannel.c:1698
 msgid "Set Channel Color"
 msgstr "设置é??é??é¢?è?²"
 
-#: ../app/core/gimpchannel.c:1679
+#: ../app/core/gimpchannel.c:1764
 msgid "Set Channel Opacity"
 msgstr "设置é??é??ä¸?é??æ??度"
 
-#: ../app/core/gimpchannel.c:1747 ../app/core/gimpselection.c:520
+#: ../app/core/gimpchannel.c:1872 ../app/core/gimpselection.c:523
 msgid "Selection Mask"
 msgstr "é??å?ºè??æ?¿"
 
-#: ../app/core/gimpdata.c:526 ../app/core/gimptoolpresets.c:279
+#: ../app/core/gimpcontext.c:593 ../app/tools/gimppaintoptions-gui.c:175
+msgid "Opacity"
+msgstr "ä¸?é??æ??度"
+
+#: ../app/core/gimpcontext.c:601
+msgid "Paint Mode"
+msgstr "��模�"
+
+#: ../app/core/gimpdata.c:569 ../app/core/gimptoolpresets.c:278
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "æ? æ³?å? é?¤â??%sâ??ï¼?%s"
 
-#: ../app/core/gimpdatafactory.c:415 ../app/core/gimpdatafactory.c:575
-#: ../app/core/gimpdatafactory.c:595
+#: ../app/core/gimpdatafactory.c:436 ../app/core/gimpdatafactory.c:596
+#: ../app/core/gimpdatafactory.c:616
 #, c-format
 msgid ""
 "Failed to save data:\n"
@@ -5893,21 +7249,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdatafactory.c:494 ../app/core/gimpdatafactory.c:497
-#: ../app/core/gimpitem.c:312 ../app/core/gimpitem.c:315
+#: ../app/core/gimpdatafactory.c:515 ../app/core/gimpdatafactory.c:518
+#: ../app/core/gimpitem.c:387 ../app/core/gimpitem.c:390
 msgid "copy"
 msgstr "��"
 
-#: ../app/core/gimpdatafactory.c:506 ../app/core/gimpitem.c:324
+#: ../app/core/gimpdatafactory.c:527 ../app/core/gimpitem.c:399
 #, c-format
 msgid "%s copy"
 msgstr "%s��"
 
-#: ../app/core/gimpdatafactory.c:576
+#: ../app/core/gimpdatafactory.c:597
 msgid "You don't have a writable data folder configured."
 msgstr "æ?¨æ²¡æ??é??ç½®ä¸?个å?¯å??å?¥ç??æ?°æ?®æ??件夹ã??"
 
-#: ../app/core/gimpdatafactory.c:751
+#: ../app/core/gimpdatafactory.c:796
 #, c-format
 msgid ""
 "Failed to load data:\n"
@@ -5918,21 +7274,20 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdrawable-blend.c:245 ../app/tools/gimpblendtool.c:107
+#: ../app/core/gimpdrawable-blend.c:244 ../app/tools/gimpblendtool.c:108
 msgid "Blend"
 msgstr "æ··å??å¡«å??"
 
-#: ../app/core/gimpdrawable-brightness-contrast.c:76
+#: ../app/core/gimpdrawable-brightness-contrast.c:70
 msgid "Brightness_Contrast"
 msgstr "亮度-对�度"
 
-#: ../app/core/gimpdrawable-brightness-contrast.c:87
-#: ../app/tools/gimpbrightnesscontrasttool.c:111
+#: ../app/core/gimpdrawable-brightness-contrast.c:81
+#: ../app/tools/gimpbrightnesscontrasttool.c:110
 msgid "Brightness-Contrast"
 msgstr "亮度-对�度"
 
 #: ../app/core/gimpdrawable-bucket-fill.c:91
-#, c-format
 msgid "No patterns available for this operation."
 msgstr "没æ??å?¯ä¾?æ­¤æ??ä½?使ç?¨ç??å?¾æ¡?ã??"
 
@@ -5941,240 +7296,247 @@ msgctxt "command"
 msgid "Bucket Fill"
 msgstr "æ²¹æ¼?桶填å??"
 
-#: ../app/core/gimpdrawable-color-balance.c:80
-#: ../app/core/gimpdrawable-color-balance.c:90
+#: ../app/core/gimpdrawable-color-balance.c:79
+#: ../app/core/gimpdrawable-color-balance.c:89
 #: ../app/tools/gimpcolorbalancetool.c:94
 msgid "Color Balance"
 msgstr "�彩平衡"
 
-#: ../app/core/gimpdrawable-colorize.c:73
-#: ../app/core/gimpdrawable-colorize.c:85 ../app/tools/gimpcolorizetool.c:90
+#: ../app/core/gimpdrawable-colorize.c:72
+#: ../app/core/gimpdrawable-colorize.c:84 ../app/tools/gimpcolorizetool.c:90
 msgid "Colorize"
 msgstr "å??è?²å??"
 
-#: ../app/core/gimpdrawable-curves.c:165 ../app/core/gimpdrawable-curves.c:182
+#: ../app/core/gimpdrawable-curves.c:164 ../app/core/gimpdrawable-curves.c:181
 #: ../app/tools/gimpcurvestool.c:140
 msgid "Curves"
 msgstr "�线"
 
-#: ../app/core/gimpdrawable-desaturate.c:71
-#: ../app/core/gimpdrawable-desaturate.c:77
+#: ../app/core/gimpdrawable-desaturate.c:70
+#: ../app/core/gimpdrawable-desaturate.c:76
 #: ../app/tools/gimpdesaturatetool.c:77
 msgid "Desaturate"
 msgstr "��"
 
-#: ../app/core/gimpdrawable-equalize.c:53
+#: ../app/core/gimpdrawable-equalize.c:52
 msgid "Equalize"
 msgstr "å??å??"
 
-#: ../app/core/gimpdrawable-foreground-extract.c:138
+#: ../app/core/gimpdrawable-foreground-extract.c:133
 msgid "Foreground Extraction"
 msgstr "å??æ?¯æ??å??"
 
-#: ../app/core/gimpdrawable-hue-saturation.c:78
+#: ../app/core/gimpdrawable-hue-saturation.c:77
 #: ../app/tools/gimphuesaturationtool.c:102
 msgid "Hue-Saturation"
 msgstr "è?²è°?-饱å??度"
 
-#: ../app/core/gimpdrawable-hue-saturation.c:88
+#: ../app/core/gimpdrawable-hue-saturation.c:87
 msgid "Hue_Saturation"
-msgstr "è?²ç?¸-饱å??度(_S)"
+msgstr "è?²è°?-饱å??度(_S)"
 
-#: ../app/core/gimpdrawable-invert.c:60 ../app/core/gimpdrawable-invert.c:68
+#: ../app/core/gimpdrawable-invert.c:54 ../app/core/gimpdrawable-invert.c:62
 msgid "Invert"
 msgstr "å??转"
 
-#: ../app/core/gimpdrawable-levels.c:154 ../app/core/gimpdrawable-levels.c:170
+#: ../app/core/gimpdrawable-levels.c:153 ../app/core/gimpdrawable-levels.c:169
 #: ../app/tools/gimplevelstool.c:150
 msgid "Levels"
 msgstr "��"
 
-#: ../app/core/gimpdrawable-offset.c:316
+#: ../app/core/gimpdrawable-offset.c:315
 msgid "Offset Drawable"
 msgstr "�移��"
 
-#: ../app/core/gimpdrawable-posterize.c:70
-#: ../app/core/gimpdrawable-posterize.c:80 ../app/tools/gimpposterizetool.c:84
+#: ../app/core/gimpdrawable-posterize.c:69
+#: ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84
 msgid "Posterize"
-msgstr "æµ·æ?¥æ??æ??"
+msgstr "è?²è°?å??离"
 
-#: ../app/core/gimpdrawable-stroke.c:324
+#: ../app/core/gimpdrawable-stroke.c:435
 msgid "Render Stroke"
 msgstr "渲æ??å?¾ç?»"
 
-#: ../app/core/gimpdrawable-threshold.c:71
-#: ../app/core/gimpdrawable-threshold.c:82 ../app/tools/gimpthresholdtool.c:90
+#: ../app/core/gimpdrawable-threshold.c:70
+#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpthresholdtool.c:90
 msgid "Threshold"
 msgstr "é??å?¼"
 
-#: ../app/core/gimpdrawable-transform.c:629 ../app/tools/gimpfliptool.c:116
+#: ../app/core/gimpdrawable-transform.c:566
+msgid "Transform"
+msgstr "å??æ?¢"
+
+#: ../app/core/gimpdrawable-transform.c:628 ../app/tools/gimpfliptool.c:116
 msgctxt "command"
 msgid "Flip"
 msgstr "翻转"
 
-#: ../app/core/gimpdrawable-transform.c:716 ../app/tools/gimprotatetool.c:121
+#: ../app/core/gimpdrawable-transform.c:715 ../app/tools/gimprotatetool.c:121
 msgctxt "command"
 msgid "Rotate"
 msgstr "æ??转"
 
-#: ../app/core/gimpdrawable-transform.c:841 ../app/core/gimplayer.c:255
+#: ../app/core/gimpdrawable-transform.c:840 ../app/core/gimplayer.c:256
 msgid "Transform Layer"
 msgstr "å??æ?¢å?¾å±?"
 
-#: ../app/core/gimpdrawable-transform.c:856
+#: ../app/core/gimpdrawable-transform.c:855
 msgid "Transformation"
 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:70 ../app/core/gimpgradient-load.c:95
+#: ../app/core/gimpgradient-load.c:116 ../app/core/gimpgradient-load.c:167
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Read error in line %d."
 msgstr "æ¸?å??æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?第 %d è¡?读å?¥å?ºé??ã??"
 
-#: ../app/core/gimpgradient-load.c:81
+#: ../app/core/gimpgradient-load.c:80
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file."
 msgstr "æ¸?å??æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?ä¸?æ?¯ GIMP æ¸?å??æ??件ã??"
 
-#: ../app/core/gimpgradient-load.c:109
+#: ../app/core/gimpgradient-load.c:108
 #, c-format
 msgid "Invalid UTF-8 string in gradient file '%s'."
 msgstr "æ¸?å??æ??件â??%sâ??中å?«æ??æ? æ??ç?? UTF-8 å­?符串ã??"
 
-#: ../app/core/gimpgradient-load.c:136
+#: ../app/core/gimpgradient-load.c:135
 #, c-format
 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:217 ../app/core/gimpgradient-load.c:228
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d."
 msgstr "æ¸?å??æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?第 %d 段å?¨ç¬¬ %d è¡?å·²æ??å??ã??"
 
-#: ../app/core/gimpgradient-load.c:241 ../app/core/gimpgradient-load.c:255
+#: ../app/core/gimpgradient-load.c:240 ../app/core/gimpgradient-load.c:254
 #, c-format
 msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1."
-msgstr "æ¸?å??æ??件 â??%sâ?? æ??å??ï¼?段ç??è??å?´ä¸?å?¨ 0-1 é?´ã??"
+msgstr "æ¸?å??æ??件â??%sâ??æ??å??ï¼?段ç??è??å?´ä¸?å?¨ 0-1 é?´ã??"
 
-#: ../app/core/gimpgradient-load.c:334
+#: ../app/core/gimpgradient-load.c:333
 #, c-format
 msgid "No linear gradients found in '%s'"
 msgstr "â??%sâ??中æ?ªæ?¾å?°çº¿æ?§æ¸?å??"
 
-#: ../app/core/gimpgradient-load.c:344
+#: ../app/core/gimpgradient-load.c:343
 #, c-format
 msgid "Failed to import gradients from '%s': %s"
 msgstr "æ? æ³?ä»?â??%sâ??导å?¥æ¸?å??ï¼?%s"
 
-#: ../app/core/gimpgrid.c:84
+#: ../app/core/gimpgrid.c:83
 msgid "Line style used for the grid."
 msgstr "ç½?格使ç?¨ç??线å??ã??"
 
-#: ../app/core/gimpgrid.c:90
+#: ../app/core/gimpgrid.c:89
 msgid "The foreground color of the grid."
 msgstr "ç½?æ ¼ç??å??æ?¯è?²ã??"
 
-#: ../app/core/gimpgrid.c:95
+#: ../app/core/gimpgrid.c:94
 msgid ""
 "The background color of the grid; only used in double dashed line style."
 msgstr "ç½?æ ¼ç??è??æ?¯è?²ï¼?å?ªç?¨äº?å??è??线线å??ã??"
 
-#: ../app/core/gimpgrid.c:101
+#: ../app/core/gimpgrid.c:100
 msgid "Horizontal spacing of grid lines."
 msgstr "ç½?æ ¼ç??æ°´å¹³é?´è·?ã??"
 
-#: ../app/core/gimpgrid.c:106
+#: ../app/core/gimpgrid.c:105
 msgid "Vertical spacing of grid lines."
 msgstr "ç½?æ ¼ç??å??ç?´é?´è·?ã??"
 
-#: ../app/core/gimpgrid.c:115
+#: ../app/core/gimpgrid.c:114
 msgid ""
 "Horizontal offset of the first grid line; this may be a negative number."
 msgstr "第ä¸?æ?¡ç½?格线ç??æ°´å¹³ä½?移ï¼?å?¯ä»¥æ?¯è´?æ?°ã??"
 
-#: ../app/core/gimpgrid.c:122
+#: ../app/core/gimpgrid.c:121
 msgid "Vertical offset of the first grid line; this may be a negative number."
 msgstr "第ä¸?æ?¡ç½?格线ç??å??ç?´ä½?移ï¼?å?¯ä»¥æ?¯è´?æ?°ã??"
 
-#: ../app/core/gimpimage-arrange.c:143
+#: ../app/core/gimpimage-arrange.c:142
 msgid "Arrange Objects"
 msgstr "æ?´ç??对象"
 
-#: ../app/core/gimpimage-colormap.c:63
+#: ../app/core/gimpimage-colormap.c:62
 msgid "Set Colormap"
 msgstr "设置��表"
 
-#: ../app/core/gimpimage-colormap.c:118
+#: ../app/core/gimpimage-colormap.c:117
 msgid "Change Colormap entry"
 msgstr "æ?¹å??é¢?è?²è¡¨é¡¹"
 
-#: ../app/core/gimpimage-colormap.c:138
+#: ../app/core/gimpimage-colormap.c:137
 msgid "Add Color to Colormap"
 msgstr "添������表"
 
-#: ../app/core/gimpimage-convert.c:792
-#, c-format
+#: ../app/core/gimpimage-convert.c:791
 msgid "Cannot convert image: palette is empty."
 msgstr "æ? æ³?转æ?¢å?¾å??ï¼?è?²æ?¿ä¸ºç©ºã??"
 
-#: ../app/core/gimpimage-convert.c:806
+#: ../app/core/gimpimage-convert.c:805
 msgid "Convert Image to RGB"
 msgstr "å°?å?¾å??转æ?¢ä¸º RGB"
 
-#: ../app/core/gimpimage-convert.c:810
+#: ../app/core/gimpimage-convert.c:809
 msgid "Convert Image to Grayscale"
 msgstr "å°?å?¾å??转æ?¢ä¸ºç?°åº¦"
 
-#: ../app/core/gimpimage-convert.c:814
+#: ../app/core/gimpimage-convert.c:813
 msgid "Convert Image to Indexed"
 msgstr "å°?å?¾å??转æ?¢ä¸ºç´¢å¼?é¢?è?²"
 
-#: ../app/core/gimpimage-convert.c:896
+#: ../app/core/gimpimage-convert.c:892
 msgid "Converting to indexed colors (stage 2)"
 msgstr "正�转�为索���(第 2 �段)"
 
-#: ../app/core/gimpimage-convert.c:941
+#: ../app/core/gimpimage-convert.c:937
 msgid "Converting to indexed colors (stage 3)"
 msgstr "正�转�为索���(第 3 �段)"
 
-#: ../app/core/gimpimage-crop.c:130
+#: ../app/core/gimpimage-crop.c:128
 msgctxt "command"
 msgid "Crop Image"
 msgstr "å?ªè£?å?¾å??"
 
-#: ../app/core/gimpimage-crop.c:133 ../app/core/gimpimage-resize.c:90
+#: ../app/core/gimpimage-crop.c:131 ../app/core/gimpimage-resize.c:89
 msgid "Resize Image"
 msgstr "å?¾å??æ?¹å??大å°?"
 
-#: ../app/core/gimpimage-guides.c:51
+#: ../app/core/gimpimage-grid.c:57 ../app/dialogs/grid-dialog.c:152
+msgid "Grid"
+msgstr "ç½?æ ¼"
+
+#: ../app/core/gimpimage-guides.c:50
 msgid "Add Horizontal Guide"
 msgstr "æ·»å? æ°´å¹³å??è??线"
 
-#: ../app/core/gimpimage-guides.c:74
+#: ../app/core/gimpimage-guides.c:73
 msgid "Add Vertical Guide"
 msgstr "æ·»å? å??ç?´å??è??线"
 
-#: ../app/core/gimpimage-guides.c:115 ../app/tools/gimpmovetool.c:564
+#: ../app/core/gimpimage-guides.c:114 ../app/tools/gimpmovetool.c:566
 msgid "Remove Guide"
 msgstr "å? é?¤å??è??线"
 
-#: ../app/core/gimpimage-guides.c:140
+#: ../app/core/gimpimage-guides.c:139
 msgid "Move Guide"
 msgstr "移å?¨å??è??线"
 
-#: ../app/core/gimpimage-item-list.c:53
+#: ../app/core/gimpimage-item-list.c:51
 msgid "Translate Items"
 msgstr "翻�项�"
 
-#: ../app/core/gimpimage-item-list.c:80
+#: ../app/core/gimpimage-item-list.c:78
 msgid "Flip Items"
 msgstr "翻转项�"
 
-#: ../app/core/gimpimage-item-list.c:107
+#: ../app/core/gimpimage-item-list.c:105
 msgid "Rotate Items"
 msgstr "æ??转项ç?®"
 
-#: ../app/core/gimpimage-item-list.c:137
+#: ../app/core/gimpimage-item-list.c:135
 msgid "Transform Items"
 msgstr "å??æ?¢é¡¹ç?®"
 
@@ -6195,266 +7557,260 @@ msgid "Merge Visible Paths"
 msgstr "å??并å?¯è§?è·¯å¾?"
 
 #: ../app/core/gimpimage-merge.c:289
-#, c-format
 msgid "Not enough visible paths for a merge. There must be at least two."
 msgstr "没æ??足å¤?å¤?ç??å?¯è§?è·¯å¾?å?¯å??并ã??è?³å°?é??è¦?两个ã??"
 
-#: ../app/core/gimpimage-quick-mask.c:82
+#: ../app/core/gimpimage-quick-mask.c:81
 msgid "Enable Quick Mask"
 msgstr "å?¯ç?¨å¿«é??è??æ?¿"
 
-#: ../app/core/gimpimage-quick-mask.c:132
+#: ../app/core/gimpimage-quick-mask.c:131
 msgid "Disable Quick Mask"
 msgstr "ç¦?ç?¨å¿«é??è??æ?¿"
 
-#: ../app/core/gimpimage-sample-points.c:53
+#: ../app/core/gimpimage-sample-points.c:52
 msgid "Add Sample Point"
 msgstr "æ·»å? é??æ ·ç?¹"
 
-#: ../app/core/gimpimage-sample-points.c:98 ../app/tools/gimpcolortool.c:429
+#: ../app/core/gimpimage-sample-points.c:97 ../app/tools/gimpcolortool.c:429
 msgid "Remove Sample Point"
 msgstr "å? é?¤é??æ ·ç?¹"
 
-#: ../app/core/gimpimage-sample-points.c:135
+#: ../app/core/gimpimage-sample-points.c:134
 msgid "Move Sample Point"
 msgstr "移å?¨é??æ ·ç?¹"
 
-#: ../app/core/gimpimage-undo-push.c:863
+#: ../app/core/gimpimage-undo-push.c:826
 #, c-format
 msgid "Can't undo %s"
 msgstr "���� %s"
 
-#: ../app/core/gimpimage.c:1506
+#: ../app/core/gimpimage.c:1525
 msgid "Change Image Resolution"
 msgstr "æ?¹å??å?¾å??å??辨ç??"
 
-#: ../app/core/gimpimage.c:1550
+#: ../app/core/gimpimage.c:1569
 msgid "Change Image Unit"
 msgstr "æ?¹å??å?¾å??å??ä½?"
 
-#: ../app/core/gimpimage.c:2384
+#: ../app/core/gimpimage.c:2429
 msgid "Attach Parasite to Image"
 msgstr "æ·»å? å¯?ç??ç?©å?°å?¾å??"
 
-#: ../app/core/gimpimage.c:2422
+#: ../app/core/gimpimage.c:2467
 msgid "Remove Parasite from Image"
 msgstr "ä»?å?¾å??å? é?¤å¯?ç??ç?©"
 
-#: ../app/core/gimpimage.c:2875
+#: ../app/core/gimpimage.c:2973
 msgid "Add Layer"
 msgstr "添���"
 
-#: ../app/core/gimpimage.c:2935 ../app/core/gimpimage.c:2948
+#: ../app/core/gimpimage.c:3039 ../app/core/gimpimage.c:3062
 msgid "Remove Layer"
 msgstr "����"
 
+#: ../app/core/gimpimage.c:3055
+msgid "Remove Floating Selection"
+msgstr "å? é?¤æµ®å?¨é??å?º"
+
 # Do not translate because most file systems doesn't support chinese!
-#: ../app/core/gimpimage.c:3092
+#: ../app/core/gimpimage.c:3209
 msgid "Layer cannot be raised higher."
 msgstr "å?¾å±?æ? æ³?å??å??é«?ã??"
 
-#: ../app/core/gimpimage.c:3097
+#: ../app/core/gimpimage.c:3214
 msgid "Raise Layer"
 msgstr "å??é«?å?¾å±?"
 
-#: ../app/core/gimpimage.c:3116
+#: ../app/core/gimpimage.c:3234
 msgid "Layer cannot be lowered more."
 msgstr "å?¾å±?æ? æ³?å??é??ä½?ã??"
 
-#: ../app/core/gimpimage.c:3121
+#: ../app/core/gimpimage.c:3239
 msgid "Lower Layer"
 msgstr "é??ä½?å?¾å±?"
 
-#: ../app/core/gimpimage.c:3132
+#: ../app/core/gimpimage.c:3250
 msgid "Raise Layer to Top"
 msgstr "��移�顶端"
 
-#: ../app/core/gimpimage.c:3147
+#: ../app/core/gimpimage.c:3265
 msgid "Lower Layer to Bottom"
 msgstr "��移��端"
 
-#: ../app/core/gimpimage.c:3209
+#: ../app/core/gimpimage.c:3318
 msgid "Add Channel"
 msgstr "æ·»å? é??é??"
 
-#: ../app/core/gimpimage.c:3252 ../app/core/gimpimage.c:3263
+#: ../app/core/gimpimage.c:3368 ../app/core/gimpimage.c:3381
 msgid "Remove Channel"
 msgstr "å? é?¤é??é??"
 
-#: ../app/core/gimpimage.c:3312
+#: ../app/core/gimpimage.c:3440
 msgid "Channel cannot be raised higher."
 msgstr "é??é??æ? æ³?å??å??é«?ã??"
 
-#: ../app/core/gimpimage.c:3317
+#: ../app/core/gimpimage.c:3445
 msgid "Raise Channel"
 msgstr "å??é«?é??é??"
 
-#: ../app/core/gimpimage.c:3328
+#: ../app/core/gimpimage.c:3456
 msgid "Raise Channel to Top"
 msgstr "é??é??移è?³é¡¶ç«¯"
 
-#: ../app/core/gimpimage.c:3348
+#: ../app/core/gimpimage.c:3477
 msgid "Channel cannot be lowered more."
 msgstr "é??é??æ? æ³?å??é??ä½?ã??"
 
-#: ../app/core/gimpimage.c:3353
+#: ../app/core/gimpimage.c:3482
 msgid "Lower Channel"
 msgstr "é??ä½?é??é??"
 
-#: ../app/core/gimpimage.c:3368
+#: ../app/core/gimpimage.c:3497
 msgid "Lower Channel to Bottom"
 msgstr "é??é??移è?³åº?端"
 
-#: ../app/core/gimpimage.c:3432
+#: ../app/core/gimpimage.c:3551
 msgid "Add Path"
 msgstr "添�路�"
 
-#: ../app/core/gimpimage.c:3476
+#: ../app/core/gimpimage.c:3595
 msgid "Remove Path"
 msgstr "��路�"
 
-#: ../app/core/gimpimage.c:3522
+#: ../app/core/gimpimage.c:3648
 msgid "Path cannot be raised higher."
 msgstr "è·¯å¾?æ? æ³?å??å??é«?ã??"
 
-#: ../app/core/gimpimage.c:3527
+#: ../app/core/gimpimage.c:3653
 msgid "Raise Path"
 msgstr "å??é«?è·¯å¾?"
 
-#: ../app/core/gimpimage.c:3538
+#: ../app/core/gimpimage.c:3664
 msgid "Raise Path to Top"
 msgstr "路�移�顶端"
 
-#: ../app/core/gimpimage.c:3557
+#: ../app/core/gimpimage.c:3684
 msgid "Path cannot be lowered more."
 msgstr "è·¯å¾?æ? æ³?å??é??ä½?ã??"
 
-#: ../app/core/gimpimage.c:3562
+#: ../app/core/gimpimage.c:3689
 msgid "Lower Path"
 msgstr "é??ä½?è·¯å¾?"
 
-#: ../app/core/gimpimage.c:3577
+#: ../app/core/gimpimage.c:3704
 msgid "Lower Path to Bottom"
 msgstr "路�移��端"
 
-#: ../app/core/gimpimagefile.c:528 ../app/dialogs/preferences-dialog.c:1727
+#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1726
 msgid "Folder"
 msgstr "æ??件夹"
 
-#: ../app/core/gimpimagefile.c:533
+#: ../app/core/gimpimagefile.c:539
 msgid "Special File"
 msgstr "ç?¹æ®?æ??件"
 
-#: ../app/core/gimpimagefile.c:549
+#: ../app/core/gimpimagefile.c:555
 msgid "Remote File"
 msgstr "è¿?ç¨?æ??件"
 
-#: ../app/core/gimpimagefile.c:568
+#: ../app/core/gimpimagefile.c:574
 msgid "Click to create preview"
 msgstr "ç?¹å?»ç??æ??é¢?è§?"
 
-#: ../app/core/gimpimagefile.c:574
+#: ../app/core/gimpimagefile.c:580
 msgid "Loading preview..."
 msgstr "正��载�� ..."
 
-#: ../app/core/gimpimagefile.c:580
+#: ../app/core/gimpimagefile.c:586
 msgid "Preview is out of date"
 msgstr "��已���"
 
-#: ../app/core/gimpimagefile.c:586
+#: ../app/core/gimpimagefile.c:592
 msgid "Cannot create preview"
 msgstr "æ? æ³?ç??æ??é¢?è§?"
 
-#: ../app/core/gimpimagefile.c:596
+#: ../app/core/gimpimagefile.c:602
 msgid "(Preview may be out of date)"
-msgstr "(��已���)"
+msgstr "(����已���)"
 
 #. pixel size
-#: ../app/core/gimpimagefile.c:605 ../app/widgets/gimpimagepropview.c:446
-#: ../app/widgets/gimpsizebox.c:438 ../app/widgets/gimptemplateeditor.c:566
-#, fuzzy, c-format
-#| msgid "%d Ã? %d pixel"
+#: ../app/core/gimpimagefile.c:611 ../app/widgets/gimpimagepropview.c:446
+#: ../app/widgets/gimpsizebox.c:437 ../app/widgets/gimptemplateeditor.c:565
+#, c-format
 msgid "%d Ã? %d pixel"
 msgid_plural "%d Ã? %d pixels"
 msgstr[0] "%d x %d å??ç´ "
-msgstr[1] "%d x %d å??ç´ "
 
-#: ../app/core/gimpimagefile.c:628 ../app/display/gimpdisplayshell-title.c:325
-#, fuzzy, c-format
-#| msgid "%d layer"
+#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:316
+#, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
 msgstr[0] "%d 个��"
-msgstr[1] "%d 个��"
 
-#: ../app/core/gimpimagefile.c:675
+#: ../app/core/gimpimagefile.c:681
 #, c-format
 msgid "Could not open thumbnail '%s': %s"
 msgstr "æ? æ³?æ??å¼?缩ç?¥å?¾æ??件â??%sâ??ï¼?%s"
 
-#: ../app/core/gimpitem.c:1138
+#: ../app/core/gimpitem.c:1349
 msgid "Attach Parasite"
 msgstr "æ·»å? å¯?ç??ç?©"
 
-#: ../app/core/gimpitem.c:1148
+#: ../app/core/gimpitem.c:1359
 msgid "Attach Parasite to Item"
 msgstr "æ·»å? å¯?ç??ç?©å?°é¡¹ç?®"
 
-#: ../app/core/gimpitem.c:1190 ../app/core/gimpitem.c:1197
+#: ../app/core/gimpitem.c:1401 ../app/core/gimpitem.c:1408
 msgid "Remove Parasite from Item"
 msgstr "ä»?项ç?®å? é?¤å¯?ç??ç?©"
 
-#: ../app/core/gimplayer-floating-sel.c:99
-msgid "Remove Floating Selection"
-msgstr "å? é?¤æµ®å?¨é??å?º"
-
-#: ../app/core/gimplayer-floating-sel.c:130
+#: ../app/core/gimplayer-floating-sel.c:98
 msgid "Anchor Floating Selection"
 msgstr "å?ºå®?æµ®å?¨é??å?º"
 
-#: ../app/core/gimplayer-floating-sel.c:205 ../app/core/gimplayer.c:643
-#, c-format
+#: ../app/core/gimplayer-floating-sel.c:131 ../app/core/gimplayer.c:674
 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:211
+#: ../app/core/gimplayer-floating-sel.c:138
 msgid "Floating Selection to Layer"
 msgstr "æµ®å?¨é??å?ºå?°å?¾å±?"
 
-#: ../app/core/gimplayer.c:248 ../app/tools/tools-enums.c:209
+#: ../app/core/gimplayer.c:249
 msgid "Layer"
 msgstr "��"
 
-#: ../app/core/gimplayer.c:249
+#: ../app/core/gimplayer.c:250
 msgid "Rename Layer"
 msgstr "é??å?½å??å?¾å±?"
 
-#: ../app/core/gimplayer.c:250 ../app/pdb/layer-cmds.c:434
-#: ../app/pdb/layer-cmds.c:470
+#: ../app/core/gimplayer.c:251 ../app/pdb/layer-cmds.c:433
+#: ../app/pdb/layer-cmds.c:471
 msgid "Move Layer"
 msgstr "移���"
 
-#: ../app/core/gimplayer.c:252
+#: ../app/core/gimplayer.c:253
 msgid "Resize Layer"
-msgstr "å?¾å±?æ?¹å??大å°?"
+msgstr "æ?¹å??å?¾å±?大å°?"
 
-#: ../app/core/gimplayer.c:253
+#: ../app/core/gimplayer.c:254
 msgid "Flip Layer"
 msgstr "翻转��"
 
-#: ../app/core/gimplayer.c:254
+#: ../app/core/gimplayer.c:255
 msgid "Rotate Layer"
 msgstr "æ??转å?¾å±?"
 
-#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1329
-#: ../app/core/gimplayermask.c:208
+#: ../app/core/gimplayer.c:412 ../app/core/gimplayer.c:1369
+#: ../app/core/gimplayermask.c:211
 #, c-format
 msgid "%s mask"
 msgstr "%sè??æ?¿"
 
-#: ../app/core/gimplayer.c:446
+#: ../app/core/gimplayer.c:452
 #, c-format
 msgid ""
 "Floating Selection\n"
@@ -6463,37 +7819,35 @@ msgstr ""
 "æµ®å?¨é??å?º\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:1265
-#, c-format
+#: ../app/core/gimplayer.c:1293
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "æ? æ³?æ·»å? å?¾å±?è??æ?¿ï¼?å? ä¸ºå·²æ??ä¸?个ã??"
 
-#: ../app/core/gimplayer.c:1276
-#, c-format
+#: ../app/core/gimplayer.c:1304
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr "æ? æ³?æ·»å? è·?æ??å®?å?¾å±?尺寸ä¸?å??ç??å?¾å±?è??æ?¿ã??"
 
-#: ../app/core/gimplayer.c:1384
+#: ../app/core/gimplayer.c:1424
 msgid "Transfer Alpha to Mask"
 msgstr "转移 Alpha å?°è??æ?¿"
 
-#: ../app/core/gimplayer.c:1556 ../app/core/gimplayermask.c:235
+#: ../app/core/gimplayer.c:1599 ../app/core/gimplayermask.c:238
 msgid "Apply Layer Mask"
 msgstr "åº?ç?¨å?¾å±?è??æ?¿"
 
-#: ../app/core/gimplayer.c:1557
+#: ../app/core/gimplayer.c:1600
 msgid "Delete Layer Mask"
 msgstr "å? é?¤å?¾å±?è??æ?¿"
 
-#: ../app/core/gimplayer.c:1669
+#: ../app/core/gimplayer.c:1719
 msgid "Add Alpha Channel"
 msgstr "æ·»å?  Alpha é??é??"
 
-#: ../app/core/gimplayer.c:1723
+#: ../app/core/gimplayer.c:1773
 msgid "Remove Alpha Channel"
 msgstr "å? é?¤ Alpha é??é??"
 
-#: ../app/core/gimplayer.c:1745
+#: ../app/core/gimplayer.c:1793
 msgid "Layer to Image Size"
 msgstr "å?¾å±?å?°å?¾å??大å°?"
 
@@ -6501,34 +7855,33 @@ msgstr "å?¾å±?å?°å?¾å??大å°?"
 msgid "Move Layer Mask"
 msgstr "移å?¨å?¾å±?è??æ?¿"
 
-#. reject renaming, layer masks are always named "<layer name> mask"
-#: ../app/core/gimplayermask.c:160
+#: ../app/core/gimplayermask.c:161
 #, c-format
 msgid "Cannot rename layer masks."
 msgstr "æ? æ³?é??å?½å??å?¾å±?è??ç??"
 
-#: ../app/core/gimplayermask.c:303
+#: ../app/core/gimplayermask.c:306
 msgid "Show Layer Mask"
 msgstr "æ?¾ç¤ºå?¾å±?è??æ?¿"
 
-#: ../app/core/gimppalette-import.c:428
+#: ../app/core/gimppalette-import.c:427
 #, c-format
 msgid "Index %d"
 msgstr "索� %d"
 
-#: ../app/core/gimppalette-import.c:532
+#: ../app/core/gimppalette-import.c:531
 #, c-format
 msgid "Unknown type of palette file: %s"
 msgstr "æ?ªç?¥ç±»å??ç??è?²æ?¿æ??件ï¼?%s"
 
-#: ../app/core/gimppalette-load.c:85 ../app/core/gimppalette-load.c:110
+#: ../app/core/gimppalette-load.c:84 ../app/core/gimppalette-load.c:110
 #: ../app/core/gimppalette-load.c:131 ../app/core/gimppalette-load.c:160
 #: ../app/core/gimppalette-load.c:236
 #, c-format
 msgid "Fatal parse error in palette file '%s': Read error in line %d."
 msgstr "è?²æ?¿æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?第 %d è¡?读å?¥å?ºé??ã??"
 
-#: ../app/core/gimppalette-load.c:95
+#: ../app/core/gimppalette-load.c:94
 #, c-format
 msgid "Fatal parse error in palette file '%s': Missing magic header."
 msgstr "è?²æ?¿æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?缺å°? magic 头ã??"
@@ -6553,7 +7906,7 @@ msgstr "读å??è?²æ?¿æ??件â??%sâ??ï¼?第 %d è¡?缺å°? RED å??é??ã??"
 #: ../app/core/gimppalette-load.c:191
 #, c-format
 msgid "Reading palette file '%s': Missing GREEN component in line %d."
-msgstr "读å??è?²æ?¿æ??件â??%sâ??ï¼?第 %d è¡?缺å°? RED å??é??ã??"
+msgstr "读å??è?²æ?¿æ??件â??%sâ??ï¼?第 %d è¡?缺å°? GREEN å??é??ã??"
 
 #: ../app/core/gimppalette-load.c:199
 #, c-format
@@ -6565,85 +7918,92 @@ msgstr "读å??è?²æ?¿æ??件â??%sâ??ï¼?第 %d è¡?缺å°? BLUE å??é??ã??"
 msgid "Reading palette file '%s': RGB value out of range in line %d."
 msgstr "读å??è?²æ?¿æ??件â??%sâ??ï¼?第 %d è¡? RGB å??å?¼è¶?å?ºè??å?´ã??"
 
-#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131
-#: ../app/core/gimppattern-load.c:162
+#: ../app/core/gimppalette-load.c:472
+#, c-format
+msgid "Could not read header from palette file '%s'"
+msgstr "æ? æ³?ä»?è?²æ?¿æ??件â??%sâ??中读å??头信æ?¯"
+
+#: ../app/core/gimppalette-load.c:495 ../app/core/gimppalette-load.c:583
+#, c-format
+msgid "Fatal parse error in palette file '%s'"
+msgstr "è?²æ?¿æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误"
+
+#: ../app/core/gimppattern-load.c:84 ../app/core/gimppattern-load.c:130
+#: ../app/core/gimppattern-load.c:161
 #, c-format
 msgid "Fatal parse error in pattern file '%s': File appears truncated."
 msgstr "å?¾æ¡?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ??件ç??æ?¥å·²è¢«æ?ªæ?­ã??"
 
-#: ../app/core/gimppattern-load.c:104
+#: ../app/core/gimppattern-load.c:103
 #, c-format
 msgid ""
 "Fatal parse error in pattern file '%s': Unknown pattern format version %d."
 msgstr "å?¾æ¡?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ?ªç?¥å?¾æ¡?æ ¼å¼?ç??æ?¬ %dã??"
 
-#: ../app/core/gimppattern-load.c:114
+#: ../app/core/gimppattern-load.c:113
 #, c-format
 msgid ""
 "Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n"
 "GIMP Patterns must be GRAY or RGB."
 msgstr ""
-"å?¾æ¡?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?ä¸?æ?¯æ??ç??å?¾æ¡?深度 %dã??\n"
+"å?¾æ¡?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?ä¸?æ?¯æ??ç??å?¾æ¡?è?²æ·± %dã??\n"
 "GIMP å?¾æ¡?å¿?须为ç?°åº¦æ?? RGBã??"
 
-#: ../app/core/gimppattern-load.c:139
+#: ../app/core/gimppattern-load.c:138
 #, c-format
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "å?¾æ¡?æ??件â??%sâ??中å?«æ??æ? æ??ç?? UTF-8 å­?符串ã??"
 
-#: ../app/core/gimppdbprogress.c:288 ../app/widgets/gimppdbdialog.c:352
+#: ../app/core/gimppdbprogress.c:287 ../app/widgets/gimppdbdialog.c:351
 #, c-format
 msgid "Unable to run %s callback. The corresponding plug-in may have crashed."
 msgstr "æ? æ³?æ?§è¡?%så??è°?ã??ç?¸åº?ç??æ??件å?¯è?½å·²å´©æº?ã??"
 
-#: ../app/core/gimpprogress.c:107 ../app/core/gimpprogress.c:154
+#: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153
 msgid "Please wait"
 msgstr "请ç¨?å??"
 
-#: ../app/core/gimpselection.c:150 ../app/tools/gimpeditselectiontool.c:240
+#: ../app/core/gimpselection.c:152 ../app/tools/gimpeditselectiontool.c:240
 msgid "Move Selection"
 msgstr "移å?¨é??å?º"
 
-#: ../app/core/gimpselection.c:168
+#: ../app/core/gimpselection.c:170
 msgid "Sharpen Selection"
 msgstr "é??å??é??å?º"
 
-#: ../app/core/gimpselection.c:169
+#: ../app/core/gimpselection.c:171
 msgid "Select None"
 msgstr "å?¨é?¨ä¸?é??"
 
-#: ../app/core/gimpselection.c:170
+#: ../app/core/gimpselection.c:172
 msgid "Select All"
 msgstr "å?¨é?¨é??中"
 
-#: ../app/core/gimpselection.c:171
+#: ../app/core/gimpselection.c:173
 msgid "Invert Selection"
 msgstr "å??转é??å?º"
 
-#: ../app/core/gimpselection.c:275
-#, c-format
+#: ../app/core/gimpselection.c:276
 msgid "There is no selection to stroke."
 msgstr "没æ??å?¯å?¾ç?»ç??é??å?ºã??"
 
-#: ../app/core/gimpselection.c:640
-#, c-format
+#: ../app/core/gimpselection.c:659
 msgid "Unable to cut or copy because the selected region is empty."
 msgstr "æ? æ³?å?ªå??æ??å¤?å?¶ï¼?å? ä¸ºé??æ?©å?ºå??为空ã??"
 
-#: ../app/core/gimpselection.c:814
-#, c-format
+#: ../app/core/gimpselection.c:832
 msgid "Cannot float selection because the selected region is empty."
 msgstr "æ? æ³?æµ®å?¨é??å?ºï¼?å? ä¸ºé??æ?©å?ºå??为空ã??"
 
-#: ../app/core/gimpselection.c:821
+#: ../app/core/gimpselection.c:839
 msgid "Float Selection"
 msgstr "æµ®å?¨é??å?º"
 
-#: ../app/core/gimpselection.c:837
+#: ../app/core/gimpselection.c:855
 msgid "Floated Layer"
 msgstr "æµ®å?¨ç??å?¾å±?"
 
-#: ../app/core/gimpstrokeoptions.c:119
+#: ../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."
@@ -6651,81 +8011,92 @@ msgstr ""
 "å¦?æ??æ??æ?¥å?¯ä»¥ä»?å®?æ ?è¿?æ?¥ç?¹å¼?å§?延伸å?°å¤§äº?æ??æ?¥é??å?¶ * 线宽ç??è·?离ï¼?å°?æ??è§?è¿?æ?¥è½¬æ?¢ä¸º"
 "æ??é?¢è¿?æ?¥ã??"
 
-#: ../app/core/gimptemplate.c:106
+#: ../app/core/gimptemplate.c:105
 msgid "The unit used for coordinate display when not in dot-for-dot mode."
 msgstr "é??ç?¹å¯¹ç?¹æ¨¡å¼?ä¸?å??æ ?æ?¾ç¤ºä½¿ç?¨ç??å??ä½?ã??"
 
-#: ../app/core/gimptemplate.c:113
+#: ../app/core/gimptemplate.c:112
 msgid "The horizontal image resolution."
 msgstr "æ°´å¹³å?¾å??å??辨ç??ã??"
 
-#: ../app/core/gimptemplate.c:119
+#: ../app/core/gimptemplate.c:118
 msgid "The vertical image resolution."
 msgstr "å??ç?´å?¾å??å??辨ç??ã??"
 
-#: ../app/core/gimptemplate.c:405 ../app/widgets/widgets-enums.c:24
+#: ../app/core/gimptemplate.c:404
 msgid "Background"
 msgstr "è??æ?¯"
 
-#. pseudo unit
 #: ../app/core/gimpunit.c:56
+msgctxt "unit-singular"
 msgid "pixel"
 msgstr "å??ç´ "
 
-#: ../app/core/gimpunit.c:56 ../app/tools/gimpmeasuretool.c:877
-#: ../app/tools/gimpmeasuretool.c:1020 ../app/tools/gimpmeasuretool.c:1076
-#: ../app/tools/gimpmeasuretool.c:1104 ../app/tools/gimppainttool.c:615
+#: ../app/core/gimpunit.c:56
+msgctxt "unit-plural"
 msgid "pixels"
 msgstr "å??ç´ "
 
-#. standard units
-#: ../app/core/gimpunit.c:59
+#: ../app/core/gimpunit.c:60
+msgctxt "unit-singular"
 msgid "inch"
 msgstr "�寸"
 
-#: ../app/core/gimpunit.c:59
+#: ../app/core/gimpunit.c:60
+msgctxt "unit-plural"
 msgid "inches"
 msgstr "�寸"
 
-#: ../app/core/gimpunit.c:60
+#: ../app/core/gimpunit.c:63
+msgctxt "unit-singular"
 msgid "millimeter"
 msgstr "毫米"
 
-#: ../app/core/gimpunit.c:60
+#: ../app/core/gimpunit.c:63
+msgctxt "unit-plural"
 msgid "millimeters"
 msgstr "毫米"
 
-#. professional units
-#: ../app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:67
+msgctxt "unit-singular"
 msgid "point"
 msgstr "ç?¹"
 
-#: ../app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:67
+msgctxt "unit-plural"
 msgid "points"
 msgstr "ç?¹"
 
-#: ../app/core/gimpunit.c:64
+#: ../app/core/gimpunit.c:70
+msgctxt "unit-singular"
 msgid "pica"
 msgstr "派�"
 
-#: ../app/core/gimpunit.c:64
+#: ../app/core/gimpunit.c:70
+msgctxt "unit-plural"
 msgid "picas"
 msgstr "派�"
 
-#: ../app/core/gimpunit.c:71
+#: ../app/core/gimpunit.c:78
+msgctxt "singular"
+msgid "percent"
+msgstr "ç?¾å??ç?¹"
+
+#: ../app/core/gimpunit.c:78
+msgctxt "plural"
 msgid "percent"
 msgstr "ç?¾å??ç?¹"
 
-#: ../app/core/gimpunit.c:71
-msgid "plural|percent"
-msgstr "ç?¾å??æ¯?"
+#: ../app/dialogs/about-dialog.c:113 ../app/gui/gui.c:478
+msgid "About GIMP"
+msgstr "�� GIMP"
 
-#: ../app/dialogs/about-dialog.c:123
+#: ../app/dialogs/about-dialog.c:122
 msgid "Visit the GIMP website"
 msgstr "访� GIMP ��"
 
 #. Translators: insert your names here, separated by newline
-#: ../app/dialogs/about-dialog.c:128
+#: ../app/dialogs/about-dialog.c:127
 msgid "translator-credits"
 msgstr ""
 "Yuheng Xie\n"
@@ -6733,11 +8104,11 @@ msgstr ""
 "Cai Qian\n"
 "���人"
 
-#: ../app/dialogs/about-dialog.c:529
+#: ../app/dialogs/about-dialog.c:532
 msgid "GIMP is brought to you by"
 msgstr "GIMP ä½?è??群"
 
-#: ../app/dialogs/about-dialog.c:603
+#: ../app/dialogs/about-dialog.c:606
 msgid "This is an unstable development release."
 msgstr "è¿?æ?¯ä¸?个ä¸?稳å®?ç??å¼?å??ç??æ?¬ã??"
 
@@ -6761,90 +8132,97 @@ msgstr "å°?å?¾å??转æ?¢ä¸ºç´¢å¼?é¢?è?²"
 msgid "C_onvert"
 msgstr "转�(_O)"
 
-#: ../app/dialogs/convert-dialog.c:189
+#: ../app/dialogs/convert-dialog.c:190
 msgid "_Maximum number of colors:"
 msgstr "æ??大é¢?è?²æ?°é??(_M)ï¼?"
 
-#: ../app/dialogs/convert-dialog.c:216
+#: ../app/dialogs/convert-dialog.c:217
 msgid "_Remove unused colors from colormap"
 msgstr "ä»?é¢?è?²è¡¨ä¸­å? é?¤æ²¡æ??被使ç?¨ç??é¢?è?²(_R)"
 
 #. dithering
-#: ../app/dialogs/convert-dialog.c:232 ../app/tools/gimpblendoptions.c:247
+#: ../app/dialogs/convert-dialog.c:233 ../app/tools/gimpblendoptions.c:246
 msgid "Dithering"
 msgstr "æ??å?¨"
 
-#: ../app/dialogs/convert-dialog.c:244
+#: ../app/dialogs/convert-dialog.c:245
 msgid "Color _dithering:"
 msgstr "é¢?è?²æ??å?¨(_D)ï¼?"
 
-#: ../app/dialogs/convert-dialog.c:259
+#: ../app/dialogs/convert-dialog.c:260
 msgid "Enable dithering of _transparency"
 msgstr "å?¯ç?¨é??æ??度æ??å?¨(_T)"
 
-#: ../app/dialogs/convert-dialog.c:286
+#: ../app/dialogs/convert-dialog.c:287
 msgid "Converting to indexed colors"
 msgstr "转�为索���"
 
 #: ../app/dialogs/convert-dialog.c:414 ../app/pdb/convert-cmds.c:150
-#, c-format
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "æ? æ³?转æ?¢å?°å¤?äº? 256 ç§?é¢?è?²ç??è?²æ?¿ã??"
 
-#: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:158
-#: ../app/gui/gui-message.c:148
+#: ../app/dialogs/dialogs-constructors.c:192 ../app/gui/gui.c:160
+#: ../app/gui/gui-message.c:147
 msgid "GIMP Message"
 msgstr "GIMP ��"
 
-#: ../app/dialogs/dialogs.c:142
+#: ../app/dialogs/dialogs.c:143
 msgid "Devices"
 msgstr "设�"
 
-#: ../app/dialogs/dialogs.c:142
+#: ../app/dialogs/dialogs.c:143
 msgid "Device Status"
 msgstr "设å¤?ç?¶æ??"
 
-#: ../app/dialogs/dialogs.c:146
+#: ../app/dialogs/dialogs.c:147
 msgid "Errors"
 msgstr "é??误"
 
-#: ../app/dialogs/dialogs.c:171
+#: ../app/dialogs/dialogs.c:151
+msgid "Pointer"
+msgstr "æ??é??"
+
+#: ../app/dialogs/dialogs.c:172
 msgid "History"
 msgstr "å??å?²"
 
-#: ../app/dialogs/dialogs.c:173
+#: ../app/dialogs/dialogs.c:174
 msgid "Image Templates"
 msgstr "å?¾å??模æ?¿"
 
-#: ../app/dialogs/dialogs.c:194
+#: ../app/dialogs/dialogs.c:195
 msgid "Histogram"
 msgstr "���"
 
-#: ../app/dialogs/dialogs.c:198
+#: ../app/dialogs/dialogs.c:199
+msgid "Selection"
+msgstr "é??å?º"
+
+#: ../app/dialogs/dialogs.c:199
 msgid "Selection Editor"
 msgstr "é??å?ºç¼?è¾?å?¨"
 
-#: ../app/dialogs/dialogs.c:202
+#: ../app/dialogs/dialogs.c:203
 msgid "Undo"
 msgstr "��"
 
-#: ../app/dialogs/dialogs.c:202
+#: ../app/dialogs/dialogs.c:203
 msgid "Undo History"
 msgstr "æ?¤æ¶?å??å?²"
 
-#: ../app/dialogs/dialogs.c:212
+#: ../app/dialogs/dialogs.c:213
 msgid "Navigation"
 msgstr "导�"
 
-#: ../app/dialogs/dialogs.c:212
+#: ../app/dialogs/dialogs.c:213
 msgid "Display Navigation"
 msgstr "�示导�"
 
-#: ../app/dialogs/dialogs.c:218
+#: ../app/dialogs/dialogs.c:219
 msgid "FG/BG"
 msgstr "å??æ?¯/è??æ?¯"
 
-#: ../app/dialogs/dialogs.c:218
+#: ../app/dialogs/dialogs.c:219
 msgid "FG/BG Color"
 msgstr "å??æ?¯/è??æ?¯é¢?è?²"
 
@@ -6865,27 +8243,23 @@ msgstr "模�(_M)�"
 msgid "_Opacity:"
 msgstr "ä¸?é??æ??度(_O)ï¼?"
 
-#: ../app/dialogs/file-open-dialog.c:253
+#: ../app/dialogs/file-open-dialog.c:254
 msgid "Open layers"
 msgstr "æ??å¼?å?¾å±?"
 
-#: ../app/dialogs/file-open-location-dialog.c:72
+#: ../app/dialogs/file-open-location-dialog.c:71
 msgid "Open Location"
 msgstr "æ??å¼?ä½?ç½®"
 
-#: ../app/dialogs/file-open-location-dialog.c:110
+#: ../app/dialogs/file-open-location-dialog.c:109
 msgid "Enter location (URI):"
 msgstr "���置(URI)�"
 
-#: ../app/dialogs/file-save-dialog.c:302 ../app/dialogs/file-save-dialog.c:338
-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:105
+msgid "Export Image"
+msgstr "导å?ºå?¾å??"
 
-#: ../app/dialogs/file-save-dialog.c:371
+#: ../app/dialogs/file-save-dialog.c:460
 msgid ""
 "Saving remote files needs to determine the file format from the file "
 "extension. Please enter a file extension that matches the selected file "
@@ -6894,18 +8268,56 @@ msgstr ""
 "ä¿?å­?è¿?ç¨?æ??件é??è¦?ä¾?å?·æ??件æ?©å±?å??ç¡®å®?æ??件格å¼?ã??请è¾?å?¥å??é??中æ??件å?¹é??ç??æ??件æ?©å±?å??"
 "æ??æ ¹æ?¬ä¸?è¾?å?¥æ??件æ?©å±?å??ã??"
 
-#: ../app/dialogs/file-save-dialog.c:428
+#: ../app/dialogs/file-save-dialog.c:587
+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:594
+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:600
+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:614
 msgid "Extension Mismatch"
-msgstr "æ?©å±?å??ä¸?对åº?"
+msgstr "æ?©å±?å??ä¸?å?¹é??"
 
-#: ../app/dialogs/file-save-dialog.c:444
+#: ../app/dialogs/file-save-dialog.c:630
 msgid "The given file extension does not match the chosen file type."
 msgstr "ç»?å®?ç??æ??件æ?©å±?å??ä¸?æ??é??ç??æ??件类å??ä¸?符ã??"
 
-#: ../app/dialogs/file-save-dialog.c:448
+#: ../app/dialogs/file-save-dialog.c:634
 msgid "Do you want to save the image using this name anyway?"
 msgstr "æ?¨ç??ç??è¦?使ç?¨æ­¤å??称ä¿?å­?å?¾å??å??ï¼?"
 
+#: ../app/dialogs/file-save-dialog.c:689
+msgid "Saving canceled"
+msgstr "å·²å??æ¶?ä¿?å­?"
+
+#: ../app/dialogs/file-save-dialog.c:697 ../app/widgets/gimpdnd-xds.c:183
+#, c-format
+msgid ""
+"Saving '%s' failed:\n"
+"\n"
+"%s"
+msgstr ""
+"ä¿?å­?â??%sâ??失败ï¼?\n"
+"\n"
+"%s"
+
 #: ../app/dialogs/grid-dialog.c:85
 msgid "Configure Grid"
 msgstr "é??ç½®ç½?æ ¼"
@@ -6951,7 +8363,7 @@ msgid "Create a New Image"
 msgstr "å??建æ?°ç??å?¾å??"
 
 #: ../app/dialogs/image-new-dialog.c:144
-#: ../app/dialogs/preferences-dialog.c:2021
+#: ../app/dialogs/preferences-dialog.c:2020
 msgid "_Template:"
 msgstr "模�(_T)�"
 
@@ -7019,17 +8431,17 @@ msgstr "å°?å?¾å??缩æ?¾è?³æ?¨é??æ?©ç??大å°?ä¼?使ä¸?äº?å?¾å±?æ?¶ç¼©è?³å®?å?¨æ¶?
 msgid "Is this what you want to do?"
 msgstr "è¿?æ?¯æ?¨æ??å¸?æ??ç??å??ï¼?"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:49
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:48
 msgid "Configure Keyboard Shortcuts"
 msgstr "é??置快æ?·é?®"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:73
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:72
 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
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:80
 msgid "S_ave keyboard shortcuts on exit"
 msgstr "é??å?ºæ?¶ä¿?å­?å¿«æ?·é?®(_A)"
 
@@ -7041,7 +8453,7 @@ msgstr "æ·»å? è??æ?¿å?°å?¾å±?"
 msgid "Initialize Layer Mask to:"
 msgstr "å??å§?å??å?¾å±?è??æ?¿ä¸ºï¼?"
 
-#: ../app/dialogs/layer-add-mask-dialog.c:138
+#: ../app/dialogs/layer-add-mask-dialog.c:139
 msgid "In_vert mask"
 msgstr "å??转è??æ?¿(_V)"
 
@@ -7051,12 +8463,12 @@ msgstr "å?¾å±?å??å­?(_N)ï¼?"
 
 #. The size labels
 #: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1065
+#: ../app/tools/gimpmeasuretool.c:1067
 msgid "Width:"
 msgstr "宽度�"
 
 #: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1093
+#: ../app/tools/gimpmeasuretool.c:1095
 msgid "Height:"
 msgstr "�度�"
 
@@ -7068,43 +8480,43 @@ msgstr "å?¾å±?å¡«å??ç±»å??"
 msgid "Set name from _text"
 msgstr "以æ??å­?设å®?å??称(_T)"
 
-#: ../app/dialogs/module-dialog.c:127
+#: ../app/dialogs/module-dialog.c:126
 msgid "Module Manager"
 msgstr "模å??管ç??å?¨"
 
-#: ../app/dialogs/module-dialog.c:150
+#: ../app/dialogs/module-dialog.c:149
 msgid "You will have to restart GIMP for the changes to take effect."
 msgstr "æ?¨é??è¦?é??æ?°å?¯å?¨ GIMP 以使æ?¹å??ç??æ??ã??"
 
-#: ../app/dialogs/module-dialog.c:191
+#: ../app/dialogs/module-dialog.c:190
 msgid "Module"
 msgstr "模å??"
 
-#: ../app/dialogs/module-dialog.c:464
+#: ../app/dialogs/module-dialog.c:463
 msgid "Only in memory"
 msgstr "ä»?å?¨å??å­?"
 
-#: ../app/dialogs/module-dialog.c:469
+#: ../app/dialogs/module-dialog.c:468
 msgid "No longer available"
 msgstr "已����"
 
-#: ../app/dialogs/module-dialog.c:498
+#: ../app/dialogs/module-dialog.c:497
 msgid "Author:"
 msgstr "ä½?è??ï¼?"
 
-#: ../app/dialogs/module-dialog.c:499
+#: ../app/dialogs/module-dialog.c:498
 msgid "Version:"
 msgstr "ç??æ?¬ï¼?"
 
-#: ../app/dialogs/module-dialog.c:500
+#: ../app/dialogs/module-dialog.c:499
 msgid "Date:"
 msgstr "æ?¥æ??ï¼?"
 
-#: ../app/dialogs/module-dialog.c:501
+#: ../app/dialogs/module-dialog.c:500
 msgid "Copyright:"
 msgstr "ç??æ??ï¼?"
 
-#: ../app/dialogs/module-dialog.c:502
+#: ../app/dialogs/module-dialog.c:501
 msgid "Location:"
 msgstr "�置�"
 
@@ -7122,7 +8534,7 @@ msgstr "é??é??ä½?移"
 
 #. The offset frame
 #: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152
-#: ../app/dialogs/resize-dialog.c:197 ../app/widgets/gimpgrideditor.c:276
+#: ../app/dialogs/resize-dialog.c:197 ../app/widgets/gimpgrideditor.c:275
 msgid "Offset"
 msgstr "�移"
 
@@ -7160,840 +8572,867 @@ msgstr "以è??æ?¯è?²å¡«å??(_B)"
 msgid "Make _transparent"
 msgstr "é??æ??(_T)"
 
-#: ../app/dialogs/palette-import-dialog.c:156
+#: ../app/dialogs/palette-import-dialog.c:154
 msgid "Import a New Palette"
 msgstr "导å?¥æ?°ç??è?²æ?¿"
 
-#: ../app/dialogs/palette-import-dialog.c:166
+#: ../app/dialogs/palette-import-dialog.c:164
 msgid "_Import"
 msgstr "导�(_I)"
 
 #. The "Source" frame
-#: ../app/dialogs/palette-import-dialog.c:205
+#: ../app/dialogs/palette-import-dialog.c:203
 msgid "Select Source"
 msgstr "é??æ?©æ?¥æº?"
 
-#: ../app/dialogs/palette-import-dialog.c:227
+#: ../app/dialogs/palette-import-dialog.c:214
+#: ../app/dialogs/preferences-dialog.c:1945
+msgid "_Gradient"
+msgstr "æ¸?å??(_G)"
+
+#: ../app/dialogs/palette-import-dialog.c:225
 msgid "I_mage"
 msgstr "å?¾å??(_M)"
 
-#: ../app/dialogs/palette-import-dialog.c:241
+#: ../app/dialogs/palette-import-dialog.c:239
 msgid "Sample _Merged"
 msgstr "ä½?æ ·å??并(_M)"
 
-#: ../app/dialogs/palette-import-dialog.c:253
+#: ../app/dialogs/palette-import-dialog.c:251
 msgid "_Selected Pixels only"
 msgstr "ä»?é??中ç??å??ç´ (_S)"
 
-#: ../app/dialogs/palette-import-dialog.c:265
+#: ../app/dialogs/palette-import-dialog.c:263
 msgid "Palette _file"
 msgstr "è?²æ?¿æ??件(_F)"
 
 #. Palette file name entry
-#: ../app/dialogs/palette-import-dialog.c:294
+#: ../app/dialogs/palette-import-dialog.c:292
 msgid "Select Palette File"
 msgstr "é??æ?©è?²æ?¿æ??件"
 
 #. The "Import" frame
-#: ../app/dialogs/palette-import-dialog.c:305
+#: ../app/dialogs/palette-import-dialog.c:303
 msgid "Import Options"
 msgstr "导å?¥é??项"
 
-#: ../app/dialogs/palette-import-dialog.c:319
+#: ../app/dialogs/palette-import-dialog.c:317
 msgid "New import"
 msgstr "�建导�"
 
-#: ../app/dialogs/palette-import-dialog.c:321
+#: ../app/dialogs/palette-import-dialog.c:319
 msgid "Palette _name:"
 msgstr "è?²æ?¿å??称(_N)ï¼?"
 
-#: ../app/dialogs/palette-import-dialog.c:327
+#: ../app/dialogs/palette-import-dialog.c:325
 msgid "N_umber of colors:"
 msgstr "é¢?è?²æ?°é??(_U)ï¼?"
 
-#: ../app/dialogs/palette-import-dialog.c:340
+#: ../app/dialogs/palette-import-dialog.c:338
 msgid "C_olumns:"
 msgstr "å??æ?°(_O)ï¼?"
 
-#: ../app/dialogs/palette-import-dialog.c:352
+#: ../app/dialogs/palette-import-dialog.c:350
 msgid "I_nterval:"
 msgstr "é?´é??(_N)ï¼?"
 
 #. The "Preview" frame
-#: ../app/dialogs/palette-import-dialog.c:363
+#: ../app/dialogs/palette-import-dialog.c:361
 msgid "Preview"
 msgstr "��"
 
-#: ../app/dialogs/palette-import-dialog.c:384
+#: ../app/dialogs/palette-import-dialog.c:382
 msgid "The selected source contains no colors."
 msgstr "é??中ç??æº?ä¸?å??å?«é¢?è?²ã??"
 
-#: ../app/dialogs/preferences-dialog.c:267
+#: ../app/dialogs/preferences-dialog.c:266
 msgid "Reset All Preferences"
 msgstr "é??ç½®æ??æ??é¦?é??项"
 
-#: ../app/dialogs/preferences-dialog.c:285
+#: ../app/dialogs/preferences-dialog.c:284
 msgid "Do you really want to reset all preferences to default values?"
 msgstr "æ?¨ç??ç??è¦?å°?æ??æ??é¦?é??项é??ç½®å?°é»?认å?¼å??ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:355
+#: ../app/dialogs/preferences-dialog.c:354
 msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr "æ?¨é??è¦?é??æ?°å?¯å?¨ GIMP 以使ä¸?å??æ?¹å??ç??æ??ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:500
+#: ../app/dialogs/preferences-dialog.c:499
 msgid "Configure Input Devices"
 msgstr "é??ç½®è¾?å?¥è®¾å¤?"
 
-#: ../app/dialogs/preferences-dialog.c:577
+#: ../app/dialogs/preferences-dialog.c:576
 msgid ""
 "Your keyboard shortcuts will be reset to default values the next time you "
 "start GIMP."
 msgstr "æ?¨ç??å¿«æ?·é?®å°?å?¨ä¸?次æ?¨å?¯å?¨ GIMP ç??æ?¶å??é??ç½®å?°é»?认å?¼ã??"
 
-#: ../app/dialogs/preferences-dialog.c:588
+#: ../app/dialogs/preferences-dialog.c:587
 msgid "Remove all Keyboard Shortcuts"
 msgstr "移é?¤æ??æ??ç??å¿«æ?·é?®"
 
-#: ../app/dialogs/preferences-dialog.c:610
+#: ../app/dialogs/preferences-dialog.c:609
 msgid "Do you really want to remove all keyboard shortcuts from all menus?"
 msgstr "æ?¨ç??ç??è¦?ä»?æ??æ??è??å??中移é?¤æ??æ??ç??å¿«æ?·é?®å??ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:651
+#: ../app/dialogs/preferences-dialog.c:650
 msgid ""
 "Your window setup will be reset to default values the next time you start "
 "GIMP."
 msgstr "æ?¨ç??çª?å?£è®¾ç½®å°?å?¨ä¸?次æ?¨å?¯å?¨ GIMP ç??æ?¶å??é??ç½®å?°é»?认å?¼ã??"
 
-#: ../app/dialogs/preferences-dialog.c:686
+#: ../app/dialogs/preferences-dialog.c:685
 msgid ""
 "Your input device settings will be reset to default values the next time you "
 "start GIMP."
 msgstr "æ?¨ç??è¾?å?¥è®¾å¤?设置å°?å?¨ä¸?次æ?¨å?¯å?¨ GIMP ç??æ?¶å??é??ç½®å?°é»?认å?¼ã??"
 
-#: ../app/dialogs/preferences-dialog.c:721
+#: ../app/dialogs/preferences-dialog.c:720
 msgid ""
 "Your tool options will be reset to default values the next time you start "
 "GIMP."
 msgstr "æ?¨ç??å·¥å?·é??项å°?å?¨æ?¨ä¸?次å?¯å?¨ GIMP æ?¶é??ç½®å?°é»?认å?¼ã??"
 
-#: ../app/dialogs/preferences-dialog.c:1289
+#: ../app/dialogs/preferences-dialog.c:1288
 msgid "Show _menubar"
 msgstr "æ?¾ç¤ºè??å??æ ?(_M)"
 
-#: ../app/dialogs/preferences-dialog.c:1293
+#: ../app/dialogs/preferences-dialog.c:1292
 msgid "Show _rulers"
 msgstr "�示�尺(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:1296
+#: ../app/dialogs/preferences-dialog.c:1295
 msgid "Show scroll_bars"
 msgstr "�示���(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1299
+#: ../app/dialogs/preferences-dialog.c:1298
 msgid "Show s_tatusbar"
 msgstr "æ?¾ç¤ºç?¶æ??æ ?(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:1307
+#: ../app/dialogs/preferences-dialog.c:1306
 msgid "Show s_election"
 msgstr "æ?¾ç¤ºé??å?º(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:1310
+#: ../app/dialogs/preferences-dialog.c:1309
 msgid "Show _layer boundary"
 msgstr "æ?¾ç¤ºå?¾å±?è¾¹ç??(_L)"
 
-#: ../app/dialogs/preferences-dialog.c:1313
+#: ../app/dialogs/preferences-dialog.c:1312
 msgid "Show _guides"
 msgstr "æ?¾ç¤ºå??è??线(_G)"
 
-#: ../app/dialogs/preferences-dialog.c:1316
+#: ../app/dialogs/preferences-dialog.c:1315
 msgid "Show gri_d"
 msgstr "�示�格(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:1322
+#: ../app/dialogs/preferences-dialog.c:1321
 msgid "Canvas _padding mode:"
 msgstr "��衬�模�(_P)�"
 
-#: ../app/dialogs/preferences-dialog.c:1327
+#: ../app/dialogs/preferences-dialog.c:1326
 msgid "Custom p_adding color:"
 msgstr "�����衬���(_A)�"
 
-#: ../app/dialogs/preferences-dialog.c:1328
+#: ../app/dialogs/preferences-dialog.c:1327
 msgid "Select Custom Canvas Padding Color"
 msgstr "设置è?ªå®?ä¹?ç?»å¸?衬å?«ç??é¢?è?²"
 
-#: ../app/dialogs/preferences-dialog.c:1417
+#: ../app/dialogs/preferences-dialog.c:1416
 msgid "Preferences"
 msgstr "é¦?é??项"
 
-#: ../app/dialogs/preferences-dialog.c:1529
-#: ../app/dialogs/preferences-dialog.c:2780
+#: ../app/dialogs/preferences-dialog.c:1528
+#: ../app/dialogs/preferences-dialog.c:2779
 msgid "Environment"
 msgstr "��"
 
-#: ../app/dialogs/preferences-dialog.c:1543
+#: ../app/dialogs/preferences-dialog.c:1542
 msgid "Resource Consumption"
 msgstr "èµ?æº?æ¶?è??"
 
-#: ../app/dialogs/preferences-dialog.c:1553
+#: ../app/dialogs/preferences-dialog.c:1552
 msgid "Minimal number of _undo levels:"
 msgstr "æ??å°?æ?¤æ¶?次æ?°(_U)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1556
+#: ../app/dialogs/preferences-dialog.c:1555
 msgid "Maximum undo _memory:"
 msgstr "æ??大æ?¤æ¶?å??å­?(_M)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1559
+#: ../app/dialogs/preferences-dialog.c:1558
 msgid "Tile cache _size:"
 msgstr "平���大�(_S)�"
 
-#: ../app/dialogs/preferences-dialog.c:1562
+#: ../app/dialogs/preferences-dialog.c:1561
 msgid "Maximum _new image size:"
 msgstr "æ??大æ?°å»ºå?¾å??大å°?(_N)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1567
+#: ../app/dialogs/preferences-dialog.c:1566
 msgid "Number of _processors to use:"
 msgstr "å¤?ç??å?¨ä½¿ç?¨æ?°é??(_P)ï¼?"
 
 #. Image Thumbnails
-#: ../app/dialogs/preferences-dialog.c:1572
+#: ../app/dialogs/preferences-dialog.c:1571
 msgid "Image Thumbnails"
 msgstr "å?¾å??缩ç?¥å?¾"
 
-#: ../app/dialogs/preferences-dialog.c:1577
+#: ../app/dialogs/preferences-dialog.c:1576
 msgid "Size of _thumbnails:"
 msgstr "缩��大�(_T)�"
 
-#: ../app/dialogs/preferences-dialog.c:1581
+#: ../app/dialogs/preferences-dialog.c:1580
 msgid "Maximum _filesize for thumbnailing:"
 msgstr "缩ç?¥å?¾æ??大æ??件大å°?(_F)ï¼?"
 
 #. File Saving
-#: ../app/dialogs/preferences-dialog.c:1585
+#: ../app/dialogs/preferences-dialog.c:1584
 msgid "Saving Images"
 msgstr "ä¿?å­?å?¾å??"
 
-#: ../app/dialogs/preferences-dialog.c:1588
+#: ../app/dialogs/preferences-dialog.c:1587
 msgid "Confirm closing of unsa_ved images"
 msgstr "å?³é?­æ?ªä¿?å­?ç??å?¾å??æ?¶é??è¦?确认(_V)"
 
-#: ../app/dialogs/preferences-dialog.c:1598
+#: ../app/dialogs/preferences-dialog.c:1597
 msgid "Keep record of used files in the Recent Documents list"
 msgstr "æ?¾ç¤ºæ??è¿?使ç?¨ç??æ??æ¡£"
 
-#: ../app/dialogs/preferences-dialog.c:1607
+#: ../app/dialogs/preferences-dialog.c:1606
 msgid "User Interface"
 msgstr "ç?¨æ?·ç??é?¢"
 
-#: ../app/dialogs/preferences-dialog.c:1610
+#: ../app/dialogs/preferences-dialog.c:1609
 msgid "Interface"
 msgstr "ç??é?¢"
 
 #. Previews
-#: ../app/dialogs/preferences-dialog.c:1617
+#: ../app/dialogs/preferences-dialog.c:1616
 msgid "Previews"
 msgstr "��"
 
-#: ../app/dialogs/preferences-dialog.c:1620
+#: ../app/dialogs/preferences-dialog.c:1619
 msgid "_Enable layer & channel previews"
 msgstr "å?¯ç?¨å?¾å±?å??é??é??é¢?è§?(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:1626
+#: ../app/dialogs/preferences-dialog.c:1625
 msgid "_Default layer & channel preview size:"
 msgstr "é»?认å?¾å±?å??é??é??é¢?è§?大å°?(_D)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1629
+#: ../app/dialogs/preferences-dialog.c:1628
 msgid "Na_vigation preview size:"
 msgstr "导���大�(_V)�"
 
 #. Keyboard Shortcuts
-#: ../app/dialogs/preferences-dialog.c:1633
+#: ../app/dialogs/preferences-dialog.c:1632
 msgid "Keyboard Shortcuts"
 msgstr "å¿«æ?·é?®"
 
-#: ../app/dialogs/preferences-dialog.c:1637
+#: ../app/dialogs/preferences-dialog.c:1636
 msgid "Show menu _mnemonics (access keys)"
 msgstr "æ?¾ç¤ºè??å??å?©è®°ç¬¦(é??æ?©é?®)(_M)"
 
-#: ../app/dialogs/preferences-dialog.c:1640
+#: ../app/dialogs/preferences-dialog.c:1639
 msgid "_Use dynamic keyboard shortcuts"
 msgstr "使ç?¨å?¨æ??å¿«æ?·é?®(_U)"
 
-#: ../app/dialogs/preferences-dialog.c:1644
+#: ../app/dialogs/preferences-dialog.c:1643
 msgid "Configure _Keyboard Shortcuts..."
 msgstr "é??置快æ?·é?®(_K)..."
 
-#: ../app/dialogs/preferences-dialog.c:1651
+#: ../app/dialogs/preferences-dialog.c:1650
 msgid "_Save keyboard shortcuts on exit"
 msgstr "é??å?ºæ?¶ä¿?å­?å¿«æ?·é?®(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:1655
+#: ../app/dialogs/preferences-dialog.c:1654
 msgid "Save Keyboard Shortcuts _Now"
 msgstr "����快��(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:1662
+#: ../app/dialogs/preferences-dialog.c:1661
 msgid "_Reset Keyboard Shortcuts to Default Values"
 msgstr "é??置快æ?·é?®å?°é»?认置(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:1671
+#: ../app/dialogs/preferences-dialog.c:1670
 msgid "Remove _All Keyboard Shortcuts"
 msgstr "移é?¤æ??æ??å¿«æ?·é?®(_A)"
 
-#: ../app/dialogs/preferences-dialog.c:1683
-#: ../app/dialogs/preferences-dialog.c:1722
+#: ../app/dialogs/preferences-dialog.c:1682
+#: ../app/dialogs/preferences-dialog.c:1721
 msgid "Theme"
 msgstr "主�"
 
-#: ../app/dialogs/preferences-dialog.c:1692
+#: ../app/dialogs/preferences-dialog.c:1691
 msgid "Select Theme"
 msgstr "é??æ?©ä¸»é¢?"
 
-#: ../app/dialogs/preferences-dialog.c:1774
+#: ../app/dialogs/preferences-dialog.c:1773
 msgid "Reload C_urrent Theme"
 msgstr "é??æ?°å? è½½å½?å??主é¢?(_U)"
 
-#: ../app/dialogs/preferences-dialog.c:1786
+#: ../app/dialogs/preferences-dialog.c:1785
 msgid "Help System"
 msgstr "帮�系�"
 
 #. General
-#: ../app/dialogs/preferences-dialog.c:1798
-#: ../app/dialogs/preferences-dialog.c:1892
-#: ../app/dialogs/preferences-dialog.c:2079
-#: ../app/widgets/gimpcontrollereditor.c:189
+#: ../app/dialogs/preferences-dialog.c:1797
+#: ../app/dialogs/preferences-dialog.c:1891
+#: ../app/dialogs/preferences-dialog.c:2078
+#: ../app/widgets/gimpcontrollereditor.c:188
 msgid "General"
 msgstr "常�"
 
-#: ../app/dialogs/preferences-dialog.c:1801
+#: ../app/dialogs/preferences-dialog.c:1800
 msgid "Show _tooltips"
 msgstr "æ?¾ç¤ºå·¥å?·æ??示(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:1804
+#: ../app/dialogs/preferences-dialog.c:1803
 msgid "Show help _buttons"
 msgstr "æ?¾ç¤ºå¸®å?©æ??é?®(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1817
+#: ../app/dialogs/preferences-dialog.c:1816
 msgid "Use the online version"
 msgstr "使ç?¨å?¨çº¿ç??æ?¬"
 
-#: ../app/dialogs/preferences-dialog.c:1818
+#: ../app/dialogs/preferences-dialog.c:1817
 msgid "Use a locally installed copy"
 msgstr "使ç?¨æ?¬å?°å·²å®?è£?ç??æ?¬"
 
-#: ../app/dialogs/preferences-dialog.c:1819
+#: ../app/dialogs/preferences-dialog.c:1818
 msgid "User manual:"
 msgstr "ç?¨æ?·æ??å??"
 
-#: ../app/dialogs/preferences-dialog.c:1826
+#: ../app/dialogs/preferences-dialog.c:1825
 msgid "There's a local installation of the user manual."
 msgstr "å·²å®?è£?ç?¨æ?·æ??å??ç??æ?¬å?°ç??æ?¬"
 
-#: ../app/dialogs/preferences-dialog.c:1831
+#: ../app/dialogs/preferences-dialog.c:1830
 msgid "The user manual is not installed locally."
 msgstr "ç?¨æ?·æ??å??æ?ªå?¨æ?¬å?°å®?è£?"
 
 #. Help Browser
-#: ../app/dialogs/preferences-dialog.c:1854
+#: ../app/dialogs/preferences-dialog.c:1853
 msgid "Help Browser"
 msgstr "帮����"
 
-#: ../app/dialogs/preferences-dialog.c:1858
+#: ../app/dialogs/preferences-dialog.c:1857
 msgid "H_elp browser to use:"
 msgstr "è¦?使ç?¨ç??帮å?©æµ?è§?å?¨(_E)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1863
+#: ../app/dialogs/preferences-dialog.c:1862
 msgid "Web Browser"
 msgstr "Web ���"
 
-#: ../app/dialogs/preferences-dialog.c:1867
+#: ../app/dialogs/preferences-dialog.c:1866
 msgid "_Web browser to use:"
 msgstr "è¦?使ç?¨ç?? Web æµ?è§?å?¨(_W)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1895
+#: ../app/dialogs/preferences-dialog.c:1894
 msgid "_Save tool options on exit"
 msgstr "é??å?ºæ?¶ä¿?å­?å·¥å?·é??项(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:1899
+#: ../app/dialogs/preferences-dialog.c:1898
 msgid "Save Tool Options _Now"
 msgstr "ç«?å?³ä¿?å­?å·¥å?·é??项(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:1906
+#: ../app/dialogs/preferences-dialog.c:1905
 msgid "_Reset Saved Tool Options to Default Values"
 msgstr "å°?å·¥å?·é??项é??置为é»?认å?¼(_R)"
 
 #. Snapping Distance
-#: ../app/dialogs/preferences-dialog.c:1916
+#: ../app/dialogs/preferences-dialog.c:1915
 msgid "Guide & Grid Snapping"
 msgstr "å??è??线å??ç½?æ ¼å?¸é??"
 
-#: ../app/dialogs/preferences-dialog.c:1921
+#: ../app/dialogs/preferences-dialog.c:1920
 msgid "_Snap distance:"
 msgstr "å?¸é??è·?离(_S)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1929
+#: ../app/dialogs/preferences-dialog.c:1928
 msgid "Default _interpolation:"
 msgstr "é»?认æ??å?¼(_I)ï¼?"
 
 #. Global Brush, Pattern, ...
-#: ../app/dialogs/preferences-dialog.c:1936
+#: ../app/dialogs/preferences-dialog.c:1935
 msgid "Paint Options Shared Between Tools"
 msgstr "å·¥å?·ä¹?é?´å?±äº«ç??æ¶?ç?»é??项"
 
-#: ../app/dialogs/preferences-dialog.c:1949
+#: ../app/dialogs/preferences-dialog.c:1939
+msgid "_Brush"
+msgstr "��(_B)"
+
+#: ../app/dialogs/preferences-dialog.c:1942
+msgid "_Pattern"
+msgstr "��(_P)"
+
+#: ../app/dialogs/preferences-dialog.c:1948
 msgid "Move Tool"
 msgstr "移�工�"
 
-#: ../app/dialogs/preferences-dialog.c:1953
+#: ../app/dialogs/preferences-dialog.c:1952
 msgid "Set layer or path as active"
 msgstr "å°?å?¾å±?æ??è·¯å¾?设置为活å?¨ç??"
 
-#: ../app/dialogs/preferences-dialog.c:1966 ../app/widgets/gimptoolbox.c:631
+#: ../app/dialogs/preferences-dialog.c:1965 ../app/widgets/gimptoolbox.c:631
 msgid "Toolbox"
 msgstr "工�箱"
 
 #. Appearance
-#: ../app/dialogs/preferences-dialog.c:1978
-#: ../app/dialogs/preferences-dialog.c:2152
-#: ../app/widgets/gimpgrideditor.c:204
+#: ../app/dialogs/preferences-dialog.c:1977
+#: ../app/dialogs/preferences-dialog.c:2151
+#: ../app/widgets/gimpgrideditor.c:203
 msgid "Appearance"
 msgstr "��"
 
-#: ../app/dialogs/preferences-dialog.c:1982
+#: ../app/dialogs/preferences-dialog.c:1981
 msgid "Show _foreground & background color"
 msgstr "æ?¾ç¤ºå??æ?¯è?²å??è??æ?¯è?²(_F)"
 
-#: ../app/dialogs/preferences-dialog.c:1986
+#: ../app/dialogs/preferences-dialog.c:1985
 msgid "Show active _brush, pattern & gradient"
 msgstr "æ?¾ç¤ºæ´»å?¨ç?»ç¬?ã??å?¾æ¡?å??æ¸?å??(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1990
+#: ../app/dialogs/preferences-dialog.c:1989
 msgid "Show active _image"
 msgstr "æ?¾ç¤ºæ´»å?¨å?¾å??(_I)"
 
-#: ../app/dialogs/preferences-dialog.c:2003
+#: ../app/dialogs/preferences-dialog.c:2002
 msgid "Default New Image"
 msgstr "é»?认æ?°å?¾å??"
 
-#: ../app/dialogs/preferences-dialog.c:2006
+#: ../app/dialogs/preferences-dialog.c:2005
 msgid "Default Image"
 msgstr "é»?认å?¾å??"
 
-#: ../app/dialogs/preferences-dialog.c:2043
+#: ../app/dialogs/preferences-dialog.c:2042
 msgid "Default Image Grid"
 msgstr "é»?认å?¾å??ç½?æ ¼"
 
-#: ../app/dialogs/preferences-dialog.c:2046
+#: ../app/dialogs/preferences-dialog.c:2045
 msgid "Default Grid"
 msgstr "�认�格"
 
-#: ../app/dialogs/preferences-dialog.c:2067
+#: ../app/dialogs/preferences-dialog.c:2066
 msgid "Image Windows"
 msgstr "å?¾å??çª?å?£"
 
-#: ../app/dialogs/preferences-dialog.c:2082
+#: ../app/dialogs/preferences-dialog.c:2081
 msgid "Use \"_Dot for dot\" by default"
 msgstr "é»?认使ç?¨â??ç?¹å¯¹ç?¹â??(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2088
+#: ../app/dialogs/preferences-dialog.c:2087
 msgid "Marching _ants speed:"
 msgstr "è??è??线é??度(_A)ï¼?"
 
 #. Zoom & Resize Behavior
-#: ../app/dialogs/preferences-dialog.c:2092
+#: ../app/dialogs/preferences-dialog.c:2091
 msgid "Zoom & Resize Behavior"
 msgstr "缩æ?¾å??æ?¹å??大å°?è¡?为"
 
-#: ../app/dialogs/preferences-dialog.c:2096
+#: ../app/dialogs/preferences-dialog.c:2095
 msgid "Resize window on _zoom"
 msgstr "缩������大�(_Z)"
 
-#: ../app/dialogs/preferences-dialog.c:2099
+#: ../app/dialogs/preferences-dialog.c:2098
 msgid "Resize window on image _size change"
 msgstr "å?¾å??大å°?æ?¹å??æ?¶è°?æ?´çª?å?£å¤§å°?(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2105
+#: ../app/dialogs/preferences-dialog.c:2104
 msgid "Fit to window"
 msgstr "é??å??çª?å?£"
 
-#: ../app/dialogs/preferences-dialog.c:2107
+#: ../app/dialogs/preferences-dialog.c:2106
 msgid "Initial zoom _ratio:"
 msgstr "å??å§?缩æ?¾æ¯?ç??(_R)ï¼?"
 
 #. Space Bar
-#: ../app/dialogs/preferences-dialog.c:2111
+#: ../app/dialogs/preferences-dialog.c:2110
 msgid "Space Bar"
-msgstr "空��"
+msgstr "空格�"
 
-#: ../app/dialogs/preferences-dialog.c:2117
+#: ../app/dialogs/preferences-dialog.c:2116
 msgid "_While space bar is pressed:"
-msgstr "å½?空ç?½é?®è¢«æ??ä¸?æ?¶(_W)ï¼?"
+msgstr "å½?空格é?®è¢«æ??ä¸?æ?¶(_W)ï¼?"
 
 #. Mouse Pointers
-#: ../app/dialogs/preferences-dialog.c:2121
+#: ../app/dialogs/preferences-dialog.c:2120
 msgid "Mouse Pointers"
 msgstr "é¼ æ ?æ??é??"
 
-#: ../app/dialogs/preferences-dialog.c:2125
+#: ../app/dialogs/preferences-dialog.c:2124
 msgid "Show _brush outline"
 msgstr "�示��轮�(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:2128
+#: ../app/dialogs/preferences-dialog.c:2127
 msgid "Show pointer for paint _tools"
 msgstr "æ?¾ç¤ºæ¶?ç?»å·¥å?·é¼ æ ?æ??é??(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2134
+#: ../app/dialogs/preferences-dialog.c:2133
 msgid "Pointer _mode:"
 msgstr "æ??é??模å¼?(_M)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2137
+#: ../app/dialogs/preferences-dialog.c:2136
 msgid "Pointer re_ndering:"
 msgstr "æ??é??渲æ??(_N)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2149
+#: ../app/dialogs/preferences-dialog.c:2148
 msgid "Image Window Appearance"
 msgstr "å?¾å??çª?å?£å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2160
+#: ../app/dialogs/preferences-dialog.c:2159
 msgid "Default Appearance in Normal Mode"
 msgstr "æ?®é??模å¼?ä¸?ç??é»?认å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2165
+#: ../app/dialogs/preferences-dialog.c:2164
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "å?¨å±?模å¼?ä¸?ç??é»?认å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2174
+#: ../app/dialogs/preferences-dialog.c:2173
 msgid "Image Title & Statusbar Format"
 msgstr "å?¾å??æ ?é¢?å??ç?¶æ??æ ?æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2177
+#: ../app/dialogs/preferences-dialog.c:2176
 msgid "Title & Status"
 msgstr "æ ?é¢?å??ç?¶æ??"
 
-#: ../app/dialogs/preferences-dialog.c:2195
+#: ../app/dialogs/preferences-dialog.c:2194
 msgid "Current format"
 msgstr "å½?å??æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2196
+#: ../app/dialogs/preferences-dialog.c:2195
 msgid "Default format"
 msgstr "�认格�"
 
-#: ../app/dialogs/preferences-dialog.c:2197
+#: ../app/dialogs/preferences-dialog.c:2196
 msgid "Show zoom percentage"
 msgstr "æ?¾ç¤ºç¼©æ?¾ç?¾å??æ¯?"
 
-#: ../app/dialogs/preferences-dialog.c:2198
+#: ../app/dialogs/preferences-dialog.c:2197
 msgid "Show zoom ratio"
 msgstr "æ?¾ç¤ºç¼©æ?¾æ¯?ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2199
+#: ../app/dialogs/preferences-dialog.c:2198
 msgid "Show image size"
 msgstr "æ?¾ç¤ºå?¾å??大å°?"
 
-#: ../app/dialogs/preferences-dialog.c:2212
+#: ../app/dialogs/preferences-dialog.c:2211
 msgid "Image Title Format"
 msgstr "å?¾å??æ ?é¢?æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2214
+#: ../app/dialogs/preferences-dialog.c:2213
 msgid "Image Statusbar Format"
 msgstr "å?¾å??ç?¶æ??æ ?æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2299
+#: ../app/dialogs/preferences-dialog.c:2298
 msgid "Display"
 msgstr "�示"
 
-#: ../app/dialogs/preferences-dialog.c:2315
+#. Transparency
+#: ../app/dialogs/preferences-dialog.c:2310
+msgid "Transparency"
+msgstr "é??æ??"
+
+#: ../app/dialogs/preferences-dialog.c:2314
 msgid "_Check style:"
 msgstr "å??å­?线样å¼?(_C)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2318
+#: ../app/dialogs/preferences-dialog.c:2317
 msgid "Check _size:"
 msgstr "å??å­?线大å°?(_S)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2321
+#: ../app/dialogs/preferences-dialog.c:2320
 msgid "Monitor Resolution"
 msgstr "ç??è§?å?¨å??辨ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2325
-#: ../app/widgets/gimpcursorview.c:124 ../app/widgets/gimpgrideditor.c:269
-#: ../app/widgets/gimpgrideditor.c:301
+#. Pixels
+#: ../app/dialogs/preferences-dialog.c:2324
+#: ../app/display/gimpcursorview.c:202 ../app/widgets/gimpgrideditor.c:268
+#: ../app/widgets/gimpgrideditor.c:300
 msgid "Pixels"
 msgstr "å??ç´ "
 
-#: ../app/dialogs/preferences-dialog.c:2347
+#: ../app/dialogs/preferences-dialog.c:2342
+msgid "Horizontal"
+msgstr "æ°´å¹³"
+
+#: ../app/dialogs/preferences-dialog.c:2344
+msgid "Vertical"
+msgstr "å??ç?´"
+
+#: ../app/dialogs/preferences-dialog.c:2346
 #: ../app/widgets/gimpimagepropview.c:476
 msgid "ppi"
 msgstr "ppi"
 
-#: ../app/dialogs/preferences-dialog.c:2363
+#: ../app/dialogs/preferences-dialog.c:2362
 #, c-format
 msgid "_Detect automatically (currently %d Ã? %d ppi)"
 msgstr "è?ªå?¨æ£?æµ?(å½?å??为 %d x %d ppi)(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2383
+#: ../app/dialogs/preferences-dialog.c:2382
 msgid "_Enter manually"
 msgstr "æ??å·¥è¾?å?¥(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:2398
+#: ../app/dialogs/preferences-dialog.c:2397
 msgid "C_alibrate..."
 msgstr "æµ?å®?(_A)..."
 
-#: ../app/dialogs/preferences-dialog.c:2421
+#: ../app/dialogs/preferences-dialog.c:2420
 msgid "Color Management"
 msgstr "è?²å½©ç®¡ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2441
+#: ../app/dialogs/preferences-dialog.c:2440
 msgid "_RGB profile:"
-msgstr "RGB é??ç½®æ??件(_R)ï¼?"
+msgstr "_RGB é??ç½®æ??件ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2442
+#: ../app/dialogs/preferences-dialog.c:2441
 msgid "Select RGB Color Profile"
 msgstr "é??æ?© RGB è?²å½©é??ç½®æ??件"
 
-#: ../app/dialogs/preferences-dialog.c:2443
+#: ../app/dialogs/preferences-dialog.c:2442
 msgid "_CMYK profile:"
-msgstr "CMYK é??ç½®æ??件(_C)ï¼?"
+msgstr "_CMYK é??ç½®æ??件ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2444
+#: ../app/dialogs/preferences-dialog.c:2443
 msgid "Select CMYK Color Profile"
 msgstr "é??æ?© CMYK è?²å½©é??ç½®æ??件"
 
-#: ../app/dialogs/preferences-dialog.c:2445
+#: ../app/dialogs/preferences-dialog.c:2444
 msgid "_Monitor profile:"
 msgstr "æ?¾ç¤ºå?¨é??ç½®æ??件(_M)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2446
+#: ../app/dialogs/preferences-dialog.c:2445
 msgid "Select Monitor Color Profile"
 msgstr "é??æ?©æ?¾ç¤ºå?¨è?²å½©é??ç½®æ??件"
 
-#: ../app/dialogs/preferences-dialog.c:2447
+#: ../app/dialogs/preferences-dialog.c:2446
 msgid "_Print simulation profile:"
 msgstr "æ??å?°æ?ºæ¨¡æ??é??ç½®æ??件(_P)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2448
+#: ../app/dialogs/preferences-dialog.c:2447
 msgid "Select Printer Color Profile"
 msgstr "é??æ?©æ??å?°æ?ºè?²å½©é??ç½®æ??件"
 
-#: ../app/dialogs/preferences-dialog.c:2459
+#: ../app/dialogs/preferences-dialog.c:2458
 msgid "_Mode of operation:"
 msgstr "æ??ä½?模å¼?(_M)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2489
+#: ../app/dialogs/preferences-dialog.c:2488
 msgid "_Try to use the system monitor profile"
 msgstr "è¯?å?¾ä½¿ç?¨ç³»ç»?æ?¾ç¤ºå?¨é??ç½®æ??件(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2499
+#: ../app/dialogs/preferences-dialog.c:2498
 msgid "_Display rendering intent:"
 msgstr "æ?¾ç¤ºæ¸²æ??缩è¿?(_D)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2508
+#: ../app/dialogs/preferences-dialog.c:2507
 msgid "_Softproof rendering intent:"
 msgstr "软æ??样渲æ??缩è¿?(_S)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2521
+#: ../app/dialogs/preferences-dialog.c:2520
 msgid "Mark out of gamut colors"
 msgstr "æ ?è®°å?ºè¶?å?ºå?¨è?²å½©è??å?´ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2526
+#: ../app/dialogs/preferences-dialog.c:2525
 msgid "Select Warning Color"
 msgstr "é??æ?©è­¦å??é¢?è?²"
 
-#: ../app/dialogs/preferences-dialog.c:2539
+#: ../app/dialogs/preferences-dialog.c:2538
 msgid "File Open behaviour:"
 msgstr "æ??件æ??å¼?è¡?为ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2551
+#: ../app/dialogs/preferences-dialog.c:2550
 msgid "Input Devices"
 msgstr "��设�"
 
 #. Extended Input Devices
-#: ../app/dialogs/preferences-dialog.c:2561
+#: ../app/dialogs/preferences-dialog.c:2560
 msgid "Extended Input Devices"
 msgstr "����设�"
 
-#: ../app/dialogs/preferences-dialog.c:2565
+#: ../app/dialogs/preferences-dialog.c:2564
 msgid "Configure E_xtended Input Devices..."
 msgstr "é??ç½®æ?©å±?è¾?å?¥è®¾å¤?(_X)..."
 
-#: ../app/dialogs/preferences-dialog.c:2572
+#: ../app/dialogs/preferences-dialog.c:2571
 msgid "_Save input device settings on exit"
 msgstr "é??å?ºæ?¶ä¿?å­?è¾?å?¥è®¾å¤?设置(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2576
+#: ../app/dialogs/preferences-dialog.c:2575
 msgid "Save Input Device Settings _Now"
 msgstr "������设�设置(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2583
+#: ../app/dialogs/preferences-dialog.c:2582
 msgid "_Reset Saved Input Device Settings to Default Values"
 msgstr "é??置已ä¿?å­?ç??è¾?å?¥è®¾å¤?设置å?°é»?认å?¼(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2598
+#: ../app/dialogs/preferences-dialog.c:2597
 msgid "Additional Input Controllers"
 msgstr "é??å? è¾?å?¥æ?§å?¶å?¨"
 
-#: ../app/dialogs/preferences-dialog.c:2601
+#: ../app/dialogs/preferences-dialog.c:2600
 msgid "Input Controllers"
 msgstr "�����"
 
-#: ../app/dialogs/preferences-dialog.c:2617
+#: ../app/dialogs/preferences-dialog.c:2616
 msgid "Window Management"
 msgstr "çª?å?£ç®¡ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2626
+#: ../app/dialogs/preferences-dialog.c:2625
 msgid "Window Manager Hints"
 msgstr "çª?å?£ç®¡ç??å?¨æ??示"
 
-#: ../app/dialogs/preferences-dialog.c:2632
+#: ../app/dialogs/preferences-dialog.c:2631
 msgid "Hint for the _toolbox:"
 msgstr "å·¥å?·ç®±ç??çª?å?£ç±»å??æ??示(_T)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2636
+#: ../app/dialogs/preferences-dialog.c:2635
 msgid "Hint for other _docks:"
 msgstr "å?¶å®?å??é? æ ?ç??æ??示(_D)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2641
+#: ../app/dialogs/preferences-dialog.c:2640
 msgid "Toolbox and other docks are transient to the active image window"
 msgstr "å·¥å?·ç®±å??å?¶ä»?å??é? æ ?对äº?æ´»å?¨å?¾å??çª?å?£æ?¯ä¸´æ?¶ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2646
+#: ../app/dialogs/preferences-dialog.c:2645
 msgid "Focus"
 msgstr "��"
 
-#: ../app/dialogs/preferences-dialog.c:2650
+#: ../app/dialogs/preferences-dialog.c:2649
 msgid "Activate the _focused image"
 msgstr "æ¿?æ´»è?·å¾?ç?¦ç?¹ç??å?¾å??(_F)"
 
 #. Window Positions
-#: ../app/dialogs/preferences-dialog.c:2654
+#: ../app/dialogs/preferences-dialog.c:2653
 msgid "Window Positions"
 msgstr "���置"
 
-#: ../app/dialogs/preferences-dialog.c:2657
+#: ../app/dialogs/preferences-dialog.c:2656
 msgid "_Save window positions on exit"
 msgstr "é??å?ºæ?¶ä¿?å­?çª?å?£ä½?ç½®(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2661
+#: ../app/dialogs/preferences-dialog.c:2660
 msgid "Save Window Positions _Now"
 msgstr "�������置(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2668
+#: ../app/dialogs/preferences-dialog.c:2667
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr "é??置已ä¿?å­?ç??çª?å?£ä½?ç½®å?°é»?认å?¼(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2683
+#: ../app/dialogs/preferences-dialog.c:2682
 msgid "Folders"
 msgstr "æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2703
+#: ../app/dialogs/preferences-dialog.c:2702
 msgid "Temporary folder:"
 msgstr "临æ?¶æ??件夹ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2704
+#: ../app/dialogs/preferences-dialog.c:2703
 msgid "Select Folder for Temporary Files"
 msgstr "为临æ?¶æ??件é??æ?©æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2708
+#: ../app/dialogs/preferences-dialog.c:2707
 msgid "Swap folder:"
 msgstr "交æ?¢æ??件夹ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2709
+#: ../app/dialogs/preferences-dialog.c:2708
 msgid "Select Swap Folder"
 msgstr "é??æ?©äº¤æ?¢æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/dialogs/preferences-dialog.c:2743
 msgid "Brush Folders"
 msgstr "ç?»ç¬?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2745
 msgid "Select Brush Folders"
 msgstr "é??æ?©ç?»ç¬?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2747
 msgid "Pattern Folders"
 msgstr "å?¾æ¡?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2749
 msgid "Select Pattern Folders"
 msgstr "é??æ?©å?¾æ¡?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2752
+#: ../app/dialogs/preferences-dialog.c:2751
 msgid "Palette Folders"
 msgstr "è?²æ?¿æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2754
+#: ../app/dialogs/preferences-dialog.c:2753
 msgid "Select Palette Folders"
 msgstr "é??æ?©è?²æ?¿æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2755
 msgid "Gradient Folders"
 msgstr "æ¸?å??æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2758
+#: ../app/dialogs/preferences-dialog.c:2757
 msgid "Select Gradient Folders"
 msgstr "é??æ?©æ¸?å??æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2759
 msgid "Font Folders"
 msgstr "å­?ä½?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2762
+#: ../app/dialogs/preferences-dialog.c:2761
 msgid "Select Font Folders"
 msgstr "é??æ?©å­?ä½?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2763
 msgid "Plug-In Folders"
 msgstr "æ??件æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2766
+#: ../app/dialogs/preferences-dialog.c:2765
 msgid "Select Plug-In Folders"
 msgstr "é??æ?©æ??件æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2768
+#: ../app/dialogs/preferences-dialog.c:2767
 msgid "Scripts"
 msgstr "è??æ?¬"
 
-#: ../app/dialogs/preferences-dialog.c:2768
+#: ../app/dialogs/preferences-dialog.c:2767
 msgid "Script-Fu Folders"
 msgstr "è??æ?¬æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2770
+#: ../app/dialogs/preferences-dialog.c:2769
 msgid "Select Script-Fu Folders"
 msgstr "é??æ?©è??æ?¬æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2772
+#: ../app/dialogs/preferences-dialog.c:2771
 msgid "Module Folders"
 msgstr "模å??æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2774
+#: ../app/dialogs/preferences-dialog.c:2773
 msgid "Select Module Folders"
 msgstr "é??æ?©æ¨¡å??æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2776
+#: ../app/dialogs/preferences-dialog.c:2775
 msgid "Interpreters"
 msgstr "解é??å?¨"
 
-#: ../app/dialogs/preferences-dialog.c:2776
+#: ../app/dialogs/preferences-dialog.c:2775
 msgid "Interpreter Folders"
 msgstr "解é??å?¨æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2778
+#: ../app/dialogs/preferences-dialog.c:2777
 msgid "Select Interpreter Folders"
 msgstr "é??æ?©è§£é??å?¨æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2780
+#: ../app/dialogs/preferences-dialog.c:2779
 msgid "Environment Folders"
 msgstr "ç?¯å¢?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2782
+#: ../app/dialogs/preferences-dialog.c:2781
 msgid "Select Environment Folders"
 msgstr "é??æ?©ç?¯å¢?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2784
+#: ../app/dialogs/preferences-dialog.c:2783
 msgid "Themes"
 msgstr "主�"
 
-#: ../app/dialogs/preferences-dialog.c:2784
+#: ../app/dialogs/preferences-dialog.c:2783
 msgid "Theme Folders"
 msgstr "主é¢?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2786
+#: ../app/dialogs/preferences-dialog.c:2785
 msgid "Select Theme Folders"
 msgstr "é??æ?©ä¸»é¢?æ??件夹"
 
@@ -8002,58 +9441,56 @@ msgid "Print Size"
 msgstr "æ??å?°å¤§å°?"
 
 #. the image size labels
-#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:202
-#: ../app/widgets/gimptemplateeditor.c:161
+#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:201
+#: ../app/widgets/gimptemplateeditor.c:160
 msgid "_Width:"
 msgstr "宽度(_W)�"
 
-#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:206
-#: ../app/widgets/gimptemplateeditor.c:168
+#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:205
+#: ../app/widgets/gimptemplateeditor.c:167
 msgid "H_eight:"
 msgstr "�度(_E)�"
 
 #. the resolution labels
-#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:264
-#: ../app/widgets/gimptemplateeditor.c:288
+#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:263
+#: ../app/widgets/gimptemplateeditor.c:287
 msgid "_X resolution:"
 msgstr "X å??辨ç??(_X)ï¼?"
 
-#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:267
-#: ../app/widgets/gimptemplateeditor.c:295
+#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:266
+#: ../app/widgets/gimptemplateeditor.c:294
 msgid "_Y resolution:"
 msgstr "Y å??辨ç??(_Y)ï¼?"
 
-#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:260
-#: ../app/widgets/gimptemplateeditor.c:308
+#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:259
+#: ../app/widgets/gimptemplateeditor.c:307
 #, c-format
 msgid "pixels/%a"
 msgstr "å??ç´ /%a"
 
-#: ../app/dialogs/quit-dialog.c:106
+#: ../app/dialogs/quit-dialog.c:105
 msgid "Quit GIMP"
 msgstr "é??å?º GIMP"
 
-#: ../app/dialogs/quit-dialog.c:106
+#: ../app/dialogs/quit-dialog.c:105
 msgid "Close All Images"
 msgstr "å?³é?­å?¨é?¨å?¾å??"
 
-#: ../app/dialogs/quit-dialog.c:165
+#: ../app/dialogs/quit-dialog.c:164
 msgid "If you quit GIMP now, these changes will be lost."
 msgstr "å¦?æ??æ?¨ç?°å?¨é??å?º GIMPï¼?è¿?äº?æ?´æ?¹å°?ä¼?丢失ã??"
 
-#: ../app/dialogs/quit-dialog.c:168
+#: ../app/dialogs/quit-dialog.c:167
 msgid "If you close these images now, changes will be lost."
 msgstr "å¦?æ??æ?¨ç?°å?¨å?³é?­è¿?äº?å?¾å??ï¼?æ?´æ?¹å°?ä¼?丢失ã??"
 
-#: ../app/dialogs/quit-dialog.c:216
-#, fuzzy, c-format
-#| msgid "There is one image with unsaved changes:"
+#: ../app/dialogs/quit-dialog.c:214
+#, c-format
 msgid "There is one image with unsaved changes:"
 msgid_plural "There are %d images with unsaved changes:"
-msgstr[0] "æ??å?¾å??ä¿®æ?¹å??è¿?没ä¿?å­?ï¼?"
-msgstr[1] "æ??å?¾å??ä¿®æ?¹å??è¿?没ä¿?å­?ï¼?"
+msgstr[0] "æ?? %d å¹?ä¿®æ?¹å??è¿?没ä¿?å­?ç??å?¾å??ï¼?"
 
-#: ../app/dialogs/quit-dialog.c:238
+#: ../app/dialogs/quit-dialog.c:236
 msgid "_Discard Changes"
 msgstr "��修�(_D)"
 
@@ -8069,24 +9506,24 @@ msgstr "��大�"
 msgid "Resize _layers:"
 msgstr "����大�(_L)�"
 
-#: ../app/dialogs/resolution-calibrate-dialog.c:70
+#: ../app/dialogs/resolution-calibrate-dialog.c:69
 msgid "Calibrate Monitor Resolution"
 msgstr "ç??è§?å?¨å??辨ç??æµ?å®?"
 
-#: ../app/dialogs/resolution-calibrate-dialog.c:128
+#: ../app/dialogs/resolution-calibrate-dialog.c:127
 msgid "Measure the rulers and enter their lengths:"
 msgstr "æµ?é??å°ºå­?并è¾?å?¥å®?们ç??é?¿åº¦ï¼?"
 
-#: ../app/dialogs/resolution-calibrate-dialog.c:153
+#: ../app/dialogs/resolution-calibrate-dialog.c:152
 msgid "_Horizontal:"
 msgstr "æ°´å¹³(_H)ï¼?"
 
-#: ../app/dialogs/resolution-calibrate-dialog.c:158
+#: ../app/dialogs/resolution-calibrate-dialog.c:157
 msgid "_Vertical:"
 msgstr "å??ç?´(_V)ï¼?"
 
 #. Image size frame
-#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:139
+#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:138
 msgid "Image Size"
 msgstr "å?¾å??大å°?"
 
@@ -8104,49 +9541,49 @@ msgid ""
 "interpolation type will affect channels and layer masks only."
 msgstr "ç´¢å¼?é¢?è?²å?¾å±?缩æ?¾æ?¶æ?»ä¸?æ??å?¼ã??æ??é??ç??æ??å?¼ç±»å??å°?å?ªå½±å??é??é??å??è??æ?¿ã??"
 
-#: ../app/dialogs/stroke-dialog.c:102
+#: ../app/dialogs/stroke-dialog.c:97
 msgid "Choose Stroke Style"
 msgstr "é??æ?©å?¾ç?»ç±»å??"
 
-#: ../app/dialogs/stroke-dialog.c:225
+#: ../app/dialogs/stroke-dialog.c:221
 msgid "Paint tool:"
 msgstr "��工��"
 
-#: ../app/dialogs/stroke-dialog.c:246
+#: ../app/dialogs/stroke-dialog.c:235
 msgid "_Emulate brush dynamics"
 msgstr "模æ??å?¨æ??ç?»ç¬?(_E)"
 
-#: ../app/dialogs/tips-dialog.c:89
+#: ../app/dialogs/tips-dialog.c:88
 msgid "The GIMP tips file is empty!"
 msgstr "GIMP æ??示æ??件为空ï¼?"
 
-#: ../app/dialogs/tips-dialog.c:93
+#: ../app/dialogs/tips-dialog.c:92
 msgid "The GIMP tips file appears to be missing!"
 msgstr "æ?¨ç?? GIMP æ??示æ??件似ä¹?丢äº?ï¼?"
 
-#: ../app/dialogs/tips-dialog.c:95
+#: ../app/dialogs/tips-dialog.c:94
 #, c-format
 msgid "There should be a file called '%s'. Please check your installation."
 msgstr "åº?该å­?å?¨ä¸?个å?«â??%sâ??ç??æ??件ã??请æ£?æ?¥æ?¨ç??å®?è£?ã??"
 
-#: ../app/dialogs/tips-dialog.c:101
+#: ../app/dialogs/tips-dialog.c:100
 msgid "The GIMP tips file could not be parsed!"
 msgstr "æ? æ³?解æ?? GIMP æ??示æ??件ï¼?"
 
-#: ../app/dialogs/tips-dialog.c:129
+#: ../app/dialogs/tips-dialog.c:128
 msgid "GIMP Tip of the Day"
 msgstr "GIMP æ?¥ç§¯æ??ç´¯"
 
-#: ../app/dialogs/tips-dialog.c:135
+#: ../app/dialogs/tips-dialog.c:134
 msgid "_Previous Tip"
 msgstr "å??ä¸?æ?¡æ??示(_P)"
 
-#: ../app/dialogs/tips-dialog.c:141
+#: ../app/dialogs/tips-dialog.c:140
 msgid "_Next Tip"
 msgstr "å??ä¸?æ?¡æ??示(_N)"
 
 #. a link to the related section in the user manual
-#: ../app/dialogs/tips-dialog.c:194
+#: ../app/dialogs/tips-dialog.c:193
 msgid "Learn more"
 msgstr "�解��"
 
@@ -8155,23 +9592,23 @@ msgstr "�解��"
 #. 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:188
+#: ../app/dialogs/tips-parser.c:187
 msgid "tips-locale:C"
 msgstr "tips-locale:zh_CN"
 
-#: ../app/dialogs/user-install-dialog.c:85
+#: ../app/dialogs/user-install-dialog.c:84
 msgid "GIMP User Installation"
 msgstr "GIMP ����"
 
-#: ../app/dialogs/user-install-dialog.c:94
+#: ../app/dialogs/user-install-dialog.c:93
 msgid "User installation failed!"
 msgstr "����失败�"
 
-#: ../app/dialogs/user-install-dialog.c:96
+#: ../app/dialogs/user-install-dialog.c:95
 msgid "The GIMP user installation failed; see the log for details."
 msgstr "GIMP ç?¨æ?·å®?è£?失败ï¼?ç»?è??请æ?¥ç??æ?¥å¿?ã??"
 
-#: ../app/dialogs/user-install-dialog.c:99
+#: ../app/dialogs/user-install-dialog.c:98
 msgid "Installation Log"
 msgstr "����"
 
@@ -8192,7 +9629,7 @@ msgid "Import Paths from SVG"
 msgstr "� SVG 导�路�"
 
 #: ../app/dialogs/vectors-import-dialog.c:92
-#: ../app/widgets/gimpprofilechooserdialog.c:132
+#: ../app/widgets/gimpprofilechooserdialog.c:131
 msgid "All files (*.*)"
 msgstr "æ??æ??æ??件(*.*)"
 
@@ -8213,123 +9650,180 @@ msgid "Path name:"
 msgstr "è·¯å¾?å??å­?ï¼?"
 
 #: ../app/display/display-enums.c:24
+msgctxt "cursor-mode"
 msgid "Tool icon"
 msgstr "工���"
 
 #: ../app/display/display-enums.c:25
+msgctxt "cursor-mode"
 msgid "Tool icon with crosshair"
 msgstr "带交å??线ç??å·¥å?·å?¾æ ?"
 
 #: ../app/display/display-enums.c:26
+msgctxt "cursor-mode"
 msgid "Crosshair only"
 msgstr "ä»?交å??线"
 
-#: ../app/display/display-enums.c:85
+#: ../app/display/display-enums.c:87
+msgctxt "canvas-padding-mode"
 msgid "From theme"
 msgstr "å??è?ªä¸»é¢?"
 
-#: ../app/display/display-enums.c:86
+#: ../app/display/display-enums.c:88
+msgctxt "canvas-padding-mode"
 msgid "Light check color"
 msgstr "æµ?è?²æ?¹æ ¼ç??é¢?è?²"
 
-#: ../app/display/display-enums.c:87
+#: ../app/display/display-enums.c:89
+msgctxt "canvas-padding-mode"
 msgid "Dark check color"
 msgstr "æ·±è?²æ?¹æ ¼ç??é¢?è?²"
 
-#: ../app/display/display-enums.c:88
+#: ../app/display/display-enums.c:90
+msgctxt "canvas-padding-mode"
 msgid "Custom color"
 msgstr "�����"
 
-#: ../app/display/display-enums.c:116
+#: ../app/display/display-enums.c:119
+msgctxt "space-bar-action"
 msgid "No action"
 msgstr "���"
 
-#: ../app/display/display-enums.c:117
+#: ../app/display/display-enums.c:120
+msgctxt "space-bar-action"
 msgid "Pan view"
 msgstr "平移��"
 
-#: ../app/display/display-enums.c:118
+#: ../app/display/display-enums.c:121
+msgctxt "space-bar-action"
 msgid "Switch to Move tool"
 msgstr "å??æ?¢å?°ç§»å?¨å·¥å?·"
 
-#: ../app/display/display-enums.c:145
-msgid "quality|Low"
+#: ../app/display/display-enums.c:149
+msgctxt "zoom-quality"
+msgid "Low"
 msgstr "ä½?"
 
-#: ../app/display/display-enums.c:146
-msgid "quality|High"
+#: ../app/display/display-enums.c:150
+msgctxt "zoom-quality"
+msgid "High"
+msgstr "é«?"
+
+#: ../app/display/gimpcursorview.c:212 ../app/display/gimpcursorview.c:218
+#: ../app/display/gimpcursorview.c:237 ../app/display/gimpcursorview.c:243
+#: ../app/display/gimpcursorview.c:262 ../app/display/gimpcursorview.c:268
+#: ../app/display/gimpcursorview.c:284 ../app/display/gimpcursorview.c:291
+#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673
+#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675
+#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789
+#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791
+#: ../app/widgets/gimpcolorframe.c:623
+msgid "n/a"
+msgstr "n/a"
+
+#: ../app/display/gimpcursorview.c:215 ../app/display/gimpcursorview.c:240
+#: ../app/display/gimpcursorview.c:265
+msgid "X"
+msgstr "X"
+
+#: ../app/display/gimpcursorview.c:221 ../app/display/gimpcursorview.c:246
+#: ../app/display/gimpcursorview.c:271
+msgid "Y"
+msgstr "Y"
+
+#. Units
+#: ../app/display/gimpcursorview.c:227
+msgid "Units"
+msgstr "å??ä½?"
+
+#. Selection Bounding Box
+#: ../app/display/gimpcursorview.c:252
+msgid "Selection Bounding Box"
+msgstr "é??å?ºå??å?´æ¡?"
+
+#. Width
+#: ../app/display/gimpcursorview.c:288
+msgid "W"
+msgstr "宽"
+
+#. Height
+#: ../app/display/gimpcursorview.c:295
+msgid "H"
 msgstr "é«?"
 
-#: ../app/display/gimpdisplay-handlers.c:160
+#: ../app/display/gimpcursorview.c:322
+msgid "_Sample Merged"
+msgstr "ä½?æ ·å??并(_S)"
+
+#: ../app/display/gimpdisplay-handlers.c:169
 #, c-format
 msgid "Image saved to '%s'"
 msgstr "å?¾å??å·²ä¿?å­?å?°â??%sâ??"
 
-#: ../app/display/gimpdisplayshell.c:1033
+#: ../app/display/gimpdisplay-handlers.c:183
+#, c-format
+msgid "Image exported to '%s'"
+msgstr "å?¾å??已导å?ºå?°â??%sâ??"
+
+#: ../app/display/gimpdisplayshell.c:1077
 msgid "Access the image menu"
 msgstr "æ??ä½?å?¾å??è??å??"
 
-#: ../app/display/gimpdisplayshell.c:1138
+#: ../app/display/gimpdisplayshell.c:1182
 msgid "Zoom image when window size changes"
 msgstr "å½?çª?å?£å¤§å°?æ?¹å??æ?¶ç¼©æ?¾å?¾å??"
 
-#: ../app/display/gimpdisplayshell.c:1188
+#: ../app/display/gimpdisplayshell.c:1211
+msgid "Toggle Quick Mask"
+msgstr "å??æ?¢å¿«é??è??æ?¿"
+
+#: ../app/display/gimpdisplayshell.c:1232
 msgid "Navigate the image display"
 msgstr "导è?ªå?¾å??æ?¾ç¤º"
 
-#: ../app/display/gimpdisplayshell.c:1283
-#: ../app/display/gimpdisplayshell.c:1373 ../app/widgets/gimptoolbox.c:222
+#: ../app/display/gimpdisplayshell.c:1327
+#: ../app/display/gimpdisplayshell.c:1417 ../app/widgets/gimptoolbox.c:220
 msgid "Drop image files here to open them"
 msgstr "æ??å?¨å?¾å??å?°æ­¤å¤?以æ??å¼?"
 
-#: ../app/display/gimpdisplayshell-close.c:147
-#: ../app/display/gimpdisplayshell-close.c:224
+#: ../app/display/gimpdisplayshell-close.c:146
+#: ../app/display/gimpdisplayshell-close.c:216
 #, c-format
 msgid "Close %s"
 msgstr "�� %s"
 
-#: ../app/display/gimpdisplayshell-close.c:159
-msgid "Do_n't Save"
-msgstr "���(_N)"
+#: ../app/display/gimpdisplayshell-close.c:157
+msgid "Close _without Saving"
+msgstr "å?³é?­è??ä¸?ä¿?å­?(_W)"
 
-#: ../app/display/gimpdisplayshell-close.c:231
+#: ../app/display/gimpdisplayshell-close.c:224
 #, c-format
 msgid "Save the changes to image '%s' before closing?"
-msgstr "å?³é?­å?¾å?? â??%sâ?? å??ä¿?å­?ä¿®æ?¹å??ï¼?"
+msgstr "å?³é?­å?¾å??â??%sâ??å??ä¿?å­?ä¿®æ?¹å??ï¼?"
 
-#: ../app/display/gimpdisplayshell-close.c:254
-#, fuzzy, c-format
-#| msgid ""
-#| "If you don't save the image, changes from the last hour will be lost."
+#: ../app/display/gimpdisplayshell-close.c:246
+#, 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."
-msgstr[0] "å¦?æ??æ?¨ç?°å?¨å?³é?­è¿?äº?å?¾å??ï¼?æ??è¿?ä¸?å°?æ?¶ç??æ?´æ?¹å°?ä¼?丢失ã??"
-msgstr[1] "å¦?æ??æ?¨ç?°å?¨å?³é?­è¿?äº?å?¾å??ï¼?æ??è¿?ä¸?å°?æ?¶ç??æ?´æ?¹å°?ä¼?丢失ã??"
+msgstr[0] "å¦?æ??æ?¨ä¸?ä¿?å­?å?¾å??ï¼?æ??è¿? %d å°?æ?¶å??ç??æ?´æ?¹å°?ä¼?丢失ã??"
 
-#: ../app/display/gimpdisplayshell-close.c:264
-#, fuzzy, c-format
-#| msgid ""
-#| "If you don't save the image, changes from the last hour and %d minute "
-#| "will be lost.be lost."
+#: ../app/display/gimpdisplayshell-close.c:256
+#, 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."
-msgstr[0] "å¦?æ??æ?¨ä¸?ä¿?å­?å?¾å??ï¼?ä»?1å°?æ?¶é?¶ %d å??é??å??æ??ä½?ç??ä¿®æ?¹å°?ä¼?丢失ã??"
-msgstr[1] "å¦?æ??æ?¨ä¸?ä¿?å­?å?¾å??ï¼?ä»?1å°?æ?¶é?¶ %d å??é??å??æ??ä½?ç??ä¿®æ?¹å°?ä¼?丢失ã??"
+msgstr[0] "å¦?æ??æ?¨ä¸?ä¿?å­?å?¾å??ï¼?æ??è¿? 1 å°?æ?¶é?¶ %d å??é??å??ç??ä¿®æ?¹å°?ä¼?丢失ã??"
 
-#: ../app/display/gimpdisplayshell-close.c:275
-#, fuzzy, c-format
-#| msgid ""
-#| "If you don't save the image, changes from the last minute will be lost."
+#: ../app/display/gimpdisplayshell-close.c:267
+#, 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."
-msgstr[0] "å¦?æ??æ?¨ç?°å?¨å?³é?­è¿?äº?å?¾å??ï¼?æ??è¿?1å??é??ç??æ?´æ?¹å°?ä¼?丢失ã??"
-msgstr[1] "å¦?æ??æ?¨ç?°å?¨å?³é?­è¿?äº?å?¾å??ï¼?æ??è¿?1å??é??ç??æ?´æ?¹å°?ä¼?丢失ã??"
+msgstr[0] "å¦?æ??æ?¨ä¸?ä¿?å­?å?¾å??ï¼?æ??è¿? %d å??é??å??ç??æ?´æ?¹å°?ä¼?丢失ã??"
 
 #: ../app/display/gimpdisplayshell-dnd.c:255
 #: ../app/display/gimpdisplayshell-dnd.c:587
@@ -8342,12 +9836,12 @@ msgid "Drop New Path"
 msgstr "æ??æ?¾å?¥æ?°è·¯å¾?"
 
 #: ../app/display/gimpdisplayshell-dnd.c:497
-#: ../app/widgets/gimplayertreeview.c:719
+#: ../app/widgets/gimplayertreeview.c:746
 msgid "Drop layers"
 msgstr "æ??æ?¾å?¥å?¾å±?"
 
 #: ../app/display/gimpdisplayshell-dnd.c:648
-#: ../app/widgets/gimplayertreeview.c:801 ../app/widgets/gimptoolbox-dnd.c:361
+#: ../app/widgets/gimplayertreeview.c:828 ../app/widgets/gimptoolbox-dnd.c:361
 msgid "Dropped Buffer"
 msgstr "�����"
 
@@ -8363,98 +9857,82 @@ msgstr "é??ç½®é¢?è?²æ?¾ç¤ºæ»¤é??"
 msgid "Layer Select"
 msgstr "å?¾å±?é??æ?©"
 
-#: ../app/display/gimpdisplayshell-scale-dialog.c:114
+#: ../app/display/gimpdisplayshell-scale-dialog.c:113
 msgid "Zoom Ratio"
 msgstr "缩æ?¾æ¯?ç??"
 
-#: ../app/display/gimpdisplayshell-scale-dialog.c:116
+#: ../app/display/gimpdisplayshell-scale-dialog.c:115
 msgid "Select Zoom Ratio"
 msgstr "é??æ?©ç¼©æ?¾æ¯?ç??"
 
-#: ../app/display/gimpdisplayshell-scale-dialog.c:159
+#: ../app/display/gimpdisplayshell-scale-dialog.c:158
 msgid "Zoom ratio:"
 msgstr "缩æ?¾æ¯?ç??ï¼?"
 
-#: ../app/display/gimpdisplayshell-scale-dialog.c:184
+#: ../app/display/gimpdisplayshell-scale-dialog.c:183
 msgid "Zoom:"
 msgstr "缩��"
 
-#: ../app/display/gimpdisplayshell-title.c:233
-msgid "RGB-empty"
-msgstr "RGB-空"
-
-#: ../app/display/gimpdisplayshell-title.c:236
-msgid "grayscale-empty"
-msgstr "�度-空"
-
-#: ../app/display/gimpdisplayshell-title.c:236
-msgid "grayscale"
-msgstr "�度"
-
-#: ../app/display/gimpdisplayshell-title.c:239
-msgid "indexed-empty"
-msgstr "索�-空"
-
-#: ../app/display/gimpdisplayshell-title.c:239
-msgid "indexed"
-msgstr "索�"
-
-#: ../app/display/gimpdisplayshell-title.c:293
+#: ../app/display/gimpdisplayshell-title.c:284
 msgid "(modified)"
 msgstr "(已修�)"
 
-#: ../app/display/gimpdisplayshell-title.c:298
+#: ../app/display/gimpdisplayshell-title.c:289
 msgid "(clean)"
 msgstr "(å¹²å??)"
 
-#: ../app/display/gimpdisplayshell-title.c:346
-#: ../app/display/gimpdisplayshell-title.c:359
-#: ../app/widgets/gimpactiongroup.c:805
+#: ../app/display/gimpdisplayshell-title.c:337
+#: ../app/display/gimpdisplayshell-title.c:350
+#: ../app/widgets/gimpactiongroup.c:888
 msgid "(none)"
 msgstr "(æ? )"
 
+#. image name and source as shown in the title of
+#. the image window
+#: ../app/display/gimpdisplayshell-title.c:454
+#, c-format
+msgid "%s (imported from %s)"
+msgstr "%s (导�� %s)"
+
 #: ../app/display/gimpstatusbar.c:346
 #, c-format
 msgid "Cancel <i>%s</i>"
 msgstr "å??æ¶? <i>%s</i>"
 
-#: ../app/file/file-open.c:131 ../app/file/file-save.c:111
-#, c-format
+#: ../app/file/file-open.c:133 ../app/file/file-save.c:112
 msgid "Not a regular file"
 msgstr "ä¸?æ?¯æ?®é??æ??件"
 
-#: ../app/file/file-open.c:183
+#: ../app/file/file-open.c:185
 #, c-format
 msgid "%s plug-in returned SUCCESS but did not return an image"
 msgstr "%s æ??件æ??å??è¿?å??(SUCCESS)ä½?没æ??è¿?å??å?¾å??"
 
-#: ../app/file/file-open.c:194
+#: ../app/file/file-open.c:196
 #, c-format
 msgid "%s plug-In could not open image"
 msgstr "%s æ??件æ? æ³?æ??å¼?å?¾å??"
 
-#: ../app/file/file-open.c:455
-#, c-format
+#: ../app/file/file-open.c:517
 msgid "Image doesn't contain any layers"
 msgstr "å?¾å??没æ??å??å?«ä»»ä½?å?¾å±?"
 
-#: ../app/file/file-open.c:505
+#: ../app/file/file-open.c:570
 #, c-format
 msgid "Opening '%s' failed: %s"
 msgstr "æ??å¼?â??%sâ??失败ï¼?%s"
 
-#: ../app/file/file-open.c:613
+#: ../app/file/file-open.c:676
 msgid ""
 "Color management has been disabled. It can be enabled again in the "
 "Preferences dialog."
 msgstr "è?²å½©ç®¡ç??已被ç¦?ç?¨ã??å®?å?¯ä»¥å?¨é¦?é??项对è¯?æ¡?æ?¯è¢«å??次å?¯ç?¨ã??"
 
-#: ../app/file/file-procedure.c:200
-#, c-format
+#: ../app/file/file-procedure.c:198
 msgid "Unknown file type"
 msgstr "æ?ªç?¥æ??件类å??"
 
-#: ../app/file/file-save.c:192
+#: ../app/file/file-save.c:185
 #, c-format
 msgid "%s plug-in could not save image"
 msgstr "%s æ??件æ? æ³?ä¿?å­?å?¾å??"
@@ -8464,464 +9942,478 @@ msgstr "%s æ??件æ? æ³?ä¿?å­?å?¾å??"
 msgid "'%s:' is not a valid URI scheme"
 msgstr "â??%s:â??ä¸?æ?¯å??æ³?ç?? URI æ ¼å¼?"
 
-#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:122
-#, c-format
+#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126
 msgid "Invalid character sequence in URI"
 msgstr "URI 中æ??æ? æ??ç??å­?符åº?å??"
 
 #: ../app/gegl/gimpcurvesconfig.c:384
-#, c-format
 msgid "not a GIMP Curves file"
 msgstr "ä¸?æ?¯ GIMP æ?²çº¿æ??件"
 
-#: ../app/gegl/gimpcurvesconfig.c:398 ../app/gegl/gimplevelsconfig.c:711
-#, c-format
+#: ../app/gegl/gimpcurvesconfig.c:399 ../app/gegl/gimplevelsconfig.c:710
 msgid "parse error"
 msgstr "解æ??é??误"
 
-#: ../app/gegl/gimplevelsconfig.c:664
-#, c-format
+#: ../app/gegl/gimplevelsconfig.c:663
 msgid "not a GIMP Levels file"
 msgstr "ä¸?æ?¯ GIMP è?²é?¶æ??件"
 
 #. initialize the document history
-#: ../app/gui/gui.c:420
+#: ../app/gui/gui.c:425
 msgid "Documents"
 msgstr "æ??æ¡£"
 
-#: ../app/gui/splash.c:116
+#: ../app/gui/splash.c:115
 msgid "GIMP Startup"
 msgstr "GIMP ��"
 
-#: ../app/paint/gimpairbrush.c:69 ../app/tools/gimpairbrushtool.c:54
+#: ../app/paint/gimpairbrush.c:70 ../app/tools/gimpairbrushtool.c:53
 msgid "Airbrush"
 msgstr "å?·æ?ª"
 
-#: ../app/paint/gimpbrushcore.c:353
-#, c-format
+#: ../app/paint/gimpbrushcore.c:370
 msgid "No brushes available for use with this tool."
 msgstr "没æ??å?¯ä¾?此工å?·ä½¿ç?¨ç??ç?»ç¬?ã??"
 
-#: ../app/paint/gimpclone.c:99 ../app/tools/gimpclonetool.c:61
+#: ../app/paint/gimpclone.c:100 ../app/tools/gimpclonetool.c:60
 msgid "Clone"
 msgstr "å??é??"
 
-#: ../app/paint/gimpclone.c:140
-#, c-format
+#: ../app/paint/gimpclone.c:141
 msgid "No patterns available for use with this tool."
 msgstr "没æ??å?¯ä¾?此工å?·ä½¿ç?¨ç??å?¾æ¡?ã??"
 
-#: ../app/paint/gimpconvolve.c:77
+#: ../app/paint/gimpconvolve.c:78
 msgid "Convolve"
 msgstr "�积"
 
-#: ../app/paint/gimpdodgeburn.c:87
+#: ../app/paint/gimpdodgeburn.c:88
 msgid "Dodge/Burn"
 msgstr "å??æ·¡/å? æ·±"
 
-#: ../app/paint/gimperaser.c:62 ../app/tools/gimperasertool.c:66
+#: ../app/paint/gimperaser.c:63 ../app/tools/gimperasertool.c:65
 msgid "Eraser"
 msgstr "æ©¡ç?®"
 
-#: ../app/paint/gimpheal.c:115 ../app/tools/gimphealtool.c:53
+#: ../app/paint/gimpheal.c:116 ../app/tools/gimphealtool.c:52
 msgid "Heal"
 msgstr "å¤?å??"
 
-#: ../app/paint/gimpheal.c:154
-#, c-format
+#: ../app/paint/gimpheal.c:155
 msgid "Healing does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?å¤?å??æ??ä½?ã??"
 
-#: ../app/paint/gimppaintbrush.c:63 ../app/tools/gimppaintbrushtool.c:51
+#: ../app/paint/gimpink.c:97 ../app/tools/gimpinktool.c:54
+msgid "Ink"
+msgstr "墨水"
+
+#: ../app/paint/gimpinkoptions.c:72
+msgid "Ink Blob Size"
+msgstr "墨æ??大å°?"
+
+#: ../app/paint/gimpinkoptions.c:99
+msgid "Ink Blob Aspect Ratio"
+msgstr "墨æ??宽é«?æ¯?"
+
+#: ../app/paint/gimpinkoptions.c:103
+msgid "Ink Blob Angle"
+msgstr "墨æ??è§?度"
+
+#: ../app/paint/gimppaintbrush.c:63 ../app/tools/gimppaintbrushtool.c:50
 msgid "Paintbrush"
 msgstr "��"
 
-#: ../app/paint/gimppaintcore-stroke.c:332
-#, c-format
+#: ../app/paint/gimppaintcore-stroke.c:335
 msgid "Not enough points to stroke"
 msgstr "ä¸?足å¤?ç??ç¬?ç?»ç?¹"
 
-#: ../app/paint/gimppencil.c:42 ../app/tools/gimppenciltool.c:51
+#: ../app/paint/gimppaintcore.c:140
+msgid "Paint"
+msgstr "��"
+
+#: ../app/paint/gimppaintoptions.c:245
+msgid "Brush Scale"
+msgstr "��缩�"
+
+#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50
 msgid "Pencil"
 msgstr "é??ç¬?"
 
-#: ../app/paint/gimpperspectiveclone.c:97 ../app/paint/paint-enums.c:52
+#: ../app/paint/gimpperspectiveclone.c:98
 #: ../app/tools/gimpperspectiveclonetool.c:126
 msgid "Perspective Clone"
 msgstr "é??è§?å??é??"
 
-#: ../app/paint/gimpperspectiveclone.c:162
-#, c-format
+#: ../app/paint/gimpperspectiveclone.c:163
 msgid "Perspective Clone does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?é??è§?å??é??æ??ä½?ã??"
 
-#: ../app/paint/gimpsmudge.c:78 ../app/tools/gimpsmudgetool.c:53
+#: ../app/paint/gimpsmudge.c:81 ../app/tools/gimpsmudgetool.c:52
 msgid "Smudge"
 msgstr "��"
 
-#: ../app/paint/gimpsourcecore.c:227
-#, c-format
+#: ../app/paint/gimpsourcecore.c:230
 msgid "Set a source image first."
 msgstr "å??设置æº?å?¾å??ã??"
 
-#: ../app/paint/paint-enums.c:51
+#: ../app/paint/paint-enums.c:52
+msgctxt "perspective-clone-mode"
 msgid "Modify Perspective"
 msgstr "ä¿®æ?¹é??è§?"
 
-#: ../app/paint/paint-enums.c:82
+#: ../app/paint/paint-enums.c:53
+msgctxt "perspective-clone-mode"
+msgid "Perspective Clone"
+msgstr "é??è§?å??é??"
+
+#: ../app/paint/paint-enums.c:83
+msgctxt "source-align-mode"
+msgid "None"
+msgstr "æ? "
+
+#: ../app/paint/paint-enums.c:84
+msgctxt "source-align-mode"
 msgid "Aligned"
 msgstr "已对�"
 
-#: ../app/paint/paint-enums.c:83
+#: ../app/paint/paint-enums.c:85
+msgctxt "source-align-mode"
 msgid "Registered"
 msgstr "已记�"
 
-#: ../app/paint/paint-enums.c:84
+#: ../app/paint/paint-enums.c:86
+msgctxt "source-align-mode"
 msgid "Fixed"
 msgstr "��"
 
-#: ../app/paint/paint-enums.c:111
+#: ../app/paint/paint-enums.c:114
+msgctxt "convolve-type"
 msgid "Blur"
 msgstr "模�"
 
-#: ../app/paint/paint-enums.c:112
+#: ../app/paint/paint-enums.c:115
+msgctxt "convolve-type"
 msgid "Sharpen"
 msgstr "é??å??"
 
-#: ../app/pdb/channel-cmds.c:183
+#: ../app/pdb/channel-cmds.c:182
 msgid "Combine Masks"
 msgstr "ç»?å??è??ç??"
 
-#: ../app/pdb/drawable-transform-cmds.c:310
-#: ../app/pdb/drawable-transform-cmds.c:395
-#: ../app/pdb/transform-tools-cmds.c:146 ../app/tools/gimpperspectivetool.c:69
+#: ../app/pdb/drawable-cmds.c:884
+msgid "Plug-In"
+msgstr "æ??件"
+
+#: ../app/pdb/drawable-transform-cmds.c:309
+#: ../app/pdb/drawable-transform-cmds.c:394
+#: ../app/pdb/transform-tools-cmds.c:145 ../app/tools/gimpperspectivetool.c:69
 msgid "Perspective"
 msgstr "é??è§?"
 
-#: ../app/pdb/drawable-transform-cmds.c:832
-#: ../app/pdb/drawable-transform-cmds.c:904
-#: ../app/pdb/transform-tools-cmds.c:362 ../app/tools/gimpsheartool.c:111
+#: ../app/pdb/drawable-transform-cmds.c:831
+#: ../app/pdb/drawable-transform-cmds.c:903
+#: ../app/pdb/transform-tools-cmds.c:361 ../app/tools/gimpsheartool.c:110
 msgid "Shearing"
 msgstr "å??å??"
 
-#: ../app/pdb/drawable-transform-cmds.c:989
-#: ../app/pdb/transform-tools-cmds.c:438
+#: ../app/pdb/drawable-transform-cmds.c:988
+#: ../app/pdb/transform-tools-cmds.c:437
 msgid "2D Transform"
 msgstr "2D å??æ?¢"
 
-#: ../app/pdb/drawable-transform-cmds.c:1072
-#: ../app/pdb/drawable-transform-cmds.c:1165
-#: ../app/pdb/drawable-transform-cmds.c:1256
+#: ../app/pdb/drawable-transform-cmds.c:1071
+#: ../app/pdb/drawable-transform-cmds.c:1164
+#: ../app/pdb/drawable-transform-cmds.c:1255
 msgid "2D Transforming"
 msgstr "2D å??æ?¢"
 
-#: ../app/pdb/edit-cmds.c:709 ../app/tools/gimpblendtool.c:225
+#: ../app/pdb/edit-cmds.c:714 ../app/tools/gimpblendtool.c:226
 msgid "Blending"
 msgstr "æ··å??"
 
-#: ../app/pdb/floating-sel-cmds.c:63
-#, c-format
+#: ../app/pdb/floating-sel-cmds.c:64
 msgid "Cannot remove this layer because it is not a floating selection."
 msgstr "æ? æ³?å?ºå®?æ­¤å?¾å±?ï¼?å? ä¸ºå®?ä¸?æ?¯ä¸?个浮å?¨é??å?ºã??"
 
-#: ../app/pdb/floating-sel-cmds.c:95
-#, c-format
+#: ../app/pdb/floating-sel-cmds.c:96
 msgid "Cannot anchor this layer because it is not a floating selection."
 msgstr "æ? æ³?å?ºå®?æ­¤å?¾å±?ï¼?å? ä¸ºå®?ä¸?æ?¯ä¸?个浮å?¨é??å?ºã??"
 
-#: ../app/pdb/floating-sel-cmds.c:127
-#, c-format
+#: ../app/pdb/floating-sel-cmds.c:128
 msgid ""
 "Cannot convert this layer to a normal layer because it is not a floating "
 "selection."
 msgstr "æ? æ³?å?ºå®?æ­¤å?¾å±?ï¼?å? ä¸ºå®?ä¸?æ?¯ä¸?个浮å?¨é??å?ºã??"
 
-#: ../app/pdb/floating-sel-cmds.c:188
-#, c-format
-msgid "Cannot rigor this layer because it is not a floating selection."
-msgstr "æ? æ³?å?ºå®?æ­¤å?¾å±?ï¼?å? ä¸ºå®?ä¸?æ?¯ä¸?个浮å?¨é??å?ºã??"
-
-#: ../app/pdb/floating-sel-cmds.c:222
-#, c-format
-msgid "Cannot relax this layer because it is not a floating selection."
-msgstr "æ? æ³?å?ºå®?æ­¤å?¾å±?ï¼?å? ä¸ºå®?ä¸?æ?¯ä¸?个浮å?¨é??å?ºã??"
-
-#: ../app/pdb/gimppdb-query.c:300 ../app/pdb/gimppdb.c:307
-#: ../app/pdb/gimppdb.c:377
+#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:306
+#: ../app/pdb/gimppdb.c:376
 #, c-format
 msgid "Procedure '%s' not found"
-msgstr "��'%s'���"
+msgstr "â??%sâ??è¿?ç¨?æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:61
-#, c-format
+#: ../app/pdb/gimppdb-utils.c:58
 msgid "Invalid empty brush name"
 msgstr "æ? æ??ç??ç?»ç¬?å??称"
 
-#: ../app/pdb/gimppdb-utils.c:71
+#: ../app/pdb/gimppdb-utils.c:68
 #, c-format
 msgid "Brush '%s' not found"
-msgstr "'%s'�����"
+msgstr "â??%sâ??ç?»ç¬?æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:76
+#: ../app/pdb/gimppdb-utils.c:73
 #, c-format
 msgid "Brush '%s' is not editable"
-msgstr "'%s'������"
+msgstr "â??%sâ??ç?»ç¬?ä¸?å?¯ç¼?è¾?"
 
-#: ../app/pdb/gimppdb-utils.c:102
+#: ../app/pdb/gimppdb-utils.c:99
 #, c-format
 msgid "Brush '%s' is not a generated brush"
-msgstr "'%s'ä¸?æ?¯ä¸?个被ç??æ??ç??ç?»ç¬?"
+msgstr "â??%sâ??ä¸?æ?¯ä¸?个被ç??æ??ç??ç?»ç¬?"
 
-#: ../app/pdb/gimppdb-utils.c:122
-#, c-format
+#: ../app/pdb/gimppdb-utils.c:119
 msgid "Invalid empty pattern name"
 msgstr "æ? æ??ç??纹ç??å??称"
 
-#: ../app/pdb/gimppdb-utils.c:132
+#: ../app/pdb/gimppdb-utils.c:129
 #, c-format
 msgid "Pattern '%s' not found"
-msgstr "�� %s ���"
+msgstr "â??%sâ??å?¾æ¡?æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:152
-#, c-format
+#: ../app/pdb/gimppdb-utils.c:149
 msgid "Invalid empty gradient name"
 msgstr "æ? æ??ç??空æ¸?å??å??称"
 
-#: ../app/pdb/gimppdb-utils.c:162
+#: ../app/pdb/gimppdb-utils.c:159
 #, c-format
 msgid "Gradient '%s' not found"
-msgstr "æ¸?å?? %s æ?ªæ?¾å?°"
+msgstr "â??%sâ??æ¸?å??æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:167
+#: ../app/pdb/gimppdb-utils.c:164
 #, c-format
 msgid "Gradient '%s' is not editable"
-msgstr "'%s'æ¸?å??ä¸?å?¯ç¼?è¾?"
+msgstr "â??%sâ??æ¸?å??ä¸?å?¯ç¼?è¾?"
 
-#: ../app/pdb/gimppdb-utils.c:188
-#, c-format
+#: ../app/pdb/gimppdb-utils.c:185
 msgid "Invalid empty palette name"
 msgstr "æ? æ??ç??空è?²ç??å??称"
 
-#: ../app/pdb/gimppdb-utils.c:198
+#: ../app/pdb/gimppdb-utils.c:195
 #, c-format
 msgid "Palette '%s' not found"
-msgstr "�� %s ���"
+msgstr "â??%sâ??è?²æ?¿æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:203
+#: ../app/pdb/gimppdb-utils.c:200
 #, c-format
 msgid "Palette '%s' is not editable"
-msgstr "'%s'������"
+msgstr "â??%sâ??è?²æ?¿ä¸?å?¯ç¼?è¾?"
 
-#: ../app/pdb/gimppdb-utils.c:223
-#, c-format
+#: ../app/pdb/gimppdb-utils.c:220
 msgid "Invalid empty font name"
 msgstr "æ? æ??ç??å­?ä½?å??称"
 
-#: ../app/pdb/gimppdb-utils.c:233
+#: ../app/pdb/gimppdb-utils.c:230
 #, c-format
 msgid "Font '%s' not found"
-msgstr "'%s'�����"
+msgstr "â??%sâ??å­?ä½?æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:252
-#, c-format
+#: ../app/pdb/gimppdb-utils.c:249
 msgid "Invalid empty buffer name"
 msgstr "æ? æ??ç??ç¼?å­?åº?å??称"
 
-#: ../app/pdb/gimppdb-utils.c:262
+#: ../app/pdb/gimppdb-utils.c:259
 #, c-format
 msgid "Named buffer '%s' not found"
-msgstr "���'%s'没��"
+msgstr "â??%sâ??ç¼?å­?åº?没æ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:281
-#, c-format
+#: ../app/pdb/gimppdb-utils.c:278
 msgid "Invalid empty paint method name"
 msgstr "æ? æ??ç??ç»?å?¾æ?¹å¼?"
 
-#: ../app/pdb/gimppdb-utils.c:291
+#: ../app/pdb/gimppdb-utils.c:288
 #, c-format
 msgid "Paint method '%s' does not exist"
-msgstr "����'%s'���"
+msgstr "â??%sâ??ç»?å?¾æ?¹å¼?ä¸?å­?å?¨"
 
-#: ../app/pdb/gimppdb-utils.c:307
+#: ../app/pdb/gimppdb-utils.c:304
 #, c-format
 msgid ""
 "Item '%s' (%d) can not be used because it has not been added to an image"
-msgstr "'%s' (%d)ä¸?å?¯ç?¨ï¼?å? ä¸ºå®?æ?ªè¢«æ·»å? è?³å?¾å??"
+msgstr "â??%sâ?? (%d)ä¸?å?¯ç?¨ï¼?å? ä¸ºå®?æ?ªè¢«æ·»å? è?³å?¾å??"
 
-#: ../app/pdb/gimppdb-utils.c:329
+#: ../app/pdb/gimppdb-utils.c:326
 #, c-format
 msgid "Item '%s' (%d) has already been added to an image"
-msgstr "'%s' (%d)已被添å? è?³å?¾å??"
+msgstr "â??%sâ?? (%d)已被添å? è?³å?¾å??"
 
-#: ../app/pdb/gimppdb-utils.c:337
+#: ../app/pdb/gimppdb-utils.c:334
 #, c-format
 msgid "Trying to add item '%s' (%d) to wrong image"
-msgstr "è¯?å?¾æ·»å? '%s' (%d)å?°é??误ç??å?¾å??"
+msgstr "è¯?å?¾æ·»å? â??%sâ?? (%d)å?°é??误ç??å?¾å??"
 
-#: ../app/pdb/gimppdb-utils.c:356
+#: ../app/pdb/gimppdb-utils.c:353
 #, c-format
 msgid "Layer '%s' (%d) can not be used because it is not a text layer"
-msgstr "'%s' (%d)å?¾å±?ä¸?è?½è¢«ä½¿ç?¨ï¼?å®?ä¸?æ?¯ä¸?个æ??å­?å?¾å±?"
+msgstr "â??%sâ?? (%d)å?¾å±?ä¸?è?½è¢«ä½¿ç?¨ï¼?å®?ä¸?æ?¯ä¸?个æ??å­?å?¾å±?"
 
-#: ../app/pdb/gimppdb-utils.c:401
+#: ../app/pdb/gimppdb-utils.c:394
 #, c-format
 msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected"
-msgstr "'%s' (%d)å?¾å??ç??æ?¯'%s'ç±»ï¼?并é??é¢?计ç??'%s'ç±»"
+msgstr "â??%sâ?? (%d)å?¾å??æ?¯â??%sâ??ç±»ï¼?并é??é¢?计ç??â??%sâ??ç±»"
 
-#: ../app/pdb/gimppdb-utils.c:430
+#: ../app/pdb/gimppdb-utils.c:417
 #, c-format
 msgid "Image '%s' (%d) is already of type '%s'"
-msgstr "'%s' (%d)å?¾å??å·²ç»?æ?¯'%s'ç±»"
+msgstr "â??%sâ?? (%d)å?¾å??å·²ç»?æ?¯â??%sâ??ç±»"
 
-#: ../app/pdb/gimppdb-utils.c:455
+#: ../app/pdb/gimppdb-utils.c:440
 #, c-format
 msgid "Vectors object %d does not contain stroke with ID %d"
-msgstr "ç?¢é??对象'%d'ä¸?å??æ?¬ID为'%d'ç??ç¬?ç?»"
+msgstr "ç?¢é??对象â??%dâ??ä¸?å??æ?¬ID为â??%dâ??ç??ç¬?ç?»"
 
-#: ../app/pdb/gimppdb.c:411
+#: ../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 "è°?ç?¨è¿?ç¨?â??%sâ??使ç?¨äº?é??误ç??å?¼ç±»å??ç?¨äº?å??æ?° #%dã??é??è¦? %sï¼?ä½?è?·å¾? %sã??"
+msgstr "è°?ç?¨â??%sâ??è¿?ç¨?使ç?¨äº?é??误ç??å?¼ç±»å??ç?¨äº?å??æ?° #%dã??é??è¦? %sï¼?ä½?è?·å¾? %sã??"
 
-#: ../app/pdb/gimpprocedure.c:361 ../app/plug-in/gimppluginprocframe.c:209
+#: ../app/pdb/gimpprocedure.c:365 ../app/plug-in/gimppluginprocframe.c:208
 #, c-format
 msgid "Procedure '%s' returned no return values"
-msgstr "'%s'è¿?ç¨?æ? è¿?å??å?¼"
+msgstr "â??%sâ??è¿?ç¨?æ? è¿?å??å?¼"
 
-#: ../app/pdb/gimpprocedure.c:585
+#: ../app/pdb/gimpprocedure.c:621
 #, 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ã??"
+msgstr "â??%sâ??è¿?ç¨?è¿?å??äº?é??误ç??å?¼ç±»å??ç?¨äº?è¿?å??å?¼â??%sâ??(#%d)ã??é??è¦? %sï¼?ä½?è?·å¾? %sã??"
 
-#: ../app/pdb/gimpprocedure.c:597
+#: ../app/pdb/gimpprocedure.c:633
 #, c-format
 msgid ""
 "Procedure '%s' has been called with a wrong value type for argument '%s' (#%"
 "d). Expected %s, got %s."
-msgstr "è°?ç?¨è¿?ç¨?â??%sâ??使ç?¨äº?é??误ç??å?¼ç±»å??ç?¨äº?å??æ?°â??%sâ??(#%d)ã??é??è¦? %sï¼?ä½?è?·å¾? %sã??"
+msgstr "è°?ç?¨â??%sâ??è¿?ç¨?使ç?¨äº?é??误ç??å?¼ç±»å??ç?¨äº?å??æ?°â??%sâ??(#%d)ã??é??è¦? %sï¼?ä½?è?·å¾? %sã??"
 
-#: ../app/pdb/gimpprocedure.c:629
+#: ../app/pdb/gimpprocedure.c:665
 #, 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ã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?å??å­?å?¨"
+"â??%sâ??è¿?ç¨?对äº?â??%sâ??å??æ?°è¿?å??äº?æ? æ??ç?? IDã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?å??å­?å?¨"
 "ç??å?¾å±?ã??"
 
-#: ../app/pdb/gimpprocedure.c:641
+#: ../app/pdb/gimpprocedure.c:677
 #, 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 ""
-"è°?ç?¨è¿?ç¨?â??%sâ??使ç?¨äº?æ? æ??ç?? ID ç?¨äº?å??æ?°â??%sâ??ã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?"
+"è°?ç?¨â??%sâ??è¿?ç¨?使ç?¨äº?æ? æ??ç?? ID ç?¨äº?â??%sâ??å??æ?°ã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?"
 "å??å­?å?¨ç??å?¾å±?ã??"
 
-#: ../app/pdb/gimpprocedure.c:657
+#: ../app/pdb/gimpprocedure.c:693
 #, 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â??è¿?å??äº?æ? æ??ç?? ID ç?¨äº?å??æ?°â??%sâ??ã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?å??å­?"
+"â??%sâ??è¿?ç¨?è¿?å??äº?æ? æ??ç?? ID ç?¨äº?â??%sâ??å??æ?°ã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?å??å­?"
 "å?¨ç??å?¾å??ã??"
 
-#: ../app/pdb/gimpprocedure.c:669
+#: ../app/pdb/gimpprocedure.c:705
 #, 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 ""
-"è°?ç?¨è¿?ç¨?â??%sâ??使ç?¨äº?æ? æ??ç?? ID ç?¨äº?å??æ?°â??%sâ??ã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?"
+"è°?ç?¨â??%sâ??è¿?ç¨?使ç?¨äº?æ? æ??ç?? ID ç?¨äº?â??%sâ??å??æ?°ã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?"
 "å??å­?å?¨ç??å?¾å??ã??"
 
-#: ../app/pdb/gimpprocedure.c:689
+#: ../app/pdb/gimpprocedure.c:725
 #, 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 ç±»å??)ã??æ­¤å?¼è¶?å?ºè??å?´ã??"
+msgstr "â??%sâ??è¿?ç¨?è¿?å??äº?â??%sâ??ä½?为è¿?å??å?¼â??%sâ??(#%dï¼?%s ç±»å??)ã??æ­¤å?¼è¶?å?ºè??å?´ã??"
 
-#: ../app/pdb/gimpprocedure.c:702
+#: ../app/pdb/gimpprocedure.c:738
 #, c-format
 msgid ""
 "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %"
 "s). This value is out of range."
-msgstr "è¿?ç¨?â??%sâ??使ç?¨äº?å?¼â??%sâ??ç?¨äº?å??æ?°â??%sâ??(#%dï¼?%s ç±»å??)ã??æ­¤å?¼è¶?å?ºè??å?´ã??"
+msgstr "â??%sâ??è¿?ç¨?使ç?¨äº?â??%sâ??å?¼ç?¨äº?â??%sâ??å??æ?°(#%dï¼?%s ç±»å??)ã??æ­¤å?¼è¶?å?ºè??å?´ã??"
 
-#: ../app/pdb/image-cmds.c:2268
-#, c-format
+#: ../app/pdb/image-cmds.c:2291
 msgid ""
 "Image resolution is out of bounds, using the default resolution instead."
 msgstr "å?¾å??å??辨ç??è¶?å?ºè??å?´ï¼?使ç?¨é»?认ç??å??辨ç??æ?¿ä»£ã??"
 
-#: ../app/pdb/selection-tools-cmds.c:218 ../app/tools/gimpfreeselecttool.c:197
+#: ../app/pdb/selection-tools-cmds.c:217 ../app/tools/gimpfreeselecttool.c:197
 msgid "Free Select"
 msgstr "è?ªç?±é??æ?©"
 
-#: ../app/pdb/text-layer-cmds.c:90
+#: ../app/pdb/text-layer-cmds.c:89
 #, c-format
 msgid "Failed to create text layer"
 msgstr "å??建æ??å­?å?¾å±?失败"
 
-#: ../app/pdb/text-layer-cmds.c:163 ../app/pdb/text-layer-cmds.c:235
-#: ../app/pdb/text-layer-cmds.c:314 ../app/pdb/text-layer-cmds.c:394
-#: ../app/pdb/text-layer-cmds.c:467 ../app/pdb/text-layer-cmds.c:539
-#: ../app/pdb/text-layer-cmds.c:611 ../app/pdb/text-layer-cmds.c:683
-#: ../app/pdb/text-layer-cmds.c:755 ../app/pdb/text-layer-cmds.c:825
-#: ../app/pdb/text-layer-cmds.c:897 ../app/pdb/text-layer-cmds.c:969
-#: ../app/pdb/text-layer-cmds.c:1041
+#: ../app/pdb/text-layer-cmds.c:162 ../app/pdb/text-layer-cmds.c:234
+#: ../app/pdb/text-layer-cmds.c:313 ../app/pdb/text-layer-cmds.c:386
+#: ../app/pdb/text-layer-cmds.c:458 ../app/pdb/text-layer-cmds.c:530
+#: ../app/pdb/text-layer-cmds.c:602 ../app/pdb/text-layer-cmds.c:674
+#: ../app/pdb/text-layer-cmds.c:746 ../app/pdb/text-layer-cmds.c:816
+#: ../app/pdb/text-layer-cmds.c:888 ../app/pdb/text-layer-cmds.c:960
+#: ../app/pdb/text-layer-cmds.c:1032 ../app/pdb/text-layer-cmds.c:1068
+#: ../app/pdb/text-layer-cmds.c:1147
 msgid "Set text layer attribute"
 msgstr "设å®?æ??å­?å?¾å±?å±?æ?§"
 
-#: ../app/plug-in/gimpenvirontable.c:282
+#: ../app/plug-in/gimpenvirontable.c:281
 #, c-format
 msgid "Empty variable name in environment file %s"
 msgstr "ç?¯å¢?æ??件 %s 中å?«æ??空å??é??å??"
 
-#: ../app/plug-in/gimpenvirontable.c:300
+#: ../app/plug-in/gimpenvirontable.c:299
 #, c-format
 msgid "Illegal variable name in environment file %s: %s"
 msgstr "ç?¯å¢?æ??件 %s 中å?«æ??é??æ³?å??é??å??ï¼?%s"
 
-#: ../app/plug-in/gimpinterpreterdb.c:264
+#: ../app/plug-in/gimpinterpreterdb.c:263
 #, c-format
 msgid "Bad interpreter referenced in interpreter file %s: %s"
 msgstr "解é??å?¨æ??件 %s 中å¼?ç?¨ç??é??误ç??解é??å?¨ï¼?%s"
 
-#: ../app/plug-in/gimpinterpreterdb.c:323
+#: ../app/plug-in/gimpinterpreterdb.c:322
 #, c-format
 msgid "Bad binary format string in interpreter file %s"
 msgstr "解é??å?¨æ??件 %s 中ç??é??误ç??äº?è¿?å?¶æ ¼å¼?串"
 
-#: ../app/plug-in/gimpplugin-message.c:423
+#: ../app/plug-in/gimpplugin-message.c:422
 #, c-format
 msgid ""
 "Calling error for procedure '%s':\n"
 "%s"
 msgstr ""
-"æµ?ç¨?é??误: '%s':\n"
+"â??%sâ??è¿?ç¨?è°?ç?¨é??误ï¼?\n"
 "%s"
 
-#: ../app/plug-in/gimpplugin-message.c:432
+#: ../app/plug-in/gimpplugin-message.c:431
 #, c-format
 msgid ""
 "Execution error for procedure '%s':\n"
 "%s"
 msgstr ""
-"æ?§è¡?é??误å??ç??å?¨è¿?ç¨?'%s':\n"
+"â??%sâ??è¿?ç¨?æ?§è¡?é??误ï¼?\n"
 "%s"
 
-#: ../app/plug-in/gimpplugin-progress.c:330
+#: ../app/plug-in/gimpplugin-progress.c:331
 msgid "Cancelled"
 msgstr "å·²å??æ¶?"
 
-#: ../app/plug-in/gimpplugin.c:639
+#: ../app/plug-in/gimpplugin.c:638
 #, c-format
 msgid ""
 "Plug-in crashed: \"%s\"\n"
@@ -8933,45 +10425,45 @@ msgstr ""
 "æ??件崩æº?ï¼?â??%sâ??\n"
 "(%s)\n"
 "\n"
-"已崩æº?ç??æ??件å?¯è?½å·²ç»?ç ´å?? GIMP ç??å??é?¨ç?¶æ??ã??æ?¨å?¯è?½é??è¦?ä¿?å­?æ?¨ç??å?¾ç??ç?¶å??é??æ?°å?¯å?¨ "
+"已崩æº?ç??æ??件å?¯è?½ç ´å??äº? GIMP ç??å??é?¨ç?¶æ??ã??æ?¨å?¯è?½é??è¦?ä¿?å­?æ?¨ç??å?¾ç??ç?¶å??é??æ?°å?¯å?¨ "
 "GIMP 以确ä¿?稳妥ã??"
 
-#: ../app/plug-in/gimppluginmanager-call.c:173
-#: ../app/plug-in/gimppluginmanager-call.c:223
-#: ../app/plug-in/gimppluginmanager-call.c:321
+#: ../app/plug-in/gimppluginmanager-call.c:172
+#: ../app/plug-in/gimppluginmanager-call.c:222
+#: ../app/plug-in/gimppluginmanager-call.c:320
 #, c-format
 msgid "Failed to run plug-in \"%s\""
-msgstr "æ??件\"%s\"å?¯ç?¨å¤±è´¥"
+msgstr "â??%sâ??æ??件å?¯ç?¨å¤±è´¥"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:222
+#: ../app/plug-in/gimppluginmanager-restore.c:225
 msgid "Searching Plug-Ins"
 msgstr "æ­£å?¨æ??ç´¢æ??件"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:271
+#: ../app/plug-in/gimppluginmanager-restore.c:274
 msgid "Resource configuration"
 msgstr "èµ?æº?é??ç½®"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:307
+#: ../app/plug-in/gimppluginmanager-restore.c:310
 msgid "Querying new Plug-ins"
 msgstr "æ­£å?¨æ?¥è¯¢æ?°ç??æ??件"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:357
+#: ../app/plug-in/gimppluginmanager-restore.c:360
 msgid "Initializing Plug-ins"
 msgstr "æ­£å?¨å??å§?å??æ??件"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:429
+#: ../app/plug-in/gimppluginmanager-restore.c:432
 msgid "Starting Extensions"
 msgstr "正�����"
 
-#: ../app/plug-in/gimppluginmanager.c:296
+#: ../app/plug-in/gimppluginmanager.c:303
 msgid "Plug-In Interpreters"
 msgstr "æ??件解é??å?¨"
 
-#: ../app/plug-in/gimppluginmanager.c:303
+#: ../app/plug-in/gimppluginmanager.c:310
 msgid "Plug-In Environment"
 msgstr "æ??件ç?¯å¢?"
 
-#: ../app/plug-in/gimppluginprocedure.c:989
+#: ../app/plug-in/gimppluginprocedure.c:990
 #, c-format
 msgid ""
 "Calling error for '%s':\n"
@@ -8980,7 +10472,7 @@ msgstr ""
 "é??误: '%s':\n"
 "%s"
 
-#: ../app/plug-in/gimppluginprocedure.c:1001
+#: ../app/plug-in/gimppluginprocedure.c:1002
 #, c-format
 msgid ""
 "Execution error for '%s':\n"
@@ -8989,38 +10481,38 @@ msgstr ""
 "æ?§è¡?â??%sâ??å?ºé??ï¼?\n"
 "%s"
 
-#: ../app/plug-in/plug-in-icc-profile.c:113
-#: ../app/plug-in/plug-in-icc-profile.c:188
-#: ../app/plug-in/plug-in-icc-profile.c:247
+#: ../app/plug-in/plug-in-icc-profile.c:112
+#: ../app/plug-in/plug-in-icc-profile.c:187
+#: ../app/plug-in/plug-in-icc-profile.c:246
 #, c-format
 msgid "Error running '%s'"
 msgstr "è¿?è¡?â??%sâ??æ?¶å?ºé??"
 
-#: ../app/plug-in/plug-in-icc-profile.c:137
-#: ../app/plug-in/plug-in-icc-profile.c:198
-#: ../app/plug-in/plug-in-icc-profile.c:257
+#: ../app/plug-in/plug-in-icc-profile.c:136
+#: ../app/plug-in/plug-in-icc-profile.c:197
+#: ../app/plug-in/plug-in-icc-profile.c:256
 #, c-format
 msgid "Plug-In missing (%s)"
-msgstr "æ??件é??失(%s)"
+msgstr "æ??件缺失(%s)"
 
-#: ../app/plug-in/plug-in-rc.c:206
+#: ../app/plug-in/plug-in-rc.c:205
 #, c-format
 msgid "Skipping '%s': wrong GIMP protocol version."
 msgstr "è·³è¿?â??%sâ??ï¼?é??误ç?? GIMP å??è®®ç??æ?¬ã??"
 
-#: ../app/plug-in/plug-in-rc.c:479
+#: ../app/plug-in/plug-in-rc.c:478
 #, c-format
 msgid "invalid value '%s' for icon type"
 msgstr "å?¾æ ?ç±»å??â??%sâ??æ? æ??"
 
-#: ../app/plug-in/plug-in-rc.c:494
+#: ../app/plug-in/plug-in-rc.c:493
 #, c-format
 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:45
+#: ../app/text/gimpfont.c:43
 msgid ""
 "Pack my box with\n"
 "five dozen liquor jugs."
@@ -9028,51 +10520,51 @@ msgstr ""
 "Pack my box with\n"
 "five dozen liquor jugs."
 
-#: ../app/text/gimptext-compat.c:108 ../app/tools/gimptexttool.c:879
+#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:1748
 msgid "Add Text Layer"
 msgstr "æ·»å? æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:138
+#: ../app/text/gimptextlayer.c:136
 msgid "Text Layer"
 msgstr "æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:139
+#: ../app/text/gimptextlayer.c:137
 msgid "Rename Text Layer"
 msgstr "é??å?½å??æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:140
+#: ../app/text/gimptextlayer.c:138
 msgid "Move Text Layer"
 msgstr "移å?¨æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:141
+#: ../app/text/gimptextlayer.c:139
 msgid "Scale Text Layer"
 msgstr "缩æ?¾æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:142
+#: ../app/text/gimptextlayer.c:140
 msgid "Resize Text Layer"
 msgstr "æ?¹å??æ??å­?å?¾å±?大å°?"
 
-#: ../app/text/gimptextlayer.c:143
+#: ../app/text/gimptextlayer.c:141
 msgid "Flip Text Layer"
 msgstr "翻转æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:144
+#: ../app/text/gimptextlayer.c:142
 msgid "Rotate Text Layer"
 msgstr "æ??转æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:145
+#: ../app/text/gimptextlayer.c:143
 msgid "Transform Text Layer"
 msgstr "å??æ?¢æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:492
+#: ../app/text/gimptextlayer.c:493
 msgid "Discard Text Information"
 msgstr "æ?¾å¼?æ??å­?ä¿¡æ?¯"
 
-#: ../app/text/gimptextlayer.c:543
+#: ../app/text/gimptextlayer.c:544
 msgid "Due to lack of any fonts, text functionality is not available."
 msgstr "ç?±äº?缺å°?å­?ä½?ï¼?æ??å­?å??è?½ä¸?å?¯ç?¨ã??"
 
-#: ../app/text/gimptextlayer.c:579
+#: ../app/text/gimptextlayer.c:581
 msgid "Empty Text Layer"
 msgstr "空ç?½æ??å­?å?¾å±?"
 
@@ -9085,12 +10577,12 @@ msgid ""
 "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"
 "%s\n"
 "\n"
 "æ??äº?æ??å­?å±?æ?§å?¯è?½æ??é??ã??é?¤é??æ?¨è¦?ç¼?è¾?ç??æ?¯æ??å­?å?¾å±?ï¼?å?¦å??ä¸?å¿?æ??å¿?ã??"
 
-#: ../app/tools/gimp-tools.c:327
+#: ../app/tools/gimp-tools.c:325
 msgid ""
 "This tool has\n"
 "no options."
@@ -9098,228 +10590,226 @@ msgstr ""
 "�个工�\n"
 "没æ??é??项ã??"
 
-#: ../app/tools/gimpairbrushtool.c:55
+#: ../app/tools/gimpairbrushtool.c:54
 msgid "Airbrush Tool: Paint using a brush, with variable pressure"
 msgstr "å?·æ?ªå·¥å?·ï¼?使ç?¨å¸¦æ??å?¯å??å??å??ç??ç?»ç¬?ç»?å?¾"
 
-#: ../app/tools/gimpairbrushtool.c:56
+#: ../app/tools/gimpairbrushtool.c:55
 msgid "_Airbrush"
 msgstr "å?·æ?ª(_A)"
 
-#: ../app/tools/gimpairbrushtool.c:92 ../app/tools/gimpconvolvetool.c:217
-#: ../app/tools/gimpsmudgetool.c:97
+#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:216
+#: ../app/tools/gimpsmudgetool.c:96
 msgid "Rate:"
 msgstr "æ¯?ç??ï¼?"
 
-#: ../app/tools/gimpairbrushtool.c:98 ../app/tools/gimppaintoptions-gui.c:198
+#: ../app/tools/gimpairbrushtool.c:97 ../app/tools/gimppaintoptions-gui.c:241
 msgid "Pressure:"
 msgstr "å??å??ï¼?"
 
-#: ../app/tools/gimpaligntool.c:134 ../app/tools/gimpaligntool.c:766
+#: ../app/tools/gimpaligntool.c:133 ../app/tools/gimpaligntool.c:765
 msgid "Align"
 msgstr "对�"
 
-#: ../app/tools/gimpaligntool.c:135
+#: ../app/tools/gimpaligntool.c:134
 msgid "Alignment Tool: Align or arrange layers and other objects"
 msgstr "对é½?å·¥å?·ï¼?对é½?æ??æ?´ç??å?¾å±?æ??å?¶ä»?对象"
 
-#: ../app/tools/gimpaligntool.c:136
+#: ../app/tools/gimpaligntool.c:135
 msgid "_Align"
 msgstr "对�(_A)"
 
-#: ../app/tools/gimpaligntool.c:599
+#: ../app/tools/gimpaligntool.c:598
 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
 msgstr "å?¨å?¾å±?ï¼?è·¯å¾?æ??å??è??线ä¸?ç?¹å?»ï¼?æ??ç?¹å?»å¹¶æ??å?¨ä»¥æ?¾å??å¤?个å?¾å±?"
 
-#: ../app/tools/gimpaligntool.c:608
+#: ../app/tools/gimpaligntool.c:607
 msgid "Click to pick this layer as first item"
 msgstr "ç?¹å?»å?¯æ?¾å??æ­¤å?¾å±?ä½?为第ä¸?项"
 
-#: ../app/tools/gimpaligntool.c:616
+#: ../app/tools/gimpaligntool.c:615
 msgid "Click to add this layer to the list"
 msgstr "ç?¹å?»å?¯å°?æ­¤å?¾å±?æ·»å? å?°å??表"
 
-#: ../app/tools/gimpaligntool.c:620
+#: ../app/tools/gimpaligntool.c:619
 msgid "Click to pick this guide as first item"
 msgstr "ç?¹å?»å?¯æ?¾å??æ­¤å??è??线ä½?为第ä¸?项"
 
-#: ../app/tools/gimpaligntool.c:628
+#: ../app/tools/gimpaligntool.c:627
 msgid "Click to add this guide to the list"
 msgstr "ç?¹å?»å?¯å°?æ­¤å??è??线添å? å?°å??表"
 
-#: ../app/tools/gimpaligntool.c:632
+#: ../app/tools/gimpaligntool.c:631
 msgid "Click to pick this path as first item"
 msgstr "ç?¹å?»å?¯æ?¾å??此路å¾?ä½?为第ä¸?项"
 
-#: ../app/tools/gimpaligntool.c:640
+#: ../app/tools/gimpaligntool.c:639
 msgid "Click to add this path to the list"
 msgstr "ç?¹å?»å?¯å°?此路å¾?æ·»å? å?°å??表"
 
-#: ../app/tools/gimpaligntool.c:778
+#: ../app/tools/gimpaligntool.c:777
 msgid "Relative to:"
 msgstr "�对��"
 
-#: ../app/tools/gimpaligntool.c:796
+#: ../app/tools/gimpaligntool.c:795
 msgid "Align left edge of target"
 msgstr "对é½?ç?®æ ?ç??左边ç¼?"
 
-#: ../app/tools/gimpaligntool.c:802
+#: ../app/tools/gimpaligntool.c:801
 msgid "Align center of target"
 msgstr "对é½?ç?®æ ?ç??中央"
 
-#: ../app/tools/gimpaligntool.c:808
+#: ../app/tools/gimpaligntool.c:807
 msgid "Align right edge of target"
 msgstr "对é½?ç?®æ ?ç??å?³è¾¹ç¼?"
 
-#: ../app/tools/gimpaligntool.c:818
+#: ../app/tools/gimpaligntool.c:817
 msgid "Align top edge of target"
 msgstr "对é½?ç?®æ ?ç??ä¸?è¾¹ç¼?"
 
-#: ../app/tools/gimpaligntool.c:824
+#: ../app/tools/gimpaligntool.c:823
 msgid "Align middle of target"
 msgstr "对é½?ç?®æ ?ç??中é?¨"
 
-#: ../app/tools/gimpaligntool.c:830
+#: ../app/tools/gimpaligntool.c:829
 msgid "Align bottom of target"
 msgstr "对é½?ç?®æ ?ç??åº?è¾¹ç¼?"
 
-#: ../app/tools/gimpaligntool.c:834
+#: ../app/tools/gimpaligntool.c:833
 msgid "Distribute"
 msgstr "å??å¸?"
 
-#: ../app/tools/gimpaligntool.c:848
+#: ../app/tools/gimpaligntool.c:847
 msgid "Distribute left edges of targets"
 msgstr "å??å¸?ç?®æ ?ç??左边ç¼?"
 
-#: ../app/tools/gimpaligntool.c:855
+#: ../app/tools/gimpaligntool.c:854
 msgid "Distribute horizontal centers of targets"
 msgstr "å??å¸?ç?®æ ?ç??水平中å¿?"
 
-#: ../app/tools/gimpaligntool.c:862
+#: ../app/tools/gimpaligntool.c:861
 msgid "Distribute right edges of targets"
 msgstr "å??å¸?ç?®æ ?ç??å?³è¾¹ç¼?"
 
-#: ../app/tools/gimpaligntool.c:872
+#: ../app/tools/gimpaligntool.c:871
 msgid "Distribute top edges of targets"
 msgstr "å??å¸?ç?®æ ?ç??ä¸?è¾¹ç¼?"
 
-#: ../app/tools/gimpaligntool.c:879
+#: ../app/tools/gimpaligntool.c:878
 msgid "Distribute vertical centers of targets"
 msgstr "å??å¸?ç?®æ ?ç??å??ç?´ä¸­å¿?"
 
-#: ../app/tools/gimpaligntool.c:885
+#: ../app/tools/gimpaligntool.c:884
 msgid "Distribute bottoms of targets"
 msgstr "å??å¸?ç?®æ ?ç??åº?é?¨"
 
-#: ../app/tools/gimpaligntool.c:893 ../app/tools/gimpblendoptions.c:222
+#: ../app/tools/gimpaligntool.c:892 ../app/tools/gimpblendoptions.c:221
 msgid "Offset:"
 msgstr "�移�"
 
-#: ../app/tools/gimpblendoptions.c:216 ../app/tools/gimppaintoptions-gui.c:648
+#: ../app/tools/gimpblendoptions.c:215 ../app/tools/gimppaintoptions-gui.c:890
 msgid "Gradient:"
 msgstr "æ¸?å??ï¼?"
 
-#: ../app/tools/gimpblendoptions.c:232 ../app/widgets/gimpbrusheditor.c:146
+#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:145
 msgid "Shape:"
 msgstr "形��"
 
-#: ../app/tools/gimpblendoptions.c:239 ../app/tools/gimppaintoptions-gui.c:672
+#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:914
 msgid "Repeat:"
 msgstr "é??å¤?ï¼?"
 
-#: ../app/tools/gimpblendoptions.c:257
+#: ../app/tools/gimpblendoptions.c:256
 msgid "Adaptive supersampling"
 msgstr "è?ªé??åº?è¶?级é??æ ·"
 
-#: ../app/tools/gimpblendoptions.c:265
+#: ../app/tools/gimpblendoptions.c:264
 msgid "Max depth:"
 msgstr "æ??大深度ï¼?"
 
-#: ../app/tools/gimpblendoptions.c:272
+#: ../app/tools/gimpblendoptions.c:271
 #: ../app/tools/gimpbucketfilloptions.c:287
-#: ../app/tools/gimpregionselectoptions.c:220
+#: ../app/tools/gimpregionselectoptions.c:219
 msgid "Threshold:"
 msgstr "é??å?¼ï¼?"
 
-#: ../app/tools/gimpblendtool.c:108
+#: ../app/tools/gimpblendtool.c:109
 msgid "Blend Tool: Fill selected area with a color gradient"
 msgstr "æ··å??å·¥å?·ï¼?ç?¨é¢?è?²æ¸?å??å¡«å??é??中ç??å?ºå??"
 
-#: ../app/tools/gimpblendtool.c:109
+#: ../app/tools/gimpblendtool.c:110
 msgid "Blen_d"
 msgstr "æ··å??å¡«å??(_D)"
 
-#: ../app/tools/gimpblendtool.c:164
-#, c-format
+#: ../app/tools/gimpblendtool.c:165
 msgid "Blend does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?æ··å??æ??ä½?ã??"
 
-#: ../app/tools/gimpblendtool.c:402 ../app/tools/gimppainttool.c:606
+#: ../app/tools/gimpblendtool.c:403 ../app/tools/gimppainttool.c:569
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%s å?¯é??å®?è§?度"
 
-#: ../app/tools/gimpblendtool.c:403
+#: ../app/tools/gimpblendtool.c:404
 #, c-format
 msgid "%s to move the whole line"
 msgstr "%s �移���线"
 
-#: ../app/tools/gimpblendtool.c:407
+#: ../app/tools/gimpblendtool.c:408
 msgid "Blend: "
 msgstr "æ··å??å¡«å??ï¼?"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:112
+#: ../app/tools/gimpbrightnesscontrasttool.c:111
 msgid "Brightness/Contrast Tool: Adjust brightness and contrast"
 msgstr "亮度å??对æ¯?度工å?·ï¼?è°?æ?´äº®åº¦å??对æ¯?度"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:113
+#: ../app/tools/gimpbrightnesscontrasttool.c:112
 msgid "B_rightness-Contrast..."
 msgstr "亮度-对�度(_R)..."
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:133
+#: ../app/tools/gimpbrightnesscontrasttool.c:132
 msgid "Adjust Brightness and Contrast"
 msgstr "è°?æ?´äº®åº¦å??对æ¯?度"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:135
+#: ../app/tools/gimpbrightnesscontrasttool.c:134
 msgid "Import Brightness-Contrast settings"
 msgstr "导�亮度-对�度设置"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:136
+#: ../app/tools/gimpbrightnesscontrasttool.c:135
 msgid "Export Brightness-Contrast settings"
 msgstr "导�亮度-对�度设置"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:184
-#, c-format
+#: ../app/tools/gimpbrightnesscontrasttool.c:183
 msgid "Brightness-Contrast does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?亮度-对æ¯?度æ??ä½?ã??"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:325
+#: ../app/tools/gimpbrightnesscontrasttool.c:321
 msgid "_Brightness:"
 msgstr "亮度(_B)�"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:340
+#: ../app/tools/gimpbrightnesscontrasttool.c:336
 msgid "Con_trast:"
 msgstr "对�度(_T)�"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:354
+#: ../app/tools/gimpbrightnesscontrasttool.c:350
 msgid "Edit these Settings as Levels"
 msgstr "�此设置�为����"
 
-#: ../app/tools/gimpbucketfilloptions.c:100
+#: ../app/tools/gimpbucketfilloptions.c:99
 msgid "Allow completely transparent regions to be filled"
 msgstr "å??许填å??å®?å?¨é??æ??ç??å?ºå??"
 
-#: ../app/tools/gimpbucketfilloptions.c:106
+#: ../app/tools/gimpbucketfilloptions.c:105
 msgid "Base filled area on all visible layers"
 msgstr "å¡«å??å?ºå??以æ??æ??å?¯è§?å?¾å±?为å??"
 
-#: ../app/tools/gimpbucketfilloptions.c:112
-#: ../app/tools/gimpregionselectoptions.c:96
+#: ../app/tools/gimpbucketfilloptions.c:111
+#: ../app/tools/gimpregionselectoptions.c:95
 msgid "Maximum color difference"
 msgstr "æ??大é¢?è?²å·®å¼?"
 
 #. fill type
-#: ../app/tools/gimpbucketfilloptions.c:226
+#: ../app/tools/gimpbucketfilloptions.c:225
 #, c-format
 msgid "Fill Type  (%s)"
 msgstr "å¡«å??ç±»å??(%s)"
@@ -9346,10 +10836,10 @@ msgstr "寻æ?¾ç?¸è¿?ç??é¢?è?²"
 msgid "Fill transparent areas"
 msgstr "å¡«å??é??æ??å?ºå??"
 
-#: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:114
-#: ../app/tools/gimpcolorpickeroptions.c:151 ../app/tools/gimphealtool.c:99
-#: ../app/tools/gimpperspectiveclonetool.c:941
-#: ../app/tools/gimpregionselectoptions.c:208
+#: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:113
+#: ../app/tools/gimpcolorpickeroptions.c:150 ../app/tools/gimphealtool.c:98
+#: ../app/tools/gimpperspectiveclonetool.c:936
+#: ../app/tools/gimpregionselectoptions.c:207
 msgid "Sample merged"
 msgstr "ä½?æ ·å??并"
 
@@ -9381,34 +10871,34 @@ msgstr "æ??é¢?è?²é??æ?©å·¥å?·ï¼?é??æ?©æ??ç?¸ä¼¼é¢?è?²ç??å?ºå??"
 msgid "_By Color Select"
 msgstr "æ??é¢?è?²é??æ?©(_B)"
 
-#: ../app/tools/gimpclonetool.c:62
+#: ../app/tools/gimpclonetool.c:61
 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush"
 msgstr "å??é??å·¥å?·ï¼?ç?¨ç?»ç¬?å?¯é??æ?§å?°ä»?å?¾å??æ??å?¾æ¡?å¤?å?¶"
 
-#: ../app/tools/gimpclonetool.c:63
+#: ../app/tools/gimpclonetool.c:62
 msgid "_Clone"
 msgstr "å??é??(_C)"
 
-#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:89
+#: ../app/tools/gimpclonetool.c:85 ../app/tools/gimpclonetool.c:88
 msgid "Click to clone"
 msgstr "ç?¹å?»ä»¥å??é??"
 
-#: ../app/tools/gimpclonetool.c:87 ../app/tools/gimpclonetool.c:91
+#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:90
 #, c-format
 msgid "%s to set a new clone source"
 msgstr "%s å?¯è®¾å®?æ?°ç??å??é??æº?"
 
-#: ../app/tools/gimpclonetool.c:90
+#: ../app/tools/gimpclonetool.c:89
 msgid "Click to set a new clone source"
 msgstr "å??å?»å?¯è®¾å®?æ?°ç??å??é??æº?"
 
-#: ../app/tools/gimpclonetool.c:109
-#: ../app/tools/gimpperspectiveclonetool.c:936
+#: ../app/tools/gimpclonetool.c:108
+#: ../app/tools/gimpperspectiveclonetool.c:931
 msgid "Source"
 msgstr "�"
 
-#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:111
-#: ../app/tools/gimpperspectiveclonetool.c:955
+#: ../app/tools/gimpclonetool.c:129 ../app/tools/gimphealtool.c:110
+#: ../app/tools/gimpperspectiveclonetool.c:952
 msgid "Alignment:"
 msgstr "对��"
 
@@ -9433,7 +10923,6 @@ msgid "Export Color Balance Settings"
 msgstr "导��彩平衡设置"
 
 #: ../app/tools/gimpcolorbalancetool.c:163
-#, c-format
 msgid "Color Balance operates only on RGB color layers."
 msgstr "è?²å½©å¹³è¡¡æ??ä½?å?ªè?½å?¨ RGB é¢?è?²ç??å?¾å±?ä¸?è¿?è¡?ã??"
 
@@ -9450,16 +10939,31 @@ msgstr "������"
 msgid "Cyan"
 msgstr "é??è?²"
 
+#: ../app/tools/gimpcolorbalancetool.c:296
+#: ../app/tools/gimphuesaturationtool.c:252
+msgid "Red"
+msgstr "红�"
+
 #: ../app/tools/gimpcolorbalancetool.c:305
 #: ../app/tools/gimphuesaturationtool.c:257
 msgid "Magenta"
 msgstr "å??红"
 
+#: ../app/tools/gimpcolorbalancetool.c:305
+#: ../app/tools/gimphuesaturationtool.c:254
+msgid "Green"
+msgstr "绿�"
+
 #: ../app/tools/gimpcolorbalancetool.c:314
 #: ../app/tools/gimphuesaturationtool.c:253
 msgid "Yellow"
 msgstr "é»?è?²"
 
+#: ../app/tools/gimpcolorbalancetool.c:314
+#: ../app/tools/gimphuesaturationtool.c:256
+msgid "Blue"
+msgstr "è??è?²"
+
 #: ../app/tools/gimpcolorbalancetool.c:325
 msgid "R_eset Range"
 msgstr "é??ç½®è??å?´(_E)"
@@ -9489,7 +10993,6 @@ msgid "Export Colorize Settings"
 msgstr "导å?ºè?²å½©å??设置"
 
 #: ../app/tools/gimpcolorizetool.c:156
-#, c-format
 msgid "Colorize operates only on RGB color layers."
 msgstr "å?ªè?½å¯¹ RGB é¢?è?²ç??å?¾å±?è¿?è¡?å??è?²å??æ??ä½?ã??"
 
@@ -9512,28 +11015,32 @@ msgstr "饱å??度(_S)ï¼?"
 msgid "_Lightness:"
 msgstr "亮度(_L)�"
 
+#: ../app/tools/gimpcoloroptions.c:75
+msgid "Color Picker Average Radius"
+msgstr "é¢?è?²æ?¾å??å¹³å??å??å¾?"
+
 #: ../app/tools/gimpcoloroptions.c:161
 msgid "Sample average"
 msgstr "ä½?æ ·å¹³å??"
 
 #: ../app/tools/gimpcoloroptions.c:171
-#: ../app/tools/gimprectangleselectoptions.c:176
-#: ../app/tools/gimpselectionoptions.c:281
-#: ../app/widgets/gimpbrusheditor.c:154
+#: ../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:156
+#: ../app/tools/gimpcolorpickeroptions.c:155
 #, c-format
 msgid "Pick Mode  (%s)"
-msgstr "æ?¾å??模å¼?(%s)"
+msgstr "æ?¾å??模å¼? (%s)"
 
 #. the use_info_window toggle button
-#: ../app/tools/gimpcolorpickeroptions.c:165
+#: ../app/tools/gimpcolorpickeroptions.c:164
 #, c-format
 msgid "Use info window  (%s)"
-msgstr "使�信���(%s)"
+msgstr "使�信��� (%s)"
 
 #: ../app/tools/gimpcolorpickertool.c:96
 msgid "Color Picker"
@@ -9551,11 +11058,11 @@ msgstr "é¢?è?²æ?¾å??(_O)"
 msgid "Click in any image to view its color"
 msgstr "å?¨å?¾å??中任æ??ç?¹å?»å?¯æ?¥ç??å?¶é¢?è?²"
 
-#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:509
+#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:474
 msgid "Click in any image to pick the foreground color"
 msgstr "å?¨å?¾å??中任æ??ç?¹å?»å?¯æ?¾å??å??æ?¯è?²"
 
-#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:515
+#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:480
 msgid "Click in any image to pick the background color"
 msgstr "å?¨å?¾å??中任æ??ç?¹å?»å?¯æ?¾å??è??æ?¯è?²"
 
@@ -9580,55 +11087,55 @@ msgstr "å??æ¶?é??æ ·ç?¹"
 msgid "Add Sample Point: "
 msgstr "æ·»å? é??æ ·ç?¹ï¼?"
 
-#: ../app/tools/gimpconvolvetool.c:73
+#: ../app/tools/gimpconvolvetool.c:72
 msgid "Blur / Sharpen"
 msgstr "模ç³? / é??å??"
 
-#: ../app/tools/gimpconvolvetool.c:74
+#: ../app/tools/gimpconvolvetool.c:73
 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush"
 msgstr "模ç³? / é??å??å·¥å?·ï¼?使ç?¨ç?»ç¬?é??æ?©æ?§å?°æ¨¡ç³?æ??è??å?»æ¨¡ç³?"
 
-#: ../app/tools/gimpconvolvetool.c:75
+#: ../app/tools/gimpconvolvetool.c:74
 msgid "Bl_ur / Sharpen"
 msgstr "模ç³? / é??å??(_U)"
 
-#: ../app/tools/gimpconvolvetool.c:170
+#: ../app/tools/gimpconvolvetool.c:169
 msgid "Click to blur"
 msgstr "��以模�"
 
-#: ../app/tools/gimpconvolvetool.c:171
+#: ../app/tools/gimpconvolvetool.c:170
 msgid "Click to blur the line"
 msgstr "����模线段"
 
-#: ../app/tools/gimpconvolvetool.c:172
+#: ../app/tools/gimpconvolvetool.c:171
 #, c-format
 msgid "%s to sharpen"
 msgstr "%s 以é??å??"
 
-#: ../app/tools/gimpconvolvetool.c:176
+#: ../app/tools/gimpconvolvetool.c:175
 msgid "Click to sharpen"
 msgstr "ç?¹å?»ä»¥é??å??"
 
-#: ../app/tools/gimpconvolvetool.c:177
+#: ../app/tools/gimpconvolvetool.c:176
 msgid "Click to sharpen the line"
 msgstr "ç?¹å?»å?¯é??å??线段"
 
-#: ../app/tools/gimpconvolvetool.c:178
+#: ../app/tools/gimpconvolvetool.c:177
 #, c-format
 msgid "%s to blur"
 msgstr "%s 以模�"
 
 #. the type radio box
-#: ../app/tools/gimpconvolvetool.c:199
+#: ../app/tools/gimpconvolvetool.c:198
 #, c-format
 msgid "Convolve Type  (%s)"
 msgstr "å?·ç§¯ç±»å??(%s)"
 
-#: ../app/tools/gimpcropoptions.c:161
+#: ../app/tools/gimpcropoptions.c:160
 msgid "Current layer only"
 msgstr "ä»?对å½?å??å?¾å±?"
 
-#: ../app/tools/gimpcropoptions.c:167
+#: ../app/tools/gimpcropoptions.c:166
 msgid "Allow growing"
 msgstr "å??许å¢?é?¿"
 
@@ -9669,38 +11176,41 @@ msgid "Export Curves"
 msgstr "载��线"
 
 #: ../app/tools/gimpcurvestool.c:221
-#, c-format
 msgid "Curves does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?æ?²çº¿æ??ä½?ã??"
 
-#: ../app/tools/gimpcurvestool.c:323
+#: ../app/tools/gimpcurvestool.c:326
 msgid "Click to add a control point"
 msgstr "���添����"
 
-#: ../app/tools/gimpcurvestool.c:328
+#: ../app/tools/gimpcurvestool.c:331
 msgid "Click to add control points to all channels"
 msgstr "å??å?»å?¯å?¨å?¨é?¨é??é??中添å? æ?§å?¶ç?¹"
 
-#: ../app/tools/gimpcurvestool.c:441 ../app/tools/gimplevelstool.c:380
+#: ../app/tools/gimpcurvestool.c:336
+msgid "Click to locate on curve (try Shift, Ctrl)"
+msgstr ""
+
+#: ../app/tools/gimpcurvestool.c:449 ../app/tools/gimplevelstool.c:380
 msgid "Cha_nnel:"
 msgstr "é??é??(_N)ï¼?"
 
-#: ../app/tools/gimpcurvestool.c:467 ../app/tools/gimplevelstool.c:404
+#: ../app/tools/gimpcurvestool.c:475 ../app/tools/gimplevelstool.c:404
 msgid "R_eset Channel"
 msgstr "é??ç½®é??é??(_E)"
 
-#: ../app/tools/gimpcurvestool.c:557
+#: ../app/tools/gimpcurvestool.c:565
 msgid "Curve _type:"
 msgstr "æ?²çº¿ç±»å??(_T)"
 
-#: ../app/tools/gimpcurvestool.c:632 ../app/tools/gimplevelstool.c:752
+#: ../app/tools/gimpcurvestool.c:640 ../app/tools/gimplevelstool.c:752
 #, c-format
 msgid "Could not read header from '%s': %s"
 msgstr "æ? æ³?ä»?â??%sâ??中读å??头ï¼?%s"
 
-#: ../app/tools/gimpcurvestool.c:705
+#: ../app/tools/gimpcurvestool.c:713
 msgid "Use _old curves file format"
-msgstr "使ç?¨æ?§æ?²çº¿æ??件格å¼?(_o)"
+msgstr "使ç?¨æ?§æ?²çº¿æ??件格å¼?(_O)"
 
 #: ../app/tools/gimpdesaturatetool.c:78
 msgid "Desaturate Tool: Turn colors into shades of gray"
@@ -9715,7 +11225,6 @@ msgid "Desaturate (Remove Colors)"
 msgstr "�度(����)"
 
 #: ../app/tools/gimpdesaturatetool.c:125
-#, c-format
 msgid "Desaturate does only operate on RGB layers."
 msgstr "å?ªæ?? RGB é¢?è?²ç??å?¾å±?å?¯ä»¥è¿?è¡?å?»è?²æ??ä½?ã??"
 
@@ -9723,56 +11232,56 @@ msgstr "å?ªæ?? RGB é¢?è?²ç??å?¾å±?å?¯ä»¥è¿?è¡?å?»è?²æ??ä½?ã??"
 msgid "Choose shade of gray based on:"
 msgstr "é??æ?©ç?°è?²æ¢¯åº¦å?ºäº?ï¼?"
 
-#: ../app/tools/gimpdodgeburntool.c:73
+#: ../app/tools/gimpdodgeburntool.c:72
 msgid "Dodge / Burn"
 msgstr "å??æ·¡ / å? æ·±"
 
-#: ../app/tools/gimpdodgeburntool.c:74
+#: ../app/tools/gimpdodgeburntool.c:73
 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush"
 msgstr "å??æ·¡ / å? æ·±å·¥å?·ï¼?使ç?¨ç?»ç¬?é??æ?©æ?§å?°å? äº®æ??å? æ·±"
 
-#: ../app/tools/gimpdodgeburntool.c:75
+#: ../app/tools/gimpdodgeburntool.c:74
 msgid "Dod_ge / Burn"
 msgstr "å??æ·¡/å? æ·±(_G)"
 
-#: ../app/tools/gimpdodgeburntool.c:173
+#: ../app/tools/gimpdodgeburntool.c:172
 msgid "Click to dodge"
 msgstr "ç?¹å?»ä»¥å??æ·¡"
 
-#: ../app/tools/gimpdodgeburntool.c:174
+#: ../app/tools/gimpdodgeburntool.c:173
 msgid "Click to dodge the line"
 msgstr "ç?¹å?»å?¯å??淡线段"
 
-#: ../app/tools/gimpdodgeburntool.c:175
+#: ../app/tools/gimpdodgeburntool.c:174
 #, c-format
 msgid "%s to burn"
 msgstr "%s 以�深"
 
-#: ../app/tools/gimpdodgeburntool.c:179
+#: ../app/tools/gimpdodgeburntool.c:178
 msgid "Click to burn"
 msgstr "��以�深"
 
-#: ../app/tools/gimpdodgeburntool.c:180
+#: ../app/tools/gimpdodgeburntool.c:179
 msgid "Click to burn the line"
 msgstr "����深线段"
 
-#: ../app/tools/gimpdodgeburntool.c:181
+#: ../app/tools/gimpdodgeburntool.c:180
 #, c-format
 msgid "%s to dodge"
 msgstr "%s 以å??æ·¡"
 
 #. the type (dodge or burn)
-#: ../app/tools/gimpdodgeburntool.c:202
+#: ../app/tools/gimpdodgeburntool.c:201
 #, c-format
 msgid "Type  (%s)"
-msgstr "ç±»å??(%s)"
+msgstr "ç±»å?? (%s)"
 
 #. mode (highlights, midtones, or shadows)
-#: ../app/tools/gimpdodgeburntool.c:213
+#: ../app/tools/gimpdodgeburntool.c:212
 msgid "Range"
 msgstr "æ¯?ç??"
 
-#: ../app/tools/gimpdodgeburntool.c:225
+#: ../app/tools/gimpdodgeburntool.c:224
 msgid "Exposure:"
 msgstr "æ??å??é??ï¼?"
 
@@ -9798,39 +11307,39 @@ msgstr "椭å??é??æ?©å·¥å?·ï¼?é??æ?©æ¤­å??å?ºå??"
 msgid "_Ellipse Select"
 msgstr "椭å??é??æ?©(_E)"
 
-#: ../app/tools/gimperasertool.c:67
+#: ../app/tools/gimperasertool.c:66
 msgid "Eraser Tool: Erase to background or transparency using a brush"
 msgstr "æ©¡ç?®å·¥å?·ï¼?使ç?¨ç?»ç¬?æ?¦é?¤è?³è??æ?¯æ??é??æ??"
 
-#: ../app/tools/gimperasertool.c:68
+#: ../app/tools/gimperasertool.c:67
 msgid "_Eraser"
 msgstr "æ©¡ç?®(_E)"
 
-#: ../app/tools/gimperasertool.c:97
+#: ../app/tools/gimperasertool.c:96
 msgid "Click to erase"
 msgstr "��以��"
 
-#: ../app/tools/gimperasertool.c:98
+#: ../app/tools/gimperasertool.c:97
 msgid "Click to erase the line"
 msgstr "�����线段"
 
-#: ../app/tools/gimperasertool.c:99
+#: ../app/tools/gimperasertool.c:98
 #, c-format
 msgid "%s to pick a background color"
 msgstr "%s å?¯æ?¾å??è??æ?¯è?²"
 
 #. the anti_erase toggle
-#: ../app/tools/gimperasertool.c:146
+#: ../app/tools/gimperasertool.c:145
 #, c-format
 msgid "Anti erase  (%s)"
 msgstr "å??æ?¦é?¤(%s)"
 
-#: ../app/tools/gimpflipoptions.c:130
+#: ../app/tools/gimpflipoptions.c:129
 msgid "Affect:"
 msgstr "å½±å??ï¼?"
 
 #. tool toggle
-#: ../app/tools/gimpflipoptions.c:139
+#: ../app/tools/gimpflipoptions.c:138
 #, c-format
 msgid "Flip Type  (%s)"
 msgstr "翻转类å??(%s)"
@@ -9848,74 +11357,74 @@ msgstr "翻转工å?·ï¼?æ°´å¹³æ??å??ç?´å??å??å?¾å±?ã??é??å?ºæ??è·¯å¾?"
 msgid "_Flip"
 msgstr "翻转(_F)"
 
-#: ../app/tools/gimpforegroundselectoptions.c:79
-#: ../app/tools/gimpselectionoptions.c:79
+#: ../app/tools/gimpforegroundselectoptions.c:78
+#: ../app/tools/gimpselectionoptions.c:78
 msgid "Smooth edges"
 msgstr "边�平�"
 
-#: ../app/tools/gimpforegroundselectoptions.c:85
+#: ../app/tools/gimpforegroundselectoptions.c:84
 msgid "Select a single contiguous area"
 msgstr "é??æ?©å??个é?»è¿?ç??å?ºå??"
 
-#: ../app/tools/gimpforegroundselectoptions.c:96
+#: ../app/tools/gimpforegroundselectoptions.c:95
 msgid "Size of the brush used for refinements"
 msgstr "ç?¨äº?æ??ç?¼ç??ç?»ç¬?ç??大å°?"
 
-#: ../app/tools/gimpforegroundselectoptions.c:102
+#: ../app/tools/gimpforegroundselectoptions.c:101
 msgid ""
 "Smaller values give a more accurate selection border but may introduce holes "
 "in the selection"
 msgstr "æ?´å°?ç??å?¼å?¯ä»¥è?·å¾?æ?´ç²¾ç¡®ç??é??å?ºä½?å?¯è?½å?¨é??å?ºä¸­äº§ç??å­?æ´?"
 
-#: ../app/tools/gimpforegroundselectoptions.c:121
+#: ../app/tools/gimpforegroundselectoptions.c:120
 msgid "Sensitivity for brightness component"
 msgstr "亮度å??é??ç??ç?µæ??度"
 
-#: ../app/tools/gimpforegroundselectoptions.c:127
+#: ../app/tools/gimpforegroundselectoptions.c:126
 msgid "Sensitivity for red/green component"
 msgstr "红/绿å??é??ç??ç?µæ??度"
 
-#: ../app/tools/gimpforegroundselectoptions.c:133
+#: ../app/tools/gimpforegroundselectoptions.c:132
 msgid "Sensitivity for yellow/blue component"
 msgstr "é»?/è??å??é??ç??ç?µæ??度"
 
 #. single / multiple objects
-#: ../app/tools/gimpforegroundselectoptions.c:276
+#: ../app/tools/gimpforegroundselectoptions.c:275
 msgid "Contiguous"
 msgstr "è¿?ç»­"
 
 #. foreground / background
-#: ../app/tools/gimpforegroundselectoptions.c:281
+#: ../app/tools/gimpforegroundselectoptions.c:280
 #, c-format
 msgid "Interactive refinement  (%s)"
 msgstr "交äº?å¼?æ??ç?¼(%s)"
 
-#: ../app/tools/gimpforegroundselectoptions.c:285
+#: ../app/tools/gimpforegroundselectoptions.c:284
 msgid "Mark background"
 msgstr "æ ?è®°è??æ?¯"
 
-#: ../app/tools/gimpforegroundselectoptions.c:286
+#: ../app/tools/gimpforegroundselectoptions.c:285
 msgid "Mark foreground"
 msgstr "æ ?è®°å??æ?¯"
 
-#: ../app/tools/gimpforegroundselectoptions.c:302
+#: ../app/tools/gimpforegroundselectoptions.c:301
 msgid "Small brush"
 msgstr "���"
 
-#: ../app/tools/gimpforegroundselectoptions.c:310
+#: ../app/tools/gimpforegroundselectoptions.c:309
 msgid "Large brush"
 msgstr "大��"
 
-#: ../app/tools/gimpforegroundselectoptions.c:334
+#: ../app/tools/gimpforegroundselectoptions.c:333
 msgid "Smoothing:"
 msgstr "å??æ»?ï¼?"
 
-#: ../app/tools/gimpforegroundselectoptions.c:340
+#: ../app/tools/gimpforegroundselectoptions.c:339
 msgid "Preview color:"
 msgstr "�����"
 
 #. granularity
-#: ../app/tools/gimpforegroundselectoptions.c:343
+#: ../app/tools/gimpforegroundselectoptions.c:342
 msgid "Color Sensitivity"
 msgstr "é¢?è?²ç?µæ??度"
 
@@ -9940,8 +11449,8 @@ msgid "Mark foreground by painting on the object to extract"
 msgstr "å?¨å¯¹è±¡ä¸?æ¶?ç?»æ ?è®°å?ºå??æ?¯ä»¥æ??å??"
 
 #: ../app/tools/gimpforegroundselecttool.c:327
-msgid "Rougly outline the object to extract"
-msgstr "å?¨å¯¹è±¡å?¨å?´ç?»ä¸?个ç²?ç?¥ç??å??以便æ??å??"
+msgid "Roughly outline the object to extract"
+msgstr "为对象ç?»ä¸?个ç²?ç?¥ç??è½®å»?以便æ??å??"
 
 #: ../app/tools/gimpforegroundselecttool.c:766
 msgctxt "command"
@@ -9967,7 +11476,7 @@ msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨ç»?件"
 
 #: ../app/tools/gimpfreeselecttool.c:1125
 msgid "Return commits, Escape cancels, Backspace removes last segment"
-msgstr "å??车以确认ï¼?Esc以å??æ¶?ï¼?Backspace以移é?¤æ??å??ç??段"
+msgstr "å??车é?®ä»¥ç¡®è®¤ï¼?Esc é?®ä»¥å??æ¶?ï¼?å??é??é?®ä»¥ç§»é?¤æ??å??ç??段"
 
 #: ../app/tools/gimpfreeselecttool.c:1129
 msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
@@ -9992,58 +11501,57 @@ msgstr "模ç³?é??æ?©(_Z)"
 
 #: ../app/tools/gimpgegltool.c:92 ../app/tools/gimpgegltool.c:111
 msgid "GEGL Operation"
-msgstr "GEGLæ??ä½?"
+msgstr "GEGL æ??ä½?"
 
 #: ../app/tools/gimpgegltool.c:93
 msgid "GEGL Tool: Use an arbitrary GEGL operation"
-msgstr "GEGLå·¥å?·ï¼?使ç?¨æ? å?ºå??ç??GEGLæ??ä½?"
+msgstr "GEGL å·¥å?·ï¼?使ç?¨æ? å?ºå??ç?? GEGL æ??ä½?"
 
 #: ../app/tools/gimpgegltool.c:94
 msgid "_GEGL Operation..."
-msgstr "GEGLæ??ä½?(_G)..."
+msgstr "GEGL æ??ä½?(_G)..."
 
 #: ../app/tools/gimpgegltool.c:158
-#, c-format
 msgid "GEGL operations do not operate on indexed layers."
-msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?GEGLæ??ä½?ã??"
+msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡? GEGL æ??ä½?ã??"
 
-#: ../app/tools/gimpgegltool.c:338
+#: ../app/tools/gimpgegltool.c:333
 msgid "_Operation:"
-msgstr "æ??ä½?(_O)..."
+msgstr "æ??ä½?(_O)ï¼?"
 
 #. The options vbox
-#: ../app/tools/gimpgegltool.c:411
+#: ../app/tools/gimpgegltool.c:404
 msgid "Operation Settings"
 msgstr "æ??ä½?é??项"
 
-#: ../app/tools/gimphealtool.c:54
+#: ../app/tools/gimphealtool.c:53
 msgid "Healing Tool: Heal image irregularities"
 msgstr "å¤?å??å·¥å?·ï¼?å¤?å??å?¾å??ç??ä¸?è§?å??"
 
-#: ../app/tools/gimphealtool.c:55
+#: ../app/tools/gimphealtool.c:54
 msgid "_Heal"
 msgstr "å¤?å??(_H)"
 
-#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:80
+#: ../app/tools/gimphealtool.c:76 ../app/tools/gimphealtool.c:79
 msgid "Click to heal"
 msgstr "ç?¹å?»ä»¥å¤?å??"
 
-#: ../app/tools/gimphealtool.c:78 ../app/tools/gimphealtool.c:82
+#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:81
 #, c-format
 msgid "%s to set a new heal source"
 msgstr "%s å?¯è®¾å®?æ?°ç??å¤?å??æº?"
 
-#: ../app/tools/gimphealtool.c:81
+#: ../app/tools/gimphealtool.c:80
 msgid "Click to set a new heal source"
 msgstr "å??å?»å?¯è®¾å®?æ?°ç??å¤?å??æº?"
 
-#: ../app/tools/gimphistogramoptions.c:127
+#: ../app/tools/gimphistogramoptions.c:126
 msgid "Histogram Scale"
 msgstr "���尺度"
 
 #: ../app/tools/gimphuesaturationtool.c:103
 msgid "Hue-Saturation Tool: Adjust hue, saturation, and lightness"
-msgstr "è?²ç?¸-饱å??度工å?·ï¼?è°?æ?´è?²ç?¸ï¼?饱å??度ï¼?以å??亮度"
+msgstr "è?²è°?-饱å??度工å?·ï¼?è°?æ?´è?²è°?ï¼?饱å??度ï¼?以å??亮度"
 
 #: ../app/tools/gimphuesaturationtool.c:104
 msgid "Hue-_Saturation..."
@@ -10055,14 +11563,13 @@ msgstr "è°?æ?´è?²è°? / 亮度 / 饱å??度"
 
 #: ../app/tools/gimphuesaturationtool.c:123
 msgid "Import Hue-Saturation Settings"
-msgstr "导å?¥è?²ç?¸-饱å??度é??项"
+msgstr "导å?¥è?²è°?-饱å??度é??项"
 
 #: ../app/tools/gimphuesaturationtool.c:124
 msgid "Export Hue-Saturation Settings"
-msgstr "导å?ºè?²ç?¸-饱å??度é??项"
+msgstr "导å?ºè?²è°?-饱å??度é??项"
 
 #: ../app/tools/gimphuesaturationtool.c:171
-#, c-format
 msgid "Hue-Saturation operates only on RGB color layers."
 msgstr "å?ªæ?? RGB é¢?è?²ç??å?¾å±?å?¯ä»¥è¿?è¡?è?²è°?-饱å??度æ??ä½?ã??"
 
@@ -10114,65 +11621,67 @@ msgstr "ä¿®æ?¹é??中ç??é¢?è?²"
 msgid "R_eset Color"
 msgstr "é??ç½®é¢?è?²(_E)"
 
-#: ../app/tools/gimpimagemaptool-settings.c:81
+#: ../app/tools/gimpimagemaptool-settings.c:80
 msgid "Pre_sets:"
-msgstr "�设(S):"
+msgstr "�设(_S):"
 
-#: ../app/tools/gimpimagemaptool-settings.c:221
+#: ../app/tools/gimpimagemaptool-settings.c:222
 #, c-format
 msgid "Settings saved to '%s'"
 msgstr "设置已ä¿?å­?å?°â??%sâ??"
 
-#: ../app/tools/gimpimagemaptool.c:318
+#: ../app/tools/gimpimagemaptool.c:319
 msgid "_Preview"
 msgstr "��(_P)"
 
 #. adjust sliders
-#: ../app/tools/gimpinkoptions-gui.c:56
+#: ../app/tools/gimpinkoptions-gui.c:55
 msgid "Adjustment"
 msgstr "è°?æ?´"
 
-#: ../app/tools/gimpinkoptions-gui.c:68 ../app/tools/gimpinkoptions-gui.c:93
-#: ../app/tools/gimprectangleoptions.c:973 ../app/tools/gimptextoptions.c:452
+#: ../app/tools/gimpinkoptions-gui.c:67 ../app/tools/gimpinkoptions-gui.c:92
+#: ../app/tools/gimprectangleoptions.c:972 ../app/tools/gimptextoptions.c:452
 msgid "Size:"
 msgstr "大��"
 
-#: ../app/tools/gimpinkoptions-gui.c:76 ../app/tools/gimpmeasuretool.c:1037
-#: ../app/widgets/gimpbrusheditor.c:208
+#: ../app/tools/gimpinkoptions-gui.c:75 ../app/tools/gimpmeasuretool.c:1039
+#: ../app/tools/gimppaintoptions-gui.c:168
+#: ../app/widgets/gimpbrusheditor.c:207
 msgid "Angle:"
 msgstr "�度�"
 
 #. sens sliders
-#: ../app/tools/gimpinkoptions-gui.c:81
+#: ../app/tools/gimpinkoptions-gui.c:80
 msgid "Sensitivity"
 msgstr "ç?µæ??度"
 
-#: ../app/tools/gimpinkoptions-gui.c:100
+#: ../app/tools/gimpinkoptions-gui.c:99
+#: ../app/tools/gimppaintoptions-gui.c:259
 msgid "Tilt:"
 msgstr "å?¾æ??ï¼?"
 
-#: ../app/tools/gimpinkoptions-gui.c:107
+#: ../app/tools/gimpinkoptions-gui.c:106
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../app/tools/gimpinkoptions-gui.c:118
+#: ../app/tools/gimpinkoptions-gui.c:117
 msgid "Type"
 msgstr "ç±»å??"
 
 #. Blob shape widget
-#: ../app/tools/gimpinkoptions-gui.c:149
+#: ../app/tools/gimpinkoptions-gui.c:148
 msgid "Shape"
 msgstr "形�"
 
-#: ../app/tools/gimpinktool.c:56
+#: ../app/tools/gimpinktool.c:55
 msgid "Ink Tool: Calligraphy-style painting"
 msgstr "墨水工å?·ï¼?书æ³?é£?æ ¼ç??ç»?å?¶"
 
-#: ../app/tools/gimpinktool.c:57
+#: ../app/tools/gimpinktool.c:56
 msgid "In_k"
 msgstr "墨水(_K)"
 
-#: ../app/tools/gimpiscissorsoptions.c:126
+#: ../app/tools/gimpiscissorsoptions.c:125
 msgid "Interactive boundary"
 msgstr "äº?å?¨è¾¹ç??"
 
@@ -10188,7 +11697,7 @@ msgstr "å?ªå??é??æ?©å·¥å?·ï¼?ç?¨æ?ºè?½è¾¹ç¼?é??é??é??å??å½¢ç?¶"
 msgid "Intelligent _Scissors"
 msgstr "æ?ºè?½å?ªå??(_S)"
 
-#: ../app/tools/gimpiscissorstool.c:940 ../app/tools/gimpmeasuretool.c:609
+#: ../app/tools/gimpiscissorstool.c:940 ../app/tools/gimpmeasuretool.c:610
 msgid "Click-Drag to move this point"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨æ­¤ç?¹"
 
@@ -10227,14 +11736,13 @@ msgstr "��(_L)..."
 
 #: ../app/tools/gimplevelstool.c:174
 msgid "Import Levels"
-msgstr "����"
+msgstr "导���"
 
 #: ../app/tools/gimplevelstool.c:175
 msgid "Export Levels"
-msgstr "����"
+msgstr "导���"
 
 #: ../app/tools/gimplevelstool.c:228
-#, c-format
 msgid "Levels does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?è?²é?¶æ??ä½?ã??"
 
@@ -10269,6 +11777,10 @@ msgstr "����"
 msgid "All Channels"
 msgstr "æ??æ??é??é??"
 
+#: ../app/tools/gimplevelstool.c:653 ../app/tools/gimpthresholdtool.c:264
+msgid "_Auto"
+msgstr "��(_A)"
+
 #: ../app/tools/gimplevelstool.c:655
 msgid "Adjust levels automatically"
 msgstr "������"
@@ -10279,14 +11791,14 @@ msgstr "�此设置�为�线��"
 
 #: ../app/tools/gimplevelstool.c:825
 msgid "Use _old levels file format"
-msgstr "使ç?¨æ?§è?²é?¶æ??件格å¼?(_o)"
+msgstr "使ç?¨æ?§è?²é?¶æ??件格å¼?(_O)"
 
-#: ../app/tools/gimpmagnifyoptions.c:167
+#: ../app/tools/gimpmagnifyoptions.c:166
 msgid "Auto-resize window"
 msgstr "è?ªå?¨æ?¹å??çª?å?£å¤§å°?"
 
 #. tool toggle
-#: ../app/tools/gimpmagnifyoptions.c:172 ../app/tools/gimpmoveoptions.c:188
+#: ../app/tools/gimpmagnifyoptions.c:171 ../app/tools/gimpmoveoptions.c:187
 #, c-format
 msgid "Tool Toggle  (%s)"
 msgstr "å·¥å?·å??æ?¢(%s)"
@@ -10303,7 +11815,7 @@ msgstr "缩�工����缩�级�"
 msgid "tool|_Zoom"
 msgstr "缩�(_Z)"
 
-#: ../app/tools/gimpmeasureoptions.c:124
+#: ../app/tools/gimpmeasureoptions.c:123
 msgid "Use info window"
 msgstr "使�信���"
 
@@ -10331,48 +11843,54 @@ msgstr "ç?¹å?»å?¯æ?¾ç½®å??ç?´å??æ°´å¹³å??è??线"
 msgid "Click to place a horizontal guide"
 msgstr "ç?¹å?»å?¯æ?¾ç½®æ°´å¹³å??è??线"
 
-#: ../app/tools/gimpmeasuretool.c:584
+#: ../app/tools/gimpmeasuretool.c:585
 msgid "Click to place a vertical guide"
 msgstr "ç?¹å?»å?¯æ?¾ç½®å??ç?´å??è??线"
 
-#: ../app/tools/gimpmeasuretool.c:598
+#: ../app/tools/gimpmeasuretool.c:599
 msgid "Click-Drag to add a new point"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯æ·»å? æ?°ç??ç?¹"
 
-#: ../app/tools/gimpmeasuretool.c:628
+#: ../app/tools/gimpmeasuretool.c:630
 msgid "Click-Drag to move all points"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨æ??æ??ç?¹"
 
+#: ../app/tools/gimpmeasuretool.c:879 ../app/tools/gimpmeasuretool.c:1022
+#: ../app/tools/gimpmeasuretool.c:1078 ../app/tools/gimpmeasuretool.c:1106
+#: ../app/tools/gimppainttool.c:578
+msgid "pixels"
+msgstr "å??ç´ "
+
 #. tool->display->shell
-#: ../app/tools/gimpmeasuretool.c:989
+#: ../app/tools/gimpmeasuretool.c:991
 msgid "Measure Distances and Angles"
 msgstr "æµ?é??è·?离å??è§?度"
 
-#: ../app/tools/gimpmeasuretool.c:1009
+#: ../app/tools/gimpmeasuretool.c:1011
 msgid "Distance:"
 msgstr "�离�"
 
-#: ../app/tools/gimpmoveoptions.c:140
+#: ../app/tools/gimpmoveoptions.c:139
 msgid "Pick a layer or guide"
 msgstr "æ?¾å??å?¾å±?æ??å??è??线"
 
-#: ../app/tools/gimpmoveoptions.c:141
+#: ../app/tools/gimpmoveoptions.c:140
 msgid "Move the active layer"
 msgstr "移�活���"
 
-#: ../app/tools/gimpmoveoptions.c:145
+#: ../app/tools/gimpmoveoptions.c:144
 msgid "Move selection"
 msgstr "移å?¨é??å?º"
 
-#: ../app/tools/gimpmoveoptions.c:149
+#: ../app/tools/gimpmoveoptions.c:148
 msgid "Pick a path"
 msgstr "æ?¾å??è·¯å¾?"
 
-#: ../app/tools/gimpmoveoptions.c:150
+#: ../app/tools/gimpmoveoptions.c:149
 msgid "Move the active path"
 msgstr "移�活�路�"
 
-#: ../app/tools/gimpmoveoptions.c:179
+#: ../app/tools/gimpmoveoptions.c:178
 msgid "Move:"
 msgstr "移��"
 
@@ -10389,100 +11907,116 @@ msgstr "移å?¨å·¥å?·ï¼?移å?¨å?¾å±?ã??é??å?ºã??以å??å?¶ä»?对象"
 msgid "_Move"
 msgstr "移�(_M)"
 
-#: ../app/tools/gimpmovetool.c:276 ../app/tools/gimpmovetool.c:570
+#: ../app/tools/gimpmovetool.c:276 ../app/tools/gimpmovetool.c:572
 msgid "Move Guide: "
 msgstr "移å?¨å??è??线ï¼?"
 
-#: ../app/tools/gimpmovetool.c:564
+#: ../app/tools/gimpmovetool.c:566
 msgid "Cancel Guide"
 msgstr "å??æ¶?å??è??线"
 
-#: ../app/tools/gimpmovetool.c:570
+#: ../app/tools/gimpmovetool.c:572
 msgid "Add Guide: "
 msgstr "æ·»å? å??è??线ï¼?"
 
-#: ../app/tools/gimppaintbrushtool.c:52
+#: ../app/tools/gimppaintbrushtool.c:51
 msgid "Paintbrush Tool: Paint smooth strokes using a brush"
 msgstr "��工��使���平���"
 
-#: ../app/tools/gimppaintbrushtool.c:53
+#: ../app/tools/gimppaintbrushtool.c:52
 msgid "_Paintbrush"
 msgstr "��(_P)"
 
-#: ../app/tools/gimppaintoptions-gui.c:112
-#: ../app/tools/gimpselectionoptions.c:211
-#: ../app/widgets/gimpbrushselect.c:191 ../app/widgets/gimplayertreeview.c:269
+#: ../app/tools/gimppaintoptions-gui.c:121
+#: ../app/tools/gimpselectionoptions.c:210
+#: ../app/widgets/gimpbrushselect.c:193 ../app/widgets/gimplayertreeview.c:296
 msgid "Mode:"
 msgstr "模��"
 
-#: ../app/tools/gimppaintoptions-gui.c:127
-#: ../app/tools/gimptransformoptions.c:348
-#: ../app/widgets/gimpbrushselect.c:178 ../app/widgets/gimplayertreeview.c:284
+#: ../app/tools/gimppaintoptions-gui.c:136
+#: ../app/tools/gimptransformoptions.c:347
+#: ../app/widgets/gimpbrushselect.c:180 ../app/widgets/gimplayertreeview.c:311
 msgid "Opacity:"
 msgstr "ä¸?é??æ??度ï¼?"
 
-#: ../app/tools/gimppaintoptions-gui.c:137
+#: ../app/tools/gimppaintoptions-gui.c:149
 msgid "Brush:"
 msgstr "���"
 
-#: ../app/tools/gimppaintoptions-gui.c:142
+#: ../app/tools/gimppaintoptions-gui.c:154
 msgid "Scale:"
 msgstr "缩��"
 
-#: ../app/tools/gimppaintoptions-gui.c:150
-msgid "Opacity"
-msgstr "ä¸?é??æ??度"
+#: ../app/tools/gimppaintoptions-gui.c:161
+msgid "Aspect Ratio:"
+msgstr "宽���"
 
-#: ../app/tools/gimppaintoptions-gui.c:156
+#: ../app/tools/gimppaintoptions-gui.c:181
 msgid "Hardness"
 msgstr "硬度"
 
-#: ../app/tools/gimppaintoptions-gui.c:162
+#: ../app/tools/gimppaintoptions-gui.c:187
 msgid "Rate"
 msgstr "æ¯?ç??"
 
-#: ../app/tools/gimppaintoptions-gui.c:168 ../app/tools/tools-enums.c:151
+#: ../app/tools/gimppaintoptions-gui.c:193
 msgid "Size"
 msgstr "大�"
 
-#: ../app/tools/gimppaintoptions-gui.c:186
+#: ../app/tools/gimppaintoptions-gui.c:199
+msgid "Aspect ratio"
+msgstr "宽��"
+
+#: ../app/tools/gimppaintoptions-gui.c:206
+msgid "Angle"
+msgstr "�度"
+
+#: ../app/tools/gimppaintoptions-gui.c:212
+msgid "Color"
+msgstr "��"
+
+#: ../app/tools/gimppaintoptions-gui.c:229
 msgid "Brush Dynamics"
 msgstr "å?¨æ??ç?»ç¬?"
 
-#: ../app/tools/gimppaintoptions-gui.c:204
+#: ../app/tools/gimppaintoptions-gui.c:247
 msgid "Velocity:"
-msgstr "é??æ?©äº?ï¼?"
+msgstr "é??ç??ï¼?"
+
+#: ../app/tools/gimppaintoptions-gui.c:253
+msgid "Direction:"
+msgstr "æ?¹å??ï¼?"
 
-#: ../app/tools/gimppaintoptions-gui.c:210
+#: ../app/tools/gimppaintoptions-gui.c:265
 msgid "Random:"
-msgstr "é??æ?º:"
+msgstr "é??æ?ºï¼?"
 
-#: ../app/tools/gimppaintoptions-gui.c:264
+#: ../app/tools/gimppaintoptions-gui.c:325
 msgid "Incremental"
 msgstr "��"
 
-#: ../app/tools/gimppaintoptions-gui.c:280
+#: ../app/tools/gimppaintoptions-gui.c:341
 msgid "Hard edge"
 msgstr "硬质边ç??"
 
-#: ../app/tools/gimppaintoptions-gui.c:565
+#: ../app/tools/gimppaintoptions-gui.c:807
 msgid "Fade out"
 msgstr "æ·¡å?º"
 
-#: ../app/tools/gimppaintoptions-gui.c:574
-#: ../app/tools/gimppaintoptions-gui.c:657
+#: ../app/tools/gimppaintoptions-gui.c:816
+#: ../app/tools/gimppaintoptions-gui.c:899
 msgid "Length:"
 msgstr "�度�"
 
-#: ../app/tools/gimppaintoptions-gui.c:601
+#: ../app/tools/gimppaintoptions-gui.c:843
 msgid "Apply Jitter"
 msgstr "åº?ç?¨æ??å?¨"
 
-#: ../app/tools/gimppaintoptions-gui.c:606
+#: ../app/tools/gimppaintoptions-gui.c:848
 msgid "Amount:"
 msgstr "计��"
 
-#: ../app/tools/gimppaintoptions-gui.c:631
+#: ../app/tools/gimppaintoptions-gui.c:873
 msgid "Use color from gradient"
 msgstr "使ç?¨æ¸?å??中ç??é¢?è?²"
 
@@ -10499,16 +12033,16 @@ msgstr "�����线段"
 msgid "%s to pick a color"
 msgstr "%s å?¯æ?¾å??é¢?è?²"
 
-#: ../app/tools/gimppainttool.c:662
+#: ../app/tools/gimppainttool.c:625
 #, c-format
 msgid "%s for a straight line"
 msgstr "%s ����线"
 
-#: ../app/tools/gimppenciltool.c:52
+#: ../app/tools/gimppenciltool.c:51
 msgid "Pencil Tool: Hard edge painting using a brush"
 msgstr "é??ç¬?å·¥å?·ï¼?使ç?¨ç?»ç¬?å??硬边ç¼?ç??ç»?ç?»"
 
-#: ../app/tools/gimppenciltool.c:53
+#: ../app/tools/gimppenciltool.c:52
 msgid "Pe_ncil"
 msgstr "é??ç¬?(_N)"
 
@@ -10549,60 +12083,59 @@ msgstr "å??æ?¢ç?©é?µ"
 
 #: ../app/tools/gimpposterizetool.c:85
 msgid "Posterize Tool: Reduce to a limited set of colors"
-msgstr "æµ·æ?¥æ??æ??å·¥å?·ï¼?å??å°?é¢?è?²å?°é??å®?ç??é??å??"
+msgstr "è?²è°?å??离工å?·ï¼?å??å°?é¢?è?²å?°é??å®?ç??é??å??"
 
 #: ../app/tools/gimpposterizetool.c:86
 msgid "_Posterize..."
-msgstr "æµ·æ?¥æ??æ??(_P)..."
+msgstr "è?²è°?å??离(_P)..."
 
 #: ../app/tools/gimpposterizetool.c:103
 msgid "Posterize (Reduce Number of Colors)"
-msgstr "æµ·æ?¥æ??æ??(å??å°?é¢?è?²ç??æ?°é??)"
+msgstr "è?²è°?å??离(å??å°?é¢?è?²ç??æ?°é??)"
 
 #: ../app/tools/gimpposterizetool.c:151
-#, c-format
 msgid "Posterize does not operate on indexed layers."
-msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?æµ·æ?¥æ??æ??æ??ä½?ã??"
+msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?è?²è°?å??离æ??ä½?ã??"
 
 #: ../app/tools/gimpposterizetool.c:226
 msgid "Posterize _levels:"
-msgstr "æµ·æ?¥æ??æ??级æ?°(_L)ï¼?"
+msgstr "è?²è°?å??离级æ?°(_L)ï¼?"
 
-#: ../app/tools/gimprectangleoptions.c:112
+#: ../app/tools/gimprectangleoptions.c:111
 msgid "Use all visible layers when shrinking the selection"
 msgstr "æ?¶ç¼©é??å?ºæ?¶ä½¿ç?¨æ??æ??ç??å?¯è§?å?¾å±?"
 
 #. Current, as in what is currently in use.
-#: ../app/tools/gimprectangleoptions.c:729
+#: ../app/tools/gimprectangleoptions.c:728
 msgid "Current"
 msgstr "å½?å??"
 
-#: ../app/tools/gimprectangleoptions.c:807
+#: ../app/tools/gimprectangleoptions.c:806
 msgid "Expand from center"
 msgstr "�中���"
 
-#: ../app/tools/gimprectangleoptions.c:830
+#: ../app/tools/gimprectangleoptions.c:829
 msgid "Fixed:"
 msgstr "���"
 
-#: ../app/tools/gimprectangleoptions.c:963
+#: ../app/tools/gimprectangleoptions.c:962
 msgid "Position:"
 msgstr "�置�"
 
-#: ../app/tools/gimprectangleoptions.c:981
+#: ../app/tools/gimprectangleoptions.c:980
 msgid "Highlight"
 msgstr "�亮"
 
 #. Auto Shrink
-#: ../app/tools/gimprectangleoptions.c:991
+#: ../app/tools/gimprectangleoptions.c:990
 msgid "Auto Shrink"
 msgstr "���缩"
 
-#: ../app/tools/gimprectangleoptions.c:998
+#: ../app/tools/gimprectangleoptions.c:997
 msgid "Shrink merged"
 msgstr "æ?¶ç¼©å??并"
 
-#: ../app/tools/gimprectangleselectoptions.c:164
+#: ../app/tools/gimprectangleselectoptions.c:163
 msgid "Rounded corners"
 msgstr "å??è§?"
 
@@ -10618,29 +12151,29 @@ msgstr "ç?©å½¢é??æ?©å·¥å?·ï¼?é??æ?©ç?©å½¢å?ºå??"
 msgid "_Rectangle Select"
 msgstr "ç?©å½¢é??æ?©(_R)"
 
-#: ../app/tools/gimprectangletool.c:1085 ../app/tools/gimprectangletool.c:1981
+#: ../app/tools/gimprectangletool.c:1151 ../app/tools/gimprectangletool.c:2091
 msgid "Rectangle: "
 msgstr "�形�"
 
-#: ../app/tools/gimpregionselectoptions.c:83
+#: ../app/tools/gimpregionselectoptions.c:82
 msgid "Allow completely transparent regions to be selected"
 msgstr "å??许é??中å®?å?¨é??æ??ç??å?ºå??"
 
-#: ../app/tools/gimpregionselectoptions.c:90
+#: ../app/tools/gimpregionselectoptions.c:89
 msgid "Base region_select on all visible layers"
 msgstr "è??å?´é??å??以æ??æ??å?¯è§?å?¾å±?为å??"
 
-#: ../app/tools/gimpregionselectoptions.c:202
+#: ../app/tools/gimpregionselectoptions.c:201
 msgid "Select transparent areas"
 msgstr "é??æ?©é??æ??å?ºå??"
 
-#: ../app/tools/gimpregionselectoptions.c:227
+#: ../app/tools/gimpregionselectoptions.c:226
 msgid "Select by:"
 msgstr "é??æ?©äº?ï¼?"
 
 #: ../app/tools/gimpregionselecttool.c:162
 msgid "Move the mouse to change threshold"
-msgstr "移å?¨é¼ æ ?å?¯æ?´æ?¹é??å?¼"
+msgstr "移å?¨é¼ æ ?å?¯æ?´æ?¹é??å?¼"
 
 #: ../app/tools/gimprotatetool.c:90
 msgid "Rotate"
@@ -10683,11 +12216,11 @@ msgctxt "command"
 msgid "Scale"
 msgstr "缩�"
 
-#: ../app/tools/gimpselectionoptions.c:258 ../app/tools/gimptextoptions.c:473
+#: ../app/tools/gimpselectionoptions.c:257 ../app/tools/gimptextoptions.c:465
 msgid "Antialiasing"
 msgstr "边�平�"
 
-#: ../app/tools/gimpselectionoptions.c:273
+#: ../app/tools/gimpselectionoptions.c:272
 msgid "Feather edges"
 msgstr "è¾¹ç¼?ç¾½å??"
 
@@ -10727,124 +12260,123 @@ msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨é??中å??ç´ ç??å?¯æ?¬"
 msgid "Click to anchor the floating selection"
 msgstr "ç?¹å?»å?¯å?ºå®?æµ®å?¨é??å?º"
 
-#: ../app/tools/gimpsheartool.c:82
+#: ../app/tools/gimpsheartool.c:81
 msgid "Shear"
 msgstr "å??å??"
 
-#: ../app/tools/gimpsheartool.c:83
+#: ../app/tools/gimpsheartool.c:82
 msgid "Shear Tool: Shear the layer, selection or path"
 msgstr "å??å??å·¥å?·ï¼?å??å??å?¾å±?ï¼?é??å?ºæ??è·¯å¾?"
 
-#: ../app/tools/gimpsheartool.c:84
+#: ../app/tools/gimpsheartool.c:83
 msgid "S_hear"
 msgstr "å??å??(_H)"
 
-#: ../app/tools/gimpsheartool.c:110
+#: ../app/tools/gimpsheartool.c:109
 msgctxt "command"
 msgid "Shear"
 msgstr "å??å??"
 
-#: ../app/tools/gimpsheartool.c:134
+#: ../app/tools/gimpsheartool.c:133
 msgid "Shear magnitude _X:"
 msgstr "å??å??é?? _Xï¼?"
 
-#: ../app/tools/gimpsheartool.c:144
+#: ../app/tools/gimpsheartool.c:143
 msgid "Shear magnitude _Y:"
 msgstr "å??å??é?? _Yï¼?"
 
-#: ../app/tools/gimpsmudgetool.c:54
+#: ../app/tools/gimpsmudgetool.c:53
 msgid "Smudge Tool: Smudge selectively using a brush"
 msgstr "æ¶?æ?¹å·¥å?·ï¼?使ç?¨ç?»ç¬?é??æ?©æ?§å?°æ¶?æ?¹"
 
-#: ../app/tools/gimpsmudgetool.c:55
+#: ../app/tools/gimpsmudgetool.c:54
 msgid "_Smudge"
 msgstr "��(_S)"
 
-#: ../app/tools/gimpsmudgetool.c:74
+#: ../app/tools/gimpsmudgetool.c:73
 msgid "Click to smudge"
 msgstr "��以��"
 
-#: ../app/tools/gimpsmudgetool.c:75
+#: ../app/tools/gimpsmudgetool.c:74
 msgid "Click to smudge the line"
 msgstr "�����线段"
 
-#: ../app/tools/gimptextoptions.c:127
+#: ../app/tools/gimptextoptions.c:130
 msgid ""
 "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr "å¾®è°?å°?ä¿®æ?¹å­?ä½?ç??è½®å»?ï¼?使ä¹?产ç??æ¸?æ?°ç??å°?尺寸ä½?å?¾"
 
-#: ../app/tools/gimptextoptions.c:134
-msgid ""
-"If available, hints from the font are used but you may prefer to always use "
-"the automatic hinter"
-msgstr "ä¸?è?¬å?ªå?¨å­?ä½?æ??ä¾?å¾®è°?æ?¶æ??è¿?è¡?å¾®è°?ï¼?ä½?æ?¯æ?¨ä¹?å?¯ä»¥é¦?é??æ?»æ?¯ä½¿ç?¨è?ªå?¨å¾®è°?"
-
-#: ../app/tools/gimptextoptions.c:159
+#: ../app/tools/gimptextoptions.c:152
 msgid "Indentation of the first line"
 msgstr "第ä¸?è¡?ç??缩è¿?深度"
 
-#: ../app/tools/gimptextoptions.c:165
+#: ../app/tools/gimptextoptions.c:158
 msgid "Adjust line spacing"
 msgstr "��线��"
 
-#: ../app/tools/gimptextoptions.c:171
+#: ../app/tools/gimptextoptions.c:164
 msgid "Adjust letter spacing"
 msgstr "����符�"
 
+#: ../app/tools/gimptextoptions.c:171
+msgid ""
+"Use an external editor window for text entry, instead of direct-on-canvas "
+"editing"
+msgstr "æ??å­?è¾?å?¥ä½¿ç?¨å¤?é?¨ç¼?è¾?å?¨çª?å?£ï¼?è??ä¸?æ?¯å?¨ç?»å¸?ä¸?ç?´æ?¥ç¼?è¾?"
+
 #: ../app/tools/gimptextoptions.c:445
 msgid "Font:"
 msgstr "å­?ä½?ï¼?"
 
 #: ../app/tools/gimptextoptions.c:461
-msgid "Hinting"
-msgstr "微�"
+msgid "Use editor"
+msgstr "使����"
 
-#: ../app/tools/gimptextoptions.c:466
-msgid "Force auto-hinter"
-msgstr "强���微�"
+#: ../app/tools/gimptextoptions.c:481
+msgid "Hinting:"
+msgstr "微��"
 
-#: ../app/tools/gimptextoptions.c:487
+#: ../app/tools/gimptextoptions.c:485
 msgid "Text Color"
 msgstr "æ??å­?é¢?è?²"
 
-#: ../app/tools/gimptextoptions.c:492
+#: ../app/tools/gimptextoptions.c:490
 msgid "Color:"
 msgstr "���"
 
-#: ../app/tools/gimptextoptions.c:498
+#: ../app/tools/gimptextoptions.c:496
 msgid "Justify:"
 msgstr "对��"
 
-#. Create a path from the current text
-#: ../app/tools/gimptextoptions.c:520
-msgid "Path from Text"
-msgstr "ä»?æ??å­?å??建路å¾?"
-
-#: ../app/tools/gimptextoptions.c:527
-msgid "Text along Path"
-msgstr "æ??å­?沿路å¾?"
+#: ../app/tools/gimptexttool.c:208
+msgid "Text"
+msgstr "æ??å­?"
 
-#: ../app/tools/gimptexttool.c:161
+#: ../app/tools/gimptexttool.c:209
 msgid "Text Tool: Create or edit text layers"
 msgstr "æ??å­?å·¥å?·ï¼?å??建æ??ç¼?è¾?æ??å­?å?¾å±?"
 
-#: ../app/tools/gimptexttool.c:162
+#: ../app/tools/gimptexttool.c:210
 msgid "Te_xt"
 msgstr "æ??å­?(_X)"
 
-#: ../app/tools/gimptexttool.c:956
+#: ../app/tools/gimptexttool.c:1361
+msgid "Reshape Text Layer"
+msgstr "å??æ ?æ ¼å??æ??å­?å?¾å±?"
+
+#: ../app/tools/gimptexttool.c:1826
 msgid "GIMP Text Editor"
 msgstr "GIMP æ??æ?¬ç¼?è¾?å?¨"
 
-#: ../app/tools/gimptexttool.c:1072 ../app/tools/gimptexttool.c:1075
+#: ../app/tools/gimptexttool.c:1955 ../app/tools/gimptexttool.c:1958
 msgid "Confirm Text Editing"
 msgstr "确认ç¼?è¾?æ??å­?"
 
-#: ../app/tools/gimptexttool.c:1079
+#: ../app/tools/gimptexttool.c:1962
 msgid "Create _New Layer"
 msgstr "å??建æ?°å?¾å±?(_N)"
 
-#: ../app/tools/gimptexttool.c:1103
+#: ../app/tools/gimptexttool.c:1986
 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 "
@@ -10857,10 +12389,6 @@ msgstr ""
 "\n"
 "æ?¨å?¯ä»¥ç¼?è¾?æ­¤å?¾å±?æ??è??ä»?å®?ç??æ??å­?å±?æ?§å??建æ?°ç??æ??å­?å?¾å±?ã??"
 
-#: ../app/tools/gimptexttool.c:1315
-msgid "Reshape Text Layer"
-msgstr "å??æ ?æ ¼å??æ??å­?å?¾å±?"
-
 #: ../app/tools/gimpthresholdtool.c:91
 msgid "Threshold Tool: Reduce image to two colors using a threshold"
 msgstr "é??å?¼å·¥å?·ï¼?以æ??å®?é??å?¼å°?å?¾å??å??è?³ä¸¤è?²"
@@ -10882,7 +12410,6 @@ msgid "Export Threshold Settings"
 msgstr "导å?ºé??å?¼è®¾ç½®"
 
 #: ../app/tools/gimpthresholdtool.c:161
-#, c-format
 msgid "Threshold does not operate on indexed layers."
 msgstr "ç´¢å¼?å?¾å±?ä¸?è?½è¿?è¡?é??å?¼æ??ä½?ã??"
 
@@ -10890,62 +12417,66 @@ msgstr "ç´¢å¼?å?¾å±?ä¸?è?½è¿?è¡?é??å?¼æ??ä½?ã??"
 msgid "Automatically adjust to optimal binarization threshold"
 msgstr "è?ªå?¨è°?æ?´å?°æ??ä½³äº?å?¼å??é??å?¼"
 
-#: ../app/tools/gimptransformoptions.c:273
+#: ../app/tools/gimptool.c:850
+msgid "Can't work on an empty image, add a layer first"
+msgstr "ä¸?è?½å?¨ç©ºç??å?¾å??ä¸?æ??ä½?ï¼?å??æ·»å? å?¾å±?"
+
+#: ../app/tools/gimptransformoptions.c:272
 msgid "Transform:"
 msgstr "å??æ?¢ï¼?"
 
-#: ../app/tools/gimptransformoptions.c:282
+#: ../app/tools/gimptransformoptions.c:281
 msgid "Direction"
 msgstr "æ?¹å??"
 
 #. the interpolation menu
-#: ../app/tools/gimptransformoptions.c:287
+#: ../app/tools/gimptransformoptions.c:286
 msgid "Interpolation:"
 msgstr "æ??å?¼ï¼?"
 
-#: ../app/tools/gimptransformoptions.c:300
+#: ../app/tools/gimptransformoptions.c:299
 msgid "Clipping:"
 msgstr "翻转�"
 
-#: ../app/tools/gimptransformoptions.c:318
+#: ../app/tools/gimptransformoptions.c:317
 msgid "Preview:"
 msgstr "���"
 
-#: ../app/tools/gimptransformoptions.c:389
+#: ../app/tools/gimptransformoptions.c:388
 #, c-format
 msgid "15 degrees  (%s)"
 msgstr "15 度(%s)"
 
-#: ../app/tools/gimptransformoptions.c:393
+#: ../app/tools/gimptransformoptions.c:392
 #, c-format
 msgid "Keep aspect  (%s)"
 msgstr "ä¿?æ??宽é«?æ¯?(%s)"
 
-#: ../app/tools/gimptransformtool.c:238
+#: ../app/tools/gimptransformtool.c:236
 msgid "Transforming"
 msgstr "æ­£å?¨å??æ?¢"
 
-#: ../app/tools/gimptransformtool.c:1165
+#: ../app/tools/gimptransformtool.c:1163
 msgid "There is no layer to transform."
 msgstr "没æ??å?¾å±?å?¯ä»¥å??æ?¢ã??"
 
-#: ../app/tools/gimptransformtool.c:1176
+#: ../app/tools/gimptransformtool.c:1174
 msgid "There is no path to transform."
 msgstr "没æ??è·¯å¾?å?¯ä»¥å??æ?¢ã??"
 
-#: ../app/tools/gimpvectoroptions.c:77
+#: ../app/tools/gimpvectoroptions.c:76
 msgid "Restrict editing to polygons"
 msgstr "ç¼?è¾?é??äº?å¤?边形"
 
-#: ../app/tools/gimpvectoroptions.c:156
+#: ../app/tools/gimpvectoroptions.c:155
 msgid "Edit Mode"
 msgstr "��模�"
 
-#: ../app/tools/gimpvectoroptions.c:174
+#: ../app/tools/gimpvectoroptions.c:173
 msgid "Polygonal"
 msgstr "�边形"
 
-#: ../app/tools/gimpvectoroptions.c:178
+#: ../app/tools/gimpvectoroptions.c:177
 #, c-format
 msgid ""
 "Path to Selection\n"
@@ -10959,7 +12490,7 @@ msgstr ""
 "%s �交"
 
 #. Create a selection from the current path
-#: ../app/tools/gimpvectoroptions.c:189
+#: ../app/tools/gimpvectoroptions.c:188
 msgid "Selection from Path"
 msgstr "ä»?è·¯å¾?å??建é??å?º"
 
@@ -11092,80 +12623,138 @@ msgstr "ç?¹å?»å?¯ä½¿æ­¤è??ç?¹æ??为è§?ç?¹"
 msgid "Delete Anchors"
 msgstr "å? é?¤é??ç?¹"
 
+#: ../app/tools/gimpvectortool.c:1912
+msgid "Path to selection"
+msgstr "è·¯å¾?å?°é??å?º"
+
 #: ../app/tools/gimpvectortool.c:1939
 msgid "There is no active layer or channel to stroke to"
 msgstr "没æ??æ´»å?¨å?¾å±?æ??é??é??å?¯ä»¥å?¾ç?»"
 
-#: ../app/tools/tools-enums.c:58
+#: ../app/tools/tools-enums.c:60
+msgctxt "rectangle-guide"
 msgid "No guides"
 msgstr "æ? å??è??线"
 
-#: ../app/tools/tools-enums.c:59
+#: ../app/tools/tools-enums.c:61
+msgctxt "rectangle-guide"
 msgid "Center lines"
 msgstr "中线"
 
-#: ../app/tools/tools-enums.c:60
+#: ../app/tools/tools-enums.c:62
+msgctxt "rectangle-guide"
 msgid "Rule of thirds"
 msgstr "ä¸?å??æ??å?¾æ³?"
 
-#: ../app/tools/tools-enums.c:61
+#: ../app/tools/tools-enums.c:63
+msgctxt "rectangle-guide"
 msgid "Golden sections"
 msgstr "é»?é??å??å?²"
 
-#: ../app/tools/tools-enums.c:148
+#: ../app/tools/tools-enums.c:64
+msgctxt "rectangle-guide"
+msgid "Diagonal lines"
+msgstr "对�线"
+
+#: ../app/tools/tools-enums.c:154
+msgctxt "rectangle-tool-fixed-rule"
 msgid "Aspect ratio"
 msgstr "宽��"
 
-#: ../app/tools/tools-enums.c:149 ../app/widgets/gimpgrideditor.c:265
-#: ../app/widgets/gimpgrideditor.c:297
+#: ../app/tools/tools-enums.c:155
+msgctxt "rectangle-tool-fixed-rule"
 msgid "Width"
 msgstr "宽度"
 
-#: ../app/tools/tools-enums.c:150 ../app/widgets/gimpgrideditor.c:267
-#: ../app/widgets/gimpgrideditor.c:299
+#: ../app/tools/tools-enums.c:156
+msgctxt "rectangle-tool-fixed-rule"
 msgid "Height"
 msgstr "�度"
 
-#: ../app/tools/tools-enums.c:179
+#: ../app/tools/tools-enums.c:157
+msgctxt "rectangle-tool-fixed-rule"
+msgid "Size"
+msgstr "大�"
+
+#: ../app/tools/tools-enums.c:186
+msgctxt "rect-select-mode"
 msgid "Free select"
 msgstr "è?ªç?±é??æ?©"
 
-#: ../app/tools/tools-enums.c:180
+#: ../app/tools/tools-enums.c:187
+msgctxt "rect-select-mode"
 msgid "Fixed size"
 msgstr "��大�"
 
-#: ../app/tools/tools-enums.c:181
+#: ../app/tools/tools-enums.c:188
+msgctxt "rect-select-mode"
 msgid "Fixed aspect ratio"
 msgstr "��宽��"
 
-#: ../app/tools/tools-enums.c:211 ../app/vectors/gimpvectors.c:192
+#: ../app/tools/tools-enums.c:217
+msgctxt "transform-type"
+msgid "Layer"
+msgstr "��"
+
+#: ../app/tools/tools-enums.c:218
+msgctxt "transform-type"
+msgid "Selection"
+msgstr "é??å?º"
+
+#: ../app/tools/tools-enums.c:219
+msgctxt "transform-type"
 msgid "Path"
 msgstr "路�"
 
-#: ../app/tools/tools-enums.c:240
+#: ../app/tools/tools-enums.c:249
+msgctxt "transform-preview-type"
 msgid "Outline"
 msgstr "轮�"
 
-#: ../app/tools/tools-enums.c:243
+#: ../app/tools/tools-enums.c:250
+msgctxt "transform-preview-type"
+msgid "Grid"
+msgstr "ç½?æ ¼"
+
+#: ../app/tools/tools-enums.c:251
+msgctxt "transform-preview-type"
+msgid "Image"
+msgstr "å?¾å??"
+
+#: ../app/tools/tools-enums.c:252
+msgctxt "transform-preview-type"
 msgid "Image + Grid"
 msgstr "å?¾å?? + ç½?æ ¼"
 
-#: ../app/tools/tools-enums.c:270
+#: ../app/tools/tools-enums.c:280
+msgctxt "transform-grid-type"
 msgid "Number of grid lines"
 msgstr "ç½?格线æ?°é??"
 
-#: ../app/tools/tools-enums.c:271
+#: ../app/tools/tools-enums.c:281
+msgctxt "transform-grid-type"
 msgid "Grid line spacing"
 msgstr "�格线��"
 
-#: ../app/tools/tools-enums.c:299
+#: ../app/tools/tools-enums.c:310
+msgctxt "vector-mode"
 msgid "Design"
 msgstr "设计"
 
-#: ../app/tools/tools-enums.c:301
+#: ../app/tools/tools-enums.c:311
+msgctxt "vector-mode"
+msgid "Edit"
+msgstr "ç¼?è¾?"
+
+#: ../app/tools/tools-enums.c:312
+msgctxt "vector-mode"
 msgid "Move"
 msgstr "移�"
 
+#: ../app/vectors/gimpvectors.c:192
+msgid "Path"
+msgstr "路�"
+
 #: ../app/vectors/gimpvectors.c:193
 msgid "Rename Path"
 msgstr "é??å?½å??è·¯å¾?"
@@ -11180,7 +12769,7 @@ msgstr "缩�路�"
 
 #: ../app/vectors/gimpvectors.c:196
 msgid "Resize Path"
-msgstr "è·¯å¾?æ?¹å??大å°?"
+msgstr "æ?¹å??è·¯å¾?大å°?"
 
 #: ../app/vectors/gimpvectors.c:197 ../app/vectors/gimpvectors.c:415
 msgid "Flip Path"
@@ -11207,151 +12796,150 @@ msgstr "导�路�"
 msgid "Imported Path"
 msgstr "导å?¥ç??è·¯å¾?"
 
-#: ../app/vectors/gimpvectors-import.c:336
+#: ../app/vectors/gimpvectors-import.c:337
 #, c-format
 msgid "No paths found in '%s'"
 msgstr "â??%sâ??中æ?ªæ?¾å?°è·¯å¾?"
 
-#: ../app/vectors/gimpvectors-import.c:339
-#, c-format
+#: ../app/vectors/gimpvectors-import.c:341
 msgid "No paths found in the buffer"
 msgstr "���中���路�"
 
-#: ../app/vectors/gimpvectors-import.c:349
+#: ../app/vectors/gimpvectors-import.c:351
 #, c-format
 msgid "Failed to import paths from '%s': %s"
 msgstr "æ? æ³?ä»?â??%sâ??导å?¥è·¯å¾?ï¼?%s"
 
-#: ../app/widgets/gimpactioneditor.c:71
+#: ../app/widgets/gimpactioneditor.c:70
 msgid "_Search:"
-msgstr "å??å??(_S)"
+msgstr "æ??ç´¢(_S)"
 
-#: ../app/widgets/gimpactiongroup.c:802
+#: ../app/widgets/gimpactiongroup.c:885
 #, c-format
 msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpactionview.c:346
-#: ../app/widgets/gimpcontrollereditor.c:348
+#: ../app/widgets/gimpactionview.c:337
+#: ../app/widgets/gimpcontrollereditor.c:344
 msgid "Action"
 msgstr "��"
 
-#: ../app/widgets/gimpactionview.c:375
+#: ../app/widgets/gimpactionview.c:366
 msgid "Shortcut"
 msgstr "å¿«æ?·é?®"
 
-#: ../app/widgets/gimpactionview.c:401
+#: ../app/widgets/gimpactionview.c:392
 msgid "Name"
 msgstr "å??å­?"
 
-#: ../app/widgets/gimpactionview.c:641 ../app/widgets/gimpactionview.c:846
+#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832
 msgid "Changing shortcut failed."
 msgstr "æ?¹å??å¿«æ?·é?®å¤±è´¥ã??"
 
-#: ../app/widgets/gimpactionview.c:683
+#: ../app/widgets/gimpactionview.c:669
 msgid "Conflicting Shortcuts"
 msgstr "快����"
 
-#: ../app/widgets/gimpactionview.c:689
+#: ../app/widgets/gimpactionview.c:675
 msgid "_Reassign shortcut"
 msgstr "é??æ?°å??é??å¿«æ?·é?®(_R)"
 
-#: ../app/widgets/gimpactionview.c:704
+#: ../app/widgets/gimpactionview.c:690
 #, c-format
 msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group."
 msgstr "å¿«æ?·é?®â??%1$sâ??已被â??%3$sâ??群ç»?ç??â??%2$sâ??å? ç?¨ã??"
 
-#: ../app/widgets/gimpactionview.c:708
+#: ../app/widgets/gimpactionview.c:694
 #, c-format
 msgid "Reassigning the shortcut will cause it to be removed from \"%s\"."
 msgstr "é??æ?°å??é??å¿«æ?·é?®å°?导è?´å®?ä»?â??%sâ??中被å?»æ??ã??"
 
-#: ../app/widgets/gimpactionview.c:781
+#: ../app/widgets/gimpactionview.c:767
 msgid "Invalid shortcut."
 msgstr "æ? æ??ç??å¿«æ?·é?®ã??"
 
-#: ../app/widgets/gimpactionview.c:870
+#: ../app/widgets/gimpactionview.c:856
 msgid "Removing shortcut failed."
 msgstr "å? é?¤å¿«æ?·é?®å¤±è´¥ã??"
 
-#: ../app/widgets/gimpbrusheditor.c:169
+#: ../app/widgets/gimpbrusheditor.c:168
 msgid "Spikes:"
 msgstr "ç©?æ?°ï¼?"
 
-#: ../app/widgets/gimpbrusheditor.c:182
+#: ../app/widgets/gimpbrusheditor.c:181
 msgid "Hardness:"
 msgstr "硬度�"
 
-#: ../app/widgets/gimpbrusheditor.c:195
+#: ../app/widgets/gimpbrusheditor.c:194
 msgid "Aspect ratio:"
 msgstr "宽���"
 
-#: ../app/widgets/gimpbrusheditor.c:221
-#: ../app/widgets/gimpbrushfactoryview.c:82
+#: ../app/widgets/gimpbrusheditor.c:220
+#: ../app/widgets/gimpbrushfactoryview.c:81
 msgid "Spacing:"
 msgstr "é?´è·?ï¼?"
 
-#: ../app/widgets/gimpbrusheditor.c:224
-#: ../app/widgets/gimpbrushfactoryview.c:85
+#: ../app/widgets/gimpbrusheditor.c:223
+#: ../app/widgets/gimpbrushfactoryview.c:84
 msgid "Percentage of width of brush"
 msgstr "ç?»ç¬?宽度ç??ç?¾å??æ¯?"
 
 #: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257
-#: ../app/widgets/gimpeditor.c:754
+#: ../app/widgets/gimpeditor.c:745
 msgid "(None)"
 msgstr "(æ? )"
 
-#: ../app/widgets/gimpchanneltreeview.c:119
+#: ../app/widgets/gimpchanneltreeview.c:127
 msgid "Reorder Channel"
 msgstr "é??æ??é??é??"
 
-#: ../app/widgets/gimpchanneltreeview.c:321
+#: ../app/widgets/gimpchanneltreeview.c:338
 msgid "Empty Channel"
 msgstr "空ç?½é??é??"
 
-#: ../app/widgets/gimpcolordialog.c:150
+#: ../app/widgets/gimpcolordialog.c:149
 msgid "Add the current color to the color history"
 msgstr "å°?å½?å??é¢?è?²æ·»å? å?°é¢?è?²å??å?²"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:152
+#: ../app/widgets/gimpcolordisplayeditor.c:151
 msgid "Available Filters"
-msgstr "å?¯ç?¨ç??è??é??"
+msgstr "å?¯ç?¨ç??滤é??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:213
+#: ../app/widgets/gimpcolordisplayeditor.c:212
 msgid "Move the selected filter up"
 msgstr "é??中ç??滤é??ä¸?移"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:222
+#: ../app/widgets/gimpcolordisplayeditor.c:221
 msgid "Move the selected filter down"
 msgstr "é??中ç??滤é??ä¸?移"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:268
+#: ../app/widgets/gimpcolordisplayeditor.c:267
 msgid "Active Filters"
 msgstr "æ´»å?¨æ»¤é??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:319
+#: ../app/widgets/gimpcolordisplayeditor.c:318
 msgid "Reset the selected filter to default values"
 msgstr "å°?é??中ç??滤é??é??ç½®å?°é»?认å?¼"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:493
+#: ../app/widgets/gimpcolordisplayeditor.c:492
 #, c-format
 msgid "Add '%s' to the list of active filters"
 msgstr "å°?â??%sâ??æ·»å? å?°æ´»å?¨æ»¤é??å??表"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:530
+#: ../app/widgets/gimpcolordisplayeditor.c:529
 #, c-format
 msgid "Remove '%s' from the list of active filters"
 msgstr "ä»?æ´»å?¨æ»¤é??å??表中å? é?¤â??%sâ??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:561
+#: ../app/widgets/gimpcolordisplayeditor.c:560
 msgid "No filter selected"
 msgstr "æ?ªé??æ?©æ»¤é??"
 
-#: ../app/widgets/gimpcoloreditor.c:263
+#: ../app/widgets/gimpcoloreditor.c:262
 msgid ""
 "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
 "CSS color names."
-msgstr "å?¨ HTML å?? CSS 中使ç?¨ç??å??å?­è¿?å?¶é¢?è?²ç¬¦å?·ã??æ­¤å¤?ä¹?å??许使ç?¨ CSS è?²å½©å??ã??"
+msgstr "å?¨ HTML å?? CSS 中使ç?¨ç??å??å?­è¿?å?¶é¢?è?²æ ¼å¼?ã??æ­¤å¤?ä¹?å??许使ç?¨ CSS è?²å½©å??ã??"
 
 #: ../app/widgets/gimpcolorframe.c:501
 msgid "Index:"
@@ -11405,14 +12993,6 @@ msgstr "���"
 msgid "Alpha:"
 msgstr "Alphaï¼?"
 
-#: ../app/widgets/gimpcolorframe.c:623 ../app/widgets/gimpcursorview.c:134
-#: ../app/widgets/gimpcursorview.c:140 ../app/widgets/gimpcursorview.c:156
-#: ../app/widgets/gimpcursorview.c:162 ../app/widgets/gimpcursorview.c:444
-#: ../app/widgets/gimpcursorview.c:445 ../app/widgets/gimpcursorview.c:446
-#: ../app/widgets/gimpcursorview.c:447
-msgid "n/a"
-msgstr "n/a"
-
 #: ../app/widgets/gimpcolormapeditor.c:225
 msgid "Color index:"
 msgstr "��索��"
@@ -11425,7 +13005,7 @@ msgstr "HTML 格��"
 msgid "Only indexed images have a colormap."
 msgstr "å?ªæ??ç´¢å¼?å?¾å??å?·æ??é¢?è?²è¡¨"
 
-#: ../app/widgets/gimpcolorselectorpalette.c:59
+#: ../app/widgets/gimpcolorselectorpalette.c:58
 msgid "Palette"
 msgstr "��"
 
@@ -11437,136 +13017,136 @@ msgstr "å??å°?é¢?è§?"
 msgid "Larger Previews"
 msgstr "�大��"
 
-#: ../app/widgets/gimpcontrollereditor.c:202
+#: ../app/widgets/gimpcontrollereditor.c:201
 msgid "_Dump events from this controller"
 msgstr "转�此����件(_D)"
 
-#: ../app/widgets/gimpcontrollereditor.c:207
+#: ../app/widgets/gimpcontrollereditor.c:206
 msgid "_Enable this controller"
 msgstr "��此���(_E)"
 
-#: ../app/widgets/gimpcontrollereditor.c:228
+#: ../app/widgets/gimpcontrollereditor.c:227
 msgid "Name:"
 msgstr "å??称ï¼?"
 
-#: ../app/widgets/gimpcontrollereditor.c:234
+#: ../app/widgets/gimpcontrollereditor.c:233
 msgid "State:"
 msgstr "ç?¶æ??ï¼?"
 
-#: ../app/widgets/gimpcontrollereditor.c:342
+#: ../app/widgets/gimpcontrollereditor.c:338
 msgid "Event"
 msgstr "�件"
 
-#: ../app/widgets/gimpcontrollereditor.c:367
+#: ../app/widgets/gimpcontrollereditor.c:363
 msgid "_Grab event"
 msgstr "æ??å??äº?件(_G)"
 
-#: ../app/widgets/gimpcontrollereditor.c:377
+#: ../app/widgets/gimpcontrollereditor.c:373
 msgid "Select the next event arriving from the controller"
 msgstr "é??æ?©æ?§å?¶å?¨å¸¦æ?¥ç??ä¸?个äº?件"
 
-#: ../app/widgets/gimpcontrollereditor.c:535
+#: ../app/widgets/gimpcontrollereditor.c:531
 #, c-format
 msgid "Remove the action assigned to '%s'"
 msgstr "å? é?¤æ??æ´¾ç»?â??%sâ??ç??å?¨ä½?"
 
-#: ../app/widgets/gimpcontrollereditor.c:540
+#: ../app/widgets/gimpcontrollereditor.c:536
 #, c-format
 msgid "Assign an action to '%s'"
 msgstr "为â??%sâ??æ??æ´¾å?¨ä½?"
 
-#: ../app/widgets/gimpcontrollereditor.c:661
+#: ../app/widgets/gimpcontrollereditor.c:657
 #, c-format
 msgid "Select Action for Event '%s'"
 msgstr "é??æ?©äº?件â??%sâ??ç??å?¨ä½?"
 
-#: ../app/widgets/gimpcontrollereditor.c:666
+#: ../app/widgets/gimpcontrollereditor.c:662
 msgid "Select Controller Event Action"
 msgstr "é??æ?©æ?§å?¶å?¨äº?件å?¨ä½?"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:70
-#: ../app/widgets/gimpcontrollerkeyboard.c:73
-#: ../app/widgets/gimpcontrollerkeyboard.c:76
-#: ../app/widgets/gimpcontrollerkeyboard.c:79
-#: ../app/widgets/gimpcontrollerkeyboard.c:82
-#: ../app/widgets/gimpcontrollerkeyboard.c:85
-#: ../app/widgets/gimpcontrollerkeyboard.c:88
-#: ../app/widgets/gimpcontrollerkeyboard.c:91
+#: ../app/widgets/gimpcontrollerkeyboard.c:69
+#: ../app/widgets/gimpcontrollerkeyboard.c:72
+#: ../app/widgets/gimpcontrollerkeyboard.c:75
+#: ../app/widgets/gimpcontrollerkeyboard.c:78
+#: ../app/widgets/gimpcontrollerkeyboard.c:81
+#: ../app/widgets/gimpcontrollerkeyboard.c:84
+#: ../app/widgets/gimpcontrollerkeyboard.c:87
+#: ../app/widgets/gimpcontrollerkeyboard.c:90
 msgid "Cursor Up"
 msgstr "å??æ ?ä¸?移"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:95
-#: ../app/widgets/gimpcontrollerkeyboard.c:98
-#: ../app/widgets/gimpcontrollerkeyboard.c:101
-#: ../app/widgets/gimpcontrollerkeyboard.c:104
-#: ../app/widgets/gimpcontrollerkeyboard.c:107
-#: ../app/widgets/gimpcontrollerkeyboard.c:110
-#: ../app/widgets/gimpcontrollerkeyboard.c:113
-#: ../app/widgets/gimpcontrollerkeyboard.c:116
+#: ../app/widgets/gimpcontrollerkeyboard.c:94
+#: ../app/widgets/gimpcontrollerkeyboard.c:97
+#: ../app/widgets/gimpcontrollerkeyboard.c:100
+#: ../app/widgets/gimpcontrollerkeyboard.c:103
+#: ../app/widgets/gimpcontrollerkeyboard.c:106
+#: ../app/widgets/gimpcontrollerkeyboard.c:109
+#: ../app/widgets/gimpcontrollerkeyboard.c:112
+#: ../app/widgets/gimpcontrollerkeyboard.c:115
 msgid "Cursor Down"
 msgstr "å??æ ?ä¸?移"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:120
-#: ../app/widgets/gimpcontrollerkeyboard.c:123
-#: ../app/widgets/gimpcontrollerkeyboard.c:126
-#: ../app/widgets/gimpcontrollerkeyboard.c:129
-#: ../app/widgets/gimpcontrollerkeyboard.c:132
-#: ../app/widgets/gimpcontrollerkeyboard.c:135
-#: ../app/widgets/gimpcontrollerkeyboard.c:138
-#: ../app/widgets/gimpcontrollerkeyboard.c:141
+#: ../app/widgets/gimpcontrollerkeyboard.c:119
+#: ../app/widgets/gimpcontrollerkeyboard.c:122
+#: ../app/widgets/gimpcontrollerkeyboard.c:125
+#: ../app/widgets/gimpcontrollerkeyboard.c:128
+#: ../app/widgets/gimpcontrollerkeyboard.c:131
+#: ../app/widgets/gimpcontrollerkeyboard.c:134
+#: ../app/widgets/gimpcontrollerkeyboard.c:137
+#: ../app/widgets/gimpcontrollerkeyboard.c:140
 msgid "Cursor Left"
 msgstr "å??æ ?左移"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:145
-#: ../app/widgets/gimpcontrollerkeyboard.c:148
-#: ../app/widgets/gimpcontrollerkeyboard.c:151
-#: ../app/widgets/gimpcontrollerkeyboard.c:154
-#: ../app/widgets/gimpcontrollerkeyboard.c:157
-#: ../app/widgets/gimpcontrollerkeyboard.c:160
-#: ../app/widgets/gimpcontrollerkeyboard.c:163
-#: ../app/widgets/gimpcontrollerkeyboard.c:166
+#: ../app/widgets/gimpcontrollerkeyboard.c:144
+#: ../app/widgets/gimpcontrollerkeyboard.c:147
+#: ../app/widgets/gimpcontrollerkeyboard.c:150
+#: ../app/widgets/gimpcontrollerkeyboard.c:153
+#: ../app/widgets/gimpcontrollerkeyboard.c:156
+#: ../app/widgets/gimpcontrollerkeyboard.c:159
+#: ../app/widgets/gimpcontrollerkeyboard.c:162
+#: ../app/widgets/gimpcontrollerkeyboard.c:165
 msgid "Cursor Right"
 msgstr "å??æ ?å?³ç§»"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:178
+#: ../app/widgets/gimpcontrollerkeyboard.c:177
 msgid "Keyboard"
 msgstr "é?®ç??"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:222
+#: ../app/widgets/gimpcontrollerkeyboard.c:221
 msgid "Keyboard Events"
 msgstr "é?®ç??æ¶?æ?¯"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:223
-#: ../app/widgets/gimpcontrollerwheel.c:225
+#: ../app/widgets/gimpcontrollerkeyboard.c:222
+#: ../app/widgets/gimpcontrollerwheel.c:224
 msgid "Ready"
 msgstr "就绪"
 
-#: ../app/widgets/gimpcontrollerlist.c:182
+#: ../app/widgets/gimpcontrollerlist.c:181
 msgid "Available Controllers"
 msgstr "å?¯ç?¨ç??æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:274
+#: ../app/widgets/gimpcontrollerlist.c:273
 msgid "Active Controllers"
 msgstr "æ´»å?¨ç??æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:290
+#: ../app/widgets/gimpcontrollerlist.c:289
 msgid "Configure the selected controller"
 msgstr "é??ç½®é??中ç??æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:298
+#: ../app/widgets/gimpcontrollerlist.c:297
 msgid "Move the selected controller up"
 msgstr "é??中ç??æ?§å?¶å?¨ä¸?移"
 
-#: ../app/widgets/gimpcontrollerlist.c:306
+#: ../app/widgets/gimpcontrollerlist.c:305
 msgid "Move the selected controller down"
 msgstr "é??中ç??æ?§å?¶å?¨ä¸?移"
 
-#: ../app/widgets/gimpcontrollerlist.c:430
+#: ../app/widgets/gimpcontrollerlist.c:429
 #, c-format
 msgid "Add '%s' to the list of active controllers"
 msgstr "å°?â??%sâ??æ·»å? å?°æ´»å?¨æ?§å?¶å?¨å??表"
 
-#: ../app/widgets/gimpcontrollerlist.c:481
+#: ../app/widgets/gimpcontrollerlist.c:480
 #, c-format
 msgid "Remove '%s' from the list of active controllers"
 msgstr "ä»?æ´»å?¨æ?§å?¶å?¨å??表中å? é?¤â??%sâ??"
@@ -11581,7 +13161,7 @@ msgstr ""
 "\n"
 "å?¨æ?¨ç??æ´»å?¨æ?§å?¶å?¨å??表中已ç»?æ??ä¸?个é?®ç??æ?§å?¶å?¨ã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:524
+#: ../app/widgets/gimpcontrollerlist.c:525
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
@@ -11603,13 +13183,12 @@ msgstr "�����"
 msgid "Remove Controller"
 msgstr "�����"
 
-#: ../app/widgets/gimpcontrollerlist.c:569
+#: ../app/widgets/gimpcontrollerlist.c:570
 #, c-format
 msgid "Remove Controller '%s'?"
-msgstr "å? é?¤æ?§å?¶å?¨â??%sâ??å??ï¼?"
+msgstr "å? é?¤â??%sâ??æ?§å?¶å?¨å??ï¼?"
 
-#: ../app/widgets/gimpcontrollerlist.c:573
-#, c-format
+#: ../app/widgets/gimpcontrollerlist.c:574
 msgid ""
 "Removing this controller from the list of active controllers will "
 "permanently delete all event mappings you have configured.\n"
@@ -11621,174 +13200,170 @@ msgstr ""
 "\n"
 "é??æ?©â??ç¦?ç?¨æ?§å?¶å?¨â??å?¯ä»¥ç¦?ç?¨æ?§å?¶å?¨è??é??移é?¤å®?ã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:633
+#: ../app/widgets/gimpcontrollerlist.c:626
 msgid "Configure Input Controller"
 msgstr "é??ç½®è¾?å?¥æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerwheel.c:72
-#: ../app/widgets/gimpcontrollerwheel.c:75
-#: ../app/widgets/gimpcontrollerwheel.c:78
-#: ../app/widgets/gimpcontrollerwheel.c:81
-#: ../app/widgets/gimpcontrollerwheel.c:84
-#: ../app/widgets/gimpcontrollerwheel.c:87
-#: ../app/widgets/gimpcontrollerwheel.c:90
-#: ../app/widgets/gimpcontrollerwheel.c:93
+#: ../app/widgets/gimpcontrollerwheel.c:71
+#: ../app/widgets/gimpcontrollerwheel.c:74
+#: ../app/widgets/gimpcontrollerwheel.c:77
+#: ../app/widgets/gimpcontrollerwheel.c:80
+#: ../app/widgets/gimpcontrollerwheel.c:83
+#: ../app/widgets/gimpcontrollerwheel.c:86
+#: ../app/widgets/gimpcontrollerwheel.c:89
+#: ../app/widgets/gimpcontrollerwheel.c:92
 msgid "Scroll Up"
 msgstr "��"
 
-#: ../app/widgets/gimpcontrollerwheel.c:97
-#: ../app/widgets/gimpcontrollerwheel.c:100
-#: ../app/widgets/gimpcontrollerwheel.c:103
-#: ../app/widgets/gimpcontrollerwheel.c:106
-#: ../app/widgets/gimpcontrollerwheel.c:109
-#: ../app/widgets/gimpcontrollerwheel.c:112
-#: ../app/widgets/gimpcontrollerwheel.c:115
-#: ../app/widgets/gimpcontrollerwheel.c:118
+#: ../app/widgets/gimpcontrollerwheel.c:96
+#: ../app/widgets/gimpcontrollerwheel.c:99
+#: ../app/widgets/gimpcontrollerwheel.c:102
+#: ../app/widgets/gimpcontrollerwheel.c:105
+#: ../app/widgets/gimpcontrollerwheel.c:108
+#: ../app/widgets/gimpcontrollerwheel.c:111
+#: ../app/widgets/gimpcontrollerwheel.c:114
+#: ../app/widgets/gimpcontrollerwheel.c:117
 msgid "Scroll Down"
 msgstr "��"
 
-#: ../app/widgets/gimpcontrollerwheel.c:122
-#: ../app/widgets/gimpcontrollerwheel.c:125
-#: ../app/widgets/gimpcontrollerwheel.c:128
-#: ../app/widgets/gimpcontrollerwheel.c:131
-#: ../app/widgets/gimpcontrollerwheel.c:134
-#: ../app/widgets/gimpcontrollerwheel.c:137
-#: ../app/widgets/gimpcontrollerwheel.c:140
-#: ../app/widgets/gimpcontrollerwheel.c:143
+#: ../app/widgets/gimpcontrollerwheel.c:121
+#: ../app/widgets/gimpcontrollerwheel.c:124
+#: ../app/widgets/gimpcontrollerwheel.c:127
+#: ../app/widgets/gimpcontrollerwheel.c:130
+#: ../app/widgets/gimpcontrollerwheel.c:133
+#: ../app/widgets/gimpcontrollerwheel.c:136
+#: ../app/widgets/gimpcontrollerwheel.c:139
+#: ../app/widgets/gimpcontrollerwheel.c:142
 msgid "Scroll Left"
 msgstr "左�"
 
-#: ../app/widgets/gimpcontrollerwheel.c:147
-#: ../app/widgets/gimpcontrollerwheel.c:150
-#: ../app/widgets/gimpcontrollerwheel.c:153
-#: ../app/widgets/gimpcontrollerwheel.c:156
-#: ../app/widgets/gimpcontrollerwheel.c:159
-#: ../app/widgets/gimpcontrollerwheel.c:162
-#: ../app/widgets/gimpcontrollerwheel.c:165
-#: ../app/widgets/gimpcontrollerwheel.c:168
+#: ../app/widgets/gimpcontrollerwheel.c:146
+#: ../app/widgets/gimpcontrollerwheel.c:149
+#: ../app/widgets/gimpcontrollerwheel.c:152
+#: ../app/widgets/gimpcontrollerwheel.c:155
+#: ../app/widgets/gimpcontrollerwheel.c:158
+#: ../app/widgets/gimpcontrollerwheel.c:161
+#: ../app/widgets/gimpcontrollerwheel.c:164
+#: ../app/widgets/gimpcontrollerwheel.c:167
 msgid "Scroll Right"
 msgstr "��"
 
-#: ../app/widgets/gimpcontrollerwheel.c:180
+#: ../app/widgets/gimpcontrollerwheel.c:179
 msgid "Mouse Wheel"
 msgstr "é¼ æ ?æ»?è½®"
 
-#: ../app/widgets/gimpcontrollerwheel.c:224
+#: ../app/widgets/gimpcontrollerwheel.c:223
 msgid "Mouse Wheel Events"
 msgstr "鼠��轮�件"
 
-#: ../app/widgets/gimpcursorview.c:137 ../app/widgets/gimpcursorview.c:159
-msgid "X"
-msgstr "X"
-
-#: ../app/widgets/gimpcursorview.c:143 ../app/widgets/gimpcursorview.c:165
-msgid "Y"
-msgstr "Y"
-
-#: ../app/widgets/gimpcursorview.c:146
-msgid "Units"
-msgstr "å??ä½?"
-
-#: ../app/widgets/gimpdataeditor.c:220
+#: ../app/widgets/gimpdataeditor.c:219
 msgid "Save"
 msgstr "ä¿?å­?"
 
-#: ../app/widgets/gimpdataeditor.c:228
+#: ../app/widgets/gimpdataeditor.c:227
 msgid "Revert"
 msgstr "��"
 
-#: ../app/widgets/gimpdataeditor.c:444
+#: ../app/widgets/gimpdataeditor.c:443
 #, c-format
 msgid "%s (read only)"
 msgstr "%s (�读)"
 
-#: ../app/widgets/gimpdevicestatus.c:138
+#: ../app/widgets/gimpdevicestatus.c:137
 msgid "Save device status"
 msgstr "ä¿?å­?设å¤?ç?¶æ??"
 
-#: ../app/widgets/gimpdevicestatus.c:448
+#: ../app/widgets/gimpdevicestatus.c:447
 #, c-format
 msgid "Foreground: %d, %d, %d"
 msgstr "å??æ?¯ï¼?%d, %d, %d"
 
-#: ../app/widgets/gimpdevicestatus.c:453
+#: ../app/widgets/gimpdevicestatus.c:452
 #, c-format
 msgid "Background: %d, %d, %d"
 msgstr "è??æ?¯ï¼?%d, %d, %d"
 
-#: ../app/widgets/gimpdnd-xds.c:190
+#: ../app/widgets/gimpdnd-xds.c:201
 msgid "The given filename does not have any known file extension."
 msgstr "ç»?å®?ç??æ??件å??ä¸?å??å?«ä»»ä½?å·²ç?¥ç??æ??件æ?©å±?å??ã??"
 
-#: ../app/widgets/gimpdnd-xds.c:208
+#: ../app/widgets/gimpdnd-xds.c:219
 msgid "File Exists"
 msgstr "æ??件已å­?å?¨"
 
-#: ../app/widgets/gimpdnd-xds.c:213
+#: ../app/widgets/gimpdnd-xds.c:224
 msgid "_Replace"
 msgstr "æ?¿æ?¢(_R)"
 
-#: ../app/widgets/gimpdnd-xds.c:224
+#: ../app/widgets/gimpdnd-xds.c:235
 #, c-format
 msgid "A file named '%s' already exists."
 msgstr "å·²å­?å?¨ä¸?个å?«â??%sâ??ç??æ??件ã??"
 
-#: ../app/widgets/gimpdnd-xds.c:229
+#: ../app/widgets/gimpdnd-xds.c:240
 msgid "Do you want to replace it with the image you are saving?"
 msgstr "æ?¨ç??ç??è¦?å°?å®?æ?¿æ?¢ä¸ºæ?¨æ­£å?¨ä¿?å­?ç??å?¾å??å??ï¼?"
 
-#: ../app/widgets/gimpdockable.c:194
+#: ../app/widgets/gimpdockable.c:193
 msgid "Configure this tab"
 msgstr "é??置此页签"
 
-#: ../app/widgets/gimpdockseparator.c:44
+#: ../app/widgets/gimpdockseparator.c:43
 msgid "You can drop dockable dialogs here"
 msgstr "æ?¨å?¯ä»¥å°?å?¯å??é? ç??对è¯?æ¡?æ?¾å?¨è¿?é??"
 
-#: ../app/widgets/gimperrordialog.c:151
+#: ../app/widgets/gimperrordialog.c:150
 msgid "Too many error messages!"
 msgstr "太å¤?é??误æ¶?æ?¯ï¼?"
 
-#: ../app/widgets/gimperrordialog.c:152
+#: ../app/widgets/gimperrordialog.c:151
 msgid "Messages are redirected to stderr."
 msgstr "æ¶?æ?¯å·²è¢«é??å®?å??å?° stderrã??"
 
-#: ../app/widgets/gimperrordialog.c:171
+#: ../app/widgets/gimperrordialog.c:170
 #, c-format
 msgid "%s Message"
 msgstr "%s ��"
 
-#: ../app/widgets/gimpfiledialog.c:310
+#: ../app/widgets/gimpfiledialog.c:315
 msgid "Automatically Detected"
 msgstr "����"
 
-#: ../app/widgets/gimpfiledialog.c:320
+#: ../app/widgets/gimpfiledialog.c:329
 msgid "By Extension"
 msgstr "æ??æ?©å±?å??"
 
-#: ../app/widgets/gimpfiledialog.c:652
+#: ../app/widgets/gimpfiledialog.c:770
 msgid "All files"
 msgstr "å?¨é?¨æ??件"
 
-#: ../app/widgets/gimpfiledialog.c:657
+#: ../app/widgets/gimpfiledialog.c:775
 msgid "All images"
 msgstr "å?¨é?¨å?¾å??"
 
-#: ../app/widgets/gimpfiledialog.c:786
+#: ../app/widgets/gimpfiledialog.c:904
 #, c-format
 msgid "Select File _Type (%s)"
 msgstr "é??æ?©æ??件类å??(%s)(_T)"
 
-#: ../app/widgets/gimpfileprocview.c:187
+#: ../app/widgets/gimpfileprocview.c:186
 msgid "File Type"
 msgstr "æ??件类å??"
 
-#: ../app/widgets/gimpfileprocview.c:199
+#: ../app/widgets/gimpfileprocview.c:198
 msgid "Extensions"
 msgstr "æ?©å±?å??"
 
+#: ../app/widgets/gimpfilleditor.c:127
+msgid "Fill Color"
+msgstr "å¡«å??é¢?è?²"
+
+#: ../app/widgets/gimpfilleditor.c:145
+msgid "_Antialiasing"
+msgstr "å??é?¯é½¿(_A)"
+
 #. Instant update toggle
-#: ../app/widgets/gimpgradienteditor.c:414
+#: ../app/widgets/gimpgradienteditor.c:413
 msgid "Instant update"
 msgstr "����"
 
@@ -11874,70 +13449,79 @@ msgstr "���置�%0.4f"
 msgid "Distance: %0.4f"
 msgstr "�离�%0.4f"
 
-#: ../app/widgets/gimpgrideditor.c:217
+#: ../app/widgets/gimpgrideditor.c:216
 msgid "Line _style:"
 msgstr "线�样�(_S)�"
 
-#: ../app/widgets/gimpgrideditor.c:221
+#: ../app/widgets/gimpgrideditor.c:220
 msgid "Change grid foreground color"
 msgstr "æ?¹å??ç½?æ ¼å??æ?¯è?²"
 
-#: ../app/widgets/gimpgrideditor.c:228
+#: ../app/widgets/gimpgrideditor.c:227
 msgid "_Foreground color:"
 msgstr "å??æ?¯è?²(_F)ï¼?"
 
-#: ../app/widgets/gimpgrideditor.c:232
+#: ../app/widgets/gimpgrideditor.c:231
 msgid "Change grid background color"
 msgstr "æ?¹å??ç½?æ ¼è??æ?¯è?²"
 
-#: ../app/widgets/gimpgrideditor.c:239
+#: ../app/widgets/gimpgrideditor.c:238
 msgid "_Background color:"
 msgstr "è??æ?¯è?²(_B)ï¼?"
 
-#: ../app/widgets/gimpgrideditor.c:244
+#: ../app/widgets/gimpgrideditor.c:243
 msgid "Spacing"
 msgstr "é?´è·?"
 
-#: ../app/widgets/gimphelp.c:276
+#: ../app/widgets/gimpgrideditor.c:264 ../app/widgets/gimpgrideditor.c:296
+msgid "Width"
+msgstr "宽度"
+
+#: ../app/widgets/gimpgrideditor.c:266 ../app/widgets/gimpgrideditor.c:298
+msgid "Height"
+msgstr "�度"
+
+#: ../app/widgets/gimphelp.c:293
 msgid "Help browser is missing"
 msgstr "帮å?©æ??件æµ?è§?å?¨ç¼ºå¤±"
 
-#: ../app/widgets/gimphelp.c:277
+#: ../app/widgets/gimphelp.c:294
 msgid "The GIMP help browser is not available."
 msgstr "GIMP 帮å?©æµ?è§?å?¨ä¸?å?¯ç?¨ã??"
 
-#: ../app/widgets/gimphelp.c:278
+#: ../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帮å?©æµ?è§?å?¨æ??件ã??æ?¨å?¯ä»¥ä½¿ç?¨ç½?页æµ?è§?å?¨ä»¥æµ?è§?GIMP帮å?©æ??件ã??"
+"æ?¨ä¼¼ä¹?没æ??å®?è£? GIMP 帮å?©æµ?è§?å?¨æ??件ã??æ?¨å?¯ä»¥ä½¿ç?¨ç½?页æµ?è§?å?¨ä»¥æµ?è§? GIMP 帮å?©æ??"
+"件ã??"
 
-#: ../app/widgets/gimphelp.c:319
+#: ../app/widgets/gimphelp.c:336
 msgid "Help browser doesn't start"
 msgstr "帮å?©æµ?è§?å?¨æ²¡æ??å?¯å?¨"
 
-#: ../app/widgets/gimphelp.c:320
+#: ../app/widgets/gimphelp.c:337
 msgid "Could not start the GIMP help browser plug-in."
 msgstr "æ? æ³?å?¯å?¨ GIMP 帮å?©æµ?è§?å?¨æ??件ã??"
 
-#: ../app/widgets/gimphelp.c:347
+#: ../app/widgets/gimphelp.c:364
 msgid "Use _Web Browser"
 msgstr "使� _Web ���"
 
-#: ../app/widgets/gimphelp.c:596
+#: ../app/widgets/gimphelp.c:610
 msgid "GIMP user manual is missing"
 msgstr "GIMP ç?¨æ?·æ??å??缺失"
 
-#: ../app/widgets/gimphelp.c:603
+#: ../app/widgets/gimphelp.c:617
 msgid "_Read Online"
 msgstr "å?¨çº¿é??读(_R)"
 
-#: ../app/widgets/gimphelp.c:627
+#: ../app/widgets/gimphelp.c:641
 msgid "The GIMP user manual is not installed on your computer."
-msgstr "GIMPç?¨æ?·æ??å??æ?ªå?¨æ?¨ç??计ç®?æ?ºä¸?å®?è£?ã??"
+msgstr "GIMP ç?¨æ?·æ??å??æ?ªå?¨æ?¨ç??计ç®?æ?ºä¸?å®?è£?ã??"
 
-#: ../app/widgets/gimphelp.c:630
+#: ../app/widgets/gimphelp.c:644
 msgid ""
 "You may either install the additional help package or change your "
 "preferences to use the online version."
@@ -12031,6 +13615,11 @@ msgstr "é??é??æ?°é??ï¼?"
 msgid "Number of paths:"
 msgstr "è·¯å¾?æ?°é??ï¼?"
 
+#. no undo (or redo) steps available
+#: ../app/widgets/gimpimagepropview.c:416
+msgid "None"
+msgstr "æ? "
+
 #: ../app/widgets/gimpimagepropview.c:471
 #, c-format
 msgid "pixels/%s"
@@ -12045,27 +13634,27 @@ msgstr "%g x %g %s"
 msgid "colors"
 msgstr "è?²"
 
-#: ../app/widgets/gimpitemtreeview.c:980
+#: ../app/widgets/gimpitemtreeview.c:1023
 msgid "Set Item Exclusive Visible"
 msgstr "设置项�����"
 
-#: ../app/widgets/gimpitemtreeview.c:988
+#: ../app/widgets/gimpitemtreeview.c:1031
 msgid "Set Item Exclusive Linked"
 msgstr "设置项�����"
 
-#: ../app/widgets/gimplayertreeview.c:218
+#: ../app/widgets/gimplayertreeview.c:239
 msgid "Reorder Layer"
 msgstr "é??æ??å?¾å±?"
 
-#: ../app/widgets/gimplayertreeview.c:306
+#: ../app/widgets/gimplayertreeview.c:333
 msgid "Lock alpha channel"
 msgstr "é??å®? Alpha é??é??"
 
-#: ../app/widgets/gimplayertreeview.c:318
+#: ../app/widgets/gimplayertreeview.c:345
 msgid "Lock:"
-msgstr "å??é? ï¼?"
+msgstr "é??å®?ï¼?"
 
-#: ../app/widgets/gimplayertreeview.c:841
+#: ../app/widgets/gimplayertreeview.c:868
 msgid "Empty Layer"
 msgstr "空���"
 
@@ -12078,33 +13667,33 @@ msgid ""
 "When enabled the dialog automatically follows the image you are working on."
 msgstr "å¦?æ??å?¯ç?¨ï¼?对è¯?æ¡?å°?è?ªå?¨è·?é??æ?¨å·¥ä½?ç??å?¾å??ã??"
 
-#: ../app/widgets/gimpmessagebox.c:443
+#: ../app/widgets/gimpmessagebox.c:442
 #, c-format
 msgid "Message repeated %d times."
 msgstr "æ¶?æ?¯é??å¤?äº? %d 次ã??"
 
-#: ../app/widgets/gimpmessagebox.c:445
+#: ../app/widgets/gimpmessagebox.c:444
 msgid "Message repeated once."
 msgstr "æ¶?æ?¯é??å¤?äº?ä¸?次ã??"
 
-#: ../app/widgets/gimppaletteeditor.c:255
-#: ../app/widgets/gimppaletteeditor.c:741
+#: ../app/widgets/gimppaletteeditor.c:254
+#: ../app/widgets/gimppaletteeditor.c:740
 msgid "Undefined"
 msgstr "���"
 
-#: ../app/widgets/gimppaletteeditor.c:263
+#: ../app/widgets/gimppaletteeditor.c:262
 msgid "Columns:"
 msgstr "å??æ?°ï¼?"
 
-#: ../app/widgets/gimpprofilechooserdialog.c:137
+#: ../app/widgets/gimpprofilechooserdialog.c:136
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC è?²å½©é??ç½®æ??件(*.icc, *.icm)"
 
-#: ../app/widgets/gimpprogressdialog.c:220
+#: ../app/widgets/gimpprogressdialog.c:221
 msgid "Progress"
 msgstr "�度"
 
-#: ../app/widgets/gimpselectiondata.c:242
+#: ../app/widgets/gimpselectiondata.c:247
 #, c-format
 msgid ""
 "The filename '%s' couldn't be converted to a valid URI:\n"
@@ -12115,148 +13704,160 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/widgets/gimpselectiondata.c:246
+#: ../app/widgets/gimpselectiondata.c:251
 msgid "Invalid UTF-8"
 msgstr "æ? æ??ç?? UTF-8"
 
-#: ../app/widgets/gimpsettingsbox.c:239
+#: ../app/widgets/gimpsettingsbox.c:240
 msgid "Pick a setting from the list"
 msgstr "ä»?å??表中é??æ?©è®¾ç½®"
 
-#: ../app/widgets/gimpsettingsbox.c:260
+#: ../app/widgets/gimpsettingsbox.c:261
 msgid "Add settings to favorites"
 msgstr "å°?设置添å? å?°æ?¶è??"
 
-#: ../app/widgets/gimpsettingsbox.c:288
+#: ../app/widgets/gimpsettingsbox.c:289
 msgid "_Import Settings from File..."
 msgstr "ä»?æ??件导å?¥è®¾ç½®(_I)..."
 
-#: ../app/widgets/gimpsettingsbox.c:294
+#: ../app/widgets/gimpsettingsbox.c:295
 msgid "_Export Settings to File..."
-msgstr "å°?å?ºé??è®°å½?ä¿?å­?å?°æ??件(_E)..."
+msgstr "å°?设置导å?ºå?°æ??件(_E)..."
 
-#: ../app/widgets/gimpsettingsbox.c:301
+#: ../app/widgets/gimpsettingsbox.c:302
 msgid "_Manage Settings..."
 msgstr "管ç??设置(_M)"
 
-#: ../app/widgets/gimpsettingsbox.c:588
+#: ../app/widgets/gimpsettingsbox.c:589
 msgid "Add Settings to Favorites"
 msgstr "æ·»å? é??项å?°æ?¶è??夹"
 
-#: ../app/widgets/gimpsettingsbox.c:591
+#: ../app/widgets/gimpsettingsbox.c:592
 msgid "Enter a name for the settings"
 msgstr "为设置å?½å??"
 
-#: ../app/widgets/gimpsettingsbox.c:592
+#: ../app/widgets/gimpsettingsbox.c:593
 msgid "Saved Settings"
 msgstr "å·²ä¿?å­?ç??é??项"
 
-#: ../app/widgets/gimpsettingsbox.c:627
+#: ../app/widgets/gimpsettingsbox.c:629
 msgid "Manage Saved Settings"
 msgstr "管ç??å·²ä¿?å­?设置"
 
-#: ../app/widgets/gimpsettingseditor.c:174
+#: ../app/widgets/gimpsettingseditor.c:173
 msgid "Import settings from a file"
 msgstr "ä»?æ??件导å?¥è®¾ç½®"
 
-#: ../app/widgets/gimpsettingseditor.c:183
+#: ../app/widgets/gimpsettingseditor.c:182
 msgid "Export the selected settings to a file"
 msgstr "导å?ºè®¾ç½®å?°æ??件"
 
-#: ../app/widgets/gimpsettingseditor.c:192
+#: ../app/widgets/gimpsettingseditor.c:191
 msgid "Delete the selected settings"
 msgstr "å? é?¤é??中ç??设置"
 
-#: ../app/widgets/gimpsizebox.c:464
+#: ../app/widgets/gimpsizebox.c:463
 #, c-format
 msgid "%d Ã? %d ppi"
 msgstr "%d x %d ppi"
 
-#: ../app/widgets/gimpsizebox.c:466
+#: ../app/widgets/gimpsizebox.c:465
 #, c-format
 msgid "%d ppi"
 msgstr "%d ppi"
 
-#: ../app/widgets/gimpstrokeeditor.c:185
+#: ../app/widgets/gimpstrokeeditor.c:187
 msgid "Line width:"
 msgstr "线宽�"
 
-#: ../app/widgets/gimpstrokeeditor.c:202
+#: ../app/widgets/gimpstrokeeditor.c:199
 msgid "_Line Style"
 msgstr "线�格(_L)"
 
-#: ../app/widgets/gimpstrokeeditor.c:221
+#: ../app/widgets/gimpstrokeeditor.c:218
 msgid "_Cap style:"
 msgstr "帽ç??é£?æ ¼(_C)ï¼?"
 
-#: ../app/widgets/gimpstrokeeditor.c:227
+#: ../app/widgets/gimpstrokeeditor.c:224
 msgid "_Join style:"
 msgstr "æ?¥å??é£?æ ¼(_J)ï¼?"
 
-#: ../app/widgets/gimpstrokeeditor.c:232
+#: ../app/widgets/gimpstrokeeditor.c:229
 msgid "_Miter limit:"
 msgstr "æ??æ?¥é??å?¶(_M)ï¼?"
 
-#: ../app/widgets/gimpstrokeeditor.c:239
+#: ../app/widgets/gimpstrokeeditor.c:236
 msgid "Dash pattern:"
 msgstr "è??线模å¼?ï¼?"
 
-#: ../app/widgets/gimpstrokeeditor.c:302
+#: ../app/widgets/gimpstrokeeditor.c:299
 msgid "Dash _preset:"
 msgstr "è??线é¢?设(_P)ï¼?"
 
-#: ../app/widgets/gimpstrokeeditor.c:323
-msgid "_Antialiasing"
-msgstr "å??é?¯é½¿(_A)"
+#: ../app/widgets/gimptagentry.c:43
+msgid "filter"
+msgstr "�滤"
+
+#: ../app/widgets/gimptagentry.c:44
+msgid "enter tags"
+msgstr "���签"
 
-#: ../app/widgets/gimptemplateeditor.c:180
+#. Seperator for tags
+#. * IMPORTANT: use only one of Unicode terminal punctuation chars.
+#. * http://unicode.org/review/pr-23.html
+#.
+#: ../app/widgets/gimptagentry.c:1653
+msgid ","
+msgstr "ï¼?"
+
+#: ../app/widgets/gimptemplateeditor.c:179
 #, c-format
 msgid "%p"
 msgstr "%p"
 
-#: ../app/widgets/gimptemplateeditor.c:255
+#: ../app/widgets/gimptemplateeditor.c:254
 msgid "_Advanced Options"
 msgstr "é«?级é??项(_A)"
 
-#: ../app/widgets/gimptemplateeditor.c:362
+#: ../app/widgets/gimptemplateeditor.c:361
 msgid "Color _space:"
 msgstr "�彩空�(_S)�"
 
-#: ../app/widgets/gimptemplateeditor.c:370
+#: ../app/widgets/gimptemplateeditor.c:369
 msgid "_Fill with:"
 msgstr "å¡«å??(_F)ï¼?"
 
-#: ../app/widgets/gimptemplateeditor.c:380
+#: ../app/widgets/gimptemplateeditor.c:379
 msgid "Comme_nt:"
 msgstr "注é??(_N)ï¼?"
 
-#: ../app/widgets/gimptemplateeditor.c:530
+#: ../app/widgets/gimptemplateeditor.c:529
 msgid "_Name:"
 msgstr "å??å­?(_N)ï¼?"
 
-#: ../app/widgets/gimptemplateeditor.c:543
+#: ../app/widgets/gimptemplateeditor.c:542
 msgid "_Icon:"
 msgstr "��(_I)�"
 
-#: ../app/widgets/gimptemplateeditor.c:671
+#: ../app/widgets/gimptemplateeditor.c:670
 #, c-format
 msgid "%d Ã? %d ppi, %s"
 msgstr "%d x %d ppiï¼?%s"
 
-#: ../app/widgets/gimptemplateeditor.c:673
+#: ../app/widgets/gimptemplateeditor.c:672
 #, c-format
 msgid "%d ppi, %s"
 msgstr "%d ppiï¼?%s"
 
-#: ../app/widgets/gimptexteditor.c:188
+#: ../app/widgets/gimptexteditor.c:193
 msgid "_Language:"
 msgstr "语�(_L)"
 
-#: ../app/widgets/gimptexteditor.c:234
+#: ../app/widgets/gimptexteditor.c:232
 msgid "_Use selected font"
 msgstr "使ç?¨é??中ç??å­?ä½?(_U)"
 
-#: ../app/widgets/gimpthumbbox.c:344
+#: ../app/widgets/gimpthumbbox.c:343
 #, c-format
 msgid ""
 "Click to update preview\n"
@@ -12265,24 +13866,24 @@ msgstr ""
 "������\n"
 "%s%s��强�������使��已��"
 
-#: ../app/widgets/gimpthumbbox.c:362
+#: ../app/widgets/gimpthumbbox.c:361
 msgid "Pr_eview"
 msgstr "��(_E)"
 
-#: ../app/widgets/gimpthumbbox.c:417 ../app/widgets/gimpthumbbox.c:481
+#: ../app/widgets/gimpthumbbox.c:416 ../app/widgets/gimpthumbbox.c:480
 msgid "No selection"
 msgstr "æ?ªé??æ?©"
 
-#: ../app/widgets/gimpthumbbox.c:609 ../app/widgets/gimpthumbbox.c:630
+#: ../app/widgets/gimpthumbbox.c:608 ../app/widgets/gimpthumbbox.c:629
 #, c-format
 msgid "Thumbnail %d of %d"
 msgstr "缩�� %d / %d"
 
-#: ../app/widgets/gimpthumbbox.c:743 ../app/widgets/gimpthumbbox.c:753
+#: ../app/widgets/gimpthumbbox.c:742 ../app/widgets/gimpthumbbox.c:752
 msgid "Creating preview..."
 msgstr "æ­£å?¨å??建é¢?è§?..."
 
-#: ../app/widgets/gimptoolbox-color-area.c:80
+#: ../app/widgets/gimptoolbox-color-area.c:79
 msgid ""
 "Foreground & background colors.\n"
 "The black and white squares reset colors.\n"
@@ -12294,11 +13895,11 @@ msgstr ""
 "箭头å?¯ä»¥äº¤æ?¢é¢?è?²ã??\n"
 "å??å?»ä»¥æ??å¼?é¢?è?²é??æ?©å¯¹è¯?æ¡?ã??"
 
-#: ../app/widgets/gimptoolbox-color-area.c:141
+#: ../app/widgets/gimptoolbox-color-area.c:140
 msgid "Change Foreground Color"
 msgstr "æ?¹å??å??æ?¯è?²"
 
-#: ../app/widgets/gimptoolbox-color-area.c:146
+#: ../app/widgets/gimptoolbox-color-area.c:145
 msgid "Change Background Color"
 msgstr "æ?¹å??è??æ?¯è?²"
 
@@ -12315,7 +13916,7 @@ msgstr ""
 msgid "Drag to an XDS enabled file-manager to save the image."
 msgstr "æ??æ?½å?°è?½å¤?使ç?¨ XDS ç??æ??件管ç??å?¨ä»¥ä¿?å­?å?¾å??ã??"
 
-#: ../app/widgets/gimptoolbox-indicator-area.c:150
+#: ../app/widgets/gimptoolbox-indicator-area.c:149
 msgid ""
 "The active brush.\n"
 "Click to open the Brush Dialog."
@@ -12323,7 +13924,7 @@ msgstr ""
 "æ´»å?¨ç?»ç¬?ã??\n"
 "ç?¹å?»æ??å¼?ç?»ç¬?对è¯?æ¡?ã??"
 
-#: ../app/widgets/gimptoolbox-indicator-area.c:182
+#: ../app/widgets/gimptoolbox-indicator-area.c:181
 msgid ""
 "The active pattern.\n"
 "Click to open the Pattern Dialog."
@@ -12331,7 +13932,7 @@ msgstr ""
 "æ´»å?¨å?¾æ¡?ã??\n"
 "ç?¹å?»æ??å¼?å?¾æ¡?对è¯?æ¡?ã??"
 
-#: ../app/widgets/gimptoolbox-indicator-area.c:214
+#: ../app/widgets/gimptoolbox-indicator-area.c:213
 msgid ""
 "The active gradient.\n"
 "Click to open the Gradient Dialog."
@@ -12339,32 +13940,32 @@ msgstr ""
 "æ´»å?¨æ¸?å??ã??\n"
 "ç?¹å?»æ??å¼?æ¸?å??对è¯?æ¡?ã??"
 
-#: ../app/widgets/gimptooloptionseditor.c:165
+#: ../app/widgets/gimptooloptionseditor.c:164
 msgid "Save options to..."
 msgstr "é??项ä¿?å­?å?°..."
 
-#: ../app/widgets/gimptooloptionseditor.c:173
+#: ../app/widgets/gimptooloptionseditor.c:172
 msgid "Restore options from..."
 msgstr "é??项æ?¢å¤?è?ª..."
 
-#: ../app/widgets/gimptooloptionseditor.c:181
+#: ../app/widgets/gimptooloptionseditor.c:180
 msgid "Delete saved options..."
 msgstr "å? é?¤å·²ä¿?å­?ç??é??项..."
 
-#: ../app/widgets/gimptooloptionseditor.c:480
+#: ../app/widgets/gimptooloptionseditor.c:479
 #, c-format
 msgid "Error saving tool options presets: %s"
 msgstr "ä¿?å­?é¢?设工å?·é??项æ?¶å?ºé??ï¼?%s"
 
-#: ../app/widgets/gimpuimanager.c:738
+#: ../app/widgets/gimpuimanager.c:740
 msgid "Your GIMP installation is incomplete:"
 msgstr "æ?¨ç?? GIMP å®?è£?ä¸?å®?æ?´ï¼?"
 
-#: ../app/widgets/gimpuimanager.c:740
-msgid "Plase make sure the menu XML files are correctly installed."
+#: ../app/widgets/gimpuimanager.c:742
+msgid "Please make sure the menu XML files are correctly installed."
 msgstr "请确认è??å?? XML æ??件已正确å®?è£?ã??"
 
-#: ../app/widgets/gimpuimanager.c:746
+#: ../app/widgets/gimpuimanager.c:748
 #, c-format
 msgid "There was an error parsing the menu definition from %s: %s"
 msgstr "ä»? %s å¤?ç??è??å??å®?ä¹?æ?¶å?ºé??ï¼?%s"
@@ -12377,169 +13978,207 @@ msgstr "[ å??å§?å?¾å?? ]"
 msgid "Reorder path"
 msgstr "é??æ??è·¯å¾?"
 
-#: ../app/widgets/gimpvectorstreeview.c:253
+#: ../app/widgets/gimpvectorstreeview.c:254
 msgid "Empty Path"
 msgstr "空�路�"
 
-#: ../app/widgets/gimpviewablebox.c:81
+#: ../app/widgets/gimpviewablebox.c:80
 msgid "Open the brush selection dialog"
 msgstr "æ??å¼?ç?»ç¬?é??æ?©å¯¹è¯?æ¡?"
 
-#: ../app/widgets/gimpviewablebox.c:138
+#: ../app/widgets/gimpviewablebox.c:137
 msgid "Open the pattern selection dialog"
 msgstr "æ??å¼?å?¾æ¡?é??æ?©å¯¹è¯?æ¡?"
 
-#: ../app/widgets/gimpviewablebox.c:204
+#: ../app/widgets/gimpviewablebox.c:203
 msgid "Open the gradient selection dialog"
 msgstr "æ??å¼?æ¸?å??é??æ?©å¯¹è¯?æ¡?"
 
-#: ../app/widgets/gimpviewablebox.c:224
+#: ../app/widgets/gimpviewablebox.c:223
 msgid "Reverse"
 msgstr "å??å??"
 
-#: ../app/widgets/gimpviewablebox.c:306
+#: ../app/widgets/gimpviewablebox.c:305
 msgid "Open the palette selection dialog"
 msgstr "æ??å¼?è?²æ?¿é??æ?©å¯¹è¯?æ¡?"
 
-#: ../app/widgets/gimpviewablebox.c:364
+#: ../app/widgets/gimpviewablebox.c:363
 msgid "Open the font selection dialog"
 msgstr "æ??å¼?å­?ä½?é??æ?©å¯¹è¯?æ¡?"
 
-#: ../app/widgets/gimpwidgets-utils.c:608
+#: ../app/widgets/gimpwidgets-utils.c:651
 #, c-format
 msgid "%s (try %s)"
 msgstr "%s (�� %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:608
+#: ../app/widgets/gimpwidgets-utils.c:651
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:612
+#: ../app/widgets/gimpwidgets-utils.c:655
 #, c-format
 msgid "%s (try %s, %s)"
 msgstr "%s (�� %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:616
+#: ../app/widgets/gimpwidgets-utils.c:659
 #, c-format
 msgid "%s (try %s, %s, %s)"
 msgstr "%s (�� %s, %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:882
+#: ../app/widgets/gimpwidgets-utils.c:927
 #, c-format
 msgid "Invalid UTF-8 data in file '%s'."
-msgstr "æ??件â??%sâ??中å?«æ??æ? æ??ç?? UTF-8 æ?°æ?®ã??"
+msgstr "â??%sâ??æ??件中å?«æ??æ? æ??ç?? UTF-8 æ?°æ?®ã??"
 
 #: ../app/widgets/widgets-enums.c:23
+msgctxt "active-color"
 msgid "Foreground"
 msgstr "å??æ?¯"
 
-#: ../app/widgets/widgets-enums.c:83
+#: ../app/widgets/widgets-enums.c:24
+msgctxt "active-color"
+msgid "Background"
+msgstr "è??æ?¯"
+
+#: ../app/widgets/widgets-enums.c:85
+msgctxt "color-frame-mode"
 msgid "Pixel"
 msgstr "å??ç´ "
 
-#: ../app/widgets/widgets-enums.c:85
+#: ../app/widgets/widgets-enums.c:86
+msgctxt "color-frame-mode"
+msgid "RGB"
+msgstr "RGB"
+
+#: ../app/widgets/widgets-enums.c:87
+msgctxt "color-frame-mode"
 msgid "HSV"
 msgstr "HSV"
 
-#: ../app/widgets/widgets-enums.c:86
+#: ../app/widgets/widgets-enums.c:88
+msgctxt "color-frame-mode"
 msgid "CMYK"
 msgstr "CMYK"
 
-#: ../app/widgets/widgets-enums.c:115
+#: ../app/widgets/widgets-enums.c:118
+msgctxt "color-pick-mode"
 msgid "Pick only"
 msgstr "ä»?æ?¾å??"
 
-#: ../app/widgets/widgets-enums.c:116
+#: ../app/widgets/widgets-enums.c:119
+msgctxt "color-pick-mode"
 msgid "Set foreground color"
 msgstr "设置å??æ?¯è?²"
 
-#: ../app/widgets/widgets-enums.c:117
+#: ../app/widgets/widgets-enums.c:120
+msgctxt "color-pick-mode"
 msgid "Set background color"
 msgstr "设置è??æ?¯è?²"
 
-#: ../app/widgets/widgets-enums.c:118
+#: ../app/widgets/widgets-enums.c:121
+msgctxt "color-pick-mode"
 msgid "Add to palette"
 msgstr "添����"
 
-#: ../app/widgets/widgets-enums.c:173
+#: ../app/widgets/widgets-enums.c:178
+msgctxt "cursor-format"
 msgid "Black & white"
 msgstr "é»?ç?½"
 
-#: ../app/widgets/widgets-enums.c:174
+#: ../app/widgets/widgets-enums.c:179
+msgctxt "cursor-format"
 msgid "Fancy"
 msgstr "�亮"
 
-#: ../app/widgets/widgets-enums.c:201
+#: ../app/widgets/widgets-enums.c:207
+msgctxt "help-browser-type"
 msgid "GIMP help browser"
 msgstr "GIMP 帮����"
 
-#: ../app/widgets/widgets-enums.c:202
+#: ../app/widgets/widgets-enums.c:208
+msgctxt "help-browser-type"
 msgid "Web browser"
 msgstr "Web ���"
 
-#: ../app/widgets/widgets-enums.c:229
+#: ../app/widgets/widgets-enums.c:236
+msgctxt "histogram-scale"
 msgid "Linear histogram"
-msgstr "���"
+msgstr "线����"
 
-#: ../app/widgets/widgets-enums.c:230
+#: ../app/widgets/widgets-enums.c:237
+msgctxt "histogram-scale"
 msgid "Logarithmic histogram"
 msgstr "对����"
 
-#: ../app/widgets/widgets-enums.c:263
+#: ../app/widgets/widgets-enums.c:271
+msgctxt "tab-style"
 msgid "Icon"
 msgstr "��"
 
-#: ../app/widgets/widgets-enums.c:264
+#: ../app/widgets/widgets-enums.c:272
+msgctxt "tab-style"
 msgid "Current status"
 msgstr "å½?å??ç?¶æ??"
 
-#: ../app/widgets/widgets-enums.c:266
+#: ../app/widgets/widgets-enums.c:273
+msgctxt "tab-style"
+msgid "Text"
+msgstr "æ??å­?"
+
+#: ../app/widgets/widgets-enums.c:274
+msgctxt "tab-style"
 msgid "Description"
 msgstr "æ??è¿°"
 
-#: ../app/widgets/widgets-enums.c:267
+#: ../app/widgets/widgets-enums.c:275
+msgctxt "tab-style"
 msgid "Icon & text"
 msgstr "å?¾æ ?å??æ??å­?"
 
-#: ../app/widgets/widgets-enums.c:268
+#: ../app/widgets/widgets-enums.c:276
+msgctxt "tab-style"
 msgid "Icon & desc"
 msgstr "å?¾æ ?å??æ??è¿°"
 
-#: ../app/widgets/widgets-enums.c:269
+#: ../app/widgets/widgets-enums.c:277
+msgctxt "tab-style"
 msgid "Status & text"
 msgstr "ç?¶æ??å??æ??å­?"
 
-#: ../app/widgets/widgets-enums.c:270
+#: ../app/widgets/widgets-enums.c:278
+msgctxt "tab-style"
 msgid "Status & desc"
 msgstr "ç?¶æ??å??æ??è¿°"
 
-#: ../app/widgets/widgets-enums.c:298
+#: ../app/widgets/widgets-enums.c:336
+msgctxt "window-hint"
 msgid "Normal window"
 msgstr "æ?®é??çª?å?£"
 
-#: ../app/widgets/widgets-enums.c:299
+#: ../app/widgets/widgets-enums.c:337
+msgctxt "window-hint"
 msgid "Utility window"
 msgstr "工���"
 
-#: ../app/widgets/widgets-enums.c:300
+#: ../app/widgets/widgets-enums.c:338
+msgctxt "window-hint"
 msgid "Keep above"
 msgstr "ä¿?æ??å?¨ä¸?æ?¹"
 
-#: ../app/xcf/xcf-load.c:277
+#: ../app/xcf/xcf-load.c:278
 msgid ""
 "This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
 "incomplete."
-msgstr "æ­¤ XCF æ??件已å??ï¼?æ??å·²ç»?å°½å?¯è?½å¤?ç??读å??ï¼?ä½?å®?ä¸?å®?æ?´ã??"
+msgstr "æ­¤ XCF æ??件已æ??å??ï¼?æ??å·²ç»?å°½å?¯è?½å¤?ç??读å??ï¼?ä½?å®?ä¸?å®?æ?´ã??"
 
-#: ../app/xcf/xcf-load.c:286
-#, c-format
+#: ../app/xcf/xcf-load.c:287
 msgid ""
 "This XCF file is corrupt!  I could not even salvage any partial image data "
 "from it."
-msgstr "æ­¤ XCF æ??件已å??ï¼?æ??ç??è?³æ? æ³?é?¨å??æ?¢æ±?å?ºä»»ä½?å?¾å??æ?°æ?®ã??"
+msgstr "æ­¤ XCF æ??件已æ??å??ï¼?æ??ç??è?³æ? æ³?é?¨å??æ?¢æ??å?ºä»»ä½?å?¾å??æ?°æ?®ã??"
 
-#: ../app/xcf/xcf-load.c:324
+#: ../app/xcf/xcf-load.c:325
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -12549,40 +14188,40 @@ msgstr ""
 "ä¸?è?½æ­£ç¡®ç??ä¿?å­?ç´¢å¼?é¢?è?²è¡¨ã??\n"
 "ç?¨ç?°åº¦é¢?è?²è¡¨å??代ã??"
 
-#: ../app/xcf/xcf-read.c:109
+#: ../app/xcf/xcf-read.c:108
 msgid "Invalid UTF-8 string in XCF file"
 msgstr "XCF æ??件中å?«æ??æ? æ??ç?? UTF-8 å­?符串"
 
-#: ../app/xcf/xcf-write.c:87
+#: ../app/xcf/xcf-write.c:86
 #, c-format
 msgid "Error writing XCF: %s"
 msgstr "å?? XCF æ?¶å?ºé??ï¼?%s"
 
-#: ../app/xcf/xcf-seek.c:44 ../app/xcf/xcf-seek.c:61 ../app/xcf/xcf-seek.c:72
+#: ../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:98 ../app/xcf/xcf.c:166
 msgid "GIMP XCF image"
 msgstr "GIMP XCF å?¾å??"
 
-#: ../app/xcf/xcf.c:271
+#: ../app/xcf/xcf.c:270
 #, c-format
 msgid "Opening '%s'"
 msgstr "æ­£å?¨æ??å¼?â??%sâ??"
 
-#: ../app/xcf/xcf.c:313
+#: ../app/xcf/xcf.c:312
 #, c-format
 msgid "XCF error: unsupported XCF file version %d encountered"
 msgstr "XCF é??误ï¼?é??å?°ä¸?æ?¯æ??ç?? XCF æ??件ç??æ?¬ %d"
 
-#: ../app/xcf/xcf.c:383
+#: ../app/xcf/xcf.c:382
 #, c-format
 msgid "Saving '%s'"
 msgstr "æ­£å?¨ä¿?å­?â??%sâ??"
 
-#: ../app/xcf/xcf.c:403
+#: ../app/xcf/xcf.c:402
 #, c-format
 msgid "Error saving XCF file: %s"
 msgstr "ä¿?å­? XCF æ??件æ?¶å?ºé??ï¼?%s"
@@ -12595,32 +14234,36 @@ msgstr "å??建å?¾å??æ??ç¼?è¾?ç?§ç??"
 msgid "Image Editor"
 msgstr "å?¾å??ç¼?è¾?å?¨"
 
-#: ../tools/gimp-remote.c:65
+#: ../tools/gimp-remote.c:64
 msgid "Use a running GIMP only, never start a new one"
 msgstr "å?ªä½¿ç?¨è¿?è¡?中ç?? GIMP å®?ä¾?ï¼?ä»?ä¸?å?¯å?¨æ?°å®?ä¾?"
 
-#: ../tools/gimp-remote.c:70
+#: ../tools/gimp-remote.c:69
 msgid "Only check if GIMP is running, then quit"
 msgstr "å?ªæ£?æ?¥ GIMP æ?¯å?¦å?¨è¿?è¡?ï¼?ç?¶å??é??å?º"
 
-#: ../tools/gimp-remote.c:76
+#: ../tools/gimp-remote.c:75
 msgid "Print X window ID of GIMP toolbox window, then quit"
 msgstr "æ??å?° GIMP å·¥å?·ç®±çª?å?£ç?? X window IDï¼?ç?¶å??é??å?ºã??"
 
-#: ../tools/gimp-remote.c:82
+#: ../tools/gimp-remote.c:81
 msgid "Start GIMP without showing the startup window"
 msgstr "å?¯å?¨ GIMP è??ä¸?æ?¾ç¤ºå?¯å?¨çª?å?£"
 
-#: ../tools/gimp-remote-x11.c:67
+#: ../tools/gimp-remote-x11.c:66
 msgid "Could not connect to GIMP."
 msgstr "æ? æ³?è¿?æ?¥å?° GIMPã??"
 
-#: ../tools/gimp-remote-x11.c:68
+#: ../tools/gimp-remote-x11.c:67
 msgid "Make sure that the Toolbox is visible!"
 msgstr "确�工�箱���"
 
 #. if execv and execvp return, there was an error
-#: ../tools/gimp-remote-x11.c:248
+#: ../tools/gimp-remote-x11.c:247
 #, c-format
 msgid "Couldn't start '%s': %s"
 msgstr "æ? æ³?å?¯å?¨â??%sâ??ï¼?%s"
+
+#~ msgctxt "file-action"
+#~ msgid "Save as _Template..."
+#~ msgstr "��为模�(_T)..."



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