[gimp] Update Chinese (China) translation.



commit 68be37aefa3dd51ceb1841a5fd1b3f4fb7f80362
Author: mike2718 <mike2718 gmail com>
Date:   Thu Dec 30 16:16:04 2010 +0000

    Update Chinese (China) translation.

 po/zh_CN.po |10645 ++++++++++++++++++++++++-----------------------------------
 1 files changed, 4322 insertions(+), 6323 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 309cb91..6a49420 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,50 +1,50 @@
 # zh_CN translation of gimp.
 # Copyright (C) 2001-2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gimp package.
+#
 # Yuheng Xie <elephant linux net cn>, 2001-2004.
 # Funda Wang <fundawang linux net cn>, 2003.
 # Cai Qian <caiqian gnome org>, 2005.
 # Shawn Syu <shawn msn cn>, 2008.
-# Aron Xuã??<aronmalache 163 com>, 2008-2009.
 # ���人 <kappa8086 gmail com>, 2008-2009.
+# Aron Xuã??<aronxu gnome org>, 2008-2009.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-28 16:13+0200\n"
-"PO-Revision-Date: 2010-05-05 22:54+0800\n"
-"Last-Translator: ���人 <kappa8086 gmail com>\n"
-"Language-Team: Chinese/Simplified <i18n-translation lists linux net cn>\n"
-"Language: \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=gimp&component=general\n"
+"POT-Creation-Date: 2010-11-09 13:46+0000\n"
+"PO-Revision-Date: 2010-12-30 16:15+0000\n"
+"Last-Translator: mike2718 <mike2718 gmail com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\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:23
+#: ../app/about.h:24
 msgid "GIMP"
 msgstr "GIMP"
 
-#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:2
+#: ../app/about.h:27 ../desktop/gimp.desktop.in.in.h:2
 msgid "GNU Image Manipulation Program"
 msgstr "GNU å?¾å??å¤?ç??ç¨?åº?"
 
-#. The year of the last commit (UTC) will be inserted into this string.
 #: ../app/about.h:30
-#, c-format
 msgid ""
-"Copyright © 1995-%s\n"
+"Copyright © 1995-2008\n"
 "Spencer Kimball, Peter Mattis and the GIMP Development Team"
 msgstr ""
-"ç??æ??æ??æ?? © 1995-%s\n"
+"ç??æ??æ??æ?? © 1995-2008\n"
 "Spencer Kimballï¼?Peter Mattis å?? GIMP å¼?å??å°?ç»?"
 
 #: ../app/about.h:34
 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 3 of the License, or (at your option) any later "
+"Foundation; either version 2 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 "
@@ -53,7 +53,8 @@ msgid ""
 "details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with "
-"GIMP.  If not, see <http://www.gnu.org/licenses/>."
+"GIMP; if not, write to the Free Software Foundation, Inc., 59 Temple Place - "
+"Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 "GIMP æ?¯ä¸?个è?ªç?±è½¯ä»¶ï¼?æ?¨å?¯ä»¥å?¨é?µå®?ç?±è?ªç?±è½¯ä»¶å?ºé??ä¼?å??å¸?ç?? GNU é??ç?¨å?¬å?±è®¸å?¯å??è®®"
 "ç??æ??å?µä¸?é??æ?°å??å??并ä¸?(æ??è??)ä¿®æ?¹è½¯ä»¶ï¼?æ??第ä¸?ç??许å?¯å??è®®ï¼?æ??(æ ¹æ?®æ?¨ç??é??æ?©)ä»»ä½?æ?´"
@@ -65,7 +66,7 @@ msgstr ""
 "æ?¨åº?该已ç»?é?? GIMP æ?¶å?°ä¸?份 GNU é??ç?¨å?¬å?±è®¸å?¯å??è®®ï¼?å¦?æ??没æ??ï¼?è§? <http://www.";
 "gnu.org/licenses/>ã??"
 
-#: ../app/app.c:220
+#: ../app/app.c:214
 #, c-format
 msgid ""
 "Unable to open a test swap file.\n"
@@ -75,8 +76,8 @@ msgid ""
 msgstr ""
 "æ? æ³?æ??å¼?æµ?è¯?交æ?¢æ??件ã??\n"
 "\n"
-"为äº?é?¿å??æ?°æ?®ä¸¢å¤±ï¼?请æ£?æ?¥æ?¨å?¨é¦?é??项中å®?ä¹?ç??交æ?¢ç?®å½?ç??ä½?置以å??æ??é??(å½?å??"
-"为â??%sâ??)ã??"
+"为äº?é?¿å??æ?°æ?®ä¸¢å¤±ï¼?请æ£?æ?¥æ?¨å?¨é¦?é??项中å®?ä¹?ç??交æ?¢ç?®å½?ç??ä½?置以å??æ??é??(å½?å??为â??%"
+"sâ??)ã??"
 
 #: ../app/batch.c:75
 #, c-format
@@ -88,102 +89,101 @@ msgstr "没æ??æ??å®?æ?¹å¤?ç??解é??å?¨ï¼?使ç?¨é»?认ç??â??%sâ??ã??\n"
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
 msgstr "æ?¹å¤?ç??解æ??ç¨?åº?â??%sâ??ä¸?å?¯ç?¨ã??æ?¹å¤?ç??模å¼?已被ç¦?ç?¨ã??"
 
-#: ../app/main.c:139 ../tools/gimp-remote.c:59
+#: ../app/main.c:148 ../tools/gimp-remote.c:60
 msgid "Show version information and exit"
 msgstr "æ?¾ç¤ºç??æ?¬ä¿¡æ?¯å¹¶é??å?º"
 
-#: ../app/main.c:144
+#: ../app/main.c:153
 msgid "Show license information and exit"
 msgstr "æ?¾ç¤ºè®¸å?¯ä¿¡æ?¯å¹¶é??å?º"
 
-#: ../app/main.c:149
+#: ../app/main.c:158
 msgid "Be more verbose"
-msgstr "�详�"
+msgstr "详�信�"
 
-#: ../app/main.c:154
+#: ../app/main.c:163
 msgid "Start a new GIMP instance"
 msgstr "å?¯å?¨ä¸?个æ?°ç?? GIMP å®?ä¾?"
 
-#: ../app/main.c:159
+#: ../app/main.c:168
 msgid "Open images as new"
 msgstr "ä½?为æ?°å»ºå?¾å??æ??å¼?"
 
-#: ../app/main.c:164
+#: ../app/main.c:173
 msgid "Run without a user interface"
 msgstr "è¿?è¡?æ?¶ä¸?æ??ä¾?ç?¨æ?·ç??é?¢"
 
-#: ../app/main.c:169
+#: ../app/main.c:178
 msgid "Do not load brushes, gradients, patterns, ..."
 msgstr "ä¸?å? è½½ç?»ç¬?ã??æ¸?å??ã??å?¾æ¡?ç­?"
 
-#: ../app/main.c:174
+#: ../app/main.c:183
 msgid "Do not load any fonts"
-msgstr "���任���"
+msgstr "�载�任���"
 
-#: ../app/main.c:179
-#, fuzzy
-msgid "Do not show a splash screen"
+#: ../app/main.c:188
+msgid "Do not show a startup window"
 msgstr "��示����"
 
-#: ../app/main.c:184
+#: ../app/main.c:193
 msgid "Do not use shared memory between GIMP and plugins"
 msgstr "ä¸?å?¨ GIMP å??æ??件ä¹?é?´ä½¿ç?¨å?±äº«å??å­?"
 
-#: ../app/main.c:189
+#: ../app/main.c:198
 msgid "Do not use special CPU acceleration functions"
 msgstr "ä¸?使ç?¨ç?¹å®? CPU å? é??"
 
-#: ../app/main.c:194
+#: ../app/main.c:203
 msgid "Use an alternate sessionrc file"
 msgstr "使ç?¨å?«ç?? sessionrc æ??件"
 
-#: ../app/main.c:199
+#: ../app/main.c:208
 msgid "Use an alternate user gimprc file"
 msgstr "使ç?¨å?«ç??ç?¨æ?· gimprc æ??件"
 
-#: ../app/main.c:204
+#: ../app/main.c:213
 msgid "Use an alternate system gimprc file"
 msgstr "使ç?¨å?«ç??ç³»ç»? gimprc æ??件"
 
-#: ../app/main.c:209
+#: ../app/main.c:218
 msgid "Batch command to run (can be used multiple times)"
 msgstr "è¦?è¿?è¡?ç??æ?¹å¤?ç??å?½ä»¤(å?¯ä»¥ä½¿ç?¨å¤?次)"
 
-#: ../app/main.c:214
+#: ../app/main.c:223
 msgid "The procedure to process batch commands with"
 msgstr "å¤?ç??æ?¹å¤?ç??å?½ä»¤ç??è¿?ç¨?"
 
-#: ../app/main.c:219
+#: ../app/main.c:228
 msgid "Send messages to console instead of using a dialog"
 msgstr "å?¨æ?§å?¶å?°è??ä¸?æ?¯å¯¹è¯?æ¡?中æ?¾ç¤ºè­¦å??ä¿¡æ?¯"
 
 #. don't translate the mode names (off|on|warn)
-#: ../app/main.c:225
+#: ../app/main.c:234
 msgid "PDB compatibility mode (off|on|warn)"
 msgstr "PDB �容模�(off|on|warn)"
 
 #. don't translate the mode names (never|query|always)
-#: ../app/main.c:231
+#: ../app/main.c:240
 msgid "Debug in case of a crash (never|query|always)"
 msgstr "崩����(never|query|always)"
 
-#: ../app/main.c:236
+#: ../app/main.c:245
 msgid "Enable non-fatal debugging signal handlers"
 msgstr "å?¯ç?¨é??è?´å?½è°?è¯?ä¿¡å?·å¤?ç??ç¨?åº?"
 
-#: ../app/main.c:241
+#: ../app/main.c:250
 msgid "Make all warnings fatal"
 msgstr "å°?æ??æ??è­¦å??ä½?为è?´å?½ç??"
 
-#: ../app/main.c:246
+#: ../app/main.c:255
 msgid "Output a gimprc file with default settings"
 msgstr "è¾?å?ºé»?认设置ç?? gimprc æ??件"
 
-#: ../app/main.c:374
+#: ../app/main.c:383
 msgid "[FILE|URI...]"
 msgstr "[æ??件|URI...]"
 
-#: ../app/main.c:392
+#: ../app/main.c:401
 msgid ""
 "GIMP could not initialize the graphical user interface.\n"
 "Make sure a proper setup for your display environment exists."
@@ -191,24 +191,24 @@ msgstr ""
 "GIMP æ? æ³?å??å§?å??å?¾å½¢ç?¨æ?·ç??é?¢ã??\n"
 "请确å®?æ?¨ç??æ?¾ç¤ºç?¯å¢?å·²ç»?正确å®?è£?ã??"
 
-#: ../app/main.c:411
+#: ../app/main.c:420
 msgid "Another GIMP instance is already running."
-msgstr "å?¦ä¸?个 GIMP å®?ä¾?å·²å?¨è¿?è¡?中ã??"
+msgstr "å?¦ä¸?个 GIMP å®?ä¾?æ­£å?¨è¿?è¡?中ã??"
 
-#: ../app/main.c:481
+#: ../app/main.c:490
 msgid "GIMP output. Type any character to close this window."
 msgstr "GIMP è¾?å?ºã??é?®å?¥ä»»æ??å­?符å?³é?­æ­¤çª?å?£ã??"
 
-#: ../app/main.c:482
+#: ../app/main.c:491
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(é?®å?¥ä»»æ??å­?符å?³é?­æ?¬çª?å?£)\n"
 
-#: ../app/main.c:499
+#: ../app/main.c:508
 msgid "GIMP output. You can minimize this window, but don't close it."
 msgstr "GIMP è¾?å?ºã??æ?¨å?¯ä»¥æ??å°?å??æ­¤çª?å?£ï¼?ä½?ä¸?è¦?å?³é?­å®?ã??"
 
-#: ../app/sanity.c:398
+#: ../app/sanity.c:365
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -219,7 +219,7 @@ msgstr ""
 "\n"
 "请æ£?æ?¥ç?¯å¢?å??é?? G_FILENAME_ENCODING ç??å?¼ã??"
 
-#: ../app/sanity.c:417
+#: ../app/sanity.c:384
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -240,488 +240,405 @@ msgstr ""
 msgid "using %s version %s (compiled against version %s)"
 msgstr "使ç?¨%sç??æ?¬ %s (以%s为å?ºç¡?ç¼?è¯?)"
 
-#: ../app/version.c:127 ../tools/gimp-remote.c:94
+#: ../app/version.c:127 ../tools/gimp-remote.c:95
 #, c-format
 msgid "%s version %s"
 msgstr "%s ç??æ?¬ %s"
 
-#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:353
-#: ../app/widgets/gimpbrusheditor.c:89
+#: ../app/actions/actions.c:101 ../app/actions/dialogs-actions.c:123
+#: ../app/dialogs/dialogs.c:224 ../app/widgets/gimpbrusheditor.c:90
 msgid "Brush Editor"
 msgstr "�����"
 
 #. initialize the list of gimp brushes
-#: ../app/actions/actions.c:112 ../app/core/gimp.c:953
-#: ../app/dialogs/dialogs.c:282 ../app/dialogs/preferences-dialog.c:2720
+#: ../app/actions/actions.c:104 ../app/core/gimp.c:838
+#: ../app/dialogs/dialogs.c:157 ../app/dialogs/preferences-dialog.c:2744
 msgid "Brushes"
 msgstr "��"
 
-#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:292
+#: ../app/actions/actions.c:107 ../app/dialogs/dialogs.c:169
 msgid "Buffers"
 msgstr "���"
 
-#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:311
+#: ../app/actions/actions.c:110 ../app/dialogs/dialogs.c:182
 msgid "Channels"
 msgstr "é??é??"
 
-#: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174
-#: ../app/dialogs/dialogs.c:319
+#: ../app/actions/actions.c:113 ../app/dialogs/convert-dialog.c:174
+#: ../app/dialogs/dialogs.c:190
 msgid "Colormap"
 msgstr "��表"
 
-#: ../app/actions/actions.c:124
+#: ../app/actions/actions.c:116
 msgid "Configuration"
 msgstr "é??ç½®"
 
-#: ../app/actions/actions.c:127
+#: ../app/actions/actions.c:119
 msgid "Context"
 msgstr "��"
 
-#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:275
+#: ../app/actions/actions.c:122 ../app/dialogs/dialogs.c:150
 msgid "Pointer Information"
 msgstr "æ??é??ä¿¡æ?¯"
 
-#: ../app/actions/actions.c:133
+#: ../app/actions/actions.c:125
 msgid "Debug"
 msgstr "��"
 
-#: ../app/actions/actions.c:136
+#: ../app/actions/actions.c:128
 msgid "Dialogs"
 msgstr "对��"
 
-#: ../app/actions/actions.c:139
+#: ../app/actions/actions.c:131
 msgid "Dock"
 msgstr "å??é? "
 
-#: ../app/actions/actions.c:142
+#: ../app/actions/actions.c:134
 msgid "Dockable"
 msgstr "å?¯å??é? "
 
 #. Document History
-#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:294
-#: ../app/dialogs/preferences-dialog.c:1573
+#: ../app/actions/actions.c:137 ../app/dialogs/dialogs.c:171
+#: ../app/dialogs/preferences-dialog.c:1595
 msgid "Document History"
 msgstr "æ??æ¡£å??å?²"
 
-#: ../app/actions/actions.c:148
+#: ../app/actions/actions.c:140
 msgid "Drawable"
 msgstr "��对象"
 
-#. Some things do not have grids, so just list
-#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:300
-msgid "Paint Dynamics"
-msgstr "å?¨æ??ç»?å?¾"
-
-#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:357
-#: ../app/widgets/gimpdynamicseditor.c:94
-msgid "Paint Dynamics Editor"
-msgstr "å?¨æ??ç»?å?¾ç¼?è¾?å?¨"
-
-#: ../app/actions/actions.c:157
+#: ../app/actions/actions.c:143 ../app/tools/tools-enums.c:300
 msgid "Edit"
 msgstr "ç¼?è¾?"
 
-#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:271
+#: ../app/actions/actions.c:146 ../app/dialogs/dialogs.c:146
 msgid "Error Console"
 msgstr "é??误æ?§å?¶å?°"
 
-#: ../app/actions/actions.c:163
+#: ../app/actions/actions.c:149
 msgid "File"
 msgstr "æ??件"
 
-#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:290
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/actions/actions.c:152 ../app/dialogs/dialogs.c:165
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Fonts"
 msgstr "å­?ä½?"
 
-#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:361
-#: ../app/widgets/gimpgradienteditor.c:275
+#: ../app/actions/actions.c:155 ../app/actions/dialogs-actions.c:141
+#: ../app/dialogs/dialogs.c:228 ../app/widgets/gimpgradienteditor.c:276
 msgid "Gradient Editor"
 msgstr "æ¸?å??ç¼?è¾?å?¨"
 
 #. initialize the list of gimp gradients
-#: ../app/actions/actions.c:172 ../app/core/gimp.c:973
-#: ../app/dialogs/dialogs.c:286 ../app/dialogs/preferences-dialog.c:2736
+#: ../app/actions/actions.c:158 ../app/core/gimp.c:850
+#: ../app/dialogs/dialogs.c:161 ../app/dialogs/preferences-dialog.c:2756
 msgid "Gradients"
 msgstr "æ¸?å??"
 
-#. initialize the list of gimp tool presets
-#: ../app/actions/actions.c:175 ../app/core/gimp.c:983
-#: ../app/dialogs/dialogs.c:302
-msgid "Tool Presets"
-msgstr "工��设�"
-
-#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:369
-#: ../app/widgets/gimptoolpreseteditor.c:75
-msgid "Tool Preset Editor"
-msgstr "工��设����"
-
-#: ../app/actions/actions.c:181
+#: ../app/actions/actions.c:161
 msgid "Help"
 msgstr "帮�"
 
-#: ../app/actions/actions.c:184
+#: ../app/actions/actions.c:164 ../app/core/core-enums.c:212
+#: ../app/tools/tools-enums.c:242
 msgid "Image"
 msgstr "å?¾å??"
 
 #. list & grid views
-#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:280
+#: ../app/actions/actions.c:167 ../app/dialogs/dialogs.c:155
 msgid "Images"
 msgstr "å?¾å??"
 
-#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:307
-#: ../app/dialogs/resize-dialog.c:287
+#: ../app/actions/actions.c:170 ../app/dialogs/dialogs.c:178
+#: ../app/dialogs/resize-dialog.c:286
 msgid "Layers"
 msgstr "��"
 
-#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:365
-#: ../app/widgets/gimppaletteeditor.c:152
+#: ../app/actions/actions.c:173 ../app/actions/dialogs-actions.c:153
+#: ../app/dialogs/dialogs.c:232 ../app/widgets/gimppaletteeditor.c:155
 msgid "Palette Editor"
 msgstr "�����"
 
 #. initialize the list of gimp palettes
-#: ../app/actions/actions.c:196 ../app/core/gimp.c:968
-#: ../app/dialogs/dialogs.c:288 ../app/dialogs/preferences-dialog.c:2732
+#: ../app/actions/actions.c:176 ../app/core/gimp.c:846
+#: ../app/dialogs/dialogs.c:163 ../app/dialogs/preferences-dialog.c:2752
 msgid "Palettes"
 msgstr "��"
 
 #. initialize the list of gimp patterns
-#: ../app/actions/actions.c:199 ../app/core/gimp.c:963
-#: ../app/dialogs/dialogs.c:284 ../app/dialogs/preferences-dialog.c:2728
+#: ../app/actions/actions.c:179 ../app/core/gimp.c:842
+#: ../app/dialogs/dialogs.c:159 ../app/dialogs/preferences-dialog.c:2748
 msgid "Patterns"
 msgstr "��"
 
-#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2744
+#: ../app/actions/actions.c:182 ../app/dialogs/preferences-dialog.c:2764
 msgid "Plug-Ins"
 msgstr "æ??件"
 
-#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:385
+#: ../app/actions/actions.c:185 ../app/core/core-enums.c:860
+#: ../app/core/gimpchannel.c:362
 msgid "Quick Mask"
 msgstr "å¿«é??è??æ?¿"
 
-#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:335
+#: ../app/actions/actions.c:188 ../app/dialogs/dialogs.c:206
 msgid "Sample Points"
 msgstr "é??æ ·ç?¹"
 
-#: ../app/actions/actions.c:211
+#: ../app/actions/actions.c:191
 msgid "Select"
 msgstr "é??æ?©"
 
 #. initialize the template list
-#: ../app/actions/actions.c:214 ../app/core/gimp.c:988
-#: ../app/dialogs/dialogs.c:296
+#: ../app/actions/actions.c:194 ../app/core/gimp.c:859
+#: ../app/dialogs/dialogs.c:173
 msgid "Templates"
 msgstr "模�"
 
-#: ../app/actions/actions.c:217
-msgid "Text Tool"
-msgstr "æ??å­?å·¥å?·"
-
-#: ../app/actions/actions.c:220
+#: ../app/actions/actions.c:197
 msgid "Text Editor"
 msgstr "æ??æ?¬ç¼?è¾?å?¨"
 
-#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:263
-#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:430
+#: ../app/actions/actions.c:200 ../app/dialogs/dialogs.c:138
+#: ../app/dialogs/preferences-dialog.c:1880 ../app/gui/gui.c:429
 msgid "Tool Options"
 msgstr "å·¥å?·é??项"
 
-#: ../app/actions/actions.c:226 ../app/widgets/gimptoolbox.c:927
+#: ../app/actions/actions.c:203 ../app/dialogs/dialogs.c:167
 msgid "Tools"
 msgstr "工�"
 
-#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:315
-#: ../app/tools/gimpvectortool.c:162
+#: ../app/actions/actions.c:206 ../app/dialogs/dialogs.c:186
+#: ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "路�"
 
-#: ../app/actions/actions.c:232
+#: ../app/actions/actions.c:209
 msgid "View"
 msgstr "æ?¥ç??"
 
-#: ../app/actions/actions.c:235
+#: ../app/actions/actions.c:212
 msgid "Windows"
 msgstr "��"
 
-#. value description and new value shown in the status bar
-#: ../app/actions/actions.c:584
-#, c-format
-msgid "%s: %.2f"
-msgstr "%s: %.2f"
-
-#. value description and new value shown in the status bar
-#: ../app/actions/actions.c:610
-#, c-format
-msgid "%s: %d"
-msgstr "%sï¼?%d"
-
-#: ../app/actions/brush-editor-actions.c:42
-msgctxt "brush-editor-action"
+#: ../app/actions/brush-editor-actions.c:43
 msgid "Brush Editor Menu"
 msgstr "ç?»ç¬?ç¼?è¾?å?¨è??å??"
 
-#: ../app/actions/brush-editor-actions.c:49
-msgctxt "brush-editor-action"
+#: ../app/actions/brush-editor-actions.c:50
 msgid "Edit Active Brush"
 msgstr "��活���"
 
-#: ../app/actions/brushes-actions.c:42
-msgctxt "brushes-action"
+#: ../app/actions/brushes-actions.c:43
 msgid "Brushes Menu"
 msgstr "ç?»ç¬?è??å??"
 
-#: ../app/actions/brushes-actions.c:46
-msgctxt "brushes-action"
+#: ../app/actions/brushes-actions.c:47
 msgid "_Open Brush as Image"
 msgstr "ä½?为å?¾å??æ??å¼?ç?»ç¬?(_O)"
 
-#: ../app/actions/brushes-actions.c:47
-msgctxt "brushes-action"
+#: ../app/actions/brushes-actions.c:48
 msgid "Open brush as image"
 msgstr "ä½?为å?¾å??æ??å¼?ç?»ç¬?"
 
-#: ../app/actions/brushes-actions.c:52
-msgctxt "brushes-action"
+#: ../app/actions/brushes-actions.c:53
 msgid "_New Brush"
 msgstr "�建��(_N)"
 
-#: ../app/actions/brushes-actions.c:53
-msgctxt "brushes-action"
-msgid "Create a new brush"
-msgstr "å??建æ?°ç?»ç¬?"
+#: ../app/actions/brushes-actions.c:54
+msgid "New brush"
+msgstr "�建��"
 
-#: ../app/actions/brushes-actions.c:58
-msgctxt "brushes-action"
+#: ../app/actions/brushes-actions.c:59
 msgid "D_uplicate Brush"
 msgstr "����(_U)"
 
-#: ../app/actions/brushes-actions.c:59
-msgctxt "brushes-action"
-msgid "Duplicate this brush"
-msgstr "��此��"
+#: ../app/actions/brushes-actions.c:60
+msgid "Duplicate brush"
+msgstr "����"
 
-#: ../app/actions/brushes-actions.c:64
-msgctxt "brushes-action"
+#: ../app/actions/brushes-actions.c:65
 msgid "Copy Brush _Location"
 msgstr "�����置(_L)"
 
-#: ../app/actions/brushes-actions.c:65
-msgctxt "brushes-action"
+#: ../app/actions/brushes-actions.c:66
 msgid "Copy brush file location to clipboard"
 msgstr "å°?ç?»ç¬?æ??件ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/brushes-actions.c:70
-msgctxt "brushes-action"
+#: ../app/actions/brushes-actions.c:71
 msgid "_Delete Brush"
 msgstr "����(_D)"
 
-#: ../app/actions/brushes-actions.c:71
-msgctxt "brushes-action"
-msgid "Delete this brush"
-msgstr "��此��"
+#: ../app/actions/brushes-actions.c:72
+msgid "Delete brush"
+msgstr "����"
 
-#: ../app/actions/brushes-actions.c:76
-msgctxt "brushes-action"
+#: ../app/actions/brushes-actions.c:77
 msgid "_Refresh Brushes"
 msgstr "����(_R)"
 
-#: ../app/actions/brushes-actions.c:77
-msgctxt "brushes-action"
+#: ../app/actions/brushes-actions.c:78
 msgid "Refresh brushes"
 msgstr "����"
 
-#: ../app/actions/brushes-actions.c:85
-msgctxt "brushes-action"
+#: ../app/actions/brushes-actions.c:86
 msgid "_Edit Brush..."
 msgstr "����(_E)..."
 
-#: ../app/actions/brushes-actions.c:86
-msgctxt "brushes-action"
-msgid "Edit this brush"
-msgstr "��此��"
+#: ../app/actions/brushes-actions.c:87
+msgid "Edit brush"
+msgstr "����"
 
-#: ../app/actions/buffers-actions.c:41
-msgctxt "buffers-action"
+#: ../app/actions/buffers-actions.c:42
 msgid "Buffers Menu"
 msgstr "ç¼?å?²å?ºè??å??"
 
-#: ../app/actions/buffers-actions.c:45
-msgctxt "buffers-action"
+#: ../app/actions/buffers-actions.c:46
 msgid "_Paste Buffer"
 msgstr "�贴���(_P)"
 
-#: ../app/actions/buffers-actions.c:46
-msgctxt "buffers-action"
+#: ../app/actions/buffers-actions.c:47
 msgid "Paste the selected buffer"
 msgstr "ç²?è´´é??中ç??ç¼?å?²å?º"
 
-#: ../app/actions/buffers-actions.c:51
-msgctxt "buffers-action"
+#: ../app/actions/buffers-actions.c:52
 msgid "Paste Buffer _Into"
 msgstr "�贴�����(_I)"
 
-#: ../app/actions/buffers-actions.c:52
-msgctxt "buffers-action"
+#: ../app/actions/buffers-actions.c:53
 msgid "Paste the selected buffer into the selection"
 msgstr "å°?é??中ç??ç¼?å?²å?ºç²?è´´å?°é??å?ºä¸­"
 
-#: ../app/actions/buffers-actions.c:57
-msgctxt "buffers-action"
+#: ../app/actions/buffers-actions.c:58
 msgid "Paste Buffer as _New"
 msgstr "ç²?è´´ç¼?å?²å?ºä¸ºæ?°å?¾å??(_N)"
 
-#: ../app/actions/buffers-actions.c:58
-msgctxt "buffers-action"
-msgid "Paste the selected buffer as a new image"
+#: ../app/actions/buffers-actions.c:59
+msgid "Paste the selected buffer as new image"
 msgstr "å°?é??中ç??ç¼?å?²å?ºç²?贴为æ?°å?¾å??"
 
-#: ../app/actions/buffers-actions.c:63
-msgctxt "buffers-action"
+#: ../app/actions/buffers-actions.c:64
 msgid "_Delete Buffer"
 msgstr "�����(_D)"
 
-#: ../app/actions/buffers-actions.c:64
-msgctxt "buffers-action"
+#: ../app/actions/buffers-actions.c:65
 msgid "Delete the selected buffer"
 msgstr "å? é?¤é??中ç??ç¼?å?²å?º"
 
 #: ../app/actions/channels-actions.c:44
-msgctxt "channels-action"
 msgid "Channels Menu"
 msgstr "é??é??è??å??"
 
 #: ../app/actions/channels-actions.c:48
-msgctxt "channels-action"
 msgid "_Edit Channel Attributes..."
 msgstr "ç¼?è¾?é??é??å±?æ?§(_E)..."
 
 #: ../app/actions/channels-actions.c:49
-msgctxt "channels-action"
 msgid "Edit the channel's name, color and opacity"
 msgstr "ç¼?è¾?é??é??å??称ã??é¢?è?²å??ä¸?é??æ??度"
 
 #: ../app/actions/channels-actions.c:54
-msgctxt "channels-action"
 msgid "_New Channel..."
 msgstr "æ?°å»ºé??é??(_N)..."
 
 #: ../app/actions/channels-actions.c:55
-msgctxt "channels-action"
 msgid "Create a new channel"
 msgstr "å??建æ?°é??é??"
 
 #: ../app/actions/channels-actions.c:60
-msgctxt "channels-action"
 msgid "_New Channel"
 msgstr "æ?°å»ºé??é??(_N)"
 
 #: ../app/actions/channels-actions.c:61
-msgctxt "channels-action"
 msgid "Create a new channel with last used values"
 msgstr "æ??ä¸?次使ç?¨ç??å?¼æ?°å»ºé??é??"
 
 #: ../app/actions/channels-actions.c:66
-msgctxt "channels-action"
 msgid "D_uplicate Channel"
 msgstr "å¤?å?¶é??é??(_U)"
 
-#: ../app/actions/channels-actions.c:68
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:67
 msgid "Create a duplicate of this channel and add it to the image"
 msgstr "å??建此é??é??ç??å¤?æ?¬å¹¶æ·»å? å?°å?¾å??"
 
-#: ../app/actions/channels-actions.c:73
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:72
 msgid "_Delete Channel"
 msgstr "å? é?¤é??é??(_D)"
 
-#: ../app/actions/channels-actions.c:74
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:73
 msgid "Delete this channel"
 msgstr "å? é?¤æ­¤é??é??"
 
-#: ../app/actions/channels-actions.c:79
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:78
 msgid "_Raise Channel"
-msgstr "å??é«?é??é??(_R)"
+msgstr "ä¸?移é??é??(_R)"
 
-#: ../app/actions/channels-actions.c:80
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:79
 msgid "Raise this channel one step in the channel stack"
-msgstr "å?¨é??é??æ ?中使此é??é??å??é«?ä¸?æ­¥"
+msgstr "å?¨é??é??æ ?中使此é??é??ä¸?移ä¸?ä½?"
 
-#: ../app/actions/channels-actions.c:85
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:84
 msgid "Raise Channel to _Top"
-msgstr "é??é??å??è?³é¡¶ç«¯(_T)"
+msgstr "é??é??ä¸?移è?³é¡¶ç«¯(_T)"
 
-#: ../app/actions/channels-actions.c:87
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:85
 msgid "Raise this channel to the top of the channel stack"
-msgstr "å??é«?æ­¤é??é??è?³é??é??æ ?ç??顶端"
+msgstr "ä¸?移此é??é??è?³é??é??æ ?ç??顶端"
 
-#: ../app/actions/channels-actions.c:92
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:90
 msgid "_Lower Channel"
-msgstr "é??ä½?é??é??(_L)"
+msgstr "ä¸?移é??é??(_L)"
 
-#: ../app/actions/channels-actions.c:93
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:91
 msgid "Lower this channel one step in the channel stack"
-msgstr "å?¨é??é??æ ?中使此é??é??é??ä½?ä¸?æ­¥"
+msgstr "å?¨é??é??æ ?中使此é??é??ä¸?移ä¸?ä½?"
 
-#: ../app/actions/channels-actions.c:98
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:96
 msgid "Lower Channel to _Bottom"
-msgstr "é??é??é??è?³åº?端(_B)"
+msgstr "é??é??ä¸?移è?³åº?端(_B)"
 
-#: ../app/actions/channels-actions.c:100
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:97
 msgid "Lower this channel to the bottom of the channel stack"
-msgstr "é??ä½?æ­¤é??é??è?³é??é??æ ?åº?端"
+msgstr "ä¸?移此é??é??è?³é??é??æ ?åº?端"
 
-#: ../app/actions/channels-actions.c:108
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:105
 msgid "Channel to Sele_ction"
 msgstr "é??é??å?°é??å?º(_C)"
 
-#: ../app/actions/channels-actions.c:109
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:106
 msgid "Replace the selection with this channel"
 msgstr "ç?¨æ­¤é??é??æ?¿æ?¢é??å?º"
 
-#: ../app/actions/channels-actions.c:114
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:111 ../app/actions/layers-actions.c:266
+#: ../app/actions/vectors-actions.c:173
 msgid "_Add to Selection"
 msgstr "æ·»å? å?°é??å?º(_A)"
 
-#: ../app/actions/channels-actions.c:115
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:112
 msgid "Add this channel to the current selection"
 msgstr "å°?æ­¤é??é??æ·»å? å?°å½?å??é??å?º"
 
-#: ../app/actions/channels-actions.c:120
-msgctxt "channels-action"
+#: ../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
 msgid "_Subtract from Selection"
 msgstr "ä»?é??å?ºä¸­å??å?»(_S)"
 
-#: ../app/actions/channels-actions.c:121
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:118
 msgid "Subtract this channel from the current selection"
 msgstr "ä»?å½?å??é??å?ºä¸­å??å?»æ­¤é??é??"
 
-#: ../app/actions/channels-actions.c:126
-msgctxt "channels-action"
+#: ../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
 msgid "_Intersect with Selection"
 msgstr "ä¸?é??å?ºç?¸äº¤(_I)"
 
-#: ../app/actions/channels-actions.c:127
-msgctxt "channels-action"
+#: ../app/actions/channels-actions.c:124
 msgid "Intersect this channel with the current selection"
 msgstr "å°?æ­¤é??é??ä¸?å½?å??é??å?ºç?¸äº¤"
 
 #: ../app/actions/channels-commands.c:85
-#: ../app/actions/channels-commands.c:402
+#: ../app/actions/channels-commands.c:393
 msgid "Channel Attributes"
 msgstr "é??é??å±?æ?§"
 
@@ -738,14 +655,11 @@ msgstr "ç¼?è¾?é??é??é¢?è?²"
 msgid "_Fill opacity:"
 msgstr "å¡«å??ä¸?é??æ??度(_F)ï¼?"
 
-#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:271
-#: ../app/widgets/gimpchanneltreeview.c:334
-msgid "Channel"
-msgstr "é??é??"
-
+#: ../app/actions/channels-commands.c:116
 #: ../app/actions/channels-commands.c:117
 #: ../app/actions/channels-commands.c:159
-#: ../app/widgets/gimpchanneltreeview.c:329
+#: ../app/actions/channels-commands.c:163
+#: ../app/widgets/gimpchanneltreeview.c:316
 msgid "New Channel"
 msgstr "æ?°å»ºé??é??"
 
@@ -757,46 +671,46 @@ msgstr "æ?°å»ºé??é??é??项"
 msgid "New Channel Color"
 msgstr "æ?°å»ºé??é??é¢?è?²"
 
-#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:252
-#: ../app/display/gimpdisplayshell-dnd.c:599
-#: ../app/widgets/gimpchanneltreeview.c:261
-#: ../app/widgets/gimplayertreeview.c:785
+#: ../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
 #, 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
+msgid "Channel to Selection"
+msgstr "é??é??å?°é??å?º"
+
 #: ../app/actions/colormap-actions.c:44
-msgctxt "colormap-action"
 msgid "Colormap Menu"
 msgstr "é¢?è?²è¡¨è??å??"
 
 #: ../app/actions/colormap-actions.c:48
-msgctxt "colormap-action"
+#: ../app/actions/palette-editor-actions.c:48
 msgid "_Edit Color..."
 msgstr "����(_E)..."
 
 #: ../app/actions/colormap-actions.c:49
-msgctxt "colormap-action"
-msgid "Edit this color"
-msgstr "��此��"
+#: ../app/actions/palette-editor-actions.c:49
+msgid "Edit 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 "æ·»å? å½?å??è??æ?¯è?²"
 
@@ -809,159 +723,121 @@ msgstr "����表项 #%d"
 msgid "Edit Colormap Entry"
 msgstr "����表项"
 
-#: ../app/actions/config-actions.c:38
-msgctxt "config-action"
+#: ../app/actions/config-actions.c:39
 msgid "Use _GEGL"
 msgstr "使� _GEGL"
 
-#: ../app/actions/config-actions.c:39
-msgctxt "config-action"
+#: ../app/actions/config-actions.c:40
 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:48
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:47 ../app/actions/image-actions.c:59
 msgid "_Colors"
 msgstr "��(_C)"
 
-#: ../app/actions/context-actions.c:50
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:48 ../app/actions/layers-actions.c:58
 msgid "_Opacity"
 msgstr "ä¸?é??æ??度(_O)"
 
-#: ../app/actions/context-actions.c:52
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:49
 msgid "Paint _Mode"
 msgstr "��模�(_M)"
 
-#: ../app/actions/context-actions.c:54
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:50
 msgid "_Tool"
 msgstr "工�(_T)"
 
-#: ../app/actions/context-actions.c:56
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:51
+#: ../app/dialogs/preferences-dialog.c:1940
 msgid "_Brush"
 msgstr "��(_B)"
 
-#: ../app/actions/context-actions.c:58
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:52 ../app/actions/plug-in-actions.c:99
+#: ../app/dialogs/preferences-dialog.c:1943
 msgid "_Pattern"
 msgstr "��(_P)"
 
-#: ../app/actions/context-actions.c:60
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:53
 msgid "_Palette"
 msgstr "��(_P)"
 
-#: ../app/actions/context-actions.c:62
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:54
+#: ../app/dialogs/palette-import-dialog.c:216
+#: ../app/dialogs/preferences-dialog.c:1946
 msgid "_Gradient"
 msgstr "æ¸?å??(_G)"
 
-#: ../app/actions/context-actions.c:64
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:55
 msgid "_Font"
 msgstr "å­?ä½?(_F)"
 
-#: ../app/actions/context-actions.c:67
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:57
 msgid "_Shape"
 msgstr "形�(_S)"
 
-#: ../app/actions/context-actions.c:69
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:58
 msgid "_Radius"
 msgstr "å??å¾?(_R)"
 
-#: ../app/actions/context-actions.c:71
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:59
 msgid "S_pikes"
 msgstr "ç©?æ?°(_P)"
 
-#: ../app/actions/context-actions.c:73
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:60
 msgid "_Hardness"
 msgstr "硬度(_H)"
 
-#: ../app/actions/context-actions.c:75
-msgctxt "context-action"
-msgid "_Aspect Ratio"
+#: ../app/actions/context-actions.c:61
+msgid "_Aspect"
 msgstr "宽��(_A)"
 
-#: ../app/actions/context-actions.c:77
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:62
 msgid "A_ngle"
 msgstr "�度(_N)"
 
-#: ../app/actions/context-actions.c:80
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:65
 msgid "_Default Colors"
 msgstr "�认��(_D)"
 
-#: ../app/actions/context-actions.c:82
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:66
 msgid "Set foreground color to black, background color to white"
 msgstr "å°?å??æ?¯è®¾å®?为é»?è?²ï¼?è??æ?¯è®¾å®?为ç?½è?²"
 
-#: ../app/actions/context-actions.c:87
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:71
 msgid "S_wap Colors"
 msgstr "交���(_W)"
 
-#: ../app/actions/context-actions.c:88
-msgctxt "context-action"
+#: ../app/actions/context-actions.c:72
 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:552
-#, c-format
-msgid "Brush Shape: %s"
-msgstr "��形��%s"
-
-#: ../app/actions/context-commands.c:612
-#, c-format
-msgid "Brush Radius: %2.2f"
-msgstr "ç?»ç¬?å??å¾?ï¼?%2.2f"
-
-#: ../app/actions/context-commands.c:720
-#, 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
-msgctxt "cursor-info-action"
+#: ../app/actions/sample-points-actions.c:47
+#: ../app/widgets/gimpcursorview.c:192
 msgid "_Sample Merged"
 msgstr "ä½?æ ·å??并(_S)"
 
 #: ../app/actions/cursor-info-actions.c:48
-msgctxt "cursor-info-action"
-msgid "Use the composite color of all visible layers"
-msgstr "使ç?¨æ??æ??å?¯è§?å?¾å±?ç??æ··å??é¢?è?²"
+#: ../app/actions/sample-points-actions.c:48
+msgid "Sample Merged"
+msgstr "ä½?æ ·å??并(_M)"
 
-#: ../app/actions/data-commands.c:104 ../app/actions/documents-commands.c:343
-#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:233
-#: ../app/dialogs/file-open-dialog.c:278
+#: ../app/actions/data-commands.c:107 ../app/actions/documents-commands.c:344
+#: ../app/actions/file-commands.c:184 ../app/dialogs/file-open-dialog.c:229
+#: ../app/dialogs/file-open-dialog.c:273
 #: ../app/dialogs/file-open-location-dialog.c:213
 #: ../app/dialogs/file-open-location-dialog.c:225
-#: ../app/display/gimpdisplayshell-dnd.c:552
-#: ../app/widgets/gimplayertreeview.c:745 ../app/widgets/gimptoolbox-dnd.c:178
-#: ../app/widgets/gimptoolbox.c:1222
+#: ../app/display/gimpdisplayshell-dnd.c:537
+#: ../app/widgets/gimplayertreeview.c:730 ../app/widgets/gimptoolbox-dnd.c:158
+#: ../app/widgets/gimptoolbox.c:981
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -973,1247 +849,1004 @@ msgstr ""
 "%s"
 
 #: ../app/actions/data-commands.c:133
-#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1624
-#: ../app/core/gimppalette-import.c:210 ../app/core/gimppalette-load.c:223
-#: ../app/core/gimppalette.c:379 ../app/dialogs/palette-import-dialog.c:771
-#: ../app/widgets/gimpdnd-xds.c:94
+#: ../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
 msgid "Untitled"
 msgstr "���"
 
-#: ../app/actions/data-commands.c:238
+#: ../app/actions/data-commands.c:231
 msgid "Delete Object"
 msgstr "��对象"
 
-#: ../app/actions/data-commands.c:261
+#: ../app/actions/data-commands.c:254
 #, c-format
 msgid "Delete '%s'?"
-msgstr "å? é?¤â??%sâ??ï¼?"
+msgstr "å? é?¤â??%sâ??å??ï¼?"
 
-#: ../app/actions/data-commands.c:264
+#: ../app/actions/data-commands.c:257
 #, 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:44
-msgctxt "windows-action"
-msgid "Tool_box"
-msgstr "工�箱(_B)"
-
-#: ../app/actions/dialogs-actions.c:50
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:39
 msgid "Tool _Options"
 msgstr "å·¥å?·é??项(_O)"
 
-#: ../app/actions/dialogs-actions.c:51
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:40
 msgid "Open the tool options dialog"
 msgstr "æ??å¼?å·¥å?·é??项对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:56
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:45
 msgid "_Device Status"
 msgstr "设å¤?ç?¶æ??(_D)"
 
-#: ../app/actions/dialogs-actions.c:57
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:46
 msgid "Open the device status dialog"
 msgstr "æ??å¼?设å¤?ç?¶æ??对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:62
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:51
 msgid "_Layers"
 msgstr "��(_L)"
 
-#: ../app/actions/dialogs-actions.c:63
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:52
 msgid "Open the layers dialog"
 msgstr "æ??å¼?å?¾å±?对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:68
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:57
 msgid "_Channels"
 msgstr "é??é??(_C)"
 
-#: ../app/actions/dialogs-actions.c:69
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:58
 msgid "Open the channels dialog"
 msgstr "æ??å¼?é??é??对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:74
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:63
 msgid "_Paths"
 msgstr "路�(_P)"
 
-#: ../app/actions/dialogs-actions.c:75
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:64
 msgid "Open the paths dialog"
 msgstr "æ??å¼?è·¯å¾?对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:80
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:69
 msgid "Color_map"
 msgstr "��表(_M)"
 
-#: ../app/actions/dialogs-actions.c:81
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:70
 msgid "Open the colormap dialog"
 msgstr "æ??å¼?é¢?è?²è¡¨å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:86
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:75
 msgid "Histogra_m"
 msgstr "���(_M)"
 
-#: ../app/actions/dialogs-actions.c:87
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:76
 msgid "Open the histogram dialog"
 msgstr "æ??å¼?ç?´æ?¹å?¾å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:92
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:81
 msgid "_Selection Editor"
 msgstr "é??å?ºç¼?è¾?å?¨(_S)"
 
-#: ../app/actions/dialogs-actions.c:93
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:82
 msgid "Open the selection editor"
 msgstr "æ??å¼?é??æ?©ç¼?è¾?å?¨"
 
-#: ../app/actions/dialogs-actions.c:98
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:87
 msgid "Na_vigation"
 msgstr "导�(_V)"
 
-#: ../app/actions/dialogs-actions.c:99
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:88
 msgid "Open the display navigation dialog"
 msgstr "æ??å¼?æ?¾ç¤ºå¯¼è?ªå¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:104
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:93
 msgid "Undo _History"
 msgstr "æ?¤æ¶?å??å?²(_H)"
 
-#: ../app/actions/dialogs-actions.c:105
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:94
 msgid "Open the undo history dialog"
 msgstr "æ??å¼?æ?¤æ¶?å??å?²å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:110
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:99 ../app/dialogs/dialogs.c:150
 msgid "Pointer"
 msgstr "æ??é??"
 
-#: ../app/actions/dialogs-actions.c:111
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:100
 msgid "Open the pointer information dialog"
 msgstr "æ??å¼?æ??é??ä¿¡æ?¯å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:116
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:105
 msgid "_Sample Points"
 msgstr "é??æ ·ç?¹(_S)"
 
-#: ../app/actions/dialogs-actions.c:117
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:106
 msgid "Open the sample points dialog"
 msgstr "æ??å¼?é??æ ·ç?¹å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:122
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:111
 msgid "Colo_rs"
 msgstr "��(_R)"
 
-#: ../app/actions/dialogs-actions.c:123
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:112
 msgid "Open the FG/BG color dialog"
 msgstr "æ??å¼?å??æ?¯/è??æ?¯è?²å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:128
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:117
 msgid "_Brushes"
 msgstr "��(_B)"
 
-#: ../app/actions/dialogs-actions.c:129
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:118
 msgid "Open the brushes dialog"
 msgstr "æ??å¼?ç?»ç¬?对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:134
-msgctxt "dialogs-action"
-msgid "Brush Editor"
-msgstr "�����"
-
-#: ../app/actions/dialogs-actions.c:135
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:124
 msgid "Open the brush editor"
 msgstr "æ??å¼?ç?»ç¬?ç¼?è¾?å?¨"
 
-#: ../app/actions/dialogs-actions.c:140
-msgctxt "dialogs-action"
-msgid "Paint Dynamics"
-msgstr "å?¨æ??ç»?å?¾"
-
-#: ../app/actions/dialogs-actions.c:141
-msgctxt "dialogs-action"
-msgid "Open paint dynamics dialog"
-msgstr "æ??å¼?å?¨æ??ç»?å?¾å¯¹è¯?æ¡?"
-
-#: ../app/actions/dialogs-actions.c:146
-msgctxt "dialogs-action"
-msgid "Paint Dynamics Editor"
-msgstr "å?¨æ??ç»?å?¾ç¼?è¾?å?¨"
-
-#: ../app/actions/dialogs-actions.c:147
-msgctxt "dialogs-action"
-msgid "Open the paint dynamics editor"
-msgstr "æ??å¼?å?¨æ??ç»?å?¾ç¼?è¾?å?¨"
-
-#: ../app/actions/dialogs-actions.c:152
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:129
 msgid "P_atterns"
 msgstr "��(_A)"
 
-#: ../app/actions/dialogs-actions.c:153
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:130
 msgid "Open the patterns dialog"
 msgstr "æ??å¼?å?¾æ¡?对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:158
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:135
 msgid "_Gradients"
 msgstr "æ¸?å??(_G)"
 
-#: ../app/actions/dialogs-actions.c:159
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:136
 msgid "Open the gradients dialog"
 msgstr "æ??å¼?æ¸?å??对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:164
-msgctxt "dialogs-action"
-msgid "Gradient Editor"
-msgstr "æ¸?å??ç¼?è¾?å?¨"
-
-#: ../app/actions/dialogs-actions.c:165
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:142
 msgid "Open the gradient editor"
 msgstr "æ??å¼?æ¸?å??ç¼?è¾?å?¨"
 
-#: ../app/actions/dialogs-actions.c:170
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:147
 msgid "Pal_ettes"
 msgstr "��(_E)"
 
-#: ../app/actions/dialogs-actions.c:171
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:148
 msgid "Open the palettes dialog"
 msgstr "æ??å¼?è?²æ?¿å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:176
-msgctxt "dialogs-action"
-msgid "Palette Editor"
-msgstr "�����"
-
-#: ../app/actions/dialogs-actions.c:177
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:154
 msgid "Open the palette editor"
 msgstr "æ??å¼?è?²æ?¿ç¼?è¾?å?¨"
 
-#: ../app/actions/dialogs-actions.c:182
-msgctxt "dialogs-action"
-msgid "Tool presets"
-msgstr "工��设�"
-
-#: ../app/actions/dialogs-actions.c:183
-msgctxt "dialogs-action"
-msgid "Open tool presets dialog"
-msgstr "æ??å¼?å·¥å?·é¢?设å?¼å¯¹è¯?æ¡?"
-
-#: ../app/actions/dialogs-actions.c:188
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:159
 msgid "_Fonts"
 msgstr "å­?ä½?(_F)"
 
-#: ../app/actions/dialogs-actions.c:189
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:160
 msgid "Open the fonts dialog"
 msgstr "æ??å¼?å­?ä½?对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:194
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:165
 msgid "B_uffers"
 msgstr "���(_U)"
 
-#: ../app/actions/dialogs-actions.c:195
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:166
 msgid "Open the named buffers dialog"
 msgstr "æ??å¼?å?½å??ç¼?å?²å?ºå¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:200
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:171
 msgid "_Images"
 msgstr "å?¾å??(_I)"
 
-#: ../app/actions/dialogs-actions.c:201
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:172
 msgid "Open the images dialog"
 msgstr "æ??å¼?å?¾å??对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:206
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:177
 msgid "Document Histor_y"
 msgstr "æ??æ¡£å??å?²(_Y)"
 
-#: ../app/actions/dialogs-actions.c:207
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:178
 msgid "Open the document history dialog"
 msgstr "æ??å¼?æ??æ¡£å??å?²å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:212
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:183
 msgid "_Templates"
 msgstr "模�(_T)"
 
-#: ../app/actions/dialogs-actions.c:213
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:184
 msgid "Open the image templates dialog"
 msgstr "æ??å¼?å?¾å??模ç??对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:218
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:189
+msgid "T_ools"
+msgstr "工�(_O)"
+
+#: ../app/actions/dialogs-actions.c:190
+msgid "Open the tools dialog"
+msgstr "æ??å¼?å·¥å?·å¯¹è¯?æ¡?"
+
+#: ../app/actions/dialogs-actions.c:195
 msgid "Error Co_nsole"
 msgstr "é??误æ?§å?¶å?°(_N)"
 
-#: ../app/actions/dialogs-actions.c:219
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:196
 msgid "Open the error console"
 msgstr "æ??å¼?é??误æ?§å?¶å?°"
 
-#: ../app/actions/dialogs-actions.c:229
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:206
 msgid "_Preferences"
 msgstr "é¦?é??项(_P)"
 
-#: ../app/actions/dialogs-actions.c:230
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:207
 msgid "Open the preferences dialog"
 msgstr "æ??å¼?é¦?é??项对è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:235
-msgctxt "dialogs-action"
-msgid "_Input Devices"
-msgstr "��设�(_I)"
-
-#: ../app/actions/dialogs-actions.c:236
-msgctxt "dialogs-action"
-msgid "Open the input devices editor"
-msgstr "æ??å¼?è¾?å?¥è®¾å¤?ç¼?è¾?å?¨"
-
-#: ../app/actions/dialogs-actions.c:241
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:212
 msgid "_Keyboard Shortcuts"
 msgstr "å¿«æ?·é?®(_K)"
 
-#: ../app/actions/dialogs-actions.c:242
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:213
 msgid "Open the keyboard shortcuts editor"
 msgstr "æ??å¼?å¿«æ?·é?®ç¼?è¾?å?¨"
 
-#: ../app/actions/dialogs-actions.c:247
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:218
 msgid "_Modules"
 msgstr "模å??(_M)"
 
-#: ../app/actions/dialogs-actions.c:248
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:219
 msgid "Open the module manager dialog"
 msgstr "æ??å¼?模å??管ç??å?¨å¯¹è¯?æ¡?"
 
-#: ../app/actions/dialogs-actions.c:253
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:224
 msgid "_Tip of the Day"
 msgstr "æ?¥ç§¯æ??ç´¯(_T)"
 
-#: ../app/actions/dialogs-actions.c:254
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:225
 msgid "Show some helpful tips on using GIMP"
-msgstr "æ?¾ç¤ºä¸?äº?å?³äº? GIMP ç??å°?贴士"
+msgstr "æ?¾ç¤ºä¸?äº?å?³äº? GIMP ç??å°?æ??å·§"
 
-#: ../app/actions/dialogs-actions.c:259
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:230
 msgid "_About"
 msgstr "��(_A)"
 
-#: ../app/actions/dialogs-actions.c:260
-msgctxt "dialogs-action"
+#: ../app/actions/dialogs-actions.c:231 ../app/dialogs/about-dialog.c:114
+#: ../app/gui/gui.c:479
 msgid "About GIMP"
 msgstr "�� GIMP"
 
-#: ../app/actions/dialogs-actions.c:304
-#: ../app/dialogs/preferences-dialog.c:1943 ../app/widgets/gimptoolbox.c:770
-msgid "Toolbox"
-msgstr "工�箱"
-
-#: ../app/actions/dialogs-actions.c:305
-msgid "Raise the toolbox"
-msgstr "æ??å??å·¥å?·ç®±"
-
-#: ../app/actions/dialogs-actions.c:309
-msgid "New Toolbox"
-msgstr "�建工�箱"
-
-#: ../app/actions/dialogs-actions.c:310
-msgid "Create a new toolbox"
-msgstr "å??建æ?°å·¥å?·ç®±"
-
-#: ../app/actions/dock-actions.c:45
-msgctxt "dock-action"
+#: ../app/actions/dock-actions.c:43
 msgid "M_ove to Screen"
 msgstr "移����(_O)"
 
-#: ../app/actions/dock-actions.c:49
-msgctxt "dock-action"
+#: ../app/actions/dock-actions.c:47
 msgid "Close Dock"
 msgstr "å?³é?­å??é? "
 
-#: ../app/actions/dock-actions.c:54
-msgctxt "dock-action"
+#: ../app/actions/dock-actions.c:52 ../app/actions/view-actions.c:123
 msgid "_Open Display..."
 msgstr "æ??å¼?æ?¾ç¤º(_O)..."
 
-#: ../app/actions/dock-actions.c:55
-msgctxt "dock-action"
+#: ../app/actions/dock-actions.c:53 ../app/actions/view-actions.c:124
 msgid "Connect to another display"
 msgstr "�����个�示"
 
-#: ../app/actions/dock-actions.c:63
-msgctxt "dock-action"
+#: ../app/actions/dock-actions.c:61
 msgid "_Show Image Selection"
 msgstr "æ?¾ç¤ºå?¾å??é??å?º(_S)"
 
-#: ../app/actions/dock-actions.c:69
-msgctxt "dock-action"
+#: ../app/actions/dock-actions.c:67
 msgid "Auto _Follow Active Image"
 msgstr "è?ªå?¨è·?é??æ´»å?¨å?¾å??(_F)"
 
-#: ../app/actions/dockable-actions.c:48
-msgctxt "dockable-action"
+#: ../app/actions/dockable-actions.c:49
 msgid "Dialogs Menu"
 msgstr "对è¯?æ¡?è??å??"
 
 #: ../app/actions/dockable-actions.c:53
-msgctxt "dockable-action"
 msgid "_Add Tab"
-msgstr "添�页签(_A)"
+msgstr "添��签(_A)"
 
-#: ../app/actions/dockable-actions.c:55
-msgctxt "dockable-action"
+#: ../app/actions/dockable-actions.c:54
 msgid "_Preview Size"
 msgstr "��大�(_P)"
 
-#: ../app/actions/dockable-actions.c:57
-msgctxt "dockable-action"
+#: ../app/actions/dockable-actions.c:55
 msgid "_Tab Style"
-msgstr "页签�格(_T)"
+msgstr "�签�格(_T)"
 
-#: ../app/actions/dockable-actions.c:60
-msgctxt "dockable-action"
+#
+#: ../app/actions/dockable-actions.c:58
 msgid "_Close Tab"
-msgstr "��页签(_C)"
+msgstr "���签(_C)"
 
-#: ../app/actions/dockable-actions.c:65
-msgctxt "dockable-action"
+#
+#: ../app/actions/dockable-actions.c:63
 msgid "_Detach Tab"
-msgstr "�移页签(_D)"
+msgstr "�移�签(_D)"
 
-#: ../app/actions/dockable-actions.c:84
-msgctxt "preview-size"
+#
+#: ../app/actions/dockable-actions.c:81
 msgid "_Tiny"
-msgstr "ç»?å°?(_T)"
+msgstr "å°?(_T)"
 
-#: ../app/actions/dockable-actions.c:86
-msgctxt "preview-size"
+#
+#: ../app/actions/dockable-actions.c:82
 msgid "E_xtra Small"
-msgstr "å? å°?(_X)"
+msgstr "æ?´å°?(_X)"
 
-#: ../app/actions/dockable-actions.c:88
-msgctxt "preview-size"
+#
+#: ../app/actions/dockable-actions.c:83
 msgid "_Small"
 msgstr "å°?(_S)"
 
-#: ../app/actions/dockable-actions.c:90
-msgctxt "preview-size"
+#
+#: ../app/actions/dockable-actions.c:84
 msgid "_Medium"
 msgstr "中(_M)"
 
-#: ../app/actions/dockable-actions.c:92
-msgctxt "preview-size"
+#
+#: ../app/actions/dockable-actions.c:85
 msgid "_Large"
 msgstr "大(_L)"
 
-#: ../app/actions/dockable-actions.c:94
-msgctxt "preview-size"
+#
+#: ../app/actions/dockable-actions.c:86
 msgid "Ex_tra Large"
 msgstr "�大(_T)"
 
-#: ../app/actions/dockable-actions.c:96
-msgctxt "preview-size"
+#
+#: ../app/actions/dockable-actions.c:87
 msgid "_Huge"
 msgstr "�大(_H)"
 
-#: ../app/actions/dockable-actions.c:98
-msgctxt "preview-size"
+#
+#: ../app/actions/dockable-actions.c:88
 msgid "_Enormous"
 msgstr "巨大(_E)"
 
-#: ../app/actions/dockable-actions.c:100
-msgctxt "preview-size"
+#
+#: ../app/actions/dockable-actions.c:89
 msgid "_Gigantic"
 msgstr "æ??大(_G)"
 
-#: ../app/actions/dockable-actions.c:106
-msgctxt "tab-style"
+#
+#: ../app/actions/dockable-actions.c:94
 msgid "_Icon"
 msgstr "��(_I)"
 
-#: ../app/actions/dockable-actions.c:108
-msgctxt "tab-style"
+#
+#: ../app/actions/dockable-actions.c:95
 msgid "Current _Status"
 msgstr "å½?å??ç?¶æ??(_S)"
 
-#: ../app/actions/dockable-actions.c:110
-msgctxt "tab-style"
+#
+#: ../app/actions/dockable-actions.c:96
 msgid "_Text"
-msgstr "æ??å­?(_T)"
+msgstr "æ??æ?¬(_T)"
 
-#: ../app/actions/dockable-actions.c:112
-msgctxt "tab-style"
+#
+#: ../app/actions/dockable-actions.c:97
 msgid "I_con & Text"
-msgstr "å?¾æ ?å??æ??å­?(_C)"
+msgstr "å?¾æ ?å??æ??æ?¬(_C)"
 
-#: ../app/actions/dockable-actions.c:114
-msgctxt "tab-style"
+#
+#: ../app/actions/dockable-actions.c:98
 msgid "St_atus & Text"
 msgstr "ç?¶æ??å??æ??å­?(_A)"
 
-#: ../app/actions/dockable-actions.c:116 ../app/widgets/widgets-enums.c:224
-#, fuzzy
-msgctxt "tab-style"
-msgid "Automatic"
-msgstr "��"
-
-#: ../app/actions/dockable-actions.c:126
-msgctxt "dockable-action"
+#
+#: ../app/actions/dockable-actions.c:108
 msgid "Loc_k Tab to Dock"
-msgstr "å°?页签é??å®?å?°å??é? (_k)"
+msgstr "å°?æ ?ç­¾é??å®?å?°å??é? (_k)"
 
-#: ../app/actions/dockable-actions.c:128
-msgctxt "dockable-action"
+#
+#: ../app/actions/dockable-actions.c:109
 msgid "Protect this tab from being dragged with the mouse pointer"
-msgstr "ä¿?æ?¤æ­¤é¡µç­¾ä¸?被鼠æ ?æ??é??æ??æ?½"
+msgstr "ä¿?æ?¤æ­¤æ ?ç­¾ä¸?被鼠æ ?æ??é??æ??æ?½"
 
-#: ../app/actions/dockable-actions.c:134
-msgctxt "dockable-action"
+#
+#: ../app/actions/dockable-actions.c:115
 msgid "Show _Button Bar"
 msgstr "æ?¾ç¤ºæ??é?®æ ?(_B)"
 
-#: ../app/actions/dockable-actions.c:143
-msgctxt "dockable-action"
+#
+#: ../app/actions/dockable-actions.c:124
 msgid "View as _List"
 msgstr "以å??表æ?¹å¼?æ?¥ç??(_L)"
 
-#: ../app/actions/dockable-actions.c:148
-msgctxt "dockable-action"
+#
+#: ../app/actions/dockable-actions.c:129
 msgid "View as _Grid"
 msgstr "以é?µå??æ?¹å¼?æ?¥ç??(_G)"
 
-#: ../app/actions/documents-actions.c:41
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:42
 msgid "Documents Menu"
 msgstr "æ??æ¡£è??å??"
 
-#: ../app/actions/documents-actions.c:45
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:46
 msgid "_Open Image"
 msgstr "æ??å¼?å?¾å??(_O)"
 
-#: ../app/actions/documents-actions.c:46
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:47
 msgid "Open the selected entry"
 msgstr "æ??å¼?é??中ç??项"
 
-#: ../app/actions/documents-actions.c:51
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:52
 msgid "_Raise or Open Image"
 msgstr "å??é«?æ??æ??å¼?å?¾å??(_R)"
 
-#: ../app/actions/documents-actions.c:52
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:53
 msgid "Raise window if already open"
 msgstr "å¦?æ??å·²æ??å¼?å??å??é«?çª?å?£"
 
-#: ../app/actions/documents-actions.c:57
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:58
 msgid "File Open _Dialog"
 msgstr "æ??件æ??å¼?对è¯?æ¡?(_D)"
 
-#: ../app/actions/documents-actions.c:58
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:59
 msgid "Open image dialog"
 msgstr "æ??å¼?å?¾å??对è¯?æ¡?"
 
-#: ../app/actions/documents-actions.c:63
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:64
 msgid "Copy Image _Location"
 msgstr "å¤?å?¶å?¾å??ä½?ç½®(_L)"
 
-#: ../app/actions/documents-actions.c:64
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:65
 msgid "Copy image location to clipboard"
 msgstr "å°?å?¾å??ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/documents-actions.c:69
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:70
 msgid "Remove _Entry"
 msgstr "��项�(_E)"
 
-#: ../app/actions/documents-actions.c:70
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:71
 msgid "Remove the selected entry"
 msgstr "å? é?¤é??中ç??项"
 
-#: ../app/actions/documents-actions.c:75
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:76
 msgid "_Clear History"
 msgstr "æ¸?é?¤å??å?²(_C)"
 
-#: ../app/actions/documents-actions.c:76
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:77
 msgid "Clear the entire document history"
 msgstr "æ¸?é?¤æ?´ä¸ªæ??æ¡£å??å?²"
 
-#: ../app/actions/documents-actions.c:81
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:82
 msgid "Recreate _Preview"
 msgstr "é??æ?°ç??æ??é¢?è§?(_P)"
 
-#: ../app/actions/documents-actions.c:82
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:83
 msgid "Recreate preview"
 msgstr "é??æ?°ç??æ??é¢?è§?"
 
-#: ../app/actions/documents-actions.c:87
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:88
 msgid "Reload _all Previews"
 msgstr "é??æ?°å? è½½æ??æ??é¢?è§?(_A)"
 
-#: ../app/actions/documents-actions.c:88
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:89
 msgid "Reload all previews"
 msgstr "é??æ?°å? è½½æ??æ??é¢?è§?"
 
-#: ../app/actions/documents-actions.c:93
-msgctxt "documents-action"
+#
+#: ../app/actions/documents-actions.c:94
 msgid "Remove Dangling E_ntries"
 msgstr "å? é?¤å·²ä¸?å­?å?¨ç??项ç?®(_N)"
 
+#
 #: ../app/actions/documents-actions.c:95
-msgctxt "documents-action"
-msgid "Remove entries for which the corresponding file is not available"
-msgstr "å°?ä¸?å?¯ç?¨ç??æ??件ç??ç?¸å?³é¡¹ç§»é?¤"
+msgid "Remove dangling entries"
+msgstr "å? é?¤å·²ä¸?å­?å?¨ç??项ç?®(_N)"
 
-#: ../app/actions/documents-commands.c:192
+#: ../app/actions/documents-commands.c:198
 msgid "Clear Document History"
 msgstr "æ¸?é?¤æ??æ¡£å??å?²"
 
-#: ../app/actions/documents-commands.c:215
+#: ../app/actions/documents-commands.c:221
 msgid "Clear the Recent Documents list?"
-msgstr "æ¸?é?¤æ??æ¡£å??å?²ï¼?"
+msgstr "æ¸?é?¤æ??æ¡£å??å?²å??ï¼?"
 
-#: ../app/actions/documents-commands.c:218
+#
+#: ../app/actions/documents-commands.c:224
 msgid ""
-"Clearing the document history will permanently remove all images from the "
-"recent documents list."
+"Clearing the document history will permanently remove all items from the "
+"recent documents list in all applications."
 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:65
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:64
 msgid "Shift the pixels, optionally wrapping them at the borders"
 msgstr "å??移å??ç´ ï¼?å?¯é??æ?©å?¨è¾¹ç??å¤?å??å?·å??ç´ "
 
-#: ../app/actions/drawable-actions.c:73
-msgctxt "drawable-action"
-msgid "_Visible"
-msgstr "��(_V)"
-
-#: ../app/actions/drawable-actions.c:74
-msgctxt "drawable-action"
-msgid "Toggle visibility"
-msgstr "å??æ?¢å?¯è§?æ?§"
-
-#: ../app/actions/drawable-actions.c:80
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:72 ../app/actions/vectors-actions.c:153
 msgid "_Linked"
 msgstr "��(_L)"
 
-#: ../app/actions/drawable-actions.c:81
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:73
 msgid "Toggle the linked state"
 msgstr "å??æ?¢é?¾æ?¥ç?¶æ??"
 
-#. GIMP_STOCK_LOCK
-#: ../app/actions/drawable-actions.c:87
-msgctxt "drawable-action"
-msgid "L_ock pixels"
-msgstr "é??å®?å??ç´ (_O)"
+#
+#: ../app/actions/drawable-actions.c:79 ../app/actions/vectors-actions.c:147
+msgid "_Visible"
+msgstr "��(_V)"
 
-#: ../app/actions/drawable-actions.c:89
-msgctxt "drawable-action"
-msgid "Keep the pixels on this drawable from being modified"
-msgstr "ä¿?æ??æ­¤å?¯ç»?å?¶å¯¹è±¡ä¸?ç??å??ç´ ä¸?被修æ?¹"
+#
+#: ../app/actions/drawable-actions.c:80
+msgid "Toggle visibility"
+msgstr "å??æ?¢å?¯è§?æ?§"
 
-#: ../app/actions/drawable-actions.c:98
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:89 ../app/actions/image-actions.c:159
 msgid "Flip _Horizontally"
 msgstr "水平翻转(_H)"
 
-#: ../app/actions/drawable-actions.c:99
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:90
 msgid "Flip horizontally"
 msgstr "水平翻转"
 
-#: ../app/actions/drawable-actions.c:104
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:95 ../app/actions/image-actions.c:165
 msgid "Flip _Vertically"
 msgstr "å??ç?´ç¿»è½¬(_V)"
 
-#: ../app/actions/drawable-actions.c:105
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:96
 msgid "Flip vertically"
 msgstr "å??ç?´ç¿»è½¬"
 
-#: ../app/actions/drawable-actions.c:113
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:104 ../app/actions/image-actions.c:174
 msgid "Rotate 90° _clockwise"
 msgstr "顺æ?¶é??æ??转 90 度(_C)"
 
-#: ../app/actions/drawable-actions.c:114
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:105
 msgid "Rotate 90 degrees to the right"
 msgstr "顺æ?¶é??æ??转 90 度"
 
-#: ../app/actions/drawable-actions.c:119
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:110 ../app/actions/image-actions.c:180
 msgid "Rotate _180°"
 msgstr "æ??转 180 度(_1)"
 
-#: ../app/actions/drawable-actions.c:120
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:111
 msgid "Turn upside-down"
 msgstr "ä¸?ä¸?颠å??"
 
-#: ../app/actions/drawable-actions.c:125
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:116 ../app/actions/image-actions.c:186
 msgid "Rotate 90° counter-clock_wise"
 msgstr "é??æ?¶é??æ??转 90 度(_W)"
 
-#: ../app/actions/drawable-actions.c:126
-msgctxt "drawable-action"
+#
+#: ../app/actions/drawable-actions.c:117
 msgid "Rotate 90 degrees to the left"
 msgstr "é??æ?¶é??æ??转 90 度"
 
-#: ../app/actions/drawable-commands.c:63
+#: ../app/actions/drawable-commands.c:62
 msgid "Equalize does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?è?²è°?å??å??æ??ä½?ã??"
 
-#: ../app/actions/drawable-commands.c:87
+#: ../app/actions/drawable-commands.c:85
 msgid "Invert does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?å??ç?¸æ??ä½?ã??"
 
-#: ../app/actions/drawable-commands.c:111
+#: ../app/actions/drawable-commands.c:108
 msgid "White Balance operates only on RGB color layers."
 msgstr "å?ªè?½å¯¹ RGB é¢?è?²ç??å?¾å±?è¿?è¡?ç?½å¹³è¡¡æ??ä½?ã??"
 
-#: ../app/actions/dynamics-actions.c:42
-msgctxt "dynamics-action"
-msgid "Paint Dynamics Menu"
-msgstr "å?¨æ??ç»?å?¾è??å??"
-
-#: ../app/actions/dynamics-actions.c:46
-msgctxt "dynamics-action"
-msgid "_New Dynamics"
-msgstr "æ?°å»ºå?¨æ??(_N)"
-
-#: ../app/actions/dynamics-actions.c:47
-msgctxt "dynamics-action"
-msgid "Create a new dynamics"
-msgstr "å??建æ?°å?¨æ??"
-
-#: ../app/actions/dynamics-actions.c:52
-msgctxt "dynamics-action"
-msgid "D_uplicate Dynamics"
-msgstr "å¤?å?¶å?¨æ??(_U)"
-
-#: ../app/actions/dynamics-actions.c:53
-msgctxt "dynamics-action"
-msgid "Duplicate this dynamics"
-msgstr "å¤?å?¶æ­¤å?¨æ??"
-
-#: ../app/actions/dynamics-actions.c:58
-msgctxt "dynamics-action"
-msgid "Copy Dynamics _Location"
-msgstr "å¤?å?¶å?¨æ??ä½?ç½®(_L)"
-
-#: ../app/actions/dynamics-actions.c:59
-msgctxt "dynamics-action"
-msgid "Copy dynamics file location to clipboard"
-msgstr "å°?å?¨æ??æ??件ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
-
-#: ../app/actions/dynamics-actions.c:64
-msgctxt "dynamics-action"
-msgid "_Delete Dynamics"
-msgstr "å? é?¤å?¨æ??"
-
-#: ../app/actions/dynamics-actions.c:65
-msgctxt "dynamics-action"
-msgid "Delete this dynamics"
-msgstr "å? é?¤æ­¤å?¨æ??"
-
-#: ../app/actions/dynamics-actions.c:70
-msgctxt "dynamics-action"
-msgid "_Refresh Dynamicss"
-msgstr "å?·æ?°å?¨æ??(_R)"
-
-#: ../app/actions/dynamics-actions.c:71
-msgctxt "dynamics-action"
-msgid "Refresh dynamics"
-msgstr "å?·æ?°å?¨æ??"
-
-#: ../app/actions/dynamics-actions.c:79
-msgctxt "dynamics-action"
-msgid "_Edit Dynamics..."
-msgstr "ç¼?è¾?å?¨æ??(_E)..."
-
-#: ../app/actions/dynamics-actions.c:80
-msgctxt "dynamics-action"
-msgid "Edit dynamics"
-msgstr "ç¼?è¾?å?¨æ??"
-
-#: ../app/actions/dynamics-editor-actions.c:42
-msgctxt "dynamics-editor-action"
-msgid "Paint Dynamics Editor Menu"
-msgstr "å?¨æ??ç»?å?¾ç¼?è¾?è??å??"
-
-#: ../app/actions/dynamics-editor-actions.c:50
-msgctxt "dynamics-editor-action"
-msgid "Edit Active Dynamics"
-msgstr "ç¼?è¾?æ´»å?¨å?¨æ??"
-
+#
 #: ../app/actions/edit-actions.c:63
-msgctxt "edit-action"
 msgid "_Edit"
 msgstr "ç¼?è¾?(_E)"
 
+#
 #: ../app/actions/edit-actions.c:64
-msgctxt "edit-action"
-msgid "Paste _as"
+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
-msgctxt "edit-action"
+#: ../app/actions/edit-actions.c:72 ../app/actions/edit-actions.c:313
 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
-msgctxt "edit-action"
+#: ../app/actions/edit-actions.c:78 ../app/actions/edit-actions.c:314
 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:92
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:91
 msgid "Redo the last operation that was undone, skipping visibility changes"
 msgstr "é??å??ä¸?次æ?¤æ¶?ç??æ??ä½?ï¼?ç?¥è¿?å?¯è§?ç?¶æ??ç??æ?¹å??"
 
-#: ../app/actions/edit-actions.c:97
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:96
 msgid "_Clear Undo History"
 msgstr "æ¸?é?¤æ?¤æ¶?å??å?²(_C)"
 
-#: ../app/actions/edit-actions.c:98
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:97
 msgid "Remove all operations from the undo history"
 msgstr "ä»?æ?¤æ¶?å??å?²ä¸­ç§»é?¤å?¨é?¨æ??ä½?"
 
-#: ../app/actions/edit-actions.c:103
-msgctxt "edit-action"
+#: ../app/actions/edit-actions.c:102 ../app/actions/edit-actions.c:315
 msgid "_Fade..."
 msgstr "æ·¡å?º(_F)..."
 
-#: ../app/actions/edit-actions.c:105
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:103
 msgid "Modify paint mode and opacity of the last pixel manipulation"
 msgstr "ä¿®æ?¹æ??å??ä¸?次å??ç´ å¤?ç??ç??ç»?å?¾æ¨¡å¼?å??é??æ??度"
 
-#: ../app/actions/edit-actions.c:110
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:108
 msgid "Cu_t"
 msgstr "å?ªå??(_T)"
 
-#: ../app/actions/edit-actions.c:111
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:109
 msgid "Move the selected pixels to the clipboard"
 msgstr "å°?é??中ç??å??素移å?¨å?°å?ªè´´æ?¿"
 
-#: ../app/actions/edit-actions.c:116
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:114
 msgid "_Copy"
 msgstr "��(_C)"
 
-#: ../app/actions/edit-actions.c:117
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:115
 msgid "Copy the selected pixels to the clipboard"
 msgstr "å°?é??中ç??å??ç´ å¤?å?¶å?°å?ªè´´æ?¿"
 
+#
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:122
-msgctxt "edit-action"
+#: ../app/actions/edit-actions.c:120
 msgid "Copy _Visible"
 msgstr "����(_V)"
 
-#: ../app/actions/edit-actions.c:123
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:121
 msgid "Copy what is visible in the selected region"
 msgstr "æ? æ³?æµ®å?¨é??å?ºï¼?å? ä¸ºé??æ?©å?ºå??为空"
 
-#: ../app/actions/edit-actions.c:128
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:126
 msgid "_Paste"
 msgstr "ç²?è´´(_P)"
 
-#: ../app/actions/edit-actions.c:129
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:127
 msgid "Paste the content of the clipboard"
 msgstr "å°?å??容ç²?è´´å?°å?ªè´´æ?¿"
 
-#: ../app/actions/edit-actions.c:134
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:132
 msgid "Paste _Into"
 msgstr "ç²?è´´è¿?å?¥(_I)"
 
-#: ../app/actions/edit-actions.c:136
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:133
 msgid "Paste the content of the clipboard into the current selection"
 msgstr "å°?å?ªè´´æ?¿ä¸­ç??å??容ç²?è´´å?°å½?å??é??å?º"
 
-#: ../app/actions/edit-actions.c:141
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:138
 msgid "From _Clipboard"
 msgstr "��贴�(_C)"
 
-#: ../app/actions/edit-actions.c:142 ../app/actions/edit-actions.c:148
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:139 ../app/actions/edit-actions.c:145
 msgid "Create a new image from the content of the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸­ç??å??容å??建æ?°å?¾å??"
 
-#: ../app/actions/edit-actions.c:147
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:144
 msgid "_New Image"
 msgstr "æ?°å»ºå?¾å??(_N)"
 
-#: ../app/actions/edit-actions.c:153
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:150
 msgid "New _Layer"
 msgstr "�建��(_L)"
 
-#: ../app/actions/edit-actions.c:154
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:151
 msgid "Create a new layer from the content of the clipboard"
 msgstr "ä»?å?ªè´´æ?¿ä¸­ç??å??容å??建æ?°å?¾å±?"
 
-#: ../app/actions/edit-actions.c:159
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:156
 msgid "Cu_t Named..."
 msgstr "å?½å??å?ªå??(_T)..."
 
-#: ../app/actions/edit-actions.c:160
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:157
 msgid "Move the selected pixels to a named buffer"
 msgstr "å°?é??中ç??å??素移å?¨å?°å?½å??ç¼?å?²å?º"
 
-#: ../app/actions/edit-actions.c:165
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:162
 msgid "_Copy Named..."
 msgstr "å?½å??å¤?å?¶(_C)..."
 
-#: ../app/actions/edit-actions.c:166
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:163
 msgid "Copy the selected pixels to a named buffer"
 msgstr "å°?é??中ç??å??ç´ å¤?å?¶å?°å?½å??ç¼?å?²å?º"
 
+#
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:171
-msgctxt "edit-action"
+#: ../app/actions/edit-actions.c:168
 msgid "Copy _Visible Named..."
 msgstr "å?½å??å¤?å?¶å?¯è§?(_V)..."
 
-#: ../app/actions/edit-actions.c:173
-msgctxt "edit-action"
-msgid "Copy what is visible in the selected region to a named buffer"
-msgstr "å°?é??æ?©å?ºå??ç??å?¯è§?å??容å¤?å?¶å?°å?½å??ç¼?å?²å?º"
+#
+#: ../app/actions/edit-actions.c:169
+msgid "Copy the selected region to a named buffer"
+msgstr "å°?é??中ç??è??å?´å¤?å?¶å?°å?½å??ç¼?å?²å?º"
 
-#: ../app/actions/edit-actions.c:178
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:174
 msgid "_Paste Named..."
 msgstr "å?½å??ç²?è´´(_P)..."
 
-#: ../app/actions/edit-actions.c:179
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:175
 msgid "Paste the content of a named buffer"
 msgstr "ç²?è´´å?½å??ç¼?å?²å?ºä¸­ç??å??容"
 
-#: ../app/actions/edit-actions.c:184
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:180
 msgid "Cl_ear"
 msgstr "��(_E)"
 
-#: ../app/actions/edit-actions.c:185
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:181
 msgid "Clear the selected pixels"
 msgstr "æ¸?é?¤é??中ç??å??ç´ "
 
-#: ../app/actions/edit-actions.c:193
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:189
 msgid "Fill with _FG Color"
 msgstr "以å??æ?¯è?²å¡«å??(_F)"
 
-#: ../app/actions/edit-actions.c:194
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:190
 msgid "Fill the selection using the foreground color"
 msgstr "使ç?¨å??æ?¯é¢?è?²å¡«å?¥é??中å?ºå??"
 
-#: ../app/actions/edit-actions.c:199
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:195
 msgid "Fill with B_G Color"
 msgstr "以è??æ?¯è?²å¡«å??(_G)"
 
-#: ../app/actions/edit-actions.c:200
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:196
 msgid "Fill the selection using the background color"
 msgstr "使ç?¨è??æ?¯é¢?è?²å¡«å?¥é??中å?ºå??"
 
-#: ../app/actions/edit-actions.c:205
-msgctxt "edit-action"
-msgid "Fill _with Pattern"
-msgstr "以å?¾æ¡?å¡«å??(_W)"
+#
+#: ../app/actions/edit-actions.c:201
+msgid "Fill with P_attern"
+msgstr "以å?¾æ¡?å¡«å??"
 
-#: ../app/actions/edit-actions.c:206
-msgctxt "edit-action"
+#
+#: ../app/actions/edit-actions.c:202
 msgid "Fill the selection using the active pattern"
 msgstr "使ç?¨å½?å??å?¾æ¡?å¡«å?¥é??中å?ºå??"
 
-#: ../app/actions/edit-actions.c:295
+#: ../app/actions/edit-actions.c:279
 #, c-format
 msgid "_Undo %s"
 msgstr "�� %s(_U)"
 
-#: ../app/actions/edit-actions.c:302
+#: ../app/actions/edit-actions.c:286
 #, c-format
 msgid "_Redo %s"
 msgstr "é??å?? %s(_R)"
 
-#: ../app/actions/edit-actions.c:317
+#: ../app/actions/edit-actions.c:301
 #, c-format
 msgid "_Fade %s..."
 msgstr "æ·¡å?º(_F) %s..."
 
-#: ../app/actions/edit-actions.c:329
-msgid "_Undo"
-msgstr "��(_U)"
-
-#: ../app/actions/edit-actions.c:330
-msgid "_Redo"
-msgstr "é??å??(_R)"
-
-#: ../app/actions/edit-actions.c:331
-msgid "_Fade..."
-msgstr "æ·¡å?º(_F)..."
-
-#: ../app/actions/edit-commands.c:136
+#: ../app/actions/edit-commands.c:134
 msgid "Clear Undo History"
 msgstr "æ¸?é?¤æ?¤æ¶?å??å?²"
 
-#: ../app/actions/edit-commands.c:162
+#: ../app/actions/edit-commands.c:160
 msgid "Really clear image's undo history?"
 msgstr "ç??ç??è¦?æ¸?é?¤å?¾å??ç??æ?¤æ¶?å??å?²å??ï¼?"
 
-#: ../app/actions/edit-commands.c:175
+#: ../app/actions/edit-commands.c:172
 #, c-format
 msgid "Clearing the undo history of this image will gain %s of memory."
 msgstr "æ¸?é?¤æ­¤å?¾å??ç??æ?¤æ¶?å??å?²å?¯é??æ?¾ %s ç??å??å­?ã??"
 
-#: ../app/actions/edit-commands.c:205
+#: ../app/actions/edit-commands.c:201
 msgid "Cut pixels to the clipboard"
 msgstr "å°?å??ç´ å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/edit-commands.c:235 ../app/actions/edit-commands.c:264
+#: ../app/actions/edit-commands.c:228 ../app/actions/edit-commands.c:254
 msgid "Copied pixels to the clipboard"
 msgstr "å°?å??ç´ å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/edit-commands.c:324 ../app/actions/edit-commands.c:359
-#: ../app/actions/edit-commands.c:538
+#: ../app/actions/edit-commands.c:315 ../app/actions/edit-commands.c:349
+#: ../app/actions/edit-commands.c:525
 msgid "There is no image data in the clipboard to paste."
 msgstr "å?ªè´´æ?¿ä¸­æ²¡æ??å?¯ç²?è´´ç??å?¾å??æ?°æ?®ã??"
 
-#: ../app/actions/edit-commands.c:347 ../app/core/gimpbrushclipboard.c:180
-#: ../app/core/gimppatternclipboard.c:180 ../app/widgets/gimpclipboard.c:345
+#: ../app/actions/edit-commands.c:338 ../app/core/gimpbrushclipboard.c:181
+#: ../app/core/gimppatternclipboard.c:181 ../app/widgets/gimpclipboard.c:296
 msgid "Clipboard"
 msgstr "�贴�"
 
-#: ../app/actions/edit-commands.c:373
+#: ../app/actions/edit-commands.c:363
 msgid "Cut Named"
 msgstr "å?½å??å?ªå??"
 
-#: ../app/actions/edit-commands.c:376 ../app/actions/edit-commands.c:417
-#: ../app/actions/edit-commands.c:437
+#: ../app/actions/edit-commands.c:366 ../app/actions/edit-commands.c:407
+#: ../app/actions/edit-commands.c:427
 msgid "Enter a name for this buffer"
 msgstr "为è¿?个ç¼?å?²å?ºè¾?å?¥ä¸?个å??å­?"
 
-#: ../app/actions/edit-commands.c:414
+#: ../app/actions/edit-commands.c:404
 msgid "Copy Named"
 msgstr "å?½å??å¤?å?¶"
 
-#: ../app/actions/edit-commands.c:434
+#: ../app/actions/edit-commands.c:424
 msgid "Copy Visible Named "
 msgstr "å?½å??å¤?å?¶å?¯è§?"
 
-#: ../app/actions/edit-commands.c:555
+#: ../app/actions/edit-commands.c:542
 msgid "There is no active layer or channel to cut from."
 msgstr "没æ??æ´»å?¨å?¾å±?æ??é??é??å?¯ä»¥å?ªå??ã??"
 
-#: ../app/actions/edit-commands.c:560 ../app/actions/edit-commands.c:592
-#: ../app/actions/edit-commands.c:616
+#: ../app/actions/edit-commands.c:547 ../app/actions/edit-commands.c:579
+#: ../app/actions/edit-commands.c:603
 msgid "(Unnamed Buffer)"
 msgstr "(æ?ªå?½å??ç¼?å?²å?º)"
 
-#: ../app/actions/edit-commands.c:587
+#: ../app/actions/edit-commands.c:574
 msgid "There is no active layer or channel to copy from."
 msgstr "没æ??æ´»å?¨å?¾å±?æ??é??é??å?¯ä»¥å¤?å?¶ã??"
 
-#: ../app/actions/error-console-actions.c:39
-msgctxt "error-console-action"
+#
+#: ../app/actions/error-console-actions.c:40
 msgid "Error Console Menu"
 msgstr "é??误æ?§å?¶å?°è??å??"
 
-#: ../app/actions/error-console-actions.c:43
-msgctxt "error-console-action"
+#
+#: ../app/actions/error-console-actions.c:44
 msgid "_Clear"
 msgstr "��(_C)"
 
-#: ../app/actions/error-console-actions.c:44
-msgctxt "error-console-action"
+#
+#: ../app/actions/error-console-actions.c:45
 msgid "Clear error console"
 msgstr "æ¸?空é??误æ?§å?¶å?°"
 
-#: ../app/actions/error-console-actions.c:49
-msgctxt "error-console-action"
+#
+#: ../app/actions/error-console-actions.c:50
 msgid "Select _All"
 msgstr "å?¨é?¨é??中(_A)"
 
-#: ../app/actions/error-console-actions.c:50
-msgctxt "error-console-action"
-msgid "Select all error messages"
+#
+#: ../app/actions/error-console-actions.c:51
+msgid "Select all errors"
 msgstr "é??æ?©æ??æ??é??误信æ?¯"
 
-#: ../app/actions/error-console-actions.c:58
-msgctxt "error-console-action"
+#
+#: ../app/actions/error-console-actions.c:59
 msgid "_Save Error Log to File..."
 msgstr "å°?å?ºé??è®°å½?ä¿?å­?å?°æ??件(_S)..."
 
-#: ../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:60
+msgid "Save error log"
+msgstr "å°?å?ºé??è®°å½?ä¿?å­?å?°æ??件"
 
-#: ../app/actions/error-console-actions.c:64
-msgctxt "error-console-action"
+#
+#: ../app/actions/error-console-actions.c:65
 msgid "Save S_election to File..."
 msgstr "å°?é??å?ºä¿?å­?å?°æ??件(_E)..."
 
-#: ../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-actions.c:66
+msgid "Save selection"
+msgstr "移å?¨é??å?º"
 
 #: ../app/actions/error-console-commands.c:84
 msgid "Cannot save. Nothing is selected."
@@ -2223,7 +1856,7 @@ msgstr "æ? æ³?ä¿?å­?ã??没æ??é??中任ä½?å??容ã??"
 msgid "Save Error Log to File"
 msgstr "å°?å?ºé??è®°å½?ä¿?å­?å?°æ??件"
 
-#: ../app/actions/error-console-commands.c:157
+#: ../app/actions/error-console-commands.c:156
 #, c-format
 msgid ""
 "Error writing file '%s':\n"
@@ -2232,231 +1865,201 @@ msgstr ""
 "å??æ??件â??%sâ??æ?¶å?ºé??ï¼?\n"
 "%s"
 
-#: ../app/actions/file-actions.c:71
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:66
 msgid "_File"
 msgstr "æ??件(_F)"
 
-#: ../app/actions/file-actions.c:72
-msgctxt "file-action"
-msgid "Crea_te"
-msgstr "å??建(_T)"
+#
+#: ../app/actions/file-actions.c:67
+msgid "Create"
+msgstr "å??建"
 
-#: ../app/actions/file-actions.c:73
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:68
 msgid "Open _Recent"
 msgstr "æ??è¿?æ??å¼?(_R)"
 
-#: ../app/actions/file-actions.c:76
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:71
 msgid "_Open..."
 msgstr "æ??å¼?(_O)..."
 
-#: ../app/actions/file-actions.c:77
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:72
 msgid "Open an image file"
 msgstr "æ??å¼?å?¾å??æ??件"
 
-#: ../app/actions/file-actions.c:82
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:77
 msgid "Op_en as Layers..."
 msgstr "ä½?为å?¾å±?æ??å¼?(_E)..."
 
-#: ../app/actions/file-actions.c:83
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:78
 msgid "Open an image file as layers"
 msgstr "ä½?为å?¾å±?æ??å¼?å?¾å??æ??件"
 
-#: ../app/actions/file-actions.c:88
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:83
 msgid "Open _Location..."
 msgstr "æ??å¼?ä½?ç½®(_L)..."
 
-#: ../app/actions/file-actions.c:89
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:84
 msgid "Open an image file from a specified location"
 msgstr "ä»?æ??å®?ç??ä½?ç½®æ??å¼?å?¾å??æ??件"
 
-#: ../app/actions/file-actions.c:94
-msgctxt "file-action"
-msgid "Create Template..."
-msgstr "å??建模æ?¿..."
+#
+#: ../app/actions/file-actions.c:89
+msgid "Save as _Template..."
+msgstr "��为模�(_T)..."
 
-#: ../app/actions/file-actions.c:95
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:90
 msgid "Create a new template from this image"
 msgstr "æ ¹æ?®æ­¤å?¾å??å??建æ?°æ¨¡æ?¿"
 
-#: ../app/actions/file-actions.c:100
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:95
 msgid "Re_vert"
 msgstr "��(_V)"
 
-#: ../app/actions/file-actions.c:101
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:96
 msgid "Reload the image file from disk"
-msgstr "ä»?ç£?ç??é??æ?°è£?å?¥å?¾å??æ??件"
+msgstr "ä»?ç£?ç??é??æ?°è½½å?¥å?¾å??æ??件"
 
-#: ../app/actions/file-actions.c:106
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:101
 msgid "Close all"
 msgstr "����"
 
-#: ../app/actions/file-actions.c:107
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:102
 msgid "Close all opened images"
 msgstr "å?³é?­å?¨é?¨æ??å¼?ç??å?¾å??"
 
-#: ../app/actions/file-actions.c:112
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:107
 msgid "_Quit"
 msgstr "é??å?º(_Q)"
 
-#: ../app/actions/file-actions.c:113
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:108
 msgid "Quit the GNU Image Manipulation Program"
 msgstr "é??å?º GNU å?¾å??å¤?ç??ç¨?åº?"
 
-#: ../app/actions/file-actions.c:121
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:116
 msgid "_Save"
 msgstr "ä¿?å­?(_S)"
 
-#: ../app/actions/file-actions.c:122
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:117
 msgid "Save this image"
 msgstr "ä¿?å­?æ­¤å?¾å??"
 
-#: ../app/actions/file-actions.c:127
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:122
 msgid "Save _As..."
 msgstr "��为(_A)..."
 
-#: ../app/actions/file-actions.c:128
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:123
 msgid "Save this image with a different name"
 msgstr "ç?¨ä¸?å??ç??å??å­?ä¿?å­?æ­¤å?¾å??"
 
-#: ../app/actions/file-actions.c:133
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:128
 msgid "Save a Cop_y..."
 msgstr "����(_Y)..."
 
-#: ../app/actions/file-actions.c:135
-msgctxt "file-action"
-msgid ""
-"Save a copy of this image, without affecting the source file (if any) or the "
-"current state of the image"
-msgstr ""
+#
+#: ../app/actions/file-actions.c:129
+msgid "Save this image with a different name, but keep its current name"
+msgstr "ç?¨ä¸?å??ç??å??å­?ä¿?å­?æ­¤å?¾å??ï¼?ä½?ä¿?æ??å®?å½?å??ç??å??å­?"
 
-#: ../app/actions/file-actions.c:140
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:134
 msgid "Save and Close..."
 msgstr "��并��..."
 
-#: ../app/actions/file-actions.c:141
-msgctxt "file-action"
+#
+#: ../app/actions/file-actions.c:135
 msgid "Save this image and close its window"
 msgstr "ä¿?å­?æ­¤å?¾å??并å?³é?­å®?ç??çª?å?£"
 
-#: ../app/actions/file-actions.c:146
-msgctxt "file-action"
-msgid "Export to"
-msgstr "导��"
-
-#: ../app/actions/file-actions.c:147
-msgctxt "file-action"
-msgid "Export the image again"
-msgstr "å??次导å?ºå?¾å??"
-
-#: ../app/actions/file-actions.c:152
-msgctxt "file-action"
-msgid "Overwrite"
-msgstr "è¦?ç??"
-
-#: ../app/actions/file-actions.c:153
-msgctxt "file-action"
-msgid "Export the image back to the imported file in the import format"
-msgstr "å°?å?¾å??以被导å?¥ç??æ ¼å¼?å??å??导å?ºå?°å¯¼å?¥æ??件"
-
-#: ../app/actions/file-actions.c:158
-msgctxt "file-action"
-msgid "Export..."
-msgstr "导�..."
-
-#: ../app/actions/file-actions.c:159
-msgctxt "file-action"
-msgid "Export the image to various file formats such as PNG or JPEG"
-msgstr "å°?å?¾å??导å?ºå?°å¦? PNG æ?? JPEG ç??å¤?ç§?æ??件格å¼?"
-
-#: ../app/actions/file-actions.c:292
-#, c-format
-msgid "Export to %s"
-msgstr "导�� %s"
-
-#: ../app/actions/file-actions.c:298
-#, c-format
-msgid "Overwrite %s"
-msgstr "è¦?ç?? %s"
-
-#: ../app/actions/file-actions.c:306
-msgid "Export to"
-msgstr "导��"
-
-#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:475
-#: ../app/dialogs/file-open-dialog.c:77
+#: ../app/actions/file-commands.c:104 ../app/actions/file-commands.c:456
+#: ../app/dialogs/file-open-dialog.c:76
 msgid "Open Image"
 msgstr "æ??å¼?å?¾å??"
 
-#: ../app/actions/file-commands.c:133
+#: ../app/actions/file-commands.c:125
 msgid "Open Image as Layers"
 msgstr "ä½?为å?¾å±?æ??å¼?å?¾å??"
 
-#: ../app/actions/file-commands.c:265
+#: ../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
 msgid "No changes need to be saved"
 msgstr "没æ??é??è¦?ä¿?å­?ç??ä¿®æ?¹"
 
-#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95
+#: ../app/actions/file-commands.c:307 ../app/dialogs/file-save-dialog.c:88
 msgid "Save Image"
 msgstr "ä¿?å­?å?¾å??"
 
-#: ../app/actions/file-commands.c:278
+#: ../app/actions/file-commands.c:313
 msgid "Save a Copy of the Image"
 msgstr "ä¿?å­?å?¾å??ç??å?¯æ?¬"
 
-#: ../app/actions/file-commands.c:338
+#: ../app/actions/file-commands.c:333
 msgid "Create New Template"
 msgstr "å??建æ?°ç??模æ?¿"
 
-#: ../app/actions/file-commands.c:342
+#: ../app/actions/file-commands.c:337
 msgid "Enter a name for this template"
-msgstr "ç»?è¿?个模æ?¿è¾?å?¥ä¸?个å??å­?"
+msgstr "为è¿?个模æ?¿è¾?å?¥ä¸?个å??å­?"
 
-#: ../app/actions/file-commands.c:377
+#: ../app/actions/file-commands.c:363
 msgid "Revert failed. No file name associated with this image."
 msgstr "æ?¢å¤?失败ã??没æ??æ??件å??ä¸?æ­¤å?¾å??ç?¸å?³è??ã??"
 
-#: ../app/actions/file-commands.c:390
+#: ../app/actions/file-commands.c:376
 msgid "Revert Image"
 msgstr "æ?¢å¤?å?¾å??"
 
-#: ../app/actions/file-commands.c:421
+#: ../app/actions/file-commands.c:402
 #, c-format
 msgid "Revert '%s' to '%s'?"
 msgstr "å°?â??%sâ??æ?¢å¤?å?°â??%sâ??ï¼?"
 
-#: ../app/actions/file-commands.c:427
+#: ../app/actions/file-commands.c:408
 msgid ""
 "By reverting the image to the state saved on disk, you will lose all "
 "changes, including all undo information."
 msgstr ""
 "å¦?æ??å°?å?¾å??æ?¢å¤?å?°ç£?ç??ä¸?ä¿?å­?ç??ç?¶æ??ï¼?æ?¨å°?ä¼?丢失æ??æ??ç??æ?¹å??ï¼?å??æ?¬æ??æ??ç??æ?¤æ¶?ä¿¡æ?¯ã??"
 
-#: ../app/actions/file-commands.c:638
+#: ../app/actions/file-commands.c:563
 msgid "(Unnamed Template)"
 msgstr "(æ?ªå?½å??模æ?¿)"
 
-#: ../app/actions/file-commands.c:690
+#: ../app/actions/file-commands.c:611
 #, c-format
 msgid ""
 "Reverting to '%s' failed:\n"
@@ -2467,335 +2070,332 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/actions/fonts-actions.c:43
-msgctxt "fonts-action"
+#
+#: ../app/actions/fonts-actions.c:44
 msgid "Fonts Menu"
 msgstr "å­?ä½?è??å??"
 
-#: ../app/actions/fonts-actions.c:47
-msgctxt "fonts-action"
+#
+#: ../app/actions/fonts-actions.c:48
 msgid "_Rescan Font List"
 msgstr "é??æ?°æ?«æ??å­?ä½?å??表(_R)"
 
-#: ../app/actions/fonts-actions.c:48
-msgctxt "fonts-action"
-msgid "Rescan the installed fonts"
-msgstr "é??æ?°æ?«æ??å·²å®?è£?ç??å­?ä½?"
+#
+#: ../app/actions/fonts-actions.c:49
+msgid "Rescan font list"
+msgstr "é??æ?°æ?«æ??å­?ä½?å??表(_R)"
 
-#: ../app/actions/gradient-editor-actions.c:45
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:46
 msgid "Gradient Editor Menu"
 msgstr "æ¸?å??ç¼?è¾?å?¨è??å??"
 
-#: ../app/actions/gradient-editor-actions.c:49
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:50
 msgid "Left Color Type"
 msgstr "左端é¢?è?²ç±»å??"
 
-#: ../app/actions/gradient-editor-actions.c:51
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:52
 msgid "_Load Left Color From"
 msgstr "左端���载�(_L)"
 
-#: ../app/actions/gradient-editor-actions.c:53
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:54
 msgid "_Save Left Color To"
 msgstr "��左端���(_S)"
 
-#: ../app/actions/gradient-editor-actions.c:56
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:57
 msgid "Right Color Type"
 msgstr "å?³ç«¯é¢?è?²ç±»å??"
 
-#: ../app/actions/gradient-editor-actions.c:58
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:59
 msgid "Load Right Color Fr_om"
 msgstr "�端���载�(_O)"
 
-#: ../app/actions/gradient-editor-actions.c:60
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:61
 msgid "Sa_ve Right Color To"
 msgstr "���端���(_V)"
 
-#: ../app/actions/gradient-editor-actions.c:66
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:67
 msgid "L_eft Endpoint's Color..."
 msgstr "左端ç?¹ç??é¢?è?²(_E)..."
 
-#: ../app/actions/gradient-editor-actions.c:71
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:72
 msgid "R_ight Endpoint's Color..."
 msgstr "å?³ç«¯ç?¹ç??é¢?è?²(_I)..."
 
-#: ../app/actions/gradient-editor-actions.c:111
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:112
 msgid "Ble_nd Endpoints' Colors"
 msgstr "æ··å??端ç?¹ç??é¢?è?²(_N)"
 
-#: ../app/actions/gradient-editor-actions.c:116
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:117
 msgid "Blend Endpoints' Opacit_y"
 msgstr "æ··å??端ç?¹ç??ä¸?é??æ??度(_Y)"
 
-#: ../app/actions/gradient-editor-actions.c:124
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:125
 msgid "Edit Active Gradient"
 msgstr "ç¼?è¾?æ´»å?¨æ¸?å??"
 
-#: ../app/actions/gradient-editor-actions.c:155
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:156
 msgid "_Left Neighbor's Right Endpoint"
 msgstr "å·¦é?»ç??å?³ç«¯ç?¹(_L)"
 
-#: ../app/actions/gradient-editor-actions.c:160
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:161
 msgid "_Right Endpoint"
 msgstr "�端�(_R)"
 
-#: ../app/actions/gradient-editor-actions.c:165
-#: ../app/actions/gradient-editor-actions.c:213
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:166
+#: ../app/actions/gradient-editor-actions.c:214
 msgid "_Foreground Color"
 msgstr "å??æ?¯è?²(_F)"
 
-#: ../app/actions/gradient-editor-actions.c:170
-#: ../app/actions/gradient-editor-actions.c:218
-msgctxt "gradient-editor-action"
+#
+#: ../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
 msgid "_Background Color"
 msgstr "è??æ?¯è?²(_B)"
 
-#: ../app/actions/gradient-editor-actions.c:203
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:204
 msgid "_Right Neighbor's Left Endpoint"
 msgstr "å?³é?»ç??左端ç?¹(_R)"
 
-#: ../app/actions/gradient-editor-actions.c:208
-msgctxt "gradient-editor-action"
+#
+#: ../app/actions/gradient-editor-actions.c:209
 msgid "_Left Endpoint"
 msgstr "左端�(_L)"
 
-#: ../app/actions/gradient-editor-actions.c:257
-#: ../app/actions/gradient-editor-actions.c:287
-msgctxt "gradient-editor-color-type"
+#
+#: ../app/actions/gradient-editor-actions.c:258
+#: ../app/actions/gradient-editor-actions.c:286
 msgid "_Fixed"
 msgstr "��(_F)"
 
-#: ../app/actions/gradient-editor-actions.c:262
-#: ../app/actions/gradient-editor-actions.c:292
-msgctxt "gradient-editor-color-type"
+#
+#: ../app/actions/gradient-editor-actions.c:263
+#: ../app/actions/gradient-editor-actions.c:291
 msgid "F_oreground Color"
 msgstr "å??æ?¯è?²(_O)"
 
+#
 #: ../app/actions/gradient-editor-actions.c:268
-#: ../app/actions/gradient-editor-actions.c:298
-msgctxt "gradient-editor-color-type"
+#: ../app/actions/gradient-editor-actions.c:296
 msgid "Fo_reground Color (Transparent)"
 msgstr "å??æ?¯è?²(é??æ??)(_R)"
 
-#: ../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"
+#
+#: ../app/actions/gradient-editor-actions.c:278
+#: ../app/actions/gradient-editor-actions.c:306
 msgid "B_ackground Color (Transparent)"
 msgstr "å??æ?¯è?²(é??æ??)(_A)"
 
-#: ../app/actions/gradient-editor-actions.c:317
-msgctxt "gradient-editor-blending"
+#
+#: ../app/actions/gradient-editor-actions.c:314
 msgid "_Linear"
 msgstr "线�(_L)"
 
-#: ../app/actions/gradient-editor-actions.c:322
-msgctxt "gradient-editor-blending"
+#
+#: ../app/actions/gradient-editor-actions.c:319
 msgid "_Curved"
 msgstr "�线(_C)"
 
-#: ../app/actions/gradient-editor-actions.c:327
-msgctxt "gradient-editor-blending"
+#
+#: ../app/actions/gradient-editor-actions.c:324
 msgid "_Sinusoidal"
 msgstr "正弦(_S)"
 
-#: ../app/actions/gradient-editor-actions.c:332
-msgctxt "gradient-editor-blending"
+#
+#: ../app/actions/gradient-editor-actions.c:329
 msgid "Spherical (i_ncreasing)"
 msgstr "ç??ç?¶(ä¸?å??)(_N)"
 
-#: ../app/actions/gradient-editor-actions.c:337
-msgctxt "gradient-editor-blending"
+#
+#: ../app/actions/gradient-editor-actions.c:334
 msgid "Spherical (_decreasing)"
 msgstr "ç??ç?¶(ä¸?é??)(_D)"
 
-#: ../app/actions/gradient-editor-actions.c:342
-msgctxt "gradient-editor-blending"
+#
+#: ../app/actions/gradient-editor-actions.c:339
+#: ../app/actions/gradient-editor-actions.c:362
 msgid "(Varies)"
 msgstr "(��)"
 
-#: ../app/actions/gradient-editor-actions.c:350
-msgctxt "gradient-editor-coloring"
+#
+#: ../app/actions/gradient-editor-actions.c:347
+#: ../app/actions/image-actions.c:141
 msgid "_RGB"
 msgstr "_RGB"
 
-#: ../app/actions/gradient-editor-actions.c:355
-msgctxt "gradient-editor-coloring"
+#
+#: ../app/actions/gradient-editor-actions.c:352
 msgid "HSV (_counter-clockwise hue)"
 msgstr "HSV (é??æ?¶é??è?²è°?)(_C)"
 
-#: ../app/actions/gradient-editor-actions.c:360
-msgctxt "gradient-editor-coloring"
+#
+#: ../app/actions/gradient-editor-actions.c:357
 msgid "HSV (clockwise _hue)"
 msgstr "HSV (顺æ?¶é??è?²è°?)(_H)"
 
-#: ../app/actions/gradient-editor-actions.c:365
-msgctxt "gradient-editor-coloring"
-msgid "(Varies)"
-msgstr "(��)"
-
-#: ../app/actions/gradient-editor-actions.c:373
+#: ../app/actions/gradient-editor-actions.c:370
+#: ../app/actions/view-actions.c:273
 msgid "Zoom In"
 msgstr "�大"
 
-#: ../app/actions/gradient-editor-actions.c:374
-#: ../app/actions/palette-editor-actions.c:89
+#: ../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
 msgid "Zoom in"
 msgstr "�大"
 
-#: ../app/actions/gradient-editor-actions.c:379
+#: ../app/actions/gradient-editor-actions.c:376
+#: ../app/actions/view-actions.c:267
 msgid "Zoom Out"
 msgstr "缩�"
 
-#: ../app/actions/gradient-editor-actions.c:380
-#: ../app/actions/palette-editor-actions.c:95
+#: ../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
 msgid "Zoom out"
 msgstr "缩�"
 
-#: ../app/actions/gradient-editor-actions.c:385
+#: ../app/actions/gradient-editor-actions.c:382
 msgid "Zoom All"
 msgstr "���示"
 
-#: ../app/actions/gradient-editor-actions.c:386
-#: ../app/actions/palette-editor-actions.c:101
+#: ../app/actions/gradient-editor-actions.c:383
+#: ../app/actions/palette-editor-actions.c:100
 msgid "Zoom all"
 msgstr "���示"
 
-#: ../app/actions/gradient-editor-actions.c:776
+#: ../app/actions/gradient-editor-actions.c:773
 msgid "_Blending Function for Segment"
 msgstr "段混å??å?½æ?°(_B)"
 
-#: ../app/actions/gradient-editor-actions.c:778
+#: ../app/actions/gradient-editor-actions.c:775
 msgid "Coloring _Type for Segment"
 msgstr "段ç??è?²ç±»å??(_T)"
 
-#: ../app/actions/gradient-editor-actions.c:781
+#: ../app/actions/gradient-editor-actions.c:778
 msgid "_Flip Segment"
 msgstr "翻转段(_F)"
 
-#: ../app/actions/gradient-editor-actions.c:783
+#: ../app/actions/gradient-editor-actions.c:780
 msgid "_Replicate Segment..."
 msgstr "��段(_R)..."
 
-#: ../app/actions/gradient-editor-actions.c:785
+#: ../app/actions/gradient-editor-actions.c:782
 msgid "Split Segment at _Midpoint"
 msgstr "å?¨ä¸­ç?¹å¤?å??å?²æ®µ(_M)"
 
-#: ../app/actions/gradient-editor-actions.c:787
+#: ../app/actions/gradient-editor-actions.c:784
 msgid "Split Segment _Uniformly..."
 msgstr "ç­?å??å??å?²æ®µ(_U)..."
 
-#: ../app/actions/gradient-editor-actions.c:789
+#: ../app/actions/gradient-editor-actions.c:786
 msgid "_Delete Segment"
 msgstr "��段(_D)"
 
-#: ../app/actions/gradient-editor-actions.c:791
+#: ../app/actions/gradient-editor-actions.c:788
 msgid "Re-_center Segment's Midpoint"
 msgstr "é??置段中ç?¹(_C)"
 
-#: ../app/actions/gradient-editor-actions.c:793
+#: ../app/actions/gradient-editor-actions.c:790
 msgid "Re-distribute _Handles in Segment"
 msgstr "é??置段æ?¯ç?¹(_H)"
 
-#: ../app/actions/gradient-editor-actions.c:798
+#: ../app/actions/gradient-editor-actions.c:795
 msgid "_Blending Function for Selection"
 msgstr "é??å?ºç??æ··å??å?½æ?°(_B)"
 
-#: ../app/actions/gradient-editor-actions.c:800
+#: ../app/actions/gradient-editor-actions.c:797
 msgid "Coloring _Type for Selection"
 msgstr "é??å?ºç??ç??è?²ç±»å??(_T)"
 
-#: ../app/actions/gradient-editor-actions.c:803
+#: ../app/actions/gradient-editor-actions.c:800
 msgid "_Flip Selection"
 msgstr "翻转é??å?º(_F)"
 
-#: ../app/actions/gradient-editor-actions.c:805
+#: ../app/actions/gradient-editor-actions.c:802
 msgid "_Replicate Selection..."
 msgstr "å¤?å?¶é??å?º(_R)..."
 
-#: ../app/actions/gradient-editor-actions.c:807
+#: ../app/actions/gradient-editor-actions.c:804
 msgid "Split Segments at _Midpoints"
 msgstr "å?¨ä¸­ç?¹å¤?å??å?²æ®µ(_M)"
 
-#: ../app/actions/gradient-editor-actions.c:809
+#: ../app/actions/gradient-editor-actions.c:806
 msgid "Split Segments _Uniformly..."
 msgstr "ç­?å??å??å?²æ®µ(_U)..."
 
-#: ../app/actions/gradient-editor-actions.c:811
+#: ../app/actions/gradient-editor-actions.c:808
 msgid "_Delete Selection"
 msgstr "å? é?¤é??中å?ºå??(_D)"
 
-#: ../app/actions/gradient-editor-actions.c:813
+#: ../app/actions/gradient-editor-actions.c:810
 msgid "Re-_center Midpoints in Selection"
 msgstr "é??ç½®é??中å?ºå??ç??中ç?¹(_C)"
 
-#: ../app/actions/gradient-editor-actions.c:815
+#: ../app/actions/gradient-editor-actions.c:812
 msgid "Re-distribute _Handles in Selection"
 msgstr "é??ç½®é??中å?ºå??ç??æ?¯ç?¹(_H)"
 
-#: ../app/actions/gradient-editor-commands.c:84
+#: ../app/actions/gradient-editor-commands.c:86
 msgid "Left Endpoint Color"
 msgstr "左端ç?¹ç??é¢?è?²"
 
-#: ../app/actions/gradient-editor-commands.c:86
+#: ../app/actions/gradient-editor-commands.c:88
 msgid "Gradient Segment's Left Endpoint Color"
 msgstr "æ¸?å??段ç??左端ç?¹ç??é¢?è?²"
 
-#: ../app/actions/gradient-editor-commands.c:235
+#: ../app/actions/gradient-editor-commands.c:237
 msgid "Right Endpoint Color"
 msgstr "å?³ç«¯ç?¹ç??é¢?è?²"
 
-#: ../app/actions/gradient-editor-commands.c:237
+#: ../app/actions/gradient-editor-commands.c:239
 msgid "Gradient Segment's Right Endpoint Color"
 msgstr "æ¸?å??段ç??å?³ç«¯ç?¹ç??é¢?è?²"
 
-#: ../app/actions/gradient-editor-commands.c:451
+#: ../app/actions/gradient-editor-commands.c:453
 msgid "Replicate Segment"
 msgstr "��段"
 
-#: ../app/actions/gradient-editor-commands.c:452
+#: ../app/actions/gradient-editor-commands.c:454
 msgid "Replicate Gradient Segment"
 msgstr "å¤?å?¶æ¸?å??段"
 
-#: ../app/actions/gradient-editor-commands.c:456
+#: ../app/actions/gradient-editor-commands.c:458
 msgid "Replicate Selection"
 msgstr "å¤?å?¶é??中å?ºå??"
 
-#: ../app/actions/gradient-editor-commands.c:457
+#: ../app/actions/gradient-editor-commands.c:459
 msgid "Replicate Gradient Selection"
 msgstr "å¤?å?¶æ¸?å??ç??é??中å?ºå??"
 
-#: ../app/actions/gradient-editor-commands.c:470
+#: ../app/actions/gradient-editor-commands.c:472
 msgid "Replicate"
 msgstr "��"
 
-#: ../app/actions/gradient-editor-commands.c:491
+#: ../app/actions/gradient-editor-commands.c:492
 msgid ""
 "Select the number of times\n"
 "to replicate the selected segment."
 msgstr "é??æ?©å¤?å?¶é??中ç??段ç??次æ?°ã??"
 
-#: ../app/actions/gradient-editor-commands.c:494
+#: ../app/actions/gradient-editor-commands.c:495
 msgid ""
 "Select the number of times\n"
 "to replicate the selection."
@@ -2803,23 +2403,23 @@ msgstr ""
 "é??æ?©å¤?å?¶æ??æ??é??中ç??\n"
 "段ç??次æ?°ã??"
 
-#: ../app/actions/gradient-editor-commands.c:553
+#: ../app/actions/gradient-editor-commands.c:554
 msgid "Split Segment Uniformly"
 msgstr "ç­?å??å??å?²æ®µ"
 
-#: ../app/actions/gradient-editor-commands.c:554
+#: ../app/actions/gradient-editor-commands.c:555
 msgid "Split Gradient Segment Uniformly"
 msgstr "ç­?å??å??å?²æ¸?å??段"
 
-#: ../app/actions/gradient-editor-commands.c:558
+#: ../app/actions/gradient-editor-commands.c:559
 msgid "Split Segments Uniformly"
 msgstr "ç­?å??å??å?²æ®µ"
 
-#: ../app/actions/gradient-editor-commands.c:559
+#: ../app/actions/gradient-editor-commands.c:560
 msgid "Split Gradient Segments Uniformly"
 msgstr "ç­?å??å??å?²æ¸?å??段"
 
-#: ../app/actions/gradient-editor-commands.c:572
+#: ../app/actions/gradient-editor-commands.c:573
 msgid "Split"
 msgstr "å??å?²"
 
@@ -2835,958 +2435,867 @@ msgid ""
 "in which to split the segments in the selection."
 msgstr "é??æ?©ç­?å??å??å?²æ??æ??é??中ç??段ç??份æ?°ã??"
 
-#: ../app/actions/gradients-actions.c:43
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:44
 msgid "Gradients Menu"
 msgstr "æ¸?å??è??å??"
 
-#: ../app/actions/gradients-actions.c:47
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:48
 msgid "_New Gradient"
 msgstr "æ?°å»ºæ¸?å??(_N)"
 
-#: ../app/actions/gradients-actions.c:48
-msgctxt "gradients-action"
-msgid "Create a new gradient"
-msgstr "å??建æ?°ç??æ¸?å??"
+#
+#: ../app/actions/gradients-actions.c:49
+msgid "New gradient"
+msgstr "æ?°å»ºæ¸?å??(_N)"
 
-#: ../app/actions/gradients-actions.c:53
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:54
 msgid "D_uplicate Gradient"
 msgstr "å¤?å?¶æ¸?å??(_U)"
 
-#: ../app/actions/gradients-actions.c:54
-msgctxt "gradients-action"
-msgid "Duplicate this gradient"
-msgstr "å¤?å?¶æ¸?å??"
+#
+#: ../app/actions/gradients-actions.c:55
+msgid "Duplicate gradient"
+msgstr "å¤?å?¶æ¸?å??(_U)"
 
-#: ../app/actions/gradients-actions.c:59
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:60
 msgid "Copy Gradient _Location"
 msgstr "å¤?å?¶æ¸?å??ä½?ç½®(_L)"
 
-#: ../app/actions/gradients-actions.c:60
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:61
 msgid "Copy gradient file location to clipboard"
 msgstr "å°?æ¸?å??æ??件ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/gradients-actions.c:65
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:66
 msgid "Save as _POV-Ray..."
-msgstr "��为 _POV-Ray..."
+msgstr "��为 _POV-Ray..."
 
-#: ../app/actions/gradients-actions.c:66
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:67
 msgid "Save gradient as POV-Ray"
 msgstr "å°?æ¸?å??ä¿?å­?为 POV-Ray"
 
-#: ../app/actions/gradients-actions.c:71
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:72
 msgid "_Delete Gradient"
 msgstr "å? é?¤æ¸?å??(_D)"
 
-#: ../app/actions/gradients-actions.c:72
-msgctxt "gradients-action"
-msgid "Delete this gradient"
-msgstr "å? é?¤æ­¤æ¸?å??"
+#
+#: ../app/actions/gradients-actions.c:73
+msgid "Delete gradient"
+msgstr "å? é?¤æ¸?å??(_D)"
 
-#: ../app/actions/gradients-actions.c:77
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:78
 msgid "_Refresh Gradients"
 msgstr "å?·æ?°æ¸?å??(_R)"
 
-#: ../app/actions/gradients-actions.c:78
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:79
 msgid "Refresh gradients"
 msgstr "å?·æ?°æ¸?å??"
 
-#: ../app/actions/gradients-actions.c:86
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:87
 msgid "_Edit Gradient..."
 msgstr "ç¼?è¾?æ¸?å??(_E)..."
 
-#: ../app/actions/gradients-actions.c:87
-msgctxt "gradients-action"
+#
+#: ../app/actions/gradients-actions.c:88
 msgid "Edit gradient"
 msgstr "ç¼?è¾?æ¸?å??"
 
-#: ../app/actions/gradients-commands.c:65
+#: ../app/actions/gradients-commands.c:66
 #, c-format
 msgid "Save '%s' as POV-Ray"
 msgstr "å°?â??%sâ??ä¿?å­?为 POV-Ray"
 
-#: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40
-msgctxt "help-action"
+#
+#: ../app/actions/help-actions.c:38 ../app/actions/help-actions.c:41
 msgid "_Help"
 msgstr "帮�(_H)"
 
-#: ../app/actions/help-actions.c:41
-msgctxt "help-action"
+#
+#: ../app/actions/help-actions.c:42
 msgid "Open the GIMP user manual"
 msgstr "æ??å¼? GIMP ç?¨æ?·æ??å??"
 
-#: ../app/actions/help-actions.c:46
-msgctxt "help-action"
+#
+#: ../app/actions/help-actions.c:47
 msgid "_Context Help"
 msgstr "��帮�(_C)"
 
-#: ../app/actions/help-actions.c:47
-msgctxt "help-action"
+#
+#: ../app/actions/help-actions.c:48
 msgid "Show the help for a specific user interface item"
 msgstr "为æ??å®?ç?¨æ?·ç??é?¢é¡¹æ?¾ç¤ºå¸®å?©"
 
-#: ../app/actions/image-actions.c:48 ../app/actions/image-actions.c:52
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:47 ../app/actions/image-actions.c:51
 msgid "Image Menu"
 msgstr "å?¾å??è??å??"
 
-#: ../app/actions/image-actions.c:55
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:54
 msgid "_Image"
 msgstr "å?¾å??(_I)"
 
-#: ../app/actions/image-actions.c:56
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:55
 msgid "_Mode"
 msgstr "模�(_M)"
 
-#: ../app/actions/image-actions.c:57
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:56 ../app/actions/layers-actions.c:56
 msgid "_Transform"
 msgstr "å??æ?¢(_T)"
 
-#: ../app/actions/image-actions.c:58
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:57
 msgid "_Guides"
-msgstr "å??è??线(_G)"
+msgstr "��线(_G)"
 
+#
 #: ../app/actions/image-actions.c:60
-msgctxt "image-action"
-msgid "_Colors"
-msgstr "��(_C)"
-
-#: ../app/actions/image-actions.c:61
-msgctxt "image-action"
 msgid "I_nfo"
 msgstr "ä¿¡æ?¯(_N)"
 
-#: ../app/actions/image-actions.c:62
-msgctxt "image-action"
+#: ../app/actions/image-actions.c:61 ../app/tools/gimplevelstool.c:653
+#: ../app/tools/gimpthresholdtool.c:264
 msgid "_Auto"
 msgstr "��(_A)"
 
-#: ../app/actions/image-actions.c:63
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:62 ../app/actions/plug-in-actions.c:95
 msgid "_Map"
 msgstr "æ? å°?(_M)"
 
-#: ../app/actions/image-actions.c:64
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:63
 msgid "C_omponents"
 msgstr "å??é??(_O)"
 
-#: ../app/actions/image-actions.c:67
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:66
 msgid "_New..."
 msgstr "�建(_N)..."
 
-#: ../app/actions/image-actions.c:68
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:67
 msgid "Create a new image"
 msgstr "å??建æ?°ç??å?¾å??"
 
-#: ../app/actions/image-actions.c:73
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:72
 msgid "Can_vas Size..."
 msgstr "��大�(_V)..."
 
-#: ../app/actions/image-actions.c:74
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:73
 msgid "Adjust the image dimensions"
 msgstr "è°?æ?´å?¾å??尺寸"
 
-#: ../app/actions/image-actions.c:79
-msgctxt "image-action"
-msgid "Fit Canvas to L_ayers"
+#
+#: ../app/actions/image-actions.c:78
+msgid "F_it Canvas to Layers"
 msgstr "ç?»å¸?é??é??å?¾å±?(_A)"
 
-#: ../app/actions/image-actions.c:80
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:79
 msgid "Resize the image to enclose all layers"
 msgstr "é??ç½®å?¾å??大å°?以容纳æ??æ??å?¾å±?"
 
-#: ../app/actions/image-actions.c:85
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:84
 msgid "F_it Canvas to Selection"
 msgstr "使ç?»å¸?é??å??é??å?º(_I)"
 
-#: ../app/actions/image-actions.c:86
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:85
 msgid "Resize the image to the extents of the selection"
 msgstr "æ?¹å??å?¾å??尺寸å?°é??å?ºç??è??å?´"
 
-#: ../app/actions/image-actions.c:91
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:90
 msgid "_Print Size..."
 msgstr "æ??å?°å¤§å°?(_P)..."
 
-#: ../app/actions/image-actions.c:92
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:91
 msgid "Adjust the print resolution"
 msgstr "è°?æ?´æ??å?°å??辨ç??"
 
-#: ../app/actions/image-actions.c:97
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:96
 msgid "_Scale Image..."
 msgstr "缩æ?¾å?¾å??(_S)..."
 
-#: ../app/actions/image-actions.c:98
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:97
 msgid "Change the size of the image content"
 msgstr "æ?´æ?¹å?¾å??å??容ç??大å°?"
 
-#: ../app/actions/image-actions.c:103
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:102 ../app/actions/layers-actions.c:188
 msgid "_Crop to Selection"
-msgstr "å?ªè£?å?°é??å?º(_C)"
+msgstr "è£?å??å?°é??å?º(_C)"
 
-#: ../app/actions/image-actions.c:104
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:103
 msgid "Crop the image to the extents of the selection"
-msgstr "å?ªè£?å?¾å??å?°é??å?ºç??è??å?´"
+msgstr "è£?å??å?¾å??å?°é??å?ºç??è??å?´"
 
-#: ../app/actions/image-actions.c:109
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:108
 msgid "_Duplicate"
 msgstr "��(_D)"
 
-#: ../app/actions/image-actions.c:110
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:109
 msgid "Create a duplicate of this image"
 msgstr "å??建此å?¾å??ç??å¤?æ?¬"
 
-#: ../app/actions/image-actions.c:115
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:114
 msgid "Merge Visible _Layers..."
 msgstr "å??并å?¯è§?å?¾å±?(_L)..."
 
-#: ../app/actions/image-actions.c:116
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:115 ../app/actions/layers-actions.c:141
 msgid "Merge all visible layers into one layer"
 msgstr "å°?æ??æ??ç??å?¯è§?å?¾å±?å??并为ä¸?个å?¾å±?"
 
-#: ../app/actions/image-actions.c:121
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:120 ../app/actions/layers-actions.c:146
 msgid "_Flatten Image"
-msgstr "å¹³æ?´å?¾å??(_F)"
+msgstr "æ?¼å??å?¾å??(_F)"
 
-#: ../app/actions/image-actions.c:122
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:121 ../app/actions/layers-actions.c:147
 msgid "Merge all layers into one and remove transparency"
 msgstr "å°?æ??æ??ç??å?¾å±?å??并为ä¸?个并移é?¤é??æ??"
 
-#: ../app/actions/image-actions.c:127
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:126
 msgid "Configure G_rid..."
 msgstr "é??ç½®ç½?æ ¼(_R)..."
 
-#: ../app/actions/image-actions.c:128
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:127
 msgid "Configure the grid for this image"
 msgstr "é??ç½®å?¾å??ç??ç½?æ ¼"
 
-#: ../app/actions/image-actions.c:133
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:132
 msgid "Image Pr_operties"
 msgstr "å?¾å??å±?æ?§(_O)"
 
-#: ../app/actions/image-actions.c:134
-msgctxt "image-action"
+#
+#: ../app/actions/image-actions.c:133
 msgid "Display information about this image"
 msgstr "æ?¾ç¤ºå?³äº?æ­¤å?¾å??ç??ä¿¡æ?¯"
 
+#
 #: ../app/actions/image-actions.c:142
-msgctxt "image-convert-action"
-msgid "_RGB"
-msgstr "_RGB"
-
-#: ../app/actions/image-actions.c:143
-msgctxt "image-convert-action"
 msgid "Convert the image to the RGB colorspace"
 msgstr "å°?å?¾å??转æ?¢å?° RGB è?²å½©ç©ºé?´"
 
-#: ../app/actions/image-actions.c:147
-msgctxt "image-convert-action"
+#
+#: ../app/actions/image-actions.c:146
 msgid "_Grayscale"
 msgstr "�度(_G)"
 
-#: ../app/actions/image-actions.c:148
-msgctxt "image-convert-action"
+#
+#: ../app/actions/image-actions.c:147
 msgid "Convert the image to grayscale"
 msgstr "å°?å?¾å??转æ?¢ä¸ºç?°åº¦"
 
-#: ../app/actions/image-actions.c:152
-msgctxt "image-convert-action"
+#
+#: ../app/actions/image-actions.c:151
 msgid "_Indexed..."
 msgstr "索�(_I)..."
 
-#: ../app/actions/image-actions.c:153
-msgctxt "image-convert-action"
+#
+#: ../app/actions/image-actions.c:152
 msgid "Convert the image to indexed colors"
 msgstr "å°?å?¾å??转æ?¢ä¸ºç´¢å¼?é¢?è?²"
 
+#
 #: ../app/actions/image-actions.c:160
-msgctxt "image-action"
-msgid "Flip _Horizontally"
-msgstr "水平翻转(_H)"
-
-#: ../app/actions/image-actions.c:161
-msgctxt "image-action"
 msgid "Flip image horizontally"
 msgstr "水平翻转"
 
+#
 #: ../app/actions/image-actions.c:166
-msgctxt "image-action"
-msgid "Flip _Vertically"
-msgstr "å??ç?´ç¿»è½¬(_V)"
-
-#: ../app/actions/image-actions.c:167
-msgctxt "image-action"
 msgid "Flip image vertically"
 msgstr "å??ç?´ç¿»è½¬"
 
+#
 #: ../app/actions/image-actions.c:175
-msgctxt "image-action"
-msgid "Rotate 90° _clockwise"
-msgstr "顺æ?¶é??æ??转 90 度(_C)"
-
-#: ../app/actions/image-actions.c:176
-msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the right"
 msgstr "å°?å?¾å??å??å?³æ??转 90 度"
 
+#
 #: ../app/actions/image-actions.c:181
-msgctxt "image-action"
-msgid "Rotate _180°"
-msgstr "æ??转 _180 度"
-
-#: ../app/actions/image-actions.c:182
-msgctxt "image-action"
 msgid "Turn the image upside-down"
 msgstr "使å?¾å??ä¸?ä¸?颠å??"
 
+#
 #: ../app/actions/image-actions.c:187
-msgctxt "image-action"
-msgid "Rotate 90° counter-clock_wise"
-msgstr "é??æ?¶é??æ??转 90 度(_W)"
-
-#: ../app/actions/image-actions.c:188
-msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the left"
 msgstr "å°?å?¾å??å??å·¦æ??转 90 度"
 
-#: ../app/actions/image-commands.c:236
+#: ../app/actions/image-commands.c:235
 msgid "Set Image Canvas Size"
-msgstr "设置å?¾å??ç?»å¸?大å°?"
+msgstr "设置��大�"
 
-#: ../app/actions/image-commands.c:265 ../app/actions/image-commands.c:289
-#: ../app/actions/image-commands.c:581
+#: ../app/actions/image-commands.c:261 ../app/actions/image-commands.c:282
+#: ../app/actions/image-commands.c:559
 msgid "Resizing"
-msgstr "æ?¹å??大å°?"
+msgstr "��大�"
 
-#: ../app/actions/image-commands.c:316
+#: ../app/actions/image-commands.c:306
 msgid "Set Image Print Resolution"
 msgstr "设置å?¾å??æ??å?°å??辨ç??"
 
-#: ../app/actions/image-commands.c:378
-#: ../app/pdb/drawable-transform-cmds.c:153
-#: ../app/pdb/drawable-transform-cmds.c:230
-#: ../app/pdb/item-transform-cmds.c:158
+#: ../app/actions/image-commands.c:362
+#: ../app/pdb/drawable-transform-cmds.c:148
+#: ../app/pdb/drawable-transform-cmds.c:223
 msgid "Flipping"
 msgstr "翻转"
 
-#: ../app/actions/image-commands.c:402
-#: ../app/pdb/drawable-transform-cmds.c:547
-#: ../app/pdb/drawable-transform-cmds.c:628 ../app/pdb/image-cmds.c:536
-#: ../app/pdb/item-transform-cmds.c:423 ../app/pdb/transform-tools-cmds.c:224
-#: ../app/tools/gimprotatetool.c:122
+#: ../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
 msgid "Rotating"
 msgstr "æ??转"
 
-#: ../app/actions/image-commands.c:428 ../app/actions/layers-commands.c:691
+#: ../app/actions/image-commands.c:408 ../app/actions/layers-commands.c:642
 msgid "Cannot crop because the current selection is empty."
 msgstr "æ? æ³?å?ªè£?ï¼?å? ä¸ºå½?å??é??å?ºä¸ºç©ºã??"
 
-#: ../app/actions/image-commands.c:628
+#: ../app/actions/image-commands.c:606
 msgid "Change Print Size"
 msgstr "æ?¹å??æ??å?°å¤§å°?"
 
-#: ../app/actions/image-commands.c:669
+#: ../app/actions/image-commands.c:647 ../app/core/gimpimage-scale.c:82
 msgid "Scale Image"
 msgstr "缩æ?¾å?¾å??"
 
 #. Scaling
-#: ../app/actions/image-commands.c:680 ../app/actions/layers-commands.c:1145
-#: ../app/dialogs/preferences-dialog.c:1899
-#: ../app/pdb/drawable-transform-cmds.c:708
-#: ../app/pdb/drawable-transform-cmds.c:786 ../app/pdb/image-cmds.c:408
-#: ../app/pdb/image-cmds.c:444 ../app/pdb/item-transform-cmds.c:512
-#: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378
-#: ../app/pdb/transform-tools-cmds.c:302 ../app/tools/gimpscaletool.c:106
+#: ../app/actions/image-commands.c:658 ../app/actions/layers-commands.c:1104
+#: ../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:292
+#: ../app/pdb/layer-cmds.c:337 ../app/pdb/transform-tools-cmds.c:291
+#: ../app/tools/gimpscaletool.c:107
 msgid "Scaling"
 msgstr "缩�"
 
+#
 #: ../app/actions/images-actions.c:43
-msgctxt "images-action"
 msgid "Images Menu"
 msgstr "å?¾å??è??å??"
 
+#
 #: ../app/actions/images-actions.c:47
-msgctxt "images-action"
 msgid "_Raise Views"
-msgstr "å??é«?è§?å?¾(_R)"
+msgstr "è§?å?¾å??ç½®(_R)"
 
+#
 #: ../app/actions/images-actions.c:48
-msgctxt "images-action"
 msgid "Raise this image's displays"
 msgstr "å??é«?æ­¤å?¾å??ç??æ?¾ç¤º"
 
-#: ../app/actions/images-actions.c:53
-msgctxt "images-action"
+#
+#: ../app/actions/images-actions.c:53 ../app/actions/view-actions.c:75
 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:49
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:48
 msgid "Layers Menu"
 msgstr "å?¾å±?è??å??"
 
-#: ../app/actions/layers-actions.c:53
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:51
 msgid "_Layer"
 msgstr "��(_L)"
 
-#: ../app/actions/layers-actions.c:55
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:52
 msgid "Stac_k"
 msgstr "å ?æ ?(_K)"
 
-#: ../app/actions/layers-actions.c:57
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:53
+msgid "Te_xt to Selection"
+msgstr "æ??æ?¬å?°é??å?º(_X)"
+
+#
+#: ../app/actions/layers-actions.c:54
 msgid "_Mask"
 msgstr "è??æ?¿(_M)"
 
-#: ../app/actions/layers-actions.c:59
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:55
 msgid "Tr_ansparency"
 msgstr "é??æ??(_A)"
 
-#: ../app/actions/layers-actions.c:61
-msgctxt "layers-action"
-msgid "_Transform"
-msgstr "å??æ?¢(_T)"
-
-#: ../app/actions/layers-actions.c:63
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:57
 msgid "_Properties"
 msgstr "å±?æ?§(_P)"
 
-#: ../app/actions/layers-actions.c:65
-msgctxt "layers-action"
-msgid "_Opacity"
-msgstr "ä¸?é??æ??度(_O)"
-
-#: ../app/actions/layers-actions.c:67
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:59
 msgid "Layer _Mode"
 msgstr "��模�(_M)"
 
-#: ../app/actions/layers-actions.c:70
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:62
 msgid "Te_xt Tool"
-msgstr "æ??å­?å·¥å?·(_X)"
+msgstr "æ??æ?¬å·¥å?·(_X)"
 
-#: ../app/actions/layers-actions.c:71
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:63
 msgid "Activate the text tool on this text layer"
 msgstr "å?¨æ­¤æ??å­?å±?ä¸?æ¿?æ´»æ??æ?¬å·¥å?·"
 
-#: ../app/actions/layers-actions.c:76
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:68
 msgid "_Edit Layer Attributes..."
 msgstr "������(_E)..."
 
-#: ../app/actions/layers-actions.c:77
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:69
 msgid "Edit the layer's name"
 msgstr "ç¼?è¾?å?¾å±?å??称"
 
-#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:598
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:74
 msgid "_New Layer..."
 msgstr "�建��(_N)..."
 
-#: ../app/actions/layers-actions.c:83
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:75
 msgid "Create a new layer and add it to the image"
 msgstr "å??建æ?°å?¾å±?并å°?å?¶æ·»å? å?°å?¾å??"
 
-#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:599
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:80
 msgid "_New Layer"
 msgstr "�建��(_N)"
 
-#: ../app/actions/layers-actions.c:89
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:81
 msgid "Create a new layer with last used values"
 msgstr "æ??ä¸?次使ç?¨ç??å?¼æ?°å»ºå?¾å±?"
 
-#: ../app/actions/layers-actions.c:94
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:86
 msgid "New from _Visible"
 msgstr "ä»?å?¯è§?项å??建(_V)"
 
-#: ../app/actions/layers-actions.c:96
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:87
 msgid "Create a new layer from what is visible in this image"
 msgstr "ä»?æ­¤å?¾å??中ç??å?¯è§?å??容å??建æ?°å?¾å±?"
 
-#: ../app/actions/layers-actions.c:101
-msgctxt "layers-action"
-msgid "New Layer _Group..."
-msgstr "�建��群�(_G)..."
-
-#: ../app/actions/layers-actions.c:102
-msgctxt "layers-action"
-msgid "Create a new layer group and add it to the image"
-msgstr "å??建æ?°å?¾å±?群ç»?并å°?å?¶æ·»å? å?°å?¾å??"
-
-#: ../app/actions/layers-actions.c:107
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:92
 msgid "D_uplicate Layer"
 msgstr "����(_U)"
 
-#: ../app/actions/layers-actions.c:109
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:93
 msgid "Create a duplicate of the layer and add it to the image"
 msgstr "å??建å?¾å±?ç??å?¯æ?¬ï¼?并å°?å?¶æ·»å? å?°å?¾å??"
 
-#: ../app/actions/layers-actions.c:114
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:98
 msgid "_Delete Layer"
 msgstr "����(_D)"
 
-#: ../app/actions/layers-actions.c:115
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:99
 msgid "Delete this layer"
 msgstr "��此��"
 
-#: ../app/actions/layers-actions.c:120
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:104
 msgid "_Raise Layer"
 msgstr "å??é«?å?¾å±?(_R)"
 
-#: ../app/actions/layers-actions.c:121
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:105
 msgid "Raise this layer one step in the layer stack"
 msgstr "å?¨å?¾å±?æ ?中使此å?¾å±?å??é«?ä¸?æ­¥"
 
-#: ../app/actions/layers-actions.c:126
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:110
 msgid "Layer to _Top"
 msgstr "å?¾å±?å??è?³é¡¶ç«¯(_T)"
 
-#: ../app/actions/layers-actions.c:127
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:111
 msgid "Move this layer to the top of the layer stack"
 msgstr "å°?æ­¤å?¾å±?移å?¨è?³å?¾å±?æ ?ç??顶端"
 
-#: ../app/actions/layers-actions.c:132
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:116
 msgid "_Lower Layer"
 msgstr "é??ä½?å?¾å±?(_L)"
 
-#: ../app/actions/layers-actions.c:133
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:117
 msgid "Lower this layer one step in the layer stack"
 msgstr "å?¨å?¾å±?æ ?中使此å?¾å±?é??ä½?ä¸?æ­¥"
 
-#: ../app/actions/layers-actions.c:138
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:122
 msgid "Layer to _Bottom"
 msgstr "å?¾å±?é??è?³åº?端(_B)"
 
-#: ../app/actions/layers-actions.c:139
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:123
 msgid "Move this layer to the bottom of the layer stack"
 msgstr "å°?æ­¤å?¾å±?移å?¨è?³å?¾å±?æ ?ç??åº?端"
 
-#: ../app/actions/layers-actions.c:144
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:128
 msgid "_Anchor Layer"
 msgstr "����(_A)"
 
-#: ../app/actions/layers-actions.c:145
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:129
 msgid "Anchor the floating layer"
 msgstr "��浮���"
 
-#: ../app/actions/layers-actions.c:150
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:134
 msgid "Merge Do_wn"
 msgstr "å??ä¸?å??并(_W)"
 
-#: ../app/actions/layers-actions.c:151
-#, fuzzy
-msgctxt "layers-action"
-msgid "Merge this layer with the first visible layer below it"
+#
+#: ../app/actions/layers-actions.c:135
+msgid "Merge this layer with the one below it"
 msgstr "å°?æ­¤å?¾å±?ä¸?å?¶ä¸?ç??ä¸?å±?å??并"
 
-#: ../app/actions/layers-actions.c:156
-msgctxt "layers-action"
-msgid "Merge Layer Group"
-msgstr "å??并å?¾å±?群ç»?"
-
-#: ../app/actions/layers-actions.c:157
-msgctxt "layers-action"
-msgid "Merge the layer group's layers into one normal layer"
-msgstr "å°?å?¾å±?群ç»?中ç??å?¾å±?å??并è?³ä¸?个æ?®é??å?¾å±?"
-
-#: ../app/actions/layers-actions.c:162
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:140
 msgid "Merge _Visible Layers..."
 msgstr "å??并å?¯è§?å?¾å±?(_V)..."
 
-#: ../app/actions/layers-actions.c:163
-msgctxt "layers-action"
-msgid "Merge all visible layers into one layer"
-msgstr "å°?æ??æ??ç??å?¯è§?å?¾å±?å??并为ä¸?个å?¾å±?"
-
-#: ../app/actions/layers-actions.c:168
-msgctxt "layers-action"
-msgid "_Flatten Image"
-msgstr "å¹³æ?´å?¾å??(_F)"
-
-#: ../app/actions/layers-actions.c:169
-msgctxt "layers-action"
-msgid "Merge all layers into one and remove transparency"
-msgstr "å°?æ??æ??ç??å?¾å±?å??并为ä¸?个并移é?¤é??æ??"
-
-#: ../app/actions/layers-actions.c:174
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:152
 msgid "_Discard Text Information"
-msgstr "æ?¾å¼?æ??å­?ä¿¡æ?¯(_D)"
+msgstr "丢å¼?æ??å­?ä¿¡æ?¯(_D)"
 
-#: ../app/actions/layers-actions.c:175
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:153
 msgid "Turn this text layer into a normal layer"
 msgstr "å°?æ­¤æ??å­?å?¾å±?转æ?¢ä¸ºæ?®é??å?¾å±?"
 
-#: ../app/actions/layers-actions.c:180
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:158
 msgid "Text to _Path"
 msgstr "æ??å­?å?°è·¯å¾?(_P)"
 
-#: ../app/actions/layers-actions.c:181
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:159
 msgid "Create a path from this text layer"
 msgstr "æ ¹æ?®æ­¤æ??å­?å?¾å±?å??建路å¾?"
 
-#: ../app/actions/layers-actions.c:186
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:164
 msgid "Text alon_g Path"
 msgstr "æ??å­?对é½?è·¯å¾?(_G)"
 
-#: ../app/actions/layers-actions.c:187
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:165
 msgid "Warp this layer's text along the current path"
 msgstr "沿活å?¨è·¯å¾?ç?¯ç»?æ­¤å±?ç??æ??å­?"
 
-#: ../app/actions/layers-actions.c:192
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:170
 msgid "Layer B_oundary Size..."
 msgstr "å?¾å±?è¾¹ç??大å°?(_O)..."
 
-#: ../app/actions/layers-actions.c:193
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:171
 msgid "Adjust the layer dimensions"
 msgstr "����尺寸"
 
-#: ../app/actions/layers-actions.c:198
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:176
 msgid "Layer to _Image Size"
 msgstr "å?¾å±?å?°å?¾å??大å°?(_I)"
 
-#: ../app/actions/layers-actions.c:199
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:177
 msgid "Resize the layer to the size of the image"
 msgstr "å°?å?¾å±?ç??大å°?é??设为å?¾å??ç??尺寸"
 
-#: ../app/actions/layers-actions.c:204
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:182
 msgid "_Scale Layer..."
 msgstr "缩���(_S)..."
 
-#: ../app/actions/layers-actions.c:205
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:183
 msgid "Change the size of the layer content"
 msgstr "æ?¹å??æ­¤å?¾å±?å??容ç??大å°?"
 
-#: ../app/actions/layers-actions.c:210
-msgctxt "layers-action"
-msgid "_Crop to Selection"
-msgstr "å?ªè£?å?°é??å?º(_C)"
-
-#: ../app/actions/layers-actions.c:211
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:189
 msgid "Crop the layer to the extents of the selection"
 msgstr "å?ªè£?å?¾å±?å?°é??å?ºç??è??å?´"
 
-#: ../app/actions/layers-actions.c:216
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:194
 msgid "Add La_yer Mask..."
 msgstr "æ·»å? å?¾å±?è??æ?¿(_Y)..."
 
-#: ../app/actions/layers-actions.c:218
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:195
 msgid "Add a mask that allows non-destructive editing of transparency"
 msgstr "æ·»å? è??ç??以å??许对é??æ??度ç??é??ç ´å??æ?§ç¼?è¾?"
 
-#: ../app/actions/layers-actions.c:223
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:200
 msgid "Add Alpha C_hannel"
 msgstr "æ·»å?  Alpha é??é??(_H)"
 
-#: ../app/actions/layers-actions.c:224
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:201
 msgid "Add transparency information to the layer"
 msgstr "æ·»å? é??æ??度信æ?¯å?°å?¾å±?"
 
-#: ../app/actions/layers-actions.c:229
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:206
 msgid "_Remove Alpha Channel"
 msgstr "移é?¤ Alpha é??é??(_R)"
 
-#: ../app/actions/layers-actions.c:230
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:207
 msgid "Remove transparency information from the layer"
 msgstr "移é?¤å?¾å±?ç??é??æ??度信æ?¯"
 
-#: ../app/actions/layers-actions.c:238
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:215
 msgid "Lock Alph_a Channel"
 msgstr "é??å®? Alph_a é??é??"
 
-#: ../app/actions/layers-actions.c:240
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:216
 msgid "Keep transparency information on this layer from being modified"
 msgstr "å?¨å?¾å??ä¸?æ?´æ?¹æ?¶ä¿?ç??é??æ??度信æ?¯"
 
-#: ../app/actions/layers-actions.c:246
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:222
 msgid "_Edit Layer Mask"
 msgstr "ç¼?è¾?å?¾å±?è??æ?¿(_E)"
 
-#: ../app/actions/layers-actions.c:247
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:223
 msgid "Work on the layer mask"
 msgstr "å?¨å?¾å±?è??æ?¿ä¸?å·¥ä½?"
 
-#: ../app/actions/layers-actions.c:253
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:229
 msgid "S_how Layer Mask"
 msgstr "æ?¾ç¤ºå?¾å±?è??æ?¿(_H)"
 
-#: ../app/actions/layers-actions.c:259
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:235
 msgid "_Disable Layer Mask"
 msgstr "ç¦?ç?¨å?¾å±?è??æ?¿(_D)"
 
-#: ../app/actions/layers-actions.c:260
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:236
 msgid "Dismiss the effect of the layer mask"
 msgstr "æ??å¼?å?¾å±?è??æ?¿æ??æ??"
 
-#: ../app/actions/layers-actions.c:269
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:245
 msgid "Apply Layer _Mask"
 msgstr "åº?ç?¨å?¾å±?è??æ?¿(_M)"
 
-#: ../app/actions/layers-actions.c:270
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:246
 msgid "Apply the effect of the layer mask and remove it"
 msgstr "åº?ç?¨å?¾å±?è??æ?¿æ??æ??并移é?¤å®?"
 
-#: ../app/actions/layers-actions.c:275
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:251
 msgid "Delete Layer Mas_k"
 msgstr "å? é?¤å?¾å±?è??æ?¿(_K)"
 
-#: ../app/actions/layers-actions.c:276
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:252
 msgid "Remove the layer mask and its effect"
 msgstr "移å? å?¾å±?è??æ?¿å??å?¶æ??æ??"
 
-#: ../app/actions/layers-actions.c:284
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:260
 msgid "_Mask to Selection"
 msgstr "è??æ?¿å?°é??å?º(_M)"
 
-#: ../app/actions/layers-actions.c:285
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:261
 msgid "Replace the selection with the layer mask"
 msgstr "ç?¨å?¾å±?è??æ?¿æ?¿ä»£é??å?º"
 
-#: ../app/actions/layers-actions.c:290
-msgctxt "layers-action"
-msgid "_Add to Selection"
-msgstr "æ·»å? å?°é??å?º(_A)"
-
-#: ../app/actions/layers-actions.c:291
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:267
 msgid "Add the layer mask to the current selection"
 msgstr "å°?å?¾å±?è??æ?¿æ·»å? å?°å½?å??é??å?º"
 
-#: ../app/actions/layers-actions.c:296 ../app/actions/layers-actions.c:325
-msgctxt "layers-action"
-msgid "_Subtract from Selection"
-msgstr "ä»?é??å?ºä¸­å??å?»(_S)"
-
-#: ../app/actions/layers-actions.c:297
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:273
 msgid "Subtract the layer mask from the current selection"
 msgstr "ä»?å½?å??é??å?ºå??å?»å?¾å±?è??ç??"
 
-#: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:332
-msgctxt "layers-action"
-msgid "_Intersect with Selection"
-msgstr "ä¸?é??å?ºç?¸äº¤(_I)"
-
-#: ../app/actions/layers-actions.c:303
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:279
 msgid "Intersect the layer mask with the current selection"
 msgstr "交å??å?¾å±?è??ç??å??å½?å??é??å?º"
 
-#: ../app/actions/layers-actions.c:311
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:287
 msgid "Al_pha to Selection"
 msgstr "Al_pha å?°é??å?º"
 
-#: ../app/actions/layers-actions.c:313
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:288
 msgid "Replace the selection with the layer's alpha channel"
 msgstr "ç?¨å?¾å±?ç?? Alpha é??é??æ?¿æ?¢é??å?º"
 
-#: ../app/actions/layers-actions.c:318
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:293 ../app/actions/layers-actions.c:320
 msgid "A_dd to Selection"
 msgstr "æ·»å? å?°é??å?º(_D)"
 
-#: ../app/actions/layers-actions.c:320
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:294
 msgid "Add the layer's alpha channel to the current selection"
 msgstr "å°?å?¾å±?ç?? Alpha é??é??æ·»å? å?°å½?å??é??å?º"
 
-#: ../app/actions/layers-actions.c:327
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:300
 msgid "Subtract the layer's alpha channel from the current selection"
 msgstr "ä»?å½?å??é??å?ºå??å?»å?¾å±?ç?? Alpha é??é??"
 
-#: ../app/actions/layers-actions.c:334
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:306
 msgid "Intersect the layer's alpha channel with the current selection"
 msgstr "交å??å?¾å±?ç?? Alpha é??é??å??å½?å??é??å?º"
 
-#: ../app/actions/layers-actions.c:342
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:314
+msgid "_Text to Selection"
+msgstr "æ??å­?å?°é??å?º(_T)"
+
+#
+#: ../app/actions/layers-actions.c:315
+msgid "Replace the selection with the text layer's outline"
+msgstr "ç?¨æ??å­?å?¾å±?ç??è½®å»?æ?¿æ?¢é??å?º"
+
+#
+#: ../app/actions/layers-actions.c:321
+msgid "Add the text layer's outline to the current selection"
+msgstr "å°?æ??å­?å?¾å±?ç??è½®å»?æ·»å? å?°å½?å??é??å?º"
+
+#
+#: ../app/actions/layers-actions.c:327
+msgid "Subtract the text layer's outline from the current selection"
+msgstr "ä»?å½?å??é??å?ºå??å?»æ??å­?å?¾å±?ç??è½®å»?"
+
+#
+#: ../app/actions/layers-actions.c:333
+msgid "Intersect the text layer's outline with the current selection"
+msgstr "交å??æ??å­?å?¾å±?ç??è½®å»?å??å½?å??é??å?º"
+
+#
+#: ../app/actions/layers-actions.c:341
 msgid "Select _Top Layer"
 msgstr "é??æ?©é¡¶ç«¯å?¾å±?(_T)"
 
-#: ../app/actions/layers-actions.c:343
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:342
 msgid "Select the topmost layer"
 msgstr "é??æ?©æ??顶端å?¾å±?"
 
-#: ../app/actions/layers-actions.c:348
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:347
 msgid "Select _Bottom Layer"
 msgstr "é??æ?©åº?端å?¾å±?(_B)"
 
-#: ../app/actions/layers-actions.c:349
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:348
 msgid "Select the bottommost layer"
 msgstr "é??æ?©æ??åº?端å?¾å±?"
 
-#: ../app/actions/layers-actions.c:354
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:353
 msgid "Select _Previous Layer"
 msgstr "é??æ?©å??ä¸?å?¾å±?(_P)"
 
-#: ../app/actions/layers-actions.c:355
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:354
 msgid "Select the layer above the current layer"
 msgstr "é??æ?©æ´»å?¨å?¾å±?ä¸?æ?¹ç??å?¾å±?"
 
-#: ../app/actions/layers-actions.c:360
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:359
 msgid "Select _Next Layer"
 msgstr "é??æ?©å??ä¸?å?¾å±?(_N)"
 
-#: ../app/actions/layers-actions.c:361
-msgctxt "layers-action"
+#
+#: ../app/actions/layers-actions.c:360
 msgid "Select the layer below the current layer"
 msgstr "é??æ?©æ´»å?¨å?¾å±?ä¸?æ?¹ç??å?¾å±?"
 
-#. Will be followed with e.g. "Shift-Click
-#. on thumbnail"
-#.
-#: ../app/actions/layers-actions.c:442
-#, fuzzy
-msgid "Shortcut: "
-msgstr "å¿«æ?·é?®"
-
-#. Will be prepended with a modifier key
-#. string, e.g. "Shift"
-#.
-#: ../app/actions/layers-actions.c:447
-msgid "-Click on thumbnail in Layers dockable"
-msgstr ""
-
-#: ../app/actions/layers-actions.c:593 ../app/actions/layers-actions.c:594
-msgctxt "layers-action"
-msgid "To _New Layer"
-msgstr "����(_N)"
+#
+#: ../app/actions/layers-actions.c:368
+msgid "Set Opacity"
+msgstr "ä¸?é??æ??度"
 
-#: ../app/actions/layers-commands.c:203
+#: ../app/actions/layers-commands.c:204
 msgid "Layer Attributes"
 msgstr "����"
 
-#: ../app/actions/layers-commands.c:206
+#: ../app/actions/layers-commands.c:207
 msgid "Edit Layer Attributes"
 msgstr "������"
 
-#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:265
-msgid "Layer"
-msgstr "��"
-
-#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320
-#: ../app/widgets/gimpdrawabletreeview.c:337
-#: ../app/widgets/gimplayertreeview.c:846
+#: ../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:326
+#: ../app/widgets/gimplayertreeview.c:835
 msgid "New Layer"
 msgstr "�建��"
 
@@ -3794,409 +3303,395 @@ msgstr "�建��"
 msgid "Create a New Layer"
 msgstr "å??建æ?°å?¾å±?"
 
-#: ../app/actions/layers-commands.c:356
+#: ../app/actions/layers-commands.c:355
 msgid "Visible"
 msgstr "��"
 
-#: ../app/actions/layers-commands.c:618
+#: ../app/actions/layers-commands.c:574
 msgid "Set Layer Boundary Size"
 msgstr "设置å?¾å±?è¾¹ç??大å°?"
 
-#: ../app/actions/layers-commands.c:663
+#: ../app/actions/layers-commands.c:615 ../app/core/gimplayer.c:251
 msgid "Scale Layer"
 msgstr "缩���"
 
-#: ../app/actions/layers-commands.c:701
+#: ../app/actions/layers-commands.c:652
 msgid "Crop Layer"
 msgstr "����"
 
-#: ../app/actions/layers-commands.c:1080
+#: ../app/actions/layers-commands.c:791
+msgid "Layer Mask to Selection"
+msgstr "å?¾å±?è??æ?¿å?°é??å?º"
+
+#: ../app/actions/layers-commands.c:1039
 msgid "Please select a channel first"
-msgstr "请å??é??æ?©é??é??"
+msgstr "请å??é??æ?©ä¸?个é??é??"
 
-#: ../app/actions/layers-commands.c:1088
-#: ../app/dialogs/layer-add-mask-dialog.c:82
+#: ../app/actions/layers-commands.c:1047 ../app/core/gimplayer.c:1283
+#: ../app/dialogs/layer-add-mask-dialog.c:81
 msgid "Add Layer Mask"
 msgstr "æ·»å? å?¾å±?è??æ?¿"
 
-#: ../app/actions/palette-editor-actions.c:43
-msgctxt "palette-editor-action"
+#
+#: ../app/actions/palette-editor-actions.c:44
 msgid "Palette Editor Menu"
 msgstr "è?²æ?¿ç¼?è¾?å?¨è??å??"
 
-#: ../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"
+#
+#: ../app/actions/palette-editor-actions.c:54
 msgid "_Delete Color"
 msgstr "����(_D)"
 
-#: ../app/actions/palette-editor-actions.c:54
-msgctxt "palette-editor-action"
-msgid "Delete this entry"
-msgstr "��此项"
+#
+#: ../app/actions/palette-editor-actions.c:55
+msgid "Delete color"
+msgstr "����(_D)"
 
-#: ../app/actions/palette-editor-actions.c:62
-msgctxt "palette-editor-action"
+#
+#: ../app/actions/palette-editor-actions.c:63
 msgid "Edit Active Palette"
 msgstr "��活���"
 
-#: ../app/actions/palette-editor-actions.c:71
-msgctxt "palette-editor-action"
+#
+#: ../app/actions/palette-editor-actions.c:72
 msgid "New Color from _FG"
 msgstr "ä»?å??æ?¯è?²æ?°å»ºé¢?è?²(_F)"
 
+#
 #: ../app/actions/palette-editor-actions.c:73
-msgctxt "palette-editor-action"
-msgid "Create a new entry from the foreground color"
-msgstr "ä»?å??æ?¯è?²æ?°å»ºé¢?è?²é¡¹"
+msgid "New color from foreground color"
+msgstr "æ·»å? å½?å??å??æ?¯è?²"
 
+#
 #: ../app/actions/palette-editor-actions.c:78
-msgctxt "palette-editor-action"
 msgid "New Color from _BG"
 msgstr "ä»?è??æ?¯è?²æ?°å»ºé¢?è?²(_B)"
 
-#: ../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:79
+msgid "New color from background color"
+msgstr "æ·»å? å½?å??è??æ?¯è?²"
 
-#: ../app/actions/palette-editor-actions.c:88
+#: ../app/actions/palette-editor-actions.c:87
+#: ../app/actions/view-actions.c:261
 msgid "Zoom _In"
 msgstr "�大(_I)"
 
-#: ../app/actions/palette-editor-actions.c:94
+#: ../app/actions/palette-editor-actions.c:93
+#: ../app/actions/view-actions.c:255
 msgid "Zoom _Out"
 msgstr "缩�(_O)"
 
-#: ../app/actions/palette-editor-actions.c:100
+#: ../app/actions/palette-editor-actions.c:99
 msgid "Zoom _All"
-msgstr "���示(_A)"
+msgstr "å??å§?大å°?(_A)"
 
-#: ../app/actions/palette-editor-commands.c:68
+#: ../app/actions/palette-editor-commands.c:69
 msgid "Edit Palette Color"
 msgstr "������"
 
-#: ../app/actions/palette-editor-commands.c:70
+#: ../app/actions/palette-editor-commands.c:71
 msgid "Edit Color Palette Entry"
 msgstr "������"
 
-#: ../app/actions/palettes-actions.c:43
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:44
 msgid "Palettes Menu"
 msgstr "è?²æ?¿è??å??"
 
-#: ../app/actions/palettes-actions.c:47
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:48
 msgid "_New Palette"
 msgstr "�建��(_N)"
 
-#: ../app/actions/palettes-actions.c:48
-msgctxt "palettes-action"
-msgid "Create a new palette"
-msgstr "å??建æ?°ç??模æ?¿"
+#
+#: ../app/actions/palettes-actions.c:49
+msgid "New palette"
+msgstr "�建��(_N)"
 
-#: ../app/actions/palettes-actions.c:53
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:54
 msgid "_Import Palette..."
 msgstr "导���(_I)..."
 
-#: ../app/actions/palettes-actions.c:54
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:55
 msgid "Import palette"
 msgstr "导���"
 
-#: ../app/actions/palettes-actions.c:59
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:60
 msgid "D_uplicate Palette"
 msgstr "����(_U)"
 
-#: ../app/actions/palettes-actions.c:60
-msgctxt "palettes-action"
-msgid "Duplicate this palette"
-msgstr "����"
+#
+#: ../app/actions/palettes-actions.c:61
+msgid "Duplicate palette"
+msgstr "����(_U)"
 
-#: ../app/actions/palettes-actions.c:65
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:66
 msgid "_Merge Palettes..."
 msgstr "å??并è?²æ?¿(_M)..."
 
-#: ../app/actions/palettes-actions.c:66
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:67
 msgid "Merge palettes"
 msgstr "å??并è?²æ?¿"
 
-#: ../app/actions/palettes-actions.c:71
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:72
 msgid "Copy Palette _Location"
 msgstr "�����置(_L)"
 
-#: ../app/actions/palettes-actions.c:72
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:73
 msgid "Copy palette file location to clipboard"
 msgstr "å°?è?²æ?¿æ??件ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/palettes-actions.c:77
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:78
 msgid "_Delete Palette"
 msgstr "����(_D)"
 
-#: ../app/actions/palettes-actions.c:78
-msgctxt "palettes-action"
-msgid "Delete this palette"
-msgstr "��此��"
+#
+#: ../app/actions/palettes-actions.c:79
+msgid "Delete palette"
+msgstr "����(_D)"
 
-#: ../app/actions/palettes-actions.c:83
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:84
 msgid "_Refresh Palettes"
 msgstr "����(_R)"
 
-#: ../app/actions/palettes-actions.c:84
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:85
 msgid "Refresh palettes"
 msgstr "����"
 
-#: ../app/actions/palettes-actions.c:92
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:93
 msgid "_Edit Palette..."
 msgstr "����(_E)..."
 
-#: ../app/actions/palettes-actions.c:93
-msgctxt "palettes-action"
+#
+#: ../app/actions/palettes-actions.c:94
 msgid "Edit palette"
 msgstr "����"
 
-#: ../app/actions/palettes-commands.c:72
+#: ../app/actions/palettes-commands.c:74
 msgid "Merge Palette"
 msgstr "å??并è?²æ?¿"
 
-#: ../app/actions/palettes-commands.c:76
+#: ../app/actions/palettes-commands.c:78
 msgid "Enter a name for the merged palette"
 msgstr "ç»?å·²å??并ç??è?²æ?¿è¾?å?¥ä¸?个å??å­?"
 
-#: ../app/actions/patterns-actions.c:42
-msgctxt "patterns-action"
+#
+#: ../app/actions/patterns-actions.c:43
 msgid "Patterns Menu"
 msgstr "å?¾æ¡?è??å??"
 
-#: ../app/actions/patterns-actions.c:46
-msgctxt "patterns-action"
+#
+#: ../app/actions/patterns-actions.c:47
 msgid "_Open Pattern as Image"
 msgstr "ä½?为å?¾å??æ??å¼?å?¾æ¡?(_O)"
 
-#: ../app/actions/patterns-actions.c:47
-msgctxt "patterns-action"
-msgid "Open this pattern as an image"
-msgstr "ä½?为å?¾å??æ??å¼?å?¾æ¡?"
+#
+#: ../app/actions/patterns-actions.c:48
+msgid "Open pattern as image"
+msgstr "ä½?为å?¾å??æ??å¼?å?¾æ¡?(_O)"
 
-#: ../app/actions/patterns-actions.c:52
-msgctxt "patterns-action"
+#
+#: ../app/actions/patterns-actions.c:53
 msgid "_New Pattern"
 msgstr "�建��(_N)"
 
-#: ../app/actions/patterns-actions.c:53
-msgctxt "patterns-action"
-msgid "Create a new pattern"
-msgstr "å??建æ?°ç??å?¾æ¡?"
+#
+#: ../app/actions/patterns-actions.c:54
+msgid "New pattern"
+msgstr "�建��(_N)"
 
-#: ../app/actions/patterns-actions.c:58
-msgctxt "patterns-action"
+#
+#: ../app/actions/patterns-actions.c:59
 msgid "D_uplicate Pattern"
 msgstr "����(_U)"
 
-#: ../app/actions/patterns-actions.c:59
-msgctxt "patterns-action"
-msgid "Duplicate this pattern"
-msgstr "��此��"
+#
+#: ../app/actions/patterns-actions.c:60
+msgid "Duplicate pattern"
+msgstr "����(_U)"
 
-#: ../app/actions/patterns-actions.c:64
-msgctxt "patterns-action"
+#
+#: ../app/actions/patterns-actions.c:65
 msgid "Copy Pattern _Location"
 msgstr "�����置(_L)"
 
-#: ../app/actions/patterns-actions.c:65
-msgctxt "patterns-action"
+#
+#: ../app/actions/patterns-actions.c:66
 msgid "Copy pattern file location to clipboard"
 msgstr "å°?å?¾æ¡?æ??件ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
 
-#: ../app/actions/patterns-actions.c:70
-msgctxt "patterns-action"
+#
+#: ../app/actions/patterns-actions.c:71
 msgid "_Delete Pattern"
 msgstr "����(_D)"
 
-#: ../app/actions/patterns-actions.c:71
-msgctxt "patterns-action"
-msgid "Delete this pattern"
-msgstr "��此��"
+#
+#: ../app/actions/patterns-actions.c:72
+msgid "Delete pattern"
+msgstr "����(_D)"
 
-#: ../app/actions/patterns-actions.c:76
-msgctxt "patterns-action"
+#
+#: ../app/actions/patterns-actions.c:77
 msgid "_Refresh Patterns"
 msgstr "����(_R)"
 
-#: ../app/actions/patterns-actions.c:77
-msgctxt "patterns-action"
+#
+#: ../app/actions/patterns-actions.c:78
 msgid "Refresh patterns"
 msgstr "����"
 
-#: ../app/actions/patterns-actions.c:85
-msgctxt "patterns-action"
+#
+#: ../app/actions/patterns-actions.c:86
 msgid "_Edit Pattern..."
 msgstr "����(_E)..."
 
-#: ../app/actions/patterns-actions.c:86
-msgctxt "patterns-action"
+#
+#: ../app/actions/patterns-actions.c:87
 msgid "Edit pattern"
 msgstr "����"
 
-#: ../app/actions/plug-in-actions.c:84
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:83
 msgid "Filte_rs"
 msgstr "滤é??(_R)"
 
-#: ../app/actions/plug-in-actions.c:86
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:84
 msgid "Recently Used"
 msgstr "æ??è¿?使ç?¨ç??"
 
-#: ../app/actions/plug-in-actions.c:88
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:85
 msgid "_Blur"
 msgstr "模�(_B)"
 
-#: ../app/actions/plug-in-actions.c:90
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:86
 msgid "_Noise"
 msgstr "��(_N)"
 
-#: ../app/actions/plug-in-actions.c:92
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:87
 msgid "Edge-De_tect"
 msgstr "边���(_T)"
 
-#: ../app/actions/plug-in-actions.c:94
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:88
 msgid "En_hance"
 msgstr "�强(_H)"
 
-#: ../app/actions/plug-in-actions.c:96
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:89
 msgid "C_ombine"
 msgstr "ç»?å??(_O)"
 
-#: ../app/actions/plug-in-actions.c:98
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:90
 msgid "_Generic"
 msgstr "常�(_G)"
 
-#: ../app/actions/plug-in-actions.c:100
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:91
 msgid "_Light and Shadow"
 msgstr "å??æº?å??é?´å½±(_L)"
 
-#: ../app/actions/plug-in-actions.c:102
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:92
 msgid "_Distorts"
 msgstr "æ?­æ?²(_D)"
 
-#: ../app/actions/plug-in-actions.c:104
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:93
 msgid "_Artistic"
 msgstr "��(_A)"
 
-#: ../app/actions/plug-in-actions.c:106
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:94
 msgid "_Decor"
 msgstr "�饰"
 
-#: ../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"
+#
+#: ../app/actions/plug-in-actions.c:96
 msgid "_Render"
 msgstr "ç»?å?¶(_R)"
 
-#: ../app/actions/plug-in-actions.c:112
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:97
 msgid "_Clouds"
 msgstr "�彩(_C)"
 
-#: ../app/actions/plug-in-actions.c:114
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:98
 msgid "_Nature"
 msgstr "��(_N)"
 
-#: ../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"
+#
+#: ../app/actions/plug-in-actions.c:100
 msgid "_Web"
 msgstr "�页(_W)"
 
-#: ../app/actions/plug-in-actions.c:120
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:101
 msgid "An_imation"
 msgstr "��(_I)"
 
-#: ../app/actions/plug-in-actions.c:123
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:104
 msgid "Reset all _Filters"
 msgstr "é??ç½®æ??æ??滤é??(_F)"
 
-#: ../app/actions/plug-in-actions.c:124
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:105
 msgid "Reset all plug-ins to their default settings"
 msgstr "å°?å?¨é?¨æ??件é??置为å?¶é»?认设置"
 
-#: ../app/actions/plug-in-actions.c:132
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:113
 msgid "Re_peat Last"
 msgstr "é??å¤?ä¸?次(_P)"
 
-#: ../app/actions/plug-in-actions.c:134
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:114
 msgid "Rerun the last used plug-in using the same settings"
 msgstr "ç?¨å??æ ·ç??设置é??æ?°è¿?è¡?ä¸?次使ç?¨ç??æ??件"
 
-#: ../app/actions/plug-in-actions.c:139
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:119
 msgid "R_e-Show Last"
 msgstr "���次(_E)"
 
-#: ../app/actions/plug-in-actions.c:140
-msgctxt "plug-in-action"
+#
+#: ../app/actions/plug-in-actions.c:120
 msgid "Show the last used plug-in dialog again"
 msgstr "å??次æ?¾ç¤ºä¸?次使ç?¨ç??æ??件对è¯?æ¡?"
 
-#: ../app/actions/plug-in-actions.c:531
+#: ../app/actions/plug-in-actions.c:503
 #, c-format
 msgid "Re_peat \"%s\""
 msgstr "é??å¤?â??%sâ??(_P)"
 
-#: ../app/actions/plug-in-actions.c:532
+#: ../app/actions/plug-in-actions.c:504
 #, c-format
 msgid "R_e-Show \"%s\""
 msgstr "é??æ?°æ?¾ç¤ºâ??%sâ??(_E)"
 
-#: ../app/actions/plug-in-actions.c:548
+#: ../app/actions/plug-in-actions.c:520
 msgid "Repeat Last"
 msgstr "é??å¤?ä¸?次"
 
-#: ../app/actions/plug-in-actions.c:550
+#: ../app/actions/plug-in-actions.c:522
 msgid "Re-Show Last"
 msgstr "���次"
 
@@ -4208,33 +3703,33 @@ msgstr "é??ç½®æ??æ??滤é??"
 msgid "Do you really want to reset all filters to default values?"
 msgstr "æ?¨ç??ç??è¦?å°?æ??æ??滤é??é??ç½®å?°é»?认å?¼å??ï¼?"
 
-#: ../app/actions/quick-mask-actions.c:43
-msgctxt "quick-mask-action"
+#
+#: ../app/actions/quick-mask-actions.c:42
 msgid "Quick Mask Menu"
 msgstr "å¿«é??è??æ?¿è??å??"
 
-#: ../app/actions/quick-mask-actions.c:47
-msgctxt "quick-mask-action"
+#
+#: ../app/actions/quick-mask-actions.c:46
 msgid "_Configure Color and Opacity..."
 msgstr "é??ç½®é¢?è?²å??ä¸?é??æ??度(_C)..."
 
-#: ../app/actions/quick-mask-actions.c:55
-msgctxt "quick-mask-action"
+#
+#: ../app/actions/quick-mask-actions.c:54
 msgid "Toggle _Quick Mask"
 msgstr "å??æ?¢å¿«é??è??æ?¿(_Q)"
 
-#: ../app/actions/quick-mask-actions.c:56
-msgctxt "quick-mask-action"
-msgid "Toggle Quick Mask on/off"
-msgstr "å??æ?¢å¿«é??è??æ?¿å¼?/å?³"
+#: ../app/actions/quick-mask-actions.c:54
+#: ../app/display/gimpdisplayshell.c:1169
+msgid "Toggle Quick Mask"
+msgstr "å??æ?¢å¿«é??è??æ?¿"
 
-#: ../app/actions/quick-mask-actions.c:65
-msgctxt "quick-mask-action"
+#
+#: ../app/actions/quick-mask-actions.c:63
 msgid "Mask _Selected Areas"
 msgstr "æ?©è?½é??中å?ºå??(_S)"
 
-#: ../app/actions/quick-mask-actions.c:70
-msgctxt "quick-mask-action"
+#
+#: ../app/actions/quick-mask-actions.c:68
 msgid "Mask _Unselected Areas"
 msgstr "æ?©è?½é??é??中å?ºå??(_U)"
 
@@ -4254,1349 +3749,1156 @@ msgstr "ç¼?è¾?å¿«é??è??æ?¿é¢?è?²"
 msgid "_Mask opacity:"
 msgstr "è??æ?¿ä¸?é??æ??度(_M)ï¼?"
 
-#: ../app/actions/sample-points-actions.c:39
-msgctxt "sample-points-action"
+#
+#: ../app/actions/sample-points-actions.c:40
 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
-msgctxt "select-action"
-msgid "_All"
-msgstr "��(_A)"
+msgid "select|_All"
+msgstr "å?¨é?¨é??中(_A)"
 
+#
 #: ../app/actions/select-actions.c:51
-msgctxt "select-action"
 msgid "Select everything"
 msgstr "é??æ?©å?¨é?¨"
 
+#
 #: ../app/actions/select-actions.c:56
-msgctxt "select-action"
-msgid "_None"
-msgstr "æ? "
+msgid "select|_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:76
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:75
 msgid "Blur the selection border so that it fades out smoothly"
 msgstr "模ç³?é??å?ºè¾¹ç??以使å?¶å¹³æ»?æ·¡å?º"
 
-#: ../app/actions/select-actions.c:81
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:80
 msgid "_Sharpen"
 msgstr "é??å??(_S)"
 
-#: ../app/actions/select-actions.c:82
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:81
 msgid "Remove fuzzyness from the selection"
 msgstr "移é?¤é??å?ºä¸­ç??模ç³?"
 
-#: ../app/actions/select-actions.c:87
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:86
 msgid "S_hrink..."
 msgstr "�缩(_H)..."
 
-#: ../app/actions/select-actions.c:88
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:87
 msgid "Contract the selection"
 msgstr "æ?¶ç¼©é??å?º"
 
-#: ../app/actions/select-actions.c:93
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:92
 msgid "_Grow..."
 msgstr "��(_G)..."
 
-#: ../app/actions/select-actions.c:94
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:93
 msgid "Enlarge the selection"
 msgstr "æ?©å¤§é??å?º"
 
-#: ../app/actions/select-actions.c:99
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:98
 msgid "Bo_rder..."
 msgstr "è¾¹ç??(_R)..."
 
-#: ../app/actions/select-actions.c:100
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:99
 msgid "Replace the selection by its border"
 msgstr "ç?¨é??å?ºç??è¾¹ç??æ?¿æ?¢é??å?º"
 
-#: ../app/actions/select-actions.c:105
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:104
 msgid "Save to _Channel"
 msgstr "ä¿?å­?å?°é??é??(_C)"
 
-#: ../app/actions/select-actions.c:106
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:105
 msgid "Save the selection to a channel"
 msgstr "å°?é??å?ºä¿?å­?å?°é??é??"
 
-#: ../app/actions/select-actions.c:111
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:110
 msgid "_Stroke Selection..."
 msgstr "å?¾ç?»é??å?º(_S)..."
 
-#: ../app/actions/select-actions.c:112
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:111
 msgid "Paint along the selection outline"
 msgstr "沿é??å?ºç??è½®å»?æ¶?ç?»"
 
-#: ../app/actions/select-actions.c:117
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:116
 msgid "_Stroke Selection"
 msgstr "å?¾ç?»é??å?º(_S)"
 
-#: ../app/actions/select-actions.c:118
-msgctxt "select-action"
+#
+#: ../app/actions/select-actions.c:117
 msgid "Stroke the selection with last used values"
 msgstr "æ??ä¸?次使ç?¨ç??å?¼å?¾ç?»é??å?º"
 
-#: ../app/actions/select-commands.c:155
+#: ../app/actions/select-commands.c:153 ../app/core/gimpselection.c:167
 msgid "Feather Selection"
 msgstr "ç¾½å??é??å?º"
 
-#: ../app/actions/select-commands.c:159
+#: ../app/actions/select-commands.c:157
 msgid "Feather selection by"
 msgstr "ç¾½å??å??å¾?"
 
-#: ../app/actions/select-commands.c:196
+#: ../app/actions/select-commands.c:191 ../app/core/gimpselection.c:174
 msgid "Shrink Selection"
 msgstr "é??å?ºæ?¶ç¼©"
 
-#: ../app/actions/select-commands.c:200
+#: ../app/actions/select-commands.c:195
 msgid "Shrink selection by"
 msgstr "�缩�离"
 
-#: ../app/actions/select-commands.c:208
+#: ../app/actions/select-commands.c:203
 msgid "_Shrink from image border"
 msgstr "ä»?å?¾å??è¾¹ç??æ?¶ç¼©(_S)"
 
-#: ../app/actions/select-commands.c:236
+#: ../app/actions/select-commands.c:228 ../app/core/gimpselection.c:173
 msgid "Grow Selection"
 msgstr "é??å?ºå¢?é?¿"
 
-#: ../app/actions/select-commands.c:240
+#: ../app/actions/select-commands.c:232
 msgid "Grow selection by"
 msgstr "���离"
 
-#: ../app/actions/select-commands.c:266
+#: ../app/actions/select-commands.c:255 ../app/core/gimpselection.c:172
 msgid "Border Selection"
 msgstr "å??é??å?ºè¾¹ç??"
 
-#: ../app/actions/select-commands.c:270
+#: ../app/actions/select-commands.c:259
 msgid "Border selection by"
 msgstr "è¾¹ç??å??å¾?"
 
 #. Feather button
-#: ../app/actions/select-commands.c:279
+#: ../app/actions/select-commands.c:268
 msgid "_Feather border"
 msgstr "ç¾½å??è¾¹ç??(_F)"
 
 #. Edge lock button
-#: ../app/actions/select-commands.c:292
+#: ../app/actions/select-commands.c:281
 msgid "_Lock selection to image edges"
 msgstr "é??å®?é??å?ºå?°å?¾å??è¾¹ç¼?"
 
-#: ../app/actions/select-commands.c:342 ../app/actions/select-commands.c:375
-#: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420
-#: ../app/dialogs/stroke-dialog.c:289
+#: ../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
 msgid "There is no active layer or channel to stroke to."
 msgstr "没æ??æ´»å?¨å?¾å±?æ??é??é??å?¯ä»¥å?¾ç?»ã??"
 
-#: ../app/actions/select-commands.c:348
+#: ../app/actions/select-commands.c:336 ../app/core/gimpselection.c:151
 msgid "Stroke Selection"
 msgstr "å?¾ç?»é??å?º"
 
-#: ../app/actions/templates-actions.c:41
-msgctxt "templates-action"
+#
+#: ../app/actions/templates-actions.c:42
 msgid "Templates Menu"
 msgstr "模æ?¿è??å??"
 
-#: ../app/actions/templates-actions.c:45
-msgctxt "templates-action"
+#
+#: ../app/actions/templates-actions.c:46
 msgid "_Create Image from Template"
 msgstr "ä»?模æ?¿å??建å?¾å??(_C)"
 
-#: ../app/actions/templates-actions.c:46
-msgctxt "templates-action"
+#
+#: ../app/actions/templates-actions.c:47
 msgid "Create a new image from the selected template"
 msgstr "ä»?é??中ç??模æ?¿å??建æ?°ç??å?¾å??"
 
-#: ../app/actions/templates-actions.c:51
-msgctxt "templates-action"
+#
+#: ../app/actions/templates-actions.c:52
 msgid "_New Template..."
 msgstr "�建模�(_N)..."
 
-#: ../app/actions/templates-actions.c:52
-msgctxt "templates-action"
+#
+#: ../app/actions/templates-actions.c:53
 msgid "Create a new template"
 msgstr "å??建æ?°ç??模æ?¿"
 
-#: ../app/actions/templates-actions.c:57
-msgctxt "templates-action"
+#
+#: ../app/actions/templates-actions.c:58
 msgid "D_uplicate Template..."
 msgstr "��模�(_U)..."
 
-#: ../app/actions/templates-actions.c:58
-msgctxt "templates-action"
-msgid "Duplicate this template"
+#
+#: ../app/actions/templates-actions.c:59
+msgid "Duplicate the selected template"
 msgstr "å¤?å?¶é??中ç??模æ?¿"
 
-#: ../app/actions/templates-actions.c:63
-msgctxt "templates-action"
+#
+#: ../app/actions/templates-actions.c:64
 msgid "_Edit Template..."
 msgstr "��模�(_E)..."
 
-#: ../app/actions/templates-actions.c:64
-msgctxt "templates-action"
-msgid "Edit this template"
+#
+#: ../app/actions/templates-actions.c:65
+msgid "Edit the selected template"
 msgstr "��模�"
 
-#: ../app/actions/templates-actions.c:69
-msgctxt "templates-action"
+#
+#: ../app/actions/templates-actions.c:70
 msgid "_Delete Template"
 msgstr "��模�(_D)"
 
-#: ../app/actions/templates-actions.c:70
-msgctxt "templates-action"
-msgid "Delete this template"
+#
+#: ../app/actions/templates-actions.c:71
+msgid "Delete the selected template"
 msgstr "��此模�"
 
-#: ../app/actions/templates-commands.c:111
+#: ../app/actions/templates-commands.c:113
 msgid "New Template"
 msgstr "�建模�"
 
-#: ../app/actions/templates-commands.c:114
+#: ../app/actions/templates-commands.c:116
 msgid "Create a New Template"
 msgstr "å??建æ?°ç??模æ?¿"
 
-#: ../app/actions/templates-commands.c:174
-#: ../app/actions/templates-commands.c:177
+#: ../app/actions/templates-commands.c:175
+#: ../app/actions/templates-commands.c:178
 msgid "Edit Template"
 msgstr "��模�"
 
-#: ../app/actions/templates-commands.c:212
+#: ../app/actions/templates-commands.c:213
 msgid "Delete Template"
 msgstr "��模�"
 
-#: ../app/actions/templates-commands.c:238
+#: ../app/actions/templates-commands.c:239
 #, c-format
 msgid ""
 "Are you sure you want to delete template '%s' from the list and from disk?"
 msgstr "æ?¨ç¡®è®¤è¦?ä»?å??表以å??ç£?ç??中å? é?¤â??%sâ??模æ?¿å??ï¼?"
 
-#: ../app/actions/text-editor-actions.c:43
-msgctxt "text-editor-action"
+#
+#: ../app/actions/text-editor-actions.c:44
 msgid "Open"
 msgstr "æ??å¼?"
 
-#: ../app/actions/text-editor-actions.c:44
-msgctxt "text-editor-action"
+#
+#: ../app/actions/text-editor-actions.c:45
 msgid "Load text from file"
 msgstr "ä»?æ??件中å? è½½æ??æ?¬"
 
-#: ../app/actions/text-editor-actions.c:49
-msgctxt "text-editor-action"
+#: ../app/actions/text-editor-actions.c:50 ../app/core/gimp-edit.c:445
 msgid "Clear"
 msgstr "��"
 
-#: ../app/actions/text-editor-actions.c:50
-msgctxt "text-editor-action"
+#
+#: ../app/actions/text-editor-actions.c:51
 msgid "Clear all text"
 msgstr "æ¸?é?¤æ??æ??æ??æ?¬"
 
-#: ../app/actions/text-editor-actions.c:58
-msgctxt "text-editor-action"
+#
+#: ../app/actions/text-editor-actions.c:59
 msgid "LTR"
 msgstr "左��"
 
-#: ../app/actions/text-editor-actions.c:59
-msgctxt "text-editor-action"
+#
+#: ../app/actions/text-editor-actions.c:60
 msgid "From left to right"
 msgstr "�左��"
 
-#: ../app/actions/text-editor-actions.c:64
-msgctxt "text-editor-action"
+#
+#: ../app/actions/text-editor-actions.c:65
 msgid "RTL"
 msgstr "��左"
 
-#: ../app/actions/text-editor-actions.c:65
-msgctxt "text-editor-action"
+#
+#: ../app/actions/text-editor-actions.c:66
 msgid "From right to left"
 msgstr "���左"
 
-#: ../app/actions/text-editor-commands.c:62
-#: ../app/actions/text-tool-commands.c:117
+#: ../app/actions/text-editor-commands.c:63
 msgid "Open Text File (UTF-8)"
 msgstr "æ??å¼?æ??æ?¬æ??件(UTF-8)"
 
-#: ../app/actions/text-editor-commands.c:143
-#: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58
-#: ../app/core/gimpbrush-load.c:140 ../app/core/gimpbrush-load.c:422
-#: ../app/core/gimpbrushgenerated-load.c:73
-#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54
+#: ../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:273 ../app/core/gimppalette-load.c:319
-#: ../app/core/gimppalette-load.c:376 ../app/core/gimppalette-load.c:466
-#: ../app/core/gimppalette-load.c:633 ../app/core/gimppattern-load.c:76
-#: ../app/tools/gimpcurvestool.c:637 ../app/tools/gimplevelstool.c:747
+#: ../app/core/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
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "æ? æ³?æ??å¼?â??%sâ??并读å??ï¼?%s"
 
-#: ../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"
+#
+#: ../app/actions/tool-options-actions.c:56
 msgid "Tool Options Menu"
 msgstr "å·¥å?·é??项è??å??"
 
-#: ../app/actions/tool-options-actions.c:59
-msgctxt "tool-options-action"
+#
+#: ../app/actions/tool-options-actions.c:60
 msgid "_Save Options To"
 msgstr "é??项ä¿?å­?å?°(_S)"
 
-#: ../app/actions/tool-options-actions.c:63
-msgctxt "tool-options-action"
+#
+#: ../app/actions/tool-options-actions.c:64
 msgid "_Restore Options From"
 msgstr "é??项æ?¢å¤?è?ª(_R)"
 
-#: ../app/actions/tool-options-actions.c:67
-msgctxt "tool-options-action"
+#
+#: ../app/actions/tool-options-actions.c:68
 msgid "Re_name Saved Options"
 msgstr "é??å?½å??å·²ä¿?å­?ç??é??项(_N)"
 
-#: ../app/actions/tool-options-actions.c:71
-msgctxt "tool-options-action"
+#
+#: ../app/actions/tool-options-actions.c:72
 msgid "_Delete Saved Options"
 msgstr "å? é?¤å·²ä¿?å­?ç??é??项(_D)"
 
-#: ../app/actions/tool-options-actions.c:75
-msgctxt "tool-options-action"
+#
+#: ../app/actions/tool-options-actions.c:76
 msgid "_New Entry..."
 msgstr "�建项(_N)..."
 
-#: ../app/actions/tool-options-actions.c:80
-msgctxt "tool-options-action"
+#
+#: ../app/actions/tool-options-actions.c:81
 msgid "R_eset Tool Options"
 msgstr "é??置工å?·é??项(_E)"
 
-#: ../app/actions/tool-options-actions.c:81
-msgctxt "tool-options-action"
+#
+#: ../app/actions/tool-options-actions.c:82
 msgid "Reset to default values"
 msgstr "é??ç½®å?°é»?认å?¼"
 
-#: ../app/actions/tool-options-actions.c:86
-msgctxt "tool-options-action"
+#
+#: ../app/actions/tool-options-actions.c:87
 msgid "Reset _all Tool Options"
 msgstr "é??ç½®æ??æ??å·¥å?·é??项(_A)"
 
-#: ../app/actions/tool-options-actions.c:87
-msgctxt "tool-options-action"
+#
+#: ../app/actions/tool-options-actions.c:88
 msgid "Reset all tool options"
 msgstr "é??ç½®æ??æ??å·¥å?·é??项"
 
-#: ../app/actions/tool-options-commands.c:70
+#: ../app/actions/tool-options-commands.c:72
 msgid "Save Tool Options"
 msgstr "ä¿?å­?å·¥å?·é??项"
 
-#: ../app/actions/tool-options-commands.c:74
+#: ../app/actions/tool-options-commands.c:76
 msgid "Enter a name for the saved options"
 msgstr "ç»?å·²ä¿?å­?ç??é??项è¾?å?¥ä¸?个å??å­?"
 
-#: ../app/actions/tool-options-commands.c:75
-#: ../app/actions/tool-options-commands.c:245
-#: ../app/actions/tool-options-commands.c:262
+#: ../app/actions/tool-options-commands.c:77
+#: ../app/actions/tool-options-commands.c:247
+#: ../app/actions/tool-options-commands.c:264
 msgid "Saved Options"
 msgstr "å·²ä¿?å­?ç??é??项"
 
-#: ../app/actions/tool-options-commands.c:138
+#: ../app/actions/tool-options-commands.c:140
 msgid "Rename Saved Tool Options"
 msgstr "é??å?½å??å·²ä¿?å­?ç??å·¥å?·é??项"
 
-#: ../app/actions/tool-options-commands.c:142
+#: ../app/actions/tool-options-commands.c:144
 msgid "Enter a new name for the saved options"
 msgstr "ç»?å·²ä¿?å­?ç??é??项è¾?å?¥ä¸?个æ?°å??å­?"
 
-#: ../app/actions/tool-options-commands.c:185
-#, fuzzy
-msgid "Reset All Tool Options"
-msgstr "é??ç½®æ??æ??å·¥å?·é??项(_A)"
+#: ../app/actions/tool-options-commands.c:187
+msgid "Reset Tool Options"
+msgstr "é??置工å?·é??项"
 
-#: ../app/actions/tool-options-commands.c:208
+#: ../app/actions/tool-options-commands.c:210
 msgid "Do you really want to reset all tool options to default values?"
 msgstr "æ?¨ç??ç??è¦?å°?æ??æ??å·¥å?·é??项é??ç½®å?°é»?认å?¼å??ï¼?"
 
-#: ../app/actions/tool-preset-actions.c:44
-msgctxt "tool-preset-action"
-msgid "Tool Preset Menu"
-msgstr "å·¥å?·é¢?设å?¼è??å??"
-
-#: ../app/actions/tool-preset-actions.c:48
-msgctxt "tool-preset-action"
-msgid "_New Tool Preset"
-msgstr "�建工��设�(_N)"
-
-#: ../app/actions/tool-preset-actions.c:49
-msgctxt "tool-preset-action"
-msgid "Create a new tool preset"
-msgstr "å??建æ?°ç??å·¥å?·é¢?设å?¼"
-
-#: ../app/actions/tool-preset-actions.c:54
-msgctxt "tool-preset-action"
-msgid "D_uplicate Tool Preset"
-msgstr "��工��设�(_U)"
-
-#: ../app/actions/tool-preset-actions.c:55
-msgctxt "tool-preset-action"
-msgid "Duplicate this tool preset"
-msgstr "��此工��设�"
-
-#: ../app/actions/tool-preset-actions.c:60
-msgctxt "tool-preset-action"
-msgid "Copy Tool Preset _Location"
-msgstr "��工��设��置(_L)"
-
-#: ../app/actions/tool-preset-actions.c:61
-msgctxt "tool-preset-action"
-msgid "Copy tool preset file location to clipboard"
-msgstr "å°?å·¥å?·é¢?设å?¼æ??件ä½?ç½®å¤?å?¶å?°å?ªè´´æ?¿"
-
-#: ../app/actions/tool-preset-actions.c:66
-msgctxt "tool-preset-action"
-msgid "_Delete Tool Preset"
-msgstr "��工��设�(_D)"
-
-#: ../app/actions/tool-preset-actions.c:67
-msgctxt "tool-preset-action"
-msgid "Delete this tool preset"
-msgstr "��此工��设�"
-
-#: ../app/actions/tool-preset-actions.c:72
-msgctxt "tool-preset-action"
-msgid "_Refresh Tool Presets"
-msgstr "��工��设�(_R)"
-
-#: ../app/actions/tool-preset-actions.c:73
-msgctxt "tool-preset-action"
-msgid "Refresh tool presets"
-msgstr "��工��设�"
-
-#: ../app/actions/tool-preset-actions.c:81
-msgctxt "tool-preset-action"
-msgid "_Edit Tool Preset..."
-msgstr "��工��设�(_E)..."
-
-#: ../app/actions/tool-preset-actions.c:82
-msgctxt "tool-preset-action"
-msgid "Edit this tool preset"
-msgstr "��此工��设�"
-
-#: ../app/actions/tool-preset-editor-actions.c:42
-#, fuzzy
-msgctxt "tool-preset-editor-action"
-msgid "Tool Preset Editor Menu"
-msgstr "工��设����"
-
-#: ../app/actions/tool-preset-editor-actions.c:50
-#, fuzzy
-msgctxt "tool-preset-editor-action"
-msgid "Edit Active Tool Preset"
-msgstr "��此工��设�"
-
-#: ../app/actions/tools-actions.c:45
-msgctxt "tools-action"
+#
+#: ../app/actions/tools-actions.c:47
+msgid "Tools Menu"
+msgstr "å·¥å?·è??å??"
+
+#
+#: ../app/actions/tools-actions.c:50
 msgid "_Tools"
 msgstr "工�(_T)"
 
-#: ../app/actions/tools-actions.c:46
-msgctxt "tools-action"
+#
+#: ../app/actions/tools-actions.c:51
 msgid "_Selection Tools"
 msgstr "é??æ?©å·¥å?·(_S)"
 
-#: ../app/actions/tools-actions.c:47
-msgctxt "tools-action"
+#
+#: ../app/actions/tools-actions.c:52
 msgid "_Paint Tools"
 msgstr "��工�(_P)"
 
-#: ../app/actions/tools-actions.c:48
-msgctxt "tools-action"
+#
+#: ../app/actions/tools-actions.c:53
 msgid "_Transform Tools"
 msgstr "å??æ?¢å·¥å?·(_T)"
 
-#: ../app/actions/tools-actions.c:49
-msgctxt "tools-action"
+#
+#: ../app/actions/tools-actions.c:54
 msgid "_Color Tools"
 msgstr "��工�(_C)"
 
-#: ../app/actions/tools-actions.c:55
-msgctxt "tools-action"
+#
+#: ../app/actions/tools-actions.c:57
+msgid "R_aise Tool"
+msgstr "æ??å??å·¥å?·(_A)"
+
+#
+#: ../app/actions/tools-actions.c:58
+msgid "Raise tool"
+msgstr "æ??å??å·¥å?·(_A)"
+
+#
+#: ../app/actions/tools-actions.c:63
+msgid "Ra_ise to Top"
+msgstr "æ??å?°æ??å??(_I)"
+
+#
+#: ../app/actions/tools-actions.c:64
+msgid "Raise tool to top"
+msgstr "å°?此工å?·ç®±æ??å?°æ??å??"
+
+#
+#: ../app/actions/tools-actions.c:69
+msgid "L_ower Tool"
+msgstr "æ?¨å??å·¥å?·(_O)"
+
+#
+#: ../app/actions/tools-actions.c:70
+msgid "Lower tool"
+msgstr "æ?¨å??å·¥å?·(_O)"
+
+#
+#: ../app/actions/tools-actions.c:75
+msgid "Lo_wer to Bottom"
+msgstr "æ?¨å?°æ??å??(_W)"
+
+#
+#: ../app/actions/tools-actions.c:76
+msgid "Lower tool to bottom"
+msgstr "å°?此工å?·ç®±æ?¨å?°æ??å??"
+
+#
+#: ../app/actions/tools-actions.c:81
+msgid "_Reset Order & Visibility"
+msgstr "é??置顺åº?å??å?¯è§?å±?æ?§(_R)"
+
+#
+#: ../app/actions/tools-actions.c:82
+msgid "Reset tool order and visibility"
+msgstr "é??置工å?·ç??顺åº?å??å?¯è§?å±?æ?§"
+
+#
+#: ../app/actions/tools-actions.c:90
+msgid "_Show in Toolbox"
+msgstr "�工�箱中�示(_S)"
+
+#
+#: ../app/actions/tools-actions.c:99
 msgid "_By Color"
 msgstr "æ??é¢?è?²(_B)"
 
-#: ../app/actions/tools-actions.c:56
-msgctxt "tools-action"
+#
+#: ../app/actions/tools-actions.c:100
 msgid "Select regions with similar colors"
 msgstr "æ??ç?¸ä¼¼ç??é¢?è?²é??æ?©å?ºå??"
 
-#: ../app/actions/tools-actions.c:61
-msgctxt "tools-action"
+#
+#: ../app/actions/tools-actions.c:105
 msgid "_Arbitrary Rotation..."
 msgstr "ä»»æ??æ??转(_A)..."
 
-#: ../app/actions/tools-actions.c:62
-msgctxt "tools-action"
+#
+#: ../app/actions/tools-actions.c:106
 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
-msgctxt "vectors-action"
-msgid "Create a new path..."
-msgstr "å??建æ?°ç??è·¯å¾?..."
+msgid "New path..."
+msgstr "�建路�(_N)..."
 
+#
 #: ../app/actions/vectors-actions.c:65
-msgctxt "vectors-action"
-msgid "_New Path with last values"
-msgstr "æ??ä¸?次ç??å?¼æ?°å»ºè·¯å¾?(_N)"
+msgid "_New Path"
+msgstr "�建路�"
 
+#
 #: ../app/actions/vectors-actions.c:66
-msgctxt "vectors-action"
-msgid "Create a new path with last used values"
-msgstr "æ??ä¸?次使ç?¨ç??å?¼æ?°å»ºè·¯å¾?"
+msgid "New path with last values"
+msgstr "æ??ä¸?次ç??å?¼æ?°å»ºè·¯å¾?(_N)"
 
+#
 #: ../app/actions/vectors-actions.c:71
-msgctxt "vectors-action"
 msgid "D_uplicate Path"
 msgstr "��路�(_U)"
 
+#
 #: ../app/actions/vectors-actions.c:72
-msgctxt "vectors-action"
-msgid "Duplicate this path"
-msgstr "��此路�"
+msgid "Duplicate path"
+msgstr "��路�(_U)"
 
+#
 #: ../app/actions/vectors-actions.c:77
-msgctxt "vectors-action"
 msgid "_Delete Path"
 msgstr "��路�(_D)"
 
-#: ../app/actions/vectors-actions.c:78
-msgctxt "vectors-action"
-msgid "Delete this path"
-msgstr "��此路�"
+#
+#: ../app/actions/vectors-actions.c:78 ../app/core/core-enums.c:920
+msgid "Delete 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
-msgctxt "vectors-action"
-msgid "Raise this path"
-msgstr "å??é«?此路å¾?"
+msgid "Raise path"
+msgstr "å??é«?è·¯å¾?"
 
+#
 #: ../app/actions/vectors-actions.c:94
-msgctxt "vectors-action"
 msgid "Raise Path to _Top"
 msgstr "è·¯å¾?å??è?³é¡¶ç«¯(_T)"
 
+#
 #: ../app/actions/vectors-actions.c:95
-msgctxt "vectors-action"
-msgid "Raise this path to the top"
-msgstr "æ??å??此路å¾?è?³é¡¶ç«¯"
+msgid "Raise path to top"
+msgstr "路�移�顶端"
 
+#
 #: ../app/actions/vectors-actions.c:100
-msgctxt "vectors-action"
 msgid "_Lower Path"
 msgstr "é??ä½?è·¯å¾?(_L)"
 
+#
 #: ../app/actions/vectors-actions.c:101
-msgctxt "vectors-action"
-msgid "Lower this path"
-msgstr "é??ä½?此路å¾?"
+msgid "Lower path"
+msgstr "é??ä½?è·¯å¾?"
 
+#
 #: ../app/actions/vectors-actions.c:106
-msgctxt "vectors-action"
 msgid "Lower Path to _Bottom"
 msgstr "è·¯å¾?é??è?³åº?端(_B)"
 
+#
 #: ../app/actions/vectors-actions.c:107
-msgctxt "vectors-action"
-msgid "Lower this path to the bottom"
-msgstr "é??ä½?此路å¾?è?³åº?端"
+msgid "Lower path to 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)"
-
-#. GIMP_STOCK_LOCK
-#: ../app/actions/vectors-actions.c:159
-msgctxt "vectors-action"
-msgid "L_ock strokes"
-msgstr "é??å®?ç¬?å??(_O)"
-
-#: ../app/actions/vectors-actions.c:168
-msgctxt "vectors-action"
+#
+#: ../app/actions/vectors-actions.c:162
 msgid "Path to Sele_ction"
 msgstr "è·¯å¾?å?°é??å?º(_C)"
 
-#: ../app/actions/vectors-actions.c:169
-msgctxt "vectors-action"
+#: ../app/actions/vectors-actions.c:163 ../app/tools/gimpvectortool.c:1912
 msgid "Path to selection"
 msgstr "è·¯å¾?å?°é??å?º"
 
-#: ../app/actions/vectors-actions.c:174
-msgctxt "vectors-action"
+#
+#: ../app/actions/vectors-actions.c:168
 msgid "Fr_om Path"
 msgstr "�路�(_O)"
 
-#: ../app/actions/vectors-actions.c:175
-msgctxt "vectors-action"
-msgid "Replace selection with path"
-msgstr "ç?¨æ­¤è·¯å¾?æ?¿æ?¢é??å?º"
-
-#: ../app/actions/vectors-actions.c:180
-msgctxt "vectors-action"
-msgid "_Add to Selection"
-msgstr "æ·»å? å?°é??å?º(_A)"
+#: ../app/actions/vectors-actions.c:174
+msgid "Add"
+msgstr "添�"
 
-#: ../app/actions/vectors-actions.c:181
-msgctxt "vectors-action"
-msgid "Add path to selection"
-msgstr "å°?è·¯å¾?æ·»å? å?°é??å?º"
+#
+#: ../app/actions/vectors-actions.c:180 ../app/base/base-enums.c:119
+msgid "Subtract"
+msgstr "å??å?»"
 
+#
 #: ../app/actions/vectors-actions.c:186
-msgctxt "vectors-action"
-msgid "_Subtract from Selection"
-msgstr "ä»?é??å?ºä¸­å??å?»(_S)"
-
-#: ../app/actions/vectors-actions.c:187
-msgctxt "vectors-action"
-msgid "Subtract path from selection"
-msgstr "ä»?é??å?ºä¸­å??å?»è·¯å¾?"
-
-#: ../app/actions/vectors-actions.c:192
-msgctxt "vectors-action"
-msgid "_Intersect with Selection"
-msgstr "ä¸?é??å?ºç?¸äº¤(_I)"
-
-#: ../app/actions/vectors-actions.c:193
-msgctxt "vectors-action"
-msgid "Intersect path with selection"
-msgstr "å°?è·¯å¾?ä¸?é??å?ºç?¸äº¤"
+msgid "Intersect"
+msgstr "å??转"
 
-#: ../app/actions/vectors-actions.c:201
-msgctxt "vectors-action"
+#
+#: ../app/actions/vectors-actions.c:194
 msgid "Selecti_on to Path"
 msgstr "é??å?ºå?°è·¯å¾?(_O)"
 
-#: ../app/actions/vectors-actions.c:202 ../app/actions/vectors-actions.c:208
-msgctxt "vectors-action"
+#
+#: ../app/actions/vectors-actions.c:195 ../app/actions/vectors-actions.c:201
 msgid "Selection to path"
 msgstr "é??å?ºå?°è·¯å¾?"
 
-#: ../app/actions/vectors-actions.c:207
-msgctxt "vectors-action"
+#
+#: ../app/actions/vectors-actions.c:200
 msgid "To _Path"
 msgstr "�路�(_P)"
 
-#: ../app/actions/vectors-actions.c:213
-msgctxt "vectors-action"
+#
+#: ../app/actions/vectors-actions.c:206
 msgid "Selection to Path (_Advanced)"
 msgstr "é??å?ºå?°è·¯å¾?(é«?级)(_A)"
 
-#: ../app/actions/vectors-actions.c:214
-msgctxt "vectors-action"
+#
+#: ../app/actions/vectors-actions.c:207
 msgid "Advanced options"
 msgstr "é«?级é??项"
 
-#: ../app/actions/vectors-commands.c:137
+#: ../app/actions/vectors-commands.c:138
 msgid "Path Attributes"
 msgstr "路���"
 
-#: ../app/actions/vectors-commands.c:140
+#: ../app/actions/vectors-commands.c:141
 msgid "Edit Path Attributes"
 msgstr "��路���"
 
-#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:205
-#: ../app/widgets/gimpvectorstreeview.c:252
-msgid "Path"
-msgstr "路�"
-
-#: ../app/actions/vectors-commands.c:165
+#: ../app/actions/vectors-commands.c:165 ../app/actions/vectors-commands.c:166
+#: ../app/actions/vectors-commands.c:188
 msgid "New Path"
 msgstr "�建路�"
 
-#: ../app/actions/vectors-commands.c:168
+#: ../app/actions/vectors-commands.c:169
 msgid "New Path Options"
 msgstr "æ?°å»ºè·¯å¾?é??项"
 
-#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:198
-#: ../app/tools/gimpvectortool.c:1990
+#: ../app/actions/vectors-commands.c:305 ../app/pdb/paths-cmds.c:640
+#: ../app/pdb/vectors-cmds.c:1253
+msgid "Path to Selection"
+msgstr "è·¯å¾?å?°é??å?º"
+
+#: ../app/actions/vectors-commands.c:385 ../app/tools/gimpvectoroptions.c:199
+#: ../app/tools/gimpvectortool.c:1945 ../app/vectors/gimpvectors.c:200
 msgid "Stroke Path"
 msgstr "��路�"
 
-#: ../app/actions/view-actions.c:69
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:67
 msgid "_View"
 msgstr "æ?¥ç??(_V)"
 
-#: ../app/actions/view-actions.c:70
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:68
 msgid "_Zoom"
 msgstr "缩�(_Z)"
 
-#: ../app/actions/view-actions.c:71
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:69
 msgid "_Padding Color"
 msgstr "衬���(_P)"
 
-#: ../app/actions/view-actions.c:73
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:71
 msgid "Move to Screen"
 msgstr "移����"
 
-#: ../app/actions/view-actions.c:77
-msgctxt "view-action"
-msgid "_New View"
-msgstr "�建��(_N)"
-
-#: ../app/actions/view-actions.c:78
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:76
 msgid "Create another view on this image"
 msgstr "å?¨æ­¤å?¾å??ä¸?å??建å?¦ä¸?个æ?¾ç¤º"
 
-#: ../app/actions/view-actions.c:83
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:81
 msgid "_Close"
 msgstr "��(_C)"
 
-#: ../app/actions/view-actions.c:84
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:82
 msgid "Close this image window"
 msgstr "å?³é?­æ­¤å?¾å??çª?å?£"
 
-#: ../app/actions/view-actions.c:89
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:87
 msgid "_Fit Image in Window"
 msgstr "å?¾å??é??é??äº?çª?å?£(_F)"
 
-#: ../app/actions/view-actions.c:90
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:88
 msgid "Adjust the zoom ratio so that the image becomes fully visible"
 msgstr "è°?æ?´ç¼©æ?¾æ¯?ç??以使å?¾å??å®?æ?´æ?¾ç¤º"
 
-#: ../app/actions/view-actions.c:95
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:93
 msgid "Fi_ll Window"
 msgstr "é??å??çª?å?£(_I)"
 
-#: ../app/actions/view-actions.c:96
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:94
 msgid "Adjust the zoom ratio so that the entire window is used"
 msgstr "è°?æ?´ç¼©æ?¾æ¯?ç??以使çª?å?£æ??ä½³å??使ç?¨"
 
-#: ../app/actions/view-actions.c:101
-msgctxt "view-action"
+#: ../app/actions/view-actions.c:99 ../app/actions/view-actions.c:579
 msgid "Re_vert Zoom"
 msgstr "��缩�(_V)"
 
-#: ../app/actions/view-actions.c:102
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:100
 msgid "Restore the previous zoom level"
 msgstr "æ?¢å¤?å?°ä¸?ä¸?次ç??缩æ?¾çº§å?«"
 
-#: ../app/actions/view-actions.c:107
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:105
 msgid "Na_vigation Window"
 msgstr "导���(_V)"
 
-#: ../app/actions/view-actions.c:108
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:106
 msgid "Show an overview window for this image"
 msgstr "为此å?¾å??æ?¾ç¤ºæ¦?è§?çª?å?£"
 
-#: ../app/actions/view-actions.c:113
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:111
 msgid "Display _Filters..."
 msgstr "æ?¾ç¤ºæ»¤é??(_F)..."
 
-#: ../app/actions/view-actions.c:114
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:112
 msgid "Configure filters applied to this view"
 msgstr "é??ç½®åº?ç?¨å?°æ­¤æ?¾ç¤ºç??滤é??"
 
-#: ../app/actions/view-actions.c:119
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:117
 msgid "Shrink _Wrap"
 msgstr "紧贴(_W)"
 
-#: ../app/actions/view-actions.c:120
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:118
 msgid "Reduce the image window to the size of the image display"
 msgstr "缩å°?å?¾å??çª?å?£å?°å?¾å??æ?¾ç¤ºç??尺寸"
 
-#: ../app/actions/view-actions.c:125
-msgctxt "view-action"
-msgid "_Open Display..."
-msgstr "æ??å¼?æ?¾ç¤º(_O)..."
-
-#: ../app/actions/view-actions.c:126
-msgctxt "view-action"
-msgid "Connect to another display"
-msgstr "�����个�示"
-
-#: ../app/actions/view-actions.c:134
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:132
 msgid "_Dot for Dot"
 msgstr "�对�(_D)"
 
-#: ../app/actions/view-actions.c:135
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:133
 msgid "A pixel on the screen represents an image pixel"
 msgstr "ä¸?个å±?å¹?ä¸?ç??å??素代表ä¸?个å?¾å??å??ç´ "
 
-#: ../app/actions/view-actions.c:141
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:139
 msgid "Show _Selection"
 msgstr "æ?¾ç¤ºé??å?º(_S)"
 
-#: ../app/actions/view-actions.c:142
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:140
 msgid "Display the selection outline"
 msgstr "æ?¾ç¤ºé??å?ºç??è½®å»?"
 
-#: ../app/actions/view-actions.c:148
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:146
 msgid "Show _Layer Boundary"
 msgstr "æ?¾ç¤ºå?¾å±?è¾¹ç??(_L)"
 
-#: ../app/actions/view-actions.c:149
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:147
 msgid "Draw a border around the active layer"
 msgstr "�活�������边�"
 
-#: ../app/actions/view-actions.c:155
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:153
 msgid "Show _Guides"
 msgstr "æ?¾ç¤ºå??è??线(_G)"
 
-#: ../app/actions/view-actions.c:156
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:154
 msgid "Display the image's guides"
 msgstr "æ?¾ç¤ºå?¾å??ç??å??è??线"
 
-#: ../app/actions/view-actions.c:162
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:160
 msgid "S_how Grid"
 msgstr "�示�格(_H)"
 
-#: ../app/actions/view-actions.c:163
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:161
 msgid "Display the image's grid"
 msgstr "æ?¾ç¤ºå?¾å??ç??ç½?æ ¼"
 
-#: ../app/actions/view-actions.c:169
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:167
 msgid "Show Sample Points"
 msgstr "æ?¾ç¤ºé??æ ·ç?¹"
 
-#: ../app/actions/view-actions.c:170
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:168
 msgid "Display the image's color sample points"
 msgstr "æ?¾ç¤ºå?¾å??ç??é¢?è?²é??æ ·ç?¹"
 
-#: ../app/actions/view-actions.c:176
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:174
 msgid "Sn_ap to Guides"
 msgstr "å?¸é??å?°å??è??线(_A)"
 
-#: ../app/actions/view-actions.c:177
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:175
 msgid "Tool operations snap to guides"
 msgstr "å·¥å?·æ??ä½?å?¸é??å?°å??è??线"
 
-#: ../app/actions/view-actions.c:183
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:181
 msgid "Sna_p to Grid"
 msgstr "å?¸é??å?°ç½?æ ¼(_P)"
 
-#: ../app/actions/view-actions.c:184
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:182
 msgid "Tool operations snap to the grid"
 msgstr "å·¥å?·æ??ä½?å?¸é??å?°ç½?æ ¼"
 
-#: ../app/actions/view-actions.c:190
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:188
 msgid "Snap to _Canvas Edges"
 msgstr "å?¸é??å?°ç?»å¸?è¾¹ç¼?(_C)"
 
-#: ../app/actions/view-actions.c:191
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:189
 msgid "Tool operations snap to the canvas edges"
 msgstr "å·¥å?·æ??ä½?å?¸é??å?°ç?»å¸?è¾¹ç¼?"
 
-#: ../app/actions/view-actions.c:197
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:195
 msgid "Snap t_o Active Path"
 msgstr "å?¸é??å?°æ´»å?¨è·¯å¾?(_O)"
 
-#: ../app/actions/view-actions.c:198
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:196
 msgid "Tool operations snap to the active path"
 msgstr "å·¥å?·æ??ä½?å?¸é??å?°æ´»å?¨è·¯å¾?"
 
-#: ../app/actions/view-actions.c:204
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:202
 msgid "Show _Menubar"
 msgstr "æ?¾ç¤ºè??å??æ ?(_M)"
 
-#: ../app/actions/view-actions.c:205
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:203
 msgid "Show this window's menubar"
 msgstr "æ?¾ç¤ºæ­¤çª?å?£ç??è??å??æ ?"
 
-#: ../app/actions/view-actions.c:211
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:209
 msgid "Show R_ulers"
 msgstr "�示�尺(_U)"
 
-#: ../app/actions/view-actions.c:212
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:210
 msgid "Show this window's rulers"
 msgstr "æ?¾ç¤ºæ­¤çª?å?£ç??æ ?å°º"
 
-#: ../app/actions/view-actions.c:218
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:216
 msgid "Show Scroll_bars"
 msgstr "�示���(_B)"
 
-#: ../app/actions/view-actions.c:219
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:217
 msgid "Show this window's scrollbars"
 msgstr "æ?¾ç¤ºæ­¤çª?å?£ç??æ»?å?¨æ?¡"
 
-#: ../app/actions/view-actions.c:225
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:223
 msgid "Show S_tatusbar"
 msgstr "æ?¾ç¤ºç?¶æ??æ ?(_T)"
 
-#: ../app/actions/view-actions.c:226
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:224
 msgid "Show this window's statusbar"
 msgstr "æ?¾ç¤ºæ­¤çª?å?£ç??ç?¶æ??æ ?"
 
-#: ../app/actions/view-actions.c:232
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:230
 msgid "Fullscr_een"
 msgstr "��(_E)"
 
-#: ../app/actions/view-actions.c:233
-msgctxt "view-action"
+#
+#: ../app/actions/view-actions.c:231
 msgid "Toggle fullscreen view"
 msgstr "å??æ?¢å?¨å±?æ?¾ç¤º"
 
-#: ../app/actions/view-actions.c:264
-msgctxt "view-zoom-action"
-msgid "Zoom _Out"
-msgstr "缩�(_O)"
-
-#: ../app/actions/view-actions.c:265 ../app/actions/view-actions.c:277
-msgctxt "view-action"
-msgid "Zoom out"
-msgstr "缩�"
-
-#: ../app/actions/view-actions.c:270
-msgctxt "view-zoom-action"
-msgid "Zoom _In"
-msgstr "�大(_I)"
-
-#: ../app/actions/view-actions.c:271 ../app/actions/view-actions.c:283
-msgctxt "view-action"
-msgid "Zoom in"
-msgstr "�大"
-
-#: ../app/actions/view-actions.c:276
-msgctxt "view-zoom-action"
-msgid "Zoom Out"
-msgstr "缩�"
-
-#: ../app/actions/view-actions.c:282
-msgctxt "view-zoom-action"
-msgid "Zoom In"
-msgstr "�大"
-
-#: ../app/actions/view-actions.c:301
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:292
 msgid "1_6:1  (1600%)"
 msgstr "1_6:1 (1600%)"
 
-#: ../app/actions/view-actions.c:302
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:293
 msgid "Zoom 16:1"
 msgstr "缩� 16:1"
 
-#: ../app/actions/view-actions.c:307
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:298
 msgid "_8:1  (800%)"
 msgstr "_8:1 (800%)"
 
-#: ../app/actions/view-actions.c:308
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:299
 msgid "Zoom 8:1"
 msgstr "缩� 8:1"
 
-#: ../app/actions/view-actions.c:313
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:304
 msgid "_4:1  (400%)"
 msgstr "_4:1 (400%)"
 
-#: ../app/actions/view-actions.c:314
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:305
 msgid "Zoom 4:1"
 msgstr "缩� 4:1"
 
-#: ../app/actions/view-actions.c:319
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:310
 msgid "_2:1  (200%)"
 msgstr "_2:1 (200%)"
 
-#: ../app/actions/view-actions.c:320
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:311
 msgid "Zoom 2:1"
 msgstr "缩� 2:1"
 
-#: ../app/actions/view-actions.c:325
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:316
 msgid "_1:1  (100%)"
 msgstr "_1:1 (100%)"
 
-#: ../app/actions/view-actions.c:326
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:317
 msgid "Zoom 1:1"
 msgstr "缩� 1:1"
 
-#: ../app/actions/view-actions.c:331
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:322
 msgid "1:_2  (50%)"
 msgstr "1:_2 (50%)"
 
-#: ../app/actions/view-actions.c:332
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:323
 msgid "Zoom 1:2"
 msgstr "缩� 1:2"
 
-#: ../app/actions/view-actions.c:337
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:328
 msgid "1:_4  (25%)"
 msgstr "1:_4 (25%)"
 
-#: ../app/actions/view-actions.c:338
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:329
 msgid "Zoom 1:4"
 msgstr "缩� 1:4"
 
-#: ../app/actions/view-actions.c:343
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:334
 msgid "1:_8  (12.5%)"
 msgstr "1:_8 (12.5%)"
 
-#: ../app/actions/view-actions.c:344
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:335
 msgid "Zoom 1:8"
 msgstr "缩� 1:8"
 
-#: ../app/actions/view-actions.c:349
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:340
 msgid "1:1_6  (6.25%)"
 msgstr "1:1_6 (6.25%)"
 
-#: ../app/actions/view-actions.c:350
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:341
 msgid "Zoom 1:16"
 msgstr "缩� 1:16"
 
-#: ../app/actions/view-actions.c:355
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:346
 msgid "Othe_r..."
 msgstr "��(_R)..."
 
-#: ../app/actions/view-actions.c:356
-msgctxt "view-zoom-action"
+#
+#: ../app/actions/view-actions.c:347
 msgid "Set a custom zoom factor"
 msgstr "设置���缩���"
 
-#: ../app/actions/view-actions.c:364
-msgctxt "view-padding-color"
+#
+#: ../app/actions/view-actions.c:355
 msgid "From _Theme"
 msgstr "å??è?ªä¸»é¢?(_T)"
 
-#: ../app/actions/view-actions.c:365
-msgctxt "view-padding-color"
+#
+#: ../app/actions/view-actions.c:356
 msgid "Use the current theme's background color"
 msgstr "使ç?¨å½?å??主é¢?ç??è??æ?¯è?²"
 
-#: ../app/actions/view-actions.c:370
-msgctxt "view-padding-color"
+#
+#: ../app/actions/view-actions.c:361
 msgid "_Light Check Color"
 msgstr "æµ?è?²æ?¹æ ¼ç??é¢?è?²(_L)"
 
-#: ../app/actions/view-actions.c:371
-msgctxt "view-padding-color"
+#
+#: ../app/actions/view-actions.c:362
 msgid "Use the light check color"
 msgstr "使ç?¨æµ?è?²æ?¹æ ¼ç??é¢?è?²"
 
-#: ../app/actions/view-actions.c:376
-msgctxt "view-padding-color"
+#
+#: ../app/actions/view-actions.c:367
 msgid "_Dark Check Color"
 msgstr "æ·±è?²æ?¹æ ¼ç??é¢?è?²(_D)"
 
-#: ../app/actions/view-actions.c:377
-msgctxt "view-padding-color"
+#
+#: ../app/actions/view-actions.c:368
 msgid "Use the dark check color"
 msgstr "使ç?¨æ·±è?²æ?¹æ ¼ç??é¢?è?²"
 
-#: ../app/actions/view-actions.c:382
-msgctxt "view-padding-color"
+#
+#: ../app/actions/view-actions.c:373
 msgid "Select _Custom Color..."
 msgstr "é??æ?©è?ªå®?ä¹?é¢?è?²(_C)..."
 
-#: ../app/actions/view-actions.c:383
-msgctxt "view-padding-color"
+#
+#: ../app/actions/view-actions.c:374
 msgid "Use an arbitrary color"
 msgstr "使ç?¨ä»»æ??é¢?è?²"
 
-#: ../app/actions/view-actions.c:388
-msgctxt "view-padding-color"
+#
+#: ../app/actions/view-actions.c:379
 msgid "As in _Preferences"
 msgstr "æ??é¦?é??项中设å®?(_P)"
 
-#: ../app/actions/view-actions.c:390
-msgctxt "view-padding-color"
+#
+#: ../app/actions/view-actions.c:380
 msgid "Reset padding color to what's configured in preferences"
 msgstr "å°?å¡«å??é¢?è?²é??置为å?¨é¦?é??项中ç??é??ç½®"
 
-#: ../app/actions/view-actions.c:589
+#: ../app/actions/view-actions.c:571
 #, c-format
 msgid "Re_vert Zoom (%d%%)"
 msgstr "��缩�(_V)(%d%%)"
 
-#: ../app/actions/view-actions.c:597
-msgid "Re_vert Zoom"
-msgstr "��缩�(_V)"
-
-#: ../app/actions/view-actions.c:733
+#: ../app/actions/view-actions.c:708
 #, c-format
 msgid "Othe_r (%s)..."
 msgstr "��(_R)(%s)..."
 
-#: ../app/actions/view-actions.c:742
+#: ../app/actions/view-actions.c:717
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "缩�(_Z)(%s)"
 
-#: ../app/actions/view-commands.c:580
+#: ../app/actions/view-commands.c:613
 msgid "Set Canvas Padding Color"
 msgstr "设置ç?»å¸?衬å?«ç??é¢?è?²"
 
-#: ../app/actions/view-commands.c:582
+#: ../app/actions/view-commands.c:615
 msgid "Set Custom Canvas Padding Color"
 msgstr "设置è?ªå®?ä¹?ç?»å¸?衬å?«ç??é¢?è?²"
 
@@ -5610,215 +4912,196 @@ msgstr "å±?å¹? %s"
 msgid "Move this window to screen %s"
 msgstr "移�此����� %s"
 
-#: ../app/actions/windows-actions.c:85
-msgctxt "windows-action"
+#
+#: ../app/actions/windows-actions.c:79
 msgid "_Windows"
 msgstr "��(_W)"
 
-#: ../app/actions/windows-actions.c:87
-msgctxt "windows-action"
+#
+#: ../app/actions/windows-actions.c:80
 msgid "_Recently Closed Docks"
 msgstr "æ??è¿?å?³é?­ç??å??é? (_R)"
 
-#: ../app/actions/windows-actions.c:89
-msgctxt "windows-action"
+#
+#: ../app/actions/windows-actions.c:81
 msgid "_Dockable Dialogs"
 msgstr "å?¯å??é? å¯¹è¯?æ¡?"
 
-#: ../app/actions/windows-actions.c:95
-msgctxt "windows-action"
-msgid "Hide Docks"
-msgstr "é??è??å??é? "
-
-#: ../app/actions/windows-actions.c:103
-msgctxt "windows-action"
-msgid ""
-"When enabled docks and other dialogs are hidden, leaving only image windows."
-msgstr "å¦?æ??å?¯ç?¨ï¼?å??é? å??å?¶ä»?对è¯?æ¡?ä¼?被é??è??ï¼?ä»?ç??ä¸?å?¾å??çª?å?£ã??"
-
-#: ../app/actions/windows-actions.c:109
-msgctxt "windows-action"
-msgid "Single-Window Mode"
-msgstr "å??çª?å?£æ¨¡å¼?"
+#
+#: ../app/actions/windows-actions.c:84
+msgid "Tool_box"
+msgstr "工�箱(_B)"
 
-#: ../app/actions/windows-actions.c:110
-msgctxt "windows-action"
-msgid ""
-"When enabled GIMP is in a single-window mode. Far from completely "
-"implemented!"
-msgstr "å¦?æ??å?¯ç?¨ï¼?GIMP å°?使ç?¨å??çª?å?£æ¨¡å¼?ã??è¿?è¿?æ?ªå®?å?¨å®?ç?°ï¼?"
+#
+#: ../app/actions/windows-actions.c:85
+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:56
-msgctxt "histogram-channel"
+#
+#: ../app/base/base-enums.c:55 ../app/base/base-enums.c:125
+#: ../app/core/core-enums.c:1202
 msgid "Value"
 msgstr "æ??度"
 
-#: ../app/base/base-enums.c:57
-msgctxt "histogram-channel"
+#: ../app/base/base-enums.c:56 ../app/core/core-enums.c:1197
+#: ../app/tools/gimpcolorbalancetool.c:296
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "Red"
 msgstr "红�"
 
-#: ../app/base/base-enums.c:58
-msgctxt "histogram-channel"
+#: ../app/base/base-enums.c:57 ../app/core/core-enums.c:1198
+#: ../app/tools/gimpcolorbalancetool.c:305
+#: ../app/tools/gimphuesaturationtool.c:254
 msgid "Green"
 msgstr "绿�"
 
-#: ../app/base/base-enums.c:59
-msgctxt "histogram-channel"
+#: ../app/base/base-enums.c:58 ../app/core/core-enums.c:1199
+#: ../app/tools/gimpcolorbalancetool.c:314
+#: ../app/tools/gimphuesaturationtool.c:256
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../app/base/base-enums.c:60
-msgctxt "histogram-channel"
+#
+#: ../app/base/base-enums.c:59
 msgid "Alpha"
 msgstr "Alpha"
 
-#: ../app/base/base-enums.c:61
-msgctxt "histogram-channel"
+#
+#: ../app/base/base-enums.c:60 ../app/display/gimpdisplayshell-title.c:233
+#: ../app/widgets/widgets-enums.c:84
 msgid "RGB"
 msgstr "RGB"
 
-#: ../app/base/base-enums.c:113
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:111
 msgid "Normal"
 msgstr "正常"
 
-#: ../app/base/base-enums.c:114
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:112
 msgid "Dissolve"
 msgstr "è??å??"
 
-#: ../app/base/base-enums.c:115
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:113
 msgid "Behind"
 msgstr "è??å??"
 
-#: ../app/base/base-enums.c:116
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:114
 msgid "Multiply"
 msgstr "��"
 
-#: ../app/base/base-enums.c:117
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:115
 msgid "Screen"
 msgstr "æ?©è?½"
 
-#: ../app/base/base-enums.c:118
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:116
 msgid "Overlay"
 msgstr "è¦?ç??"
 
-#: ../app/base/base-enums.c:119
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:117
 msgid "Difference"
 msgstr "差�"
 
-#: ../app/base/base-enums.c:120
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:118
 msgid "Addition"
 msgstr "��"
 
-#: ../app/base/base-enums.c:121
-msgctxt "layer-mode-effects"
-msgid "Subtract"
-msgstr "å??å?»"
-
-#: ../app/base/base-enums.c:122
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:120
 msgid "Darken only"
-msgstr "ä»?å??æ??"
+msgstr "å??æ??"
 
-#: ../app/base/base-enums.c:123
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:121
 msgid "Lighten only"
-msgstr "ä»?å??亮"
+msgstr "å??亮"
 
-#: ../app/base/base-enums.c:124
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:122 ../app/core/core-enums.c:1200
 msgid "Hue"
 msgstr "��"
 
-#: ../app/base/base-enums.c:125
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:123 ../app/core/core-enums.c:1201
 msgid "Saturation"
 msgstr "饱å??度"
 
-#: ../app/base/base-enums.c:126
-msgctxt "layer-mode-effects"
+#: ../app/base/base-enums.c:124 ../app/tools/gimppaintoptions-gui.c:174
 msgid "Color"
 msgstr "��"
 
-#: ../app/base/base-enums.c:127
-msgctxt "layer-mode-effects"
-msgid "Value"
-msgstr "æ??度"
-
-#: ../app/base/base-enums.c:128
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:126
 msgid "Divide"
 msgstr "��"
 
-#: ../app/base/base-enums.c:129
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:127
 msgid "Dodge"
 msgstr "å??æ·¡"
 
-#: ../app/base/base-enums.c:130
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:128
 msgid "Burn"
 msgstr "å? æ·±"
 
-#: ../app/base/base-enums.c:131
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:129
 msgid "Hard light"
 msgstr "硬å??"
 
-#: ../app/base/base-enums.c:132
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:130
 msgid "Soft light"
 msgstr "æ??å??"
 
-#: ../app/base/base-enums.c:133
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:131
 msgid "Grain extract"
 msgstr "å¢?ç??æ??å??"
 
-#: ../app/base/base-enums.c:134
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:132
 msgid "Grain merge"
 msgstr "å¢?ç??å??并"
 
-#: ../app/base/base-enums.c:135
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:133
 msgid "Color erase"
 msgstr "����"
 
-#: ../app/base/base-enums.c:136
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:134
 msgid "Erase"
 msgstr "��"
 
-#: ../app/base/base-enums.c:137
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:135
 msgid "Replace"
 msgstr "æ?¿æ?¢"
 
-#: ../app/base/base-enums.c:138
-msgctxt "layer-mode-effects"
+#
+#: ../app/base/base-enums.c:136
 msgid "Anti erase"
 msgstr "å??æ?¦é?¤"
 
-#: ../app/base/tile-swap.c:710
+#: ../app/base/tile-swap.c:553
 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 "
@@ -5829,127 +5112,32 @@ msgstr ""
 "è?½ä¼?被æ??å??ã??请å°?è¯?使ç?¨ä¸?å??ç??æ??件å??ä¿?å­?æ?¨ç??å·¥ä½?ï¼?é??æ?°å?¯å?¨ GIMP 并æ£?æ?¥æ?¨ç??é¦?é??"
 "项中交æ?¢ç?®å½?ç??ä½?ç½®ã??"
 
-#: ../app/base/tile-swap.c:725
+#: ../app/base/tile-swap.c:568
 #, c-format
 msgid "Failed to resize swap file: %s"
 msgstr "è°?æ?´äº¤æ?¢æ??件大å°?失败ï¼?%s"
 
-#: ../app/config/config-enums.c:24
-msgctxt "cursor-mode"
-msgid "Tool icon"
-msgstr "工���"
-
-#: ../app/config/config-enums.c:25
-msgctxt "cursor-mode"
-msgid "Tool icon with crosshair"
-msgstr "带交å??线ç??å·¥å?·å?¾æ ?"
-
-#: ../app/config/config-enums.c:26
-msgctxt "cursor-mode"
-msgid "Crosshair only"
-msgstr "ä»?交å??线"
-
-#: ../app/config/config-enums.c:56
-msgctxt "canvas-padding-mode"
-msgid "From theme"
-msgstr "å??è?ªä¸»é¢?"
-
-#: ../app/config/config-enums.c:57
-msgctxt "canvas-padding-mode"
-msgid "Light check color"
-msgstr "æµ?è?²æ?¹æ ¼ç??é¢?è?²"
-
-#: ../app/config/config-enums.c:58
-msgctxt "canvas-padding-mode"
-msgid "Dark check color"
-msgstr "æ·±è?²æ?¹æ ¼ç??é¢?è?²"
-
-#: ../app/config/config-enums.c:59
-msgctxt "canvas-padding-mode"
-msgid "Custom color"
-msgstr "�����"
-
-#: ../app/config/config-enums.c:88
-msgctxt "space-bar-action"
-msgid "No action"
-msgstr "���"
-
-#: ../app/config/config-enums.c:89
-msgctxt "space-bar-action"
-msgid "Pan view"
-msgstr "平移��"
-
-#: ../app/config/config-enums.c:90
-msgctxt "space-bar-action"
-msgid "Switch to Move tool"
-msgstr "å??æ?¢å?°ç§»å?¨å·¥å?·"
-
-#: ../app/config/config-enums.c:118
-msgctxt "zoom-quality"
-msgid "Low"
-msgstr "ä½?"
-
-#: ../app/config/config-enums.c:119
-msgctxt "zoom-quality"
-msgid "High"
-msgstr "é«?"
-
-#: ../app/config/config-enums.c:147
-msgctxt "help-browser-type"
-msgid "GIMP help browser"
-msgstr "GIMP 帮����"
-
-#: ../app/config/config-enums.c:148
-msgctxt "help-browser-type"
-msgid "Web browser"
-msgstr "Web ���"
-
-#: ../app/config/config-enums.c:177
-msgctxt "window-hint"
-msgid "Normal window"
-msgstr "æ?®é??çª?å?£"
-
-#: ../app/config/config-enums.c:178
-msgctxt "window-hint"
-msgid "Utility window"
-msgstr "工���"
-
-#: ../app/config/config-enums.c:179
-msgctxt "window-hint"
-msgid "Keep above"
-msgstr "ä¿?æ??å?¨ä¸?æ?¹"
-
-#: ../app/config/config-enums.c:207
-msgctxt "cursor-format"
-msgid "Black & white"
-msgstr "é»?ç?½"
-
-#: ../app/config/config-enums.c:208
-msgctxt "cursor-format"
-msgid "Fancy"
-msgstr "�亮"
-
-#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62
-#: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50
-#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:55
-#: ../app/gui/themes.c:238 ../app/tools/gimpcurvestool.c:690
-#: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81
+#: ../app/config/gimpconfig-file.c: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
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "æ? æ³?æ??å¼?â??%sâ??并å??å?¥ï¼?%s"
 
-#: ../app/config/gimpconfig-file.c:78 ../app/config/gimpconfig-file.c:101
+#: ../app/config/gimpconfig-file.c:79 ../app/config/gimpconfig-file.c:102
 #, c-format
 msgid "Error writing '%s': %s"
 msgstr "å??å?¥â??%sâ??å?ºé??ï¼?%s"
 
-#: ../app/config/gimpconfig-file.c:89
+#: ../app/config/gimpconfig-file.c:90
 #, c-format
 msgid "Error reading '%s': %s"
 msgstr "读å??â??%sâ??æ?¶å?ºé??ï¼?%s"
 
-#: ../app/config/gimpconfig-file.c:131
+#: ../app/config/gimpconfig-file.c:132
 #, c-format
 msgid ""
 "There was an error parsing your '%s' file. Default values will be used. A "
@@ -5969,37 +5157,33 @@ msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?å½?对åº?ç??å?¾å??çª?å?£è?·å¾?ç?¦ç?¹æ?¶ï¼?å?¾å??å°?æ??为活å?¨å?¾å??ã??è¿?对使ç?¨â??ç?¹å?»è?·å??ç?¦"
 "ç?¹â??ç??çª?å?£ç®¡ç??å?¨æ??ç?¨ã??"
 
-#: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28
-msgid "Sets the dynamics search path."
-msgstr "设置å?¨æ??ç??æ??索路å¾?"
-
-#: ../app/config/gimprc-blurbs.h:33
+#: ../app/config/gimprc-blurbs.h:23
 msgid ""
 "Sets the canvas padding color used if the padding mode is set to custom "
 "color."
 msgstr "设置ç?»å¸?使ç?¨ç??衬å?«é¢?è?²ï¼?å¦?æ??衬å?«æ¨¡å¼?设为è?ªå®?ä¹?é¢?è?²ç??è¯?ã??"
 
-#: ../app/config/gimprc-blurbs.h:37
+#: ../app/config/gimprc-blurbs.h:27
 msgid "Specifies how the area around the image should be drawn."
 msgstr "æ??å®?å¦?ä½?å?»ç?»å?¾å??å??å?¨ç??å?ºå??ã??"
 
-#: ../app/config/gimprc-blurbs.h:43
+#: ../app/config/gimprc-blurbs.h:33
 msgid "How to handle embedded color profiles when opening a file."
 msgstr "å?¨æ??å¼?æ??件æ?¶å¦?ä½?å¤?ç??å??åµ?ç??è?²å½©é??ç½®æ??件ã??"
 
-#: ../app/config/gimprc-blurbs.h:46
+#: ../app/config/gimprc-blurbs.h:36
 msgid "Ask for confirmation before closing an image without saving."
 msgstr "å?³é?­æ?ªä¿?å­?ç??å?¾å??å??å??è¿?è¡?确认ã??"
 
-#: ../app/config/gimprc-blurbs.h:49
+#: ../app/config/gimprc-blurbs.h:39
 msgid "Sets the pixel format to use for mouse pointers."
 msgstr "设å®?é¼ æ ?æ??é??æ??使ç?¨ç??å??ç´ æ ¼å¼?ã??"
 
-#: ../app/config/gimprc-blurbs.h:52
+#: ../app/config/gimprc-blurbs.h:42
 msgid "Sets the type of mouse pointers to use."
 msgstr "设å®?æ??使ç?¨ç??é¼ æ ?æ??é??ç±»å??ã??"
 
-#: ../app/config/gimprc-blurbs.h:55
+#: ../app/config/gimprc-blurbs.h:45
 msgid ""
 "Context-dependent mouse pointers are helpful.  They are enabled by default.  "
 "However, they require overhead that you may want to do without."
@@ -6007,17 +5191,17 @@ msgstr ""
 "ç?¯å¢?ç?¸å?³ç??é¼ æ ?æ??é??å¾?æ??ç?¨ã??å®?们é»?认æ?¯å?¯ç?¨ç??ã??ä½?æ?¯ï¼?å®?们ä¹?é??è¦?ä¸?å®?ç??è´?è?·ï¼?è¿?ç?¹"
 "å?¯è?½æ?¨å¹¶ä¸?æ?³è¦?ã??"
 
-#: ../app/config/gimprc-blurbs.h:71
+#: ../app/config/gimprc-blurbs.h:53
 msgid ""
 "When enabled, this will ensure that each pixel of an image gets mapped to a "
 "pixel on the screen."
 msgstr "å¦?æ??å?¯ç?¨ï¼?å°?ç¡®ä¿?å?¾å??ç??æ¯?个ç?¹é?½å¯¹åº?å±?å¹?ä¸?ç??ä¸?个å??ç´ ã??"
 
-#: ../app/config/gimprc-blurbs.h:93
+#: ../app/config/gimprc-blurbs.h:75
 msgid "This is the distance in pixels where Guide and Grid snapping activates."
 msgstr "è¿?æ?¯å??è??线å??ç½?格产ç??å?¸é??ä½?ç?¨ç??å??ç´ è·?离ã??"
 
-#: ../app/config/gimprc-blurbs.h:109
+#: ../app/config/gimprc-blurbs.h:79
 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 "
@@ -6029,87 +5213,82 @@ msgstr ""
 "个å??å§?é??中ç??å??ç´ å¼?å§?并å??å??个æ?¹å??æ?¨è¿?ï¼?ç?´å?°ä¸?å??ç´ å??å§?ç??é¢?è?²å·®å?«å¤§äº?ä¸?个æ??å®?ç??"
 "é??å?¼ã??该å?¼å°±æ?¯é»?认ç??é??å?¼ã??"
 
-#: ../app/config/gimprc-blurbs.h:122
+#: ../app/config/gimprc-blurbs.h:92
 msgid ""
-"The window type hint that is set on dock windows and the toolbox window. "
-"This may affect the way your window manager decorates and handles these "
-"windows."
+"The window type hint that is set on dock windows. This may affect the way "
+"your window manager decorates and handles dock windows."
 msgstr ""
-"å??é? å¼?çª?å?£ä»¥å??å·¥å?·çª?å?£ç??çª?å?£ç±»å??æ??示设置ã??è¿?å°?å½±å??æ?¨ç??çª?å?£ç®¡ç??å?¨è£?饰å??å¤?ç??å??"
-"é? å¼?çª?å?£ç??è¡?为ã??"
+"å??é? å¼?çª?å?£ç??çª?å?£ç±»å??æ??示设置ã??è¿?å°?å½±å??æ?¨ç??çª?å?£ç®¡ç??å?¨è£?饰å??å¤?ç??å??é? å¼?çª?å?£ç??è¡?"
+"为ã??"
 
-#: ../app/config/gimprc-blurbs.h:154
+#: ../app/config/gimprc-blurbs.h:123
 msgid "When enabled, the selected brush will be used for all tools."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ??æ??ç??å·¥å?·é?½å°?使ç?¨é??中ç??ç?»ç¬?ã??"
 
-#: ../app/config/gimprc-blurbs.h:157
-msgid "When enabled, the selected dynamics will be used for all tools."
-msgstr "å¦?æ??å?¯ç?¨ï¼?æ??æ??ç??å·¥å?·é?½å°?使ç?¨é??中ç??å?¨æ??ã??"
-
-#: ../app/config/gimprc-blurbs.h:163
+#: ../app/config/gimprc-blurbs.h:129
 msgid "When enabled, the selected gradient will be used for all tools."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ??æ??ç??å·¥å?·é?½å°?使ç?¨é??中ç??æ¸?å??ã??"
 
-#: ../app/config/gimprc-blurbs.h:166
+#: ../app/config/gimprc-blurbs.h:132
 msgid "When enabled, the selected pattern will be used for all tools."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ??æ??ç??å·¥å?·é?½å°?使ç?¨é??中ç??å?¾æ¡?ã??"
 
-#: ../app/config/gimprc-blurbs.h:180
+#: ../app/config/gimprc-blurbs.h:146
 msgid "Sets the browser used by the help system."
 msgstr "设置帮å?©ç³»ç»?æ??使ç?¨ç??æµ?è§?å?¨ã??"
 
-#: ../app/config/gimprc-blurbs.h:191
+#: ../app/config/gimprc-blurbs.h:154
 msgid "Sets the text to appear in image window status bars."
 msgstr "设置å?¾å??çª?å?£ç?¶æ??æ ?æ??æ?¾ç¤ºç??æ??å­?ã??"
 
-#: ../app/config/gimprc-blurbs.h:194
+#: ../app/config/gimprc-blurbs.h:157
 msgid "Sets the text to appear in image window titles."
 msgstr "设置å?¾å??çª?å?£æ ?é¢?æ??æ?¾ç¤ºç??æ??å­?ã??"
 
-#: ../app/config/gimprc-blurbs.h:197
+#: ../app/config/gimprc-blurbs.h:160
 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:201
+#: ../app/config/gimprc-blurbs.h:164
 msgid ""
 "Install a private colormap; might be useful on 8-bit (256 colors) displays."
 msgstr "å®?è£?ç§?ç?¨é¢?è?²è¡¨ï¼?对 8 ä½?(256 è?²)æ?¾ç¤ºå?¯è?½æ??ç?¨ã??"
 
-#: ../app/config/gimprc-blurbs.h:204
+#: ../app/config/gimprc-blurbs.h:167
 msgid ""
 "Sets the level of interpolation used for scaling and other transformations."
 msgstr "设置æ??å?¼è®¡ç®?ç??ç­?级ï¼?ç?¨äº?缩æ?¾å??å?¶å®?å??æ?¢æ??ä½?ã??"
 
-#: ../app/config/gimprc-blurbs.h:211
-msgid "Specifies the language to use for the user interface."
-msgstr "为ç?¨æ?·ç??é?¢æ??å®?使ç?¨ç??语è¨?ã??"
-
-#: ../app/config/gimprc-blurbs.h:214
+#: ../app/config/gimprc-blurbs.h:174
 msgid "How many recently opened image filenames to keep on the File menu."
 msgstr "å?¨æ??件è??å??中ä¿?ç??å¤?å°?个æ??è¿?æ??å¼?å?¾å??ç??æ??件å??ã??"
 
-#: ../app/config/gimprc-blurbs.h:217
+#: ../app/config/gimprc-blurbs.h:177
 msgid ""
 "Speed of marching ants in the selection outline.  This value is in "
 "milliseconds (less time indicates faster marching)."
 msgstr "é??å?ºè½®å»?è??è??线ç??é??度ã??该å?¼ä»¥æ¯«ç§?(æ?¶é?´è¶?ç?­é??度è¶?å¿«)为å??ä½?ã??"
 
-#: ../app/config/gimprc-blurbs.h:221
+#: ../app/config/gimprc-blurbs.h:181
 msgid ""
 "GIMP will warn the user if an attempt is made to create an image that would "
 "take more memory than the size specified here."
 msgstr ""
 "å¦?æ??è¯?å?¾å??建ä¸?å¹?æ??é??å??å­?æ¯?æ­¤å¤?æ??å®?ç??大å°?è¿?è¦?大ç??å?¾å??ï¼?GIMP å°?è­¦å??ç?¨æ?·ã??"
 
-#: ../app/config/gimprc-blurbs.h:225
+#: ../app/config/gimprc-blurbs.h:185
+msgid "When enabled, GIMP will show mnemonics in menus."
+msgstr "å¦?æ??å?¯ç?¨ï¼?GIMP å°?å?¨è??å??中æ?¾ç¤ºå?©è®°ç¬¦ã??"
+
+#: ../app/config/gimprc-blurbs.h:188
 msgid ""
 "Generally only a concern for 8-bit displays, this sets the minimum number of "
 "system colors allocated for GIMP."
 msgstr "é??常å?ªå¯¹ 8 ä½?æ?¾ç¤ºï¼?æ­¤å¤?设置å??é??ç»? GIMP ç??ç³»ç»?é¢?è?²ç??æ??å°?æ?°é??ã??"
 
-#: ../app/config/gimprc-blurbs.h:235
+#: ../app/config/gimprc-blurbs.h:198
 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 "
@@ -6118,7 +5297,7 @@ msgstr ""
 "设置ç??è§?å?¨ç??æ°´å¹³å??辨ç??ï¼?以æ¯?è?±å¯¸ç??ç?¹æ?°ä¸ºå??ä½?ã??å¦?æ??设置为 0 å??强å?¶å?? X æ??å?¡å?¨"
 "æ?¥è¯¢æ°´å¹³å??å??ç?´å??辨ç??ä¿¡æ?¯ã??"
 
-#: ../app/config/gimprc-blurbs.h:240
+#: ../app/config/gimprc-blurbs.h:203
 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 "
@@ -6127,7 +5306,7 @@ msgstr ""
 "设置ç??è§?å?¨ç??å??ç?´å??辨ç??ï¼?以æ¯?è?±å¯¸ç??ç?¹æ?°ä¸ºå??ä½?ã??å¦?æ??设置为 0 å??强å?¶å?? X æ??å?¡å?¨"
 "æ?¥è¯¢æ°´å¹³å??å??ç?´å??辨ç??ä¿¡æ?¯ã??"
 
-#: ../app/config/gimprc-blurbs.h:245
+#: ../app/config/gimprc-blurbs.h:208
 msgid ""
 "If enabled, the move tool sets the edited layer or path as active.  This "
 "used to be the default behaviour in older versions."
@@ -6135,29 +5314,29 @@ msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?移å?¨å·¥å?·ä¼?å°?被ç¼?è¾?ç??å?¾å±?æ??è·¯å¾?设置为活å?¨ç??ã??å?¨æ?§ç??ç??æ?¬ä¸­ï¼?è¿?æ?¯é»?认"
 "ç??è¡?为ã??"
 
-#: ../app/config/gimprc-blurbs.h:249
+#: ../app/config/gimprc-blurbs.h:212
 msgid ""
 "Sets the size of the navigation preview available in the lower right corner "
 "of the image window."
 msgstr "设置å?¾å??çª?å?£å?³ä¸?è§?ç??导è?ªé¢?è§?ç??大å°?ã??"
 
-#: ../app/config/gimprc-blurbs.h:253
+#: ../app/config/gimprc-blurbs.h:216
 msgid "Sets how many processors GIMP should try to use simultaneously."
 msgstr "设置 GIMP å°?è¯?å?¾å??æ?¶ä½¿ç?¨å¤?å°?个å¤?ç??å?¨ã??"
 
-#: ../app/config/gimprc-blurbs.h:266
+#: ../app/config/gimprc-blurbs.h:229
 msgid ""
 "When enabled, the X server is queried for the mouse's current position on "
 "each motion event, rather than relying on the position hint.  This means "
 "painting with large brushes should be more accurate, but it may be slower.  "
-"Conversely, on some X servers enabling this option results in faster "
+"Perversely, on some X servers enabling this option results in faster "
 "painting."
 msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?æ¯?次移å?¨é¼ æ ?ç??æ?¶å??é?½å°?å?? X æ??å?¡å?¨æ?¥è¯¢å½?å??ç??é¼ æ ?ä½?ç½®ï¼?è??ä¸?æ?¯ä¾?èµ?äº?ä½?"
-"ç½®æ??示ã??è¿?æ??å?³ç??ç?¨å¤§ç??ç?»ç¬?æ¶?ç?»ç??æ?¶å??å°?æ?´å? ç²¾ç¡®ï¼?ä¸?è¿?å?¯è?½ä¹?æ?´æ?¢ã??ä¸?æ­¤ç?¸å??ï¼?å?¨"
+"ç½®æ??示ã??è¿?æ??å?³ç??ç?¨å¤§ç??ç?»ç¬?æ¶?ç?»ç??æ?¶å??å°?æ?´å? ç²¾ç¡®ï¼?ä¸?è¿?å?¯è?½ä¹?æ?´æ?¢ã??å??常ç??æ?¯ï¼?å?¨"
 "æ??äº? X æ??å?¡å?¨ä¸?å?¯ç?¨è¯¥é??项å°?ä¼?å? å¿«æ¶?ç?»é??度ã??"
 
-#: ../app/config/gimprc-blurbs.h:282
+#: ../app/config/gimprc-blurbs.h:245
 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 "
@@ -6166,54 +5345,54 @@ msgstr ""
 "æ??å®? GIMP æ?¯å?¦åº?该å??建å?¾å±?å??é??é??ç??é¢?è§?ã??å?¨å?¾å±?å??é??é??对è¯?æ¡?中æ?¾ç¤ºé¢?è§?æ?¯ä¸?é??"
 "ç??ï¼?ä½?æ?¯å½?å?¾å??å¾?大ç??æ?¶å??å°?ä¼?使é??度å??æ?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:287
+#: ../app/config/gimprc-blurbs.h:250
 msgid ""
 "Sets the preview size used for layers and channel previews in newly created "
 "dialogs."
 msgstr "设置æ?°å??建ç??对è¯?æ¡?中å?¾å±?å??é??é??ç??é¢?è§?大å°?ã??"
 
-#: ../app/config/gimprc-blurbs.h:291
+#: ../app/config/gimprc-blurbs.h:254
 msgid ""
 "When enabled, the image window will automatically resize itself whenever the "
 "physical image size changes."
 msgstr "å¦?æ??å?¯ç?¨ï¼?å½?å?¾å??å®?é??大å°?å??ç??å??å??æ?¶ï¼?å?¾å??çª?å?£å¤§å°?å°?è?ªå?¨é??ç½®ã??"
 
-#: ../app/config/gimprc-blurbs.h:295
+#: ../app/config/gimprc-blurbs.h:258
 msgid ""
 "When enabled, the image window will automatically resize itself when zooming "
 "into and out of images."
 msgstr "å¦?æ??å?¯ç?¨ï¼?å½?æ?¾å¤§æ??缩å°?æ?¥ç??å?¾å??æ?¶ï¼?å?¾å??çª?å?£å¤§å°?å°?è?ªå?¨é??ç½®ã??"
 
-#: ../app/config/gimprc-blurbs.h:299
+#: ../app/config/gimprc-blurbs.h:262
 msgid "Let GIMP try to restore your last saved session on each startup."
 msgstr "æ¯?次å?¯å?¨æ?¶è®© GIMP å°?è¯?æ?¢å¤?æ?¨ä¸?次ä¿?å­?ç??ä¼?è¯?ã??"
 
-#: ../app/config/gimprc-blurbs.h:302
+#: ../app/config/gimprc-blurbs.h:265
 msgid ""
 "Remember the current tool, pattern, color, and brush across GIMP sessions."
 msgstr "å?¨å¤?个 GIMP ä¼?è¯?é?´è®°ä½?å½?å??ç??å·¥å?·ã??å?¾æ¡?ã??é¢?è?²å??ç?»ç¬?ã??"
 
-#: ../app/config/gimprc-blurbs.h:306
+#: ../app/config/gimprc-blurbs.h:269
 msgid ""
 "Keep a permanent record of all opened and saved files in the Recent "
 "Documents list."
 msgstr "å°?å?¨é?¨æ??å¼?å??ä¿?å­?ç??æ??件添å? å?°ç£?ç??ä¸?ç??æ??æ¡£å??å?²è®°å½?ã??"
 
-#: ../app/config/gimprc-blurbs.h:310
+#: ../app/config/gimprc-blurbs.h:273
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
 msgstr "GIMP é??å?ºæ?¶ä¿?å­?主è¦?ç??对è¯?æ¡?ç??ä½?ç½®å??大å°?ã??"
 
-#: ../app/config/gimprc-blurbs.h:313
+#: ../app/config/gimprc-blurbs.h:276
 msgid "Save the tool options when GIMP exits."
 msgstr "GIMP é??å?ºæ?¶ä¿?å­?å·¥å?·é??项ã??"
 
-#: ../app/config/gimprc-blurbs.h:319
+#: ../app/config/gimprc-blurbs.h:282
 msgid ""
 "When enabled, all paint tools will show a preview of the current brush's "
 "outline."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ??æ??æ¶?ç?»å·¥å?·é?½å°?æ?¾ç¤ºå½?å??ç?»ç¬?ç??è½®å»?é¢?è§?ã??"
 
-#: ../app/config/gimprc-blurbs.h:323
+#: ../app/config/gimprc-blurbs.h:286
 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 "
@@ -6222,89 +5401,81 @@ msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?对è¯?æ¡?中å°?æ?¾ç¤ºä¸?个å?°è¾¾ç?¸å?³å¸®å?©é¡µé?¢ç??æ??é?®ã??å¦?æ??没æ??è¿?个æ??é?®ï¼?ä»?ç?¶å?¯"
 "以æ?? F1 æ??å¼?帮å?©é¡µé?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:328
+#: ../app/config/gimprc-blurbs.h:291
 msgid ""
 "When enabled, the mouse pointer will be shown over the image while using a "
 "paint tool."
 msgstr "å¦?æ??å?¯ç?¨ï¼?å½?使ç?¨æ¶?ç?»å·¥å?·æ?¶ï¼?é¼ æ ?æ??é??å°?æ?¾ç¤ºå?¨å?¾å??ä¸?æ?¹ã??"
 
-#: ../app/config/gimprc-blurbs.h:332
+#: ../app/config/gimprc-blurbs.h:295
 msgid ""
 "When enabled, the menubar is visible by default. This can also be toggled "
 "with the \"View->Show Menubar\" command."
 msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?è??å??æ ?å°?é»?认å?¯è§?ã??è¿?ä¹?å?¯ä»¥é??è¿?â??æ?¥ç??->æ?¾ç¤ºè??å??æ ?â??å?½ä»¤è¿?è¡?å??æ?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:336
+#: ../app/config/gimprc-blurbs.h:299
 msgid ""
 "When enabled, the rulers are visible by default. This can also be toggled "
 "with the \"View->Show Rulers\" command."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ ?å°ºå°?é»?认å?¯è§?ã??è¿?ä¹?å?¯ä»¥é??è¿?â??æ?¥ç??->æ?¾ç¤ºæ ?å°ºâ??å?½ä»¤è¿?è¡?å??æ?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:340
+#: ../app/config/gimprc-blurbs.h:303
 msgid ""
 "When enabled, the scrollbars are visible by default. This can also be "
 "toggled with the \"View->Show Scrollbars\" command."
 msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?æ»?å?¨æ?¡å°?é»?认å?¯è§?ã??è¿?ä¹?å?¯ä»¥é??è¿?â??æ?¥ç??->æ?¾ç¤ºæ»?å?¨æ?¡â??å?½ä»¤è¿?è¡?å??æ?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:344
+#: ../app/config/gimprc-blurbs.h:307
 msgid ""
 "When enabled, the statusbar is visible by default. This can also be toggled "
 "with the \"View->Show Statusbar\" command."
 msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?ç?¶æ??æ ?å°?é»?认å?¯è§?ã??è¿?ä¹?å?¯ä»¥é??è¿?â??æ?¥ç??->æ?¾ç¤ºç?¶æ??æ ?â??å?½ä»¤è¿?è¡?å??æ?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:348
+#: ../app/config/gimprc-blurbs.h:311
 msgid ""
 "When enabled, the selection is visible by default. This can also be toggled "
 "with the \"View->Show Selection\" command."
 msgstr "å¦?æ??å?¯ç?¨ï¼?é??å?ºå°?é»?认å?¯è§?ã??è¿?ä¹?å?¯ä»¥é??è¿?â??æ?¥ç??->æ?¾ç¤ºé??å?ºâ??å?½ä»¤è¿?è¡?å??æ?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:352
+#: ../app/config/gimprc-blurbs.h:315
 msgid ""
 "When enabled, the layer boundary is visible by default. This can also be "
 "toggled with the \"View->Show Layer Boundary\" command."
 msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?å?¾å±?è¾¹ç??å°?é»?认å?¯è§?ã??è¿?ä¹?å?¯ä»¥é??è¿?â??æ?¥ç??->æ?¾ç¤ºå?¾å±?è¾¹ç??â??å?½ä»¤è¿?è¡?å??æ?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:356
+#: ../app/config/gimprc-blurbs.h:319
 msgid ""
 "When enabled, the guides are visible by default. This can also be toggled "
 "with the \"View->Show Guides\" command."
 msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?å??è??线å°?é»?认å?¯è§?ã??è¿?ä¹?å?¯ä»¥é??è¿?â??æ?¥ç??->æ?¾ç¤ºå??è??线â??å?½ä»¤è¿?è¡?å??æ?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:360
+#: ../app/config/gimprc-blurbs.h:323
 msgid ""
 "When enabled, the grid is visible by default. This can also be toggled with "
 "the \"View->Show Grid\" command."
 msgstr "å¦?æ??å?¯ç?¨ï¼?ç½?æ ¼å°?é»?认å?¯è§?ã??è¿?ä¹?å?¯ä»¥é??è¿?â??æ?¥ç??->æ?¾ç¤ºç½?æ ¼â??å?½ä»¤è¿?è¡?å??æ?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:364
+#: ../app/config/gimprc-blurbs.h:327
 msgid ""
 "When enabled, the sample points are visible by default. This can also be "
 "toggled with the \"View->Show Sample Points\" command."
 msgstr ""
 "å¦?æ??å?¯ç?¨ï¼?é??æ ·ç?¹å°?é»?认å?¯è§?ã??è¿?ä¹?å?¯ä»¥é??è¿?â??æ?¥ç??->æ?¾ç¤ºé??æ ·ç?¹â??å?½ä»¤è¿?è¡?å??æ?¢ã??"
 
-#: ../app/config/gimprc-blurbs.h:368
+#: ../app/config/gimprc-blurbs.h:331
 msgid "Show a tooltip when the pointer hovers over an item."
 msgstr "å½?æ??é??æ?¬å??å?¨é¡¹ç?®ä¸?æ?¶æ?¾ç¤ºå·¥å?·æ??示ã??"
 
-#: ../app/config/gimprc-blurbs.h:371
-msgid "Use GIMP in a single-window mode."
-msgstr "å?¨å??çª?å?£æ¨¡å¼?中使ç?¨ GIMPã??"
-
-#: ../app/config/gimprc-blurbs.h:374
-msgid "Hide docks and other windows, leaving only image windows."
-msgstr "é??è??å??é? å??å?¶ä»?çª?å?£ï¼?ä»?ç??ä¸?å?¾å??çª?å?£ã??"
-
-#: ../app/config/gimprc-blurbs.h:377
+#: ../app/config/gimprc-blurbs.h:334
 msgid "What to do when the space bar is pressed in the image window."
 msgstr "å½?å?¨å?¾å??çª?å?£ä¸­ç©ºæ ¼é?®æ??ä¸?æ?¶ç??è¡?为ã??"
 
-#: ../app/config/gimprc-blurbs.h:380
+#: ../app/config/gimprc-blurbs.h:337
 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 "
@@ -6318,25 +5489,34 @@ msgstr ""
 "å??å¾?å¾?大ã??å?¦å¤?ï¼?å¦?æ??交æ?¢æ??件æ??å?¨ç?®å½?æ?¯é??è¿? NFS å? è½½ç??è¯?ï¼?ç¨?åº?å??å¾?æ??为ç¼?æ?¢ã??ç?±"
 "äº?è¿?äº?å??å? ï¼?æ??好æ?¯å°?æ?¨ç??交æ?¢æ??件æ?¾å?°â??/tmpâ??ç?®å½?ã??"
 
-#: ../app/config/gimprc-blurbs.h:389
+#: ../app/config/gimprc-blurbs.h:346
 msgid "When enabled, menus can be torn off."
 msgstr "å¦?æ??å?¯ç?¨ï¼?è??å??å?¯è¢«æ??ä¸?ã??"
 
-#: ../app/config/gimprc-blurbs.h:392
+#: ../app/config/gimprc-blurbs.h:349
+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 "
+"dock windows above the image window then, but it may also have other effects."
+msgstr ""
+"å¦?æ??å?¯ç?¨ï¼?å°?å??é? çª?å?£(å·¥å?·ç®±å??è°?è?²æ?¿)对äº?æ´»å?¨å?¾å??çª?å?£è®¾ç½®ä¸ºä¸´æ?¶ç??ã??è¿?æ ·å¤?æ?°çª?"
+"å?£ç®¡ç??å?¨å°?ä¼?æ??å??é? çª?å?£ä¿?æ??å?¨å?¾å??çª?å?£ä¹?ä¸?ï¼?ä½?ä¹?å?¯è?½æ??å?¶ä»?æ??æ??ã??"
+
+#: ../app/config/gimprc-blurbs.h:355
 msgid ""
 "When enabled, you can change keyboard shortcuts for menu items by hitting a "
 "key combination while the menu item is highlighted."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ?¨å?ªè¦?æ??ä¸?个é?®ç??ç»?å??å°±å?¯ä»¥å?³æ?¶æ?¹å??çª?å?ºæ?¾ç¤ºç??è??å??项ç??å¿«æ?·é?®ã??"
 
-#: ../app/config/gimprc-blurbs.h:396
+#: ../app/config/gimprc-blurbs.h:359
 msgid "Save changed keyboard shortcuts when GIMP exits."
 msgstr "GIMP é??å?ºæ?¶ä¿?å­?å·²æ?¹å??ç??å¿«æ?·é?®ã??"
 
-#: ../app/config/gimprc-blurbs.h:399
+#: ../app/config/gimprc-blurbs.h:362
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "GIMP å?¯å?¨æ?¶æ?¢å¤?å·²ä¿?å­?ç??å¿«æ?·é?®ã??"
 
-#: ../app/config/gimprc-blurbs.h:402
+#: ../app/config/gimprc-blurbs.h:365
 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 "
@@ -6347,17 +5527,17 @@ msgstr ""
 "å?ºä»¥å??å°?æ¶?失ï¼?ä½?æ?¯ä¸ªå?«æ??件å?¯è?½ä¼?ç??ä¸?æ?¥ï¼?å? æ­¤æ??好ä¸?è¦?æ??è¿?个ç?®å½?ä¸?å?«ç??ç?¨æ?·å?±"
 "享ã??"
 
-#: ../app/config/gimprc-blurbs.h:414
+#: ../app/config/gimprc-blurbs.h:377
 msgid "Sets the size of the thumbnail shown in the Open dialog."
 msgstr "设置æ??å¼?对è¯?æ¡?中缩ç?¥å?¾ç??尺寸ã??"
 
-#: ../app/config/gimprc-blurbs.h:417
+#: ../app/config/gimprc-blurbs.h:380
 msgid ""
 "The thumbnail in the Open dialog will be automatically updated if the file "
 "being previewed is smaller than the size set here."
 msgstr "å¦?æ??é¢?è§?ç??æ??件å°?äº?è¿?é??设置ç??大å°?ï¼?æ??å¼?对è¯?æ¡?中ç??缩ç?¥å?¾å°?ä¼?è?ªå?¨æ?´æ?°ã??"
 
-#: ../app/config/gimprc-blurbs.h:421
+#: ../app/config/gimprc-blurbs.h:384
 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 "
@@ -6365,36 +5545,43 @@ msgid ""
 "you may want to set this to a higher value."
 msgstr ""
 "å½?å??ç´ æ?°æ?®é??è¶?è¿?é??å?¶æ?¶ï¼?GIMP å°?å¼?å§?交æ?¢æ?°æ?®å?°ç£?ç??ã??è¿?å°?使é??度æ??大å??æ?¢ä½?å®?å?´ä½¿"
-"å¾?å¤?ç??æ? æ³?è£?å?¥å??å­?ç??å?¾å??æ??为å?¯è?½ã??å¦?æ??æ?¨ç??å??å­?å¾?å¤?ï¼?æ?¨å?¯è?½å¸?æ??设置ä¸?个æ?´å¤§ç??"
+"å¾?å¤?ç??æ? æ³?è½½å?¥å??å­?ç??å?¾å??æ??为å?¯è?½ã??å¦?æ??æ?¨ç??å??å­?å¾?å¤?ï¼?æ?¨å?¯è?½å¸?æ??设置ä¸?个æ?´å¤§ç??"
 "å?¼ã??"
 
-#: ../app/config/gimprc-blurbs.h:427
+#: ../app/config/gimprc-blurbs.h:390
 msgid "Show the current foreground and background colors in the toolbox."
 msgstr "å?¨å·¥å?·ç®±ä¸­æ?¾ç¤ºå½?å??ç??å??æ?¯è?²å??è??æ?¯è?²"
 
-#: ../app/config/gimprc-blurbs.h:430
+#: ../app/config/gimprc-blurbs.h:393
 msgid "Show the currently selected brush, pattern and gradient in the toolbox."
 msgstr "å?¨å·¥å?·ç®±ä¸­æ?¾ç¤ºæ´»å?¨ç?»ç¬?ã??å?¾æ¡?å??æ¸?å??"
 
-#: ../app/config/gimprc-blurbs.h:433
+#: ../app/config/gimprc-blurbs.h:396
 msgid "Show the currently active image in the toolbox."
 msgstr "å?¨å·¥å?·ç®±ä¸­æ?¾ç¤ºå½?å??æ´»å?¨ç??å?¾å??"
 
-#: ../app/config/gimprc-blurbs.h:439
+#: ../app/config/gimprc-blurbs.h:402
+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
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "设置å?¾å??中é??æ??é?¨å??ç??æ?¾ç¤ºæ?¹å¼?ã??"
 
-#: ../app/config/gimprc-blurbs.h:442
+#: ../app/config/gimprc-blurbs.h:409
 msgid "Sets the size of the checkerboard used to display transparency."
 msgstr "设置ç?¨äº?表示é??æ??ç??æ£?ç??æ ¼å­?ç??大å°?ã??"
 
-#: ../app/config/gimprc-blurbs.h:445
+#: ../app/config/gimprc-blurbs.h:412
 msgid ""
 "When enabled, GIMP will not save an image if it has not been changed since "
 "it was opened."
 msgstr "å¦?æ??å?¯ç?¨ï¼?å¦?æ??å?¾å??è?ªæ??å¼?以æ?¥æ²¡æ??被修æ?¹ï¼?GIMP å°?ä¸?ä¼?ä¿?å­?ã??"
 
-#: ../app/config/gimprc-blurbs.h:449
+#: ../app/config/gimprc-blurbs.h:416
 msgid ""
 "Sets the minimal number of operations that can be undone. More undo levels "
 "are kept available until the undo-size limit is reached."
@@ -6402,7 +5589,7 @@ msgstr ""
 "设置å??许æ?¤æ¶?ç??æ??ä½?ç??æ??å°?æ?°ç?®ã??å?ªè¦?è¿?没æ??è¾¾å?°æ?¤æ¶?大å°?ç??é??å?¶ï¼?å°±å?¯å·²ä¿?å­?æ?´å¤?ç??"
 "æ?¤æ¶?æ??ä½?ã??"
 
-#: ../app/config/gimprc-blurbs.h:453
+#: ../app/config/gimprc-blurbs.h:420
 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 "
@@ -6411,891 +5598,754 @@ msgstr ""
 "设置æ¯?å¹?å?¾å??ç?¨äº?ä¿?å­?æ?¤æ¶?å ?æ ?中ç??æ??ä½?ç??å??å­?ä¸?é??ã??ä¸?此设置æ? å?³ï¼?æ?¤æ¶?æ??ä½?è?³å°?å?¯"
 "以达å?°æ??å®?ç??æ?¤æ¶?次æ?°ã??"
 
-#: ../app/config/gimprc-blurbs.h:458
+#: ../app/config/gimprc-blurbs.h:425
 msgid "Sets the size of the previews in the Undo History."
 msgstr "设置æ?¤æ¶?å??å?²ç??é¢?è§?大å°?ã??"
 
-#: ../app/config/gimprc-blurbs.h:461
+#: ../app/config/gimprc-blurbs.h:428
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "å¦?æ??å?¯ç?¨ï¼?æ?? F1 å°?æ??å¼?帮å?©æµ?è§?å?¨ã??"
 
-#: ../app/config/gimprc-deserialize.c:134 ../app/core/gimp-modules.c:133
-#: ../app/core/gimp-units.c:163 ../app/gui/session.c:243
-#: ../app/plug-in/plug-in-rc.c:212
+#: ../app/config/gimprc-blurbs.h:439
+#, c-format
+msgid ""
+"Sets the external web browser to be used.  This can be an absolute path or "
+"the name of an executable to search for in the user's PATH. If the command "
+"contains '%s' it will be replaced with the URL, else the URL will be "
+"appended to the command with a space separating the two."
+msgstr ""
+"设置è¦?使ç?¨å¤?é?¨ Web æµ?è§?å?¨ã??å?¯ä»¥æ?¯ç»?对路å¾?æ??è??æ?¯ä»?ç?¨æ?·ç?? PATH 中æ??ç´¢ç??å?¯æ?§è¡?ç¨?"
+"åº?ç??å??å­?ã??å¦?æ??å?½ä»¤å?«æ??â??%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
 msgid "fatal parse error"
 msgstr "严é??解æ??é??误"
 
-#: ../app/config/gimprc-deserialize.c:162
+#: ../app/config/gimprc-deserialize.c:163
 #, c-format
 msgid "value for token %s is not a valid UTF-8 string"
 msgstr "%s ç??å?¼ä¸?æ?¯æ??æ??ç?? UTF-8 å­?符串"
 
-#: ../app/core/core-enums.c:54
-msgctxt "convert-dither-type"
+#. 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
 msgid "None"
 msgstr "æ? "
 
-#: ../app/core/core-enums.c:55
-msgctxt "convert-dither-type"
+#
+#: ../app/core/core-enums.c:54
 msgid "Floyd-Steinberg (normal)"
-msgstr "Floyd-Steinberg (æ?®é??)"
+msgstr "æ??å?¨ (æ?®é??)"
 
-#: ../app/core/core-enums.c:56
-msgctxt "convert-dither-type"
+#
+#: ../app/core/core-enums.c:55
 msgid "Floyd-Steinberg (reduced color bleeding)"
-msgstr "Floyd-Steinberg (å??å°?é¢?è?²æ??失)"
+msgstr "æ??å?¨ (å??å°?é¢?è?²æ??失)"
 
-#: ../app/core/core-enums.c:57
-msgctxt "convert-dither-type"
+#
+#: ../app/core/core-enums.c:56
 msgid "Positioned"
 msgstr "å®?ä½?"
 
-#: ../app/core/core-enums.c:87
-msgctxt "convert-palette-type"
+#
+#: ../app/core/core-enums.c:85
 msgid "Generate optimum palette"
 msgstr "ç??æ??ä¼?å??è?²æ?¿"
 
-#: ../app/core/core-enums.c:88
-msgctxt "convert-palette-type"
+#
+#: ../app/core/core-enums.c:86
 msgid "Use web-optimized palette"
 msgstr "使ç?¨ç½?页ä¼?å??è?²æ?¿"
 
-#: ../app/core/core-enums.c:89
-msgctxt "convert-palette-type"
+#
+#: ../app/core/core-enums.c:87
 msgid "Use black and white (1-bit) palette"
 msgstr "使���(1 �)��"
 
-#: ../app/core/core-enums.c:90
-msgctxt "convert-palette-type"
+#
+#: ../app/core/core-enums.c:88
 msgid "Use custom palette"
 msgstr "使������"
 
-#: ../app/core/core-enums.c:216
-msgctxt "align-reference-type"
+#
+#: ../app/core/core-enums.c:211
 msgid "First item"
 msgstr "第�项"
 
-#: ../app/core/core-enums.c:217
-msgctxt "align-reference-type"
-msgid "Image"
-msgstr "å?¾å??"
-
-#: ../app/core/core-enums.c:218
-msgctxt "align-reference-type"
+#: ../app/core/core-enums.c:213 ../app/dialogs/dialogs.c:198
+#: ../app/tools/tools-enums.c:210
 msgid "Selection"
 msgstr "é??å?º"
 
-#: ../app/core/core-enums.c:219
-msgctxt "align-reference-type"
+#
+#: ../app/core/core-enums.c:214
 msgid "Active layer"
 msgstr "活���"
 
-#: ../app/core/core-enums.c:220
-msgctxt "align-reference-type"
+#
+#: ../app/core/core-enums.c:215
 msgid "Active channel"
 msgstr "æ´»å?¨é??é??"
 
-#: ../app/core/core-enums.c:221
-msgctxt "align-reference-type"
+#
+#: ../app/core/core-enums.c:216
 msgid "Active path"
 msgstr "活�路�"
 
-#: ../app/core/core-enums.c:253
-msgctxt "fill-type"
+#
+#: ../app/core/core-enums.c:247
 msgid "Foreground color"
 msgstr "å??æ?¯è?²"
 
-#: ../app/core/core-enums.c:254
-msgctxt "fill-type"
+#
+#: ../app/core/core-enums.c:248
 msgid "Background color"
 msgstr "è??æ?¯è?²"
 
-#: ../app/core/core-enums.c:255
-msgctxt "fill-type"
+#
+#: ../app/core/core-enums.c:249
 msgid "White"
 msgstr "��"
 
-#: ../app/core/core-enums.c:256
-msgctxt "fill-type"
+#. Transparency
+#: ../app/core/core-enums.c:250 ../app/dialogs/preferences-dialog.c:2311
 msgid "Transparency"
 msgstr "é??æ??"
 
-#: ../app/core/core-enums.c:257
-msgctxt "fill-type"
-msgid "Pattern"
-msgstr "��"
-
-#: ../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"
+#
+#: ../app/core/core-enums.c:251 ../app/core/core-enums.c:308
 msgid "Pattern"
 msgstr "��"
 
-#: ../app/core/core-enums.c:315
-msgctxt "stroke-method"
+#
+#: ../app/core/core-enums.c:279
 msgid "Stroke line"
 msgstr "��线�"
 
-#: ../app/core/core-enums.c:316
-msgctxt "stroke-method"
+#
+#: ../app/core/core-enums.c:280
 msgid "Stroke with a paint tool"
 msgstr "使���工�����"
 
-#: ../app/core/core-enums.c:345
-msgctxt "join-style"
+#
+#: ../app/core/core-enums.c:307
+msgid "Solid color"
+msgstr "纯�"
+
+#
+#: ../app/core/core-enums.c:336
 msgid "Miter"
 msgstr "æ??æ?¥"
 
-#: ../app/core/core-enums.c:346
-msgctxt "join-style"
+#
+#: ../app/core/core-enums.c:337 ../app/core/core-enums.c:367
 msgid "Round"
 msgstr "å??è§?"
 
-#: ../app/core/core-enums.c:347
-msgctxt "join-style"
+#
+#: ../app/core/core-enums.c:338
 msgid "Bevel"
 msgstr "æ??é?¢"
 
-#: ../app/core/core-enums.c:376
-msgctxt "cap-style"
+#
+#: ../app/core/core-enums.c:366
 msgid "Butt"
 msgstr "对�"
 
-#: ../app/core/core-enums.c:377
-msgctxt "cap-style"
-msgid "Round"
-msgstr "å??è§?"
-
-#: ../app/core/core-enums.c:378
-msgctxt "cap-style"
+#
+#: ../app/core/core-enums.c:368 ../app/core/core-enums.c:443
 msgid "Square"
 msgstr "正�"
 
-#: ../app/core/core-enums.c:415
-msgctxt "dash-preset"
+#
+#: ../app/core/core-enums.c:404
 msgid "Custom"
 msgstr "���"
 
-#: ../app/core/core-enums.c:416
-msgctxt "dash-preset"
+#
+#: ../app/core/core-enums.c:405
 msgid "Line"
 msgstr "线"
 
-#: ../app/core/core-enums.c:417
-msgctxt "dash-preset"
+#
+#: ../app/core/core-enums.c:406
 msgid "Long dashes"
 msgstr "é?¿å??"
 
-#: ../app/core/core-enums.c:418
-msgctxt "dash-preset"
+#
+#: ../app/core/core-enums.c:407
 msgid "Medium dashes"
 msgstr "中å??"
 
-#: ../app/core/core-enums.c:419
-msgctxt "dash-preset"
+#
+#: ../app/core/core-enums.c:408
 msgid "Short dashes"
 msgstr "ç?­å??"
 
-#: ../app/core/core-enums.c:420
-msgctxt "dash-preset"
+#
+#: ../app/core/core-enums.c:409
 msgid "Sparse dots"
 msgstr "ç¨?ç??ç?¹"
 
-#: ../app/core/core-enums.c:421
-msgctxt "dash-preset"
+#
+#: ../app/core/core-enums.c:410
 msgid "Normal dots"
 msgstr "正常�"
 
-#: ../app/core/core-enums.c:422
-msgctxt "dash-preset"
+#
+#: ../app/core/core-enums.c:411
 msgid "Dense dots"
 msgstr "å¯?é??ç?¹"
 
-#: ../app/core/core-enums.c:423
-msgctxt "dash-preset"
+#
+#: ../app/core/core-enums.c:412
 msgid "Stipples"
 msgstr "��"
 
-#: ../app/core/core-enums.c:424
-msgctxt "dash-preset"
+#
+#: ../app/core/core-enums.c:413
 msgid "Dash, dot"
 msgstr "å??ç?¹"
 
-#: ../app/core/core-enums.c:425
-msgctxt "dash-preset"
+#
+#: ../app/core/core-enums.c:414
 msgid "Dash, dot, dot"
 msgstr "å??ç?¹ç?¹"
 
-#: ../app/core/core-enums.c:454
-msgctxt "brush-generated-shape"
+#
+#: ../app/core/core-enums.c:442
 msgid "Circle"
 msgstr "å??"
 
-#: ../app/core/core-enums.c:455
-msgctxt "brush-generated-shape"
-msgid "Square"
-msgstr "正�"
-
-#: ../app/core/core-enums.c:456
-msgctxt "brush-generated-shape"
+#
+#: ../app/core/core-enums.c:444
 msgid "Diamond"
 msgstr "�形"
 
-#: ../app/core/core-enums.c:485
-msgctxt "orientation-type"
+#: ../app/core/core-enums.c:472 ../app/dialogs/preferences-dialog.c:2343
 msgid "Horizontal"
 msgstr "æ°´å¹³"
 
-#: ../app/core/core-enums.c:486
-msgctxt "orientation-type"
+#: ../app/core/core-enums.c:473 ../app/dialogs/preferences-dialog.c:2345
 msgid "Vertical"
 msgstr "å??ç?´"
 
-#: ../app/core/core-enums.c:487
-msgctxt "orientation-type"
+#
+#: ../app/core/core-enums.c:474
 msgid "Unknown"
 msgstr "��"
 
-#: ../app/core/core-enums.c:518
-msgctxt "item-set"
-msgid "None"
-msgstr "æ? "
-
-#: ../app/core/core-enums.c:519
-msgctxt "item-set"
+#
+#: ../app/core/core-enums.c:505
 msgid "All layers"
 msgstr "����"
 
-#: ../app/core/core-enums.c:520
-msgctxt "item-set"
+#
+#: ../app/core/core-enums.c:506
 msgid "Image-sized layers"
 msgstr "å?¾å??大å°?ç??å?¾å±?"
 
-#: ../app/core/core-enums.c:521
-msgctxt "item-set"
+#
+#: ../app/core/core-enums.c:507
 msgid "All visible layers"
 msgstr "������"
 
-#: ../app/core/core-enums.c:522
-msgctxt "item-set"
+#
+#: ../app/core/core-enums.c:508
 msgid "All linked layers"
 msgstr "������"
 
-#: ../app/core/core-enums.c:588
-msgctxt "view-size"
+#
+#: ../app/core/core-enums.c:572
 msgid "Tiny"
 msgstr "ç»?å°?"
 
-#: ../app/core/core-enums.c:589
-msgctxt "view-size"
+#
+#: ../app/core/core-enums.c:573
 msgid "Very small"
 msgstr "å¾?å°?"
 
-#: ../app/core/core-enums.c:590
-msgctxt "view-size"
+#
+#: ../app/core/core-enums.c:574
 msgid "Small"
 msgstr "å°?"
 
-#: ../app/core/core-enums.c:591
-msgctxt "view-size"
+#
+#: ../app/core/core-enums.c:575
 msgid "Medium"
 msgstr "中"
 
-#: ../app/core/core-enums.c:592
-msgctxt "view-size"
+#
+#: ../app/core/core-enums.c:576
 msgid "Large"
 msgstr "大"
 
-#: ../app/core/core-enums.c:593
-msgctxt "view-size"
+#
+#: ../app/core/core-enums.c:577
 msgid "Very large"
 msgstr "�大"
 
-#: ../app/core/core-enums.c:594
-msgctxt "view-size"
+#
+#: ../app/core/core-enums.c:578
 msgid "Huge"
 msgstr "�大"
 
-#: ../app/core/core-enums.c:595
-msgctxt "view-size"
+#
+#: ../app/core/core-enums.c:579
 msgid "Enormous"
 msgstr "巨大"
 
-#: ../app/core/core-enums.c:596
-msgctxt "view-size"
+#
+#: ../app/core/core-enums.c:580
 msgid "Gigantic"
 msgstr "æ??大"
 
-#: ../app/core/core-enums.c:624
-msgctxt "view-type"
+#
+#: ../app/core/core-enums.c:607
 msgid "View as list"
 msgstr "以å??表æ?¹å¼?æ?¥ç??"
 
-#: ../app/core/core-enums.c:625
-msgctxt "view-type"
+#
+#: ../app/core/core-enums.c:608
 msgid "View as grid"
 msgstr "以é?µå??æ?¹å¼?æ?¥ç??"
 
-#: ../app/core/core-enums.c:691
-msgctxt "thumbnail-size"
+#
+#: ../app/core/core-enums.c:672
 msgid "No thumbnails"
 msgstr "�缩��"
 
-#: ../app/core/core-enums.c:692
-msgctxt "thumbnail-size"
+#
+#: ../app/core/core-enums.c:673
 msgid "Normal (128x128)"
 msgstr "æ?®é??(128x128)"
 
-#: ../app/core/core-enums.c:693
-msgctxt "thumbnail-size"
+#
+#: ../app/core/core-enums.c:674
 msgid "Large (256x256)"
 msgstr "大(256x256)"
 
-#: ../app/core/core-enums.c:870
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:850
 msgid "<<invalid>>"
 msgstr "<< æ? æ?? >>"
 
-#: ../app/core/core-enums.c:871
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:851
 msgid "Scale image"
 msgstr "缩æ?¾å?¾å??"
 
-#: ../app/core/core-enums.c:872
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:852
 msgid "Resize image"
 msgstr "å?¾å??æ?¹å??大å°?"
 
-#: ../app/core/core-enums.c:873
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:853
 msgid "Flip image"
 msgstr "翻转å?¾å??"
 
-#: ../app/core/core-enums.c:874
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:854
 msgid "Rotate image"
 msgstr "æ??转å?¾å??"
 
-#: ../app/core/core-enums.c:875
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:855
 msgid "Crop image"
 msgstr "å?ªè£?å?¾å??"
 
-#: ../app/core/core-enums.c:876
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:856
 msgid "Convert image"
 msgstr "转æ?¢å?¾å??"
 
-#: ../app/core/core-enums.c:877
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:857
 msgid "Remove item"
 msgstr "移�项�"
 
-#: ../app/core/core-enums.c:878
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:858
 msgid "Merge layers"
 msgstr "å??并å?¾å±?"
 
-#: ../app/core/core-enums.c:879
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:859
 msgid "Merge paths"
 msgstr "å??并路å¾?"
 
-#: ../app/core/core-enums.c:880
-msgctxt "undo-type"
-msgid "Quick Mask"
-msgstr "å¿«é??è??æ?¿"
-
-#: ../app/core/core-enums.c:881 ../app/core/core-enums.c:911
-#: ../app/core/gimpimage-grid.c:63
-msgctxt "undo-type"
+#: ../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
 msgid "Grid"
 msgstr "ç½?æ ¼"
 
-#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:913
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:862 ../app/core/core-enums.c:894
 msgid "Guide"
-msgstr "å??è??线"
+msgstr "��线"
 
-#: ../app/core/core-enums.c:883 ../app/core/core-enums.c:914
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:863 ../app/core/core-enums.c:895
 msgid "Sample Point"
 msgstr "é??æ ·ç?¹"
 
-#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:915
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:864 ../app/core/core-enums.c:896
 msgid "Layer/Channel"
 msgstr "å?¾å±?/é??é??"
 
-#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:916
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:897
 msgid "Layer/Channel modification"
 msgstr "å?¾å±?/é??é??ä¿®æ?¹"
 
-#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:917
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:866 ../app/core/core-enums.c:898
 msgid "Selection mask"
 msgstr "é??å?ºè??æ?¿"
 
-#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:921
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:901
 msgid "Item visibility"
 msgstr "项����"
 
-#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:922
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:868 ../app/core/core-enums.c:902
 msgid "Link/Unlink item"
 msgstr "é?¾æ?¥/å??æ¶?é?¾æ?¥é¡¹ç?®"
 
-#: ../app/core/core-enums.c:889
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:869
 msgid "Item properties"
 msgstr "项���"
 
-#: ../app/core/core-enums.c:890 ../app/core/core-enums.c:920
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:870 ../app/core/core-enums.c:900
 msgid "Move item"
 msgstr "移�项�"
 
-#: ../app/core/core-enums.c:891
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:871
 msgid "Scale item"
 msgstr "缩�项�"
 
-#: ../app/core/core-enums.c:892
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:872
 msgid "Resize item"
 msgstr "��项�大�"
 
-#: ../app/core/core-enums.c:893
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:873
 msgid "Add layer"
 msgstr "添���"
 
-#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:933
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:911
 msgid "Add layer mask"
 msgstr "æ·»å? å?¾å±?è??æ?¿"
 
-#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:935
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:913
 msgid "Apply layer mask"
 msgstr "åº?ç?¨å?¾å±?è??æ?¿"
 
-#: ../app/core/core-enums.c:896 ../app/core/core-enums.c:943
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:923
 msgid "Floating selection to layer"
 msgstr "æµ®å?¨é??å?ºå?°å?¾å±?"
 
-#: ../app/core/core-enums.c:897
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:877
 msgid "Float selection"
 msgstr "æµ®å?¨é??å?º"
 
-#: ../app/core/core-enums.c:898
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:878
 msgid "Anchor floating selection"
 msgstr "å?ºå®?æµ®å?¨é??å?º"
 
-#: ../app/core/core-enums.c:899 ../app/core/gimp-edit.c:262
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:879
+msgid "Remove floating selection"
+msgstr "å? é?¤æµ®å?¨é??å?º"
+
+#: ../app/core/core-enums.c:880 ../app/core/gimp-edit.c:262
 msgid "Paste"
 msgstr "ç²?è´´"
 
-#: ../app/core/core-enums.c:900 ../app/core/gimp-edit.c:501
-msgctxt "undo-type"
+#: ../app/core/core-enums.c:881 ../app/core/gimp-edit.c:557
 msgid "Cut"
 msgstr "å?ªå??"
 
-#: ../app/core/core-enums.c:901
-msgctxt "undo-type"
+#: ../app/core/core-enums.c:882 ../app/tools/gimptexttool.c:161
+#: ../app/widgets/widgets-enums.c:265
 msgid "Text"
-msgstr "æ??å­?"
+msgstr "æ??æ?¬"
 
-#: ../app/core/core-enums.c:902 ../app/core/core-enums.c:944
+#: ../app/core/core-enums.c:883 ../app/core/core-enums.c:926
 #: ../app/core/gimpdrawable-transform.c:567
-msgctxt "undo-type"
 msgid "Transform"
 msgstr "å??æ?¢"
 
-#: ../app/core/core-enums.c:903 ../app/core/core-enums.c:945
-msgctxt "undo-type"
+#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:927
+#: ../app/paint/gimppaintcore.c:137
 msgid "Paint"
 msgstr "��"
 
-#: ../app/core/core-enums.c:904 ../app/core/core-enums.c:948
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:930
 msgid "Attach parasite"
 msgstr "æ·»å? å¯?ç??ç?©"
 
-#: ../app/core/core-enums.c:905 ../app/core/core-enums.c:949
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:931
 msgid "Remove parasite"
 msgstr "å? é?¤å¯?ç??ç?©"
 
-#: ../app/core/core-enums.c:906
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:887
 msgid "Import paths"
 msgstr "导�路�"
 
-#: ../app/core/core-enums.c:907
-msgctxt "undo-type"
+#: ../app/core/core-enums.c:888 ../app/pdb/drawable-cmds.c:885
 msgid "Plug-In"
 msgstr "æ??件"
 
-#: ../app/core/core-enums.c:908
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:889
 msgid "Image type"
 msgstr "å?¾å??ç±»å??"
 
-#: ../app/core/core-enums.c:909
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:890
 msgid "Image size"
 msgstr "å?¾å??大å°?"
 
-#: ../app/core/core-enums.c:910
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:891
 msgid "Image resolution change"
 msgstr "å?¾å??å??辨ç??æ?´æ?¹"
 
-#: ../app/core/core-enums.c:912
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:893
 msgid "Change indexed palette"
 msgstr "��索���"
 
-#: ../app/core/core-enums.c:918
-msgctxt "undo-type"
-msgid "Reorder item"
-msgstr "é??æ?°æ??å??项ç?®"
-
-#: ../app/core/core-enums.c:919
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:899
 msgid "Rename item"
 msgstr "é??å?½å??项ç?®"
 
-#: ../app/core/core-enums.c:923
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:903
 msgid "New layer"
 msgstr "�建��"
 
-#: ../app/core/core-enums.c:924
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:904
 msgid "Delete layer"
 msgstr "����"
 
-#: ../app/core/core-enums.c:925
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:905
+msgid "Reposition layer"
+msgstr "é??å®?ä½?å?¾å±?"
+
+#
+#: ../app/core/core-enums.c:906
 msgid "Set layer mode"
 msgstr "设置��模�"
 
-#: ../app/core/core-enums.c:926
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:907
 msgid "Set layer opacity"
 msgstr "设置å?¾å±?ä¸?é??æ??度"
 
-#: ../app/core/core-enums.c:927
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:908
 msgid "Lock/Unlock alpha channel"
 msgstr "é??å®?/å??æ¶?é??å®? Alpha é??é??"
 
-#: ../app/core/core-enums.c:928
-msgctxt "undo-type"
-msgid "Suspend group layer resize"
-msgstr "æ??å??æ?¹å??群ç»?å?¾å±?大å°?"
-
-#: ../app/core/core-enums.c:929
-msgctxt "undo-type"
-msgid "Resume group layer resize"
-msgstr "æ?¢å¤?æ?¹å??群ç»?å?¾å±?大å°?"
-
-#: ../app/core/core-enums.c:930
-msgctxt "undo-type"
-msgid "Convert group layer"
-msgstr "转�群���"
-
-#: ../app/core/core-enums.c:931
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:909
 msgid "Text layer"
 msgstr "æ??å­?å?¾å±?"
 
-#: ../app/core/core-enums.c:932
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:910
 msgid "Text layer modification"
 msgstr "æ??å­?å?¾å±?ä¿®æ?¹"
 
-#: ../app/core/core-enums.c:934
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:912
 msgid "Delete layer mask"
 msgstr "å? é?¤å?¾å±?è??æ?¿"
 
-#: ../app/core/core-enums.c:936
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:914
 msgid "Show layer mask"
 msgstr "æ?¾ç¤ºå?¾å±?è??æ?¿"
 
-#: ../app/core/core-enums.c:937
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:915
 msgid "New channel"
 msgstr "æ?°å»ºé??é??"
 
-#: ../app/core/core-enums.c:938
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:916
 msgid "Delete channel"
 msgstr "å? é?¤é??é??"
 
-#: ../app/core/core-enums.c:939
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:917
+msgid "Reposition channel"
+msgstr "é??å®?ä½?é??é??"
+
+#
+#: ../app/core/core-enums.c:918
 msgid "Channel color"
 msgstr "é??é??é¢?è?²"
 
-#: ../app/core/core-enums.c:940
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:919
 msgid "New path"
 msgstr "�建路�"
 
-#: ../app/core/core-enums.c:941
-msgctxt "undo-type"
-msgid "Delete path"
-msgstr "��路�"
-
-#: ../app/core/core-enums.c:942
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:921
 msgid "Path modification"
 msgstr "路�修�"
 
-#: ../app/core/core-enums.c:946
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:922
+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
 msgid "Ink"
 msgstr "墨水"
 
-#: ../app/core/core-enums.c:947
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:929
 msgid "Select foreground"
 msgstr "é??æ?©å??æ?¯"
 
-#: ../app/core/core-enums.c:950
-msgctxt "undo-type"
+#
+#: ../app/core/core-enums.c:932
 msgid "Not undoable"
 msgstr "����"
 
-#: ../app/core/core-enums.c:1222
-msgctxt "select-criterion"
+#
+#: ../app/core/core-enums.c:1196
 msgid "Composite"
 msgstr "å??æ??"
 
-#: ../app/core/core-enums.c:1223
-msgctxt "select-criterion"
-msgid "Red"
-msgstr "红�"
-
-#: ../app/core/core-enums.c:1224
-msgctxt "select-criterion"
-msgid "Green"
-msgstr "绿�"
-
-#: ../app/core/core-enums.c:1225
-msgctxt "select-criterion"
-msgid "Blue"
-msgstr "è??è?²"
-
-#: ../app/core/core-enums.c:1226
-msgctxt "select-criterion"
-msgid "Hue"
-msgstr "��"
-
-#: ../app/core/core-enums.c:1227
-msgctxt "select-criterion"
-msgid "Saturation"
-msgstr "饱å??度"
-
-#: ../app/core/core-enums.c:1228
-msgctxt "select-criterion"
-msgid "Value"
-msgstr "æ??度"
-
-#: ../app/core/core-enums.c:1257
-msgctxt "message-severity"
+#
+#: ../app/core/core-enums.c:1230
 msgid "Message"
 msgstr "��"
 
-#: ../app/core/core-enums.c:1258
-msgctxt "message-severity"
+#
+#: ../app/core/core-enums.c:1231
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../app/core/core-enums.c:1259
-msgctxt "message-severity"
+#
+#: ../app/core/core-enums.c:1232
 msgid "Error"
 msgstr "é??误"
 
-#: ../app/core/core-enums.c:1288
-msgctxt "color-profile-policy"
+#
+#: ../app/core/core-enums.c:1260
 msgid "Ask what to do"
 msgstr "询é?®æ??ä¹?å??"
 
-#: ../app/core/core-enums.c:1289
-msgctxt "color-profile-policy"
+#
+#: ../app/core/core-enums.c:1261
 msgid "Keep embedded profile"
 msgstr "ä¿?æ??å??åµ?ç??é??ç½®æ??件"
 
-#: ../app/core/core-enums.c:1290
-msgctxt "color-profile-policy"
+#
+#: ../app/core/core-enums.c:1262
 msgid "Convert to RGB workspace"
 msgstr "转�为 RGB 工�空�"
 
-#: ../app/core/core-enums.c:1327
-msgctxt "dynamics-output-type"
-msgid "Opacity"
-msgstr "ä¸?é??æ??度"
-
-#: ../app/core/core-enums.c:1328
-msgctxt "dynamics-output-type"
-msgid "Size"
-msgstr "大�"
-
-#: ../app/core/core-enums.c:1329
-msgctxt "dynamics-output-type"
-msgid "Angle"
-msgstr "�度"
-
-#: ../app/core/core-enums.c:1330
-msgctxt "dynamics-output-type"
-msgid "Color"
-msgstr "��"
-
-#: ../app/core/core-enums.c:1331
-msgctxt "dynamics-output-type"
-msgid "Hardness"
-msgstr "硬度"
-
-#: ../app/core/core-enums.c:1332
-msgctxt "dynamics-output-type"
-msgid "Force"
-msgstr "å??度"
-
-#: ../app/core/core-enums.c:1333
-msgctxt "dynamics-output-type"
-msgid "Aspect ratio"
-msgstr "宽��"
-
-#: ../app/core/core-enums.c:1334
-msgctxt "dynamics-output-type"
-msgid "Spacing"
-msgstr "é?´è·?"
-
-#: ../app/core/core-enums.c:1335
-msgctxt "dynamics-output-type"
-msgid "Rate"
-msgstr "æ¯?ç??"
-
-#: ../app/core/core-enums.c:1336
-msgctxt "dynamics-output-type"
-msgid "Flow"
-msgstr "æµ?é??"
-
-#: ../app/core/core-enums.c:1337
-msgctxt "dynamics-output-type"
-msgid "Jitter"
-msgstr "æ??å?¨"
-
-#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:344
-#: ../app/gui/session.c:349 ../app/menus/menus.c:464
-#: ../app/widgets/gimpdevices.c:269
+#: ../app/core/gimp-contexts.c:155 ../app/core/gimptooloptions.c:231
+#: ../app/gui/session.c:307 ../app/menus/menus.c:433
+#: ../app/widgets/gimpdevices.c:258
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
 msgstr "å? é?¤â??%sâ??失败ï¼?%s"
 
-#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:304
+#: ../app/core/gimp-edit.c:190 ../app/core/gimp-edit.c:326
 msgid "Pasted Layer"
 msgstr "被ç²?è´´ç??å?¾å±?"
 
-#: ../app/core/gimp-edit.c:389
-#, fuzzy
-msgctxt "undo-type"
-msgid "Clear"
-msgstr "��"
-
-#: ../app/core/gimp-edit.c:408
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimp-edit.c:464
 msgid "Fill with Foreground Color"
 msgstr "以å??æ?¯è?²å¡«å??"
 
-#: ../app/core/gimp-edit.c:412
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimp-edit.c:468
 msgid "Fill with Background Color"
 msgstr "以è??æ?¯è?²å¡«å??"
 
-#: ../app/core/gimp-edit.c:416
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimp-edit.c:472
 msgid "Fill with White"
 msgstr "以ç?½è?²å¡«å??"
 
-#: ../app/core/gimp-edit.c:420
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimp-edit.c:476
 msgid "Fill with Transparency"
 msgstr "以é??æ??å¡«å??"
 
-#: ../app/core/gimp-edit.c:424
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimp-edit.c:480
 msgid "Fill with Pattern"
 msgstr "以å?¾æ¡?å¡«å??"
 
-#: ../app/core/gimp-edit.c:513
+#: ../app/core/gimp-edit.c:573
 msgid "Global Buffer"
 msgstr "�����"
 
-#: ../app/core/gimp-gradients.c:62
+#: ../app/core/gimp-gradients.c:61
 msgid "FG to BG (RGB)"
 msgstr "å??æ?¯å?°è??æ?¯(RGB)"
 
-#: ../app/core/gimp-gradients.c:70
-msgid "FG to BG (Hardedge)"
-msgstr "å??æ?¯å?°è??æ?¯(硬边)"
-
-#: ../app/core/gimp-gradients.c:87
+#: ../app/core/gimp-gradients.c:66
 msgid "FG to BG (HSV counter-clockwise)"
 msgstr "å??æ?¯å?°è??æ?¯(HSV é??æ?¶é??è?²è°?)"
 
-#: ../app/core/gimp-gradients.c:95
+#: ../app/core/gimp-gradients.c:71
 msgid "FG to BG (HSV clockwise hue)"
 msgstr "å??æ?¯å?°è??æ?¯(HSV 顺æ?¶é??è?²è°?)"
 
-#: ../app/core/gimp-gradients.c:103
+#: ../app/core/gimp-gradients.c:76
 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:154
+#: ../app/core/gimp-user-install.c:153
 #, c-format
 msgid ""
 "It seems you have used GIMP %s before.  GIMP will now migrate your user "
 "settings to '%s'."
 msgstr "æ?¨ç??æ?¥æ?¾ç»?使ç?¨è¿? GIMP %sã??GIMP ç?°å?¨å°?è¦?æ??æ?¨ç??ç?¨æ?·é??ç½®è¿?移å?°â??%sâ??ã??"
 
-#: ../app/core/gimp-user-install.c:159
+#: ../app/core/gimp-user-install.c:158
 #, c-format
 msgid ""
 "It appears that you are using GIMP for the first time.  GIMP will now create "
@@ -7304,108 +6354,99 @@ msgstr ""
 "æ?¨ç??æ?¥æ?¯ç¬¬ä¸?次使ç?¨ GIMPã??GIMP ç?°å?¨å°?å??建å??为â??%sâ??ç??æ??件夹并å¤?å?¶ä¸?äº?æ??件å?°å?¶"
 "中ã??"
 
-#: ../app/core/gimp-user-install.c:311
+#: ../app/core/gimp-user-install.c:309
 #, c-format
 msgid "Copying file '%s' from '%s'..."
 msgstr "æ­£å?¨ä»?â??%2$sâ??å¤?å?¶æ??件â??%1$sâ??..."
 
-#: ../app/core/gimp-user-install.c:326 ../app/core/gimp-user-install.c:352
+#: ../app/core/gimp-user-install.c:324 ../app/core/gimp-user-install.c:350
 #, c-format
 msgid "Creating folder '%s'..."
 msgstr "æ­£å?¨å??建â??%sâ??æ??件夹..."
 
-#: ../app/core/gimp-user-install.c:337 ../app/core/gimp-user-install.c:363
+#: ../app/core/gimp-user-install.c:335 ../app/core/gimp-user-install.c:361
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "æ? æ³?å??建â??%sâ??æ??件夹ï¼?%s"
 
-#: ../app/core/gimp.c:597
+#: ../app/core/gimp.c:543
 msgid "Initialization"
 msgstr "å??å§?å??"
 
 #. register all internal procedures
-#: ../app/core/gimp.c:698
+#: ../app/core/gimp.c:618
 msgid "Internal Procedures"
 msgstr "å??é?¨è¿?ç¨?"
 
 #. initialize  the global parasite table
-#: ../app/core/gimp.c:949
+#: ../app/core/gimp.c:834
 msgid "Looking for data files"
 msgstr "æ­£å?¨æ?¥æ?¾æ?°æ?®æ??件"
 
-#: ../app/core/gimp.c:949
+#: ../app/core/gimp.c:834
 msgid "Parasites"
 msgstr "å¯?ç??ç?©"
 
-#. initialize the list of gimp dynamics
-#: ../app/core/gimp.c:958 ../app/dialogs/preferences-dialog.c:2724
-msgid "Dynamics"
-msgstr "å?¨æ??"
-
 #. initialize the list of fonts
-#: ../app/core/gimp.c:978
+#: ../app/core/gimp.c:854
 msgid "Fonts (this may take a while)"
 msgstr "å­?ä½?(è¿?å°?è??è´¹ä¸?äº?æ?¶é?´)"
 
 #. initialize the module list
-#: ../app/core/gimp.c:992 ../app/dialogs/preferences-dialog.c:2752
+#: ../app/core/gimp.c:863 ../app/dialogs/preferences-dialog.c:2772
 msgid "Modules"
 msgstr "模å??"
 
-#. update tag cache
-#: ../app/core/gimp.c:996
-msgid "Updating tag cache"
-msgstr "正����签��"
-
-#: ../app/core/gimpbrush-load.c:178
+#: ../app/core/gimpbrush-load.c:177
 #, c-format
 msgid "Could not read %d bytes from '%s': %s"
 msgstr "æ? æ³?ä»?â??%2$sâ??中读å?? %1$d å­?è??ï¼?%3$s"
 
-#: ../app/core/gimpbrush-load.c:198
+#: ../app/core/gimpbrush-load.c:197
 #, c-format
 msgid "Fatal parse error in brush file '%s': Width = 0."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?宽度 = 0ã??"
 
-#: ../app/core/gimpbrush-load.c:207
+#: ../app/core/gimpbrush-load.c:206
 #, c-format
 msgid "Fatal parse error in brush file '%s': Height = 0."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?é«?度 = 0ã??"
 
-#: ../app/core/gimpbrush-load.c:216
+#: ../app/core/gimpbrush-load.c:215
 #, c-format
 msgid "Fatal parse error in brush file '%s': Bytes = 0."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?å­?è??æ?° = 0ã??"
 
-#: ../app/core/gimpbrush-load.c:240
+#: ../app/core/gimpbrush-load.c:239
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown depth %d."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ?ªç?¥è?²æ·± %dã??"
 
-#: ../app/core/gimpbrush-load.c:253
+#: ../app/core/gimpbrush-load.c:252
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown version %d."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ?ªç?¥ç??æ?¬ %dã??"
 
-#: ../app/core/gimpbrush-load.c:269 ../app/core/gimpbrush-load.c:389
-#: ../app/core/gimpbrush-load.c:722
+#: ../app/core/gimpbrush-load.c:268 ../app/core/gimpbrush-load.c:388
+#: ../app/core/gimpbrush-load.c:720
 #, c-format
 msgid "Fatal parse error in brush file '%s': File appears truncated."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ??件ç??æ?¥å·²è¢«æ?ªæ?­ã??"
 
-#: ../app/core/gimpbrush-load.c:277 ../app/core/gimpbrushgenerated-load.c:128
+#: ../app/core/gimpbrush-load.c:276 ../app/core/gimpbrushgenerated-load.c:128
 #: ../app/core/gimpbrushpipe-load.c:97
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "ç?»ç¬?æ??件â??%sâ??中å?«æ??æ? æ??ç?? UTF-8 å­?符串ã??"
 
-#: ../app/core/gimpbrush-load.c:284 ../app/core/gimppattern-load.c:146
-#: ../app/dialogs/template-options-dialog.c:82
-#: ../app/tools/gimpvectortool.c:319
+#: ../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/tools/gimpvectortool.c:299
 msgid "Unnamed"
 msgstr "æ?ªå?½å??"
 
-#: ../app/core/gimpbrush-load.c:378
+#: ../app/core/gimpbrush-load.c:377
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': Unsupported brush depth %d\n"
@@ -7414,21 +6455,17 @@ msgstr ""
 "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?ä¸?æ?¯æ??ç??ç?»ç¬?è?²æ·± %d\n"
 "GIMP ç?»ç¬?å¿?须为ç?°åº¦æ?? RGBAã??"
 
-#: ../app/core/gimpbrush-load.c:450
+#: ../app/core/gimpbrush-load.c:448
 #, 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:617
+#: ../app/core/gimpbrush-load.c:615
 #, c-format
 msgid "Fatal parse error in brush file '%s': Wide brushes are not supported."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?ä¸?æ?¯æ??宽ç?»ç¬?ã??"
 
-#: ../app/core/gimpbrush.c:136
-msgid "Brush Spacing"
-msgstr "����"
-
 #: ../app/core/gimpbrushgenerated-load.c:87
 #, c-format
 msgid "Fatal parse error in brush file '%s': Not a GIMP brush file."
@@ -7461,253 +6498,139 @@ msgstr "æ??件å?¨ç¬¬ %d è¡?被æ?ªæ?­"
 msgid "Error while reading brush file '%s': %s"
 msgstr "读å??ç?»ç¬?æ??件â??%sâ??æ?¶å?ºé??ï¼?%s"
 
-#: ../app/core/gimpbrushgenerated.c:129
-msgid "Brush Shape"
-msgstr "��形�"
-
-#: ../app/core/gimpbrushgenerated.c:137
-msgid "Brush Radius"
-msgstr "ç?»ç¬?å??å¾?"
-
-#: ../app/core/gimpbrushgenerated.c:144
-msgid "Brush Spikes"
-msgstr "����"
-
-#: ../app/core/gimpbrushgenerated.c:151
-msgid "Brush Hardness"
-msgstr "��硬度"
-
-#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:143
-msgid "Brush Aspect Ratio"
-msgstr "��宽��"
-
-#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:147
-msgid "Brush Angle"
-msgstr "���度"
-
 #: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133
-#: ../app/core/gimpbrushpipe-load.c:224
+#: ../app/core/gimpbrushpipe-load.c:223
 #, c-format
 msgid "Fatal parse error in brush file '%s': File is corrupt."
 msgstr "ç?»ç¬?æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?æ??件已æ??å??ã??"
 
-#: ../app/core/gimpchannel-select.c:59
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel-select.c:60
+msgctxt "command"
 msgid "Rectangle Select"
 msgstr "ç?©å½¢é??æ?©"
 
-#: ../app/core/gimpchannel-select.c:110
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel-select.c:111
+msgctxt "command"
 msgid "Ellipse Select"
 msgstr "椭å??é??æ?©"
 
-#: ../app/core/gimpchannel-select.c:164
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel-select.c:165
+msgctxt "command"
 msgid "Rounded Rectangle Select"
 msgstr "å??è§?ç?©å½¢é??æ?©"
 
-#: ../app/core/gimpchannel-select.c:433 ../app/core/gimplayer.c:273
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel-select.c:434
 msgid "Alpha to Selection"
 msgstr "Alpha å?°é??å?º"
 
-#: ../app/core/gimpchannel-select.c:471
-#, fuzzy, c-format
-msgctxt "undo-type"
+#: ../app/core/gimpchannel-select.c:472
+#, c-format
 msgid "%s Channel to Selection"
 msgstr "%s é??é??å?°é??å?º"
 
-#: ../app/core/gimpchannel-select.c:519
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel-select.c:520 ../app/tools/gimpfuzzyselecttool.c:80
+msgctxt "command"
 msgid "Fuzzy Select"
 msgstr "模ç³?é??æ?©"
 
-#: ../app/core/gimpchannel-select.c:566
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel-select.c:567
+#: ../app/tools/gimpbycolorselecttool.c:82
+msgctxt "command"
 msgid "Select by Color"
 msgstr "æ??é¢?è?²é??æ?©"
 
-#: ../app/core/gimpchannel.c:272
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:257
+msgid "Channel"
+msgstr "é??é??"
+
+#: ../app/core/gimpchannel.c:258
 msgid "Rename Channel"
 msgstr "é??å?½å??é??é??"
 
-#: ../app/core/gimpchannel.c:273
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:259
 msgid "Move Channel"
 msgstr "移å?¨é??é??"
 
-#: ../app/core/gimpchannel.c:274
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:260
 msgid "Scale Channel"
 msgstr "缩æ?¾é??é??"
 
-#: ../app/core/gimpchannel.c:275
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:261
 msgid "Resize Channel"
 msgstr "æ?¹å??é??é??大å°?"
 
-#: ../app/core/gimpchannel.c:276
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:262
 msgid "Flip Channel"
 msgstr "翻转é??é??"
 
-#: ../app/core/gimpchannel.c:277
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:263
 msgid "Rotate Channel"
 msgstr "æ??转é??é??"
 
-#: ../app/core/gimpchannel.c:278 ../app/core/gimpdrawable-transform.c:845
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:886
 msgid "Transform Channel"
 msgstr "å??æ?¢é??é??"
 
-#: ../app/core/gimpchannel.c:279
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:265
 msgid "Stroke Channel"
 msgstr "å?¾ç?»é??é??"
 
-#: ../app/core/gimpchannel.c:280 ../app/core/gimpselection.c:584
-#, fuzzy
-msgctxt "undo-type"
-msgid "Channel to Selection"
-msgstr "é??é??å?°é??å?º"
-
-#: ../app/core/gimpchannel.c:281
-#, fuzzy
-msgctxt "undo-type"
-msgid "Reorder Channel"
-msgstr "é??æ??é??é??"
-
-#: ../app/core/gimpchannel.c:282
-#, fuzzy
-msgctxt "undo-type"
-msgid "Raise Channel"
-msgstr "å??é«?é??é??"
-
-#: ../app/core/gimpchannel.c:283
-#, fuzzy
-msgctxt "undo-type"
-msgid "Raise Channel to Top"
-msgstr "é??é??移è?³é¡¶ç«¯"
-
-#: ../app/core/gimpchannel.c:284
-#, fuzzy
-msgctxt "undo-type"
-msgid "Lower Channel"
-msgstr "é??ä½?é??é??"
-
-#: ../app/core/gimpchannel.c:285
-#, fuzzy
-msgctxt "undo-type"
-msgid "Lower Channel to Bottom"
-msgstr "é??é??移è?³åº?端"
-
 #: ../app/core/gimpchannel.c:286
-msgid "Channel cannot be raised higher."
-msgstr "é??é??æ? æ³?å??å??é«?ã??"
-
-#: ../app/core/gimpchannel.c:287
-msgid "Channel cannot be lowered more."
-msgstr "é??é??æ? æ³?å??é??ä½?ã??"
-
-#: ../app/core/gimpchannel.c:309
-#, fuzzy
-msgctxt "undo-type"
 msgid "Feather Channel"
 msgstr "ç¾½å??é??é??"
 
-#: ../app/core/gimpchannel.c:310
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:287
 msgid "Sharpen Channel"
 msgstr "é??å??é??é??"
 
-#: ../app/core/gimpchannel.c:311
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:288
 msgid "Clear Channel"
 msgstr "æ¸?é?¤é??é??"
 
-#: ../app/core/gimpchannel.c:312
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:289
 msgid "Fill Channel"
 msgstr "å¡«å??é??é??"
 
-#: ../app/core/gimpchannel.c:313
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:290
 msgid "Invert Channel"
 msgstr "å??转é??é??"
 
-#: ../app/core/gimpchannel.c:314
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:291
 msgid "Border Channel"
 msgstr "å??é??é??è¾¹ç??"
 
-#: ../app/core/gimpchannel.c:315
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:292
 msgid "Grow Channel"
 msgstr "å¢?é?¿é??é??"
 
-#: ../app/core/gimpchannel.c:316
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:293
 msgid "Shrink Channel"
 msgstr "æ?¶ç¼©é??é??"
 
-#: ../app/core/gimpchannel.c:728
+#: ../app/core/gimpchannel.c:710
+#, c-format
 msgid "Cannot stroke empty channel."
 msgstr "æ? æ³?å?¾ç?»ç©ºé??é??ã??"
 
-#: ../app/core/gimpchannel.c:1752
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:1631
 msgid "Set Channel Color"
 msgstr "设置é??é??é¢?è?²"
 
-#: ../app/core/gimpchannel.c:1818
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpchannel.c:1679
 msgid "Set Channel Opacity"
 msgstr "设置é??é??ä¸?é??æ??度"
 
-#: ../app/core/gimpchannel.c:1926 ../app/core/gimpselection.c:154
+#: ../app/core/gimpchannel.c:1747 ../app/core/gimpselection.c:520
 msgid "Selection Mask"
 msgstr "é??å?ºè??æ?¿"
 
-#: ../app/core/gimpcontext.c:640
-msgid "Opacity"
-msgstr "ä¸?é??æ??度"
-
-#: ../app/core/gimpcontext.c:648
-msgid "Paint Mode"
-msgstr "��模�"
-
-#: ../app/core/gimpdata.c:679 ../app/core/gimptoolpresets.c:277
+#: ../app/core/gimpdata.c:526 ../app/core/gimptoolpresets.c:279
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "æ? æ³?å? é?¤â??%sâ??ï¼?%s"
 
-#: ../app/core/gimpdatafactory.c:427 ../app/core/gimpdatafactory.c:456
-#: ../app/core/gimpdatafactory.c:622 ../app/core/gimpdatafactory.c:644
+#: ../app/core/gimpdatafactory.c:415 ../app/core/gimpdatafactory.c:575
+#: ../app/core/gimpdatafactory.c:595
 #, c-format
 msgid ""
 "Failed to save data:\n"
@@ -7718,188 +6641,138 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdatafactory.c:536 ../app/core/gimpdatafactory.c:539
-#: ../app/core/gimpitem.c:425 ../app/core/gimpitem.c:428
+#: ../app/core/gimpdatafactory.c:494 ../app/core/gimpdatafactory.c:497
+#: ../app/core/gimpitem.c:312 ../app/core/gimpitem.c:315
 msgid "copy"
 msgstr "��"
 
-#: ../app/core/gimpdatafactory.c:548 ../app/core/gimpitem.c:437
+#: ../app/core/gimpdatafactory.c:506 ../app/core/gimpitem.c:324
 #, c-format
 msgid "%s copy"
 msgstr "%s��"
 
-#: ../app/core/gimpdatafactory.c:741
-#, c-format
-msgid ""
-"You have a writable data folder configured (%s), but this folder does not "
-"exist. Please create the folder or fix your configuation in the Preferences "
-"dialog's 'Folders' section."
-msgstr ""
-"æ?¨è®¾ç½®äº?å?¯å??å?¥ç??æ?°æ?®æ??件夹(%s)ï¼?ä½?该æ??件夹ä¸?å­?å?¨ã??请å??建该æ??件夹æ??å?¨é¦?é??项对"
-"è¯?æ¡?ç??â??æ??件夹â??项中修正æ?¨ç??设置ã??"
+#: ../app/core/gimpdatafactory.c:576
+msgid "You don't have a writable data folder configured."
+msgstr "æ?¨æ²¡æ??é??ç½®ä¸?个å?¯å??å?¥ç??æ?°æ?®æ??件夹ã??"
 
-#: ../app/core/gimpdatafactory.c:762
-#, c-format
-msgid ""
-"You have a writable data folder configured, but this folder is not part of "
-"your data search path. You probably edited the gimprc file manually, please "
-"fix it in the Preferences dialog's 'Folders' section."
-msgstr ""
-"æ?¨è®¾ç½®äº?å?¯å??å?¥ç??æ?°æ?®æ??件夹ï¼?ä½?该æ??件夹ä¸?æ?¯æ?¨æ?°æ?®æ??索路å¾?ç??ä¸?é?¨å??ã??æ?¨å?¯è?½æ??å?¨"
-"ç¼?è¾?è¿? gimprc æ??件ï¼?请å?¨é¦?é??项对è¯?æ¡?ç??â??æ??件夹â??项中修正æ?¨ç??设置ã??"
-
-#: ../app/core/gimpdatafactory.c:772
-#, c-format
-msgid "You don't have any writable data folder configured."
-msgstr "æ?¨æ²¡æ??é??置任ä½?å?¯å??å?¥ç??æ?°æ?®æ??件夹ã??"
-
-#: ../app/core/gimpdatafactory.c:889
+#: ../app/core/gimpdatafactory.c:751
 #, c-format
 msgid ""
 "Failed to load data:\n"
 "\n"
 "%s"
 msgstr ""
-"����失败�\n"
+"载���失败�\n"
 "\n"
 "%s"
 
-#: ../app/core/gimpdrawable-blend.c:244
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-blend.c:245 ../app/tools/gimpblendtool.c:107
 msgid "Blend"
 msgstr "æ··å??å¡«å??"
 
-#: ../app/core/gimpdrawable-brightness-contrast.c:70
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-brightness-contrast.c:76
 msgid "Brightness_Contrast"
 msgstr "亮度-对�度"
 
-#: ../app/core/gimpdrawable-brightness-contrast.c:81
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-brightness-contrast.c:87
+#: ../app/tools/gimpbrightnesscontrasttool.c:111
 msgid "Brightness-Contrast"
 msgstr "亮度-对�度"
 
 #: ../app/core/gimpdrawable-bucket-fill.c:91
+#, c-format
 msgid "No patterns available for this operation."
 msgstr "没æ??å?¯ä¾?æ­¤æ??ä½?使ç?¨ç??å?¾æ¡?ã??"
 
 #: ../app/core/gimpdrawable-bucket-fill.c:286
-#, fuzzy
-msgctxt "undo-type"
+msgctxt "command"
 msgid "Bucket Fill"
 msgstr "æ²¹æ¼?桶填å??"
 
-#: ../app/core/gimpdrawable-color-balance.c:79
-#: ../app/core/gimpdrawable-color-balance.c:89
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-color-balance.c:80
+#: ../app/core/gimpdrawable-color-balance.c:90
+#: ../app/tools/gimpcolorbalancetool.c:94
 msgid "Color Balance"
 msgstr "�彩平衡"
 
-#: ../app/core/gimpdrawable-colorize.c:72
-#: ../app/core/gimpdrawable-colorize.c:84
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-colorize.c:73
+#: ../app/core/gimpdrawable-colorize.c:85 ../app/tools/gimpcolorizetool.c:90
 msgid "Colorize"
 msgstr "å??è?²å??"
 
-#: ../app/core/gimpdrawable-curves.c:162 ../app/core/gimpdrawable-curves.c:179
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-curves.c:165 ../app/core/gimpdrawable-curves.c:182
+#: ../app/tools/gimpcurvestool.c:140
 msgid "Curves"
 msgstr "�线"
 
-#: ../app/core/gimpdrawable-desaturate.c:70
-#: ../app/core/gimpdrawable-desaturate.c:76
+#: ../app/core/gimpdrawable-desaturate.c:71
+#: ../app/core/gimpdrawable-desaturate.c:77
 #: ../app/tools/gimpdesaturatetool.c:77
 msgid "Desaturate"
 msgstr "��"
 
-#: ../app/core/gimpdrawable-equalize.c:52
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-equalize.c:53
 msgid "Equalize"
 msgstr "å??å??"
 
-#: ../app/core/gimpdrawable-foreground-extract.c:133
+#: ../app/core/gimpdrawable-foreground-extract.c:138
 msgid "Foreground Extraction"
 msgstr "å??æ?¯æ??å??"
 
-#: ../app/core/gimpdrawable-hue-saturation.c:77
+#: ../app/core/gimpdrawable-hue-saturation.c:78
 #: ../app/tools/gimphuesaturationtool.c:102
 msgid "Hue-Saturation"
 msgstr "è?²è°?-饱å??度"
 
-#: ../app/core/gimpdrawable-hue-saturation.c:87
+#: ../app/core/gimpdrawable-hue-saturation.c:88
 msgid "Hue_Saturation"
 msgstr "è?²è°?-饱å??度(_S)"
 
-#: ../app/core/gimpdrawable-invert.c:54 ../app/core/gimpdrawable-invert.c:62
+#: ../app/core/gimpdrawable-invert.c:60 ../app/core/gimpdrawable-invert.c:68
 msgid "Invert"
 msgstr "å??转"
 
-#: ../app/core/gimpdrawable-levels.c:153 ../app/core/gimpdrawable-levels.c:169
+#: ../app/core/gimpdrawable-levels.c:154 ../app/core/gimpdrawable-levels.c:170
 #: ../app/tools/gimplevelstool.c:150
 msgid "Levels"
 msgstr "��"
 
-#: ../app/core/gimpdrawable-offset.c:315
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-offset.c:316
 msgid "Offset Drawable"
 msgstr "�移��"
 
-#: ../app/core/gimpdrawable-posterize.c:69
-#: ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84
+#: ../app/core/gimpdrawable-posterize.c:70
+#: ../app/core/gimpdrawable-posterize.c:80 ../app/tools/gimpposterizetool.c:84
 msgid "Posterize"
 msgstr "è?²è°?å??离"
 
-#: ../app/core/gimpdrawable-stroke.c:435
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-stroke.c:324
 msgid "Render Stroke"
 msgstr "渲æ??å?¾ç?»"
 
-#: ../app/core/gimpdrawable-threshold.c:70
-#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpthresholdtool.c:90
+#: ../app/core/gimpdrawable-threshold.c:71
+#: ../app/core/gimpdrawable-threshold.c:82 ../app/tools/gimpthresholdtool.c:90
 msgid "Threshold"
 msgstr "é??å?¼"
 
-#: ../app/core/gimpdrawable-transform.c:644
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-transform.c:645 ../app/tools/gimpfliptool.c:116
+msgctxt "command"
 msgid "Flip"
 msgstr "翻转"
 
-#: ../app/core/gimpdrawable-transform.c:718
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-transform.c:745 ../app/tools/gimprotatetool.c:121
+msgctxt "command"
 msgid "Rotate"
 msgstr "æ??转"
 
-#: ../app/core/gimpdrawable-transform.c:843 ../app/core/gimplayer.c:272
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpdrawable-transform.c:884 ../app/core/gimplayer.c:255
 msgid "Transform Layer"
 msgstr "å??æ?¢å?¾å±?"
 
-#: ../app/core/gimpdrawable-transform.c:858
+#: ../app/core/gimpdrawable-transform.c:899
 msgid "Transformation"
 msgstr "å??æ?¢"
 
-#: ../app/core/gimpdrawable.c:486
-#, fuzzy
-msgctxt "undo-type"
-msgid "Scale"
-msgstr "缩�"
-
-#: ../app/core/gimpdynamicsoutput.c:106
-msgid "Output type"
-msgstr "è¾?å?ºç±»å??"
-
 #: ../app/core/gimpgradient-load.c:71 ../app/core/gimpgradient-load.c:96
 #: ../app/core/gimpgradient-load.c:117 ../app/core/gimpgradient-load.c:168
 #, c-format
@@ -7931,532 +6804,401 @@ msgstr "æ¸?å??æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?第 %d 段å?¨ç¬¬ %d è¡?
 msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1."
 msgstr "æ¸?å??æ??件â??%sâ??æ??å??ï¼?段ç??è??å?´ä¸?å?¨ 0-1 é?´ã??"
 
-#: ../app/core/gimpgradient-load.c:335
+#: ../app/core/gimpgradient-load.c:334
 #, c-format
 msgid "No linear gradients found in '%s'"
 msgstr "â??%sâ??中æ?ªæ?¾å?°çº¿æ?§æ¸?å??"
 
-#: ../app/core/gimpgradient-load.c:345
+#: ../app/core/gimpgradient-load.c:344
 #, c-format
 msgid "Failed to import gradients from '%s': %s"
 msgstr "æ? æ³?ä»?â??%sâ??导å?¥æ¸?å??ï¼?%s"
 
-#: ../app/core/gimpgrid.c:83
+#: ../app/core/gimpgrid.c:84
 msgid "Line style used for the grid."
 msgstr "ç½?格使ç?¨ç??线å??ã??"
 
-#: ../app/core/gimpgrid.c:89
+#: ../app/core/gimpgrid.c:90
 msgid "The foreground color of the grid."
 msgstr "ç½?æ ¼ç??å??æ?¯è?²ã??"
 
-#: ../app/core/gimpgrid.c:94
+#: ../app/core/gimpgrid.c:95
 msgid ""
 "The background color of the grid; only used in double dashed line style."
 msgstr "ç½?æ ¼ç??è??æ?¯è?²ï¼?å?ªç?¨äº?å??è??线线å??ã??"
 
-#: ../app/core/gimpgrid.c:100
+#: ../app/core/gimpgrid.c:101
 msgid "Horizontal spacing of grid lines."
 msgstr "ç½?æ ¼ç??æ°´å¹³é?´è·?ã??"
 
-#: ../app/core/gimpgrid.c:105
+#: ../app/core/gimpgrid.c:106
 msgid "Vertical spacing of grid lines."
 msgstr "ç½?æ ¼ç??å??ç?´é?´è·?ã??"
 
-#: ../app/core/gimpgrid.c:114
+#: ../app/core/gimpgrid.c:115
 msgid ""
 "Horizontal offset of the first grid line; this may be a negative number."
 msgstr "第ä¸?æ?¡ç½?格线ç??æ°´å¹³ä½?移ï¼?å?¯ä»¥æ?¯è´?æ?°ã??"
 
-#: ../app/core/gimpgrid.c:121
+#: ../app/core/gimpgrid.c:122
 msgid "Vertical offset of the first grid line; this may be a negative number."
 msgstr "第ä¸?æ?¡ç½?格线ç??å??ç?´ä½?移ï¼?å?¯ä»¥æ?¯è´?æ?°ã??"
 
-#: ../app/core/gimpgrouplayer.c:178
-msgid "Layer Group"
-msgstr "��群�"
-
-#: ../app/core/gimpgrouplayer.c:179
-#, fuzzy
-msgctxt "undo-type"
-msgid "Rename Layer Group"
-msgstr "é??å?½å??å?¾å±?群ç»?"
-
-#: ../app/core/gimpgrouplayer.c:180
-#, fuzzy
-msgctxt "undo-type"
-msgid "Move Layer Group"
-msgstr "移���群�"
-
-#: ../app/core/gimpgrouplayer.c:181
-#, fuzzy
-msgctxt "undo-type"
-msgid "Scale Layer Group"
-msgstr "缩���群�"
-
-#: ../app/core/gimpgrouplayer.c:182
-#, fuzzy
-msgctxt "undo-type"
-msgid "Resize Layer Group"
-msgstr "æ?¹å??å?¾å±?群ç»?ç??大å°?"
-
-#: ../app/core/gimpgrouplayer.c:183
-#, fuzzy
-msgctxt "undo-type"
-msgid "Flip Layer Group"
-msgstr "翻转��群�"
-
-#: ../app/core/gimpgrouplayer.c:184
-#, fuzzy
-msgctxt "undo-type"
-msgid "Rotate Layer Group"
-msgstr "æ??转å?¾å±?群ç»?"
-
-#: ../app/core/gimpgrouplayer.c:185
-#, fuzzy
-msgctxt "undo-type"
-msgid "Transform Layer Group"
-msgstr "å??æ?¢å?¾å±?群ç»?"
-
-#: ../app/core/gimpimage-arrange.c:142
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-arrange.c:143
 msgid "Arrange Objects"
 msgstr "æ?´ç??对象"
 
-#: ../app/core/gimpimage-colormap.c:67
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-colormap.c:63
 msgid "Set Colormap"
 msgstr "设置��表"
 
-#: ../app/core/gimpimage-colormap.c:132
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-colormap.c:118
 msgid "Change Colormap entry"
 msgstr "æ?¹å??é¢?è?²è¡¨é¡¹"
 
-#: ../app/core/gimpimage-colormap.c:157
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-colormap.c:138
 msgid "Add Color to Colormap"
 msgstr "添������表"
 
-#: ../app/core/gimpimage-convert.c:791
+#: ../app/core/gimpimage-convert.c:792
+#, c-format
 msgid "Cannot convert image: palette is empty."
 msgstr "æ? æ³?转æ?¢å?¾å??ï¼?è?²æ?¿ä¸ºç©ºã??"
 
-#: ../app/core/gimpimage-convert.c:807
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-convert.c:806
 msgid "Convert Image to RGB"
 msgstr "å°?å?¾å??转æ?¢ä¸º RGB"
 
-#: ../app/core/gimpimage-convert.c:811
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-convert.c:810
 msgid "Convert Image to Grayscale"
 msgstr "å°?å?¾å??转æ?¢ä¸ºç?°åº¦"
 
-#: ../app/core/gimpimage-convert.c:815
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-convert.c:814
 msgid "Convert Image to Indexed"
 msgstr "å°?å?¾å??转æ?¢ä¸ºç´¢å¼?é¢?è?²"
 
-#: ../app/core/gimpimage-convert.c:894
+#: ../app/core/gimpimage-convert.c:896
 msgid "Converting to indexed colors (stage 2)"
 msgstr "正�转�为索���(第 2 �段)"
 
-#: ../app/core/gimpimage-convert.c:939
+#: ../app/core/gimpimage-convert.c:941
 msgid "Converting to indexed colors (stage 3)"
 msgstr "正�转�为索���(第 3 �段)"
 
-#: ../app/core/gimpimage-crop.c:129
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-crop.c:130
+msgctxt "command"
 msgid "Crop Image"
 msgstr "å?ªè£?å?¾å??"
 
-#: ../app/core/gimpimage-crop.c:132 ../app/core/gimpimage-resize.c:86
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-crop.c:133 ../app/core/gimpimage-resize.c:90
 msgid "Resize Image"
 msgstr "å?¾å??æ?¹å??大å°?"
 
-#: ../app/core/gimpimage-guides.c:52
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-guides.c:51
 msgid "Add Horizontal Guide"
 msgstr "æ·»å? æ°´å¹³å??è??线"
 
-#: ../app/core/gimpimage-guides.c:76
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-guides.c:74
 msgid "Add Vertical Guide"
 msgstr "æ·»å? å??ç?´å??è??线"
 
-#: ../app/core/gimpimage-guides.c:119
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-guides.c:115 ../app/tools/gimpmovetool.c:564
 msgid "Remove Guide"
 msgstr "å? é?¤å??è??线"
 
-#: ../app/core/gimpimage-guides.c:144
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-guides.c:140
 msgid "Move Guide"
 msgstr "移å?¨å??è??线"
 
-#: ../app/core/gimpimage-item-list.c:51
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-item-list.c:53
 msgid "Translate Items"
 msgstr "翻�项�"
 
-#: ../app/core/gimpimage-item-list.c:78
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-item-list.c:80
 msgid "Flip Items"
 msgstr "翻转项�"
 
-#: ../app/core/gimpimage-item-list.c:105
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-item-list.c:107
 msgid "Rotate Items"
 msgstr "æ??转项ç?®"
 
-#: ../app/core/gimpimage-item-list.c:135
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-item-list.c:137
 msgid "Transform Items"
 msgstr "å??æ?¢é¡¹ç?®"
 
-#: ../app/core/gimpimage-merge.c:108 ../app/core/gimpimage-merge.c:122
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-merge.c:102 ../app/core/gimpimage-merge.c:114
 msgid "Merge Visible Layers"
 msgstr "å??并å?¯è§?å?¾å±?"
 
-#: ../app/core/gimpimage-merge.c:176
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-merge.c:165
 msgid "Flatten Image"
 msgstr "å¹³æ?´å?¾å??"
 
-#: ../app/core/gimpimage-merge.c:225
-msgid "Cannot merge down to a layer group."
-msgstr "ä¸?è?½å??ä¸?å??并å?°å?¾å±?群ç»?ã??"
-
-#: ../app/core/gimpimage-merge.c:232
-msgid "The layer to merge down to is locked."
-msgstr "è¦?å??ä¸?å??并ç??ç?®æ ?å?¾å±?被é??å®?ã??"
-
-#: ../app/core/gimpimage-merge.c:244
-msgid "There is no visible layer to merge down to."
-msgstr "没æ??å?¯è§?å?¾å±?å?¯ä»¥å??ä¸?å??并ã??"
-
-#: ../app/core/gimpimage-merge.c:255
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-merge.c:214
 msgid "Merge Down"
 msgstr "å??ä¸?å??并"
 
-#: ../app/core/gimpimage-merge.c:277
-#, fuzzy
-msgctxt "undo-type"
-msgid "Merge Layer Group"
-msgstr "å??并å?¾å±?群ç»?"
-
-#: ../app/core/gimpimage-merge.c:330
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-merge.c:254
 msgid "Merge Visible Paths"
 msgstr "å??并å?¯è§?è·¯å¾?"
 
-#: ../app/core/gimpimage-merge.c:366
+#: ../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-new.c:135
-msgid "Background"
-msgstr "è??æ?¯"
-
-#: ../app/core/gimpimage-quick-mask.c:85
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-quick-mask.c:82
 msgid "Enable Quick Mask"
 msgstr "å?¯ç?¨å¿«é??è??æ?¿"
 
-#: ../app/core/gimpimage-quick-mask.c:135
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-quick-mask.c:132
 msgid "Disable Quick Mask"
 msgstr "ç¦?ç?¨å¿«é??è??æ?¿"
 
 #: ../app/core/gimpimage-sample-points.c:53
-#, fuzzy
-msgctxt "undo-type"
 msgid "Add Sample Point"
 msgstr "æ·»å? é??æ ·ç?¹"
 
-#: ../app/core/gimpimage-sample-points.c:101
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-sample-points.c:98 ../app/tools/gimpcolortool.c:429
 msgid "Remove Sample Point"
 msgstr "å? é?¤é??æ ·ç?¹"
 
-#: ../app/core/gimpimage-sample-points.c:138
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage-sample-points.c:135
 msgid "Move Sample Point"
 msgstr "移å?¨é??æ ·ç?¹"
 
-#: ../app/core/gimpimage-scale.c:87
-#, fuzzy
-msgctxt "undo-type"
-msgid "Scale Image"
-msgstr "缩æ?¾å?¾å??"
-
-#: ../app/core/gimpimage-undo-push.c:862
+#: ../app/core/gimpimage-undo-push.c:863
 #, c-format
 msgid "Can't undo %s"
 msgstr "���� %s"
 
-#: ../app/core/gimpimage.c:1734
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage.c:1506
 msgid "Change Image Resolution"
 msgstr "æ?¹å??å?¾å??å??辨ç??"
 
-#: ../app/core/gimpimage.c:1786
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage.c:1550
 msgid "Change Image Unit"
 msgstr "æ?¹å??å?¾å??å??ä½?"
 
-#: ../app/core/gimpimage.c:2767
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage.c:2384
 msgid "Attach Parasite to Image"
 msgstr "æ·»å? å¯?ç??ç?©å?°å?¾å??"
 
-#: ../app/core/gimpimage.c:2808
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage.c:2422
 msgid "Remove Parasite from Image"
 msgstr "ä»?å?¾å??å? é?¤å¯?ç??ç?©"
 
-#: ../app/core/gimpimage.c:3517
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage.c:2875
 msgid "Add Layer"
 msgstr "添���"
 
-#: ../app/core/gimpimage.c:3567 ../app/core/gimpimage.c:3587
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage.c:2935 ../app/core/gimpimage.c:2948
 msgid "Remove Layer"
 msgstr "����"
 
-#: ../app/core/gimpimage.c:3580
-#, fuzzy
-msgctxt "undo-type"
-msgid "Remove Floating Selection"
-msgstr "å? é?¤æµ®å?¨é??å?º"
+# Do not translate because most file systems doesn't support chinese!
+#: ../app/core/gimpimage.c:3092
+msgid "Layer cannot be raised higher."
+msgstr "å?¾å±?æ? æ³?å??å??é«?ã??"
 
-#: ../app/core/gimpimage.c:3746
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage.c:3097
+msgid "Raise Layer"
+msgstr "�移��"
+
+#: ../app/core/gimpimage.c:3116
+msgid "Layer cannot be lowered more."
+msgstr "å?¾å±?æ? æ³?å??å??ä¸?移å?¨ã??"
+
+#: ../app/core/gimpimage.c:3121
+msgid "Lower Layer"
+msgstr "�移��"
+
+#: ../app/core/gimpimage.c:3132
+msgid "Raise Layer to Top"
+msgstr "å?¾å±?移è?³æ??ä¸?æ?¹"
+
+#: ../app/core/gimpimage.c:3147
+msgid "Lower Layer to Bottom"
+msgstr "å?¾å±?移è?³æ??ä¸?æ?¹"
+
+#: ../app/core/gimpimage.c:3209
 msgid "Add Channel"
 msgstr "æ·»å? é??é??"
 
-#: ../app/core/gimpimage.c:3784 ../app/core/gimpimage.c:3796
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage.c:3252 ../app/core/gimpimage.c:3263
 msgid "Remove Channel"
 msgstr "å? é?¤é??é??"
 
-#: ../app/core/gimpimage.c:3843
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage.c:3312
+msgid "Channel cannot be raised higher."
+msgstr "é??é??æ? æ³?å??å??ä¸?移å?¨ã??"
+
+#: ../app/core/gimpimage.c:3317
+msgid "Raise Channel"
+msgstr "ä¸?移é??é??"
+
+#: ../app/core/gimpimage.c:3328
+msgid "Raise Channel to Top"
+msgstr "é??é??移è?³æ??ä¸?æ?¹"
+
+#: ../app/core/gimpimage.c:3348
+msgid "Channel cannot be lowered more."
+msgstr "é??é??æ? æ³?å??å??ä¸?移å?¨ã??"
+
+#: ../app/core/gimpimage.c:3353
+msgid "Lower Channel"
+msgstr "ä¸?移é??é??"
+
+#: ../app/core/gimpimage.c:3368
+msgid "Lower Channel to Bottom"
+msgstr "é??é??移è?³æ??ä¸?æ?¹"
+
+#: ../app/core/gimpimage.c:3432
 msgid "Add Path"
 msgstr "添�路�"
 
-#: ../app/core/gimpimage.c:3874
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpimage.c:3476
 msgid "Remove Path"
 msgstr "��路�"
 
-#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1711
+#: ../app/core/gimpimage.c:3522
+msgid "Path cannot be raised higher."
+msgstr "è·¯å¾?æ? æ³?å??å??ä¸?移å?¨ã??"
+
+#: ../app/core/gimpimage.c:3527
+msgid "Raise Path"
+msgstr "�移路�"
+
+#: ../app/core/gimpimage.c:3538
+msgid "Raise Path to Top"
+msgstr "è·¯å¾?移è?³æ??ä¸?æ?¹"
+
+#: ../app/core/gimpimage.c:3557
+msgid "Path cannot be lowered more."
+msgstr "è·¯å¾?æ? æ³?å??å??ä¸?移å?¨ã??"
+
+#: ../app/core/gimpimage.c:3562
+msgid "Lower Path"
+msgstr "�移路�"
+
+#: ../app/core/gimpimage.c:3577
+msgid "Lower Path to Bottom"
+msgstr "è·¯å¾?移è?³æ??ä¸?æ?¹"
+
+#: ../app/core/gimpimagefile.c:528 ../app/dialogs/preferences-dialog.c:1727
 msgid "Folder"
 msgstr "æ??件夹"
 
-#: ../app/core/gimpimagefile.c:539
+#: ../app/core/gimpimagefile.c:533
 msgid "Special File"
 msgstr "ç?¹æ®?æ??件"
 
-#: ../app/core/gimpimagefile.c:555
+#: ../app/core/gimpimagefile.c:549
 msgid "Remote File"
 msgstr "è¿?ç¨?æ??件"
 
-#: ../app/core/gimpimagefile.c:574
+#: ../app/core/gimpimagefile.c:568
 msgid "Click to create preview"
 msgstr "ç?¹å?»ç??æ??é¢?è§?"
 
-#: ../app/core/gimpimagefile.c:580
+#: ../app/core/gimpimagefile.c:574
 msgid "Loading preview..."
 msgstr "正��载�� ..."
 
-#: ../app/core/gimpimagefile.c:586
+#: ../app/core/gimpimagefile.c:580
 msgid "Preview is out of date"
 msgstr "��已���"
 
-#: ../app/core/gimpimagefile.c:592
+#: ../app/core/gimpimagefile.c:586
 msgid "Cannot create preview"
 msgstr "æ? æ³?ç??æ??é¢?è§?"
 
-#: ../app/core/gimpimagefile.c:602
+#: ../app/core/gimpimagefile.c:596
 msgid "(Preview may be out of date)"
 msgstr "(����已���)"
 
 #. pixel size
-#: ../app/core/gimpimagefile.c:611 ../app/widgets/gimpimagepropview.c:446
-#: ../app/widgets/gimpsizebox.c:434 ../app/widgets/gimptemplateeditor.c:565
+#: ../app/core/gimpimagefile.c:605 ../app/widgets/gimpimagepropview.c:446
+#: ../app/widgets/gimpsizebox.c:438 ../app/widgets/gimptemplateeditor.c:566
 #, c-format
 msgid "%d Ã? %d pixel"
 msgid_plural "%d Ã? %d pixels"
 msgstr[0] "%d x %d å??ç´ "
 
-#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:335
+#: ../app/core/gimpimagefile.c:628 ../app/display/gimpdisplayshell-title.c:325
 #, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
 msgstr[0] "%d 个��"
 
-#: ../app/core/gimpimagefile.c:681
+#: ../app/core/gimpimagefile.c:675
 #, c-format
 msgid "Could not open thumbnail '%s': %s"
 msgstr "æ? æ³?æ??å¼?缩ç?¥å?¾æ??件â??%sâ??ï¼?%s"
 
-#: ../app/core/gimpitem.c:1564
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpitem.c:1138
 msgid "Attach Parasite"
 msgstr "æ·»å? å¯?ç??ç?©"
 
-#: ../app/core/gimpitem.c:1574
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpitem.c:1148
 msgid "Attach Parasite to Item"
-msgstr "æ·»å? å¯?ç??ç?©å?°é¡¹ç?®"
+msgstr "æ·»å? é??件å?°é¡¹ç?®"
 
-#: ../app/core/gimpitem.c:1616 ../app/core/gimpitem.c:1623
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpitem.c:1190 ../app/core/gimpitem.c:1197
 msgid "Remove Parasite from Item"
-msgstr "ä»?项ç?®å? é?¤å¯?ç??ç?©"
+msgstr "ä»?项ç?®å? é?¤é??件"
+
+#: ../app/core/gimplayer-floating-sel.c:99
+msgid "Remove Floating Selection"
+msgstr "å? é?¤æµ®å?¨é??å?º"
 
-#: ../app/core/gimplayer-floating-sel.c:95
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer-floating-sel.c:130
 msgid "Anchor Floating Selection"
 msgstr "å?ºå®?æµ®å?¨é??å?º"
 
-#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:595
+#: ../app/core/gimplayer-floating-sel.c:205 ../app/core/gimplayer.c:643
+#, c-format
 msgid ""
 "Cannot create a new layer from the floating selection because it belongs to "
 "a layer mask or channel."
 msgstr "æ? æ³?ä»?æµ®å?¨é??å?ºå??建æ?°å?¾å±?ï¼?å? ä¸ºå®?å±?äº?ä¸?个å?¾å±?è??æ?¿æ??é??é??ã??"
 
-#: ../app/core/gimplayer-floating-sel.c:133
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer-floating-sel.c:211
 msgid "Floating Selection to Layer"
 msgstr "æµ®å?¨é??å?ºå?°å?¾å±?"
 
-#: ../app/core/gimplayer.c:266
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer.c:248 ../app/tools/tools-enums.c:209
+msgid "Layer"
+msgstr "��"
+
+#: ../app/core/gimplayer.c:249
 msgid "Rename Layer"
 msgstr "é??å?½å??å?¾å±?"
 
-#: ../app/core/gimplayer.c:267
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer.c:250 ../app/pdb/layer-cmds.c:437
+#: ../app/pdb/layer-cmds.c:473
 msgid "Move Layer"
 msgstr "移���"
 
-#: ../app/core/gimplayer.c:268
-#, fuzzy
-msgctxt "undo-type"
-msgid "Scale Layer"
-msgstr "缩���"
-
-#: ../app/core/gimplayer.c:269
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer.c:252
 msgid "Resize Layer"
 msgstr "æ?¹å??å?¾å±?大å°?"
 
-#: ../app/core/gimplayer.c:270
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer.c:253
 msgid "Flip Layer"
 msgstr "翻转��"
 
-#: ../app/core/gimplayer.c:271
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer.c:254
 msgid "Rotate Layer"
 msgstr "æ??转å?¾å±?"
 
-#: ../app/core/gimplayer.c:274
-#, fuzzy
-msgctxt "undo-type"
-msgid "Reorder Layer"
-msgstr "é??æ??å?¾å±?"
-
-#: ../app/core/gimplayer.c:275
-#, fuzzy
-msgctxt "undo-type"
-msgid "Raise Layer"
-msgstr "å??é«?å?¾å±?"
-
-#: ../app/core/gimplayer.c:276
-#, fuzzy
-msgctxt "undo-type"
-msgid "Raise Layer to Top"
-msgstr "��移�顶端"
-
-#: ../app/core/gimplayer.c:277
-#, fuzzy
-msgctxt "undo-type"
-msgid "Lower Layer"
-msgstr "é??ä½?å?¾å±?"
-
-#: ../app/core/gimplayer.c:278
-#, fuzzy
-msgctxt "undo-type"
-msgid "Lower Layer to Bottom"
-msgstr "��移��端"
-
-# Do not translate because most file systems doesn't support chinese!
-#: ../app/core/gimplayer.c:279
-msgid "Layer cannot be raised higher."
-msgstr "å?¾å±?æ? æ³?å??å??é«?ã??"
-
-#: ../app/core/gimplayer.c:280
-msgid "Layer cannot be lowered more."
-msgstr "å?¾å±?æ? æ³?å??é??ä½?ã??"
-
-#: ../app/core/gimplayer.c:437 ../app/core/gimplayer.c:1491
-#: ../app/core/gimplayermask.c:235
+#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1330
+#: ../app/core/gimplayermask.c:208
 #, c-format
 msgid "%s mask"
 msgstr "%sè??æ?¿"
 
-#: ../app/core/gimplayer.c:476
+#: ../app/core/gimplayer.c:446
 #, c-format
 msgid ""
 "Floating Selection\n"
@@ -8465,92 +7207,67 @@ msgstr ""
 "æµ®å?¨é??å?º\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:1415
+#: ../app/core/gimplayer.c:1266
+#, c-format
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "æ? æ³?æ·»å? å?¾å±?è??æ?¿ï¼?å? ä¸ºå·²æ??ä¸?个ã??"
 
-#: ../app/core/gimplayer.c:1426
+#: ../app/core/gimplayer.c:1277
+#, c-format
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr "æ? æ³?æ·»å? è·?æ??å®?å?¾å±?尺寸ä¸?å??ç??å?¾å±?è??æ?¿ã??"
 
-#: ../app/core/gimplayer.c:1432
-#, fuzzy
-msgctxt "undo-type"
-msgid "Add Layer Mask"
-msgstr "æ·»å? å?¾å±?è??æ?¿"
-
-#: ../app/core/gimplayer.c:1546
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer.c:1385
 msgid "Transfer Alpha to Mask"
 msgstr "转移 Alpha å?°è??æ?¿"
 
-#: ../app/core/gimplayer.c:1716 ../app/core/gimplayermask.c:261
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer.c:1557 ../app/core/gimplayermask.c:235
 msgid "Apply Layer Mask"
 msgstr "åº?ç?¨å?¾å±?è??æ?¿"
 
-#: ../app/core/gimplayer.c:1717
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer.c:1558
 msgid "Delete Layer Mask"
 msgstr "å? é?¤å?¾å±?è??æ?¿"
 
-#: ../app/core/gimplayer.c:1836
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer.c:1670
 msgid "Add Alpha Channel"
 msgstr "æ·»å?  Alpha é??é??"
 
-#: ../app/core/gimplayer.c:1890
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer.c:1724
 msgid "Remove Alpha Channel"
 msgstr "å? é?¤ Alpha é??é??"
 
-#: ../app/core/gimplayer.c:1910
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayer.c:1746
 msgid "Layer to Image Size"
 msgstr "å?¾å±?å?°å?¾å??大å°?"
 
-#: ../app/core/gimplayermask.c:110
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayermask.c:105
 msgid "Move Layer Mask"
 msgstr "移å?¨å?¾å±?è??æ?¿"
 
-#: ../app/core/gimplayermask.c:111
-#, fuzzy
-msgctxt "undo-type"
-msgid "Layer Mask to Selection"
-msgstr "å?¾å±?è??æ?¿å?°é??å?º"
-
-#: ../app/core/gimplayermask.c:185
+#. reject renaming, layer masks are always named "<layer name> mask"
+#: ../app/core/gimplayermask.c:160
 #, c-format
 msgid "Cannot rename layer masks."
 msgstr "æ? æ³?é??å?½å??å?¾å±?è??ç??"
 
-#: ../app/core/gimplayermask.c:329
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimplayermask.c:303
 msgid "Show Layer Mask"
 msgstr "æ?¾ç¤ºå?¾å±?è??æ?¿"
 
-#: ../app/core/gimppalette-import.c:438
+#: ../app/core/gimppalette-import.c:428
 #, c-format
 msgid "Index %d"
 msgstr "索� %d"
 
-#: ../app/core/gimppalette-import.c:548
+#: ../app/core/gimppalette-import.c:532
 #, c-format
 msgid "Unknown type of palette file: %s"
 msgstr "æ?ªç?¥ç±»å??ç??è?²æ?¿æ??件ï¼?%s"
 
-#: ../app/core/gimppalette-load.c:85 ../app/core/gimppalette-load.c:111
-#: ../app/core/gimppalette-load.c:132 ../app/core/gimppalette-load.c:161
-#: ../app/core/gimppalette-load.c:237
+#: ../app/core/gimppalette-load.c:85 ../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 è¡?读å?¥å?ºé??ã??"
@@ -8560,48 +7277,38 @@ msgstr "è?²æ?¿æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?第 %d è¡?读å?¥å?ºé??ã??
 msgid "Fatal parse error in palette file '%s': Missing magic header."
 msgstr "è?²æ?¿æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误ï¼?缺å°? magic 头ã??"
 
-#: ../app/core/gimppalette-load.c:124
+#: ../app/core/gimppalette-load.c:123
 #, c-format
 msgid "Invalid UTF-8 string in palette file '%s'"
 msgstr "è?²æ?¿æ??件â??%sâ??中å?«æ??æ? æ??ç?? UTF-8 å­?符串ã??"
 
-#: ../app/core/gimppalette-load.c:148
+#: ../app/core/gimppalette-load.c:147
 #, c-format
 msgid ""
 "Reading palette file '%s': Invalid number of columns in line %d. Using "
 "default value."
 msgstr "读å??è?²æ?¿æ??件â??%sâ??ï¼?第 %d è¡?中å??æ?°ç?®æ? æ??ã??使ç?¨é»?认å?¼ã??"
 
-#: ../app/core/gimppalette-load.c:184
+#: ../app/core/gimppalette-load.c:183
 #, c-format
 msgid "Reading palette file '%s': Missing RED component in line %d."
 msgstr "读å??è?²æ?¿æ??件â??%sâ??ï¼?第 %d è¡?缺å°? RED å??é??ã??"
 
-#: ../app/core/gimppalette-load.c:192
+#: ../app/core/gimppalette-load.c:191
 #, c-format
 msgid "Reading palette file '%s': Missing GREEN component in line %d."
 msgstr "读å??è?²æ?¿æ??件â??%sâ??ï¼?第 %d è¡?缺å°? GREEN å??é??ã??"
 
-#: ../app/core/gimppalette-load.c:200
+#: ../app/core/gimppalette-load.c:199
 #, c-format
 msgid "Reading palette file '%s': Missing BLUE component in line %d."
 msgstr "读å??è?²æ?¿æ??件â??%sâ??ï¼?第 %d è¡?缺å°? BLUE å??é??ã??"
 
-#: ../app/core/gimppalette-load.c:210
+#: ../app/core/gimppalette-load.c:209
 #, c-format
 msgid "Reading palette file '%s': RGB value out of range in line %d."
 msgstr "读å??è?²æ?¿æ??件â??%sâ??ï¼?第 %d è¡? RGB å??å?¼è¶?å?ºè??å?´ã??"
 
-#: ../app/core/gimppalette-load.c:477
-#, c-format
-msgid "Could not read header from palette file '%s'"
-msgstr "æ? æ³?ä»?è?²æ?¿æ??件â??%sâ??中读å??头信æ?¯"
-
-#: ../app/core/gimppalette-load.c:500 ../app/core/gimppalette-load.c:588
-#, c-format
-msgid "Fatal parse error in palette file '%s'"
-msgstr "è?²æ?¿æ??件â??%sâ??å?ºç?°ä¸¥é??解æ??é??误"
-
 #: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131
 #: ../app/core/gimppattern-load.c:162
 #, c-format
@@ -8628,98 +7335,59 @@ msgstr ""
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "å?¾æ¡?æ??件â??%sâ??中å?«æ??æ? æ??ç?? UTF-8 å­?符串ã??"
 
-#: ../app/core/gimppdbprogress.c:287 ../app/widgets/gimppdbdialog.c:339
+#: ../app/core/gimppdbprogress.c:288 ../app/widgets/gimppdbdialog.c:352
 #, c-format
 msgid "Unable to run %s callback. The corresponding plug-in may have crashed."
 msgstr "æ? æ³?æ?§è¡?%så??è°?ã??ç?¸åº?ç??æ??件å?¯è?½å·²å´©æº?ã??"
 
-#: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153
+#: ../app/core/gimpprogress.c:107 ../app/core/gimpprogress.c:154
 msgid "Please wait"
 msgstr "请ç¨?å??"
 
-#: ../app/core/gimpselection.c:155
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpselection.c:150 ../app/tools/gimpeditselectiontool.c:240
 msgid "Move Selection"
 msgstr "移å?¨é??å?º"
 
-#: ../app/core/gimpselection.c:156
-#, fuzzy
-msgctxt "undo-type"
-msgid "Stroke Selection"
-msgstr "å?¾ç?»é??å?º"
-
-#: ../app/core/gimpselection.c:172
-#, fuzzy
-msgctxt "undo-type"
-msgid "Feather Selection"
-msgstr "ç¾½å??é??å?º"
-
-#: ../app/core/gimpselection.c:173
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpselection.c:168
 msgid "Sharpen Selection"
 msgstr "é??å??é??å?º"
 
-#: ../app/core/gimpselection.c:174
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpselection.c:169
 msgid "Select None"
 msgstr "å?¨é?¨ä¸?é??"
 
-#: ../app/core/gimpselection.c:175
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpselection.c:170
 msgid "Select All"
 msgstr "å?¨é?¨é??中"
 
-#: ../app/core/gimpselection.c:176
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpselection.c:171
 msgid "Invert Selection"
 msgstr "å??转é??å?º"
 
-#: ../app/core/gimpselection.c:177
-#, fuzzy
-msgctxt "undo-type"
-msgid "Border Selection"
-msgstr "å??é??å?ºè¾¹ç??"
-
-#: ../app/core/gimpselection.c:178
-#, fuzzy
-msgctxt "undo-type"
-msgid "Grow Selection"
-msgstr "é??å?ºå¢?é?¿"
-
-#: ../app/core/gimpselection.c:179
-#, fuzzy
-msgctxt "undo-type"
-msgid "Shrink Selection"
-msgstr "é??å?ºæ?¶ç¼©"
-
-#: ../app/core/gimpselection.c:286
+#: ../app/core/gimpselection.c:275
+#, c-format
 msgid "There is no selection to stroke."
 msgstr "没æ??å?¯å?¾ç?»ç??é??å?ºã??"
 
-#: ../app/core/gimpselection.c:670
+#: ../app/core/gimpselection.c:640
+#, c-format
 msgid "Unable to cut or copy because the selected region is empty."
 msgstr "æ? æ³?å?ªå??æ??å¤?å?¶ï¼?å? ä¸ºé??æ?©å?ºå??为空ã??"
 
-#: ../app/core/gimpselection.c:845
+#: ../app/core/gimpselection.c:814
+#, c-format
 msgid "Cannot float selection because the selected region is empty."
 msgstr "æ? æ³?æµ®å?¨é??å?ºï¼?å? ä¸ºé??æ?©å?ºå??为空ã??"
 
-#: ../app/core/gimpselection.c:852
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/core/gimpselection.c:821
 msgid "Float Selection"
 msgstr "æµ®å?¨é??å?º"
 
-#: ../app/core/gimpselection.c:868
+#: ../app/core/gimpselection.c:837
 msgid "Floated Layer"
 msgstr "æµ®å?¨ç??å?¾å±?"
 
-#: ../app/core/gimpstrokeoptions.c:151
+#: ../app/core/gimpstrokeoptions.c:119
 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."
@@ -8727,108 +7395,114 @@ msgstr ""
 "å¦?æ??æ??æ?¥å?¯ä»¥ä»?å®?æ ?è¿?æ?¥ç?¹å¼?å§?延伸å?°å¤§äº?æ??æ?¥é??å?¶ * 线宽ç??è·?离ï¼?å°?æ??è§?è¿?æ?¥è½¬æ?¢ä¸º"
 "æ??é?¢è¿?æ?¥ã??"
 
-#: ../app/core/gimptemplate.c:100
+#: ../app/core/gimptemplate.c:106
 msgid "The unit used for coordinate display when not in dot-for-dot mode."
 msgstr "é??ç?¹å¯¹ç?¹æ¨¡å¼?ä¸?å??æ ?æ?¾ç¤ºä½¿ç?¨ç??å??ä½?ã??"
 
-#: ../app/core/gimptemplate.c:107
+#: ../app/core/gimptemplate.c:113
 msgid "The horizontal image resolution."
 msgstr "æ°´å¹³å?¾å??å??辨ç??ã??"
 
-#: ../app/core/gimptemplate.c:113
+#: ../app/core/gimptemplate.c:119
 msgid "The vertical image resolution."
 msgstr "å??ç?´å?¾å??å??辨ç??ã??"
 
+#: ../app/core/gimptemplate.c:405 ../app/widgets/widgets-enums.c:24
+msgid "Background"
+msgstr "è??æ?¯"
+
+#
+#. pseudo unit
 #: ../app/core/gimpunit.c:56
-msgctxt "unit-singular"
 msgid "pixel"
 msgstr "å??ç´ "
 
-#: ../app/core/gimpunit.c:56
-msgctxt "unit-plural"
+#: ../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
 msgid "pixels"
 msgstr "å??ç´ "
 
-#: ../app/core/gimpunit.c:60
-msgctxt "unit-singular"
+#
+#. standard units
+#: ../app/core/gimpunit.c:59
 msgid "inch"
 msgstr "�寸"
 
-#: ../app/core/gimpunit.c:60
-msgctxt "unit-plural"
+#
+#: ../app/core/gimpunit.c:59
 msgid "inches"
 msgstr "�寸"
 
-#: ../app/core/gimpunit.c:63
-msgctxt "unit-singular"
+#
+#: ../app/core/gimpunit.c:60
 msgid "millimeter"
 msgstr "毫米"
 
-#: ../app/core/gimpunit.c:63
-msgctxt "unit-plural"
+#
+#: ../app/core/gimpunit.c:60
 msgid "millimeters"
 msgstr "毫米"
 
-#: ../app/core/gimpunit.c:67
-msgctxt "unit-singular"
+#
+#. professional units
+#: ../app/core/gimpunit.c:63
 msgid "point"
 msgstr "ç?¹"
 
-#: ../app/core/gimpunit.c:67
-msgctxt "unit-plural"
+#
+#: ../app/core/gimpunit.c:63
 msgid "points"
 msgstr "ç?¹"
 
-#: ../app/core/gimpunit.c:70
-msgctxt "unit-singular"
+#
+#: ../app/core/gimpunit.c:64
 msgid "pica"
 msgstr "派�"
 
-#: ../app/core/gimpunit.c:70
-msgctxt "unit-plural"
+#
+#: ../app/core/gimpunit.c:64
 msgid "picas"
 msgstr "派�"
 
-#: ../app/core/gimpunit.c:78
-msgctxt "singular"
+#
+#: ../app/core/gimpunit.c:71
 msgid "percent"
 msgstr "ç?¾å??ç?¹"
 
-#: ../app/core/gimpunit.c:78
-msgctxt "plural"
-msgid "percent"
+#
+#: ../app/core/gimpunit.c:71
+msgid "plural|percent"
 msgstr "ç?¾å??ç?¹"
 
-#: ../app/dialogs/about-dialog.c:106 ../app/gui/gui.c:484
-msgid "About GIMP"
-msgstr "�� GIMP"
-
-#: ../app/dialogs/about-dialog.c:115
+#: ../app/dialogs/about-dialog.c:123
 msgid "Visit the GIMP website"
 msgstr "访� GIMP ��"
 
 #. Translators: insert your names here, separated by newline
-#: ../app/dialogs/about-dialog.c:120
+#: ../app/dialogs/about-dialog.c:128
 msgid "translator-credits"
 msgstr ""
-"Yuheng Xie\n"
-"Funda Wang\n"
-"Cai Qian\n"
-"���人"
-
-#: ../app/dialogs/about-dialog.c:515
+"Yuheng Xie <elephant linux net cn>\n"
+"Funda Wang <fundawang linux net cn>\n"
+"Cai Qian <caiqian gnome org>\n"
+"Shawn Syu <shawn msn cn>\n"
+"���人 <kappa8086 gmail com>\n"
+"Aron Xuã??<aronxu gnome org>"
+
+#: ../app/dialogs/about-dialog.c:529
 msgid "GIMP is brought to you by"
 msgstr "GIMP ä½?è??群"
 
-#: ../app/dialogs/about-dialog.c:589
+#: ../app/dialogs/about-dialog.c:603
 msgid "This is an unstable development release."
 msgstr "è¿?æ?¯ä¸?个ä¸?稳å®?ç??å¼?å??ç??æ?¬ã??"
 
-#: ../app/dialogs/channel-options-dialog.c:146
+#: ../app/dialogs/channel-options-dialog.c:145
 msgid "Channel _name:"
 msgstr "é??é??å??å­?(_N)ï¼?"
 
-#: ../app/dialogs/channel-options-dialog.c:175
+#: ../app/dialogs/channel-options-dialog.c:174
 msgid "Initialize from _selection"
 msgstr "ä»?é??æ?©å?ºå??å§?å??(_S)"
 
@@ -8844,97 +7518,90 @@ msgstr "å°?å?¾å??转æ?¢ä¸ºç´¢å¼?é¢?è?²"
 msgid "C_onvert"
 msgstr "转�(_O)"
 
-#: ../app/dialogs/convert-dialog.c:190
+#: ../app/dialogs/convert-dialog.c:189
 msgid "_Maximum number of colors:"
 msgstr "æ??大é¢?è?²æ?°é??(_M)ï¼?"
 
-#: ../app/dialogs/convert-dialog.c:217
+#: ../app/dialogs/convert-dialog.c:216
 msgid "_Remove unused colors from colormap"
 msgstr "ä»?é¢?è?²è¡¨ä¸­å? é?¤æ²¡æ??被使ç?¨ç??é¢?è?²(_R)"
 
 #. dithering
-#: ../app/dialogs/convert-dialog.c:233 ../app/tools/gimpblendoptions.c:246
+#: ../app/dialogs/convert-dialog.c:232 ../app/tools/gimpblendoptions.c:247
 msgid "Dithering"
 msgstr "æ??å?¨"
 
-#: ../app/dialogs/convert-dialog.c:245
+#: ../app/dialogs/convert-dialog.c:244
 msgid "Color _dithering:"
 msgstr "é¢?è?²æ??å?¨(_D)ï¼?"
 
-#: ../app/dialogs/convert-dialog.c:260
+#: ../app/dialogs/convert-dialog.c:259
 msgid "Enable dithering of _transparency"
 msgstr "å?¯ç?¨é??æ??度æ??å?¨(_T)"
 
-#: ../app/dialogs/convert-dialog.c:287
+#: ../app/dialogs/convert-dialog.c:286
 msgid "Converting to indexed colors"
 msgstr "转�为索���"
 
-#: ../app/dialogs/convert-dialog.c:414 ../app/pdb/convert-cmds.c:152
+#: ../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:212 ../app/gui/gui.c:164
-#: ../app/gui/gui-message.c:145
+#: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:161
+#: ../app/gui/gui-message.c:148
 msgid "GIMP Message"
 msgstr "GIMP ��"
 
-#: ../app/dialogs/dialogs.c:267
+#: ../app/dialogs/dialogs.c:142
 msgid "Devices"
 msgstr "设�"
 
-#: ../app/dialogs/dialogs.c:267
+#: ../app/dialogs/dialogs.c:142
 msgid "Device Status"
 msgstr "设å¤?ç?¶æ??"
 
-#: ../app/dialogs/dialogs.c:271
+#: ../app/dialogs/dialogs.c:146
 msgid "Errors"
 msgstr "é??误"
 
-#: ../app/dialogs/dialogs.c:275
-msgid "Pointer"
-msgstr "æ??é??"
-
-#: ../app/dialogs/dialogs.c:294
+#: ../app/dialogs/dialogs.c:171
 msgid "History"
 msgstr "å??å?²"
 
-#: ../app/dialogs/dialogs.c:296
+#: ../app/dialogs/dialogs.c:173
 msgid "Image Templates"
 msgstr "å?¾å??模æ?¿"
 
-#: ../app/dialogs/dialogs.c:323
+#: ../app/dialogs/dialogs.c:194
 msgid "Histogram"
 msgstr "���"
 
-#: ../app/dialogs/dialogs.c:327
-msgid "Selection"
-msgstr "é??å?º"
-
-#: ../app/dialogs/dialogs.c:327
+#: ../app/dialogs/dialogs.c:198
 msgid "Selection Editor"
 msgstr "é??å?ºç¼?è¾?å?¨"
 
-#: ../app/dialogs/dialogs.c:331
+#: ../app/dialogs/dialogs.c:202
 msgid "Undo"
 msgstr "��"
 
-#: ../app/dialogs/dialogs.c:331
+#: ../app/dialogs/dialogs.c:202
 msgid "Undo History"
 msgstr "æ?¤æ¶?å??å?²"
 
-#: ../app/dialogs/dialogs.c:341
+#: ../app/dialogs/dialogs.c:212
 msgid "Navigation"
 msgstr "导�"
 
-#: ../app/dialogs/dialogs.c:341
+#: ../app/dialogs/dialogs.c:212
 msgid "Display Navigation"
 msgstr "�示导�"
 
-#: ../app/dialogs/dialogs.c:347
+#: ../app/dialogs/dialogs.c:218
 msgid "FG/BG"
 msgstr "å??æ?¯/è??æ?¯"
 
-#: ../app/dialogs/dialogs.c:347
+#: ../app/dialogs/dialogs.c:218
 msgid "FG/BG Color"
 msgstr "å??æ?¯/è??æ?¯é¢?è?²"
 
@@ -8943,11 +7610,11 @@ msgstr "å??æ?¯/è??æ?¯é¢?è?²"
 msgid "Fade %s"
 msgstr "æ·¡å?º %s"
 
-#: ../app/dialogs/fade-dialog.c:122
+#: ../app/dialogs/fade-dialog.c:123
 msgid "_Fade"
 msgstr "æ·¡å?º(_F)"
 
-#: ../app/dialogs/fade-dialog.c:157 ../app/widgets/gimpdeviceinfoeditor.c:346
+#: ../app/dialogs/fade-dialog.c:157
 msgid "_Mode:"
 msgstr "模�(_M)�"
 
@@ -8955,27 +7622,27 @@ msgstr "模�(_M)�"
 msgid "_Opacity:"
 msgstr "ä¸?é??æ??度(_O)ï¼?"
 
-#: ../app/dialogs/file-open-dialog.c:267
+#: ../app/dialogs/file-open-dialog.c:262
 msgid "Open layers"
 msgstr "æ??å¼?å?¾å±?"
 
-#: ../app/dialogs/file-open-location-dialog.c:71
+#: ../app/dialogs/file-open-location-dialog.c:72
 msgid "Open Location"
 msgstr "æ??å¼?ä½?ç½®"
 
-#: ../app/dialogs/file-open-location-dialog.c:109
+#: ../app/dialogs/file-open-location-dialog.c:110
 msgid "Enter location (URI):"
 msgstr "���置(URI)�"
 
-#: ../app/dialogs/file-save-dialog.c:105
-msgid "Export Image"
-msgstr "导å?ºå?¾å??"
-
-#: ../app/dialogs/file-save-dialog.c:106
-msgid "_Export"
-msgstr "导�(_E)"
+#: ../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:468
+#: ../app/dialogs/file-save-dialog.c:371
 msgid ""
 "Saving remote files needs to determine the file format from the file "
 "extension. Please enter a file extension that matches the selected file "
@@ -8984,56 +7651,18 @@ msgstr ""
 "ä¿?å­?è¿?ç¨?æ??件é??è¦?ä¾?å?·æ??件æ?©å±?å??ç¡®å®?æ??件格å¼?ã??请è¾?å?¥å??é??中æ??件å?¹é??ç??æ??件æ?©å±?å??"
 "æ??æ ¹æ?¬ä¸?è¾?å?¥æ??件æ?©å±?å??ã??"
 
-#: ../app/dialogs/file-save-dialog.c:595
-msgid ""
-"You can use this dialog to export to various file formats. If you want to "
-"save the image to the GIMP XCF format, use Fileâ??Save instead."
-msgstr ""
-"æ?¨å?¯ä»¥ç?¨æ­¤å¯¹è¯?æ¡?导å?ºå¤?ç§?æ??件格å¼?ã??å¦?æ??æ?¨æ?³å°?å?¾å??ä¿?å­?为 GIMP XCF æ ¼å¼?ï¼?请æ?¹ç?¨"
-"æ??件â??ä¿?å­?ã??"
-
-#: ../app/dialogs/file-save-dialog.c:602
-msgid ""
-"You can use this dialog to save to the GIMP XCF format. Use Fileâ??Export to "
-"export to other file formats."
-msgstr ""
-"æ?¨å?¯ä»¥ç?¨æ­¤å¯¹è¯?æ¡?ä¿?å­?å?° GIMP XCF æ ¼å¼?ã??使ç?¨æ??件â??导å?ºä»¥å¯¼å?ºå?°å?¶ä»?æ??件格å¼?ã??"
-
-#: ../app/dialogs/file-save-dialog.c:608
-msgid ""
-"The given filename does not have any known file extension. Please enter a "
-"known file extension or select a file format from the file format list."
-msgstr ""
-"ç»?å?ºç??æ??件å??没æ??å·²ç?¥ç??æ?©å±?å??ã??请è¾?å?¥å·²ç?¥ç??æ??件æ?©å±?å??æ??ä»?æ??件格å¼?å??表中é??æ?©æ??"
-"件格å¼?ã??"
-
-#: ../app/dialogs/file-save-dialog.c:622
+#: ../app/dialogs/file-save-dialog.c:428
 msgid "Extension Mismatch"
 msgstr "æ?©å±?å??ä¸?å?¹é??"
 
-#: ../app/dialogs/file-save-dialog.c:638
+#: ../app/dialogs/file-save-dialog.c:444
 msgid "The given file extension does not match the chosen file type."
 msgstr "ç»?å®?ç??æ??件æ?©å±?å??ä¸?æ??é??ç??æ??件类å??ä¸?符ã??"
 
-#: ../app/dialogs/file-save-dialog.c:642
+#: ../app/dialogs/file-save-dialog.c:448
 msgid "Do you want to save the image using this name anyway?"
 msgstr "æ?¨ç??ç??è¦?使ç?¨æ­¤å??称ä¿?å­?å?¾å??å??ï¼?"
 
-#: ../app/dialogs/file-save-dialog.c:697
-msgid "Saving canceled"
-msgstr "å·²å??æ¶?ä¿?å­?"
-
-#: ../app/dialogs/file-save-dialog.c:705 ../app/widgets/gimpdnd-xds.c:185
-#, c-format
-msgid ""
-"Saving '%s' failed:\n"
-"\n"
-"%s"
-msgstr ""
-"ä¿?å­?â??%sâ??失败ï¼?\n"
-"\n"
-"%s"
-
 #: ../app/dialogs/grid-dialog.c:85
 msgid "Configure Grid"
 msgstr "é??ç½®ç½?æ ¼"
@@ -9042,10 +7671,6 @@ msgstr "é??ç½®ç½?æ ¼"
 msgid "Configure Image Grid"
 msgstr "é??ç½®å?¾å??ç½?æ ¼"
 
-#: ../app/dialogs/grid-dialog.c:152
-msgid "Grid"
-msgstr "ç½?æ ¼"
-
 #: ../app/dialogs/image-merge-layers-dialog.c:64
 msgid "Merge Layers"
 msgstr "å??并å?¾å±?"
@@ -9058,23 +7683,23 @@ msgstr "å?¾å±?å??并é??项"
 msgid "_Merge"
 msgstr "å??并(_M)"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:92
+#: ../app/dialogs/image-merge-layers-dialog.c:91
 msgid "Final, Merged Layer should be:"
 msgstr "æ??å??ï¼?å??并ç??å?¾å±?åº?该æ?¯ï¼?"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:96
+#: ../app/dialogs/image-merge-layers-dialog.c:95
 msgid "Expanded as necessary"
 msgstr "�����"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:99
+#: ../app/dialogs/image-merge-layers-dialog.c:98
 msgid "Clipped to image"
 msgstr "å?ªè´´æ?¿å?°å?¾å??"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:102
+#: ../app/dialogs/image-merge-layers-dialog.c:101
 msgid "Clipped to bottom layer"
 msgstr "�贴���端��"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:110
+#: ../app/dialogs/image-merge-layers-dialog.c:109
 msgid "_Discard invisible layers"
 msgstr "丢������(_D)"
 
@@ -9083,7 +7708,7 @@ msgid "Create a New Image"
 msgstr "å??建æ?°ç??å?¾å??"
 
 #: ../app/dialogs/image-new-dialog.c:144
-#: ../app/dialogs/preferences-dialog.c:2008
+#: ../app/dialogs/preferences-dialog.c:2021
 msgid "_Template:"
 msgstr "模�(_T)�"
 
@@ -9103,8 +7728,8 @@ msgid ""
 "An image of the chosen size will use more memory than what is configured as "
 "\"Maximum Image Size\" in the Preferences dialog (currently %s)."
 msgstr ""
-"æ??é??ç??å?¾å??大å°?å°?å? ç?¨æ¯?é¦?é??项对è¯?æ¡?中â??æ??大å?¾å??大å°?â??æ??é??ç½®ç??æ?´å¤?å??å­?(å½?å??为 "
-"%s)ã??"
+"æ??é??ç??å?¾å??大å°?å°?å? ç?¨æ¯?é¦?é??项对è¯?æ¡?中â??æ??大å?¾å??大å°?â??æ??é??ç½®ç??æ?´å¤?å??å­?(å½?å??为 %"
+"s)ã??"
 
 #: ../app/dialogs/image-properties-dialog.c:60
 #: ../app/dialogs/image-properties-dialog.c:63
@@ -9151,11 +7776,7 @@ msgstr "å°?å?¾å??缩æ?¾è?³æ?¨é??æ?©ç??大å°?ä¼?使ä¸?äº?å?¾å±?æ?¶ç¼©è?³å®?å?¨æ¶?
 msgid "Is this what you want to do?"
 msgstr "è¿?æ?¯æ?¨æ??å¸?æ??ç??å??ï¼?"
 
-#: ../app/dialogs/input-devices-dialog.c:55
-msgid "Configure Input Devices"
-msgstr "é??ç½®è¾?å?¥è®¾å¤?"
-
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:48
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:49
 msgid "Configure Keyboard Shortcuts"
 msgstr "é??置快æ?·é?®"
 
@@ -9169,15 +7790,15 @@ msgstr "è¦?ç¼?è¾?å¿«æ?·é?®ï¼?请å?¨ç?¸åº?è¡?æ??æ?°ç??å? é??é?®ï¼?æ??æ?? Backspac
 msgid "S_ave keyboard shortcuts on exit"
 msgstr "é??å?ºæ?¶ä¿?å­?å¿«æ?·é?®(_A)"
 
-#: ../app/dialogs/layer-add-mask-dialog.c:84
+#: ../app/dialogs/layer-add-mask-dialog.c:83
 msgid "Add a Mask to the Layer"
 msgstr "æ·»å? è??æ?¿å?°å?¾å±?"
 
-#: ../app/dialogs/layer-add-mask-dialog.c:112
+#: ../app/dialogs/layer-add-mask-dialog.c:110
 msgid "Initialize Layer Mask to:"
 msgstr "å??å§?å??å?¾å±?è??æ?¿ä¸ºï¼?"
 
-#: ../app/dialogs/layer-add-mask-dialog.c:143
+#: ../app/dialogs/layer-add-mask-dialog.c:138
 msgid "In_vert mask"
 msgstr "å??转è??æ?¿(_V)"
 
@@ -9187,12 +7808,12 @@ msgstr "å?¾å±?å??å­?(_N)ï¼?"
 
 #. The size labels
 #: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1088
+#: ../app/tools/gimpmeasuretool.c:1065
 msgid "Width:"
 msgstr "宽度�"
 
 #: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1116
+#: ../app/tools/gimpmeasuretool.c:1093
 msgid "Height:"
 msgstr "�度�"
 
@@ -9204,7 +7825,7 @@ msgstr "å?¾å±?å¡«å??ç±»å??"
 msgid "Set name from _text"
 msgstr "以æ??å­?设å®?å??称(_T)"
 
-#: ../app/dialogs/module-dialog.c:126
+#: ../app/dialogs/module-dialog.c:127
 msgid "Module Manager"
 msgstr "模å??管ç??å?¨"
 
@@ -9216,31 +7837,31 @@ msgstr "æ?¨é??è¦?é??æ?°å?¯å?¨ GIMP 以使æ?¹å??ç??æ??ã??"
 msgid "Module"
 msgstr "模å??"
 
-#: ../app/dialogs/module-dialog.c:465
+#: ../app/dialogs/module-dialog.c:464
 msgid "Only in memory"
 msgstr "ä»?å?¨å??å­?"
 
-#: ../app/dialogs/module-dialog.c:470
+#: ../app/dialogs/module-dialog.c:469
 msgid "No longer available"
 msgstr "已����"
 
-#: ../app/dialogs/module-dialog.c:494
+#: ../app/dialogs/module-dialog.c:498
 msgid "Author:"
 msgstr "ä½?è??ï¼?"
 
-#: ../app/dialogs/module-dialog.c:495
+#: ../app/dialogs/module-dialog.c:499
 msgid "Version:"
 msgstr "ç??æ?¬ï¼?"
 
-#: ../app/dialogs/module-dialog.c:496
+#: ../app/dialogs/module-dialog.c:500
 msgid "Date:"
 msgstr "æ?¥æ??ï¼?"
 
-#: ../app/dialogs/module-dialog.c:497
+#: ../app/dialogs/module-dialog.c:501
 msgid "Copyright:"
 msgstr "ç??æ??ï¼?"
 
-#: ../app/dialogs/module-dialog.c:498
+#: ../app/dialogs/module-dialog.c:502
 msgid "Location:"
 msgstr "�置�"
 
@@ -9258,7 +7879,7 @@ msgstr "é??é??ä½?移"
 
 #. The offset frame
 #: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152
-#: ../app/dialogs/resize-dialog.c:198 ../app/widgets/gimpgrideditor.c:275
+#: ../app/dialogs/resize-dialog.c:197 ../app/widgets/gimpgrideditor.c:276
 msgid "Offset"
 msgstr "�移"
 
@@ -9267,11 +7888,11 @@ msgstr "�移"
 msgid "_Offset"
 msgstr "�移(_O)"
 
-#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:227
+#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:226
 msgid "_X:"
 msgstr "_Xï¼?"
 
-#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:228
+#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:227
 msgid "_Y:"
 msgstr "_Yï¼?"
 
@@ -9296,860 +7917,840 @@ msgstr "以è??æ?¯è?²å¡«å??(_B)"
 msgid "Make _transparent"
 msgstr "é??æ??(_T)"
 
-#: ../app/dialogs/palette-import-dialog.c:154
+#: ../app/dialogs/palette-import-dialog.c:156
 msgid "Import a New Palette"
 msgstr "导å?¥æ?°ç??è?²æ?¿"
 
-#: ../app/dialogs/palette-import-dialog.c:164
+#: ../app/dialogs/palette-import-dialog.c:166
 msgid "_Import"
 msgstr "导�(_I)"
 
 #. The "Source" frame
-#: ../app/dialogs/palette-import-dialog.c:203
+#: ../app/dialogs/palette-import-dialog.c:205
 msgid "Select Source"
 msgstr "é??æ?©æ?¥æº?"
 
-#: ../app/dialogs/palette-import-dialog.c:214
-#: ../app/dialogs/preferences-dialog.c:1923
-msgid "_Gradient"
-msgstr "æ¸?å??(_G)"
-
-#: ../app/dialogs/palette-import-dialog.c:225
+#: ../app/dialogs/palette-import-dialog.c:227
 msgid "I_mage"
 msgstr "å?¾å??(_M)"
 
-#: ../app/dialogs/palette-import-dialog.c:239
+#: ../app/dialogs/palette-import-dialog.c:241
 msgid "Sample _Merged"
 msgstr "ä½?æ ·å??并(_M)"
 
-#: ../app/dialogs/palette-import-dialog.c:251
+#: ../app/dialogs/palette-import-dialog.c:253
 msgid "_Selected Pixels only"
 msgstr "ä»?é??中ç??å??ç´ (_S)"
 
-#: ../app/dialogs/palette-import-dialog.c:263
+#: ../app/dialogs/palette-import-dialog.c:265
 msgid "Palette _file"
 msgstr "è?²æ?¿æ??件(_F)"
 
 #. Palette file name entry
-#: ../app/dialogs/palette-import-dialog.c:292
+#: ../app/dialogs/palette-import-dialog.c:294
 msgid "Select Palette File"
 msgstr "é??æ?©è?²æ?¿æ??件"
 
 #. The "Import" frame
-#: ../app/dialogs/palette-import-dialog.c:303
+#: ../app/dialogs/palette-import-dialog.c:305
 msgid "Import Options"
 msgstr "导å?¥é??项"
 
-#: ../app/dialogs/palette-import-dialog.c:317
+#: ../app/dialogs/palette-import-dialog.c:319
 msgid "New import"
 msgstr "�建导�"
 
-#: ../app/dialogs/palette-import-dialog.c:319
+#: ../app/dialogs/palette-import-dialog.c:321
 msgid "Palette _name:"
 msgstr "è?²æ?¿å??称(_N)ï¼?"
 
-#: ../app/dialogs/palette-import-dialog.c:325
+#: ../app/dialogs/palette-import-dialog.c:327
 msgid "N_umber of colors:"
 msgstr "é¢?è?²æ?°é??(_U)ï¼?"
 
-#: ../app/dialogs/palette-import-dialog.c:338
+#: ../app/dialogs/palette-import-dialog.c:340
 msgid "C_olumns:"
 msgstr "å??æ?°(_O)ï¼?"
 
-#: ../app/dialogs/palette-import-dialog.c:350
+#: ../app/dialogs/palette-import-dialog.c:352
 msgid "I_nterval:"
 msgstr "é?´é??(_N)ï¼?"
 
 #. The "Preview" frame
-#: ../app/dialogs/palette-import-dialog.c:361
+#: ../app/dialogs/palette-import-dialog.c:363
 msgid "Preview"
 msgstr "��"
 
-#: ../app/dialogs/palette-import-dialog.c:382
+#: ../app/dialogs/palette-import-dialog.c:384
 msgid "The selected source contains no colors."
 msgstr "é??中ç??æº?ä¸?å??å?«é¢?è?²ã??"
 
-#: ../app/dialogs/preferences-dialog.c:266
+#: ../app/dialogs/preferences-dialog.c:267
 msgid "Reset All Preferences"
 msgstr "é??ç½®æ??æ??é¦?é??项"
 
-#: ../app/dialogs/preferences-dialog.c:284
+#: ../app/dialogs/preferences-dialog.c:285
 msgid "Do you really want to reset all preferences to default values?"
 msgstr "æ?¨ç??ç??è¦?å°?æ??æ??é¦?é??项é??ç½®å?°é»?认å?¼å??ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:354
+#: ../app/dialogs/preferences-dialog.c:355
 msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr "æ?¨é??è¦?é??æ?°å?¯å?¨ GIMP 以使ä¸?å??æ?¹å??ç??æ??ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:538
+#: ../app/dialogs/preferences-dialog.c:500
+msgid "Configure Input Devices"
+msgstr "é??ç½®è¾?å?¥è®¾å¤?"
+
+#: ../app/dialogs/preferences-dialog.c:577
 msgid ""
 "Your keyboard shortcuts will be reset to default values the next time you "
 "start GIMP."
 msgstr "æ?¨ç??å¿«æ?·é?®å°?å?¨ä¸?次æ?¨å?¯å?¨ GIMP ç??æ?¶å??é??ç½®å?°é»?认å?¼ã??"
 
-#: ../app/dialogs/preferences-dialog.c:549
+#: ../app/dialogs/preferences-dialog.c:588
 msgid "Remove all Keyboard Shortcuts"
 msgstr "移é?¤æ??æ??ç??å¿«æ?·é?®"
 
-#: ../app/dialogs/preferences-dialog.c:571
+#: ../app/dialogs/preferences-dialog.c:610
 msgid "Do you really want to remove all keyboard shortcuts from all menus?"
 msgstr "æ?¨ç??ç??è¦?ä»?æ??æ??è??å??中移é?¤æ??æ??ç??å¿«æ?·é?®å??ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:612
+#: ../app/dialogs/preferences-dialog.c:651
 msgid ""
 "Your window setup will be reset to default values the next time you start "
 "GIMP."
 msgstr "æ?¨ç??çª?å?£è®¾ç½®å°?å?¨ä¸?次æ?¨å?¯å?¨ GIMP ç??æ?¶å??é??ç½®å?°é»?认å?¼ã??"
 
-#: ../app/dialogs/preferences-dialog.c:647
+#: ../app/dialogs/preferences-dialog.c:686
 msgid ""
 "Your input device settings will be reset to default values the next time you "
 "start GIMP."
 msgstr "æ?¨ç??è¾?å?¥è®¾å¤?设置å°?å?¨ä¸?次æ?¨å?¯å?¨ GIMP ç??æ?¶å??é??ç½®å?°é»?认å?¼ã??"
 
-#: ../app/dialogs/preferences-dialog.c:682
+#: ../app/dialogs/preferences-dialog.c:721
 msgid ""
 "Your tool options will be reset to default values the next time you start "
 "GIMP."
 msgstr "æ?¨ç??å·¥å?·é??项å°?å?¨æ?¨ä¸?次å?¯å?¨ GIMP æ?¶é??ç½®å?°é»?认å?¼ã??"
 
-#: ../app/dialogs/preferences-dialog.c:1266
+#: ../app/dialogs/preferences-dialog.c:1289
 msgid "Show _menubar"
 msgstr "æ?¾ç¤ºè??å??æ ?(_M)"
 
-#: ../app/dialogs/preferences-dialog.c:1270
+#: ../app/dialogs/preferences-dialog.c:1293
 msgid "Show _rulers"
 msgstr "�示�尺(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:1273
+#: ../app/dialogs/preferences-dialog.c:1296
 msgid "Show scroll_bars"
 msgstr "�示���(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1276
+#: ../app/dialogs/preferences-dialog.c:1299
 msgid "Show s_tatusbar"
 msgstr "æ?¾ç¤ºç?¶æ??æ ?(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:1284
+#: ../app/dialogs/preferences-dialog.c:1307
 msgid "Show s_election"
 msgstr "æ?¾ç¤ºé??å?º(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:1287
+#: ../app/dialogs/preferences-dialog.c:1310
 msgid "Show _layer boundary"
 msgstr "æ?¾ç¤ºå?¾å±?è¾¹ç??(_L)"
 
-#: ../app/dialogs/preferences-dialog.c:1290
+#: ../app/dialogs/preferences-dialog.c:1313
 msgid "Show _guides"
 msgstr "æ?¾ç¤ºå??è??线(_G)"
 
-#: ../app/dialogs/preferences-dialog.c:1293
+#: ../app/dialogs/preferences-dialog.c:1316
 msgid "Show gri_d"
 msgstr "�示�格(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:1299
+#: ../app/dialogs/preferences-dialog.c:1322
 msgid "Canvas _padding mode:"
 msgstr "��衬�模�(_P)�"
 
-#: ../app/dialogs/preferences-dialog.c:1304
+#: ../app/dialogs/preferences-dialog.c:1327
 msgid "Custom p_adding color:"
 msgstr "�����衬���(_A)�"
 
-#: ../app/dialogs/preferences-dialog.c:1305
+#: ../app/dialogs/preferences-dialog.c:1328
 msgid "Select Custom Canvas Padding Color"
 msgstr "设置è?ªå®?ä¹?ç?»å¸?衬å?«ç??é¢?è?²"
 
-#: ../app/dialogs/preferences-dialog.c:1394
+#: ../app/dialogs/preferences-dialog.c:1417
 msgid "Preferences"
 msgstr "é¦?é??项"
 
-#: ../app/dialogs/preferences-dialog.c:1507
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:1529
+#: ../app/dialogs/preferences-dialog.c:2780
 msgid "Environment"
 msgstr "��"
 
-#: ../app/dialogs/preferences-dialog.c:1521
+#: ../app/dialogs/preferences-dialog.c:1543
 msgid "Resource Consumption"
 msgstr "èµ?æº?æ¶?è??"
 
-#: ../app/dialogs/preferences-dialog.c:1531
+#: ../app/dialogs/preferences-dialog.c:1553
 msgid "Minimal number of _undo levels:"
 msgstr "æ??å°?æ?¤æ¶?次æ?°(_U)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1534
+#: ../app/dialogs/preferences-dialog.c:1556
 msgid "Maximum undo _memory:"
 msgstr "æ??大æ?¤æ¶?å??å­?(_M)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1537
+#: ../app/dialogs/preferences-dialog.c:1559
 msgid "Tile cache _size:"
 msgstr "平���大�(_S)�"
 
-#: ../app/dialogs/preferences-dialog.c:1540
+#: ../app/dialogs/preferences-dialog.c:1562
 msgid "Maximum _new image size:"
 msgstr "æ??大æ?°å»ºå?¾å??大å°?(_N)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1545
+#: ../app/dialogs/preferences-dialog.c:1567
 msgid "Number of _processors to use:"
 msgstr "å¤?ç??å?¨ä½¿ç?¨æ?°é??(_P)ï¼?"
 
 #. Image Thumbnails
-#: ../app/dialogs/preferences-dialog.c:1550
+#: ../app/dialogs/preferences-dialog.c:1572
 msgid "Image Thumbnails"
 msgstr "å?¾å??缩ç?¥å?¾"
 
-#: ../app/dialogs/preferences-dialog.c:1555
+#: ../app/dialogs/preferences-dialog.c:1577
 msgid "Size of _thumbnails:"
 msgstr "缩��大�(_T)�"
 
-#: ../app/dialogs/preferences-dialog.c:1559
+#: ../app/dialogs/preferences-dialog.c:1581
 msgid "Maximum _filesize for thumbnailing:"
 msgstr "缩ç?¥å?¾æ??大æ??件大å°?(_F)ï¼?"
 
 #. File Saving
-#: ../app/dialogs/preferences-dialog.c:1563
+#: ../app/dialogs/preferences-dialog.c:1585
 msgid "Saving Images"
 msgstr "ä¿?å­?å?¾å??"
 
-#: ../app/dialogs/preferences-dialog.c:1566
+#: ../app/dialogs/preferences-dialog.c:1588
 msgid "Confirm closing of unsa_ved images"
 msgstr "å?³é?­æ?ªä¿?å­?ç??å?¾å??æ?¶é??è¦?确认(_V)"
 
-#: ../app/dialogs/preferences-dialog.c:1576
+#: ../app/dialogs/preferences-dialog.c:1598
 msgid "Keep record of used files in the Recent Documents list"
 msgstr "æ?¾ç¤ºæ??è¿?使ç?¨ç??æ??æ¡£"
 
-#: ../app/dialogs/preferences-dialog.c:1585
+#: ../app/dialogs/preferences-dialog.c:1607
 msgid "User Interface"
 msgstr "ç?¨æ?·ç??é?¢"
 
-#: ../app/dialogs/preferences-dialog.c:1588
+#: ../app/dialogs/preferences-dialog.c:1610
 msgid "Interface"
 msgstr "ç??é?¢"
 
-#: ../app/dialogs/preferences-dialog.c:1598
-msgid "Language"
-msgstr "语�"
-
 #. Previews
-#: ../app/dialogs/preferences-dialog.c:1604
+#: ../app/dialogs/preferences-dialog.c:1617
 msgid "Previews"
 msgstr "��"
 
-#: ../app/dialogs/preferences-dialog.c:1607
+#: ../app/dialogs/preferences-dialog.c:1620
 msgid "_Enable layer & channel previews"
 msgstr "å?¯ç?¨å?¾å±?å??é??é??é¢?è§?(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:1613
+#: ../app/dialogs/preferences-dialog.c:1626
 msgid "_Default layer & channel preview size:"
 msgstr "é»?认å?¾å±?å??é??é??é¢?è§?大å°?(_D)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1616
+#: ../app/dialogs/preferences-dialog.c:1629
 msgid "Na_vigation preview size:"
 msgstr "导���大�(_V)�"
 
 #. Keyboard Shortcuts
-#: ../app/dialogs/preferences-dialog.c:1620
+#: ../app/dialogs/preferences-dialog.c:1633
 msgid "Keyboard Shortcuts"
 msgstr "å¿«æ?·é?®"
 
-#: ../app/dialogs/preferences-dialog.c:1624
+#: ../app/dialogs/preferences-dialog.c:1637
+msgid "Show menu _mnemonics (access keys)"
+msgstr "æ?¾ç¤ºè??å??å?©è®°ç¬¦(é??æ?©é?®)(_M)"
+
+#: ../app/dialogs/preferences-dialog.c:1640
 msgid "_Use dynamic keyboard shortcuts"
 msgstr "使ç?¨å?¨æ??å¿«æ?·é?®(_U)"
 
-#: ../app/dialogs/preferences-dialog.c:1628
+#: ../app/dialogs/preferences-dialog.c:1644
 msgid "Configure _Keyboard Shortcuts..."
 msgstr "é??置快æ?·é?®(_K)..."
 
-#: ../app/dialogs/preferences-dialog.c:1635
+#: ../app/dialogs/preferences-dialog.c:1651
 msgid "_Save keyboard shortcuts on exit"
 msgstr "é??å?ºæ?¶ä¿?å­?å¿«æ?·é?®(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:1639
+#: ../app/dialogs/preferences-dialog.c:1655
 msgid "Save Keyboard Shortcuts _Now"
 msgstr "����快��(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:1646
+#: ../app/dialogs/preferences-dialog.c:1662
 msgid "_Reset Keyboard Shortcuts to Default Values"
 msgstr "é??置快æ?·é?®å?°é»?认置(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:1655
+#: ../app/dialogs/preferences-dialog.c:1671
 msgid "Remove _All Keyboard Shortcuts"
 msgstr "移é?¤æ??æ??å¿«æ?·é?®(_A)"
 
-#: ../app/dialogs/preferences-dialog.c:1667
-#: ../app/dialogs/preferences-dialog.c:1706
+#: ../app/dialogs/preferences-dialog.c:1683
+#: ../app/dialogs/preferences-dialog.c:1722
 msgid "Theme"
 msgstr "主�"
 
-#: ../app/dialogs/preferences-dialog.c:1676
+#: ../app/dialogs/preferences-dialog.c:1692
 msgid "Select Theme"
 msgstr "é??æ?©ä¸»é¢?"
 
-#: ../app/dialogs/preferences-dialog.c:1758
+#: ../app/dialogs/preferences-dialog.c:1774
 msgid "Reload C_urrent Theme"
 msgstr "é??æ?°å? è½½å½?å??主é¢?(_U)"
 
-#: ../app/dialogs/preferences-dialog.c:1770
+#: ../app/dialogs/preferences-dialog.c:1786
 msgid "Help System"
 msgstr "帮�系�"
 
 #. General
-#: ../app/dialogs/preferences-dialog.c:1782
-#: ../app/dialogs/preferences-dialog.c:1866
-#: ../app/dialogs/preferences-dialog.c:2066
-#: ../app/widgets/gimpcontrollereditor.c:188
+#: ../app/dialogs/preferences-dialog.c:1798
+#: ../app/dialogs/preferences-dialog.c:1892
+#: ../app/dialogs/preferences-dialog.c:2079
+#: ../app/widgets/gimpcontrollereditor.c:189
 msgid "General"
 msgstr "常�"
 
-#: ../app/dialogs/preferences-dialog.c:1785
+#: ../app/dialogs/preferences-dialog.c:1801
 msgid "Show _tooltips"
 msgstr "æ?¾ç¤ºå·¥å?·æ??示(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:1788
+#: ../app/dialogs/preferences-dialog.c:1804
 msgid "Show help _buttons"
 msgstr "æ?¾ç¤ºå¸®å?©æ??é?®(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1801
+#: ../app/dialogs/preferences-dialog.c:1817
 msgid "Use the online version"
 msgstr "使ç?¨å?¨çº¿ç??æ?¬"
 
-#: ../app/dialogs/preferences-dialog.c:1802
+#: ../app/dialogs/preferences-dialog.c:1818
 msgid "Use a locally installed copy"
 msgstr "使ç?¨æ?¬å?°å·²å®?è£?ç??æ?¬"
 
-#: ../app/dialogs/preferences-dialog.c:1803
+#: ../app/dialogs/preferences-dialog.c:1819
 msgid "User manual:"
 msgstr "ç?¨æ?·æ??å??"
 
-#: ../app/dialogs/preferences-dialog.c:1810
+#: ../app/dialogs/preferences-dialog.c:1826
 msgid "There's a local installation of the user manual."
 msgstr "å·²å®?è£?ç?¨æ?·æ??å??ç??æ?¬å?°ç??æ?¬"
 
-#: ../app/dialogs/preferences-dialog.c:1815
+#: ../app/dialogs/preferences-dialog.c:1831
 msgid "The user manual is not installed locally."
 msgstr "ç?¨æ?·æ??å??æ?ªå?¨æ?¬å?°å®?è£?"
 
 #. Help Browser
-#: ../app/dialogs/preferences-dialog.c:1838
+#: ../app/dialogs/preferences-dialog.c:1854
 msgid "Help Browser"
 msgstr "帮����"
 
-#: ../app/dialogs/preferences-dialog.c:1842
+#: ../app/dialogs/preferences-dialog.c:1858
 msgid "H_elp browser to use:"
 msgstr "è¦?使ç?¨ç??帮å?©æµ?è§?å?¨(_E)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1869
+#: ../app/dialogs/preferences-dialog.c:1863
+msgid "Web Browser"
+msgstr "Web ���"
+
+#: ../app/dialogs/preferences-dialog.c:1867
+msgid "_Web browser to use:"
+msgstr "è¦?使ç?¨ç?? Web æµ?è§?å?¨(_W)ï¼?"
+
+#: ../app/dialogs/preferences-dialog.c:1895
 msgid "_Save tool options on exit"
 msgstr "é??å?ºæ?¶ä¿?å­?å·¥å?·é??项(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:1873
+#: ../app/dialogs/preferences-dialog.c:1899
 msgid "Save Tool Options _Now"
 msgstr "ç«?å?³ä¿?å­?å·¥å?·é??项(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:1880
+#: ../app/dialogs/preferences-dialog.c:1906
 msgid "_Reset Saved Tool Options to Default Values"
 msgstr "å°?å·¥å?·é??项é??置为é»?认å?¼(_R)"
 
 #. Snapping Distance
-#: ../app/dialogs/preferences-dialog.c:1890
+#: ../app/dialogs/preferences-dialog.c:1916
 msgid "Guide & Grid Snapping"
 msgstr "å??è??线å??ç½?æ ¼å?¸é??"
 
-#: ../app/dialogs/preferences-dialog.c:1895
+#: ../app/dialogs/preferences-dialog.c:1921
 msgid "_Snap distance:"
 msgstr "å?¸é??è·?离(_S)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:1903
+#: ../app/dialogs/preferences-dialog.c:1929
 msgid "Default _interpolation:"
 msgstr "é»?认æ??å?¼(_I)ï¼?"
 
 #. Global Brush, Pattern, ...
-#: ../app/dialogs/preferences-dialog.c:1910
+#: ../app/dialogs/preferences-dialog.c:1936
 msgid "Paint Options Shared Between Tools"
 msgstr "å·¥å?·ä¹?é?´å?±äº«ç??æ¶?ç?»é??项"
 
-#: ../app/dialogs/preferences-dialog.c:1914
-msgid "_Brush"
-msgstr "��(_B)"
-
-#: ../app/dialogs/preferences-dialog.c:1917
-msgid "_Dynamics"
-msgstr "å?¨æ??(_D)"
-
-#: ../app/dialogs/preferences-dialog.c:1920
-msgid "_Pattern"
-msgstr "��(_P)"
-
-#: ../app/dialogs/preferences-dialog.c:1926
+#: ../app/dialogs/preferences-dialog.c:1949
 msgid "Move Tool"
 msgstr "移�工�"
 
-#: ../app/dialogs/preferences-dialog.c:1930
+#: ../app/dialogs/preferences-dialog.c:1953
 msgid "Set layer or path as active"
 msgstr "å°?å?¾å±?æ??è·¯å¾?设置为活å?¨ç??"
 
+#: ../app/dialogs/preferences-dialog.c:1966 ../app/widgets/gimptoolbox.c:633
+msgid "Toolbox"
+msgstr "工�箱"
+
 #. Appearance
-#: ../app/dialogs/preferences-dialog.c:1955
-#: ../app/dialogs/preferences-dialog.c:2139
-#: ../app/widgets/gimpgrideditor.c:203
+#: ../app/dialogs/preferences-dialog.c:1978
+#: ../app/dialogs/preferences-dialog.c:2152
+#: ../app/widgets/gimpgrideditor.c:204
 msgid "Appearance"
 msgstr "��"
 
-#: ../app/dialogs/preferences-dialog.c:1959
+#: ../app/dialogs/preferences-dialog.c:1982
 msgid "Show _foreground & background color"
 msgstr "æ?¾ç¤ºå??æ?¯è?²å??è??æ?¯è?²(_F)"
 
-#: ../app/dialogs/preferences-dialog.c:1963
+#: ../app/dialogs/preferences-dialog.c:1986
 msgid "Show active _brush, pattern & gradient"
 msgstr "æ?¾ç¤ºæ´»å?¨ç?»ç¬?ã??å?¾æ¡?å??æ¸?å??(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1967
+#: ../app/dialogs/preferences-dialog.c:1990
 msgid "Show active _image"
 msgstr "æ?¾ç¤ºæ´»å?¨å?¾å??(_I)"
 
-#. Tool Editor
-#: ../app/dialogs/preferences-dialog.c:1975
-msgid "Tools configuration"
-msgstr "å·¥å?·é??ç½®"
-
-#: ../app/dialogs/preferences-dialog.c:1990
+#: ../app/dialogs/preferences-dialog.c:2003
 msgid "Default New Image"
 msgstr "é»?认æ?°å?¾å??"
 
-#: ../app/dialogs/preferences-dialog.c:1993
+#: ../app/dialogs/preferences-dialog.c:2006
 msgid "Default Image"
 msgstr "é»?认å?¾å??"
 
-#: ../app/dialogs/preferences-dialog.c:2030
+#: ../app/dialogs/preferences-dialog.c:2043
 msgid "Default Image Grid"
 msgstr "é»?认å?¾å??ç½?æ ¼"
 
-#: ../app/dialogs/preferences-dialog.c:2033
+#: ../app/dialogs/preferences-dialog.c:2046
 msgid "Default Grid"
 msgstr "�认�格"
 
-#: ../app/dialogs/preferences-dialog.c:2054
+#: ../app/dialogs/preferences-dialog.c:2067
 msgid "Image Windows"
 msgstr "å?¾å??çª?å?£"
 
-#: ../app/dialogs/preferences-dialog.c:2069
+#: ../app/dialogs/preferences-dialog.c:2082
 msgid "Use \"_Dot for dot\" by default"
 msgstr "é»?认使ç?¨â??ç?¹å¯¹ç?¹â??(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2075
+#: ../app/dialogs/preferences-dialog.c:2088
 msgid "Marching _ants speed:"
 msgstr "è??è??线é??度(_A)ï¼?"
 
 #. Zoom & Resize Behavior
-#: ../app/dialogs/preferences-dialog.c:2079
+#: ../app/dialogs/preferences-dialog.c:2092
 msgid "Zoom & Resize Behavior"
 msgstr "缩æ?¾å??æ?¹å??大å°?è¡?为"
 
-#: ../app/dialogs/preferences-dialog.c:2083
+#: ../app/dialogs/preferences-dialog.c:2096
 msgid "Resize window on _zoom"
 msgstr "缩������大�(_Z)"
 
-#: ../app/dialogs/preferences-dialog.c:2086
+#: ../app/dialogs/preferences-dialog.c:2099
 msgid "Resize window on image _size change"
 msgstr "å?¾å??大å°?æ?¹å??æ?¶è°?æ?´çª?å?£å¤§å°?(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2092
+#: ../app/dialogs/preferences-dialog.c:2105
 msgid "Fit to window"
 msgstr "é??å??çª?å?£"
 
-#: ../app/dialogs/preferences-dialog.c:2094
+#: ../app/dialogs/preferences-dialog.c:2107
 msgid "Initial zoom _ratio:"
 msgstr "å??å§?缩æ?¾æ¯?ç??(_R)ï¼?"
 
 #. Space Bar
-#: ../app/dialogs/preferences-dialog.c:2098
+#: ../app/dialogs/preferences-dialog.c:2111
 msgid "Space Bar"
 msgstr "空格�"
 
-#: ../app/dialogs/preferences-dialog.c:2104
+#: ../app/dialogs/preferences-dialog.c:2117
 msgid "_While space bar is pressed:"
 msgstr "å½?空格é?®è¢«æ??ä¸?æ?¶(_W)ï¼?"
 
 #. Mouse Pointers
-#: ../app/dialogs/preferences-dialog.c:2108
+#: ../app/dialogs/preferences-dialog.c:2121
 msgid "Mouse Pointers"
 msgstr "é¼ æ ?æ??é??"
 
-#: ../app/dialogs/preferences-dialog.c:2112
+#: ../app/dialogs/preferences-dialog.c:2125
 msgid "Show _brush outline"
 msgstr "�示��轮�(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:2115
+#: ../app/dialogs/preferences-dialog.c:2128
 msgid "Show pointer for paint _tools"
 msgstr "æ?¾ç¤ºæ¶?ç?»å·¥å?·é¼ æ ?æ??é??(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2121
+#: ../app/dialogs/preferences-dialog.c:2134
 msgid "Pointer _mode:"
 msgstr "æ??é??模å¼?(_M)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2124
+#: ../app/dialogs/preferences-dialog.c:2137
 msgid "Pointer re_ndering:"
 msgstr "æ??é??渲æ??(_N)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2136
+#: ../app/dialogs/preferences-dialog.c:2149
 msgid "Image Window Appearance"
 msgstr "å?¾å??çª?å?£å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2147
+#: ../app/dialogs/preferences-dialog.c:2160
 msgid "Default Appearance in Normal Mode"
 msgstr "æ?®é??模å¼?ä¸?ç??é»?认å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2152
+#: ../app/dialogs/preferences-dialog.c:2165
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "å?¨å±?模å¼?ä¸?ç??é»?认å¤?è§?"
 
-#: ../app/dialogs/preferences-dialog.c:2161
+#: ../app/dialogs/preferences-dialog.c:2174
 msgid "Image Title & Statusbar Format"
 msgstr "å?¾å??æ ?é¢?å??ç?¶æ??æ ?æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2164
+#: ../app/dialogs/preferences-dialog.c:2177
 msgid "Title & Status"
 msgstr "æ ?é¢?å??ç?¶æ??"
 
-#: ../app/dialogs/preferences-dialog.c:2182
+#: ../app/dialogs/preferences-dialog.c:2195
 msgid "Current format"
 msgstr "å½?å??æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2183
+#: ../app/dialogs/preferences-dialog.c:2196
 msgid "Default format"
 msgstr "�认格�"
 
-#: ../app/dialogs/preferences-dialog.c:2184
+#: ../app/dialogs/preferences-dialog.c:2197
 msgid "Show zoom percentage"
 msgstr "æ?¾ç¤ºç¼©æ?¾ç?¾å??æ¯?"
 
-#: ../app/dialogs/preferences-dialog.c:2185
+#: ../app/dialogs/preferences-dialog.c:2198
 msgid "Show zoom ratio"
 msgstr "æ?¾ç¤ºç¼©æ?¾æ¯?ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2186
+#: ../app/dialogs/preferences-dialog.c:2199
 msgid "Show image size"
 msgstr "æ?¾ç¤ºå?¾å??大å°?"
 
-#: ../app/dialogs/preferences-dialog.c:2199
+#: ../app/dialogs/preferences-dialog.c:2212
 msgid "Image Title Format"
 msgstr "å?¾å??æ ?é¢?æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2201
+#: ../app/dialogs/preferences-dialog.c:2214
 msgid "Image Statusbar Format"
 msgstr "å?¾å??ç?¶æ??æ ?æ ¼å¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2286
+#: ../app/dialogs/preferences-dialog.c:2299
 msgid "Display"
 msgstr "�示"
 
-#. Transparency
-#: ../app/dialogs/preferences-dialog.c:2298
-msgid "Transparency"
-msgstr "é??æ??"
-
-#: ../app/dialogs/preferences-dialog.c:2302
+#: ../app/dialogs/preferences-dialog.c:2315
 msgid "_Check style:"
 msgstr "å??å­?线样å¼?(_C)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2305
+#: ../app/dialogs/preferences-dialog.c:2318
 msgid "Check _size:"
 msgstr "å??å­?线大å°?(_S)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2308
+#: ../app/dialogs/preferences-dialog.c:2321
 msgid "Monitor Resolution"
 msgstr "ç??è§?å?¨å??辨ç??"
 
-#. Pixels
-#: ../app/dialogs/preferences-dialog.c:2312
-#: ../app/display/gimpcursorview.c:200 ../app/widgets/gimpgrideditor.c:268
-#: ../app/widgets/gimpgrideditor.c:300
+#: ../app/dialogs/preferences-dialog.c:2325
+#: ../app/widgets/gimpcursorview.c:124 ../app/widgets/gimpgrideditor.c:269
+#: ../app/widgets/gimpgrideditor.c:301
 msgid "Pixels"
 msgstr "å??ç´ "
 
-#: ../app/dialogs/preferences-dialog.c:2330
-msgid "Horizontal"
-msgstr "æ°´å¹³"
-
-#: ../app/dialogs/preferences-dialog.c:2332
-msgid "Vertical"
-msgstr "å??ç?´"
-
-#: ../app/dialogs/preferences-dialog.c:2334
-#: ../app/widgets/gimpimagepropview.c:475
+#: ../app/dialogs/preferences-dialog.c:2347
+#: ../app/widgets/gimpimagepropview.c:476
 msgid "ppi"
 msgstr "ppi"
 
-#: ../app/dialogs/preferences-dialog.c:2350
+#: ../app/dialogs/preferences-dialog.c:2363
 #, c-format
 msgid "_Detect automatically (currently %d Ã? %d ppi)"
 msgstr "è?ªå?¨æ£?æµ?(å½?å??为 %d x %d ppi)(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2370
+#: ../app/dialogs/preferences-dialog.c:2383
 msgid "_Enter manually"
 msgstr "æ??å·¥è¾?å?¥(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:2385
+#: ../app/dialogs/preferences-dialog.c:2398
 msgid "C_alibrate..."
 msgstr "æµ?å®?(_A)..."
 
-#: ../app/dialogs/preferences-dialog.c:2408
+#: ../app/dialogs/preferences-dialog.c:2421
 msgid "Color Management"
 msgstr "è?²å½©ç®¡ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2428
+#: ../app/dialogs/preferences-dialog.c:2441
 msgid "_RGB profile:"
 msgstr "_RGB é??ç½®æ??件ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2429
+#: ../app/dialogs/preferences-dialog.c:2442
 msgid "Select RGB Color Profile"
 msgstr "é??æ?© RGB è?²å½©é??ç½®æ??件"
 
-#: ../app/dialogs/preferences-dialog.c:2430
+#: ../app/dialogs/preferences-dialog.c:2443
 msgid "_CMYK profile:"
 msgstr "_CMYK é??ç½®æ??件ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2431
+#: ../app/dialogs/preferences-dialog.c:2444
 msgid "Select CMYK Color Profile"
 msgstr "é??æ?© CMYK è?²å½©é??ç½®æ??件"
 
-#: ../app/dialogs/preferences-dialog.c:2432
+#: ../app/dialogs/preferences-dialog.c:2445
 msgid "_Monitor profile:"
 msgstr "æ?¾ç¤ºå?¨é??ç½®æ??件(_M)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2433
+#: ../app/dialogs/preferences-dialog.c:2446
 msgid "Select Monitor Color Profile"
 msgstr "é??æ?©æ?¾ç¤ºå?¨è?²å½©é??ç½®æ??件"
 
-#: ../app/dialogs/preferences-dialog.c:2434
+#: ../app/dialogs/preferences-dialog.c:2447
 msgid "_Print simulation profile:"
 msgstr "æ??å?°æ?ºæ¨¡æ??é??ç½®æ??件(_P)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2435
+#: ../app/dialogs/preferences-dialog.c:2448
 msgid "Select Printer Color Profile"
 msgstr "é??æ?©æ??å?°æ?ºè?²å½©é??ç½®æ??件"
 
-#: ../app/dialogs/preferences-dialog.c:2446
+#: ../app/dialogs/preferences-dialog.c:2459
 msgid "_Mode of operation:"
 msgstr "æ??ä½?模å¼?(_M)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2476
+#: ../app/dialogs/preferences-dialog.c:2489
 msgid "_Try to use the system monitor profile"
 msgstr "è¯?å?¾ä½¿ç?¨ç³»ç»?æ?¾ç¤ºå?¨é??ç½®æ??件(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2486
+#: ../app/dialogs/preferences-dialog.c:2499
 msgid "_Display rendering intent:"
 msgstr "æ?¾ç¤ºæ¸²æ??缩è¿?(_D)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2495
+#: ../app/dialogs/preferences-dialog.c:2508
 msgid "_Softproof rendering intent:"
 msgstr "软æ??样渲æ??缩è¿?(_S)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2508
+#: ../app/dialogs/preferences-dialog.c:2521
 msgid "Mark out of gamut colors"
 msgstr "æ ?è®°å?ºè¶?å?ºå?¨è?²å½©è??å?´ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2513
+#: ../app/dialogs/preferences-dialog.c:2526
 msgid "Select Warning Color"
 msgstr "é??æ?©è­¦å??é¢?è?²"
 
-#: ../app/dialogs/preferences-dialog.c:2526
+#: ../app/dialogs/preferences-dialog.c:2539
 msgid "File Open behaviour:"
 msgstr "æ??件æ??å¼?è¡?为ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2538
+#: ../app/dialogs/preferences-dialog.c:2551
 msgid "Input Devices"
 msgstr "��设�"
 
 #. Extended Input Devices
-#: ../app/dialogs/preferences-dialog.c:2548
+#: ../app/dialogs/preferences-dialog.c:2561
 msgid "Extended Input Devices"
 msgstr "����设�"
 
-#: ../app/dialogs/preferences-dialog.c:2552
+#: ../app/dialogs/preferences-dialog.c:2565
 msgid "Configure E_xtended Input Devices..."
 msgstr "é??ç½®æ?©å±?è¾?å?¥è®¾å¤?(_X)..."
 
-#: ../app/dialogs/preferences-dialog.c:2559
+#: ../app/dialogs/preferences-dialog.c:2572
 msgid "_Save input device settings on exit"
 msgstr "é??å?ºæ?¶ä¿?å­?è¾?å?¥è®¾å¤?设置(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2563
+#: ../app/dialogs/preferences-dialog.c:2576
 msgid "Save Input Device Settings _Now"
 msgstr "������设�设置(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2570
+#: ../app/dialogs/preferences-dialog.c:2583
 msgid "_Reset Saved Input Device Settings to Default Values"
 msgstr "é??置已ä¿?å­?ç??è¾?å?¥è®¾å¤?设置å?°é»?认å?¼(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2585
+#: ../app/dialogs/preferences-dialog.c:2598
 msgid "Additional Input Controllers"
 msgstr "é??å? è¾?å?¥æ?§å?¶å?¨"
 
-#: ../app/dialogs/preferences-dialog.c:2588
+#: ../app/dialogs/preferences-dialog.c:2601
 msgid "Input Controllers"
 msgstr "�����"
 
-#: ../app/dialogs/preferences-dialog.c:2604
+#: ../app/dialogs/preferences-dialog.c:2617
 msgid "Window Management"
 msgstr "çª?å?£ç®¡ç??"
 
-#: ../app/dialogs/preferences-dialog.c:2613
+#: ../app/dialogs/preferences-dialog.c:2626
 msgid "Window Manager Hints"
 msgstr "çª?å?£ç®¡ç??å?¨æ??示"
 
-#: ../app/dialogs/preferences-dialog.c:2619
-msgid "Hint for _docks and toolbox:"
-msgstr "å??é? çª?å??å·¥å?·ç®±ç??çª?å?£ç±»å??æ??示(_D)ï¼?"
+#: ../app/dialogs/preferences-dialog.c:2632
+msgid "Hint for the _toolbox:"
+msgstr "å·¥å?·ç®±ç??çª?å?£ç±»å??æ??示(_T)ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2622
+#: ../app/dialogs/preferences-dialog.c:2636
+msgid "Hint for other _docks:"
+msgstr "å?¶å®?å??é? æ ?ç??æ??示(_D)ï¼?"
+
+#: ../app/dialogs/preferences-dialog.c:2641
+msgid "Toolbox and other docks are transient to the active image window"
+msgstr "å·¥å?·ç®±å??å?¶ä»?å??é? æ ?对äº?æ´»å?¨å?¾å??çª?å?£æ?¯ä¸´æ?¶ç??"
+
+#: ../app/dialogs/preferences-dialog.c:2646
 msgid "Focus"
 msgstr "��"
 
-#: ../app/dialogs/preferences-dialog.c:2626
+#: ../app/dialogs/preferences-dialog.c:2650
 msgid "Activate the _focused image"
 msgstr "æ¿?æ´»è?·å¾?ç?¦ç?¹ç??å?¾å??(_F)"
 
 #. Window Positions
-#: ../app/dialogs/preferences-dialog.c:2630
+#: ../app/dialogs/preferences-dialog.c:2654
 msgid "Window Positions"
 msgstr "���置"
 
-#: ../app/dialogs/preferences-dialog.c:2633
+#: ../app/dialogs/preferences-dialog.c:2657
 msgid "_Save window positions on exit"
 msgstr "é??å?ºæ?¶ä¿?å­?çª?å?£ä½?ç½®(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2637
+#: ../app/dialogs/preferences-dialog.c:2661
 msgid "Save Window Positions _Now"
 msgstr "�������置(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2644
+#: ../app/dialogs/preferences-dialog.c:2668
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr "é??置已ä¿?å­?ç??çª?å?£ä½?ç½®å?°é»?认å?¼(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2659
+#: ../app/dialogs/preferences-dialog.c:2683
 msgid "Folders"
 msgstr "æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2679
+#: ../app/dialogs/preferences-dialog.c:2703
 msgid "Temporary folder:"
 msgstr "临æ?¶æ??件夹ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2680
+#: ../app/dialogs/preferences-dialog.c:2704
 msgid "Select Folder for Temporary Files"
 msgstr "为临æ?¶æ??件é??æ?©æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2684
+#: ../app/dialogs/preferences-dialog.c:2708
 msgid "Swap folder:"
 msgstr "交æ?¢æ??件夹ï¼?"
 
-#: ../app/dialogs/preferences-dialog.c:2685
+#: ../app/dialogs/preferences-dialog.c:2709
 msgid "Select Swap Folder"
 msgstr "é??æ?©äº¤æ?¢æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2720
+#: ../app/dialogs/preferences-dialog.c:2744
 msgid "Brush Folders"
 msgstr "ç?»ç¬?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2722
+#: ../app/dialogs/preferences-dialog.c:2746
 msgid "Select Brush Folders"
 msgstr "é??æ?©ç?»ç¬?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2724
-msgid "Dynamics Folders"
-msgstr "å?¨æ??æ??件夹"
-
-#: ../app/dialogs/preferences-dialog.c:2726
-msgid "Select Dynamics Folders"
-msgstr "é??æ?©å?¨æ??æ??件夹"
-
-#: ../app/dialogs/preferences-dialog.c:2728
+#: ../app/dialogs/preferences-dialog.c:2748
 msgid "Pattern Folders"
 msgstr "å?¾æ¡?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2730
+#: ../app/dialogs/preferences-dialog.c:2750
 msgid "Select Pattern Folders"
 msgstr "é??æ?©å?¾æ¡?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2732
+#: ../app/dialogs/preferences-dialog.c:2752
 msgid "Palette Folders"
 msgstr "è?²æ?¿æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2734
+#: ../app/dialogs/preferences-dialog.c:2754
 msgid "Select Palette Folders"
 msgstr "é??æ?©è?²æ?¿æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2736
+#: ../app/dialogs/preferences-dialog.c:2756
 msgid "Gradient Folders"
 msgstr "æ¸?å??æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2738
+#: ../app/dialogs/preferences-dialog.c:2758
 msgid "Select Gradient Folders"
 msgstr "é??æ?©æ¸?å??æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Font Folders"
 msgstr "å­?ä½?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2762
 msgid "Select Font Folders"
 msgstr "é??æ?©å­?ä½?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/dialogs/preferences-dialog.c:2764
 msgid "Plug-In Folders"
 msgstr "æ??件æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2766
 msgid "Select Plug-In Folders"
 msgstr "é??æ?©æ??件æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2768
 msgid "Scripts"
 msgstr "è??æ?¬"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2768
 msgid "Script-Fu Folders"
 msgstr "è??æ?¬æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2770
 msgid "Select Script-Fu Folders"
 msgstr "é??æ?©è??æ?¬æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2752
+#: ../app/dialogs/preferences-dialog.c:2772
 msgid "Module Folders"
 msgstr "模å??æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2754
+#: ../app/dialogs/preferences-dialog.c:2774
 msgid "Select Module Folders"
 msgstr "é??æ?©æ¨¡å??æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2776
 msgid "Interpreters"
 msgstr "解é??å?¨"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2776
 msgid "Interpreter Folders"
 msgstr "解é??å?¨æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2758
+#: ../app/dialogs/preferences-dialog.c:2778
 msgid "Select Interpreter Folders"
 msgstr "é??æ?©è§£é??å?¨æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2780
 msgid "Environment Folders"
 msgstr "ç?¯å¢?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2762
+#: ../app/dialogs/preferences-dialog.c:2782
 msgid "Select Environment Folders"
 msgstr "é??æ?©ç?¯å¢?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2784
 msgid "Themes"
 msgstr "主�"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2784
 msgid "Theme Folders"
 msgstr "主é¢?æ??件夹"
 
-#: ../app/dialogs/preferences-dialog.c:2766
+#: ../app/dialogs/preferences-dialog.c:2786
 msgid "Select Theme Folders"
 msgstr "é??æ?©ä¸»é¢?æ??件夹"
 
@@ -10158,56 +8759,56 @@ msgid "Print Size"
 msgstr "æ??å?°å¤§å°?"
 
 #. the image size labels
-#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:198
-#: ../app/widgets/gimptemplateeditor.c:160
+#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:202
+#: ../app/widgets/gimptemplateeditor.c:161
 msgid "_Width:"
 msgstr "宽度(_W)�"
 
-#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:202
-#: ../app/widgets/gimptemplateeditor.c:167
+#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:206
+#: ../app/widgets/gimptemplateeditor.c:168
 msgid "H_eight:"
 msgstr "�度(_E)�"
 
 #. the resolution labels
-#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:260
-#: ../app/widgets/gimptemplateeditor.c:287
+#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:264
+#: ../app/widgets/gimptemplateeditor.c:288
 msgid "_X resolution:"
-msgstr "_X å??辨ç??ï¼?"
+msgstr "X å??辨ç??(_X)ï¼?"
 
-#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:263
-#: ../app/widgets/gimptemplateeditor.c:294
+#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:267
+#: ../app/widgets/gimptemplateeditor.c:295
 msgid "_Y resolution:"
-msgstr "_Y å??辨ç??ï¼?"
+msgstr "Y å??辨ç??(_Y)ï¼?"
 
-#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:256
-#: ../app/widgets/gimptemplateeditor.c:307
+#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:260
+#: ../app/widgets/gimptemplateeditor.c:308
 #, c-format
 msgid "pixels/%a"
 msgstr "å??ç´ /%a"
 
-#: ../app/dialogs/quit-dialog.c:104
+#: ../app/dialogs/quit-dialog.c:106
 msgid "Quit GIMP"
 msgstr "é??å?º GIMP"
 
-#: ../app/dialogs/quit-dialog.c:104
+#: ../app/dialogs/quit-dialog.c:106
 msgid "Close All Images"
 msgstr "å?³é?­å?¨é?¨å?¾å??"
 
-#: ../app/dialogs/quit-dialog.c:163
+#: ../app/dialogs/quit-dialog.c:165
 msgid "If you quit GIMP now, these changes will be lost."
 msgstr "å¦?æ??æ?¨ç?°å?¨é??å?º GIMPï¼?è¿?äº?æ?´æ?¹å°?ä¼?丢失ã??"
 
-#: ../app/dialogs/quit-dialog.c:166
+#: ../app/dialogs/quit-dialog.c:168
 msgid "If you close these images now, changes will be lost."
 msgstr "å¦?æ??æ?¨ç?°å?¨å?³é?­è¿?äº?å?¾å??ï¼?æ?´æ?¹å°?ä¼?丢失ã??"
 
-#: ../app/dialogs/quit-dialog.c:213
+#: ../app/dialogs/quit-dialog.c:216
 #, c-format
 msgid "There is one image with unsaved changes:"
 msgid_plural "There are %d images with unsaved changes:"
 msgstr[0] "æ?? %d å¹?ä¿®æ?¹å??è¿?没ä¿?å­?ç??å?¾å??ï¼?"
 
-#: ../app/dialogs/quit-dialog.c:235
+#: ../app/dialogs/quit-dialog.c:238
 msgid "_Discard Changes"
 msgstr "��修�(_D)"
 
@@ -10219,11 +8820,11 @@ msgstr "��大�"
 msgid "Layer Size"
 msgstr "��大�"
 
-#: ../app/dialogs/resize-dialog.c:295
+#: ../app/dialogs/resize-dialog.c:294
 msgid "Resize _layers:"
 msgstr "����大�(_L)�"
 
-#: ../app/dialogs/resolution-calibrate-dialog.c:69
+#: ../app/dialogs/resolution-calibrate-dialog.c:70
 msgid "Calibrate Monitor Resolution"
 msgstr "ç??è§?å?¨å??辨ç??æµ?å®?"
 
@@ -10240,67 +8841,67 @@ msgid "_Vertical:"
 msgstr "å??ç?´(_V)ï¼?"
 
 #. Image size frame
-#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:138
+#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:139
 msgid "Image Size"
 msgstr "å?¾å??大å°?"
 
-#: ../app/dialogs/scale-dialog.c:176
+#: ../app/dialogs/scale-dialog.c:175
 msgid "Quality"
 msgstr "è´¨é??"
 
-#: ../app/dialogs/scale-dialog.c:188
+#: ../app/dialogs/scale-dialog.c:187
 msgid "I_nterpolation:"
 msgstr "æ??å?¼(_N)ï¼?"
 
-#: ../app/dialogs/scale-dialog.c:207
+#: ../app/dialogs/scale-dialog.c:206
 msgid ""
 "Indexed color layers are always scaled without interpolation. The chosen "
 "interpolation type will affect channels and layer masks only."
 msgstr "ç´¢å¼?é¢?è?²å?¾å±?缩æ?¾æ?¶æ?»ä¸?æ??å?¼ã??æ??é??ç??æ??å?¼ç±»å??å°?å?ªå½±å??é??é??å??è??æ?¿ã??"
 
-#: ../app/dialogs/stroke-dialog.c:97
+#: ../app/dialogs/stroke-dialog.c:102
 msgid "Choose Stroke Style"
 msgstr "é??æ?©å?¾ç?»ç±»å??"
 
-#: ../app/dialogs/stroke-dialog.c:222
+#: ../app/dialogs/stroke-dialog.c:225
 msgid "Paint tool:"
 msgstr "��工��"
 
-#: ../app/dialogs/stroke-dialog.c:236
+#: ../app/dialogs/stroke-dialog.c:246
 msgid "_Emulate brush dynamics"
 msgstr "模æ??å?¨æ??ç?»ç¬?(_E)"
 
-#: ../app/dialogs/tips-dialog.c:88
+#: ../app/dialogs/tips-dialog.c:89
 msgid "The GIMP tips file is empty!"
 msgstr "GIMP æ??示æ??件为空ï¼?"
 
-#: ../app/dialogs/tips-dialog.c:92
+#: ../app/dialogs/tips-dialog.c:93
 msgid "The GIMP tips file appears to be missing!"
 msgstr "æ?¨ç?? GIMP æ??示æ??件似ä¹?丢äº?ï¼?"
 
-#: ../app/dialogs/tips-dialog.c:94
+#: ../app/dialogs/tips-dialog.c:95
 #, c-format
 msgid "There should be a file called '%s'. Please check your installation."
 msgstr "åº?该å­?å?¨ä¸?个å?«â??%sâ??ç??æ??件ã??请æ£?æ?¥æ?¨ç??å®?è£?ã??"
 
-#: ../app/dialogs/tips-dialog.c:100
+#: ../app/dialogs/tips-dialog.c:101
 msgid "The GIMP tips file could not be parsed!"
 msgstr "æ? æ³?解æ?? GIMP æ??示æ??件ï¼?"
 
-#: ../app/dialogs/tips-dialog.c:128
+#: ../app/dialogs/tips-dialog.c:129
 msgid "GIMP Tip of the Day"
 msgstr "GIMP æ?¥ç§¯æ??ç´¯"
 
-#: ../app/dialogs/tips-dialog.c:134
+#: ../app/dialogs/tips-dialog.c:135
 msgid "_Previous Tip"
 msgstr "å??ä¸?æ?¡æ??示(_P)"
 
-#: ../app/dialogs/tips-dialog.c:140
+#: ../app/dialogs/tips-dialog.c:141
 msgid "_Next Tip"
 msgstr "å??ä¸?æ?¡æ??示(_N)"
 
 #. a link to the related section in the user manual
-#: ../app/dialogs/tips-dialog.c:193
+#: ../app/dialogs/tips-dialog.c:194
 msgid "Learn more"
 msgstr "�解��"
 
@@ -10309,23 +8910,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:187
+#: ../app/dialogs/tips-parser.c:188
 msgid "tips-locale:C"
 msgstr "tips-locale:zh_CN"
 
-#: ../app/dialogs/user-install-dialog.c:84
+#: ../app/dialogs/user-install-dialog.c:85
 msgid "GIMP User Installation"
 msgstr "GIMP ����"
 
-#: ../app/dialogs/user-install-dialog.c:93
+#: ../app/dialogs/user-install-dialog.c:94
 msgid "User installation failed!"
 msgstr "����失败�"
 
-#: ../app/dialogs/user-install-dialog.c:95
+#: ../app/dialogs/user-install-dialog.c:96
 msgid "The GIMP user installation failed; see the log for details."
 msgstr "GIMP ç?¨æ?·å®?è£?失败ï¼?ç»?è??请æ?¥ç??æ?¥å¿?ã??"
 
-#: ../app/dialogs/user-install-dialog.c:98
+#: ../app/dialogs/user-install-dialog.c:99
 msgid "Installation Log"
 msgstr "����"
 
@@ -10346,7 +8947,7 @@ msgid "Import Paths from SVG"
 msgstr "� SVG 导�路�"
 
 #: ../app/dialogs/vectors-import-dialog.c:92
-#: ../app/widgets/gimpprofilechooserdialog.c:131
+#: ../app/widgets/gimpprofilechooserdialog.c:132
 msgid "All files (*.*)"
 msgstr "æ??æ??æ??件(*.*)"
 
@@ -10362,88 +8963,102 @@ msgstr "å??并导å?¥ç??è·¯å¾?(_M)"
 msgid "_Scale imported paths to fit image"
 msgstr "缩æ?¾å¯¼å?¥ç??è·¯å¾?使ä¹?ä¸?å?¾å??å?¹é??(_S)"
 
-#: ../app/dialogs/vectors-options-dialog.c:122
+#: ../app/dialogs/vectors-options-dialog.c:121
 msgid "Path name:"
 msgstr "è·¯å¾?å??å­?ï¼?"
 
-#: ../app/display/gimpcursorview.c:210 ../app/display/gimpcursorview.c:216
-#: ../app/display/gimpcursorview.c:235 ../app/display/gimpcursorview.c:241
-#: ../app/display/gimpcursorview.c:260 ../app/display/gimpcursorview.c:266
-#: ../app/display/gimpcursorview.c:282 ../app/display/gimpcursorview.c:289
-#: ../app/display/gimpcursorview.c:664 ../app/display/gimpcursorview.c:665
-#: ../app/display/gimpcursorview.c:666 ../app/display/gimpcursorview.c:667
-#: ../app/display/gimpcursorview.c:780 ../app/display/gimpcursorview.c:781
-#: ../app/display/gimpcursorview.c:782 ../app/display/gimpcursorview.c:783
-#: ../app/widgets/gimpcolorframe.c:630
-msgid "n/a"
-msgstr "n/a"
+#
+#: ../app/display/display-enums.c:24
+msgid "Tool icon"
+msgstr "工���"
 
-#: ../app/display/gimpcursorview.c:213 ../app/display/gimpcursorview.c:238
-#: ../app/display/gimpcursorview.c:263
-#: ../app/widgets/gimpdeviceinfoeditor.c:140
-msgid "X"
-msgstr "X"
+#
+#: ../app/display/display-enums.c:25
+msgid "Tool icon with crosshair"
+msgstr "带交å??线ç??å·¥å?·å?¾æ ?"
 
-#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244
-#: ../app/display/gimpcursorview.c:269
-#: ../app/widgets/gimpdeviceinfoeditor.c:141
-msgid "Y"
-msgstr "Y"
+#
+#: ../app/display/display-enums.c:26
+msgid "Crosshair only"
+msgstr "ä»?交å??线"
 
-#. Units
-#: ../app/display/gimpcursorview.c:225
-msgid "Units"
-msgstr "å??ä½?"
+#
+#: ../app/display/display-enums.c:85
+msgid "From theme"
+msgstr "å??è?ªä¸»é¢?"
 
-#. Selection Bounding Box
-#: ../app/display/gimpcursorview.c:250
-msgid "Selection Bounding Box"
-msgstr "é??å?ºå??å?´æ¡?"
+#
+#: ../app/display/display-enums.c:86
+msgid "Light check color"
+msgstr "æµ?è?²æ?¹æ ¼ç??é¢?è?²"
 
-#. Width
-#: ../app/display/gimpcursorview.c:286
-msgid "W"
-msgstr "宽"
+#
+#: ../app/display/display-enums.c:87
+msgid "Dark check color"
+msgstr "æ·±è?²æ?¹æ ¼ç??é¢?è?²"
 
-#. Height
-#: ../app/display/gimpcursorview.c:293
-msgid "H"
+#
+#: ../app/display/display-enums.c:88
+msgid "Custom color"
+msgstr "�����"
+
+#
+#: ../app/display/display-enums.c:116
+msgid "No action"
+msgstr "���"
+
+#
+#: ../app/display/display-enums.c:117
+msgid "Pan view"
+msgstr "平移��"
+
+#
+#: ../app/display/display-enums.c:118
+msgid "Switch to Move tool"
+msgstr "å??æ?¢å?°ç§»å?¨å·¥å?·"
+
+#
+#: ../app/display/display-enums.c:145
+msgid "quality|Low"
+msgstr "ä½?"
+
+#
+#: ../app/display/display-enums.c:146
+msgid "quality|High"
 msgstr "é«?"
 
-#: ../app/display/gimpcursorview.c:320
-msgid "_Sample Merged"
-msgstr "ä½?æ ·å??并(_S)"
+#: ../app/display/gimpdisplay-handlers.c:160
+#, c-format
+msgid "Image saved to '%s'"
+msgstr "å?¾å??å·²ä¿?å­?å?°â??%sâ??"
 
-#: ../app/display/gimpdisplayshell.c:499
+#: ../app/display/gimpdisplayshell.c:1035
 msgid "Access the image menu"
 msgstr "æ??ä½?å?¾å??è??å??"
 
-#: ../app/display/gimpdisplayshell.c:613
+#: ../app/display/gimpdisplayshell.c:1140
 msgid "Zoom image when window size changes"
 msgstr "å½?çª?å?£å¤§å°?æ?¹å??æ?¶ç¼©æ?¾å?¾å??"
 
-#: ../app/display/gimpdisplayshell.c:642
-msgid "Toggle Quick Mask"
-msgstr "å??æ?¢å¿«é??è??æ?¿"
-
-#: ../app/display/gimpdisplayshell.c:665
+#: ../app/display/gimpdisplayshell.c:1190
 msgid "Navigate the image display"
 msgstr "导è?ªå?¾å??æ?¾ç¤º"
 
-#: ../app/display/gimpdisplayshell.c:733
-#: ../app/display/gimpdisplayshell.c:1311 ../app/widgets/gimptoolbox.c:315
+#: ../app/display/gimpdisplayshell.c:1285
+#: ../app/display/gimpdisplayshell.c:1375 ../app/widgets/gimptoolbox.c:222
 msgid "Drop image files here to open them"
-msgstr "æ??å?¨å?¾å??å?°æ­¤å¤?以æ??å¼?"
+msgstr "æ??æ?³å?¾å??å?°æ­¤å¤?以æ??å¼?"
 
-#: ../app/display/gimpdisplayshell-close.c:153
-#: ../app/display/gimpdisplayshell-close.c:223
+#: ../app/display/gimpdisplayshell-close.c:147
+#: ../app/display/gimpdisplayshell-close.c:224
 #, c-format
 msgid "Close %s"
 msgstr "�� %s"
 
-#: ../app/display/gimpdisplayshell-close.c:164
-msgid "Close _without Saving"
-msgstr "å?³é?­è??ä¸?ä¿?å­?(_W)"
+#
+#: ../app/display/gimpdisplayshell-close.c:159
+msgid "Do_n't Save"
+msgstr "���(_N)"
 
 #: ../app/display/gimpdisplayshell-close.c:231
 #, c-format
@@ -10474,59 +9089,34 @@ msgid_plural ""
 "If you don't save the image, changes from the last %d minutes will be lost."
 msgstr[0] "å¦?æ??æ?¨ä¸?ä¿?å­?å?¾å??ï¼?æ??è¿? %d å??é??å??ç??æ?´æ?¹å°?ä¼?丢失ã??"
 
-#: ../app/display/gimpdisplayshell-dnd.c:232
-#: ../app/display/gimpdisplayshell-dnd.c:602
-#: ../app/display/gimpdisplayshell-dnd.c:667
+#: ../app/display/gimpdisplayshell-dnd.c:255
+#: ../app/display/gimpdisplayshell-dnd.c:587
+#: ../app/display/gimpdisplayshell-dnd.c:658
 msgid "Drop New Layer"
 msgstr "æ??æ?¾å?¥æ?°å?¾å±?"
 
-#: ../app/display/gimpdisplayshell-dnd.c:275
+#: ../app/display/gimpdisplayshell-dnd.c:301
 msgid "Drop New Path"
 msgstr "æ??æ?¾å?¥æ?°è·¯å¾?"
 
-#: ../app/display/gimpdisplayshell-dnd.c:347
-#: ../app/display/gimpdisplayshell-dnd.c:442 ../app/tools/gimpblendtool.c:174
-#: ../app/tools/gimpbucketfilltool.c:135 ../app/tools/gimpimagemaptool.c:279
-msgid "Cannot modify the pixels of layer groups."
-msgstr "ä¸?è?½ä¿®æ?¹å?¾å±?群ç»?ç??å??ç´ ã??"
-
-#: ../app/display/gimpdisplayshell-dnd.c:355
-#: ../app/display/gimpdisplayshell-dnd.c:450 ../app/tools/gimpblendtool.c:181
-#: ../app/tools/gimpbucketfilltool.c:142 ../app/tools/gimpcroptool.c:335
-#: ../app/tools/gimpimagemaptool.c:286 ../app/tools/gimppainttool.c:286
-#: ../app/tools/gimptransformtool.c:350 ../app/tools/gimptransformtool.c:1178
-msgid "The active layer's pixels are locked."
-msgstr "æ´»å?¨å?¾å±?ç??å??素被é??å®?ã??"
-
-#: ../app/display/gimpdisplayshell-dnd.c:512
-#: ../app/widgets/gimplayertreeview.c:734
+#: ../app/display/gimpdisplayshell-dnd.c:497
+#: ../app/widgets/gimplayertreeview.c:719
 msgid "Drop layers"
 msgstr "æ??æ?¾å?¥å?¾å±?"
 
-#: ../app/display/gimpdisplayshell-dnd.c:635
-#: ../app/display/gimpdisplayshell-dnd.c:657
-#: ../app/widgets/gimplayertreeview.c:811 ../app/widgets/gimptoolbox-dnd.c:274
+#: ../app/display/gimpdisplayshell-dnd.c:648
+#: ../app/widgets/gimplayertreeview.c:801 ../app/widgets/gimptoolbox-dnd.c:361
 msgid "Dropped Buffer"
 msgstr "�����"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:78
+#: ../app/display/gimpdisplayshell-filter-dialog.c:75
 msgid "Color Display Filters"
 msgstr "é¢?è?²æ?¾ç¤ºæ»¤é??"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:81
+#: ../app/display/gimpdisplayshell-filter-dialog.c:78
 msgid "Configure Color Display Filters"
 msgstr "é??ç½®é¢?è?²æ?¾ç¤ºæ»¤é??"
 
-#: ../app/display/gimpdisplayshell-handlers.c:561
-#, c-format
-msgid "Image saved to '%s'"
-msgstr "å?¾å??å·²ä¿?å­?å?°â??%sâ??"
-
-#: ../app/display/gimpdisplayshell-handlers.c:575
-#, c-format
-msgid "Image exported to '%s'"
-msgstr "å?¾å??已导å?ºå?°â??%sâ??"
-
 #: ../app/display/gimpdisplayshell-layer-select.c:120
 msgid "Layer Select"
 msgstr "å?¾å±?é??æ?©"
@@ -10539,79 +9129,93 @@ msgstr "缩æ?¾æ¯?ç??"
 msgid "Select Zoom Ratio"
 msgstr "é??æ?©ç¼©æ?¾æ¯?ç??"
 
-#: ../app/display/gimpdisplayshell-scale-dialog.c:161
+#: ../app/display/gimpdisplayshell-scale-dialog.c:159
 msgid "Zoom ratio:"
 msgstr "缩æ?¾æ¯?ç??ï¼?"
 
-#: ../app/display/gimpdisplayshell-scale-dialog.c:186
+#: ../app/display/gimpdisplayshell-scale-dialog.c:184
 msgid "Zoom:"
 msgstr "缩��"
 
-#: ../app/display/gimpdisplayshell-title.c:303
+#: ../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
 msgid "(modified)"
 msgstr "(已修�)"
 
-#: ../app/display/gimpdisplayshell-title.c:308
+#: ../app/display/gimpdisplayshell-title.c:298
 msgid "(clean)"
 msgstr "(å¹²å??)"
 
-#: ../app/display/gimpdisplayshell-title.c:356
-#: ../app/display/gimpdisplayshell-title.c:369
-#: ../app/widgets/gimpactiongroup.c:870
+#: ../app/display/gimpdisplayshell-title.c:346
+#: ../app/display/gimpdisplayshell-title.c:359
+#: ../app/widgets/gimpactiongroup.c:805
 msgid "(none)"
 msgstr "(æ? )"
 
-#: ../app/display/gimpdisplayshell-title.c:500
-msgid " (exported)"
-msgstr " (已导�)"
-
-#: ../app/display/gimpdisplayshell-title.c:502
-msgid " (overwritten)"
-msgstr " (å·²è¦?ç??)"
-
-#: ../app/display/gimpdisplayshell-title.c:508
-msgid " (imported)"
-msgstr " (已导�)"
-
-#: ../app/display/gimpstatusbar.c:358
+#: ../app/display/gimpstatusbar.c:364
 #, c-format
 msgid "Cancel <i>%s</i>"
 msgstr "å??æ¶? <i>%s</i>"
 
-#: ../app/file/file-open.c:136 ../app/file/file-save.c:112
+#: ../app/file/file-open.c:131 ../app/file/file-save.c:111
+#, c-format
 msgid "Not a regular file"
 msgstr "ä¸?æ?¯æ?®é??æ??件"
 
-#: ../app/file/file-open.c:188
+#: ../app/file/file-open.c:183
 #, c-format
 msgid "%s plug-in returned SUCCESS but did not return an image"
 msgstr "%s æ??件æ??å??è¿?å??(SUCCESS)ä½?没æ??è¿?å??å?¾å??"
 
-#: ../app/file/file-open.c:199
+#: ../app/file/file-open.c:194
 #, c-format
 msgid "%s plug-In could not open image"
 msgstr "%s æ??件æ? æ³?æ??å¼?å?¾å??"
 
-#: ../app/file/file-open.c:518
+#: ../app/file/file-open.c:455
+#, c-format
 msgid "Image doesn't contain any layers"
 msgstr "å?¾å??没æ??å??å?«ä»»ä½?å?¾å±?"
 
-#: ../app/file/file-open.c:571
+#: ../app/file/file-open.c:505
 #, c-format
 msgid "Opening '%s' failed: %s"
 msgstr "æ??å¼?â??%sâ??失败ï¼?%s"
 
-#: ../app/file/file-open.c:678
+#: ../app/file/file-open.c:613
 msgid ""
 "Color management has been disabled. It can be enabled again in the "
 "Preferences dialog."
 msgstr "è?²å½©ç®¡ç??已被ç¦?ç?¨ã??å®?å?¯ä»¥å?¨é¦?é??项对è¯?æ¡?æ?¯è¢«å??次å?¯ç?¨ã??"
 
-#: ../app/file/file-procedure.c:198
+#: ../app/file/file-procedure.c:200
+#, c-format
 msgid "Unknown file type"
 msgstr "æ?ªç?¥æ??件类å??"
 
-#: ../app/file/file-save.c:189
+#: ../app/file/file-save.c:192
 #, c-format
 msgid "%s plug-in could not save image"
 msgstr "%s æ??件æ? æ³?ä¿?å­?å?¾å??"
@@ -10621,412 +9225,353 @@ msgstr "%s æ??件æ? æ³?ä¿?å­?å?¾å??"
 msgid "'%s:' is not a valid URI scheme"
 msgstr "â??%s:â??ä¸?æ?¯å??æ³?ç?? URI æ ¼å¼?"
 
-#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126
+#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:122
+#, c-format
 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:399 ../app/gegl/gimplevelsconfig.c:710
+#: ../app/gegl/gimpcurvesconfig.c:398 ../app/gegl/gimplevelsconfig.c:711
+#, c-format
 msgid "parse error"
 msgstr "解æ??é??误"
 
-#: ../app/gegl/gimplevelsconfig.c:663
+#: ../app/gegl/gimplevelsconfig.c:664
+#, c-format
 msgid "not a GIMP Levels file"
 msgstr "ä¸?æ?¯ GIMP è?²é?¶æ??件"
 
 #. initialize the document history
-#: ../app/gui/gui.c:427
+#: ../app/gui/gui.c:426
 msgid "Documents"
 msgstr "æ??æ¡£"
 
-#: ../app/gui/splash.c:114
+#: ../app/gui/splash.c:116
 msgid "GIMP Startup"
 msgstr "GIMP ��"
 
-#: ../app/paint/gimpairbrush.c:72 ../app/tools/gimpairbrushtool.c:53
+#: ../app/paint/gimpairbrush.c:69 ../app/tools/gimpairbrushtool.c:54
 msgid "Airbrush"
 msgstr "å?·æ?ª"
 
-#: ../app/paint/gimpbrushcore.c:435
+#: ../app/paint/gimpbrushcore.c:353
+#, c-format
 msgid "No brushes available for use with this tool."
 msgstr "没æ??å?¯ä¾?此工å?·ä½¿ç?¨ç??ç?»ç¬?ã??"
 
-#: ../app/paint/gimpbrushcore.c:442
-msgid "No paint dynamics available for use with this tool."
-msgstr "没æ??å?¯ä¾?此工å?·ä½¿ç?¨ç??å?¨æ??ã??"
-
-#: ../app/paint/gimpclone.c:102 ../app/tools/gimpclonetool.c:60
+#: ../app/paint/gimpclone.c:99 ../app/tools/gimpclonetool.c:61
 msgid "Clone"
 msgstr "å??é??"
 
-#: ../app/paint/gimpclone.c:143
+#: ../app/paint/gimpclone.c:140
+#, c-format
 msgid "No patterns available for use with this tool."
 msgstr "没æ??å?¯ä¾?此工å?·ä½¿ç?¨ç??å?¾æ¡?ã??"
 
-#: ../app/paint/gimpconvolve.c:80
+#: ../app/paint/gimpconvolve.c:77
 msgid "Convolve"
 msgstr "�积"
 
-#: ../app/paint/gimpdodgeburn.c:91
+#: ../app/paint/gimpdodgeburn.c:87
 msgid "Dodge/Burn"
 msgstr "å??æ·¡/å? æ·±"
 
-#: ../app/paint/gimperaser.c:65 ../app/tools/gimperasertool.c:65
+#: ../app/paint/gimperaser.c:62 ../app/tools/gimperasertool.c:66
 msgid "Eraser"
 msgstr "æ©¡ç?®"
 
-#: ../app/paint/gimpheal.c:118 ../app/tools/gimphealtool.c:52
+#: ../app/paint/gimpheal.c:115 ../app/tools/gimphealtool.c:53
 msgid "Heal"
 msgstr "å¤?å??"
 
-#: ../app/paint/gimpheal.c:157
+#: ../app/paint/gimpheal.c:154
+#, c-format
 msgid "Healing does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?å¤?å??æ??ä½?ã??"
 
-#: ../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:65 ../app/tools/gimppaintbrushtool.c:50
+#: ../app/paint/gimppaintbrush.c:63 ../app/tools/gimppaintbrushtool.c:51
 msgid "Paintbrush"
 msgstr "��"
 
-#: ../app/paint/gimppaintcore-stroke.c:335
+#: ../app/paint/gimppaintcore-stroke.c:332
+#, c-format
 msgid "Not enough points to stroke"
 msgstr "ä¸?足å¤?ç??ç¬?ç?»ç?¹"
 
-#: ../app/paint/gimppaintcore.c:140
-msgid "Paint"
-msgstr "��"
-
-#: ../app/paint/gimppaintoptions.c:138
-msgid "Brush Scale"
-msgstr "��缩�"
-
-#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50
+#: ../app/paint/gimppencil.c:42 ../app/tools/gimppenciltool.c:51
 msgid "Pencil"
 msgstr "é??ç¬?"
 
-#: ../app/paint/gimpperspectiveclone.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:128
+#: ../app/paint/gimpperspectiveclone.c:97 ../app/paint/paint-enums.c:52
+#: ../app/tools/gimpperspectiveclonetool.c:126
 msgid "Perspective Clone"
 msgstr "é??è§?å??é??"
 
-#: ../app/paint/gimpperspectiveclone.c:163
+#: ../app/paint/gimpperspectiveclone.c:162
+#, c-format
 msgid "Perspective Clone does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?é??è§?å??é??æ??ä½?ã??"
 
-#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:52
+#: ../app/paint/gimpsmudge.c:78 ../app/tools/gimpsmudgetool.c:53
 msgid "Smudge"
 msgstr "��"
 
-#: ../app/paint/gimpsourcecore.c:232
+#: ../app/paint/gimpsourcecore.c:227
+#, c-format
 msgid "Set a source image first."
 msgstr "å??设置æº?å?¾å??ã??"
 
-#: ../app/paint/paint-enums.c:52
-msgctxt "perspective-clone-mode"
+#
+#: ../app/paint/paint-enums.c:51
 msgid "Modify Perspective"
 msgstr "ä¿®æ?¹é??è§?"
 
-#: ../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"
+#
+#: ../app/paint/paint-enums.c:82
 msgid "Aligned"
 msgstr "已对�"
 
-#: ../app/paint/paint-enums.c:85
-msgctxt "source-align-mode"
+#
+#: ../app/paint/paint-enums.c:83
 msgid "Registered"
 msgstr "已记�"
 
-#: ../app/paint/paint-enums.c:86
-msgctxt "source-align-mode"
+#
+#: ../app/paint/paint-enums.c:84
 msgid "Fixed"
 msgstr "��"
 
-#: ../app/paint/paint-enums.c:114
-msgctxt "convolve-type"
+#
+#: ../app/paint/paint-enums.c:111
 msgid "Blur"
 msgstr "模�"
 
-#: ../app/paint/paint-enums.c:115
-msgctxt "convolve-type"
+#
+#: ../app/paint/paint-enums.c:112
 msgid "Sharpen"
 msgstr "é??å??"
 
-#: ../app/pdb/channel-cmds.c:182
+#: ../app/pdb/channel-cmds.c:183
 msgid "Combine Masks"
 msgstr "ç»?å??è??ç??"
 
-#: ../app/pdb/drawable-cmds.c:474
-msgid "Plug-In"
-msgstr "æ??件"
-
-#: ../app/pdb/drawable-transform-cmds.c:319
-#: ../app/pdb/drawable-transform-cmds.c:406
-#: ../app/pdb/item-transform-cmds.c:256 ../app/pdb/transform-tools-cmds.c:153
-#: ../app/tools/gimpperspectivetool.c:69
+#: ../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
 msgid "Perspective"
 msgstr "é??è§?"
 
-#: ../app/pdb/drawable-transform-cmds.c:862
-#: ../app/pdb/drawable-transform-cmds.c:936
-#: ../app/pdb/item-transform-cmds.c:597 ../app/pdb/transform-tools-cmds.c:375
-#: ../app/tools/gimpsheartool.c:110
+#: ../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
 msgid "Shearing"
 msgstr "å??å??"
 
-#: ../app/pdb/drawable-transform-cmds.c:1023
-#: ../app/pdb/item-transform-cmds.c:693 ../app/pdb/transform-tools-cmds.c:453
+#: ../app/pdb/drawable-transform-cmds.c:989
+#: ../app/pdb/transform-tools-cmds.c:438
 msgid "2D Transform"
 msgstr "2D å??æ?¢"
 
-#: ../app/pdb/drawable-transform-cmds.c:1108
-#: ../app/pdb/drawable-transform-cmds.c:1203
-#: ../app/pdb/drawable-transform-cmds.c:1296
-#: ../app/pdb/item-transform-cmds.c:797
+#: ../app/pdb/drawable-transform-cmds.c:1072
+#: ../app/pdb/drawable-transform-cmds.c:1165
+#: ../app/pdb/drawable-transform-cmds.c:1256
 msgid "2D Transforming"
 msgstr "2D å??æ?¢"
 
-#: ../app/pdb/edit-cmds.c:725 ../app/tools/gimpblendtool.c:243
+#: ../app/pdb/edit-cmds.c:709 ../app/tools/gimpblendtool.c:225
 msgid "Blending"
 msgstr "æ··å??"
 
-#: ../app/pdb/floating-sel-cmds.c:64
+#: ../app/pdb/floating-sel-cmds.c:63
+#, c-format
 msgid "Cannot remove this layer because it is not a floating selection."
 msgstr "æ? æ³?å?ºå®?æ­¤å?¾å±?ï¼?å? ä¸ºå®?ä¸?æ?¯ä¸?个浮å?¨é??å?ºã??"
 
-#: ../app/pdb/floating-sel-cmds.c:96
+#: ../app/pdb/floating-sel-cmds.c:95
+#, c-format
 msgid "Cannot anchor this layer because it is not a floating selection."
 msgstr "æ? æ³?å?ºå®?æ­¤å?¾å±?ï¼?å? ä¸ºå®?ä¸?æ?¯ä¸?个浮å?¨é??å?ºã??"
 
-#: ../app/pdb/floating-sel-cmds.c:128
+#: ../app/pdb/floating-sel-cmds.c:127
+#, c-format
 msgid ""
 "Cannot convert this layer to a normal layer because it is not a floating "
 "selection."
 msgstr "æ? æ³?å?ºå®?æ­¤å?¾å±?ï¼?å? ä¸ºå®?ä¸?æ?¯ä¸?个浮å?¨é??å?ºã??"
 
-#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:306
-#: ../app/pdb/gimppdb.c:376
+#: ../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
 #, c-format
 msgid "Procedure '%s' not found"
 msgstr "â??%sâ??è¿?ç¨?æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:73
+#: ../app/pdb/gimppdb-utils.c:61
+#, c-format
 msgid "Invalid empty brush name"
 msgstr "æ? æ??ç??ç?»ç¬?å??称"
 
-#: ../app/pdb/gimppdb-utils.c:82
+#: ../app/pdb/gimppdb-utils.c:71
 #, c-format
 msgid "Brush '%s' not found"
 msgstr "â??%sâ??ç?»ç¬?æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:87
+#: ../app/pdb/gimppdb-utils.c:76
 #, c-format
 msgid "Brush '%s' is not editable"
 msgstr "â??%sâ??ç?»ç¬?ä¸?å?¯ç¼?è¾?"
 
-#: ../app/pdb/gimppdb-utils.c:113
+#: ../app/pdb/gimppdb-utils.c:102
 #, c-format
 msgid "Brush '%s' is not a generated brush"
 msgstr "â??%sâ??ä¸?æ?¯ä¸?个被ç??æ??ç??ç?»ç¬?"
 
-#: ../app/pdb/gimppdb-utils.c:133
+#: ../app/pdb/gimppdb-utils.c:122
+#, c-format
 msgid "Invalid empty pattern name"
 msgstr "æ? æ??ç??纹ç??å??称"
 
-#: ../app/pdb/gimppdb-utils.c:142
+#: ../app/pdb/gimppdb-utils.c:132
 #, c-format
 msgid "Pattern '%s' not found"
 msgstr "â??%sâ??å?¾æ¡?æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:162
+#: ../app/pdb/gimppdb-utils.c:152
+#, c-format
 msgid "Invalid empty gradient name"
 msgstr "æ? æ??ç??空æ¸?å??å??称"
 
-#: ../app/pdb/gimppdb-utils.c:171
+#: ../app/pdb/gimppdb-utils.c:162
 #, c-format
 msgid "Gradient '%s' not found"
 msgstr "â??%sâ??æ¸?å??æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:176
+#: ../app/pdb/gimppdb-utils.c:167
 #, c-format
 msgid "Gradient '%s' is not editable"
 msgstr "â??%sâ??æ¸?å??ä¸?å?¯ç¼?è¾?"
 
-#: ../app/pdb/gimppdb-utils.c:197
+#: ../app/pdb/gimppdb-utils.c:188
+#, c-format
 msgid "Invalid empty palette name"
 msgstr "æ? æ??ç??空è?²ç??å??称"
 
-#: ../app/pdb/gimppdb-utils.c:206
+#: ../app/pdb/gimppdb-utils.c:198
 #, c-format
 msgid "Palette '%s' not found"
 msgstr "â??%sâ??è?²æ?¿æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:211
+#: ../app/pdb/gimppdb-utils.c:203
 #, c-format
 msgid "Palette '%s' is not editable"
 msgstr "â??%sâ??è?²æ?¿ä¸?å?¯ç¼?è¾?"
 
-#: ../app/pdb/gimppdb-utils.c:231
+#: ../app/pdb/gimppdb-utils.c:223
+#, c-format
 msgid "Invalid empty font name"
 msgstr "æ? æ??ç??å­?ä½?å??称"
 
-#: ../app/pdb/gimppdb-utils.c:241
+#: ../app/pdb/gimppdb-utils.c:233
 #, c-format
 msgid "Font '%s' not found"
 msgstr "â??%sâ??å­?ä½?æ?ªæ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:260
+#: ../app/pdb/gimppdb-utils.c:252
+#, c-format
 msgid "Invalid empty buffer name"
 msgstr "æ? æ??ç??ç¼?å­?åº?å??称"
 
-#: ../app/pdb/gimppdb-utils.c:270
+#: ../app/pdb/gimppdb-utils.c:262
 #, c-format
 msgid "Named buffer '%s' not found"
 msgstr "â??%sâ??ç¼?å­?åº?没æ?¾å?°"
 
-#: ../app/pdb/gimppdb-utils.c:289
+#: ../app/pdb/gimppdb-utils.c:281
+#, c-format
 msgid "Invalid empty paint method name"
 msgstr "æ? æ??ç??ç»?å?¾æ?¹å¼?"
 
-#: ../app/pdb/gimppdb-utils.c:299
+#: ../app/pdb/gimppdb-utils.c:291
 #, c-format
 msgid "Paint method '%s' does not exist"
 msgstr "â??%sâ??ç»?å?¾æ?¹å¼?ä¸?å­?å?¨"
 
-#: ../app/pdb/gimppdb-utils.c:318
-#, fuzzy, c-format
-msgid "Item '%s' (%d) cannot be used because it has not been added to an image"
-msgstr "â??%sâ??(%d)ä¸?å?¯ç?¨ï¼?å? ä¸ºå®?æ?ªè¢«æ·»å? è?³å?¾å??"
-
-#: ../app/pdb/gimppdb-utils.c:328
-#, fuzzy, c-format
-msgid "Item '%s' (%d) cannot be used because it is attached to another image"
-msgstr "â??%sâ??(%d)ä¸?å?¯ç?¨ï¼?å? ä¸ºå®?æ?ªè¢«æ·»å? è?³å?¾å??"
-
-#: ../app/pdb/gimppdb-utils.c:357
-#, fuzzy, c-format
-msgid ""
-"Item '%s' (%d) cannot be used because it is not a direct child of an item "
-"tree"
-msgstr "â??%sâ??(%d)ä¸?å?¯ç?¨ï¼?å? ä¸ºå®?æ?ªè¢«æ·»å? è?³å?¾å??"
-
-#: ../app/pdb/gimppdb-utils.c:385
-#, fuzzy, c-format
-msgid ""
-"Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of "
-"the same item tree"
-msgstr "â??%sâ??(%d)ä¸?å?¯ç?¨ï¼?å? ä¸ºå®?æ?ªè¢«æ·»å? è?³å?¾å??"
-
-#: ../app/pdb/gimppdb-utils.c:410
+#: ../app/pdb/gimppdb-utils.c:307
 #, c-format
-msgid "Item '%s' (%d) must not be an ancestor of '%s' (%d)"
-msgstr ""
+msgid ""
+"Item '%s' (%d) can not be used because it has not been added to an image"
+msgstr "â??%sâ?? (%d)ä¸?å?¯ç?¨ï¼?å? ä¸ºå®?æ?ªè¢«æ·»å? è?³å?¾å??"
 
-#: ../app/pdb/gimppdb-utils.c:434
+#: ../app/pdb/gimppdb-utils.c:329
 #, c-format
 msgid "Item '%s' (%d) has already been added to an image"
-msgstr "â??%sâ??(%d)已被添å? è?³å?¾å??"
+msgstr "â??%sâ?? (%d)已被添å? è?³å?¾å??"
 
-#: ../app/pdb/gimppdb-utils.c:442
+#: ../app/pdb/gimppdb-utils.c:337
 #, c-format
 msgid "Trying to add item '%s' (%d) to wrong image"
-msgstr "è¯?å?¾æ·»å? â??%sâ??(%d)å?°é??误ç??å?¾å??"
+msgstr "è¯?å?¾æ·»å? â??%sâ?? (%d)å?°é??误ç??å?¾å??"
 
-#: ../app/pdb/gimppdb-utils.c:461
+#: ../app/pdb/gimppdb-utils.c:356
 #, c-format
-msgid "Item '%s' (%d) cannot be modified because its contents are locked"
-msgstr "â??%sâ??(%d)ä¸?è?½è¢«ä¿®æ?¹ï¼?å? ä¸ºå®?ç??å??容被é??å®?"
+msgid "Layer '%s' (%d) can not be used because it is not a text layer"
+msgstr "â??%sâ?? (%d)å?¾å±?ä¸?è?½è¢«ä½¿ç?¨ï¼?å®?ä¸?æ?¯ä¸?个æ??å­?å?¾å±?"
 
-#: ../app/pdb/gimppdb-utils.c:481
-#, fuzzy, c-format
-msgid "Item '%s' (%d) cannot be used because it is not a group item"
-msgstr "â??%sâ??(%d)ä¸?è?½è¢«ä¿®æ?¹ï¼?å? ä¸ºå®?æ?¯ç¾¤ç»?项ç?®"
-
-#: ../app/pdb/gimppdb-utils.c:501
-#, c-format
-msgid "Item '%s' (%d) cannot be modified because it is a group item"
-msgstr "â??%sâ??(%d)ä¸?è?½è¢«ä¿®æ?¹ï¼?å? ä¸ºå®?æ?¯ç¾¤ç»?项ç?®"
-
-#: ../app/pdb/gimppdb-utils.c:522
-#, fuzzy, c-format
-msgid "Layer '%s' (%d) cannot be used because it is not a text layer"
-msgstr "â??%sâ??(%d)å?¾å±?ä¸?è?½è¢«ä½¿ç?¨ï¼?å®?ä¸?æ?¯ä¸?个æ??å­?å?¾å±?"
-
-#: ../app/pdb/gimppdb-utils.c:563
+#: ../app/pdb/gimppdb-utils.c:401
 #, 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:586
+#: ../app/pdb/gimppdb-utils.c:430
 #, c-format
 msgid "Image '%s' (%d) is already of type '%s'"
-msgstr "â??%sâ??(%d)å?¾å??å·²ç»?æ?¯â??%sâ??ç±»"
+msgstr "â??%sâ?? (%d)å?¾å??å·²ç»?æ?¯â??%sâ??ç±»"
 
-#: ../app/pdb/gimppdb-utils.c:614
+#: ../app/pdb/gimppdb-utils.c:455
 #, c-format
 msgid "Vectors object %d does not contain stroke with ID %d"
 msgstr "ç?¢é??对象â??%dâ??ä¸?å??æ?¬ID为â??%dâ??ç??ç¬?ç?»"
 
-#: ../app/pdb/gimppdb.c:410
+#: ../app/pdb/gimppdb.c:411
 #, c-format
 msgid ""
-"Procedure '%s' has been called with a wrong type for argument #%d. Expected "
-"%s, got %s."
+"Procedure '%s' has been called with a wrong type for argument #%d. Expected %"
+"s, got %s."
 msgstr "è°?ç?¨â??%sâ??è¿?ç¨?使ç?¨äº?é??误ç??å?¼ç±»å??ç?¨äº?å??æ?° #%dã??é??è¦? %sï¼?ä½?è?·å¾? %sã??"
 
-#: ../app/pdb/gimppdbcontext.c:78
-#: ../app/tools/gimpforegroundselectoptions.c:78
-#: ../app/tools/gimpselectionoptions.c:78
-msgid "Smooth edges"
-msgstr "边�平�"
-
-#: ../app/pdb/gimpprocedure.c:371 ../app/plug-in/gimppluginprocframe.c:208
+#: ../app/pdb/gimpprocedure.c:361 ../app/plug-in/gimppluginprocframe.c:209
 #, c-format
 msgid "Procedure '%s' returned no return values"
 msgstr "â??%sâ??è¿?ç¨?æ? è¿?å??å?¼"
 
-#: ../app/pdb/gimpprocedure.c:634
+#: ../app/pdb/gimpprocedure.c:585
 #, 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ã??"
 
-#: ../app/pdb/gimpprocedure.c:646
+#: ../app/pdb/gimpprocedure.c:597
 #, c-format
 msgid ""
-"Procedure '%s' has been called with a wrong value type for argument '%s' (#"
-"%d). Expected %s, got %s."
+"Procedure '%s' has been called with a wrong value type for argument '%s' (#%"
+"d). Expected %s, got %s."
 msgstr "è°?ç?¨â??%sâ??è¿?ç¨?使ç?¨äº?é??误ç??å?¼ç±»å??ç?¨äº?å??æ?°â??%sâ??(#%d)ã??é??è¦? %sï¼?ä½?è?·å¾? %sã??"
 
-#: ../app/pdb/gimpprocedure.c:678
+#: ../app/pdb/gimpprocedure.c:629
 #, c-format
 msgid ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
@@ -11035,7 +9580,7 @@ msgstr ""
 "â??%sâ??è¿?ç¨?对äº?â??%sâ??å??æ?°è¿?å??äº?æ? æ??ç?? IDã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?å??å­?å?¨"
 "ç??å?¾å±?ã??"
 
-#: ../app/pdb/gimpprocedure.c:690
+#: ../app/pdb/gimpprocedure.c:641
 #, c-format
 msgid ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
@@ -11044,7 +9589,7 @@ msgstr ""
 "è°?ç?¨â??%sâ??è¿?ç¨?使ç?¨äº?æ? æ??ç?? ID ç?¨äº?â??%sâ??å??æ?°ã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?"
 "å??å­?å?¨ç??å?¾å±?ã??"
 
-#: ../app/pdb/gimpprocedure.c:706
+#: ../app/pdb/gimpprocedure.c:657
 #, c-format
 msgid ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
@@ -11053,7 +9598,7 @@ msgstr ""
 "â??%sâ??è¿?ç¨?è¿?å??äº?æ? æ??ç?? ID ç?¨äº?â??%sâ??å??æ?°ã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?å??å­?"
 "å?¨ç??å?¾å??ã??"
 
-#: ../app/pdb/gimpprocedure.c:718
+#: ../app/pdb/gimpprocedure.c:669
 #, c-format
 msgid ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
@@ -11062,104 +9607,66 @@ msgstr ""
 "è°?ç?¨â??%sâ??è¿?ç¨?使ç?¨äº?æ? æ??ç?? ID ç?¨äº?â??%sâ??å??æ?°ã??å¾?æ??å?¯è?½æ?¯æ??件正å?¨è¯?å?¾æ??ä½?ä¸?个已ä¸?"
 "å??å­?å?¨ç??å?¾å??ã??"
 
-#: ../app/pdb/gimpprocedure.c:738
+#: ../app/pdb/gimpprocedure.c:689
 #, 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 ç±»å??)ã??æ­¤å?¼è¶?å?ºè??å?´ã??"
 
-#: ../app/pdb/gimpprocedure.c:751
+#: ../app/pdb/gimpprocedure.c:702
 #, c-format
 msgid ""
-"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type "
-"%s). This value is out of range."
+"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 ç±»å??)ã??æ­¤å?¼è¶?å?ºè??å?´ã??"
 
-#: ../app/pdb/image-cmds.c:2650
+#: ../app/pdb/image-cmds.c:2268
+#, c-format
 msgid ""
 "Image resolution is out of bounds, using the default resolution instead."
 msgstr "å?¾å??å??辨ç??è¶?å?ºè??å?´ï¼?使ç?¨é»?认ç??å??辨ç??æ?¿ä»£ã??"
 
-#: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516
-msgid "Move Layer"
-msgstr "移���"
-
-#: ../app/pdb/selection-tools-cmds.c:217 ../app/tools/gimpfreeselecttool.c:199
+#: ../app/pdb/selection-tools-cmds.c:218 ../app/tools/gimpfreeselecttool.c:197
 msgid "Free Select"
 msgstr "è?ªç?±é??æ?©"
 
-#: ../app/pdb/text-layer-cmds.c:89
+#: ../app/pdb/text-layer-cmds.c:90
 #, c-format
 msgid "Failed to create text layer"
 msgstr "å??建æ??å­?å?¾å±?失败"
 
-#: ../app/pdb/text-layer-cmds.c:162 ../app/pdb/text-layer-cmds.c:272
-#: ../app/pdb/text-layer-cmds.c:351 ../app/pdb/text-layer-cmds.c:424
-#: ../app/pdb/text-layer-cmds.c:496 ../app/pdb/text-layer-cmds.c:568
-#: ../app/pdb/text-layer-cmds.c:640 ../app/pdb/text-layer-cmds.c:712
-#: ../app/pdb/text-layer-cmds.c:784 ../app/pdb/text-layer-cmds.c:854
-#: ../app/pdb/text-layer-cmds.c:926 ../app/pdb/text-layer-cmds.c:998
-#: ../app/pdb/text-layer-cmds.c:1070 ../app/pdb/text-layer-cmds.c:1106
-#: ../app/pdb/text-layer-cmds.c:1185
+#: ../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
 msgid "Set text layer attribute"
 msgstr "设å®?æ??å­?å?¾å±?å±?æ?§"
 
-#: ../app/pdb/vectors-cmds.c:323
-msgid "Remove path stroke"
-msgstr "å? é?¤è·¯å¾?ç¬?å??"
-
-#: ../app/pdb/vectors-cmds.c:359
-msgid "Close path stroke"
-msgstr "é?­å??è·¯å¾?ç¬?å??"
-
-#: ../app/pdb/vectors-cmds.c:399
-msgid "Translate path stroke"
-msgstr "转æ?¢è·¯å¾?ç¬?å??"
-
-#: ../app/pdb/vectors-cmds.c:439
-msgid "Scale path stroke"
-msgstr "缩æ?¾è·¯å¾?ç¬?å??"
-
-#: ../app/pdb/vectors-cmds.c:481
-msgid "Rotate path stroke"
-msgstr "æ??转路å¾?ç¬?å??"
-
-#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565
-msgid "Flip path stroke"
-msgstr "翻转路å¾?ç¬?å??"
-
-#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:816
-#: ../app/pdb/vectors-cmds.c:1035
-msgid "Add path stroke"
-msgstr "æ·»å? è·¯å¾?ç¬?å??"
-
-#: ../app/pdb/vectors-cmds.c:868 ../app/pdb/vectors-cmds.c:921
-#: ../app/pdb/vectors-cmds.c:982
-msgid "Extend path stroke"
-msgstr "延伸路å¾?ç¬?å??"
-
-#: ../app/plug-in/gimpenvirontable.c:281
+#: ../app/plug-in/gimpenvirontable.c:282
 #, c-format
 msgid "Empty variable name in environment file %s"
 msgstr "ç?¯å¢?æ??件 %s 中å?«æ??空å??é??å??"
 
-#: ../app/plug-in/gimpenvirontable.c:299
+#: ../app/plug-in/gimpenvirontable.c:300
 #, c-format
 msgid "Illegal variable name in environment file %s: %s"
 msgstr "ç?¯å¢?æ??件 %s 中å?«æ??é??æ³?å??é??å??ï¼?%s"
 
-#: ../app/plug-in/gimpinterpreterdb.c:263
+#: ../app/plug-in/gimpinterpreterdb.c:264
 #, c-format
 msgid "Bad interpreter referenced in interpreter file %s: %s"
 msgstr "解é??å?¨æ??件 %s 中å¼?ç?¨ç??é??误ç??解é??å?¨ï¼?%s"
 
-#: ../app/plug-in/gimpinterpreterdb.c:322
+#: ../app/plug-in/gimpinterpreterdb.c:323
 #, c-format
 msgid "Bad binary format string in interpreter file %s"
 msgstr "解é??å?¨æ??件 %s 中ç??é??误ç??äº?è¿?å?¶æ ¼å¼?串"
 
-#: ../app/plug-in/gimpplugin-message.c:450
+#: ../app/plug-in/gimpplugin-message.c:423
 #, c-format
 msgid ""
 "Calling error for procedure '%s':\n"
@@ -11168,7 +9675,7 @@ msgstr ""
 "â??%sâ??è¿?ç¨?è°?ç?¨é??误ï¼?\n"
 "%s"
 
-#: ../app/plug-in/gimpplugin-message.c:459
+#: ../app/plug-in/gimpplugin-message.c:432
 #, c-format
 msgid ""
 "Execution error for procedure '%s':\n"
@@ -11177,7 +9684,7 @@ msgstr ""
 "â??%sâ??è¿?ç¨?æ?§è¡?é??误ï¼?\n"
 "%s"
 
-#: ../app/plug-in/gimpplugin-progress.c:331
+#: ../app/plug-in/gimpplugin-progress.c:330
 msgid "Cancelled"
 msgstr "å·²å??æ¶?"
 
@@ -11203,35 +9710,35 @@ msgstr ""
 msgid "Failed to run plug-in \"%s\""
 msgstr "â??%sâ??æ??件å?¯ç?¨å¤±è´¥"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:230
+#: ../app/plug-in/gimppluginmanager-restore.c:222
 msgid "Searching Plug-Ins"
 msgstr "æ­£å?¨æ??ç´¢æ??件"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:279
+#: ../app/plug-in/gimppluginmanager-restore.c:271
 msgid "Resource configuration"
 msgstr "èµ?æº?é??ç½®"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:315
+#: ../app/plug-in/gimppluginmanager-restore.c:307
 msgid "Querying new Plug-ins"
 msgstr "æ­£å?¨æ?¥è¯¢æ?°ç??æ??件"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:365
+#: ../app/plug-in/gimppluginmanager-restore.c:357
 msgid "Initializing Plug-ins"
 msgstr "æ­£å?¨å??å§?å??æ??件"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:437
+#: ../app/plug-in/gimppluginmanager-restore.c:429
 msgid "Starting Extensions"
 msgstr "正�����"
 
-#: ../app/plug-in/gimppluginmanager.c:297
+#: ../app/plug-in/gimppluginmanager.c:290
 msgid "Plug-In Interpreters"
 msgstr "æ??件解é??å?¨"
 
-#: ../app/plug-in/gimppluginmanager.c:304
+#: ../app/plug-in/gimppluginmanager.c:297
 msgid "Plug-In Environment"
 msgstr "æ??件ç?¯å¢?"
 
-#: ../app/plug-in/gimppluginprocedure.c:995
+#: ../app/plug-in/gimppluginprocedure.c:989
 #, c-format
 msgid ""
 "Calling error for '%s':\n"
@@ -11240,7 +9747,7 @@ msgstr ""
 "é??误: '%s':\n"
 "%s"
 
-#: ../app/plug-in/gimppluginprocedure.c:1007
+#: ../app/plug-in/gimppluginprocedure.c:1001
 #, c-format
 msgid ""
 "Execution error for '%s':\n"
@@ -11249,38 +9756,38 @@ msgstr ""
 "æ?§è¡?â??%sâ??å?ºé??ï¼?\n"
 "%s"
 
-#: ../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
+#: ../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
 #, c-format
 msgid "Error running '%s'"
 msgstr "è¿?è¡?â??%sâ??æ?¶å?ºé??"
 
-#: ../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
+#: ../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
 #, c-format
 msgid "Plug-In missing (%s)"
 msgstr "æ??件缺失(%s)"
 
-#: ../app/plug-in/plug-in-rc.c:205
+#: ../app/plug-in/plug-in-rc.c:206
 #, c-format
 msgid "Skipping '%s': wrong GIMP protocol version."
 msgstr "è·³è¿?â??%sâ??ï¼?é??误ç?? GIMP å??è®®ç??æ?¬ã??"
 
-#: ../app/plug-in/plug-in-rc.c:478
+#: ../app/plug-in/plug-in-rc.c:479
 #, c-format
 msgid "invalid value '%s' for icon type"
 msgstr "å?¾æ ?ç±»å??â??%sâ??æ? æ??"
 
-#: ../app/plug-in/plug-in-rc.c:493
+#: ../app/plug-in/plug-in-rc.c:494
 #, 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:43
+#: ../app/text/gimpfont.c:45
 msgid ""
 "Pack my box with\n"
 "five dozen liquor jugs."
@@ -11288,51 +9795,51 @@ msgstr ""
 "Pack my box with\n"
 "five dozen liquor jugs."
 
-#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:1386
+#: ../app/text/gimptext-compat.c:108 ../app/tools/gimptexttool.c:901
 msgid "Add Text Layer"
 msgstr "æ·»å? æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:141
+#: ../app/text/gimptextlayer.c:138
 msgid "Text Layer"
 msgstr "æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:142
+#: ../app/text/gimptextlayer.c:139
 msgid "Rename Text Layer"
 msgstr "é??å?½å??æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:143
+#: ../app/text/gimptextlayer.c:140
 msgid "Move Text Layer"
 msgstr "移å?¨æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:144
+#: ../app/text/gimptextlayer.c:141
 msgid "Scale Text Layer"
 msgstr "缩æ?¾æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:145
+#: ../app/text/gimptextlayer.c:142
 msgid "Resize Text Layer"
 msgstr "æ?¹å??æ??å­?å?¾å±?大å°?"
 
-#: ../app/text/gimptextlayer.c:146
+#: ../app/text/gimptextlayer.c:143
 msgid "Flip Text Layer"
 msgstr "翻转æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:147
+#: ../app/text/gimptextlayer.c:144
 msgid "Rotate Text Layer"
 msgstr "æ??转æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:148
+#: ../app/text/gimptextlayer.c:145
 msgid "Transform Text Layer"
 msgstr "å??æ?¢æ??å­?å?¾å±?"
 
-#: ../app/text/gimptextlayer.c:509
+#: ../app/text/gimptextlayer.c:492
 msgid "Discard Text Information"
 msgstr "æ?¾å¼?æ??å­?ä¿¡æ?¯"
 
-#: ../app/text/gimptextlayer.c:562
+#: ../app/text/gimptextlayer.c:543
 msgid "Due to lack of any fonts, text functionality is not available."
 msgstr "ç?±äº?缺å°?å­?ä½?ï¼?æ??å­?å??è?½ä¸?å?¯ç?¨ã??"
 
-#: ../app/text/gimptextlayer.c:613
+#: ../app/text/gimptextlayer.c:579
 msgid "Empty Text Layer"
 msgstr "空ç?½æ??å­?å?¾å±?"
 
@@ -11350,17 +9857,7 @@ msgstr ""
 "\n"
 "æ??äº?æ??å­?å±?æ?§å?¯è?½æ??é??ã??é?¤é??æ?¨è¦?ç¼?è¾?ç??æ?¯æ??å­?å?¾å±?ï¼?å?¦å??ä¸?å¿?æ??å¿?ã??"
 
-#: ../app/text/text-enums.c:23
-msgctxt "text-box-mode"
-msgid "Dynamic"
-msgstr "å?¨æ??"
-
-#: ../app/text/text-enums.c:24
-msgctxt "text-box-mode"
-msgid "Fixed"
-msgstr "��"
-
-#: ../app/tools/gimp-tools.c:352
+#: ../app/tools/gimp-tools.c:335
 msgid ""
 "This tool has\n"
 "no options."
@@ -11368,36 +9865,32 @@ msgstr ""
 "�个工�\n"
 "没æ??é??项ã??"
 
-#: ../app/tools/gimpairbrushtool.c:54
+#: ../app/tools/gimpairbrushtool.c:55
 msgid "Airbrush Tool: Paint using a brush, with variable pressure"
 msgstr "å?·æ?ªå·¥å?·ï¼?使ç?¨å¸¦æ??å?¯å??å??å??ç??ç?»ç¬?ç»?å?¾"
 
-#: ../app/tools/gimpairbrushtool.c:55
+#: ../app/tools/gimpairbrushtool.c:56
 msgid "_Airbrush"
 msgstr "å?·æ?ª(_A)"
 
-#: ../app/tools/gimpairbrushtool.c:88
-msgid "Motion only"
-msgstr "���"
-
-#: ../app/tools/gimpairbrushtool.c:97 ../app/tools/gimpconvolvetool.c:216
-#: ../app/tools/gimpsmudgetool.c:96
+#: ../app/tools/gimpairbrushtool.c:92 ../app/tools/gimpconvolvetool.c:217
+#: ../app/tools/gimpsmudgetool.c:97
 msgid "Rate:"
 msgstr "æ¯?ç??ï¼?"
 
-#: ../app/tools/gimpairbrushtool.c:103
-msgid "Flow:"
-msgstr "æµ?é??ï¼?"
+#: ../app/tools/gimpairbrushtool.c:98 ../app/tools/gimppaintoptions-gui.c:198
+msgid "Pressure:"
+msgstr "å??å??ï¼?"
 
-#: ../app/tools/gimpaligntool.c:135 ../app/tools/gimpaligntool.c:764
+#: ../app/tools/gimpaligntool.c:134 ../app/tools/gimpaligntool.c:766
 msgid "Align"
 msgstr "对�"
 
-#: ../app/tools/gimpaligntool.c:136
+#: ../app/tools/gimpaligntool.c:135
 msgid "Alignment Tool: Align or arrange layers and other objects"
 msgstr "对é½?å·¥å?·ï¼?对é½?æ??æ?´ç??å?¾å±?æ??å?¶ä»?对象"
 
-#: ../app/tools/gimpaligntool.c:137
+#: ../app/tools/gimpaligntool.c:136
 msgid "_Align"
 msgstr "对�(_A)"
 
@@ -11429,126 +9922,119 @@ msgstr "ç?¹å?»å?¯æ?¾å??此路å¾?ä½?为第ä¸?项"
 msgid "Click to add this path to the list"
 msgstr "ç?¹å?»å?¯å°?此路å¾?æ·»å? å?°å??表"
 
-#: ../app/tools/gimpaligntool.c:776
+#: ../app/tools/gimpaligntool.c:778
 msgid "Relative to:"
 msgstr "�对��"
 
-#: ../app/tools/gimpaligntool.c:794
+#: ../app/tools/gimpaligntool.c:796
 msgid "Align left edge of target"
 msgstr "对é½?ç?®æ ?ç??左边ç¼?"
 
-#: ../app/tools/gimpaligntool.c:800
+#: ../app/tools/gimpaligntool.c:802
 msgid "Align center of target"
 msgstr "对é½?ç?®æ ?ç??中央"
 
-#: ../app/tools/gimpaligntool.c:806
+#: ../app/tools/gimpaligntool.c:808
 msgid "Align right edge of target"
 msgstr "对é½?ç?®æ ?ç??å?³è¾¹ç¼?"
 
-#: ../app/tools/gimpaligntool.c:816
+#: ../app/tools/gimpaligntool.c:818
 msgid "Align top edge of target"
 msgstr "对é½?ç?®æ ?ç??ä¸?è¾¹ç¼?"
 
-#: ../app/tools/gimpaligntool.c:822
+#: ../app/tools/gimpaligntool.c:824
 msgid "Align middle of target"
 msgstr "对é½?ç?®æ ?ç??中é?¨"
 
-#: ../app/tools/gimpaligntool.c:828
+#: ../app/tools/gimpaligntool.c:830
 msgid "Align bottom of target"
 msgstr "对é½?ç?®æ ?ç??åº?è¾¹ç¼?"
 
-#: ../app/tools/gimpaligntool.c:832
+#: ../app/tools/gimpaligntool.c:834
 msgid "Distribute"
 msgstr "å??å¸?"
 
-#: ../app/tools/gimpaligntool.c:846
+#: ../app/tools/gimpaligntool.c:848
 msgid "Distribute left edges of targets"
 msgstr "å??å¸?ç?®æ ?ç??左边ç¼?"
 
-#: ../app/tools/gimpaligntool.c:853
+#: ../app/tools/gimpaligntool.c:855
 msgid "Distribute horizontal centers of targets"
 msgstr "å??å¸?ç?®æ ?ç??水平中å¿?"
 
-#: ../app/tools/gimpaligntool.c:860
+#: ../app/tools/gimpaligntool.c:862
 msgid "Distribute right edges of targets"
 msgstr "å??å¸?ç?®æ ?ç??å?³è¾¹ç¼?"
 
-#: ../app/tools/gimpaligntool.c:870
+#: ../app/tools/gimpaligntool.c:872
 msgid "Distribute top edges of targets"
 msgstr "å??å¸?ç?®æ ?ç??ä¸?è¾¹ç¼?"
 
-#: ../app/tools/gimpaligntool.c:877
+#: ../app/tools/gimpaligntool.c:879
 msgid "Distribute vertical centers of targets"
 msgstr "å??å¸?ç?®æ ?ç??å??ç?´ä¸­å¿?"
 
-#: ../app/tools/gimpaligntool.c:883
+#: ../app/tools/gimpaligntool.c:885
 msgid "Distribute bottoms of targets"
 msgstr "å??å¸?ç?®æ ?ç??åº?é?¨"
 
-#: ../app/tools/gimpaligntool.c:891 ../app/tools/gimpblendoptions.c:221
+#: ../app/tools/gimpaligntool.c:893 ../app/tools/gimpblendoptions.c:222
 msgid "Offset:"
 msgstr "�移�"
 
-#: ../app/tools/gimpblendoptions.c:215 ../app/tools/gimppaintoptions-gui.c:305
+#: ../app/tools/gimpblendoptions.c:216 ../app/tools/gimppaintoptions-gui.c:648
 msgid "Gradient:"
 msgstr "æ¸?å??ï¼?"
 
-#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:145
+#: ../app/tools/gimpblendoptions.c:232 ../app/widgets/gimpbrusheditor.c:146
 msgid "Shape:"
 msgstr "形��"
 
-#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:236
+#: ../app/tools/gimpblendoptions.c:239 ../app/tools/gimppaintoptions-gui.c:672
 msgid "Repeat:"
 msgstr "é??å¤?ï¼?"
 
-#: ../app/tools/gimpblendoptions.c:256
+#: ../app/tools/gimpblendoptions.c:257
 msgid "Adaptive supersampling"
 msgstr "è?ªé??åº?è¶?级é??æ ·"
 
-#: ../app/tools/gimpblendoptions.c:264
+#: ../app/tools/gimpblendoptions.c:265
 msgid "Max depth:"
 msgstr "æ??大深度ï¼?"
 
-#: ../app/tools/gimpblendoptions.c:271
+#: ../app/tools/gimpblendoptions.c:272
 #: ../app/tools/gimpbucketfilloptions.c:287
-#: ../app/tools/gimpregionselectoptions.c:219
+#: ../app/tools/gimpregionselectoptions.c:220
 msgid "Threshold:"
 msgstr "é??å?¼ï¼?"
 
-#: ../app/tools/gimpblendtool.c:109
-msgid "Blend"
-msgstr "æ··å??å¡«å??"
-
-#: ../app/tools/gimpblendtool.c:110
+#: ../app/tools/gimpblendtool.c:108
 msgid "Blend Tool: Fill selected area with a color gradient"
 msgstr "æ··å??å·¥å?·ï¼?ç?¨é¢?è?²æ¸?å??å¡«å??é??中ç??å?ºå??"
 
-#: ../app/tools/gimpblendtool.c:111
+#: ../app/tools/gimpblendtool.c:109
 msgid "Blen_d"
 msgstr "æ··å??å¡«å??(_D)"
 
-#: ../app/tools/gimpblendtool.c:167
+#: ../app/tools/gimpblendtool.c:164
+#, c-format
 msgid "Blend does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?æ··å??æ??ä½?ã??"
 
-#: ../app/tools/gimpblendtool.c:420 ../app/tools/gimppainttool.c:634
+#: ../app/tools/gimpblendtool.c:402 ../app/tools/gimppainttool.c:606
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%s å?¯é??å®?è§?度"
 
-#: ../app/tools/gimpblendtool.c:421
+#: ../app/tools/gimpblendtool.c:403
 #, c-format
 msgid "%s to move the whole line"
 msgstr "%s �移���线"
 
-#: ../app/tools/gimpblendtool.c:425
+#: ../app/tools/gimpblendtool.c:407
 msgid "Blend: "
 msgstr "æ··å??å¡«å??ï¼?"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:111
-msgid "Brightness-Contrast"
-msgstr "亮度-对�度"
-
 #: ../app/tools/gimpbrightnesscontrasttool.c:112
 msgid "Brightness/Contrast Tool: Adjust brightness and contrast"
 msgstr "亮度å??对æ¯?度工å?·ï¼?è°?æ?´äº®åº¦å??对æ¯?度"
@@ -11569,37 +10055,38 @@ msgstr "导�亮度-对�度设置"
 msgid "Export Brightness-Contrast settings"
 msgstr "导�亮度-对�度设置"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:183
+#: ../app/tools/gimpbrightnesscontrasttool.c:184
+#, c-format
 msgid "Brightness-Contrast does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?亮度-对æ¯?度æ??ä½?ã??"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:320
+#: ../app/tools/gimpbrightnesscontrasttool.c:325
 msgid "_Brightness:"
 msgstr "亮度(_B)�"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:335
+#: ../app/tools/gimpbrightnesscontrasttool.c:340
 msgid "Con_trast:"
 msgstr "对�度(_T)�"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:349
+#: ../app/tools/gimpbrightnesscontrasttool.c:354
 msgid "Edit these Settings as Levels"
 msgstr "�此设置�为����"
 
-#: ../app/tools/gimpbucketfilloptions.c:99
+#: ../app/tools/gimpbucketfilloptions.c:100
 msgid "Allow completely transparent regions to be filled"
 msgstr "å??许填å??å®?å?¨é??æ??ç??å?ºå??"
 
-#: ../app/tools/gimpbucketfilloptions.c:105
+#: ../app/tools/gimpbucketfilloptions.c:106
 msgid "Base filled area on all visible layers"
 msgstr "å¡«å??å?ºå??以æ??æ??å?¯è§?å?¾å±?为å??"
 
-#: ../app/tools/gimpbucketfilloptions.c:111
-#: ../app/tools/gimpregionselectoptions.c:95
+#: ../app/tools/gimpbucketfilloptions.c:112
+#: ../app/tools/gimpregionselectoptions.c:96
 msgid "Maximum color difference"
 msgstr "æ??大é¢?è?²å·®å¼?"
 
 #. fill type
-#: ../app/tools/gimpbucketfilloptions.c:225
+#: ../app/tools/gimpbucketfilloptions.c:226
 #, c-format
 msgid "Fill Type  (%s)"
 msgstr "å¡«å??ç±»å??(%s)"
@@ -11626,10 +10113,10 @@ msgstr "寻æ?¾ç?¸è¿?ç??é¢?è?²"
 msgid "Fill transparent areas"
 msgstr "å¡«å??é??æ??å?ºå??"
 
-#: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:113
-#: ../app/tools/gimpcolorpickeroptions.c:150 ../app/tools/gimphealtool.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:963
-#: ../app/tools/gimpregionselectoptions.c:207
+#: ../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
 msgid "Sample merged"
 msgstr "ä½?æ ·å??并"
 
@@ -11637,15 +10124,15 @@ msgstr "ä½?æ ·å??并"
 msgid "Fill by:"
 msgstr "å¡«å??äº?ï¼?"
 
-#: ../app/tools/gimpbucketfilltool.c:85
+#: ../app/tools/gimpbucketfilltool.c:81
 msgid "Bucket Fill"
 msgstr "æ²¹æ¼?桶填å??"
 
-#: ../app/tools/gimpbucketfilltool.c:86
+#: ../app/tools/gimpbucketfilltool.c:82
 msgid "Bucket Fill Tool: Fill selected area with a color or pattern"
 msgstr "æ²¹æ¼?桶填å??å·¥å?·ï¼?ç?¨ä¸?ç§?é¢?è?²æ??å?¾æ¡?å¡«å??é??中ç??å?ºå??"
 
-#: ../app/tools/gimpbucketfilltool.c:87
+#: ../app/tools/gimpbucketfilltool.c:83
 msgid "_Bucket Fill"
 msgstr "æ²¹æ¼?桶填å??(_B)"
 
@@ -11661,46 +10148,37 @@ msgstr "æ??é¢?è?²é??æ?©å·¥å?·ï¼?é??æ?©æ??ç?¸ä¼¼é¢?è?²ç??å?ºå??"
 msgid "_By Color Select"
 msgstr "æ??é¢?è?²é??æ?©(_B)"
 
-#: ../app/tools/gimpbycolorselecttool.c:82
-msgctxt "command"
-msgid "Select by Color"
-msgstr "æ??é¢?è?²é??æ?©"
-
-#: ../app/tools/gimpclonetool.c:61
+#: ../app/tools/gimpclonetool.c:62
 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush"
 msgstr "å??é??å·¥å?·ï¼?ç?¨ç?»ç¬?å?¯é??æ?§å?°ä»?å?¾å??æ??å?¾æ¡?å¤?å?¶"
 
-#: ../app/tools/gimpclonetool.c:62
+#: ../app/tools/gimpclonetool.c:63
 msgid "_Clone"
 msgstr "å??é??(_C)"
 
-#: ../app/tools/gimpclonetool.c:85 ../app/tools/gimpclonetool.c:88
+#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:89
 msgid "Click to clone"
 msgstr "ç?¹å?»ä»¥å??é??"
 
-#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:90
+#: ../app/tools/gimpclonetool.c:87 ../app/tools/gimpclonetool.c:91
 #, c-format
 msgid "%s to set a new clone source"
 msgstr "%s å?¯è®¾å®?æ?°ç??å??é??æº?"
 
-#: ../app/tools/gimpclonetool.c:89
+#: ../app/tools/gimpclonetool.c:90
 msgid "Click to set a new clone source"
 msgstr "å??å?»å?¯è®¾å®?æ?°ç??å??é??æº?"
 
-#: ../app/tools/gimpclonetool.c:108
-#: ../app/tools/gimpperspectiveclonetool.c:958
+#: ../app/tools/gimpclonetool.c:109
+#: ../app/tools/gimpperspectiveclonetool.c:936
 msgid "Source"
 msgstr "�"
 
-#: ../app/tools/gimpclonetool.c:129 ../app/tools/gimphealtool.c:110
-#: ../app/tools/gimpperspectiveclonetool.c:979
+#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:111
+#: ../app/tools/gimpperspectiveclonetool.c:955
 msgid "Alignment:"
 msgstr "对��"
 
-#: ../app/tools/gimpcolorbalancetool.c:94
-msgid "Color Balance"
-msgstr "�彩平衡"
-
 #: ../app/tools/gimpcolorbalancetool.c:95
 msgid "Color Balance Tool: Adjust color distribution"
 msgstr "è?²å½©å¹³è¡¡å·¥å?·ï¼?è°?æ?´è?²å½©å??å¸?"
@@ -11721,60 +10199,42 @@ msgstr "导��彩平衡设置"
 msgid "Export Color Balance Settings"
 msgstr "导��彩平衡设置"
 
-#: ../app/tools/gimpcolorbalancetool.c:162
+#: ../app/tools/gimpcolorbalancetool.c:163
+#, c-format
 msgid "Color Balance operates only on RGB color layers."
 msgstr "è?²å½©å¹³è¡¡æ??ä½?å?ªè?½å?¨ RGB é¢?è?²ç??å?¾å±?ä¸?è¿?è¡?ã??"
 
-#: ../app/tools/gimpcolorbalancetool.c:267
+#: ../app/tools/gimpcolorbalancetool.c:270
 msgid "Select Range to Adjust"
 msgstr "é??æ?©è¦?è°?æ?´ç??è??å?´"
 
-#: ../app/tools/gimpcolorbalancetool.c:276 ../app/tools/gimplevelstool.c:172
+#: ../app/tools/gimpcolorbalancetool.c:279 ../app/tools/gimplevelstool.c:172
 msgid "Adjust Color Levels"
 msgstr "������"
 
-#: ../app/tools/gimpcolorbalancetool.c:293
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/tools/gimpcolorbalancetool.c:296
+#: ../app/tools/gimphuesaturationtool.c:255
 msgid "Cyan"
-msgstr "é??è?²"
+msgstr "é??"
 
-#: ../app/tools/gimpcolorbalancetool.c:293
-#: ../app/tools/gimphuesaturationtool.c:249
-msgid "Red"
-msgstr "红�"
-
-#: ../app/tools/gimpcolorbalancetool.c:302
-#: ../app/tools/gimphuesaturationtool.c:254
+#: ../app/tools/gimpcolorbalancetool.c:305
+#: ../app/tools/gimphuesaturationtool.c:257
 msgid "Magenta"
 msgstr "å??红"
 
-#: ../app/tools/gimpcolorbalancetool.c:302
-#: ../app/tools/gimphuesaturationtool.c:251
-msgid "Green"
-msgstr "绿�"
-
-#: ../app/tools/gimpcolorbalancetool.c:311
-#: ../app/tools/gimphuesaturationtool.c:250
-msgid "Yellow"
-msgstr "é»?è?²"
-
-#: ../app/tools/gimpcolorbalancetool.c:311
+#: ../app/tools/gimpcolorbalancetool.c:314
 #: ../app/tools/gimphuesaturationtool.c:253
-msgid "Blue"
-msgstr "è??è?²"
+msgid "Yellow"
+msgstr "é»?"
 
-#: ../app/tools/gimpcolorbalancetool.c:322
+#: ../app/tools/gimpcolorbalancetool.c:325
 msgid "R_eset Range"
 msgstr "é??ç½®è??å?´(_E)"
 
-#: ../app/tools/gimpcolorbalancetool.c:331
+#: ../app/tools/gimpcolorbalancetool.c:334
 msgid "Preserve _luminosity"
 msgstr "ä¿?æ??亮度(_L)"
 
-#: ../app/tools/gimpcolorizetool.c:90
-msgid "Colorize"
-msgstr "å??è?²å??"
-
 #: ../app/tools/gimpcolorizetool.c:91
 msgid "Colorize Tool: Colorize the image"
 msgstr "å??è?²å??å·¥å?·ï¼?å?¾å??å??è?²å??"
@@ -11795,180 +10255,165 @@ msgstr "导å?¥è?²å½©å??设置"
 msgid "Export Colorize Settings"
 msgstr "导å?ºè?²å½©å??设置"
 
-#: ../app/tools/gimpcolorizetool.c:157
+#: ../app/tools/gimpcolorizetool.c:156
+#, c-format
 msgid "Colorize operates only on RGB color layers."
 msgstr "å?ªè?½å¯¹ RGB é¢?è?²ç??å?¾å±?è¿?è¡?å??è?²å??æ??ä½?ã??"
 
-#: ../app/tools/gimpcolorizetool.c:225
+#: ../app/tools/gimpcolorizetool.c:221
 msgid "Select Color"
 msgstr "é??æ?©é¢?è?²"
 
-#: ../app/tools/gimpcolorizetool.c:242
-#: ../app/tools/gimphuesaturationtool.c:385
+#: ../app/tools/gimpcolorizetool.c:238
+#: ../app/tools/gimphuesaturationtool.c:388
 msgid "_Hue:"
 msgstr "��(_H)�"
 
-#: ../app/tools/gimpcolorizetool.c:257
-#: ../app/tools/gimphuesaturationtool.c:423
+#: ../app/tools/gimpcolorizetool.c:253
+#: ../app/tools/gimphuesaturationtool.c:426
 msgid "_Saturation:"
 msgstr "饱å??度(_S)ï¼?"
 
-#: ../app/tools/gimpcolorizetool.c:272
-#: ../app/tools/gimphuesaturationtool.c:404
+#: ../app/tools/gimpcolorizetool.c:268
+#: ../app/tools/gimphuesaturationtool.c:407
 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:175
-#: ../app/tools/gimpselectionoptions.c:280
-#: ../app/widgets/gimpbrusheditor.c:153
+#: ../app/tools/gimprectangleselectoptions.c:176
+#: ../app/tools/gimpselectionoptions.c:281
+#: ../app/widgets/gimpbrusheditor.c:154
 msgid "Radius:"
 msgstr "å??å¾?ï¼?"
 
 #. the pick FG/BG frame
-#: ../app/tools/gimpcolorpickeroptions.c:155
+#: ../app/tools/gimpcolorpickeroptions.c:156
 #, c-format
 msgid "Pick Mode  (%s)"
 msgstr "æ?¾å??模å¼? (%s)"
 
 #. the use_info_window toggle button
-#: ../app/tools/gimpcolorpickeroptions.c:164
+#: ../app/tools/gimpcolorpickeroptions.c:165
 #, c-format
 msgid "Use info window  (%s)"
 msgstr "使�信��� (%s)"
 
 #: ../app/tools/gimpcolorpickertool.c:96
 msgid "Color Picker"
-msgstr "é¢?è?²æ?¾å??"
+msgstr "���"
 
 #: ../app/tools/gimpcolorpickertool.c:97
 msgid "Color Picker Tool: Set colors from image pixels"
-msgstr "é¢?è?²æ?¾å??å·¥å?·ï¼?ä»?å?¾å??中æ?¾å??é¢?è?²"
+msgstr "æ?¾è?²å?¨ï¼?ä»?å?¾å??中æ?¾å??é¢?è?²"
 
 #: ../app/tools/gimpcolorpickertool.c:98
 msgid "C_olor Picker"
-msgstr "é¢?è?²æ?¾å??(_O)"
+msgstr "���(_O)"
 
 #: ../app/tools/gimpcolorpickertool.c:242
 msgid "Click in any image to view its color"
-msgstr "å?¨å?¾å??中任æ??ç?¹å?»å?¯æ?¥ç??å?¶é¢?è?²"
+msgstr "å?¨å?¾å??中å??å?»ä»»æ??ç?¹å?¯æ?¥ç??å?¶é¢?è?²"
 
-#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:493
+#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:509
 msgid "Click in any image to pick the foreground color"
-msgstr "å?¨å?¾å??中任æ??ç?¹å?»å?¯æ?¾å??å??æ?¯è?²"
+msgstr "å?¨å?¾å??中å??å?»ä»»æ??ç?¹å?¯æ?¾å??å??æ?¯è?²"
 
-#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:499
+#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:515
 msgid "Click in any image to pick the background color"
-msgstr "å?¨å?¾å??中任æ??ç?¹å?»å?¯æ?¾å??è??æ?¯è?²"
+msgstr "å?¨å?¾å??中å??å?»ä»»æ??ç?¹å?¯æ?¾å??è??æ?¯è?²"
 
 #: ../app/tools/gimpcolorpickertool.c:265
 msgid "Click in any image to add the color to the palette"
-msgstr "å?¨å?¾å??中任æ??ç?¹å?»å?¯å°?é¢?è?²æ·»å? å?°è°?è?²æ?¿"
+msgstr "å?¨å?¾å??中å??å?»ä»»æ??ç?¹å?¯å°?é¢?è?²æ·»å? å?°è°?è?²æ?¿"
 
 #. tool->display->shell
 #: ../app/tools/gimpcolorpickertool.c:318
 msgid "Color Picker Information"
-msgstr "é¢?è?²æ?¾å??ä¿¡æ?¯"
+msgstr "���信�"
 
-#: ../app/tools/gimpcolortool.c:268 ../app/tools/gimpcolortool.c:446
+#: ../app/tools/gimpcolortool.c:258 ../app/tools/gimpcolortool.c:437
 msgid "Move Sample Point: "
 msgstr "移å?¨é??æ ·ç?¹ï¼?"
 
-#: ../app/tools/gimpcolortool.c:438
-msgid "Remove Sample Point"
-msgstr "å? é?¤é??æ ·ç?¹"
-
-#: ../app/tools/gimpcolortool.c:439
+#: ../app/tools/gimpcolortool.c:430
 msgid "Cancel Sample Point"
 msgstr "å??æ¶?é??æ ·ç?¹"
 
-#: ../app/tools/gimpcolortool.c:447
+#: ../app/tools/gimpcolortool.c:438
 msgid "Add Sample Point: "
 msgstr "æ·»å? é??æ ·ç?¹ï¼?"
 
-#: ../app/tools/gimpconvolvetool.c:72
+#: ../app/tools/gimpconvolvetool.c:73
 msgid "Blur / Sharpen"
 msgstr "模ç³? / é??å??"
 
-#: ../app/tools/gimpconvolvetool.c:73
+#: ../app/tools/gimpconvolvetool.c:74
 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush"
 msgstr "模ç³? / é??å??å·¥å?·ï¼?使ç?¨ç?»ç¬?é??æ?©æ?§å?°æ¨¡ç³?æ??è??å?»æ¨¡ç³?"
 
-#: ../app/tools/gimpconvolvetool.c:74
+#: ../app/tools/gimpconvolvetool.c:75
 msgid "Bl_ur / Sharpen"
 msgstr "模ç³? / é??å??(_U)"
 
-#: ../app/tools/gimpconvolvetool.c:169
+#: ../app/tools/gimpconvolvetool.c:170
 msgid "Click to blur"
 msgstr "��以模�"
 
-#: ../app/tools/gimpconvolvetool.c:170
+#: ../app/tools/gimpconvolvetool.c:171
 msgid "Click to blur the line"
 msgstr "����模线段"
 
-#: ../app/tools/gimpconvolvetool.c:171
+#: ../app/tools/gimpconvolvetool.c:172
 #, c-format
 msgid "%s to sharpen"
 msgstr "%s 以é??å??"
 
-#: ../app/tools/gimpconvolvetool.c:175
+#: ../app/tools/gimpconvolvetool.c:176
 msgid "Click to sharpen"
 msgstr "ç?¹å?»ä»¥é??å??"
 
-#: ../app/tools/gimpconvolvetool.c:176
+#: ../app/tools/gimpconvolvetool.c:177
 msgid "Click to sharpen the line"
 msgstr "ç?¹å?»å?¯é??å??线段"
 
-#: ../app/tools/gimpconvolvetool.c:177
+#: ../app/tools/gimpconvolvetool.c:178
 #, c-format
 msgid "%s to blur"
 msgstr "%s 以模�"
 
 #. the type radio box
-#: ../app/tools/gimpconvolvetool.c:198
+#: ../app/tools/gimpconvolvetool.c:199
 #, c-format
 msgid "Convolve Type  (%s)"
 msgstr "å?·ç§¯ç±»å??(%s)"
 
-#: ../app/tools/gimpcropoptions.c:160
+#: ../app/tools/gimpcropoptions.c:161
 msgid "Current layer only"
 msgstr "ä»?对å½?å??å?¾å±?"
 
-#: ../app/tools/gimpcropoptions.c:166
+#: ../app/tools/gimpcropoptions.c:167
 msgid "Allow growing"
 msgstr "å??许å¢?é?¿"
 
-#: ../app/tools/gimpcroptool.c:127
+#: ../app/tools/gimpcroptool.c:126
 msgid "Crop"
-msgstr "��"
+msgstr "è£?å??"
 
-#: ../app/tools/gimpcroptool.c:128
+#: ../app/tools/gimpcroptool.c:127
 msgid "Crop Tool: Remove edge areas from image or layer"
-msgstr "å?ªè£?å·¥å?·ï¼?移é?¤å?¾å??æ??å?¾å±?ç??è¾¹ç¼?å?ºå??"
+msgstr "è£?å??å·¥å?·ï¼?移é?¤å?¾å??æ??å?¾å±?ç??è¾¹ç¼?å?ºå??"
 
-#: ../app/tools/gimpcroptool.c:129
+#: ../app/tools/gimpcroptool.c:128
 msgid "_Crop"
-msgstr "��(_C)"
+msgstr "è£?å??(_C)"
 
-#: ../app/tools/gimpcroptool.c:271
+#: ../app/tools/gimpcroptool.c:269
 msgid "Click or press Enter to crop"
-msgstr "ç?¹å?»æ??æ?? Enter å?¯å?ªè£?"
-
-#: ../app/tools/gimpcroptool.c:328
-msgid "There is no active layer to crop."
-msgstr "没æ??æ´»å?¨å?¾å±?å?¯ä»¥è£?å??ã??"
-
-#: ../app/tools/gimpcurvestool.c:140
-msgid "Curves"
-msgstr "�线"
+msgstr "å??å?»æ??æ??ä¸? Enter å?¯è¿?è¡?è£?å??"
 
 #: ../app/tools/gimpcurvestool.c:141
 msgid "Curves Tool: Adjust color curves"
@@ -11984,46 +10429,43 @@ msgstr "�����线"
 
 #: ../app/tools/gimpcurvestool.c:170
 msgid "Import Curves"
-msgstr "载��线"
+msgstr "导��线"
 
 #: ../app/tools/gimpcurvestool.c:171
 msgid "Export Curves"
-msgstr "载��线"
+msgstr "导��线"
 
-#: ../app/tools/gimpcurvestool.c:222
+#: ../app/tools/gimpcurvestool.c:221
+#, c-format
 msgid "Curves does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?æ?²çº¿æ??ä½?ã??"
 
-#: ../app/tools/gimpcurvestool.c:330
+#: ../app/tools/gimpcurvestool.c:323
 msgid "Click to add a control point"
 msgstr "���添����"
 
-#: ../app/tools/gimpcurvestool.c:335
+#: ../app/tools/gimpcurvestool.c:328
 msgid "Click to add control points to all channels"
 msgstr "å??å?»å?¯å?¨å?¨é?¨é??é??中添å? æ?§å?¶ç?¹"
 
-#: ../app/tools/gimpcurvestool.c:340
-msgid "Click to locate on curve (try Shift, Ctrl)"
-msgstr "��线���以��(�� Shift, Ctrl)"
-
-#: ../app/tools/gimpcurvestool.c:453 ../app/tools/gimplevelstool.c:384
+#: ../app/tools/gimpcurvestool.c:441 ../app/tools/gimplevelstool.c:380
 msgid "Cha_nnel:"
 msgstr "é??é??(_N)ï¼?"
 
-#: ../app/tools/gimpcurvestool.c:479 ../app/tools/gimplevelstool.c:408
+#: ../app/tools/gimpcurvestool.c:467 ../app/tools/gimplevelstool.c:404
 msgid "R_eset Channel"
 msgstr "é??ç½®é??é??(_E)"
 
-#: ../app/tools/gimpcurvestool.c:571 ../app/widgets/gimpdeviceinfoeditor.c:460
+#: ../app/tools/gimpcurvestool.c:557
 msgid "Curve _type:"
 msgstr "æ?²çº¿ç±»å??(_T)"
 
-#: ../app/tools/gimpcurvestool.c:646 ../app/tools/gimplevelstool.c:756
+#: ../app/tools/gimpcurvestool.c:632 ../app/tools/gimplevelstool.c:752
 #, c-format
 msgid "Could not read header from '%s': %s"
 msgstr "æ? æ³?ä»?â??%sâ??中读å??头ï¼?%s"
 
-#: ../app/tools/gimpcurvestool.c:719
+#: ../app/tools/gimpcurvestool.c:705
 msgid "Use _old curves file format"
 msgstr "使ç?¨æ?§æ?²çº¿æ??件格å¼?(_O)"
 
@@ -12039,127 +10481,123 @@ msgstr "��(_D)..."
 msgid "Desaturate (Remove Colors)"
 msgstr "�度(����)"
 
-#: ../app/tools/gimpdesaturatetool.c:124
-#, fuzzy
-msgid "Desaturate only operates on RGB layers."
+#: ../app/tools/gimpdesaturatetool.c:125
+#, c-format
+msgid "Desaturate does only operate on RGB layers."
 msgstr "å?ªæ?? RGB é¢?è?²ç??å?¾å±?å?¯ä»¥è¿?è¡?å?»è?²æ??ä½?ã??"
 
-#: ../app/tools/gimpdesaturatetool.c:193
+#: ../app/tools/gimpdesaturatetool.c:191
 msgid "Choose shade of gray based on:"
 msgstr "é??æ?©ç?°è?²æ¢¯åº¦å?ºäº?ï¼?"
 
-#: ../app/tools/gimpdodgeburntool.c:72
+#: ../app/tools/gimpdodgeburntool.c:73
 msgid "Dodge / Burn"
 msgstr "å??æ·¡ / å? æ·±"
 
-#: ../app/tools/gimpdodgeburntool.c:73
+#: ../app/tools/gimpdodgeburntool.c:74
 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush"
 msgstr "å??æ·¡ / å? æ·±å·¥å?·ï¼?使ç?¨ç?»ç¬?é??æ?©æ?§å?°å? äº®æ??å? æ·±"
 
-#: ../app/tools/gimpdodgeburntool.c:74
+#: ../app/tools/gimpdodgeburntool.c:75
 msgid "Dod_ge / Burn"
 msgstr "å??æ·¡/å? æ·±(_G)"
 
-#: ../app/tools/gimpdodgeburntool.c:172
+#: ../app/tools/gimpdodgeburntool.c:173
 msgid "Click to dodge"
-msgstr "ç?¹å?»ä»¥å??æ·¡"
+msgstr "ç?¹å?»å¹¶å??æ·¡"
 
-#: ../app/tools/gimpdodgeburntool.c:173
+#: ../app/tools/gimpdodgeburntool.c:174
 msgid "Click to dodge the line"
-msgstr "ç?¹å?»å?¯å??淡线段"
+msgstr "ç?¹å?»å¹¶å??淡线段"
 
-#: ../app/tools/gimpdodgeburntool.c:174
+#: ../app/tools/gimpdodgeburntool.c:175
 #, c-format
 msgid "%s to burn"
-msgstr "%s 以�深"
+msgstr "%s 并�深"
 
-#: ../app/tools/gimpdodgeburntool.c:178
+#: ../app/tools/gimpdodgeburntool.c:179
 msgid "Click to burn"
-msgstr "��以�深"
+msgstr "å??å?»å¹¶å? æ·±"
 
-#: ../app/tools/gimpdodgeburntool.c:179
+#: ../app/tools/gimpdodgeburntool.c:180
 msgid "Click to burn the line"
 msgstr "����深线段"
 
-#: ../app/tools/gimpdodgeburntool.c:180
+#: ../app/tools/gimpdodgeburntool.c:181
 #, c-format
 msgid "%s to dodge"
 msgstr "%s 以å??æ·¡"
 
 #. the type (dodge or burn)
-#: ../app/tools/gimpdodgeburntool.c:201
+#: ../app/tools/gimpdodgeburntool.c:202
 #, c-format
 msgid "Type  (%s)"
 msgstr "ç±»å?? (%s)"
 
 #. mode (highlights, midtones, or shadows)
-#: ../app/tools/gimpdodgeburntool.c:212
+#: ../app/tools/gimpdodgeburntool.c:213
 msgid "Range"
 msgstr "æ¯?ç??"
 
-#: ../app/tools/gimpdodgeburntool.c:224
+#: ../app/tools/gimpdodgeburntool.c:225
 msgid "Exposure:"
 msgstr "æ??å??é??ï¼?"
 
-#: ../app/tools/gimpeditselectiontool.c:240
-msgid "Move Selection"
-msgstr "移å?¨é??å?º"
-
 #: ../app/tools/gimpeditselectiontool.c:244
-#: ../app/tools/gimpeditselectiontool.c:1233
+#: ../app/tools/gimpeditselectiontool.c:1229
 msgid "Move Floating Selection"
 msgstr "移å?¨æµ®å?¨é??å?º"
 
-#: ../app/tools/gimpeditselectiontool.c:453
-#: ../app/tools/gimpeditselectiontool.c:728
+#: ../app/tools/gimpeditselectiontool.c:457
+#: ../app/tools/gimpeditselectiontool.c:726
 msgid "Move: "
 msgstr "移��"
 
 #: ../app/tools/gimpellipseselecttool.c:68
 msgid "Ellipse Select"
-msgstr "椭å??é??æ?©"
+msgstr "椭å??é??å?º"
 
 #: ../app/tools/gimpellipseselecttool.c:69
 msgid "Ellipse Select Tool: Select an elliptical region"
-msgstr "椭å??é??æ?©å·¥å?·ï¼?é??æ?©æ¤­å??å?ºå??"
+msgstr "椭å??é??å?ºå·¥å?·ï¼?é??æ?©æ¤­å??å?ºå??"
 
 #: ../app/tools/gimpellipseselecttool.c:70
 msgid "_Ellipse Select"
-msgstr "椭å??é??æ?©(_E)"
+msgstr "椭å??é??å?º(_E)"
 
-#: ../app/tools/gimperasertool.c:66
+#: ../app/tools/gimperasertool.c:67
 msgid "Eraser Tool: Erase to background or transparency using a brush"
-msgstr "æ©¡ç?®å·¥å?·ï¼?使ç?¨ç?»ç¬?æ?¦é?¤è?³è??æ?¯æ??é??æ??"
+msgstr "æ©¡ç?®æ?¦å·¥å?·ï¼?使ç?¨ç?»ç¬?æ?¦é?¤è?³è??æ?¯æ??é??æ??"
 
-#: ../app/tools/gimperasertool.c:67
+#: ../app/tools/gimperasertool.c:68
 msgid "_Eraser"
-msgstr "æ©¡ç?®(_E)"
+msgstr "橡��(_E)"
 
-#: ../app/tools/gimperasertool.c:96
+#: ../app/tools/gimperasertool.c:97
 msgid "Click to erase"
-msgstr "��以��"
+msgstr "å??å?»å¹¶æ?¦é?¤"
 
-#: ../app/tools/gimperasertool.c:97
+#: ../app/tools/gimperasertool.c:98
 msgid "Click to erase the line"
-msgstr "�����线段"
+msgstr "å??å?»å¹¶æ?¦é?¤çº¿æ®µ"
 
-#: ../app/tools/gimperasertool.c:98
+#: ../app/tools/gimperasertool.c:99
 #, c-format
 msgid "%s to pick a background color"
 msgstr "%s å?¯æ?¾å??è??æ?¯è?²"
 
 #. the anti_erase toggle
-#: ../app/tools/gimperasertool.c:145
+#: ../app/tools/gimperasertool.c:146
 #, c-format
 msgid "Anti erase  (%s)"
-msgstr "å??æ?¦é?¤(%s)"
+msgstr "å??ç?¸æ?¦é?¤(%s)"
 
-#: ../app/tools/gimpflipoptions.c:129
+#: ../app/tools/gimpflipoptions.c:130
 msgid "Affect:"
 msgstr "å½±å??ï¼?"
 
 #. tool toggle
-#: ../app/tools/gimpflipoptions.c:138
+#: ../app/tools/gimpflipoptions.c:139
 #, c-format
 msgid "Flip Type  (%s)"
 msgstr "翻转类å??(%s)"
@@ -12171,138 +10609,139 @@ msgstr "翻转"
 #: ../app/tools/gimpfliptool.c:80
 msgid ""
 "Flip Tool: Reverse the layer, selection or path horizontally or vertically"
-msgstr "翻转工å?·ï¼?æ°´å¹³æ??å??ç?´å??ç?¸å?¾å±?ã??é??å?ºæ??è·¯å¾?"
+msgstr "翻转工å?·ï¼?ä»?æ°´å¹³æ??å??ç?´æ?¹å??翻转å?¾å±?ã??é??å?ºæ??è·¯å¾?"
 
 #: ../app/tools/gimpfliptool.c:82
 msgid "_Flip"
 msgstr "翻转(_F)"
 
-#: ../app/tools/gimpfliptool.c:116
-msgctxt "command"
-msgid "Flip"
-msgstr "翻转"
+#: ../app/tools/gimpforegroundselectoptions.c:79
+#: ../app/tools/gimpselectionoptions.c:79
+msgid "Smooth edges"
+msgstr "边�平�"
 
-#: ../app/tools/gimpforegroundselectoptions.c:84
+#: ../app/tools/gimpforegroundselectoptions.c:85
 msgid "Select a single contiguous area"
 msgstr "é??æ?©å??个é?»è¿?ç??å?ºå??"
 
-#: ../app/tools/gimpforegroundselectoptions.c:95
+#: ../app/tools/gimpforegroundselectoptions.c:96
 msgid "Size of the brush used for refinements"
 msgstr "ç?¨äº?æ??ç?¼ç??ç?»ç¬?ç??大å°?"
 
-#: ../app/tools/gimpforegroundselectoptions.c:101
+#: ../app/tools/gimpforegroundselectoptions.c:102
 msgid ""
 "Smaller values give a more accurate selection border but may introduce holes "
 "in the selection"
 msgstr "æ?´å°?ç??å?¼å?¯ä»¥è?·å¾?æ?´ç²¾ç¡®ç??é??å?ºä½?å?¯è?½å?¨é??å?ºä¸­äº§ç??å­?æ´?"
 
-#: ../app/tools/gimpforegroundselectoptions.c:120
+#: ../app/tools/gimpforegroundselectoptions.c:121
 msgid "Sensitivity for brightness component"
 msgstr "亮度å??é??ç??ç?µæ??度"
 
-#: ../app/tools/gimpforegroundselectoptions.c:126
+#: ../app/tools/gimpforegroundselectoptions.c:127
 msgid "Sensitivity for red/green component"
 msgstr "红/绿å??é??ç??ç?µæ??度"
 
-#: ../app/tools/gimpforegroundselectoptions.c:132
+#: ../app/tools/gimpforegroundselectoptions.c:133
 msgid "Sensitivity for yellow/blue component"
 msgstr "é»?/è??å??é??ç??ç?µæ??度"
 
 #. single / multiple objects
-#: ../app/tools/gimpforegroundselectoptions.c:275
+#: ../app/tools/gimpforegroundselectoptions.c:276
 msgid "Contiguous"
 msgstr "è¿?ç»­"
 
 #. foreground / background
-#: ../app/tools/gimpforegroundselectoptions.c:280
+#: ../app/tools/gimpforegroundselectoptions.c:281
 #, c-format
 msgid "Interactive refinement  (%s)"
 msgstr "交äº?å¼?æ??ç?¼(%s)"
 
-#: ../app/tools/gimpforegroundselectoptions.c:284
+#: ../app/tools/gimpforegroundselectoptions.c:285
 msgid "Mark background"
 msgstr "æ ?è®°è??æ?¯"
 
-#: ../app/tools/gimpforegroundselectoptions.c:285
+#: ../app/tools/gimpforegroundselectoptions.c:286
 msgid "Mark foreground"
 msgstr "æ ?è®°å??æ?¯"
 
-#: ../app/tools/gimpforegroundselectoptions.c:301
+#: ../app/tools/gimpforegroundselectoptions.c:302
 msgid "Small brush"
 msgstr "���"
 
-#: ../app/tools/gimpforegroundselectoptions.c:309
+#: ../app/tools/gimpforegroundselectoptions.c:310
 msgid "Large brush"
 msgstr "大��"
 
-#: ../app/tools/gimpforegroundselectoptions.c:333
+#: ../app/tools/gimpforegroundselectoptions.c:334
 msgid "Smoothing:"
 msgstr "å??æ»?ï¼?"
 
-#: ../app/tools/gimpforegroundselectoptions.c:339
+#: ../app/tools/gimpforegroundselectoptions.c:340
 msgid "Preview color:"
 msgstr "�����"
 
 #. granularity
-#: ../app/tools/gimpforegroundselectoptions.c:342
+#: ../app/tools/gimpforegroundselectoptions.c:343
 msgid "Color Sensitivity"
 msgstr "é¢?è?²ç?µæ??度"
 
-#: ../app/tools/gimpforegroundselecttool.c:146
+#: ../app/tools/gimpforegroundselecttool.c:145
 msgid "Foreground Select"
 msgstr "å??æ?¯é??æ?©"
 
-#: ../app/tools/gimpforegroundselecttool.c:147
+#: ../app/tools/gimpforegroundselecttool.c:146
 msgid "Foreground Select Tool: Select a region containing foreground objects"
 msgstr "å??æ?¯é??æ?©å·¥å?·ï¼?é??æ?©å??å?«å??æ?¯å¯¹è±¡ç??å?ºå??"
 
-#: ../app/tools/gimpforegroundselecttool.c:148
+#: ../app/tools/gimpforegroundselecttool.c:147
 msgid "F_oreground Select"
 msgstr "å??æ?¯é??æ?©(_O)"
 
-#: ../app/tools/gimpforegroundselecttool.c:315
+#: ../app/tools/gimpforegroundselecttool.c:314
 msgid "Add more strokes or press Enter to accept the selection"
 msgstr "æ·»å? æ?´å¤?ç¬?å??æ??æ?? Enter é?®ä»¥ç¡®è®¤é??å?º"
 
-#: ../app/tools/gimpforegroundselecttool.c:317
+#: ../app/tools/gimpforegroundselecttool.c:316
 msgid "Mark foreground by painting on the object to extract"
 msgstr "å?¨å¯¹è±¡ä¸?æ¶?ç?»æ ?è®°å?ºå??æ?¯ä»¥æ??å??"
 
-#: ../app/tools/gimpforegroundselecttool.c:328
-msgid "Roughly outline the object to extract"
+#
+#: ../app/tools/gimpforegroundselecttool.c:327
+msgid "Rougly outline the object to extract"
 msgstr "为对象ç?»ä¸?个ç²?ç?¥ç??è½®å»?以便æ??å??"
 
-#: ../app/tools/gimpforegroundselecttool.c:774
+#: ../app/tools/gimpforegroundselecttool.c:766
 msgctxt "command"
 msgid "Foreground Select"
 msgstr "å??æ?¯é??æ?©"
 
-#: ../app/tools/gimpfreeselecttool.c:200
+#: ../app/tools/gimpfreeselecttool.c:198
 msgid ""
 "Free Select Tool: Select a hand-drawn region with free and polygonal segments"
 msgstr "è?ªç?±é??æ?©å·¥å?·ï¼?é??æ?©æ??ç»?å?ºå??"
 
-#: ../app/tools/gimpfreeselecttool.c:201
+#: ../app/tools/gimpfreeselecttool.c:199
 msgid "_Free Select"
 msgstr "è?ªç?±é??æ?©(_F)"
 
-#: ../app/tools/gimpfreeselecttool.c:1120
+#: ../app/tools/gimpfreeselecttool.c:1117
 msgid "Click to complete selection"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯å??建æ?°ç??é??å?º"
 
-#: ../app/tools/gimpfreeselecttool.c:1124
+#: ../app/tools/gimpfreeselecttool.c:1121
 msgid "Click-Drag to move segment vertex"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨ç»?件"
 
-#: ../app/tools/gimpfreeselecttool.c:1129
+#: ../app/tools/gimpfreeselecttool.c:1126
 msgid "Return commits, Escape cancels, Backspace removes last segment"
 msgstr "å??车é?®ä»¥ç¡®è®¤ï¼?Esc é?®ä»¥å??æ¶?ï¼?å??é??é?®ä»¥ç§»é?¤æ??å??ç??段"
 
-#: ../app/tools/gimpfreeselecttool.c:1133
+#: ../app/tools/gimpfreeselecttool.c:1130
 msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
 msgstr "ç?¹å?»å¹¶æ??å?¨ä»¥æ·»å? è?ªç?±é??å?ºï¼?ç?¹å?»ä»¥æ·»å? å¤?边形é??å?º"
 
-#: ../app/tools/gimpfreeselecttool.c:1643
+#: ../app/tools/gimpfreeselecttool.c:1582
 msgctxt "command"
 msgid "Free Select"
 msgstr "è?ªç?±é??æ?©"
@@ -12319,62 +10758,54 @@ msgstr "模ç³?é??æ?©å·¥å?·ï¼?æ ¹æ?®é¢?è?²é??æ?©è¿?ç»­ç??å?ºå??"
 msgid "Fu_zzy Select"
 msgstr "模ç³?é??æ?©(_Z)"
 
-#: ../app/tools/gimpfuzzyselecttool.c:80
-msgctxt "command"
-msgid "Fuzzy Select"
-msgstr "模ç³?é??æ?©"
-
-#: ../app/tools/gimpgegltool.c:93 ../app/tools/gimpgegltool.c:112
+#: ../app/tools/gimpgegltool.c:92 ../app/tools/gimpgegltool.c:111
 msgid "GEGL Operation"
 msgstr "GEGL æ??ä½?"
 
-#: ../app/tools/gimpgegltool.c:94
+#: ../app/tools/gimpgegltool.c:93
 msgid "GEGL Tool: Use an arbitrary GEGL operation"
 msgstr "GEGL å·¥å?·ï¼?使ç?¨æ? å?ºå??ç?? GEGL æ??ä½?"
 
-#: ../app/tools/gimpgegltool.c:95
+#: ../app/tools/gimpgegltool.c:94
 msgid "_GEGL Operation..."
 msgstr "GEGL æ??ä½?(_G)..."
 
-#: ../app/tools/gimpgegltool.c:160
+#: ../app/tools/gimpgegltool.c:158
+#, c-format
 msgid "GEGL operations do not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡? GEGL æ??ä½?ã??"
 
-#: ../app/tools/gimpgegltool.c:371
+#: ../app/tools/gimpgegltool.c:339
 msgid "_Operation:"
 msgstr "æ??ä½?(_O)ï¼?"
 
 #. The options vbox
-#: ../app/tools/gimpgegltool.c:430
+#: ../app/tools/gimpgegltool.c:412
 msgid "Operation Settings"
 msgstr "æ??ä½?é??项"
 
-#: ../app/tools/gimpgegltool.c:435
-msgid "Select an operation from the list above"
-msgstr "ä»?以ä¸?å??表中é??æ?©ä¸?项æ??ä½?"
-
-#: ../app/tools/gimphealtool.c:53
+#: ../app/tools/gimphealtool.c:54
 msgid "Healing Tool: Heal image irregularities"
 msgstr "å¤?å??å·¥å?·ï¼?å¤?å??å?¾å??ç??ä¸?è§?å??"
 
-#: ../app/tools/gimphealtool.c:54
+#: ../app/tools/gimphealtool.c:55
 msgid "_Heal"
 msgstr "å¤?å??(_H)"
 
-#: ../app/tools/gimphealtool.c:76 ../app/tools/gimphealtool.c:79
+#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:80
 msgid "Click to heal"
 msgstr "ç?¹å?»ä»¥å¤?å??"
 
-#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:81
+#: ../app/tools/gimphealtool.c:78 ../app/tools/gimphealtool.c:82
 #, c-format
 msgid "%s to set a new heal source"
 msgstr "%s å?¯è®¾å®?æ?°ç??å¤?å??æº?"
 
-#: ../app/tools/gimphealtool.c:80
+#: ../app/tools/gimphealtool.c:81
 msgid "Click to set a new heal source"
 msgstr "å??å?»å?¯è®¾å®?æ?°ç??å¤?å??æº?"
 
-#: ../app/tools/gimphistogramoptions.c:126
+#: ../app/tools/gimphistogramoptions.c:127
 msgid "Histogram Scale"
 msgstr "���尺度"
 
@@ -12398,159 +10829,159 @@ msgstr "导å?¥è?²è°?-饱å??度é??项"
 msgid "Export Hue-Saturation Settings"
 msgstr "导å?ºè?²è°?-饱å??度é??项"
 
-#: ../app/tools/gimphuesaturationtool.c:170
+#: ../app/tools/gimphuesaturationtool.c:171
+#, c-format
 msgid "Hue-Saturation operates only on RGB color layers."
 msgstr "å?ªæ?? RGB é¢?è?²ç??å?¾å±?å?¯ä»¥è¿?è¡?è?²è°?-饱å??度æ??ä½?ã??"
 
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "M_aster"
 msgstr "主�(_A)"
 
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "Adjust all colors"
-msgstr "������"
+msgstr "è°?æ?´æ??æ??é¢?è?²"
 
-#: ../app/tools/gimphuesaturationtool.c:249
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "_R"
 msgstr "红(_R)"
 
-#: ../app/tools/gimphuesaturationtool.c:250
+#: ../app/tools/gimphuesaturationtool.c:253
 msgid "_Y"
 msgstr "é»?(_Y)"
 
-#: ../app/tools/gimphuesaturationtool.c:251
+#: ../app/tools/gimphuesaturationtool.c:254
 msgid "_G"
 msgstr "绿(_G)"
 
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/tools/gimphuesaturationtool.c:255
 msgid "_C"
 msgstr "é??(_C)"
 
-#: ../app/tools/gimphuesaturationtool.c:253
+#: ../app/tools/gimphuesaturationtool.c:256
 msgid "_B"
 msgstr "è??(_B)"
 
-#: ../app/tools/gimphuesaturationtool.c:254
+#: ../app/tools/gimphuesaturationtool.c:257
 msgid "_M"
 msgstr "å??(_M)"
 
-#: ../app/tools/gimphuesaturationtool.c:259
+#: ../app/tools/gimphuesaturationtool.c:262
 msgid "Select Primary Color to Adjust"
 msgstr "æ??é??æ?©è¦?ä¿®æ?¹ç??è?²ç³»"
 
-#: ../app/tools/gimphuesaturationtool.c:349
+#: ../app/tools/gimphuesaturationtool.c:352
 msgid "_Overlap:"
 msgstr "è¦?ç??(_O)ï¼?"
 
-#: ../app/tools/gimphuesaturationtool.c:368
+#: ../app/tools/gimphuesaturationtool.c:371
 msgid "Adjust Selected Color"
 msgstr "ä¿®æ?¹é??中ç??é¢?è?²"
 
-#: ../app/tools/gimphuesaturationtool.c:444
+#: ../app/tools/gimphuesaturationtool.c:447
 msgid "R_eset Color"
 msgstr "é??ç½®é¢?è?²(_E)"
 
-#: ../app/tools/gimpimagemaptool-settings.c:80
+#: ../app/tools/gimpimagemaptool-settings.c:81
 msgid "Pre_sets:"
 msgstr "�设(_S):"
 
-#: ../app/tools/gimpimagemaptool-settings.c:222
+#: ../app/tools/gimpimagemaptool-settings.c:221
 #, c-format
 msgid "Settings saved to '%s'"
 msgstr "设置已ä¿?å­?å?°â??%sâ??"
 
-#: ../app/tools/gimpimagemaptool.c:367
+#: ../app/tools/gimpimagemaptool.c:318
 msgid "_Preview"
 msgstr "��(_P)"
 
 #. adjust sliders
-#: ../app/tools/gimpinkoptions-gui.c:55
+#: ../app/tools/gimpinkoptions-gui.c:56
 msgid "Adjustment"
 msgstr "è°?æ?´"
 
-#: ../app/tools/gimpinkoptions-gui.c:67 ../app/tools/gimpinkoptions-gui.c:92
-#: ../app/tools/gimprectangleoptions.c:972 ../app/tools/gimptextoptions.c:489
+#: ../app/tools/gimpinkoptions-gui.c:68 ../app/tools/gimpinkoptions-gui.c:93
+#: ../app/tools/gimprectangleoptions.c:973 ../app/tools/gimptextoptions.c:452
 msgid "Size:"
-msgstr "大��"
+msgstr "尺寸�"
 
-#: ../app/tools/gimpinkoptions-gui.c:75 ../app/tools/gimpmeasuretool.c:1060
-#: ../app/tools/gimppaintoptions-gui.c:137
-#: ../app/widgets/gimpbrusheditor.c:207
+#: ../app/tools/gimpinkoptions-gui.c:76 ../app/tools/gimpmeasuretool.c:1037
+#: ../app/widgets/gimpbrusheditor.c:208
 msgid "Angle:"
 msgstr "�度�"
 
 #. sens sliders
-#: ../app/tools/gimpinkoptions-gui.c:80
+#: ../app/tools/gimpinkoptions-gui.c:81
 msgid "Sensitivity"
 msgstr "ç?µæ??度"
 
-#: ../app/tools/gimpinkoptions-gui.c:99
+#: ../app/tools/gimpinkoptions-gui.c:100
 msgid "Tilt:"
 msgstr "å?¾æ??ï¼?"
 
-#: ../app/tools/gimpinkoptions-gui.c:106
+#: ../app/tools/gimpinkoptions-gui.c:107
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../app/tools/gimpinkoptions-gui.c:117
+#: ../app/tools/gimpinkoptions-gui.c:118
 msgid "Type"
 msgstr "ç±»å??"
 
 #. Blob shape widget
-#: ../app/tools/gimpinkoptions-gui.c:148
+#: ../app/tools/gimpinkoptions-gui.c:149
 msgid "Shape"
 msgstr "形�"
 
-#: ../app/tools/gimpinktool.c:55
+#: ../app/tools/gimpinktool.c:56
 msgid "Ink Tool: Calligraphy-style painting"
 msgstr "墨水工å?·ï¼?书æ³?é£?æ ¼ç??ç»?å?¶"
 
-#: ../app/tools/gimpinktool.c:56
+#: ../app/tools/gimpinktool.c:57
 msgid "In_k"
 msgstr "墨水(_K)"
 
-#: ../app/tools/gimpiscissorsoptions.c:125
+#: ../app/tools/gimpiscissorsoptions.c:126
 msgid "Interactive boundary"
 msgstr "äº?å?¨è¾¹ç??"
 
-#: ../app/tools/gimpiscissorstool.c:279
+#: ../app/tools/gimpiscissorstool.c:278
 msgid "Scissors"
 msgstr "å?ªå??"
 
-#: ../app/tools/gimpiscissorstool.c:280
+#: ../app/tools/gimpiscissorstool.c:279
 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting"
 msgstr "å?ªå??é??æ?©å·¥å?·ï¼?ç?¨æ?ºè?½è¾¹ç¼?é??é??é??å??å½¢ç?¶"
 
-#: ../app/tools/gimpiscissorstool.c:281
+#: ../app/tools/gimpiscissorstool.c:280
 msgid "Intelligent _Scissors"
 msgstr "æ?ºè?½å?ªå??(_S)"
 
-#: ../app/tools/gimpiscissorstool.c:931 ../app/tools/gimpmeasuretool.c:617
+#: ../app/tools/gimpiscissorstool.c:940 ../app/tools/gimpmeasuretool.c:609
 msgid "Click-Drag to move this point"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨æ­¤ç?¹"
 
-#: ../app/tools/gimpiscissorstool.c:933 ../app/tools/gimpiscissorstool.c:997
+#: ../app/tools/gimpiscissorstool.c:942 ../app/tools/gimpiscissorstool.c:1007
 #, c-format
 msgid "%s: disable auto-snap"
 msgstr "%sï¼?ç¦?ç?¨è?ªå?¨å?¸é??"
 
-#: ../app/tools/gimpiscissorstool.c:949
+#: ../app/tools/gimpiscissorstool.c:959
 msgid "Click to close the curve"
-msgstr "ç?¹å?»å?¯é?­å??æ?²çº¿"
+msgstr "å??å?»ä»¥é?­å??æ?²çº¿"
 
-#: ../app/tools/gimpiscissorstool.c:955
+#: ../app/tools/gimpiscissorstool.c:965
 msgid "Click to add a point on this segment"
-msgstr "ç?¹å?»å?¯å?¨æ­¤è??ä¸?æ·»å? ç?¹"
+msgstr "å??å?»å?¯å?¨æ­¤è??ä¸?æ·»å? ç?¹"
 
-#: ../app/tools/gimpiscissorstool.c:969
+#: ../app/tools/gimpiscissorstool.c:979
 msgid "Click or press Enter to convert to a selection"
-msgstr "ç?¹å?»æ??æ?? Enter å?¯è½¬æ?¢å?°é??å?º"
+msgstr "å??å?»æ??æ??ä¸? Enter 以转æ?¢å?°é??å?º"
 
-#: ../app/tools/gimpiscissorstool.c:979
+#: ../app/tools/gimpiscissorstool.c:989
 msgid "Press Enter to convert to a selection"
-msgstr "æ?? Enter é?®å?¯è½¬æ?¢ä¸ºé??å?º"
+msgstr "æ??ä¸? Enter é?®ä»¥è½¬æ?¢ä¸ºé??å?º"
 
-#: ../app/tools/gimpiscissorstool.c:994
+#: ../app/tools/gimpiscissorstool.c:1004
 msgid "Click or Click-Drag to add a point"
 msgstr "ç?¹å?»æ??ç?¹å?»æ??å?¨å?¯æ·»å? ç?¹"
 
@@ -12570,294 +11001,296 @@ msgstr "导���"
 msgid "Export Levels"
 msgstr "导���"
 
-#: ../app/tools/gimplevelstool.c:229
+#: ../app/tools/gimplevelstool.c:228
+#, c-format
 msgid "Levels does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?è?²é?¶æ??ä½?ã??"
 
-#: ../app/tools/gimplevelstool.c:314
+#: ../app/tools/gimplevelstool.c:310
 msgid "Pick black point"
 msgstr "æ?¾å??é»?ç?¹"
 
-#: ../app/tools/gimplevelstool.c:318
+#: ../app/tools/gimplevelstool.c:314
 msgid "Pick gray point"
 msgstr "æ?¾å??ç?°ç?¹"
 
-#: ../app/tools/gimplevelstool.c:322
+#: ../app/tools/gimplevelstool.c:318
 msgid "Pick white point"
 msgstr "æ?¾å??ç?½ç?¹"
 
 #. Input levels frame
-#: ../app/tools/gimplevelstool.c:423
+#: ../app/tools/gimplevelstool.c:419
 msgid "Input Levels"
 msgstr "����"
 
-#: ../app/tools/gimplevelstool.c:526
+#: ../app/tools/gimplevelstool.c:522
 msgid "Gamma"
-msgstr "Gamma"
+msgstr "ä¼½ç??"
 
 #. Output levels frame
-#: ../app/tools/gimplevelstool.c:568
+#: ../app/tools/gimplevelstool.c:564
 msgid "Output Levels"
 msgstr "����"
 
 #. all channels frame
-#: ../app/tools/gimplevelstool.c:645
+#: ../app/tools/gimplevelstool.c:641
 msgid "All Channels"
 msgstr "æ??æ??é??é??"
 
-#: ../app/tools/gimplevelstool.c:657 ../app/tools/gimpthresholdtool.c:268
-msgid "_Auto"
-msgstr "��(_A)"
-
-#: ../app/tools/gimplevelstool.c:659
+#: ../app/tools/gimplevelstool.c:655
 msgid "Adjust levels automatically"
 msgstr "������"
 
-#: ../app/tools/gimplevelstool.c:686
+#: ../app/tools/gimplevelstool.c:682
 msgid "Edit these Settings as Curves"
 msgstr "�此设置�为�线��"
 
-#: ../app/tools/gimplevelstool.c:829
+#: ../app/tools/gimplevelstool.c:825
 msgid "Use _old levels file format"
 msgstr "使ç?¨æ?§è?²é?¶æ??件格å¼?(_O)"
 
-#: ../app/tools/gimpmagnifyoptions.c:166
+#: ../app/tools/gimpmagnifyoptions.c:167
 msgid "Auto-resize window"
 msgstr "è?ªå?¨æ?¹å??çª?å?£å¤§å°?"
 
 #. tool toggle
-#: ../app/tools/gimpmagnifyoptions.c:171 ../app/tools/gimpmoveoptions.c:187
+#: ../app/tools/gimpmagnifyoptions.c:172 ../app/tools/gimpmoveoptions.c:188
 #, c-format
 msgid "Tool Toggle  (%s)"
 msgstr "å·¥å?·å??æ?¢(%s)"
 
-#: ../app/tools/gimpmagnifytool.c:87
+#: ../app/tools/gimpmagnifytool.c:86
 msgid "Zoom"
 msgstr "缩�"
 
-#: ../app/tools/gimpmagnifytool.c:88
+#: ../app/tools/gimpmagnifytool.c:87
 msgid "Zoom Tool: Adjust the zoom level"
 msgstr "缩�工����缩�级�"
 
-#: ../app/tools/gimpmagnifytool.c:89
-msgctxt "tool"
-msgid "_Zoom"
+#: ../app/tools/gimpmagnifytool.c:88
+msgid "tool|_Zoom"
 msgstr "缩�(_Z)"
 
-#: ../app/tools/gimpmeasureoptions.c:123
+#: ../app/tools/gimpmeasureoptions.c:124
 msgid "Use info window"
 msgstr "使�信���"
 
-#: ../app/tools/gimpmeasuretool.c:125
+#: ../app/tools/gimpmeasuretool.c:121
 msgid "Measure"
 msgstr "æµ?é??"
 
-#: ../app/tools/gimpmeasuretool.c:126
+#: ../app/tools/gimpmeasuretool.c:122
 msgid "Measure Tool: Measure distances and angles"
 msgstr "æµ?é??å·¥å?·ï¼?æµ?é??è·?离å??è§?度"
 
-#: ../app/tools/gimpmeasuretool.c:127
+#: ../app/tools/gimpmeasuretool.c:123
 msgid "_Measure"
 msgstr "æµ?é??(_M)"
 
-#: ../app/tools/gimpmeasuretool.c:246
+#: ../app/tools/gimpmeasuretool.c:241
 msgid "Add Guides"
-msgstr "æ·»å? å??è??线"
+msgstr "添���线"
 
-#: ../app/tools/gimpmeasuretool.c:568
+#: ../app/tools/gimpmeasuretool.c:561
 msgid "Click to place vertical and horizontal guides"
 msgstr "ç?¹å?»å?¯æ?¾ç½®å??ç?´å??æ°´å¹³å??è??线"
 
-#: ../app/tools/gimpmeasuretool.c:577
+#: ../app/tools/gimpmeasuretool.c:570
 msgid "Click to place a horizontal guide"
 msgstr "ç?¹å?»å?¯æ?¾ç½®æ°´å¹³å??è??线"
 
-#: ../app/tools/gimpmeasuretool.c:592
+#: ../app/tools/gimpmeasuretool.c:584
 msgid "Click to place a vertical guide"
 msgstr "ç?¹å?»å?¯æ?¾ç½®å??ç?´å??è??线"
 
-#: ../app/tools/gimpmeasuretool.c:606
+#: ../app/tools/gimpmeasuretool.c:598
 msgid "Click-Drag to add a new point"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯æ·»å? æ?°ç??ç?¹"
 
-#: ../app/tools/gimpmeasuretool.c:637
+#: ../app/tools/gimpmeasuretool.c:628
 msgid "Click-Drag to move all points"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨æ??æ??ç?¹"
 
-#: ../app/tools/gimpmeasuretool.c:898 ../app/tools/gimpmeasuretool.c:1043
-#: ../app/tools/gimpmeasuretool.c:1099 ../app/tools/gimpmeasuretool.c:1127
-#: ../app/tools/gimppainttool.c:643
-msgid "pixels"
-msgstr "å??ç´ "
-
 #. tool->display->shell
-#: ../app/tools/gimpmeasuretool.c:1011
+#: ../app/tools/gimpmeasuretool.c:989
 msgid "Measure Distances and Angles"
 msgstr "æµ?é??è·?离å??è§?度"
 
-#: ../app/tools/gimpmeasuretool.c:1032
+#: ../app/tools/gimpmeasuretool.c:1009
 msgid "Distance:"
 msgstr "�离�"
 
-#: ../app/tools/gimpmoveoptions.c:139
+#: ../app/tools/gimpmoveoptions.c:140
 msgid "Pick a layer or guide"
 msgstr "æ?¾å??å?¾å±?æ??å??è??线"
 
-#: ../app/tools/gimpmoveoptions.c:140
+#: ../app/tools/gimpmoveoptions.c:141
 msgid "Move the active layer"
 msgstr "移�活���"
 
-#: ../app/tools/gimpmoveoptions.c:144
+#: ../app/tools/gimpmoveoptions.c:145
 msgid "Move selection"
 msgstr "移å?¨é??å?º"
 
-#: ../app/tools/gimpmoveoptions.c:148
+#: ../app/tools/gimpmoveoptions.c:149
 msgid "Pick a path"
-msgstr "æ?¾å??è·¯å¾?"
+msgstr "æ?¾å??å??个路å¾?"
 
-#: ../app/tools/gimpmoveoptions.c:149
+#: ../app/tools/gimpmoveoptions.c:150
 msgid "Move the active path"
 msgstr "移�活�路�"
 
-#: ../app/tools/gimpmoveoptions.c:178
+#: ../app/tools/gimpmoveoptions.c:179
 msgid "Move:"
 msgstr "移��"
 
-#: ../app/tools/gimpmovetool.c:129
+#: ../app/tools/gimpmovetool.c:127
 msgctxt "tool"
 msgid "Move"
 msgstr "移�"
 
-#: ../app/tools/gimpmovetool.c:130
+#: ../app/tools/gimpmovetool.c:128
 msgid "Move Tool: Move layers, selections, and other objects"
 msgstr "移å?¨å·¥å?·ï¼?移å?¨å?¾å±?ã??é??å?ºã??以å??å?¶ä»?对象"
 
-#: ../app/tools/gimpmovetool.c:131
+#: ../app/tools/gimpmovetool.c:129
 msgid "_Move"
 msgstr "移�(_M)"
 
-#: ../app/tools/gimpmovetool.c:285 ../app/tools/gimpmovetool.c:580
+#: ../app/tools/gimpmovetool.c:276 ../app/tools/gimpmovetool.c:570
 msgid "Move Guide: "
-msgstr "移å?¨å??è??线ï¼?"
+msgstr "移���线�"
 
-#: ../app/tools/gimpmovetool.c:574
-msgid "Remove Guide"
-msgstr "å? é?¤å??è??线"
-
-#: ../app/tools/gimpmovetool.c:574
+#: ../app/tools/gimpmovetool.c:564
 msgid "Cancel Guide"
-msgstr "å??æ¶?å??è??线"
+msgstr "å??æ¶?è¾?å?©çº¿"
 
-#: ../app/tools/gimpmovetool.c:580
+#: ../app/tools/gimpmovetool.c:570
 msgid "Add Guide: "
-msgstr "æ·»å? å??è??线ï¼?"
+msgstr "添���线�"
 
-#: ../app/tools/gimppaintbrushtool.c:51
+#: ../app/tools/gimppaintbrushtool.c:52
 msgid "Paintbrush Tool: Paint smooth strokes using a brush"
-msgstr "��工��使���平���"
+msgstr "ç?»ç¬?å·¥å?·ï¼?使ç?¨ç?»ç¬?å¹³æ»?ç»?å?¶å??容"
 
-#: ../app/tools/gimppaintbrushtool.c:52
+#: ../app/tools/gimppaintbrushtool.c:53
 msgid "_Paintbrush"
 msgstr "��(_P)"
 
-#: ../app/tools/gimppaintoptions-gui.c:90
-#: ../app/tools/gimpselectionoptions.c:210
-#: ../app/widgets/gimpbrushselect.c:193 ../app/widgets/gimplayertreeview.c:266
+#: ../app/tools/gimppaintoptions-gui.c:112
+#: ../app/tools/gimpselectionoptions.c:211
+#: ../app/widgets/gimpbrushselect.c:191 ../app/widgets/gimplayertreeview.c:269
 msgid "Mode:"
 msgstr "模��"
 
-#: ../app/tools/gimppaintoptions-gui.c:105
-#: ../app/tools/gimptransformoptions.c:347
-#: ../app/widgets/gimpbrushselect.c:180 ../app/widgets/gimplayertreeview.c:289
+#: ../app/tools/gimppaintoptions-gui.c:127
+#: ../app/tools/gimptransformoptions.c:348
+#: ../app/widgets/gimpbrushselect.c:178 ../app/widgets/gimplayertreeview.c:284
 msgid "Opacity:"
 msgstr "ä¸?é??æ??度ï¼?"
 
-#: ../app/tools/gimppaintoptions-gui.c:118
+#: ../app/tools/gimppaintoptions-gui.c:137
 msgid "Brush:"
 msgstr "���"
 
-#: ../app/tools/gimppaintoptions-gui.c:123
+#: ../app/tools/gimppaintoptions-gui.c:142
 msgid "Scale:"
 msgstr "缩��"
 
-#: ../app/tools/gimppaintoptions-gui.c:130
-msgid "Aspect Ratio:"
-msgstr "宽���"
+#: ../app/tools/gimppaintoptions-gui.c:150
+msgid "Opacity"
+msgstr "ä¸?é??æ??度"
+
+#: ../app/tools/gimppaintoptions-gui.c:156
+msgid "Hardness"
+msgstr "硬度"
 
 #: ../app/tools/gimppaintoptions-gui.c:162
+msgid "Rate"
+msgstr "æ¯?ç??"
+
+#: ../app/tools/gimppaintoptions-gui.c:168 ../app/tools/tools-enums.c:151
+msgid "Size"
+msgstr "大�"
+
+#: ../app/tools/gimppaintoptions-gui.c:186
+msgid "Brush Dynamics"
+msgstr "å?¨æ??ç?»ç¬?"
+
+#: ../app/tools/gimppaintoptions-gui.c:204
+msgid "Velocity:"
+msgstr "é??ç??ï¼?"
+
+#: ../app/tools/gimppaintoptions-gui.c:210
+msgid "Random:"
+msgstr "é??æ?ºï¼?"
+
+#: ../app/tools/gimppaintoptions-gui.c:264
 msgid "Incremental"
 msgstr "��"
 
-#: ../app/tools/gimppaintoptions-gui.c:178
+#: ../app/tools/gimppaintoptions-gui.c:280
 msgid "Hard edge"
 msgstr "硬质边ç??"
 
-#: ../app/tools/gimppaintoptions-gui.c:212
+#: ../app/tools/gimppaintoptions-gui.c:565
 msgid "Fade out"
 msgstr "æ·¡å?º"
 
-#: ../app/tools/gimppaintoptions-gui.c:221
+#: ../app/tools/gimppaintoptions-gui.c:574
+#: ../app/tools/gimppaintoptions-gui.c:657
 msgid "Length:"
 msgstr "�度�"
 
-#: ../app/tools/gimppaintoptions-gui.c:241
-#: ../app/widgets/gimpviewablebox.c:223
-msgid "Reverse"
-msgstr "å??å??"
-
-#: ../app/tools/gimppaintoptions-gui.c:261
+#: ../app/tools/gimppaintoptions-gui.c:601
 msgid "Apply Jitter"
 msgstr "åº?ç?¨æ??å?¨"
 
-#: ../app/tools/gimppaintoptions-gui.c:266
+#: ../app/tools/gimppaintoptions-gui.c:606
 msgid "Amount:"
 msgstr "计��"
 
-#: ../app/tools/gimppaintoptions-gui.c:288
+#: ../app/tools/gimppaintoptions-gui.c:631
 msgid "Use color from gradient"
 msgstr "使ç?¨æ¸?å??中ç??é¢?è?²"
 
-#: ../app/tools/gimppainttool.c:142
+#: ../app/tools/gimppainttool.c:136
 msgid "Click to paint"
 msgstr "��以��"
 
-#: ../app/tools/gimppainttool.c:143
+#: ../app/tools/gimppainttool.c:137
 msgid "Click to draw the line"
 msgstr "�����线段"
 
-#: ../app/tools/gimppainttool.c:144
+#: ../app/tools/gimppainttool.c:138
 #, c-format
 msgid "%s to pick a color"
 msgstr "%s å?¯æ?¾å??é¢?è?²"
 
-#: ../app/tools/gimppainttool.c:279
-msgid "Cannot paint on layer groups."
-msgstr "�����群����"
-
-#: ../app/tools/gimppainttool.c:689
+#: ../app/tools/gimppainttool.c:662
 #, c-format
 msgid "%s for a straight line"
 msgstr "%s ����线"
 
-#: ../app/tools/gimppenciltool.c:51
+#: ../app/tools/gimppenciltool.c:52
 msgid "Pencil Tool: Hard edge painting using a brush"
 msgstr "é??ç¬?å·¥å?·ï¼?使ç?¨ç?»ç¬?å??硬边ç¼?ç??ç»?ç?»"
 
-#: ../app/tools/gimppenciltool.c:52
+#: ../app/tools/gimppenciltool.c:53
 msgid "Pe_ncil"
 msgstr "é??ç¬?(_N)"
 
-#: ../app/tools/gimpperspectiveclonetool.c:129
+#: ../app/tools/gimpperspectiveclonetool.c:127
 msgid ""
 "Perspective Clone Tool: Clone from an image source after applying a "
 "perspective transformation"
 msgstr "é??è§?å??é??å·¥å?·ï¼?ä»?åº?ç?¨é??è§?å??æ?¢ä¹?å??ç??å?¾å??æº?å??é??"
 
-#: ../app/tools/gimpperspectiveclonetool.c:131
+#: ../app/tools/gimpperspectiveclonetool.c:129
 msgid "_Perspective Clone"
 msgstr "é??è§?å??é??(_P)"
 
-#: ../app/tools/gimpperspectiveclonetool.c:704
+#: ../app/tools/gimpperspectiveclonetool.c:692
 msgid "Ctrl-Click to set a clone source"
 msgstr "Ctrl+å??å?»å?¯è®¾å®?å??é??æº?"
 
@@ -12894,82 +11327,82 @@ msgstr "è?²è°?å??离(_P)..."
 msgid "Posterize (Reduce Number of Colors)"
 msgstr "è?²è°?å??离(å??å°?é¢?è?²ç??æ?°é??)"
 
-#: ../app/tools/gimpposterizetool.c:152
+#: ../app/tools/gimpposterizetool.c:151
+#, c-format
 msgid "Posterize does not operate on indexed layers."
 msgstr "ä¸?è?½å¯¹ç´¢å¼?å?¾å±?è¿?è¡?è?²è°?å??离æ??ä½?ã??"
 
-#: ../app/tools/gimpposterizetool.c:230
+#: ../app/tools/gimpposterizetool.c:226
 msgid "Posterize _levels:"
 msgstr "è?²è°?å??离级æ?°(_L)ï¼?"
 
-#: ../app/tools/gimprectangleoptions.c:111
+#: ../app/tools/gimprectangleoptions.c:112
 msgid "Use all visible layers when shrinking the selection"
 msgstr "æ?¶ç¼©é??å?ºæ?¶ä½¿ç?¨æ??æ??ç??å?¯è§?å?¾å±?"
 
 #. Current, as in what is currently in use.
-#: ../app/tools/gimprectangleoptions.c:728
+#: ../app/tools/gimprectangleoptions.c:729
 msgid "Current"
 msgstr "å½?å??"
 
-#: ../app/tools/gimprectangleoptions.c:806
+#: ../app/tools/gimprectangleoptions.c:807
 msgid "Expand from center"
 msgstr "�中���"
 
-#: ../app/tools/gimprectangleoptions.c:829
+#: ../app/tools/gimprectangleoptions.c:830
 msgid "Fixed:"
 msgstr "���"
 
-#: ../app/tools/gimprectangleoptions.c:962
+#: ../app/tools/gimprectangleoptions.c:963
 msgid "Position:"
 msgstr "�置�"
 
-#: ../app/tools/gimprectangleoptions.c:980
+#: ../app/tools/gimprectangleoptions.c:981
 msgid "Highlight"
 msgstr "�亮"
 
 #. Auto Shrink
-#: ../app/tools/gimprectangleoptions.c:990
+#: ../app/tools/gimprectangleoptions.c:991
 msgid "Auto Shrink"
 msgstr "���缩"
 
-#: ../app/tools/gimprectangleoptions.c:997
+#: ../app/tools/gimprectangleoptions.c:998
 msgid "Shrink merged"
 msgstr "æ?¶ç¼©å??并"
 
-#: ../app/tools/gimprectangleselectoptions.c:163
+#: ../app/tools/gimprectangleselectoptions.c:164
 msgid "Rounded corners"
 msgstr "å??è§?"
 
-#: ../app/tools/gimprectangleselecttool.c:168
+#: ../app/tools/gimprectangleselecttool.c:167
 msgid "Rectangle Select"
 msgstr "ç?©å½¢é??æ?©"
 
-#: ../app/tools/gimprectangleselecttool.c:169
+#: ../app/tools/gimprectangleselecttool.c:168
 msgid "Rectangle Select Tool: Select a rectangular region"
 msgstr "ç?©å½¢é??æ?©å·¥å?·ï¼?é??æ?©ç?©å½¢å?ºå??"
 
-#: ../app/tools/gimprectangleselecttool.c:170
+#: ../app/tools/gimprectangleselecttool.c:169
 msgid "_Rectangle Select"
 msgstr "ç?©å½¢é??æ?©(_R)"
 
-#: ../app/tools/gimprectangletool.c:1158 ../app/tools/gimprectangletool.c:2220
+#: ../app/tools/gimprectangletool.c:1085 ../app/tools/gimprectangletool.c:1981
 msgid "Rectangle: "
 msgstr "�形�"
 
-#: ../app/tools/gimpregionselectoptions.c:82
+#: ../app/tools/gimpregionselectoptions.c:83
 msgid "Allow completely transparent regions to be selected"
 msgstr "å??许é??中å®?å?¨é??æ??ç??å?ºå??"
 
-#: ../app/tools/gimpregionselectoptions.c:89
-#, fuzzy
-msgid "Base selection on all visible layers"
+#: ../app/tools/gimpregionselectoptions.c:90
+msgid "Base region_select on all visible layers"
 msgstr "è??å?´é??å??以æ??æ??å?¯è§?å?¾å±?为å??"
 
-#: ../app/tools/gimpregionselectoptions.c:201
+#: ../app/tools/gimpregionselectoptions.c:202
 msgid "Select transparent areas"
 msgstr "é??æ?©é??æ??å?ºå??"
 
-#: ../app/tools/gimpregionselectoptions.c:226
+#: ../app/tools/gimpregionselectoptions.c:227
 msgid "Select by:"
 msgstr "é??æ?©äº?ï¼?"
 
@@ -12989,11 +11422,6 @@ msgstr "æ??转工å?·ï¼?æ??转å?¾å±?ï¼?é??å?ºæ??è·¯å¾?"
 msgid "_Rotate"
 msgstr "æ??转(_R)"
 
-#: ../app/tools/gimprotatetool.c:121
-msgctxt "command"
-msgid "Rotate"
-msgstr "æ??转"
-
 #: ../app/tools/gimprotatetool.c:188
 msgid "_Angle:"
 msgstr "�度(_A)�"
@@ -13006,196 +11434,188 @@ msgstr "中� _X�"
 msgid "Center _Y:"
 msgstr "中� _Y�"
 
-#: ../app/tools/gimpscaletool.c:77
+#: ../app/tools/gimpscaletool.c:78
 msgid "Scale"
 msgstr "缩�"
 
-#: ../app/tools/gimpscaletool.c:78
+#: ../app/tools/gimpscaletool.c:79
 msgid "Scale Tool: Scale the layer, selection or path"
 msgstr "缩æ?¾å·¥å?·ï¼?缩æ?¾å?¾å±?ï¼?é??å?ºæ??è·¯å¾?"
 
-#: ../app/tools/gimpscaletool.c:79
+#: ../app/tools/gimpscaletool.c:80
 msgid "_Scale"
 msgstr "缩�(_S)"
 
-#: ../app/tools/gimpscaletool.c:105
+#: ../app/tools/gimpscaletool.c:106
 msgctxt "command"
 msgid "Scale"
 msgstr "缩�"
 
-#: ../app/tools/gimpselectionoptions.c:257 ../app/tools/gimptextoptions.c:502
+#: ../app/tools/gimpselectionoptions.c:258 ../app/tools/gimptextoptions.c:473
 msgid "Antialiasing"
 msgstr "边�平�"
 
-#: ../app/tools/gimpselectionoptions.c:272
+#: ../app/tools/gimpselectionoptions.c:273
 msgid "Feather edges"
 msgstr "è¾¹ç¼?ç¾½å??"
 
-#: ../app/tools/gimpselectiontool.c:253
+#: ../app/tools/gimpselectiontool.c:251
 msgid "Click-Drag to replace the current selection"
 msgstr "ç?¹å?»å¹¶æ??å?¨æ??æ?¿æ?¢å½?å??é??å?º"
 
-#: ../app/tools/gimpselectiontool.c:261
+#: ../app/tools/gimpselectiontool.c:259
 msgid "Click-Drag to create a new selection"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯å??建æ?°ç??é??å?º"
 
-#: ../app/tools/gimpselectiontool.c:266
+#: ../app/tools/gimpselectiontool.c:264
 msgid "Click-Drag to add to the current selection"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯æ·»å? å?°å½?å??é??å?º"
 
-#: ../app/tools/gimpselectiontool.c:275
+#: ../app/tools/gimpselectiontool.c:273
 msgid "Click-Drag to subtract from the current selection"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ä»?é??å?ºä¸­å??å?»"
 
-#: ../app/tools/gimpselectiontool.c:284
+#: ../app/tools/gimpselectiontool.c:282
 msgid "Click-Drag to intersect with the current selection"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ä¸?å½?å??é??å?ºç?¸äº¤"
 
-#: ../app/tools/gimpselectiontool.c:294
+#: ../app/tools/gimpselectiontool.c:292
 msgid "Click-Drag to move the selection mask"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨é??å?ºè??æ?¿"
 
-#: ../app/tools/gimpselectiontool.c:302
+#: ../app/tools/gimpselectiontool.c:300
 msgid "Click-Drag to move the selected pixels"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨é??中ç??å??ç´ "
 
-#: ../app/tools/gimpselectiontool.c:306
+#: ../app/tools/gimpselectiontool.c:304
 msgid "Click-Drag to move a copy of the selected pixels"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨é??中å??ç´ ç??å?¯æ?¬"
 
-#: ../app/tools/gimpselectiontool.c:310
+#: ../app/tools/gimpselectiontool.c:308
 msgid "Click to anchor the floating selection"
 msgstr "ç?¹å?»å?¯å?ºå®?æµ®å?¨é??å?º"
 
-#: ../app/tools/gimpsheartool.c:81
+#: ../app/tools/gimpsheartool.c:82
 msgid "Shear"
 msgstr "å??å??"
 
-#: ../app/tools/gimpsheartool.c:82
+#: ../app/tools/gimpsheartool.c:83
 msgid "Shear Tool: Shear the layer, selection or path"
 msgstr "å??å??å·¥å?·ï¼?å??å??å?¾å±?ï¼?é??å?ºæ??è·¯å¾?"
 
-#: ../app/tools/gimpsheartool.c:83
+#: ../app/tools/gimpsheartool.c:84
 msgid "S_hear"
 msgstr "å??å??(_H)"
 
-#: ../app/tools/gimpsheartool.c:109
+#: ../app/tools/gimpsheartool.c:110
 msgctxt "command"
 msgid "Shear"
 msgstr "å??å??"
 
-#: ../app/tools/gimpsheartool.c:133
+#: ../app/tools/gimpsheartool.c:134
 msgid "Shear magnitude _X:"
 msgstr "å??å??é?? _Xï¼?"
 
-#: ../app/tools/gimpsheartool.c:143
+#: ../app/tools/gimpsheartool.c:144
 msgid "Shear magnitude _Y:"
 msgstr "å??å??é?? _Yï¼?"
 
-#: ../app/tools/gimpsmudgetool.c:53
+#: ../app/tools/gimpsmudgetool.c:54
 msgid "Smudge Tool: Smudge selectively using a brush"
 msgstr "æ¶?æ?¹å·¥å?·ï¼?使ç?¨ç?»ç¬?é??æ?©æ?§å?°æ¶?æ?¹"
 
-#: ../app/tools/gimpsmudgetool.c:54
+#: ../app/tools/gimpsmudgetool.c:55
 msgid "_Smudge"
 msgstr "��(_S)"
 
-#: ../app/tools/gimpsmudgetool.c:73
+#: ../app/tools/gimpsmudgetool.c:74
 msgid "Click to smudge"
 msgstr "��以��"
 
-#: ../app/tools/gimpsmudgetool.c:74
+#: ../app/tools/gimpsmudgetool.c:75
 msgid "Click to smudge the line"
 msgstr "�����线段"
 
-#: ../app/tools/gimptextoptions.c:137
+#: ../app/tools/gimptextoptions.c:127
 msgid ""
 "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr "å¾®è°?å°?ä¿®æ?¹å­?ä½?ç??è½®å»?ï¼?使ä¹?产ç??æ¸?æ?°ç??å°?尺寸ä½?å?¾"
 
-#: ../app/tools/gimptextoptions.c:145
-msgid "The text language may have an effect on the way the text is rendered."
-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:161
+#: ../app/tools/gimptextoptions.c:159
 msgid "Indentation of the first line"
 msgstr "第ä¸?è¡?ç??缩è¿?深度"
 
-#: ../app/tools/gimptextoptions.c:167
+#: ../app/tools/gimptextoptions.c:165
 msgid "Adjust line spacing"
 msgstr "��线��"
 
-#: ../app/tools/gimptextoptions.c:173
+#: ../app/tools/gimptextoptions.c:171
 msgid "Adjust letter spacing"
 msgstr "����符�"
 
-#: ../app/tools/gimptextoptions.c:179
-msgid "Text box resize mode"
-msgstr "æ??å­?æ¡?è°?æ?´å¤§å°?模å¼?"
-
-#: ../app/tools/gimptextoptions.c:186
-msgid ""
-"Use an external editor window for text entry, instead of direct-on-canvas "
-"editing"
-msgstr "æ??å­?è¾?å?¥ä½¿ç?¨å¤?é?¨ç¼?è¾?å?¨çª?å?£ï¼?è??ä¸?æ?¯å?¨ç?»å¸?ä¸?ç?´æ?¥ç¼?è¾?"
-
-#: ../app/tools/gimptextoptions.c:482
+#: ../app/tools/gimptextoptions.c:445
 msgid "Font:"
 msgstr "å­?ä½?ï¼?"
 
-#: ../app/tools/gimptextoptions.c:498
-msgid "Use editor"
-msgstr "使����"
-
-#: ../app/tools/gimptextoptions.c:518
-msgid "Hinting:"
+#
+#: ../app/tools/gimptextoptions.c:461
+msgid "Hinting"
 msgstr "微��"
 
-#: ../app/tools/gimptextoptions.c:522
+#: ../app/tools/gimptextoptions.c:466
+msgid "Force auto-hinter"
+msgstr "强���微�"
+
+#: ../app/tools/gimptextoptions.c:487
 msgid "Text Color"
 msgstr "æ??å­?é¢?è?²"
 
-#: ../app/tools/gimptextoptions.c:527
+#: ../app/tools/gimptextoptions.c:492
 msgid "Color:"
 msgstr "���"
 
-#: ../app/tools/gimptextoptions.c:533
+#: ../app/tools/gimptextoptions.c:498
 msgid "Justify:"
 msgstr "对��"
 
-#: ../app/tools/gimptextoptions.c:556
-msgid "Box:"
-msgstr "æ??å­?æ¡?ï¼?"
-
-#: ../app/tools/gimptextoptions.c:570
-msgid "Language:"
-msgstr "语��"
+#
+#. Create a path from the current text
+#: ../app/tools/gimptextoptions.c:520
+msgid "Path from Text"
+msgstr "ä»?æ??å­?å??建路å¾?(_P)"
 
-#: ../app/tools/gimptexttool.c:194
-msgid "Text"
-msgstr "æ??å­?"
+#
+#: ../app/tools/gimptextoptions.c:527
+msgid "Text along Path"
+msgstr "æ??å­?对é½?è·¯å¾?(_G)"
 
-#: ../app/tools/gimptexttool.c:195
+#: ../app/tools/gimptexttool.c:162
 msgid "Text Tool: Create or edit text layers"
 msgstr "æ??å­?å·¥å?·ï¼?å??建æ??ç¼?è¾?æ??å­?å?¾å±?"
 
-#: ../app/tools/gimptexttool.c:196
+#: ../app/tools/gimptexttool.c:163
 msgid "Te_xt"
-msgstr "æ??å­?(_X)"
+msgstr "æ??æ?¬(_X)"
 
-#: ../app/tools/gimptexttool.c:959
-msgid "Reshape Text Layer"
-msgstr "å??æ ?æ ¼å??æ??å­?å?¾å±?"
+#: ../app/tools/gimptexttool.c:987
+msgid "GIMP Text Editor"
+msgstr "GIMP æ??æ?¬ç¼?è¾?å?¨"
 
-#: ../app/tools/gimptexttool.c:1497 ../app/tools/gimptexttool.c:1500
+#: ../app/tools/gimptexttool.c:1103 ../app/tools/gimptexttool.c:1106
 msgid "Confirm Text Editing"
 msgstr "确认ç¼?è¾?æ??å­?"
 
-#: ../app/tools/gimptexttool.c:1504
+#: ../app/tools/gimptexttool.c:1110
 msgid "Create _New Layer"
 msgstr "å??建æ?°å?¾å±?(_N)"
 
-#: ../app/tools/gimptexttool.c:1528
+#: ../app/tools/gimptexttool.c:1134
 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 "
@@ -13208,9 +11628,9 @@ msgstr ""
 "\n"
 "æ?¨å?¯ä»¥ç¼?è¾?æ­¤å?¾å±?æ??è??ä»?å®?ç??æ??å­?å±?æ?§å??建æ?°ç??æ??å­?å?¾å±?ã??"
 
-#: ../app/tools/gimptexttool-editor.c:1118
-msgid "GIMP Text Editor"
-msgstr "GIMP æ??æ?¬ç¼?è¾?å?¨"
+#: ../app/tools/gimptexttool.c:1356
+msgid "Reshape Text Layer"
+msgstr "å??æ ?æ ¼å??æ??å­?å?¾å±?"
 
 #: ../app/tools/gimpthresholdtool.c:91
 msgid "Threshold Tool: Reduce image to two colors using a threshold"
@@ -13232,80 +11652,71 @@ msgstr "导å?¥é??å?¼è®¾ç½®"
 msgid "Export Threshold Settings"
 msgstr "导å?ºé??å?¼è®¾ç½®"
 
-#: ../app/tools/gimpthresholdtool.c:162
+#: ../app/tools/gimpthresholdtool.c:161
+#, c-format
 msgid "Threshold does not operate on indexed layers."
 msgstr "ç´¢å¼?å?¾å±?ä¸?è?½è¿?è¡?é??å?¼æ??ä½?ã??"
 
-#: ../app/tools/gimpthresholdtool.c:270
+#: ../app/tools/gimpthresholdtool.c:266
 msgid "Automatically adjust to optimal binarization threshold"
 msgstr "è?ªå?¨è°?æ?´å?°æ??ä½³äº?å?¼å??é??å?¼"
 
-#: ../app/tools/gimptool.c:886
-msgid "Can't work on an empty image, add a layer first"
-msgstr "ä¸?è?½å?¨ç©ºç??å?¾å??ä¸?æ??ä½?ï¼?å??æ·»å? å?¾å±?"
-
-#: ../app/tools/gimptransformoptions.c:272
+#: ../app/tools/gimptransformoptions.c:273
 msgid "Transform:"
 msgstr "å??æ?¢ï¼?"
 
-#: ../app/tools/gimptransformoptions.c:281
-#: ../app/widgets/gimpdynamicseditor.c:150
-#: ../app/widgets/gimpdynamicsoutputeditor.c:227
+#: ../app/tools/gimptransformoptions.c:282
 msgid "Direction"
 msgstr "æ?¹å??"
 
 #. the interpolation menu
-#: ../app/tools/gimptransformoptions.c:286
+#: ../app/tools/gimptransformoptions.c:287
 msgid "Interpolation:"
 msgstr "æ??å?¼ï¼?"
 
-#: ../app/tools/gimptransformoptions.c:299
+#: ../app/tools/gimptransformoptions.c:300
 msgid "Clipping:"
 msgstr "翻转�"
 
-#: ../app/tools/gimptransformoptions.c:317
+#: ../app/tools/gimptransformoptions.c:318
 msgid "Preview:"
 msgstr "���"
 
-#: ../app/tools/gimptransformoptions.c:388
+#: ../app/tools/gimptransformoptions.c:389
 #, c-format
 msgid "15 degrees  (%s)"
 msgstr "15 度(%s)"
 
-#: ../app/tools/gimptransformoptions.c:392
+#: ../app/tools/gimptransformoptions.c:393
 #, c-format
 msgid "Keep aspect  (%s)"
 msgstr "ä¿?æ??宽é«?æ¯?(%s)"
 
-#: ../app/tools/gimptransformtool.c:240
+#: ../app/tools/gimptransformtool.c:238
 msgid "Transforming"
 msgstr "æ­£å?¨å??æ?¢"
 
-#: ../app/tools/gimptransformtool.c:1177
+#: ../app/tools/gimptransformtool.c:1165
 msgid "There is no layer to transform."
 msgstr "没æ??å?¾å±?å?¯ä»¥å??æ?¢ã??"
 
-#: ../app/tools/gimptransformtool.c:1190
+#: ../app/tools/gimptransformtool.c:1176
 msgid "There is no path to transform."
 msgstr "没æ??è·¯å¾?å?¯ä»¥å??æ?¢ã??"
 
-#: ../app/tools/gimptransformtool.c:1191
-msgid "The active path's strokes are locked."
-msgstr "æ´»å?¨è·¯å¾?ç??ç¬?å??被é??å®?ã??"
-
-#: ../app/tools/gimpvectoroptions.c:76
+#: ../app/tools/gimpvectoroptions.c:77
 msgid "Restrict editing to polygons"
 msgstr "ç¼?è¾?é??äº?å¤?边形"
 
-#: ../app/tools/gimpvectoroptions.c:155
+#: ../app/tools/gimpvectoroptions.c:156
 msgid "Edit Mode"
 msgstr "��模�"
 
-#: ../app/tools/gimpvectoroptions.c:173
+#: ../app/tools/gimpvectoroptions.c:174
 msgid "Polygonal"
 msgstr "�边形"
 
-#: ../app/tools/gimpvectoroptions.c:177
+#: ../app/tools/gimpvectoroptions.c:178
 #, c-format
 msgid ""
 "Path to Selection\n"
@@ -13319,741 +11730,627 @@ msgstr ""
 "%s �交"
 
 #. Create a selection from the current path
-#: ../app/tools/gimpvectoroptions.c:188
+#: ../app/tools/gimpvectoroptions.c:189
 msgid "Selection from Path"
 msgstr "ä»?è·¯å¾?å??建é??å?º"
 
-#: ../app/tools/gimpvectortool.c:163
+#: ../app/tools/gimpvectortool.c:161
 msgid "Paths Tool: Create and edit paths"
 msgstr "è·¯å¾?å·¥å?·ï¼?å??建并ç¼?è¾?è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:164
+#: ../app/tools/gimpvectortool.c:162
 msgid "Pat_hs"
 msgstr "路�(_H)"
 
-#: ../app/tools/gimpvectortool.c:254
-msgid "The active path is locked."
-msgstr "æ´»å?¨è·¯å¾?被é??å®?ã??"
-
-#: ../app/tools/gimpvectortool.c:342
+#: ../app/tools/gimpvectortool.c:322
 msgid "Add Stroke"
 msgstr "æ·»å? ç¬?å??"
 
-#: ../app/tools/gimpvectortool.c:366
+#: ../app/tools/gimpvectortool.c:345
 msgid "Add Anchor"
 msgstr "æ·»å? é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:392
+#: ../app/tools/gimpvectortool.c:370
 msgid "Insert Anchor"
 msgstr "æ??å?¥é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:423
+#: ../app/tools/gimpvectortool.c:400
 msgid "Drag Handle"
-msgstr "æ??å?¨è??ç?¹"
+msgstr "æ??æ?³è??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:453
+#: ../app/tools/gimpvectortool.c:429
 msgid "Drag Anchor"
-msgstr "æ??å?¨é??ç?¹"
+msgstr "æ??æ?³é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:471
+#: ../app/tools/gimpvectortool.c:446
 msgid "Drag Anchors"
-msgstr "æ??å?¨å¤?个é??ç?¹"
+msgstr "æ??æ?³å¤?个é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:494
+#: ../app/tools/gimpvectortool.c:468
 msgid "Drag Curve"
-msgstr "æ??å?¨æ?²çº¿"
+msgstr "æ??æ?³æ?²çº¿"
 
-#: ../app/tools/gimpvectortool.c:523
+#: ../app/tools/gimpvectortool.c:496
 msgid "Connect Strokes"
 msgstr "è¿?æ?¥ç¬?å??"
 
-#: ../app/tools/gimpvectortool.c:555
+#: ../app/tools/gimpvectortool.c:527
 msgid "Drag Path"
 msgstr "æ??å?¨è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:566
+#: ../app/tools/gimpvectortool.c:537
 msgid "Convert Edge"
 msgstr "转�边�"
 
-#: ../app/tools/gimpvectortool.c:597
+#: ../app/tools/gimpvectortool.c:567
 msgid "Delete Anchor"
 msgstr "å? é?¤é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:620
+#: ../app/tools/gimpvectortool.c:589
 msgid "Delete Segment"
-msgstr "��段"
+msgstr "å? é?¤ç??段"
 
-#: ../app/tools/gimpvectortool.c:839
+#: ../app/tools/gimpvectortool.c:807
 msgid "Move Anchors"
 msgstr "移å?¨å¤?个é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:1199
+#: ../app/tools/gimpvectortool.c:1167
 msgid "Click to pick path to edit"
 msgstr "ç?¹å?»å?¯æ?¾å??è·¯å¾?并ç¼?è¾?"
 
-#: ../app/tools/gimpvectortool.c:1203
+#: ../app/tools/gimpvectortool.c:1171
 msgid "Click to create a new path"
 msgstr "ç?¹å?»å?¯å??建æ?°ç??è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:1207
+#: ../app/tools/gimpvectortool.c:1175
 msgid "Click to create a new component of the path"
 msgstr "ç?¹å?»å?¯å??建æ?°ç??è·¯å¾?ç»?件"
 
-#: ../app/tools/gimpvectortool.c:1211
+#: ../app/tools/gimpvectortool.c:1179
 msgid "Click or Click-Drag to create a new anchor"
 msgstr "ç?¹å?»æ??ç?¹å?»æ??å?¨å?¯å??建æ?°ç??é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:1221 ../app/tools/gimpvectortool.c:1228
+#: ../app/tools/gimpvectortool.c:1189 ../app/tools/gimpvectortool.c:1196
 msgid "Click-Drag to move the anchor around"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:1232 ../app/tools/gimpvectortool.c:1255
+#: ../app/tools/gimpvectortool.c:1200 ../app/tools/gimpvectortool.c:1213
 msgid "Click-Drag to move the anchors around"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨å¤?个é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:1238
+#: ../app/tools/gimpvectortool.c:1204
 msgid "Click-Drag to move the handle around"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨è??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:1245
-msgid "Click-Drag to move the handles around symmetrically"
-msgstr "ç?¹å?»å¹¶æ??å?¨å?¯å¯¹ç§°å?°ç§»å?¨è??ç?¹"
-
-#: ../app/tools/gimpvectortool.c:1260
+#: ../app/tools/gimpvectortool.c:1218
 msgid "Click-Drag to change the shape of the curve"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯æ?¹å??æ?²çº¿ç??å½¢ç?¶"
 
-#: ../app/tools/gimpvectortool.c:1263
+#: ../app/tools/gimpvectortool.c:1221
 #, c-format
 msgid "%s: symmetrical"
 msgstr "%s�对称"
 
-#: ../app/tools/gimpvectortool.c:1268
+#: ../app/tools/gimpvectortool.c:1226
 msgid "Click-Drag to move the component around"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨ç»?件"
 
-#: ../app/tools/gimpvectortool.c:1276
+#: ../app/tools/gimpvectortool.c:1234
 msgid "Click-Drag to move the path around"
 msgstr "ç?¹å?»å¹¶æ??å?¨å?¯ç§»å?¨è·¯å¾?"
 
-#: ../app/tools/gimpvectortool.c:1280
+#: ../app/tools/gimpvectortool.c:1238
 msgid "Click-Drag to insert an anchor on the path"
 msgstr "ç?¹å?»å?¯å?¨è·¯å¾?中æ??å?¥æ?°ç??é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:1288
+#: ../app/tools/gimpvectortool.c:1246
 msgid "Click to delete this anchor"
 msgstr "ç?¹å?»å?¯å? é?¤æ­¤é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:1292
+#: ../app/tools/gimpvectortool.c:1250
 msgid "Click to connect this anchor with the selected endpoint"
 msgstr "ç?¹å?»å?¯è¿?æ?¥æ­¤é??ç?¹ä¸?é??中ç??端ç?¹"
 
-#: ../app/tools/gimpvectortool.c:1297
+#: ../app/tools/gimpvectortool.c:1255
 msgid "Click to open up the path"
 msgstr "�����路�"
 
-#: ../app/tools/gimpvectortool.c:1301
+#: ../app/tools/gimpvectortool.c:1259
 msgid "Click to make this node angular"
 msgstr "ç?¹å?»å?¯ä½¿æ­¤è??ç?¹æ??为è§?ç?¹"
 
-#: ../app/tools/gimpvectortool.c:1813
+#: ../app/tools/gimpvectortool.c:1766
 msgid "Delete Anchors"
 msgstr "å? é?¤é??ç?¹"
 
-#: ../app/tools/gimpvectortool.c:1984
+#: ../app/tools/gimpvectortool.c:1939
 msgid "There is no active layer or channel to stroke to"
 msgstr "没æ??æ´»å?¨å?¾å±?æ??é??é??å?¯ä»¥å?¾ç?»"
 
-#: ../app/tools/tools-enums.c:92
-msgctxt "rectangle-guide"
+#
+#: ../app/tools/tools-enums.c:58
 msgid "No guides"
 msgstr "æ? å??è??线"
 
-#: ../app/tools/tools-enums.c:93
-msgctxt "rectangle-guide"
+#
+#: ../app/tools/tools-enums.c:59
 msgid "Center lines"
 msgstr "中线"
 
-#: ../app/tools/tools-enums.c:94
-msgctxt "rectangle-guide"
+#
+#: ../app/tools/tools-enums.c:60
 msgid "Rule of thirds"
 msgstr "ä¸?å??æ??å?¾æ³?"
 
-#: ../app/tools/tools-enums.c:95
-#, fuzzy
-msgctxt "rectangle-guide"
-msgid "Rule of fifths"
-msgstr "ä¸?å??æ??å?¾æ³?"
-
-#: ../app/tools/tools-enums.c:96
-msgctxt "rectangle-guide"
+#
+#: ../app/tools/tools-enums.c:61
 msgid "Golden sections"
 msgstr "é»?é??å??å?²"
 
-#: ../app/tools/tools-enums.c:97
-msgctxt "rectangle-guide"
-msgid "Diagonal lines"
-msgstr "对�线"
-
-#: ../app/tools/tools-enums.c:187
-msgctxt "rectangle-tool-fixed-rule"
+#: ../app/tools/tools-enums.c:148
 msgid "Aspect ratio"
 msgstr "宽��"
 
-#: ../app/tools/tools-enums.c:188
-msgctxt "rectangle-tool-fixed-rule"
+#: ../app/tools/tools-enums.c:149 ../app/widgets/gimpgrideditor.c:265
+#: ../app/widgets/gimpgrideditor.c:297
 msgid "Width"
 msgstr "宽度"
 
-#: ../app/tools/tools-enums.c:189
-msgctxt "rectangle-tool-fixed-rule"
+#: ../app/tools/tools-enums.c:150 ../app/widgets/gimpgrideditor.c:267
+#: ../app/widgets/gimpgrideditor.c:299
 msgid "Height"
 msgstr "�度"
 
-#: ../app/tools/tools-enums.c:190
-msgctxt "rectangle-tool-fixed-rule"
-msgid "Size"
-msgstr "大�"
-
-#: ../app/tools/tools-enums.c:219
-msgctxt "rect-select-mode"
+#
+#: ../app/tools/tools-enums.c:179
 msgid "Free select"
 msgstr "è?ªç?±é??æ?©"
 
-#: ../app/tools/tools-enums.c:220
-msgctxt "rect-select-mode"
+#
+#: ../app/tools/tools-enums.c:180
 msgid "Fixed size"
-msgstr "��大�"
+msgstr "é??å®?大å°?"
 
-#: ../app/tools/tools-enums.c:221
-msgctxt "rect-select-mode"
+#
+#: ../app/tools/tools-enums.c:181
 msgid "Fixed aspect ratio"
-msgstr "��宽��"
+msgstr "é??å®?宽é«?æ¯?"
 
-#: ../app/tools/tools-enums.c:250
-msgctxt "transform-type"
-msgid "Layer"
-msgstr "��"
-
-#: ../app/tools/tools-enums.c:251
-msgctxt "transform-type"
-msgid "Selection"
-msgstr "é??å?º"
-
-#: ../app/tools/tools-enums.c:252
-msgctxt "transform-type"
+#: ../app/tools/tools-enums.c:211 ../app/vectors/gimpvectors.c:192
 msgid "Path"
 msgstr "路�"
 
-#: ../app/tools/tools-enums.c:282
-msgctxt "transform-preview-type"
+#
+#: ../app/tools/tools-enums.c:240
 msgid "Outline"
 msgstr "轮�"
 
-#: ../app/tools/tools-enums.c:283
-msgctxt "transform-preview-type"
-msgid "Grid"
-msgstr "ç½?æ ¼"
-
-#: ../app/tools/tools-enums.c:284
-msgctxt "transform-preview-type"
-msgid "Image"
-msgstr "å?¾å??"
-
-#: ../app/tools/tools-enums.c:285
-msgctxt "transform-preview-type"
+#
+#: ../app/tools/tools-enums.c:243
 msgid "Image + Grid"
 msgstr "å?¾å?? + ç½?æ ¼"
 
-#: ../app/tools/tools-enums.c:313
-msgctxt "transform-grid-type"
+#
+#: ../app/tools/tools-enums.c:270
 msgid "Number of grid lines"
 msgstr "ç½?格线æ?°é??"
 
-#: ../app/tools/tools-enums.c:314
-msgctxt "transform-grid-type"
+#
+#: ../app/tools/tools-enums.c:271
 msgid "Grid line spacing"
 msgstr "�格线��"
 
-#: ../app/tools/tools-enums.c:343
-msgctxt "vector-mode"
+#
+#: ../app/tools/tools-enums.c:299
 msgid "Design"
 msgstr "设计"
 
-#: ../app/tools/tools-enums.c:344
-msgctxt "vector-mode"
-msgid "Edit"
-msgstr "ç¼?è¾?"
-
-#: ../app/tools/tools-enums.c:345
-msgctxt "vector-mode"
+#
+#: ../app/tools/tools-enums.c:301
 msgid "Move"
 msgstr "移�"
 
-#: ../app/vectors/gimpvectors.c:206
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/vectors/gimpvectors.c:193
 msgid "Rename Path"
 msgstr "é??å?½å??è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:207
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/vectors/gimpvectors.c:194 ../app/vectors/gimpvectors.c:316
 msgid "Move Path"
 msgstr "移�路�"
 
-#: ../app/vectors/gimpvectors.c:208
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/vectors/gimpvectors.c:195
 msgid "Scale Path"
 msgstr "缩�路�"
 
-#: ../app/vectors/gimpvectors.c:209
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/vectors/gimpvectors.c:196
 msgid "Resize Path"
 msgstr "æ?¹å??è·¯å¾?大å°?"
 
-#: ../app/vectors/gimpvectors.c:210
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/vectors/gimpvectors.c:197 ../app/vectors/gimpvectors.c:415
 msgid "Flip Path"
 msgstr "翻转路�"
 
-#: ../app/vectors/gimpvectors.c:211
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/vectors/gimpvectors.c:198 ../app/vectors/gimpvectors.c:446
 msgid "Rotate Path"
 msgstr "æ??转路å¾?"
 
-#: ../app/vectors/gimpvectors.c:212
-#, fuzzy
-msgctxt "undo-type"
+#: ../app/vectors/gimpvectors.c:199 ../app/vectors/gimpvectors.c:476
 msgid "Transform Path"
 msgstr "å??æ?¢è·¯å¾?"
 
-#: ../app/vectors/gimpvectors.c:213
-#, fuzzy
-msgctxt "undo-type"
-msgid "Stroke Path"
-msgstr "��路�"
-
-#: ../app/vectors/gimpvectors.c:214
-#, fuzzy
-msgctxt "undo-type"
-msgid "Path to Selection"
-msgstr "è·¯å¾?å?°é??å?º"
-
-#: ../app/vectors/gimpvectors.c:215
-#, fuzzy
-msgctxt "undo-type"
-msgid "Reorder Path"
-msgstr "é??æ??è·¯å¾?"
-
-#: ../app/vectors/gimpvectors.c:216
-#, fuzzy
-msgctxt "undo-type"
-msgid "Raise Path"
-msgstr "å??é«?è·¯å¾?"
-
-#: ../app/vectors/gimpvectors.c:217
-#, fuzzy
-msgctxt "undo-type"
-msgid "Raise Path to Top"
-msgstr "路�移�顶端"
-
-#: ../app/vectors/gimpvectors.c:218
-#, fuzzy
-msgctxt "undo-type"
-msgid "Lower Path"
-msgstr "é??ä½?è·¯å¾?"
-
-#: ../app/vectors/gimpvectors.c:219
-#, fuzzy
-msgctxt "undo-type"
-msgid "Lower Path to Bottom"
-msgstr "路�移��端"
-
-#: ../app/vectors/gimpvectors.c:220
-msgid "Path cannot be raised higher."
-msgstr "è·¯å¾?æ? æ³?å??å??é«?ã??"
-
-#: ../app/vectors/gimpvectors.c:221
-msgid "Path cannot be lowered more."
-msgstr "è·¯å¾?æ? æ³?å??é??ä½?ã??"
-
-#: ../app/vectors/gimpvectors.c:364
-msgid "Move Path"
-msgstr "移�路�"
-
-#: ../app/vectors/gimpvectors.c:463
-msgid "Flip Path"
-msgstr "翻转路�"
-
-#: ../app/vectors/gimpvectors.c:494
-msgid "Rotate Path"
-msgstr "æ??转路å¾?"
-
-#: ../app/vectors/gimpvectors.c:524
-msgid "Transform Path"
-msgstr "å??æ?¢è·¯å¾?"
-
-#: ../app/vectors/gimpvectors-export.c:95
+#: ../app/vectors/gimpvectors-export.c:96
 #, c-format
 msgid "Error while writing '%s': %s"
 msgstr "å??å?¥â??%sâ??æ?¶å?ºé??ï¼?%s"
 
-#: ../app/vectors/gimpvectors-import.c:330
+#: ../app/vectors/gimpvectors-import.c:296
 msgid "Import Paths"
 msgstr "导�路�"
 
-#: ../app/vectors/gimpvectors-import.c:341
+#: ../app/vectors/gimpvectors-import.c:307
 msgid "Imported Path"
 msgstr "导å?¥ç??è·¯å¾?"
 
-#: ../app/vectors/gimpvectors-import.c:372
+#: ../app/vectors/gimpvectors-import.c:336
 #, c-format
 msgid "No paths found in '%s'"
 msgstr "â??%sâ??中æ?ªæ?¾å?°è·¯å¾?"
 
-#: ../app/vectors/gimpvectors-import.c:376
+#: ../app/vectors/gimpvectors-import.c:339
+#, c-format
 msgid "No paths found in the buffer"
 msgstr "���中���路�"
 
-#: ../app/vectors/gimpvectors-import.c:386
+#: ../app/vectors/gimpvectors-import.c:349
 #, c-format
 msgid "Failed to import paths from '%s': %s"
 msgstr "æ? æ³?ä»?â??%sâ??导å?¥è·¯å¾?ï¼?%s"
 
-#: ../app/widgets/gimpactioneditor.c:66
+#: ../app/widgets/gimpactioneditor.c:71
 msgid "_Search:"
 msgstr "æ??ç´¢(_S)"
 
-#: ../app/widgets/gimpactiongroup.c:867
+#: ../app/widgets/gimpactiongroup.c:802
 #, 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:337
-#: ../app/widgets/gimpcontrollereditor.c:344
+#: ../app/widgets/gimpactionview.c:346
+#: ../app/widgets/gimpcontrollereditor.c:348
 msgid "Action"
 msgstr "��"
 
-#: ../app/widgets/gimpactionview.c:366
+#: ../app/widgets/gimpactionview.c:375
 msgid "Shortcut"
 msgstr "å¿«æ?·é?®"
 
-#: ../app/widgets/gimpactionview.c:392
+#: ../app/widgets/gimpactionview.c:401
 msgid "Name"
 msgstr "å??å­?"
 
-#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832
+#: ../app/widgets/gimpactionview.c:641 ../app/widgets/gimpactionview.c:846
 msgid "Changing shortcut failed."
 msgstr "æ?¹å??å¿«æ?·é?®å¤±è´¥ã??"
 
-#: ../app/widgets/gimpactionview.c:669
+#: ../app/widgets/gimpactionview.c:683
 msgid "Conflicting Shortcuts"
 msgstr "快����"
 
-#: ../app/widgets/gimpactionview.c:675
+#: ../app/widgets/gimpactionview.c:689
 msgid "_Reassign shortcut"
 msgstr "é??æ?°å??é??å¿«æ?·é?®(_R)"
 
-#: ../app/widgets/gimpactionview.c:690
+#: ../app/widgets/gimpactionview.c:704
 #, 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:694
+#: ../app/widgets/gimpactionview.c:708
 #, c-format
 msgid "Reassigning the shortcut will cause it to be removed from \"%s\"."
 msgstr "é??æ?°å??é??å¿«æ?·é?®å°?导è?´å®?ä»?â??%sâ??中被å?»æ??ã??"
 
-#: ../app/widgets/gimpactionview.c:767
+#: ../app/widgets/gimpactionview.c:781
 msgid "Invalid shortcut."
 msgstr "æ? æ??ç??å¿«æ?·é?®ã??"
 
-#: ../app/widgets/gimpactionview.c:856
+#: ../app/widgets/gimpactionview.c:870
 msgid "Removing shortcut failed."
 msgstr "å? é?¤å¿«æ?·é?®å¤±è´¥ã??"
 
-#: ../app/widgets/gimpbrusheditor.c:168
+#: ../app/widgets/gimpbrusheditor.c:169
 msgid "Spikes:"
 msgstr "ç©?æ?°ï¼?"
 
-#: ../app/widgets/gimpbrusheditor.c:181
+#: ../app/widgets/gimpbrusheditor.c:182
 msgid "Hardness:"
 msgstr "硬度�"
 
-#: ../app/widgets/gimpbrusheditor.c:194
+#: ../app/widgets/gimpbrusheditor.c:195
 msgid "Aspect ratio:"
 msgstr "宽���"
 
-#: ../app/widgets/gimpbrusheditor.c:220
-#: ../app/widgets/gimpbrushfactoryview.c:81
+#: ../app/widgets/gimpbrusheditor.c:221
+#: ../app/widgets/gimpbrushfactoryview.c:82
 msgid "Spacing:"
 msgstr "é?´è·?ï¼?"
 
-#: ../app/widgets/gimpbrusheditor.c:223
-#: ../app/widgets/gimpbrushfactoryview.c:84
+#: ../app/widgets/gimpbrusheditor.c:224
+#: ../app/widgets/gimpbrushfactoryview.c:85
 msgid "Percentage of width of brush"
 msgstr "ç?»ç¬?宽度ç??ç?¾å??æ¯?"
 
 #: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257
-#: ../app/widgets/gimpeditor.c:735
+#: ../app/widgets/gimpeditor.c:754
 msgid "(None)"
 msgstr "(æ? )"
 
-#: ../app/widgets/gimpcolordialog.c:149
+#: ../app/widgets/gimpchanneltreeview.c:119
+msgid "Reorder Channel"
+msgstr "é??æ??é??é??"
+
+#: ../app/widgets/gimpchanneltreeview.c:321
+msgid "Empty Channel"
+msgstr "空ç?½é??é??"
+
+#: ../app/widgets/gimpcolordialog.c:150
 msgid "Add the current color to the color history"
 msgstr "å°?å½?å??é¢?è?²æ·»å? å?°é¢?è?²å??å?²"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:151
+#: ../app/widgets/gimpcolordisplayeditor.c:152
 msgid "Available Filters"
 msgstr "å?¯ç?¨ç??滤é??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:212
+#: ../app/widgets/gimpcolordisplayeditor.c:213
 msgid "Move the selected filter up"
 msgstr "é??中ç??滤é??ä¸?移"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:221
+#: ../app/widgets/gimpcolordisplayeditor.c:222
 msgid "Move the selected filter down"
 msgstr "é??中ç??滤é??ä¸?移"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:267
+#: ../app/widgets/gimpcolordisplayeditor.c:268
 msgid "Active Filters"
 msgstr "æ´»å?¨æ»¤é??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:318
+#: ../app/widgets/gimpcolordisplayeditor.c:319
 msgid "Reset the selected filter to default values"
 msgstr "å°?é??中ç??滤é??é??ç½®å?°é»?认å?¼"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:492
+#: ../app/widgets/gimpcolordisplayeditor.c:493
 #, c-format
 msgid "Add '%s' to the list of active filters"
 msgstr "å°?â??%sâ??æ·»å? å?°æ´»å?¨æ»¤é??å??表"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:529
+#: ../app/widgets/gimpcolordisplayeditor.c:530
 #, c-format
 msgid "Remove '%s' from the list of active filters"
 msgstr "ä»?æ´»å?¨æ»¤é??å??表中å? é?¤â??%sâ??"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:560
+#: ../app/widgets/gimpcolordisplayeditor.c:561
 msgid "No filter selected"
 msgstr "æ?ªé??æ?©æ»¤é??"
 
-#: ../app/widgets/gimpcoloreditor.c:259
+#: ../app/widgets/gimpcoloreditor.c:263
 msgid ""
 "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
 "CSS color names."
 msgstr "å?¨ HTML å?? CSS 中使ç?¨ç??å??å?­è¿?å?¶é¢?è?²æ ¼å¼?ã??æ­¤å¤?ä¹?å??许使ç?¨ CSS è?²å½©å??ã??"
 
-#: ../app/widgets/gimpcolorframe.c:508
+#: ../app/widgets/gimpcolorframe.c:501
 msgid "Index:"
 msgstr "索��"
 
-#: ../app/widgets/gimpcolorframe.c:521 ../app/widgets/gimpcolorframe.c:547
+#: ../app/widgets/gimpcolorframe.c:514 ../app/widgets/gimpcolorframe.c:540
 msgid "Red:"
 msgstr "红��"
 
-#: ../app/widgets/gimpcolorframe.c:522 ../app/widgets/gimpcolorframe.c:548
+#: ../app/widgets/gimpcolorframe.c:515 ../app/widgets/gimpcolorframe.c:541
 msgid "Green:"
 msgstr "绿��"
 
-#: ../app/widgets/gimpcolorframe.c:523 ../app/widgets/gimpcolorframe.c:549
+#: ../app/widgets/gimpcolorframe.c:516 ../app/widgets/gimpcolorframe.c:542
 msgid "Blue:"
 msgstr "è??è?²ï¼?"
 
-#: ../app/widgets/gimpcolorframe.c:536 ../app/widgets/gimpcolorframe.c:569
+#: ../app/widgets/gimpcolorframe.c:529 ../app/widgets/gimpcolorframe.c:562
 msgid "Value:"
 msgstr "亮度�"
 
-#: ../app/widgets/gimpcolorframe.c:560
+#: ../app/widgets/gimpcolorframe.c:553
 msgid "Hex:"
 msgstr "å??å?­è¿?å?¶ï¼?"
 
-#: ../app/widgets/gimpcolorframe.c:567
+#: ../app/widgets/gimpcolorframe.c:560
 msgid "Hue:"
 msgstr "���"
 
-#: ../app/widgets/gimpcolorframe.c:568
+#: ../app/widgets/gimpcolorframe.c:561
 msgid "Sat.:"
 msgstr "饱å??度ï¼?"
 
-#: ../app/widgets/gimpcolorframe.c:586
+#: ../app/widgets/gimpcolorframe.c:579
 msgid "Cyan:"
 msgstr "é??è?²ï¼?"
 
-#: ../app/widgets/gimpcolorframe.c:587
+#: ../app/widgets/gimpcolorframe.c:580
 msgid "Magenta:"
 msgstr "å??红ï¼?"
 
-#: ../app/widgets/gimpcolorframe.c:588
+#: ../app/widgets/gimpcolorframe.c:581
 msgid "Yellow:"
 msgstr "���"
 
-#: ../app/widgets/gimpcolorframe.c:589
+#: ../app/widgets/gimpcolorframe.c:582
 msgid "Black:"
 msgstr "���"
 
-#: ../app/widgets/gimpcolorframe.c:609
+#: ../app/widgets/gimpcolorframe.c:602
 msgid "Alpha:"
 msgstr "Alphaï¼?"
 
-#: ../app/widgets/gimpcolormapeditor.c:208
+#: ../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 "��索��"
 
-#: ../app/widgets/gimpcolormapeditor.c:218
+#: ../app/widgets/gimpcolormapeditor.c:235
 msgid "HTML notation:"
 msgstr "HTML 格��"
 
-#: ../app/widgets/gimpcolormapeditor.c:472
+#: ../app/widgets/gimpcolormapeditor.c:492
 msgid "Only indexed images have a colormap."
 msgstr "å?ªæ??ç´¢å¼?å?¾å??å?·æ??é¢?è?²è¡¨"
 
-#: ../app/widgets/gimpcolorselectorpalette.c:58
+#: ../app/widgets/gimpcolorselectorpalette.c:59
 msgid "Palette"
 msgstr "��"
 
-#: ../app/widgets/gimpcontainerpopup.c:578
+#: ../app/widgets/gimpcontainerpopup.c:571
 msgid "Smaller Previews"
 msgstr "å??å°?é¢?è§?"
 
-#: ../app/widgets/gimpcontainerpopup.c:583
+#: ../app/widgets/gimpcontainerpopup.c:576
 msgid "Larger Previews"
 msgstr "�大��"
 
-#: ../app/widgets/gimpcontrollereditor.c:201
+#: ../app/widgets/gimpcontrollereditor.c:202
 msgid "_Dump events from this controller"
 msgstr "转�此����件(_D)"
 
-#: ../app/widgets/gimpcontrollereditor.c:206
+#: ../app/widgets/gimpcontrollereditor.c:207
 msgid "_Enable this controller"
 msgstr "��此���(_E)"
 
-#: ../app/widgets/gimpcontrollereditor.c:227
+#: ../app/widgets/gimpcontrollereditor.c:228
 msgid "Name:"
 msgstr "å??称ï¼?"
 
-#: ../app/widgets/gimpcontrollereditor.c:233
+#: ../app/widgets/gimpcontrollereditor.c:234
 msgid "State:"
 msgstr "ç?¶æ??ï¼?"
 
-#: ../app/widgets/gimpcontrollereditor.c:338
+#: ../app/widgets/gimpcontrollereditor.c:342
 msgid "Event"
 msgstr "�件"
 
-#: ../app/widgets/gimpcontrollereditor.c:363
+#: ../app/widgets/gimpcontrollereditor.c:367
 msgid "_Grab event"
 msgstr "æ??å??äº?件(_G)"
 
-#: ../app/widgets/gimpcontrollereditor.c:372
+#: ../app/widgets/gimpcontrollereditor.c:377
 msgid "Select the next event arriving from the controller"
 msgstr "é??æ?©æ?§å?¶å?¨å¸¦æ?¥ç??ä¸?个äº?件"
 
-#: ../app/widgets/gimpcontrollereditor.c:530
+#: ../app/widgets/gimpcontrollereditor.c:535
 #, c-format
 msgid "Remove the action assigned to '%s'"
 msgstr "å? é?¤æ??æ´¾ç»?â??%sâ??ç??å?¨ä½?"
 
-#: ../app/widgets/gimpcontrollereditor.c:535
+#: ../app/widgets/gimpcontrollereditor.c:540
 #, c-format
 msgid "Assign an action to '%s'"
 msgstr "为â??%sâ??æ??æ´¾å?¨ä½?"
 
-#: ../app/widgets/gimpcontrollereditor.c:656
+#: ../app/widgets/gimpcontrollereditor.c:661
 #, c-format
 msgid "Select Action for Event '%s'"
 msgstr "é??æ?©äº?件â??%sâ??ç??å?¨ä½?"
 
-#: ../app/widgets/gimpcontrollereditor.c:661
+#: ../app/widgets/gimpcontrollereditor.c:666
 msgid "Select Controller Event Action"
 msgstr "é??æ?©æ?§å?¶å?¨äº?件å?¨ä½?"
 
-#: ../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
+#: ../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
 msgid "Cursor Up"
 msgstr "å??æ ?ä¸?移"
 
-#: ../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
+#: ../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
 msgid "Cursor Down"
 msgstr "å??æ ?ä¸?移"
 
-#: ../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
+#: ../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
 msgid "Cursor Left"
 msgstr "å??æ ?左移"
 
-#: ../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
+#: ../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
 msgid "Cursor Right"
 msgstr "å??æ ?å?³ç§»"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:177
+#: ../app/widgets/gimpcontrollerkeyboard.c:178
 msgid "Keyboard"
 msgstr "é?®ç??"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:221
+#: ../app/widgets/gimpcontrollerkeyboard.c:222
 msgid "Keyboard Events"
-msgstr "é?®ç??æ¶?æ?¯"
+msgstr "é?®ç??äº?件"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:222
-#: ../app/widgets/gimpcontrollerwheel.c:224
+#: ../app/widgets/gimpcontrollerkeyboard.c:223
+#: ../app/widgets/gimpcontrollerwheel.c:225
 msgid "Ready"
 msgstr "就绪"
 
-#: ../app/widgets/gimpcontrollerlist.c:181
+#: ../app/widgets/gimpcontrollerlist.c:182
 msgid "Available Controllers"
 msgstr "å?¯ç?¨ç??æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:273
+#: ../app/widgets/gimpcontrollerlist.c:274
 msgid "Active Controllers"
 msgstr "æ´»å?¨ç??æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:289
+#: ../app/widgets/gimpcontrollerlist.c:290
 msgid "Configure the selected controller"
 msgstr "é??ç½®é??中ç??æ?§å?¶å?¨"
 
-#: ../app/widgets/gimpcontrollerlist.c:297
+#: ../app/widgets/gimpcontrollerlist.c:298
 msgid "Move the selected controller up"
 msgstr "é??中ç??æ?§å?¶å?¨ä¸?移"
 
-#: ../app/widgets/gimpcontrollerlist.c:305
+#: ../app/widgets/gimpcontrollerlist.c:306
 msgid "Move the selected controller down"
 msgstr "é??中ç??æ?§å?¶å?¨ä¸?移"
 
-#: ../app/widgets/gimpcontrollerlist.c:429
+#: ../app/widgets/gimpcontrollerlist.c:430
 #, c-format
 msgid "Add '%s' to the list of active controllers"
 msgstr "å°?â??%sâ??æ·»å? å?°æ´»å?¨æ?§å?¶å?¨å??表"
 
-#: ../app/widgets/gimpcontrollerlist.c:480
+#: ../app/widgets/gimpcontrollerlist.c:481
 #, c-format
 msgid "Remove '%s' from the list of active controllers"
 msgstr "ä»?æ´»å?¨æ?§å?¶å?¨å??表中å? é?¤â??%sâ??"
@@ -14068,7 +12365,7 @@ msgstr ""
 "\n"
 "å?¨æ?¨ç??æ´»å?¨æ?§å?¶å?¨å??表中已ç»?æ??ä¸?个é?®ç??æ?§å?¶å?¨ã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:525
+#: ../app/widgets/gimpcontrollerlist.c:524
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
@@ -14090,12 +12387,13 @@ msgstr "�����"
 msgid "Remove Controller"
 msgstr "�����"
 
-#: ../app/widgets/gimpcontrollerlist.c:570
+#: ../app/widgets/gimpcontrollerlist.c:569
 #, c-format
 msgid "Remove Controller '%s'?"
 msgstr "å? é?¤â??%sâ??æ?§å?¶å?¨å??ï¼?"
 
-#: ../app/widgets/gimpcontrollerlist.c:574
+#: ../app/widgets/gimpcontrollerlist.c:573
+#, c-format
 msgid ""
 "Removing this controller from the list of active controllers will "
 "permanently delete all event mappings you have configured.\n"
@@ -14107,148 +12405,88 @@ msgstr ""
 "\n"
 "é??æ?©â??ç¦?ç?¨æ?§å?¶å?¨â??å?¯ä»¥ç¦?ç?¨æ?§å?¶å?¨è??é??移é?¤å®?ã??"
 
-#: ../app/widgets/gimpcontrollerlist.c:626
+#: ../app/widgets/gimpcontrollerlist.c:633
 msgid "Configure Input Controller"
 msgstr "é??ç½®è¾?å?¥æ?§å?¶å?¨"
 
-#: ../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
+#: ../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
 msgid "Scroll Up"
 msgstr "��"
 
-#: ../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
+#: ../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
 msgid "Scroll Down"
 msgstr "��"
 
-#: ../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
+#: ../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
 msgid "Scroll Left"
 msgstr "左�"
 
-#: ../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
+#: ../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
 msgid "Scroll Right"
 msgstr "��"
 
-#: ../app/widgets/gimpcontrollerwheel.c:179
+#: ../app/widgets/gimpcontrollerwheel.c:180
 msgid "Mouse Wheel"
 msgstr "é¼ æ ?æ»?è½®"
 
-#: ../app/widgets/gimpcontrollerwheel.c:223
+#: ../app/widgets/gimpcontrollerwheel.c:224
 msgid "Mouse Wheel Events"
 msgstr "鼠��轮�件"
 
-#: ../app/widgets/gimpdataeditor.c:221
+#: ../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
 msgid "Save"
 msgstr "ä¿?å­?"
 
-#: ../app/widgets/gimpdataeditor.c:229
+#: ../app/widgets/gimpdataeditor.c:228
 msgid "Revert"
 msgstr "��"
 
-#: ../app/widgets/gimpdataeditor.c:445
+#: ../app/widgets/gimpdataeditor.c:444
 #, c-format
 msgid "%s (read only)"
 msgstr "%s (�读)"
 
-#: ../app/widgets/gimpdeviceeditor.c:161
-msgid "Delete the selected device"
-msgstr "å? é?¤é??中ç??设å¤?"
-
-#: ../app/widgets/gimpdeviceeditor.c:469
-msgid "Delete Device Settings"
-msgstr "��设�设置"
-
-#: ../app/widgets/gimpdeviceeditor.c:490
-#, c-format
-msgid "Delete \"%s\"?"
-msgstr "å? é?¤â??%sâ??ï¼?"
-
-#: ../app/widgets/gimpdeviceeditor.c:493
-msgid ""
-"You are about to delete this device's stored settings.\n"
-"The next time this device is plugged, default settings will be used."
-msgstr ""
-"æ?¨æ­£è¯?å?¾å? é?¤æ­¤è®¾å¤?å·²å­?å?¨ç??设置ã??\n"
-"ä¸?次此设å¤?被æ??å?¥æ?¶ï¼?å°?åº?ç?¨é»?认设置ã??"
-
-#: ../app/widgets/gimpdeviceinfoeditor.c:142
-#: ../app/widgets/gimpdynamicseditor.c:148
-#: ../app/widgets/gimpdynamicsoutputeditor.c:213
-msgid "Pressure"
-msgstr "å??å??"
-
-#: ../app/widgets/gimpdeviceinfoeditor.c:143
-msgid "X tilt"
-msgstr "X å?¾æ??"
-
-#: ../app/widgets/gimpdeviceinfoeditor.c:144
-msgid "Y tilt"
-msgstr "X å?¾æ??"
-
-#: ../app/widgets/gimpdeviceinfoeditor.c:145
-#: ../app/widgets/gimpdynamicseditor.c:152
-#: ../app/widgets/gimpdynamicsoutputeditor.c:241
-msgid "Wheel"
-msgstr "æ»?è½®"
-
-#. the axes
-#: ../app/widgets/gimpdeviceinfoeditor.c:192
-msgid "Axes"
-msgstr "轴线"
-
-#. the keys
-#: ../app/widgets/gimpdeviceinfoeditor.c:266
-msgid "Keys"
-msgstr "æ??é?®"
-
-#: ../app/widgets/gimpdeviceinfoeditor.c:366
-#: ../app/widgets/gimpdeviceinfoeditor.c:584
-#, c-format
-msgid "none"
-msgstr "æ? "
-
-#: ../app/widgets/gimpdeviceinfoeditor.c:414
-#, c-format
-msgid "%s Curve"
-msgstr "%s �线"
-
-#: ../app/widgets/gimpdeviceinfoeditor.c:473
-#: ../app/widgets/gimpdynamicsoutputeditor.c:196
-msgid "_Reset Curve"
-msgstr "é??ç½®æ?²çº¿(_R)"
-
-#: ../app/widgets/gimpdeviceinfoeditor.c:486
-#, c-format
-msgid "The axis '%s' has no curve"
-msgstr "è½´â??%sâ??没æ??æ?²çº¿"
-
-#: ../app/widgets/gimpdevicestatus.c:139
+#: ../app/widgets/gimpdevicestatus.c:138
 msgid "Save device status"
 msgstr "ä¿?å­?设å¤?ç?¶æ??"
 
@@ -14262,144 +12500,79 @@ msgstr "å??æ?¯ï¼?%d, %d, %d"
 msgid "Background: %d, %d, %d"
 msgstr "è??æ?¯ï¼?%d, %d, %d"
 
-#: ../app/widgets/gimpdnd-xds.c:203
+#: ../app/widgets/gimpdnd-xds.c:190
 msgid "The given filename does not have any known file extension."
 msgstr "ç»?å®?ç??æ??件å??ä¸?å??å?«ä»»ä½?å·²ç?¥ç??æ??件æ?©å±?å??ã??"
 
-#: ../app/widgets/gimpdnd-xds.c:221
+#: ../app/widgets/gimpdnd-xds.c:208
 msgid "File Exists"
 msgstr "æ??件已å­?å?¨"
 
-#: ../app/widgets/gimpdnd-xds.c:226
+#: ../app/widgets/gimpdnd-xds.c:213
 msgid "_Replace"
 msgstr "æ?¿æ?¢(_R)"
 
-#: ../app/widgets/gimpdnd-xds.c:237
+#: ../app/widgets/gimpdnd-xds.c:224
 #, c-format
 msgid "A file named '%s' already exists."
-msgstr "å·²å­?å?¨ä¸?个å?«â??%sâ??ç??æ??件ã??"
+msgstr "å·²å­?å?¨ä¸?个å??称为â??%sâ??ç??æ??件ã??"
 
-#: ../app/widgets/gimpdnd-xds.c:242
+#: ../app/widgets/gimpdnd-xds.c:229
 msgid "Do you want to replace it with the image you are saving?"
 msgstr "æ?¨ç??ç??è¦?å°?å®?æ?¿æ?¢ä¸ºæ?¨æ­£å?¨ä¿?å­?ç??å?¾å??å??ï¼?"
 
-#. String used to separate dockables, e.g. "Tool Options, Layers"
-#: ../app/widgets/gimpdock.h:34
-msgctxt "dock"
-msgid ", "
-msgstr "ï¼?"
-
-#. String used to separate books (GtkNotebooks) within a dock,
-#. e.g. "Tool Options, Layers - Brushes"
-#.
-#: ../app/widgets/gimpdock.h:39
-msgctxt "dock"
-msgid " - "
-msgstr " - "
-
-#. String used to separate dock columns,
-#. e.g. "Tool Options, Layers - Brushes | Gradients"
-#.
-#: ../app/widgets/gimpdock.h:44
-msgctxt "dock"
-msgid " | "
-msgstr " | "
-
-#: ../app/widgets/gimpdockbook.c:290
+#: ../app/widgets/gimpdockable.c:194
 msgid "Configure this tab"
-msgstr "é??置此页签"
-
-#. Auto button
-#: ../app/widgets/gimpdockwindow.c:353
-msgid "Auto"
-msgstr "��"
+msgstr "é??置此æ ?ç­¾"
 
-#: ../app/widgets/gimpdockwindow.c:364
-msgid ""
-"When enabled the dialog automatically follows the image you are working on."
-msgstr "å¦?æ??å?¯ç?¨ï¼?对è¯?æ¡?å°?è?ªå?¨è·?é??æ?¨å·¥ä½?ç??å?¾å??ã??"
+#: ../app/widgets/gimpdockseparator.c:44
+msgid "You can drop dockable dialogs here"
+msgstr "æ?¨å?¯ä»¥å°?å?¯å??é? ç??对è¯?æ¡?æ?¾å?¨è¿?é??"
 
-#: ../app/widgets/gimpdrawabletreeview.c:124
-msgid "Lock pixels"
-msgstr "é??å®?å??ç´ "
-
-#: ../app/widgets/gimpdynamicseditor.c:133
-#: ../app/widgets/gimpdynamicseditor.c:139
-msgid "Mapping matrix"
-msgstr "æ? å°?ç?©é?µ"
-
-#: ../app/widgets/gimpdynamicseditor.c:149
-#: ../app/widgets/gimpdynamicsoutputeditor.c:220
-msgid "Velocity"
-msgstr "é??ç??"
-
-#: ../app/widgets/gimpdynamicseditor.c:151
-#: ../app/widgets/gimpdynamicsoutputeditor.c:234
-msgid "Tilt"
-msgstr "å?¾æ??"
-
-#: ../app/widgets/gimpdynamicseditor.c:153
-#: ../app/widgets/gimpdynamicsoutputeditor.c:248
-msgid "Random"
-msgstr "é??æ?º"
-
-#: ../app/widgets/gimpdynamicseditor.c:154
-#: ../app/widgets/gimpdynamicsoutputeditor.c:255
-msgid "Fade"
-msgstr "æ·¡å?º"
-
-#: ../app/widgets/gimperrordialog.c:150
+#: ../app/widgets/gimperrordialog.c:151
 msgid "Too many error messages!"
-msgstr "太å¤?é??误æ¶?æ?¯ï¼?"
+msgstr "é??误æ¶?æ?¯è¿?å¤?ï¼?"
 
-#: ../app/widgets/gimperrordialog.c:151
+#: ../app/widgets/gimperrordialog.c:152
 msgid "Messages are redirected to stderr."
 msgstr "æ¶?æ?¯å·²è¢«é??å®?å??å?° stderrã??"
 
-#: ../app/widgets/gimperrordialog.c:170
+#: ../app/widgets/gimperrordialog.c:171
 #, c-format
 msgid "%s Message"
 msgstr "%s ��"
 
-#: ../app/widgets/gimpfiledialog.c:326
+#: ../app/widgets/gimpfiledialog.c:310
 msgid "Automatically Detected"
 msgstr "����"
 
-#: ../app/widgets/gimpfiledialog.c:343
+#: ../app/widgets/gimpfiledialog.c:320
 msgid "By Extension"
 msgstr "æ??æ?©å±?å??"
 
-#: ../app/widgets/gimpfiledialog.c:799
+#: ../app/widgets/gimpfiledialog.c:652
 msgid "All files"
 msgstr "å?¨é?¨æ??件"
 
-#: ../app/widgets/gimpfiledialog.c:804
+#: ../app/widgets/gimpfiledialog.c:657
 msgid "All images"
 msgstr "å?¨é?¨å?¾å??"
 
-#: ../app/widgets/gimpfiledialog.c:980
+#: ../app/widgets/gimpfiledialog.c:786
 #, c-format
 msgid "Select File _Type (%s)"
 msgstr "é??æ?©æ??件类å??(%s)(_T)"
 
-#: ../app/widgets/gimpfileprocview.c:186
+#: ../app/widgets/gimpfileprocview.c:187
 msgid "File Type"
 msgstr "æ??件类å??"
 
-#: ../app/widgets/gimpfileprocview.c:198
+#: ../app/widgets/gimpfileprocview.c:199
 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:413
+#: ../app/widgets/gimpgradienteditor.c:414
 msgid "Instant update"
 msgstr "����"
 
@@ -14485,47 +12658,39 @@ msgstr "���置�%0.4f"
 msgid "Distance: %0.4f"
 msgstr "�离�%0.4f"
 
-#: ../app/widgets/gimpgrideditor.c:216
+#: ../app/widgets/gimpgrideditor.c:217
 msgid "Line _style:"
 msgstr "线�样�(_S)�"
 
-#: ../app/widgets/gimpgrideditor.c:220
+#: ../app/widgets/gimpgrideditor.c:221
 msgid "Change grid foreground color"
 msgstr "æ?¹å??ç½?æ ¼å??æ?¯è?²"
 
-#: ../app/widgets/gimpgrideditor.c:227
+#: ../app/widgets/gimpgrideditor.c:228
 msgid "_Foreground color:"
 msgstr "å??æ?¯è?²(_F)ï¼?"
 
-#: ../app/widgets/gimpgrideditor.c:231
+#: ../app/widgets/gimpgrideditor.c:232
 msgid "Change grid background color"
 msgstr "æ?¹å??ç½?æ ¼è??æ?¯è?²"
 
-#: ../app/widgets/gimpgrideditor.c:238
+#: ../app/widgets/gimpgrideditor.c:239
 msgid "_Background color:"
 msgstr "è??æ?¯è?²(_B)ï¼?"
 
-#: ../app/widgets/gimpgrideditor.c:243
+#: ../app/widgets/gimpgrideditor.c:244
 msgid "Spacing"
 msgstr "é?´è·?"
 
-#: ../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
+#: ../app/widgets/gimphelp.c:294
 msgid "Help browser is missing"
 msgstr "帮å?©æ??件æµ?è§?å?¨ç¼ºå¤±"
 
-#: ../app/widgets/gimphelp.c:294
+#: ../app/widgets/gimphelp.c:295
 msgid "The GIMP help browser is not available."
 msgstr "GIMP 帮å?©æµ?è§?å?¨ä¸?å?¯ç?¨ã??"
 
-#: ../app/widgets/gimphelp.c:295
+#: ../app/widgets/gimphelp.c:296
 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."
@@ -14533,31 +12698,31 @@ msgstr ""
 "æ?¨ä¼¼ä¹?没æ??å®?è£? GIMP 帮å?©æµ?è§?å?¨æ??件ã??æ?¨å?¯ä»¥ä½¿ç?¨ç½?页æµ?è§?å?¨ä»¥æµ?è§? GIMP 帮å?©æ??"
 "件ã??"
 
-#: ../app/widgets/gimphelp.c:336
+#: ../app/widgets/gimphelp.c:337
 msgid "Help browser doesn't start"
 msgstr "帮å?©æµ?è§?å?¨æ²¡æ??å?¯å?¨"
 
-#: ../app/widgets/gimphelp.c:337
+#: ../app/widgets/gimphelp.c:338
 msgid "Could not start the GIMP help browser plug-in."
 msgstr "æ? æ³?å?¯å?¨ GIMP 帮å?©æµ?è§?å?¨æ??件ã??"
 
-#: ../app/widgets/gimphelp.c:364
+#: ../app/widgets/gimphelp.c:365
 msgid "Use _Web Browser"
 msgstr "使� _Web ���"
 
-#: ../app/widgets/gimphelp.c:610
+#: ../app/widgets/gimphelp.c:614
 msgid "GIMP user manual is missing"
-msgstr "GIMP ç?¨æ?·æ??å??缺失"
+msgstr "GIMP ç?¨æ?·æ??å??æ?ªæ?¾å?°"
 
-#: ../app/widgets/gimphelp.c:617
+#: ../app/widgets/gimphelp.c:621
 msgid "_Read Online"
 msgstr "å?¨çº¿é??读(_R)"
 
-#: ../app/widgets/gimphelp.c:641
+#: ../app/widgets/gimphelp.c:645
 msgid "The GIMP user manual is not installed on your computer."
 msgstr "GIMP ç?¨æ?·æ??å??æ?ªå?¨æ?¨ç??计ç®?æ?ºä¸?å®?è£?ã??"
 
-#: ../app/widgets/gimphelp.c:644
+#: ../app/widgets/gimphelp.c:648
 msgid ""
 "You may either install the additional help package or change your "
 "preferences to use the online version."
@@ -14591,24 +12756,13 @@ msgstr "ç?¾å??æ¯?ï¼?"
 msgid "Channel:"
 msgstr "é??é??ï¼?"
 
-#. Button
-#: ../app/widgets/gimpimagecommenteditor.c:107
-msgid "Use default comment"
-msgstr "使ç?¨é»?认注é??"
-
-#: ../app/widgets/gimpimagecommenteditor.c:109
-msgid ""
-"Replace the current image comment with the default comment set in "
-"Editâ??Preferencesâ??Default Image."
-msgstr "ç?¨å?¨ç¼?è¾?â??é¦?é??项â??é»?认å?¾å??中设置ç??é»?认注é??æ?¿æ?¢å½?å??å?¾å??注é??ã??"
-
 #: ../app/widgets/gimpimageprofileview.c:200
 msgid "Querying..."
 msgstr "正��询..."
 
 #: ../app/widgets/gimpimagepropview.c:122
-msgid "Size in pixels:"
-msgstr "尺寸æ??å??ç´ ï¼?"
+msgid "Pixel dimensions:"
+msgstr "å??素尺寸ï¼?"
 
 #: ../app/widgets/gimpimagepropview.c:125
 msgid "Print size:"
@@ -14662,68 +12816,80 @@ msgstr "é??é??æ?°é??ï¼?"
 msgid "Number of paths:"
 msgstr "è·¯å¾?æ?°é??ï¼?"
 
-#. no undo (or redo) steps available
-#: ../app/widgets/gimpimagepropview.c:416
-msgid "None"
-msgstr "æ? "
-
-#: ../app/widgets/gimpimagepropview.c:470
+#: ../app/widgets/gimpimagepropview.c:471
 #, c-format
 msgid "pixels/%s"
 msgstr "å??ç´ /%s"
 
-#: ../app/widgets/gimpimagepropview.c:472
+#: ../app/widgets/gimpimagepropview.c:473
 #, c-format
 msgid "%g Ã? %g %s"
 msgstr "%g x %g %s"
 
-#: ../app/widgets/gimpimagepropview.c:493
+#: ../app/widgets/gimpimagepropview.c:494
 msgid "colors"
 msgstr "è?²"
 
-#: ../app/widgets/gimpitemtreeview.c:708
-msgid "Lock:"
-msgstr "é??å®?ï¼?"
-
-#: ../app/widgets/gimpitemtreeview.c:1481
+#: ../app/widgets/gimpitemtreeview.c:980
 msgid "Set Item Exclusive Visible"
 msgstr "设置项�����"
 
-#: ../app/widgets/gimpitemtreeview.c:1489
+#: ../app/widgets/gimpitemtreeview.c:988
 msgid "Set Item Exclusive Linked"
 msgstr "设置项�����"
 
-#: ../app/widgets/gimplayertreeview.c:309
+#: ../app/widgets/gimplayertreeview.c:218
+msgid "Reorder Layer"
+msgstr "é??æ??å?¾å±?"
+
+#: ../app/widgets/gimplayertreeview.c:306
 msgid "Lock alpha channel"
 msgstr "é??å®? Alpha é??é??"
 
-#: ../app/widgets/gimpmessagebox.c:439
+#: ../app/widgets/gimplayertreeview.c:318
+msgid "Lock:"
+msgstr "é??å®?ï¼?"
+
+#: ../app/widgets/gimplayertreeview.c:841
+msgid "Empty Layer"
+msgstr "空���"
+
+#: ../app/widgets/gimpmenudock.c:159
+msgid "Auto"
+msgstr "��"
+
+#: ../app/widgets/gimpmenudock.c:170
+msgid ""
+"When enabled the dialog automatically follows the image you are working on."
+msgstr "å¦?æ??å?¯ç?¨ï¼?对è¯?æ¡?å°?è?ªå?¨è·?é??æ?¨å·¥ä½?ç??å?¾å??ã??"
+
+#: ../app/widgets/gimpmessagebox.c:443
 #, c-format
 msgid "Message repeated %d times."
 msgstr "æ¶?æ?¯é??å¤?äº? %d 次ã??"
 
-#: ../app/widgets/gimpmessagebox.c:441
+#: ../app/widgets/gimpmessagebox.c:445
 msgid "Message repeated once."
 msgstr "æ¶?æ?¯é??å¤?äº?ä¸?次ã??"
 
-#: ../app/widgets/gimppaletteeditor.c:252
-#: ../app/widgets/gimppaletteeditor.c:743
+#: ../app/widgets/gimppaletteeditor.c:255
+#: ../app/widgets/gimppaletteeditor.c:741
 msgid "Undefined"
 msgstr "���"
 
-#: ../app/widgets/gimppaletteeditor.c:260
+#: ../app/widgets/gimppaletteeditor.c:263
 msgid "Columns:"
 msgstr "å??æ?°ï¼?"
 
-#: ../app/widgets/gimpprofilechooserdialog.c:136
+#: ../app/widgets/gimpprofilechooserdialog.c:137
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC è?²å½©é??ç½®æ??件(*.icc, *.icm)"
 
-#: ../app/widgets/gimpprogressdialog.c:221
+#: ../app/widgets/gimpprogressdialog.c:220
 msgid "Progress"
 msgstr "�度"
 
-#: ../app/widgets/gimpselectiondata.c:249
+#: ../app/widgets/gimpselectiondata.c:242
 #, c-format
 msgid ""
 "The filename '%s' couldn't be converted to a valid URI:\n"
@@ -14734,43 +12900,43 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/widgets/gimpselectiondata.c:253
+#: ../app/widgets/gimpselectiondata.c:246
 msgid "Invalid UTF-8"
 msgstr "æ? æ??ç?? UTF-8"
 
-#: ../app/widgets/gimpsettingsbox.c:241
+#: ../app/widgets/gimpsettingsbox.c:239
 msgid "Pick a setting from the list"
 msgstr "ä»?å??表中é??æ?©è®¾ç½®"
 
-#: ../app/widgets/gimpsettingsbox.c:262
+#: ../app/widgets/gimpsettingsbox.c:260
 msgid "Add settings to favorites"
 msgstr "å°?设置添å? å?°æ?¶è??"
 
-#: ../app/widgets/gimpsettingsbox.c:290
+#: ../app/widgets/gimpsettingsbox.c:288
 msgid "_Import Settings from File..."
 msgstr "ä»?æ??件导å?¥è®¾ç½®(_I)..."
 
-#: ../app/widgets/gimpsettingsbox.c:296
+#: ../app/widgets/gimpsettingsbox.c:294
 msgid "_Export Settings to File..."
 msgstr "å°?设置导å?ºå?°æ??件(_E)..."
 
-#: ../app/widgets/gimpsettingsbox.c:303
+#: ../app/widgets/gimpsettingsbox.c:301
 msgid "_Manage Settings..."
 msgstr "管ç??设置(_M)"
 
-#: ../app/widgets/gimpsettingsbox.c:590
+#: ../app/widgets/gimpsettingsbox.c:588
 msgid "Add Settings to Favorites"
 msgstr "æ·»å? é??项å?°æ?¶è??夹"
 
-#: ../app/widgets/gimpsettingsbox.c:593
+#: ../app/widgets/gimpsettingsbox.c:591
 msgid "Enter a name for the settings"
 msgstr "为设置å?½å??"
 
-#: ../app/widgets/gimpsettingsbox.c:594
+#: ../app/widgets/gimpsettingsbox.c:592
 msgid "Saved Settings"
 msgstr "å·²ä¿?å­?ç??é??项"
 
-#: ../app/widgets/gimpsettingsbox.c:630
+#: ../app/widgets/gimpsettingsbox.c:627
 msgid "Manage Saved Settings"
 msgstr "管ç??å·²ä¿?å­?设置"
 
@@ -14786,140 +12952,96 @@ msgstr "导å?ºè®¾ç½®å?°æ??件"
 msgid "Delete the selected settings"
 msgstr "å? é?¤é??中ç??设置"
 
-#: ../app/widgets/gimpsizebox.c:460
+#: ../app/widgets/gimpsizebox.c:464
 #, c-format
 msgid "%d Ã? %d ppi"
 msgstr "%d x %d ppi"
 
-#: ../app/widgets/gimpsizebox.c:462
+#: ../app/widgets/gimpsizebox.c:466
 #, c-format
 msgid "%d ppi"
 msgstr "%d ppi"
 
-#: ../app/widgets/gimpstrokeeditor.c:187
+#: ../app/widgets/gimpstrokeeditor.c:185
 msgid "Line width:"
 msgstr "线宽�"
 
-#: ../app/widgets/gimpstrokeeditor.c:199
+#: ../app/widgets/gimpstrokeeditor.c:202
 msgid "_Line Style"
 msgstr "线�格(_L)"
 
-#: ../app/widgets/gimpstrokeeditor.c:218
+#: ../app/widgets/gimpstrokeeditor.c:221
 msgid "_Cap style:"
 msgstr "帽ç??é£?æ ¼(_C)ï¼?"
 
-#: ../app/widgets/gimpstrokeeditor.c:224
+#: ../app/widgets/gimpstrokeeditor.c:227
 msgid "_Join style:"
 msgstr "æ?¥å??é£?æ ¼(_J)ï¼?"
 
-#: ../app/widgets/gimpstrokeeditor.c:229
+#: ../app/widgets/gimpstrokeeditor.c:232
 msgid "_Miter limit:"
 msgstr "æ??æ?¥é??å?¶(_M)ï¼?"
 
-#: ../app/widgets/gimpstrokeeditor.c:236
+#: ../app/widgets/gimpstrokeeditor.c:239
 msgid "Dash pattern:"
 msgstr "è??线模å¼?ï¼?"
 
-#: ../app/widgets/gimpstrokeeditor.c:299
+#: ../app/widgets/gimpstrokeeditor.c:302
 msgid "Dash _preset:"
 msgstr "è??线é¢?设(_P)ï¼?"
 
-#: ../app/widgets/gimptagentry.c:43
-msgid "filter"
-msgstr "�滤"
-
-#: ../app/widgets/gimptagentry.c:44
-msgid "enter tags"
-msgstr "���签"
-
-#. Seperator for tags
-#. * IMPORTANT: use only one of Unicode terminal punctuation chars.
-#. * http://unicode.org/review/pr-23.html
-#.
-#: ../app/widgets/gimptagentry.c:1716
-msgid ","
-msgstr "ï¼?"
+#: ../app/widgets/gimpstrokeeditor.c:323
+msgid "_Antialiasing"
+msgstr "å??é?¯é½¿(_A)"
 
-#: ../app/widgets/gimptemplateeditor.c:179
+#: ../app/widgets/gimptemplateeditor.c:180
 #, c-format
 msgid "%p"
 msgstr "%p"
 
-#: ../app/widgets/gimptemplateeditor.c:254
+#: ../app/widgets/gimptemplateeditor.c:255
 msgid "_Advanced Options"
 msgstr "é«?级é??项(_A)"
 
-#: ../app/widgets/gimptemplateeditor.c:361
+#: ../app/widgets/gimptemplateeditor.c:362
 msgid "Color _space:"
 msgstr "�彩空�(_S)�"
 
-#: ../app/widgets/gimptemplateeditor.c:369
+#: ../app/widgets/gimptemplateeditor.c:370
 msgid "_Fill with:"
 msgstr "å¡«å??(_F)ï¼?"
 
-#: ../app/widgets/gimptemplateeditor.c:379
+#: ../app/widgets/gimptemplateeditor.c:380
 msgid "Comme_nt:"
 msgstr "注é??(_N)ï¼?"
 
-#: ../app/widgets/gimptemplateeditor.c:529
+#: ../app/widgets/gimptemplateeditor.c:530
 msgid "_Name:"
-msgstr "å??å­?(_N)ï¼?"
+msgstr "å??称(_N)ï¼?"
 
-#: ../app/widgets/gimptemplateeditor.c:542
+#: ../app/widgets/gimptemplateeditor.c:543
 msgid "_Icon:"
 msgstr "��(_I)�"
 
-#: ../app/widgets/gimptemplateeditor.c:670
+#: ../app/widgets/gimptemplateeditor.c:671
 #, c-format
 msgid "%d Ã? %d ppi, %s"
 msgstr "%d x %d ppiï¼?%s"
 
-#: ../app/widgets/gimptemplateeditor.c:672
+#: ../app/widgets/gimptemplateeditor.c:673
 #, c-format
 msgid "%d ppi, %s"
 msgstr "%d ppiï¼?%s"
 
-#: ../app/widgets/gimptextbuffer-serialize.c:338
-#, c-format
-msgid "Attribute \"%s\" is invalid on <%s> element in this context"
-msgstr "æ­¤ä¸?ä¸?æ??中ç??â??%sâ??å±?æ?§å?¨<%s>å??ç´ ä¸?æ? æ??"
-
-#: ../app/widgets/gimptextbuffer-serialize.c:410
-#, c-format
-msgid "Outermost element in text must be <markup> not <%s>"
-msgstr "æ??æ?¬ä¸­æ??å¤?å±?ç??å??ç´ åº?该æ?¯<markup>è??é??<%s>"
-
-#: ../app/widgets/gimptextbuffer.c:1456
-#, c-format
-msgid "Invalid UTF-8 data in file '%s'."
-msgstr "â??%sâ??æ??件中å?«æ??æ? æ??ç?? UTF-8 æ?°æ?®ã??"
+#: ../app/widgets/gimptexteditor.c:188
+msgid "_Language:"
+msgstr "语�(_L)"
 
-#: ../app/widgets/gimptexteditor.c:205
+#: ../app/widgets/gimptexteditor.c:234
 msgid "_Use selected font"
 msgstr "使ç?¨é??中ç??å­?ä½?(_U)"
 
-#: ../app/widgets/gimptextstyleeditor.c:199
-msgid "Change size of selected text"
-msgstr "æ?¹å??é??中æ??å­?ç??大å°?"
-
-#: ../app/widgets/gimptextstyleeditor.c:206
-#, fuzzy
-msgid "Change color of selected text"
-msgstr "æ?¹å??é??中æ??å­?ç??大å°?"
-
-#: ../app/widgets/gimptextstyleeditor.c:231
-msgid "Clear style of selected text"
-msgstr "æ¸?é?¤é??中æ??å­?ç??é£?æ ¼"
-
-#: ../app/widgets/gimptextstyleeditor.c:251
-msgid "Change kerning of selected text"
-msgstr "æ?¹å??é??中æ??å­?ç??å­?è·?"
-
-#: ../app/widgets/gimptextstyleeditor.c:267
-msgid "Change baseline of selected text"
-msgstr "æ?¹å??é??中æ??å­?ç??å?ºçº¿"
-
-#: ../app/widgets/gimpthumbbox.c:330
+#: ../app/widgets/gimpthumbbox.c:344
 #, c-format
 msgid ""
 "Click to update preview\n"
@@ -14928,24 +13050,24 @@ msgstr ""
 "������\n"
 "%s%s��强�������使��已��"
 
-#: ../app/widgets/gimpthumbbox.c:348
+#: ../app/widgets/gimpthumbbox.c:362
 msgid "Pr_eview"
 msgstr "��(_E)"
 
-#: ../app/widgets/gimpthumbbox.c:403 ../app/widgets/gimpthumbbox.c:467
+#: ../app/widgets/gimpthumbbox.c:417 ../app/widgets/gimpthumbbox.c:481
 msgid "No selection"
 msgstr "æ?ªé??æ?©"
 
-#: ../app/widgets/gimpthumbbox.c:595 ../app/widgets/gimpthumbbox.c:616
+#: ../app/widgets/gimpthumbbox.c:609 ../app/widgets/gimpthumbbox.c:630
 #, c-format
 msgid "Thumbnail %d of %d"
 msgstr "缩�� %d / %d"
 
-#: ../app/widgets/gimpthumbbox.c:729 ../app/widgets/gimpthumbbox.c:739
+#: ../app/widgets/gimpthumbbox.c:743 ../app/widgets/gimpthumbbox.c:753
 msgid "Creating preview..."
 msgstr "æ­£å?¨å??建é¢?è§?..."
 
-#: ../app/widgets/gimptoolbox-color-area.c:79
+#: ../app/widgets/gimptoolbox-color-area.c:80
 msgid ""
 "Foreground & background colors.\n"
 "The black and white squares reset colors.\n"
@@ -14957,11 +13079,11 @@ msgstr ""
 "箭头å?¯ä»¥äº¤æ?¢é¢?è?²ã??\n"
 "å??å?»ä»¥æ??å¼?é¢?è?²é??æ?©å¯¹è¯?æ¡?ã??"
 
-#: ../app/widgets/gimptoolbox-color-area.c:140
+#: ../app/widgets/gimptoolbox-color-area.c:141
 msgid "Change Foreground Color"
 msgstr "æ?¹å??å??æ?¯è?²"
 
-#: ../app/widgets/gimptoolbox-color-area.c:145
+#: ../app/widgets/gimptoolbox-color-area.c:146
 msgid "Change Background Color"
 msgstr "æ?¹å??è??æ?¯è?²"
 
@@ -14978,7 +13100,7 @@ msgstr ""
 msgid "Drag to an XDS enabled file-manager to save the image."
 msgstr "æ??æ?½å?°è?½å¤?使ç?¨ XDS ç??æ??件管ç??å?¨ä»¥ä¿?å­?å?¾å??ã??"
 
-#: ../app/widgets/gimptoolbox-indicator-area.c:149
+#: ../app/widgets/gimptoolbox-indicator-area.c:150
 msgid ""
 "The active brush.\n"
 "Click to open the Brush Dialog."
@@ -14986,7 +13108,7 @@ msgstr ""
 "æ´»å?¨ç?»ç¬?ã??\n"
 "ç?¹å?»æ??å¼?ç?»ç¬?对è¯?æ¡?ã??"
 
-#: ../app/widgets/gimptoolbox-indicator-area.c:181
+#: ../app/widgets/gimptoolbox-indicator-area.c:182
 msgid ""
 "The active pattern.\n"
 "Click to open the Pattern Dialog."
@@ -14994,7 +13116,7 @@ msgstr ""
 "æ´»å?¨å?¾æ¡?ã??\n"
 "ç?¹å?»æ??å¼?å?¾æ¡?对è¯?æ¡?ã??"
 
-#: ../app/widgets/gimptoolbox-indicator-area.c:213
+#: ../app/widgets/gimptoolbox-indicator-area.c:214
 msgid ""
 "The active gradient.\n"
 "Click to open the Gradient Dialog."
@@ -15002,91 +13124,33 @@ msgstr ""
 "æ´»å?¨æ¸?å??ã??\n"
 "ç?¹å?»æ??å¼?æ¸?å??对è¯?æ¡?ã??"
 
-#: ../app/widgets/gimptooleditor.c:294
-msgid "Raise this tool"
-msgstr "æ??å??此工å?·"
-
-#: ../app/widgets/gimptooleditor.c:295
-msgid "Raise this tool to the top"
-msgstr "æ??å??此工å?·è?³é¡¶ç«¯"
-
-#: ../app/widgets/gimptooleditor.c:302
-msgid "Lower this tool"
-msgstr "é??ä½?此工å?·"
-
-#: ../app/widgets/gimptooleditor.c:303
-msgid "Lower this tool to the bottom"
-msgstr "é??ä½?此工å?·è?³åº?端"
-
-#: ../app/widgets/gimptooleditor.c:310
-msgid "Reset tool order and visibility"
-msgstr "é??置工å?·ç??顺åº?å??å?¯è§?å±?æ?§"
-
-#: ../app/widgets/gimptooloptionseditor.c:218
+#: ../app/widgets/gimptooloptionseditor.c:165
 msgid "Save options to..."
 msgstr "é??项ä¿?å­?å?°..."
 
-#: ../app/widgets/gimptooloptionseditor.c:226
+#: ../app/widgets/gimptooloptionseditor.c:173
 msgid "Restore options from..."
 msgstr "é??项æ?¢å¤?è?ª..."
 
-#: ../app/widgets/gimptooloptionseditor.c:234
+#: ../app/widgets/gimptooloptionseditor.c:181
 msgid "Delete saved options..."
 msgstr "å? é?¤å·²ä¿?å­?ç??é??项..."
 
-#: ../app/widgets/gimptooloptionseditor.c:592
+#: ../app/widgets/gimptooloptionseditor.c:480
 #, c-format
 msgid "Error saving tool options presets: %s"
 msgstr "ä¿?å­?é¢?设工å?·é??项æ?¶å?ºé??ï¼?%s"
 
-#: ../app/widgets/gimptoolpreseteditor.c:109
-msgid "Apply stored FG/BG"
-msgstr ""
-
-#: ../app/widgets/gimptoolpreseteditor.c:115
-#, fuzzy
-msgid "Apply stored brush"
-msgstr "é??å?¼å¤?ç??"
-
-#: ../app/widgets/gimptoolpreseteditor.c:121
-msgid "Apply stored dynamics"
-msgstr ""
-
-#: ../app/widgets/gimptoolpreseteditor.c:127
-msgid "Apply stored gradient"
-msgstr ""
-
-#: ../app/widgets/gimptoolpreseteditor.c:133
-#, fuzzy
-msgid "Apply stored pattern"
-msgstr "åº?ç?¨æ??å?¨"
-
-#: ../app/widgets/gimptoolpreseteditor.c:139
-#, fuzzy
-msgid "Apply stored pallete"
-msgstr "添����"
-
-#: ../app/widgets/gimptoolpreseteditor.c:145
-msgid "Apply stored font"
-msgstr ""
-
-#: ../app/widgets/gimptranslationstore.c:105
-msgid "System Language"
-msgstr "系�语�"
-
-#: ../app/widgets/gimptranslationstore.c:107
-msgid "English"
-msgstr "�语"
-
-#: ../app/widgets/gimpuimanager.c:750
+#: ../app/widgets/gimpuimanager.c:738
 msgid "Your GIMP installation is incomplete:"
 msgstr "æ?¨ç?? GIMP å®?è£?ä¸?å®?æ?´ï¼?"
 
-#: ../app/widgets/gimpuimanager.c:752
-msgid "Please make sure the menu XML files are correctly installed."
+#
+#: ../app/widgets/gimpuimanager.c:740
+msgid "Plase make sure the menu XML files are correctly installed."
 msgstr "请确认è??å?? XML æ??件已正确å®?è£?ã??"
 
-#: ../app/widgets/gimpuimanager.c:758
+#: ../app/widgets/gimpuimanager.c:746
 #, c-format
 msgid "There was an error parsing the menu definition from %s: %s"
 msgstr "ä»? %s å¤?ç??è??å??å®?ä¹?æ?¶å?ºé??ï¼?%s"
@@ -15095,169 +13159,197 @@ msgstr "ä»? %s å¤?ç??è??å??å®?ä¹?æ?¶å?ºé??ï¼?%s"
 msgid "[ Base Image ]"
 msgstr "[ å??å§?å?¾å?? ]"
 
-#: ../app/widgets/gimpvectorstreeview.c:112
-msgid "Lock path strokes"
-msgstr "é??å®?è·¯å¾?ç¬?å??"
+#: ../app/widgets/gimpvectorstreeview.c:110
+msgid "Reorder path"
+msgstr "é??æ??è·¯å¾?"
+
+#: ../app/widgets/gimpvectorstreeview.c:253
+msgid "Empty Path"
+msgstr "空路�"
 
-#: ../app/widgets/gimpviewablebox.c:80
+#: ../app/widgets/gimpviewablebox.c:81
 msgid "Open the brush selection dialog"
 msgstr "æ??å¼?ç?»ç¬?é??æ?©å¯¹è¯?æ¡?"
 
-#: ../app/widgets/gimpviewablebox.c:137
+#: ../app/widgets/gimpviewablebox.c:138
 msgid "Open the pattern selection dialog"
 msgstr "æ??å¼?å?¾æ¡?é??æ?©å¯¹è¯?æ¡?"
 
-#: ../app/widgets/gimpviewablebox.c:203
+#: ../app/widgets/gimpviewablebox.c:204
 msgid "Open the gradient selection dialog"
 msgstr "æ??å¼?æ¸?å??é??æ?©å¯¹è¯?æ¡?"
 
-#: ../app/widgets/gimpviewablebox.c:305
+#: ../app/widgets/gimpviewablebox.c:224
+msgid "Reverse"
+msgstr "å??å??"
+
+#: ../app/widgets/gimpviewablebox.c:306
 msgid "Open the palette selection dialog"
 msgstr "æ??å¼?è?²æ?¿é??æ?©å¯¹è¯?æ¡?"
 
-#: ../app/widgets/gimpviewablebox.c:363
+#: ../app/widgets/gimpviewablebox.c:364
 msgid "Open the font selection dialog"
 msgstr "æ??å¼?å­?ä½?é??æ?©å¯¹è¯?æ¡?"
 
-#: ../app/widgets/gimpwidgets-utils.c:670
+#: ../app/widgets/gimpwidgets-utils.c:608
 #, c-format
 msgid "%s (try %s)"
 msgstr "%s (�� %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:670
+#: ../app/widgets/gimpwidgets-utils.c:608
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:674
+#: ../app/widgets/gimpwidgets-utils.c:612
 #, c-format
 msgid "%s (try %s, %s)"
 msgstr "%s (�� %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:678
+#: ../app/widgets/gimpwidgets-utils.c:616
 #, c-format
 msgid "%s (try %s, %s, %s)"
 msgstr "%s (�� %s, %s, %s)"
 
+#: ../app/widgets/gimpwidgets-utils.c:882
+#, c-format
+msgid "Invalid UTF-8 data in file '%s'."
+msgstr "â??%sâ??æ??件中å?«æ??æ? æ??ç?? UTF-8 æ?°æ?®ã??"
+
+#
 #: ../app/widgets/widgets-enums.c:23
-msgctxt "active-color"
 msgid "Foreground"
 msgstr "å??æ?¯"
 
-#: ../app/widgets/widgets-enums.c:24
-msgctxt "active-color"
-msgid "Background"
-msgstr "è??æ?¯"
-
-#: ../app/widgets/widgets-enums.c:85
-msgctxt "color-frame-mode"
+#
+#: ../app/widgets/widgets-enums.c:83
 msgid "Pixel"
 msgstr "å??ç´ "
 
-#: ../app/widgets/widgets-enums.c:86
-msgctxt "color-frame-mode"
-msgid "RGB"
-msgstr "RGB"
-
-#: ../app/widgets/widgets-enums.c:87
-msgctxt "color-frame-mode"
+#
+#: ../app/widgets/widgets-enums.c:85
 msgid "HSV"
 msgstr "HSV"
 
-#: ../app/widgets/widgets-enums.c:88
-msgctxt "color-frame-mode"
+#
+#: ../app/widgets/widgets-enums.c:86
 msgid "CMYK"
 msgstr "CMYK"
 
-#: ../app/widgets/widgets-enums.c:118
-msgctxt "color-pick-mode"
+#
+#: ../app/widgets/widgets-enums.c:115
 msgid "Pick only"
 msgstr "ä»?æ?¾å??"
 
-#: ../app/widgets/widgets-enums.c:119
-msgctxt "color-pick-mode"
+#
+#: ../app/widgets/widgets-enums.c:116
 msgid "Set foreground color"
 msgstr "设置å??æ?¯è?²"
 
-#: ../app/widgets/widgets-enums.c:120
-msgctxt "color-pick-mode"
+#
+#: ../app/widgets/widgets-enums.c:117
 msgid "Set background color"
 msgstr "设置è??æ?¯è?²"
 
-#: ../app/widgets/widgets-enums.c:121
-msgctxt "color-pick-mode"
+#
+#: ../app/widgets/widgets-enums.c:118
 msgid "Add to palette"
 msgstr "添����"
 
-#: ../app/widgets/widgets-enums.c:178
-msgctxt "histogram-scale"
+#
+#: ../app/widgets/widgets-enums.c:173
+msgid "Black & white"
+msgstr "é»?ç?½"
+
+#
+#: ../app/widgets/widgets-enums.c:174
+msgid "Fancy"
+msgstr "�亮"
+
+#
+#: ../app/widgets/widgets-enums.c:201
+msgid "GIMP help browser"
+msgstr "GIMP 帮����"
+
+#
+#: ../app/widgets/widgets-enums.c:202
+msgid "Web browser"
+msgstr "Web ���"
+
+#
+#: ../app/widgets/widgets-enums.c:229
 msgid "Linear histogram"
 msgstr "线����"
 
-#: ../app/widgets/widgets-enums.c:179
-msgctxt "histogram-scale"
+#
+#: ../app/widgets/widgets-enums.c:230
 msgid "Logarithmic histogram"
 msgstr "对����"
 
-#: ../app/widgets/widgets-enums.c:215
-msgctxt "tab-style"
+#
+#: ../app/widgets/widgets-enums.c:263
 msgid "Icon"
 msgstr "��"
 
-#: ../app/widgets/widgets-enums.c:216
-msgctxt "tab-style"
+#
+#: ../app/widgets/widgets-enums.c:264
 msgid "Current status"
 msgstr "å½?å??ç?¶æ??"
 
-#: ../app/widgets/widgets-enums.c:217
-msgctxt "tab-style"
-msgid "Text"
-msgstr "æ??å­?"
-
-#: ../app/widgets/widgets-enums.c:218
-msgctxt "tab-style"
+#
+#: ../app/widgets/widgets-enums.c:266
 msgid "Description"
 msgstr "æ??è¿°"
 
-#: ../app/widgets/widgets-enums.c:219
-msgctxt "tab-style"
+#
+#: ../app/widgets/widgets-enums.c:267
 msgid "Icon & text"
 msgstr "å?¾æ ?å??æ??å­?"
 
-#: ../app/widgets/widgets-enums.c:220
-msgctxt "tab-style"
+#
+#: ../app/widgets/widgets-enums.c:268
 msgid "Icon & desc"
 msgstr "å?¾æ ?å??æ??è¿°"
 
-#: ../app/widgets/widgets-enums.c:221
-msgctxt "tab-style"
+#
+#: ../app/widgets/widgets-enums.c:269
 msgid "Status & text"
 msgstr "ç?¶æ??å??æ??å­?"
 
-#: ../app/widgets/widgets-enums.c:222
-msgctxt "tab-style"
+#
+#: ../app/widgets/widgets-enums.c:270
 msgid "Status & desc"
 msgstr "ç?¶æ??å??æ??è¿°"
 
-#: ../app/widgets/widgets-enums.c:223
-#, fuzzy
-msgctxt "tab-style"
-msgid "Undefined"
-msgstr "���"
+#
+#: ../app/widgets/widgets-enums.c:298
+msgid "Normal window"
+msgstr "æ?®é??çª?å?£"
+
+#
+#: ../app/widgets/widgets-enums.c:299
+msgid "Utility window"
+msgstr "工���"
+
+#
+#: ../app/widgets/widgets-enums.c:300
+msgid "Keep above"
+msgstr "æ?»å?¨æ??å??"
 
-#: ../app/xcf/xcf-load.c:332
+#: ../app/xcf/xcf-load.c:277
 msgid ""
 "This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
 "incomplete."
 msgstr "æ­¤ XCF æ??件已æ??å??ï¼?æ??å·²ç»?å°½å?¯è?½å¤?ç??读å??ï¼?ä½?å®?ä¸?å®?æ?´ã??"
 
-#: ../app/xcf/xcf-load.c:343
+#: ../app/xcf/xcf-load.c:286
+#, c-format
 msgid ""
 "This XCF file is corrupt!  I could not even salvage any partial image data "
 "from it."
 msgstr "æ­¤ XCF æ??件已æ??å??ï¼?æ??ç??è?³æ? æ³?é?¨å??æ?¢æ??å?ºä»»ä½?å?¾å??æ?°æ?®ã??"
 
-#: ../app/xcf/xcf-load.c:407
+#: ../app/xcf/xcf-load.c:324
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -15267,16 +13359,16 @@ msgstr ""
 "ä¸?è?½æ­£ç¡®ç??ä¿?å­?ç´¢å¼?é¢?è?²è¡¨ã??\n"
 "ç?¨ç?°åº¦é¢?è?²è¡¨å??代ã??"
 
-#: ../app/xcf/xcf-read.c:108
+#: ../app/xcf/xcf-read.c:109
 msgid "Invalid UTF-8 string in XCF file"
 msgstr "XCF æ??件中å?«æ??æ? æ??ç?? UTF-8 å­?符串"
 
-#: ../app/xcf/xcf-write.c:86
+#: ../app/xcf/xcf-write.c:87
 #, c-format
 msgid "Error writing XCF: %s"
 msgstr "å?? XCF æ?¶å?ºé??ï¼?%s"
 
-#: ../app/xcf/xcf-seek.c:43 ../app/xcf/xcf-seek.c:60 ../app/xcf/xcf-seek.c:71
+#: ../app/xcf/xcf-seek.c:44 ../app/xcf/xcf-seek.c:61 ../app/xcf/xcf-seek.c:72
 #, c-format
 msgid "Could not seek in XCF file: %s"
 msgstr "æ? æ³?å?¨ XCF æ??件中æ??ç´¢ï¼?%s"
@@ -15305,14 +13397,6 @@ msgstr "æ­£å?¨ä¿?å­?â??%sâ??"
 msgid "Error saving XCF file: %s"
 msgstr "ä¿?å­? XCF æ??件æ?¶å?ºé??ï¼?%s"
 
-#: ../data/tags/gimp-tags-default.xml.in.h:1
-msgid "fuzzy"
-msgstr "模�"
-
-#: ../data/tags/gimp-tags-default.xml.in.h:2
-msgid "round"
-msgstr "å??"
-
 #: ../desktop/gimp.desktop.in.in.h:1
 msgid "Create images and edit photographs"
 msgstr "å??建å?¾å??æ??ç¼?è¾?ç?§ç??"
@@ -15321,117 +13405,32 @@ msgstr "å??建å?¾å??æ??ç¼?è¾?ç?§ç??"
 msgid "Image Editor"
 msgstr "å?¾å??ç¼?è¾?å?¨"
 
-#: ../tools/gimp-remote.c:64
+#: ../tools/gimp-remote.c:65
 msgid "Use a running GIMP only, never start a new one"
 msgstr "å?ªä½¿ç?¨è¿?è¡?中ç?? GIMP å®?ä¾?ï¼?ä»?ä¸?å?¯å?¨æ?°å®?ä¾?"
 
-#: ../tools/gimp-remote.c:69
+#: ../tools/gimp-remote.c:70
 msgid "Only check if GIMP is running, then quit"
 msgstr "å?ªæ£?æ?¥ GIMP æ?¯å?¦å?¨è¿?è¡?ï¼?ç?¶å??é??å?º"
 
-#: ../tools/gimp-remote.c:75
+#: ../tools/gimp-remote.c:76
 msgid "Print X window ID of GIMP toolbox window, then quit"
 msgstr "æ??å?° GIMP å·¥å?·ç®±çª?å?£ç?? X window IDï¼?ç?¶å??é??å?ºã??"
 
-#: ../tools/gimp-remote.c:81
+#: ../tools/gimp-remote.c:82
 msgid "Start GIMP without showing the startup window"
 msgstr "å?¯å?¨ GIMP è??ä¸?æ?¾ç¤ºå?¯å?¨çª?å?£"
 
-#: ../tools/gimp-remote-x11.c:66
+#: ../tools/gimp-remote-x11.c:67
 msgid "Could not connect to GIMP."
 msgstr "æ? æ³?è¿?æ?¥å?° GIMPã??"
 
-#: ../tools/gimp-remote-x11.c:67
+#: ../tools/gimp-remote-x11.c:68
 msgid "Make sure that the Toolbox is visible!"
-msgstr "确�工�箱���"
+msgstr "请��工�箱为���"
 
 #. if execv and execvp return, there was an error
-#: ../tools/gimp-remote-x11.c:247
+#: ../tools/gimp-remote-x11.c:248
 #, c-format
 msgid "Couldn't start '%s': %s"
 msgstr "æ? æ³?å?¯å?¨â??%sâ??ï¼?%s"
-
-#~ msgctxt "file-action"
-#~ msgid "Save this image with a different name, but keep its current name"
-#~ msgstr "ç?¨ä¸?å??ç??å??å­?ä¿?å­?æ­¤å?¾å??ï¼?ä½?ä¿?æ??å®?å½?å??ç??å??å­?"
-
-#~ msgctxt "layers-action"
-#~ msgid "Te_xt to Selection"
-#~ msgstr "æ??å­?å?°é??å?º(_X)"
-
-#~ msgctxt "layers-action"
-#~ msgid "_Text to Selection"
-#~ msgstr "æ??å­?å?°é??å?º(_T)"
-
-#~ msgctxt "layers-action"
-#~ msgid "Replace the selection with the text layer's outline"
-#~ msgstr "ç?¨æ??å­?å?¾å±?ç??è½®å»?æ?¿æ?¢é??å?º"
-
-#~ msgctxt "layers-action"
-#~ msgid "Add the text layer's outline to the current selection"
-#~ msgstr "å°?æ??å­?å?¾å±?ç??è½®å»?æ·»å? å?°å½?å??é??å?º"
-
-#~ msgctxt "layers-action"
-#~ msgid "Subtract the text layer's outline from the current selection"
-#~ msgstr "ä»?å½?å??é??å?ºå??å?»æ??å­?å?¾å±?ç??è½®å»?"
-
-#~ msgctxt "layers-action"
-#~ msgid "Intersect the text layer's outline with the current selection"
-#~ msgstr "交å??æ??å­?å?¾å±?ç??è½®å»?å??å½?å??é??å?º"
-
-#~ msgid "Reset Tool Options"
-#~ msgstr "é??置工å?·é??项"
-
-#~ msgid "Paste"
-#~ msgstr "ç²?è´´"
-
-#~ msgid "Cut"
-#~ msgstr "å?ªå??"
-
-#~ msgctxt "command"
-#~ msgid "Rectangle Select"
-#~ msgstr "ç?©å½¢é??æ?©"
-
-#~ msgctxt "command"
-#~ msgid "Ellipse Select"
-#~ msgstr "椭å??é??æ?©"
-
-#~ msgctxt "command"
-#~ msgid "Bucket Fill"
-#~ msgstr "æ²¹æ¼?桶填å??"
-
-#~ msgid "Transform"
-#~ msgstr "å??æ?¢"
-
-#~ msgid "Path to selection"
-#~ msgstr "è·¯å¾?å?°é??å?º"
-
-#~ msgctxt "undo-type"
-#~ msgid "Reorder layer"
-#~ msgstr "é??æ??å?¾å±?"
-
-#~ msgctxt "undo-type"
-#~ msgid "Reorder channel"
-#~ msgstr "é??æ??é??é??"
-
-#~ msgctxt "undo-type"
-#~ msgid "Reorder path"
-#~ msgstr "é??æ??è·¯å¾?"
-
-#~ msgid "Pressure:"
-#~ msgstr "å??å??ï¼?"
-
-#~ msgid "Empty Channel"
-#~ msgstr "空ç?½é??é??"
-
-#~ msgid "Pixel dimensions:"
-#~ msgstr "å??素尺寸ï¼?"
-
-#~ msgid "Empty Layer"
-#~ msgstr "空���"
-
-#~ msgid "Empty Path"
-#~ msgstr "空�路�"
-
-#~ msgid "You can drop dockable dialogs here"
-#~ msgstr "æ?¨å?¯ä»¥å°?å?¯å??é? ç??对è¯?æ¡?æ?¾å?¨è¿?é??"



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