[gimp/gimp-2-8] Updated Chinese (Taiwan) translation



commit 1ffac928c5014f228b395b045f402dd0ac300511
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Fri Feb 27 14:57:28 2015 +0000

    Updated Chinese (Taiwan) translation

 po/zh_TW.po | 5525 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 3142 insertions(+), 2383 deletions(-)
---
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 75a92a0..04ed159 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,22 +9,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp 2.6.7\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-01 19:28+0800\n"
-"PO-Revision-Date: 2010-10-04 19:54+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=gimp&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2015-02-27 08:54+0000\n"
+"PO-Revision-Date: 2015-02-27 22:56+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Taiwan) <community linuxhall org>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.7.1\n"
 
 #: ../app/about.h:23
 msgid "GIMP"
 msgstr "GIMP"
 
-#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:2
+#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:1
 msgid "GNU Image Manipulation Program"
 msgstr "GNU 圖片處理程式"
 
@@ -39,7 +41,6 @@ msgstr ""
 "Spencer Kimball、Peter Mattis 及 GIMP 開發團隊"
 
 #: ../app/about.h:34
-#, fuzzy
 msgid ""
 "GIMP is free software: you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -54,17 +55,17 @@ msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "GIMP.  If not, see http://www.gnu.org/licenses/.";
 msgstr ""
-"本程式是自由軟體,您可以遵照自由軟體基金會 (Free Software Foundation) 出版的 "
-"GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈這"
-"一程式,或者自由選擇使用任何更新的版本。\n"
+"GIMP 是自由軟體:您可以遵照自由軟體基金會 (Free Software Foundation) 出版的 "
+"GNU 通用公共許可證條款 (GNU General Public License) 第三版來修改和重新散佈這"
+"一程式,或者 (自由選擇) 使用任何後續出版的版本。\n"
 "\n"
-"發佈這一程式的目的是希望它有用,但沒有任何擔保。甚至沒有適合特定目的而隱含的"
-"擔保。更詳細的情況請參閱 GNU 通用公共許可證。\n"
+"發佈這一程式的目的是希望它有用,但「沒有任何擔保」;更沒有「可銷售」或「適合"
+"特定用途」的隱含性擔保。更詳細的情況請參閱 GNU 通用公共許可證。\n"
 "\n"
-"您應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有,請查閱"
-"http://www.gnu.org/licenses/。\n";
+"您應該已經隨 GIMP 一起收到一份 GNU 通用公共許可證的副本。如果還沒有,請查閱"
+"http://www.gnu.org/licenses/。";
 
-#: ../app/app.c:220
+#: ../app/app.c:225
 #, c-format
 msgid ""
 "Unable to open a test swap file.\n"
@@ -80,108 +81,112 @@ msgstr ""
 #: ../app/batch.c:75
 #, c-format
 msgid "No batch interpreter specified, using the default '%s'.\n"
-msgstr "沒有指定批次解譯器,使用預設的“%s”\n"
+msgstr "沒有指定批次解譯器,使用預設的「%s」。\n"
 
 #: ../app/batch.c:93 ../app/batch.c:111
 #, c-format
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
-msgstr "批次解譯器“%s”無法使用。批次模式已停用。"
+msgstr "批次解譯器「%s」無法使用。批次模式已停用。"
 
-#: ../app/main.c:139 ../tools/gimp-remote.c:59
+#: ../app/main.c:148
 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 "顯示更多結果"
 
-#: ../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 "不要載入任何字型"
 
-#: ../app/main.c:179
+#: ../app/main.c:188
 msgid "Do not show a splash screen"
 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 "傳送訊息到 console 而非對話盒"
 
 #. 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:271
+msgid "Output a sorted list of deprecated procedures in the PDB"
+msgstr "輸出 PDB 棄用程序的排序後清單"
+
+#: ../app/main.c:399
 msgid "[FILE|URI...]"
 msgstr "[FILE|URI...]"
 
-#: ../app/main.c:392
+#: ../app/main.c:421
 msgid ""
 "GIMP could not initialize the graphical user interface.\n"
 "Make sure a proper setup for your display environment exists."
@@ -189,24 +194,24 @@ msgstr ""
 "GIMP 無法初始化圖形介面。\n"
 "請確定您的圖形顯示環境設定無誤。"
 
-#: ../app/main.c:411
+#: ../app/main.c:440
 msgid "Another GIMP instance is already running."
 msgstr "另一個 GIMP 實體已經在執行。"
 
-#: ../app/main.c:481
+#: ../app/main.c:512
 msgid "GIMP output. Type any character to close this window."
 msgstr "GIMP 輸出。請輸入任何字元以關閉這個視窗。"
 
-#: ../app/main.c:482
+#: ../app/main.c:513
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(輸入任何字元以關閉這個視窗)\n"
 
-#: ../app/main.c:499
+#: ../app/main.c:530
 msgid "GIMP output. You can minimize this window, but don't close it."
 msgstr "GIMP 輸出。您可以將這個視窗最小化,但不關閉它。"
 
-#: ../app/sanity.c:398
+#: ../app/sanity.c:433
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -217,7 +222,7 @@ msgstr ""
 "\n"
 "請檢查環境變數 G_FILE_NAME_ENCODING 的值。"
 
-#: ../app/sanity.c:417
+#: ../app/sanity.c:452
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -233,37 +238,37 @@ msgstr ""
 "定來通知 Glib。請設定環境變數 G_FILENAME_ENCODING。"
 
 #. show versions of libraries used by GIMP
-#: ../app/version.c:64
+#: ../app/version.c:63 ../app/version.c:130
 #, c-format
 msgid "using %s version %s (compiled against version %s)"
 msgstr "正在使用 %s 版本 %s(依版本 %s 編譯)"
 
-#: ../app/version.c:127 ../tools/gimp-remote.c:94
+#: ../app/version.c:138
 #, 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:109 ../app/dialogs/dialogs.c:388
+#: ../app/widgets/gimpbrusheditor.c:88
 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:2718
+#: ../app/actions/actions.c:112 ../app/core/gimp.c:951
+#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2746
 msgid "Brushes"
 msgstr "筆刷"
 
-#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:292
+#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:327
 msgid "Buffers"
 msgstr "緩衝區"
 
-#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:311
+#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:346
 msgid "Channels"
 msgstr "色版"
 
 #: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174
-#: ../app/dialogs/dialogs.c:319
+#: ../app/dialogs/dialogs.c:354
 msgid "Colormap"
 msgstr "顏色對應表"
 
@@ -275,7 +280,7 @@ msgstr "組態"
 msgid "Context"
 msgstr "關聯"
 
-#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:275
+#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:310
 msgid "Pointer Information"
 msgstr "滑鼠指標資訊"
 
@@ -296,8 +301,8 @@ 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:145 ../app/dialogs/dialogs.c:329
+#: ../app/dialogs/preferences-dialog.c:1577
 msgid "Document History"
 msgstr "文件記錄"
 
@@ -306,12 +311,12 @@ msgid "Drawable"
 msgstr "可繪物件"
 
 #. Some things do not have grids, so just list
-#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:300
+#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:335
 msgid "Paint Dynamics"
 msgstr "筆刷動態"
 
-#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:357
-#: ../app/widgets/gimpdynamicseditor.c:94
+#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:392
+#: ../app/widgets/gimpdynamicseditor.c:92
 msgid "Paint Dynamics Editor"
 msgstr "筆刷動態編輯器"
 
@@ -319,7 +324,7 @@ msgstr "筆刷動態編輯器"
 msgid "Edit"
 msgstr "編輯"
 
-#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:271
+#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:306
 msgid "Error Console"
 msgstr "錯誤訊息"
 
@@ -327,30 +332,29 @@ msgstr "錯誤訊息"
 msgid "File"
 msgstr "檔案"
 
-#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:290
-#: ../app/dialogs/preferences-dialog.c:2738
+#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325
+#: ../app/dialogs/preferences-dialog.c:2766
 msgid "Fonts"
 msgstr "字型"
 
-#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:361
-#: ../app/widgets/gimpgradienteditor.c:273
+#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:396
+#: ../app/widgets/gimpgradienteditor.c:269
 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:2734
+#: ../app/actions/actions.c:172 ../app/core/gimp.c:971
+#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2762
 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
+#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2770
 msgid "Tool Presets"
 msgstr "工具預設"
 
-#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:369
-#: ../app/widgets/gimptoolpreseteditor.c:75
+#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:404
+#: ../app/widgets/gimptoolpreseteditor.c:92
 msgid "Tool Preset Editor"
 msgstr "工具預設編輯器"
 
@@ -363,41 +367,43 @@ msgid "Image"
 msgstr "圖片"
 
 #. list & grid views
-#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:280
+#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:315
 msgid "Images"
 msgstr "圖片"
 
-#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:307
+#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:342
 #: ../app/dialogs/resize-dialog.c:287
 msgid "Layers"
 msgstr "圖層"
 
-#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:365
-#: ../app/widgets/gimppaletteeditor.c:145
+#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:400
+#: ../app/widgets/gimppaletteeditor.c:148
 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:2730
+#: ../app/actions/actions.c:196 ../app/core/gimp.c:966
+#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2758
 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:2726
+#: ../app/actions/actions.c:199 ../app/core/gimp.c:961
+#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2754
 msgid "Patterns"
 msgstr "圖樣"
 
-#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2742
+#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2774
 msgid "Plug-Ins"
 msgstr "外掛程式"
 
-#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:385
+#. Quick Mask Color
+#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386
+#: ../app/dialogs/preferences-dialog.c:2032
 msgid "Quick Mask"
 msgstr "快速遮罩"
 
-#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:335
+#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:370
 msgid "Sample Points"
 msgstr "取樣點"
 
@@ -406,8 +412,8 @@ 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:214 ../app/core/gimp.c:989
+#: ../app/dialogs/dialogs.c:331
 msgid "Templates"
 msgstr "範本"
 
@@ -419,16 +425,16 @@ msgstr "文字工具"
 msgid "Text Editor"
 msgstr "文字編輯器"
 
-#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:263
-#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:425
+#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298
+#: ../app/dialogs/preferences-dialog.c:1861 ../app/gui/gui.c:436
 msgid "Tool Options"
 msgstr "工具選項"
 
-#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:181
+#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391
 msgid "Tools"
 msgstr "工具箱"
 
-#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:315
+#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:350
 #: ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "路徑"
@@ -736,14 +742,14 @@ msgstr "修改色版顏色"
 msgid "_Fill opacity:"
 msgstr "填色不透明度(_F):"
 
-#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:271
-#: ../app/widgets/gimpchanneltreeview.c:334
+#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:272
+#: ../app/widgets/gimpchanneltreeview.c:331
 msgid "Channel"
 msgstr "色版"
 
 #: ../app/actions/channels-commands.c:117
 #: ../app/actions/channels-commands.c:159
-#: ../app/widgets/gimpchanneltreeview.c:329
+#: ../app/widgets/gimpchanneltreeview.c:326
 msgid "New Channel"
 msgstr "新增色版"
 
@@ -755,10 +761,10 @@ 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:244 ../app/core/gimpimage-new.c:257
+#: ../app/display/gimpdisplayshell-dnd.c:646
+#: ../app/widgets/gimpchanneltreeview.c:258
+#: ../app/widgets/gimplayertreeview.c:776
 #, c-format
 msgid "%s Channel Copy"
 msgstr "%s 色版複製本"
@@ -953,14 +959,14 @@ msgctxt "cursor-info-action"
 msgid "Use the composite color of all visible layers"
 msgstr "使用所有看得見圖層的複合色"
 
-#: ../app/actions/data-commands.c:104 ../app/actions/documents-commands.c:343
-#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:233
-#: ../app/dialogs/file-open-dialog.c:278
+#: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344
+#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232
+#: ../app/dialogs/file-open-dialog.c:277
 #: ../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:180
-#: ../app/widgets/gimptoolbox.c:867
+#: ../app/display/gimpdisplayshell-dnd.c:592
+#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168
+#: ../app/widgets/gimptoolbox.c:817
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -971,398 +977,389 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/actions/data-commands.c:133
-#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1538
-#: ../app/core/gimppalette-import.c:210 ../app/core/gimppalette-load.c:223
-#: ../app/core/gimppalette.c:398 ../app/dialogs/palette-import-dialog.c:771
+#: ../app/actions/data-commands.c:118
+#: ../app/actions/tool-options-commands.c:72
+#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529
+#: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224
+#: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771
 #: ../app/widgets/gimpdnd-xds.c:94
 msgid "Untitled"
 msgstr "未命名"
 
-#: ../app/actions/data-commands.c:238
-msgid "Delete Object"
-msgstr "刪除物件"
-
-#: ../app/actions/data-commands.c:261
-#, c-format
-msgid "Delete '%s'?"
-msgstr "刪除 “%s”?"
-
-#: ../app/actions/data-commands.c:264
-#, c-format
-msgid ""
-"Are you sure you want to remove '%s' from the list and delete it on disk?"
-msgstr "是否確定要同時在清單及磁碟裡刪除“%s”?"
-
-#: ../app/actions/dialogs-actions.c:44
+#: ../app/actions/dialogs-actions.c:49
 msgctxt "windows-action"
 msgid "Tool_box"
 msgstr "工具箱(_B)"
 
-#: ../app/actions/dialogs-actions.c:50
+#: ../app/actions/dialogs-actions.c:55
 msgctxt "dialogs-action"
 msgid "Tool _Options"
 msgstr "工具選項(_O)"
 
-#: ../app/actions/dialogs-actions.c:51
+#: ../app/actions/dialogs-actions.c:56
 msgctxt "dialogs-action"
 msgid "Open the tool options dialog"
 msgstr "開啟工具選項對話盒"
 
-#: ../app/actions/dialogs-actions.c:56
+#: ../app/actions/dialogs-actions.c:61
 msgctxt "dialogs-action"
 msgid "_Device Status"
 msgstr "裝置狀態(_D)"
 
-#: ../app/actions/dialogs-actions.c:57
+#: ../app/actions/dialogs-actions.c:62
 msgctxt "dialogs-action"
 msgid "Open the device status dialog"
 msgstr "開啟裝置狀態對話盒"
 
-#: ../app/actions/dialogs-actions.c:62
+#: ../app/actions/dialogs-actions.c:67
 msgctxt "dialogs-action"
 msgid "_Layers"
 msgstr "圖層(_L)"
 
-#: ../app/actions/dialogs-actions.c:63
+#: ../app/actions/dialogs-actions.c:68
 msgctxt "dialogs-action"
 msgid "Open the layers dialog"
 msgstr "開啟圖層對話盒"
 
-#: ../app/actions/dialogs-actions.c:68
+#: ../app/actions/dialogs-actions.c:73
 msgctxt "dialogs-action"
 msgid "_Channels"
 msgstr "色版(_C)"
 
-#: ../app/actions/dialogs-actions.c:69
+#: ../app/actions/dialogs-actions.c:74
 msgctxt "dialogs-action"
 msgid "Open the channels dialog"
 msgstr "開啟色版對話盒"
 
-#: ../app/actions/dialogs-actions.c:74
+#: ../app/actions/dialogs-actions.c:79
 msgctxt "dialogs-action"
 msgid "_Paths"
 msgstr "路徑(_P)"
 
-#: ../app/actions/dialogs-actions.c:75
+#: ../app/actions/dialogs-actions.c:80
 msgctxt "dialogs-action"
 msgid "Open the paths dialog"
 msgstr "開啟路徑對話盒"
 
-#: ../app/actions/dialogs-actions.c:80
+#: ../app/actions/dialogs-actions.c:85
 msgctxt "dialogs-action"
 msgid "Color_map"
 msgstr "顏色對應表(_M)"
 
-#: ../app/actions/dialogs-actions.c:81
+#: ../app/actions/dialogs-actions.c:86
 msgctxt "dialogs-action"
 msgid "Open the colormap dialog"
 msgstr "開啟顏色對應表對話盒"
 
-#: ../app/actions/dialogs-actions.c:86
+#: ../app/actions/dialogs-actions.c:91
 msgctxt "dialogs-action"
 msgid "Histogra_m"
 msgstr "色彩統計圖(_M)"
 
-#: ../app/actions/dialogs-actions.c:87
+#: ../app/actions/dialogs-actions.c:92
 msgctxt "dialogs-action"
 msgid "Open the histogram dialog"
 msgstr "開啟色彩統計圖對話盒"
 
-#: ../app/actions/dialogs-actions.c:92
+#: ../app/actions/dialogs-actions.c:97
 msgctxt "dialogs-action"
 msgid "_Selection Editor"
 msgstr "選取區域編輯器(_S)"
 
-#: ../app/actions/dialogs-actions.c:93
+#: ../app/actions/dialogs-actions.c:98
 msgctxt "dialogs-action"
 msgid "Open the selection editor"
 msgstr "開啟選取區域編輯器"
 
-#: ../app/actions/dialogs-actions.c:98
+#: ../app/actions/dialogs-actions.c:103
 msgctxt "dialogs-action"
 msgid "Na_vigation"
 msgstr "導覽(_V)"
 
-#: ../app/actions/dialogs-actions.c:99
+#: ../app/actions/dialogs-actions.c:104
 msgctxt "dialogs-action"
 msgid "Open the display navigation dialog"
 msgstr "開啟導覽對話盒"
 
-#: ../app/actions/dialogs-actions.c:104
+#: ../app/actions/dialogs-actions.c:109
 msgctxt "dialogs-action"
 msgid "Undo _History"
 msgstr "復原記錄(_H)"
 
-#: ../app/actions/dialogs-actions.c:105
+#: ../app/actions/dialogs-actions.c:110
 msgctxt "dialogs-action"
 msgid "Open the undo history dialog"
 msgstr "開啟復原記錄對話盒"
 
-#: ../app/actions/dialogs-actions.c:110
+#: ../app/actions/dialogs-actions.c:115
 msgctxt "dialogs-action"
 msgid "Pointer"
 msgstr "指標"
 
-#: ../app/actions/dialogs-actions.c:111
+#: ../app/actions/dialogs-actions.c:116
 msgctxt "dialogs-action"
 msgid "Open the pointer information dialog"
 msgstr "開啟指標資訊對話盒"
 
-#: ../app/actions/dialogs-actions.c:116
+#: ../app/actions/dialogs-actions.c:121
 msgctxt "dialogs-action"
 msgid "_Sample Points"
 msgstr "取樣點(_S)"
 
-#: ../app/actions/dialogs-actions.c:117
+#: ../app/actions/dialogs-actions.c:122
 msgctxt "dialogs-action"
 msgid "Open the sample points dialog"
 msgstr "開啟取樣點對話盒"
 
-#: ../app/actions/dialogs-actions.c:122
+#: ../app/actions/dialogs-actions.c:127
 msgctxt "dialogs-action"
 msgid "Colo_rs"
 msgstr "顏色(_R)"
 
-#: ../app/actions/dialogs-actions.c:123
+#: ../app/actions/dialogs-actions.c:128
 msgctxt "dialogs-action"
 msgid "Open the FG/BG color dialog"
 msgstr "開啟前景/背景顏色對話盒"
 
-#: ../app/actions/dialogs-actions.c:128
+#: ../app/actions/dialogs-actions.c:133
 msgctxt "dialogs-action"
 msgid "_Brushes"
 msgstr "筆刷(_B)"
 
-#: ../app/actions/dialogs-actions.c:129
+#: ../app/actions/dialogs-actions.c:134
 msgctxt "dialogs-action"
 msgid "Open the brushes dialog"
 msgstr "開啟筆刷對話盒"
 
-#: ../app/actions/dialogs-actions.c:134
+#: ../app/actions/dialogs-actions.c:139
 msgctxt "dialogs-action"
 msgid "Brush Editor"
 msgstr "筆刷編輯器"
 
-#: ../app/actions/dialogs-actions.c:135
+#: ../app/actions/dialogs-actions.c:140
 msgctxt "dialogs-action"
 msgid "Open the brush editor"
 msgstr "開啟筆刷編輯器"
 
-#: ../app/actions/dialogs-actions.c:140
+#: ../app/actions/dialogs-actions.c:145
 msgctxt "dialogs-action"
 msgid "Paint Dynamics"
 msgstr "筆刷動態"
 
-#: ../app/actions/dialogs-actions.c:141
+#: ../app/actions/dialogs-actions.c:146
 msgctxt "dialogs-action"
 msgid "Open paint dynamics dialog"
 msgstr "開啟筆刷動態對話盒"
 
-#: ../app/actions/dialogs-actions.c:146
+#: ../app/actions/dialogs-actions.c:151
 msgctxt "dialogs-action"
 msgid "Paint Dynamics Editor"
 msgstr "筆刷動態編輯器"
 
-#: ../app/actions/dialogs-actions.c:147
+#: ../app/actions/dialogs-actions.c:152
 msgctxt "dialogs-action"
 msgid "Open the paint dynamics editor"
 msgstr "開啟筆刷動態編輯器"
 
-#: ../app/actions/dialogs-actions.c:152
+#: ../app/actions/dialogs-actions.c:157
 msgctxt "dialogs-action"
 msgid "P_atterns"
 msgstr "圖樣(_A)"
 
-#: ../app/actions/dialogs-actions.c:153
+#: ../app/actions/dialogs-actions.c:158
 msgctxt "dialogs-action"
 msgid "Open the patterns dialog"
 msgstr "開啟圖樣對話盒"
 
-#: ../app/actions/dialogs-actions.c:158
+#: ../app/actions/dialogs-actions.c:163
 msgctxt "dialogs-action"
 msgid "_Gradients"
 msgstr "漸層(_G)"
 
-#: ../app/actions/dialogs-actions.c:159
+#: ../app/actions/dialogs-actions.c:164
 msgctxt "dialogs-action"
 msgid "Open the gradients dialog"
 msgstr "開啟漸層對話盒"
 
-#: ../app/actions/dialogs-actions.c:164
+#: ../app/actions/dialogs-actions.c:169
 msgctxt "dialogs-action"
 msgid "Gradient Editor"
 msgstr "漸層編輯器"
 
-#: ../app/actions/dialogs-actions.c:165
+#: ../app/actions/dialogs-actions.c:170
 msgctxt "dialogs-action"
 msgid "Open the gradient editor"
 msgstr "開啟漸層編輯器"
 
-#: ../app/actions/dialogs-actions.c:170
+#: ../app/actions/dialogs-actions.c:175
 msgctxt "dialogs-action"
 msgid "Pal_ettes"
 msgstr "調色盤(_E)"
 
-#: ../app/actions/dialogs-actions.c:171
+#: ../app/actions/dialogs-actions.c:176
 msgctxt "dialogs-action"
 msgid "Open the palettes dialog"
 msgstr "開啟調色盤對話盒"
 
-#: ../app/actions/dialogs-actions.c:176
+#: ../app/actions/dialogs-actions.c:181
 msgctxt "dialogs-action"
 msgid "Palette Editor"
 msgstr "調色盤編輯器"
 
-#: ../app/actions/dialogs-actions.c:177
+#: ../app/actions/dialogs-actions.c:182
 msgctxt "dialogs-action"
 msgid "Open the palette editor"
 msgstr "開啟調色盤編輯器"
 
-#: ../app/actions/dialogs-actions.c:182
+#: ../app/actions/dialogs-actions.c:187
 msgctxt "dialogs-action"
 msgid "Tool presets"
 msgstr "工具預設"
 
-#: ../app/actions/dialogs-actions.c:183
+#: ../app/actions/dialogs-actions.c:188
 msgctxt "dialogs-action"
 msgid "Open tool presets dialog"
 msgstr "開啟工具預設對話盒"
 
-#: ../app/actions/dialogs-actions.c:188
+#: ../app/actions/dialogs-actions.c:193
 msgctxt "dialogs-action"
 msgid "_Fonts"
 msgstr "字型(_F)"
 
-#: ../app/actions/dialogs-actions.c:189
+#: ../app/actions/dialogs-actions.c:194
 msgctxt "dialogs-action"
 msgid "Open the fonts dialog"
 msgstr "開啟字型對話盒"
 
-#: ../app/actions/dialogs-actions.c:194
+#: ../app/actions/dialogs-actions.c:199
 msgctxt "dialogs-action"
 msgid "B_uffers"
 msgstr "緩衝區(_U)"
 
-#: ../app/actions/dialogs-actions.c:195
+#: ../app/actions/dialogs-actions.c:200
 msgctxt "dialogs-action"
 msgid "Open the named buffers dialog"
 msgstr "開啟命名的緩衝區對話盒"
 
-#: ../app/actions/dialogs-actions.c:200
+#: ../app/actions/dialogs-actions.c:205
 msgctxt "dialogs-action"
 msgid "_Images"
 msgstr "圖片(_I)"
 
-#: ../app/actions/dialogs-actions.c:201
+#: ../app/actions/dialogs-actions.c:206
 msgctxt "dialogs-action"
 msgid "Open the images dialog"
 msgstr "開啟圖片對話盒"
 
-#: ../app/actions/dialogs-actions.c:206
+#: ../app/actions/dialogs-actions.c:211
 msgctxt "dialogs-action"
 msgid "Document Histor_y"
 msgstr "文件記錄(_Y)"
 
-#: ../app/actions/dialogs-actions.c:207
+#: ../app/actions/dialogs-actions.c:212
 msgctxt "dialogs-action"
 msgid "Open the document history dialog"
 msgstr "開啟文件歷史記錄對話盒"
 
-#: ../app/actions/dialogs-actions.c:212
+#: ../app/actions/dialogs-actions.c:217
 msgctxt "dialogs-action"
 msgid "_Templates"
 msgstr "範本(_T)"
 
-#: ../app/actions/dialogs-actions.c:213
+#: ../app/actions/dialogs-actions.c:218
 msgctxt "dialogs-action"
 msgid "Open the image templates dialog"
 msgstr "開啟圖片範本對話盒"
 
-#: ../app/actions/dialogs-actions.c:218
+#: ../app/actions/dialogs-actions.c:223
 msgctxt "dialogs-action"
 msgid "Error Co_nsole"
 msgstr "錯誤訊息(_N)"
 
-#: ../app/actions/dialogs-actions.c:219
+#: ../app/actions/dialogs-actions.c:224
 msgctxt "dialogs-action"
 msgid "Open the error console"
 msgstr "開啟錯誤訊息視窗"
 
-#: ../app/actions/dialogs-actions.c:229
+#: ../app/actions/dialogs-actions.c:234
 msgctxt "dialogs-action"
 msgid "_Preferences"
 msgstr "偏好設定(_P)"
 
-#: ../app/actions/dialogs-actions.c:230
+#: ../app/actions/dialogs-actions.c:235
 msgctxt "dialogs-action"
 msgid "Open the preferences dialog"
 msgstr "開啟偏好設定對話盒"
 
-#: ../app/actions/dialogs-actions.c:235
+#: ../app/actions/dialogs-actions.c:240
 msgctxt "dialogs-action"
 msgid "_Input Devices"
 msgstr "輸入裝置(_I)"
 
-#: ../app/actions/dialogs-actions.c:236
+#: ../app/actions/dialogs-actions.c:241
 msgctxt "dialogs-action"
 msgid "Open the input devices editor"
 msgstr "開啟輸入裝置編輯器"
 
-#: ../app/actions/dialogs-actions.c:241
+#: ../app/actions/dialogs-actions.c:246
 msgctxt "dialogs-action"
 msgid "_Keyboard Shortcuts"
 msgstr "鍵盤捷徑鍵(_K)"
 
-#: ../app/actions/dialogs-actions.c:242
+#: ../app/actions/dialogs-actions.c:247
 msgctxt "dialogs-action"
 msgid "Open the keyboard shortcuts editor"
 msgstr "開啟鍵盤捷徑鍵編輯器"
 
-#: ../app/actions/dialogs-actions.c:247
+#: ../app/actions/dialogs-actions.c:252
 msgctxt "dialogs-action"
 msgid "_Modules"
 msgstr "模組(_M)"
 
-#: ../app/actions/dialogs-actions.c:248
+#: ../app/actions/dialogs-actions.c:253
 msgctxt "dialogs-action"
 msgid "Open the module manager dialog"
 msgstr "開啟模組總管對話盒"
 
-#: ../app/actions/dialogs-actions.c:253
+#: ../app/actions/dialogs-actions.c:258
 msgctxt "dialogs-action"
 msgid "_Tip of the Day"
 msgstr "每日提示(_T)"
 
-#: ../app/actions/dialogs-actions.c:254
+#: ../app/actions/dialogs-actions.c:259
 msgctxt "dialogs-action"
 msgid "Show some helpful tips on using GIMP"
 msgstr "顯示一些使用 GIMP 的有用提示"
 
-#: ../app/actions/dialogs-actions.c:259
+#: ../app/actions/dialogs-actions.c:265 ../app/actions/dialogs-actions.c:271
 msgctxt "dialogs-action"
-msgid "_About"
+msgid "About GIMP"
+msgstr "關於 GIMP"
+
+#: ../app/actions/dialogs-actions.c:267
+msgctxt "dialogs-action"
+msgid "About"
 msgstr "關於(_A)"
 
-#: ../app/actions/dialogs-actions.c:260
+#: ../app/actions/dialogs-actions.c:269
 msgctxt "dialogs-action"
-msgid "About GIMP"
-msgstr "關於 GIMP"
+msgid "_About"
+msgstr "關於(_A)"
 
-#: ../app/actions/dialogs-actions.c:304
-#: ../app/dialogs/preferences-dialog.c:1943 ../app/widgets/gimptoolbox.c:597
+#: ../app/actions/dialogs-actions.c:333
+#: ../app/dialogs/preferences-dialog.c:1951 ../app/widgets/gimptoolbox.c:539
 msgid "Toolbox"
 msgstr "工具箱"
 
-#: ../app/actions/dialogs-actions.c:305
+#: ../app/actions/dialogs-actions.c:334
 msgid "Raise the toolbox"
 msgstr "提升工具箱"
 
-#: ../app/actions/dialogs-actions.c:309
+#: ../app/actions/dialogs-actions.c:338
 msgid "New Toolbox"
 msgstr "新增工具箱"
 
-#: ../app/actions/dialogs-actions.c:310
+#: ../app/actions/dialogs-actions.c:339
 msgid "Create a new toolbox"
 msgstr "建立新的工具箱"
 
@@ -1542,10 +1539,9 @@ msgid "Open the selected entry"
 msgstr "開啟選取的項目"
 
 #: ../app/actions/documents-actions.c:51
-#, fuzzy
 msgctxt "documents-action"
 msgid "_Raise or Open Image"
-msgstr "無法開啟 TIFF 圖片"
+msgstr "抬升或開啟圖片(_R)"
 
 #: ../app/actions/documents-actions.c:52
 msgctxt "documents-action"
@@ -1553,10 +1549,9 @@ msgid "Raise window if already open"
 msgstr "如果視窗已開啟便將其抬升"
 
 #: ../app/actions/documents-actions.c:57
-#, fuzzy
 msgctxt "documents-action"
 msgid "File Open _Dialog"
-msgstr "開啟搜尋對話方塊"
+msgstr "檔案開啟對話盒(_D)"
 
 #: ../app/actions/documents-actions.c:58
 msgctxt "documents-action"
@@ -1617,7 +1612,7 @@ msgstr "重新載入所有預覽圖"
 #, fuzzy
 msgctxt "documents-action"
 msgid "Remove Dangling E_ntries"
-msgstr "從面板中移除(_R)"
+msgstr "移除條目(_N)"
 
 #: ../app/actions/documents-actions.c:95
 msgctxt "documents-action"
@@ -1819,8 +1814,8 @@ msgstr "刪除這個筆刷動態"
 
 #: ../app/actions/dynamics-actions.c:70
 msgctxt "dynamics-action"
-msgid "_Refresh Dynamicss"
-msgstr "重新載入筆刷動態(_R)"
+msgid "_Refresh Dynamics"
+msgstr "重新整理筆刷動態(_R)"
 
 #: ../app/actions/dynamics-actions.c:71
 msgctxt "dynamics-action"
@@ -2084,91 +2079,91 @@ msgctxt "edit-action"
 msgid "Fill the selection using the active pattern"
 msgstr "用使用中的圖樣填滿選取區域"
 
-#: ../app/actions/edit-actions.c:295
+#: ../app/actions/edit-actions.c:304
 #, c-format
 msgid "_Undo %s"
 msgstr "復原「%s」(_U)"
 
-#: ../app/actions/edit-actions.c:302
+#: ../app/actions/edit-actions.c:311
 #, c-format
 msgid "_Redo %s"
 msgstr "取消復原「%s」(_R)"
 
-#: ../app/actions/edit-actions.c:317
+#: ../app/actions/edit-actions.c:326
 #, c-format
 msgid "_Fade %s..."
 msgstr "淡化 %s(_F)..."
 
-#: ../app/actions/edit-actions.c:329
+#: ../app/actions/edit-actions.c:338
 msgid "_Undo"
 msgstr "復原(_U)"
 
-#: ../app/actions/edit-actions.c:330
+#: ../app/actions/edit-actions.c:339
 msgid "_Redo"
 msgstr "取消復原(_R)"
 
-#: ../app/actions/edit-actions.c:331
+#: ../app/actions/edit-actions.c:340
 msgid "_Fade..."
 msgstr "淡化(_F)..."
 
-#: ../app/actions/edit-commands.c:136
+#: ../app/actions/edit-commands.c:137
 msgid "Clear Undo History"
 msgstr "清除復原記錄"
 
-#: ../app/actions/edit-commands.c:162
+#: ../app/actions/edit-commands.c:163
 msgid "Really clear image's undo history?"
 msgstr "真的要清除圖片的復原記錄嗎?"
 
-#: ../app/actions/edit-commands.c:175
+#: ../app/actions/edit-commands.c:176
 #, 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:206
 msgid "Cut pixels to the clipboard"
 msgstr "剪下像素到剪貼簿"
 
-#: ../app/actions/edit-commands.c:235 ../app/actions/edit-commands.c:264
+#: ../app/actions/edit-commands.c:236 ../app/actions/edit-commands.c:265
 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:325 ../app/actions/edit-commands.c:360
+#: ../app/actions/edit-commands.c:543
 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:348 ../app/core/gimpbrushclipboard.c:172
+#: ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345
 msgid "Clipboard"
 msgstr "剪貼簿"
 
-#: ../app/actions/edit-commands.c:373
+#: ../app/actions/edit-commands.c:374
 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:377 ../app/actions/edit-commands.c:418
+#: ../app/actions/edit-commands.c:438
 msgid "Enter a name for this buffer"
 msgstr "為此緩衝區命名"
 
-#: ../app/actions/edit-commands.c:414
+#: ../app/actions/edit-commands.c:415
 msgid "Copy Named"
 msgstr "複製並命名"
 
-#: ../app/actions/edit-commands.c:434
+#: ../app/actions/edit-commands.c:435
 msgid "Copy Visible Named "
 msgstr "複製可見的並命名"
 
-#: ../app/actions/edit-commands.c:555
+#: ../app/actions/edit-commands.c:560
 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:565 ../app/actions/edit-commands.c:597
+#: ../app/actions/edit-commands.c:621
 msgid "(Unnamed Buffer)"
 msgstr "(未命名的緩衝區)"
 
-#: ../app/actions/edit-commands.c:587
+#: ../app/actions/edit-commands.c:592
 msgid "There is no active layer or channel to copy from."
 msgstr "目前沒有任何使用中的圖層或者色版可以複製。"
 
@@ -2364,8 +2359,8 @@ msgstr "儲存這個圖片,並關閉它的視窗"
 
 #: ../app/actions/file-actions.c:146
 msgctxt "file-action"
-msgid "Export to"
-msgstr "匯出到"
+msgid "Export"
+msgstr "匯出"
 
 #: ../app/actions/file-actions.c:147
 msgctxt "file-action"
@@ -2374,8 +2369,8 @@ msgstr "再次匯出圖片"
 
 #: ../app/actions/file-actions.c:152
 msgctxt "file-action"
-msgid "Overwrite"
-msgstr "覆寫"
+msgid "Over_write"
+msgstr "覆寫(_W)"
 
 #: ../app/actions/file-actions.c:153
 msgctxt "file-action"
@@ -2384,8 +2379,8 @@ msgstr "匯出圖片回原匯入的檔案,用匯入的檔案格式"
 
 #: ../app/actions/file-actions.c:158
 msgctxt "file-action"
-msgid "Export..."
-msgstr "匯出..."
+msgid "Export As..."
+msgstr "匯出為..."
 
 #: ../app/actions/file-actions.c:159
 msgctxt "file-action"
@@ -2399,66 +2394,67 @@ msgstr "匯出到 %s"
 
 #: ../app/actions/file-actions.c:298
 #, c-format
-msgid "Overwrite %s"
-msgstr "覆寫 %s"
+msgid "Over_write %s"
+msgstr "覆寫 %s(_W)"
 
 #: ../app/actions/file-actions.c:306
-msgid "Export to"
-msgstr "匯出到"
+msgid "Export"
+msgstr "匯出"
 
-#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:475
+#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:497
 #: ../app/dialogs/file-open-dialog.c:77
 msgid "Open Image"
 msgstr "開啟圖片"
 
-#: ../app/actions/file-commands.c:133
+#: ../app/actions/file-commands.c:140
 msgid "Open Image as Layers"
 msgstr "開啟圖片成為圖層"
 
-#: ../app/actions/file-commands.c:265
+#: ../app/actions/file-commands.c:272
 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:279 ../app/actions/file-commands.c:701
+#: ../app/dialogs/file-save-dialog.c:103
 msgid "Save Image"
 msgstr "儲存圖片"
 
-#: ../app/actions/file-commands.c:278
+#: ../app/actions/file-commands.c:285
 msgid "Save a Copy of the Image"
 msgstr "儲存圖片的複本"
 
-#: ../app/actions/file-commands.c:338
+#: ../app/actions/file-commands.c:371
 msgid "Create New Template"
 msgstr "建立新的範本"
 
-#: ../app/actions/file-commands.c:342
+#: ../app/actions/file-commands.c:375
 msgid "Enter a name for this template"
 msgstr "輸入這個範本的名稱"
 
-#: ../app/actions/file-commands.c:377
+#: ../app/actions/file-commands.c:405
 msgid "Revert failed. No file name associated with this image."
 msgstr "還原失敗。沒有檔案是屬於這圖片的。"
 
-#: ../app/actions/file-commands.c:390
+#: ../app/actions/file-commands.c:417
 msgid "Revert Image"
 msgstr "還原圖片"
 
-#: ../app/actions/file-commands.c:421
+#: ../app/actions/file-commands.c:443
 #, c-format
 msgid "Revert '%s' to '%s'?"
 msgstr "是否將 ‘%s’ 還原為 ‘%s’?"
 
-#: ../app/actions/file-commands.c:427
+#: ../app/actions/file-commands.c:449
 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:731
 msgid "(Unnamed Template)"
 msgstr "(未命名範本)"
 
-#: ../app/actions/file-commands.c:690
+#: ../app/actions/file-commands.c:782
 #, c-format
 msgid ""
 "Reverting to '%s' failed:\n"
@@ -2520,28 +2516,24 @@ msgid "Sa_ve Right Color To"
 msgstr "將右端點顏色儲存至(_V)"
 
 #: ../app/actions/gradient-editor-actions.c:66
-#, fuzzy
 msgctxt "gradient-editor-action"
 msgid "L_eft Endpoint's Color..."
-msgstr "格線外框的顏色"
+msgstr "左端點的色彩(_E)..."
 
 #: ../app/actions/gradient-editor-actions.c:71
-#, fuzzy
 msgctxt "gradient-editor-action"
 msgid "R_ight Endpoint's Color..."
-msgstr "格線外框的顏色"
+msgstr "右端點的色彩(_I)..."
 
 #: ../app/actions/gradient-editor-actions.c:111
-#, fuzzy
 msgctxt "gradient-editor-action"
 msgid "Ble_nd Endpoints' Colors"
 msgstr "混合端點的顏色(_N)"
 
 #: ../app/actions/gradient-editor-actions.c:116
-#, fuzzy
 msgctxt "gradient-editor-action"
 msgid "Blend Endpoints' Opacit_y"
-msgstr "指定了多重連線端點"
+msgstr "混合端點的不透明度(_Y)"
 
 #: ../app/actions/gradient-editor-actions.c:124
 msgctxt "gradient-editor-action"
@@ -2549,10 +2541,9 @@ msgid "Edit Active Gradient"
 msgstr "編輯使用中漸層"
 
 #: ../app/actions/gradient-editor-actions.c:155
-#, fuzzy
 msgctxt "gradient-editor-action"
 msgid "_Left Neighbor's Right Endpoint"
-msgstr "靠左、靠右或是置中對齊"
+msgstr "左鄰的右端點(_L)"
 
 #: ../app/actions/gradient-editor-actions.c:160
 msgctxt "gradient-editor-action"
@@ -2572,10 +2563,9 @@ msgid "_Background Color"
 msgstr "背景顏色(_B)"
 
 #: ../app/actions/gradient-editor-actions.c:203
-#, fuzzy
 msgctxt "gradient-editor-action"
 msgid "_Right Neighbor's Left Endpoint"
-msgstr "靠左、靠右或是置中對齊"
+msgstr "右鄰的左端點(_R)"
 
 #: ../app/actions/gradient-editor-actions.c:208
 msgctxt "gradient-editor-action"
@@ -3192,54 +3182,54 @@ 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:237
 msgid "Set Image Canvas Size"
 msgstr "設定圖片的畫布尺寸"
 
-#: ../app/actions/image-commands.c:265 ../app/actions/image-commands.c:289
-#: ../app/actions/image-commands.c:581
+#: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290
+#: ../app/actions/image-commands.c:594
 msgid "Resizing"
 msgstr "縮放中"
 
-#: ../app/actions/image-commands.c:316
+#: ../app/actions/image-commands.c:317
 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:379
+#: ../app/pdb/drawable-transform-cmds.c:159
+#: ../app/pdb/drawable-transform-cmds.c:247
+#: ../app/pdb/item-transform-cmds.c:162
 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:403
+#: ../app/pdb/drawable-transform-cmds.c:602
+#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534
+#: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245
+#: ../app/tools/gimprotatetool.c:125
 msgid "Rotating"
 msgstr "旋轉中"
 
-#: ../app/actions/image-commands.c:428 ../app/actions/layers-commands.c:691
+#: ../app/actions/image-commands.c:429 ../app/actions/layers-commands.c:691
 msgid "Cannot crop because the current selection is empty."
 msgstr "無法裁剪,因為目前選取區域是空的。"
 
-#: ../app/actions/image-commands.c:628
+#: ../app/actions/image-commands.c:641
 msgid "Change Print Size"
 msgstr "改變列印的大小"
 
-#: ../app/actions/image-commands.c:669
+#: ../app/actions/image-commands.c:682
 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:693 ../app/actions/layers-commands.c:1145
+#: ../app/dialogs/preferences-dialog.c:1906
+#: ../app/pdb/drawable-transform-cmds.c:783
+#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406
+#: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524
+#: ../app/pdb/layer-cmds.c:330 ../app/pdb/layer-cmds.c:375
+#: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118
 msgid "Scaling"
 msgstr "縮放"
 
@@ -3343,7 +3333,7 @@ msgctxt "layers-action"
 msgid "Edit the layer's name"
 msgstr "編輯圖層名稱"
 
-#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:598
+#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:610
 msgctxt "layers-action"
 msgid "_New Layer..."
 msgstr "新增圖層(_N)..."
@@ -3353,7 +3343,7 @@ msgctxt "layers-action"
 msgid "Create a new layer and add it to the image"
 msgstr "建立新的圖層並將它加入圖片"
 
-#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:599
+#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:611
 msgctxt "layers-action"
 msgid "_New Layer"
 msgstr "新增圖層(_N)"
@@ -3762,22 +3752,21 @@ msgstr "選取在目前圖層之下的圖層"
 #. on thumbnail"
 #.
 #: ../app/actions/layers-actions.c:442
-#, fuzzy
 msgid "Shortcut: "
-msgstr "捷徑"
+msgstr "捷徑鍵:"
 
 #. Will be prepended with a modifier key
 #. string, e.g. "Shift"
 #.
 #: ../app/actions/layers-actions.c:447
+#, fuzzy
 msgid "-Click on thumbnail in Layers dockable"
-msgstr ""
+msgstr "-點按圖層中的縮圖"
 
-#: ../app/actions/layers-actions.c:593 ../app/actions/layers-actions.c:594
-#, fuzzy
+#: ../app/actions/layers-actions.c:605 ../app/actions/layers-actions.c:606
 msgctxt "layers-action"
 msgid "To _New Layer"
-msgstr "加入新的圖層"
+msgstr "到新的圖層(_N)"
 
 #: ../app/actions/layers-commands.c:203
 msgid "Layer Attributes"
@@ -3787,13 +3776,13 @@ msgstr "圖層屬性"
 msgid "Edit Layer Attributes"
 msgstr "編輯圖層屬性"
 
-#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:265
+#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:267
 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/widgets/gimpdrawabletreeview.c:326
+#: ../app/widgets/gimplayertreeview.c:837
 msgid "New Layer"
 msgstr "新增圖層"
 
@@ -4012,7 +4001,7 @@ msgstr "新增圖樣(_N)"
 #: ../app/actions/patterns-actions.c:53
 msgctxt "patterns-action"
 msgid "Create a new pattern"
-msgstr ""
+msgstr "建立新的圖樣"
 
 #: ../app/actions/patterns-actions.c:58
 msgctxt "patterns-action"
@@ -4064,146 +4053,146 @@ msgctxt "patterns-action"
 msgid "Edit pattern"
 msgstr "編輯圖樣"
 
-#: ../app/actions/plug-in-actions.c:84
+#: ../app/actions/plug-in-actions.c:85
 msgctxt "plug-in-action"
 msgid "Filte_rs"
 msgstr "濾鏡(_R)"
 
-#: ../app/actions/plug-in-actions.c:86
+#: ../app/actions/plug-in-actions.c:87
 msgctxt "plug-in-action"
 msgid "Recently Used"
 msgstr "最近使用的"
 
-#: ../app/actions/plug-in-actions.c:88
+#: ../app/actions/plug-in-actions.c:89
 msgctxt "plug-in-action"
 msgid "_Blur"
 msgstr "模糊化(_B)"
 
-#: ../app/actions/plug-in-actions.c:90
+#: ../app/actions/plug-in-actions.c:91
 msgctxt "plug-in-action"
 msgid "_Noise"
 msgstr "雜訊(_N)"
 
-#: ../app/actions/plug-in-actions.c:92
+#: ../app/actions/plug-in-actions.c:93
 msgctxt "plug-in-action"
 msgid "Edge-De_tect"
 msgstr "邊緣偵測(_T)"
 
-#: ../app/actions/plug-in-actions.c:94
+#: ../app/actions/plug-in-actions.c:95
 msgctxt "plug-in-action"
 msgid "En_hance"
 msgstr "加強品質(_H)"
 
-#: ../app/actions/plug-in-actions.c:96
+#: ../app/actions/plug-in-actions.c:97
 msgctxt "plug-in-action"
 msgid "C_ombine"
 msgstr "合併(_O)"
 
-#: ../app/actions/plug-in-actions.c:98
+#: ../app/actions/plug-in-actions.c:99
 msgctxt "plug-in-action"
 msgid "_Generic"
 msgstr "無法歸類的濾鏡(_G)"
 
-#: ../app/actions/plug-in-actions.c:100
+#: ../app/actions/plug-in-actions.c:101
 msgctxt "plug-in-action"
 msgid "_Light and Shadow"
 msgstr "光影(_L)"
 
-#: ../app/actions/plug-in-actions.c:102
+#: ../app/actions/plug-in-actions.c:103
 msgctxt "plug-in-action"
 msgid "_Distorts"
 msgstr "扭曲(_D)"
 
-#: ../app/actions/plug-in-actions.c:104
+#: ../app/actions/plug-in-actions.c:105
 msgctxt "plug-in-action"
 msgid "_Artistic"
 msgstr "藝術效果(_A)"
 
-#: ../app/actions/plug-in-actions.c:106
+#: ../app/actions/plug-in-actions.c:107
 msgctxt "plug-in-action"
 msgid "_Decor"
 msgstr "裝飾(_D)"
 
-#: ../app/actions/plug-in-actions.c:108
+#: ../app/actions/plug-in-actions.c:109
 msgctxt "plug-in-action"
 msgid "_Map"
 msgstr "映射(_M)"
 
-#: ../app/actions/plug-in-actions.c:110
+#: ../app/actions/plug-in-actions.c:111
 msgctxt "plug-in-action"
 msgid "_Render"
 msgstr "描繪(_R)"
 
-#: ../app/actions/plug-in-actions.c:112
+#: ../app/actions/plug-in-actions.c:113
 msgctxt "plug-in-action"
 msgid "_Clouds"
 msgstr "雲狀(_C)"
 
-#: ../app/actions/plug-in-actions.c:114
+#: ../app/actions/plug-in-actions.c:115
 msgctxt "plug-in-action"
 msgid "_Nature"
 msgstr "自然(_N)"
 
-#: ../app/actions/plug-in-actions.c:116
+#: ../app/actions/plug-in-actions.c:117
 msgctxt "plug-in-action"
 msgid "_Pattern"
 msgstr "圖樣(_P)"
 
-#: ../app/actions/plug-in-actions.c:118
+#: ../app/actions/plug-in-actions.c:119
 msgctxt "plug-in-action"
 msgid "_Web"
 msgstr "網頁(_W)"
 
-#: ../app/actions/plug-in-actions.c:120
+#: ../app/actions/plug-in-actions.c:121
 msgctxt "plug-in-action"
 msgid "An_imation"
 msgstr "動畫(_I)"
 
-#: ../app/actions/plug-in-actions.c:123
+#: ../app/actions/plug-in-actions.c:124
 msgctxt "plug-in-action"
 msgid "Reset all _Filters"
 msgstr "重設所有濾鏡(_F)"
 
-#: ../app/actions/plug-in-actions.c:124
+#: ../app/actions/plug-in-actions.c:125
 msgctxt "plug-in-action"
 msgid "Reset all plug-ins to their default settings"
 msgstr "重新設置所有的外掛程式設定為其預設值"
 
-#: ../app/actions/plug-in-actions.c:132
+#: ../app/actions/plug-in-actions.c:133
 msgctxt "plug-in-action"
 msgid "Re_peat Last"
 msgstr "重複上一個(_P)"
 
-#: ../app/actions/plug-in-actions.c:134
+#: ../app/actions/plug-in-actions.c:135
 msgctxt "plug-in-action"
 msgid "Rerun the last used plug-in using the same settings"
 msgstr "再一次執行前次使用的外掛程式,並且使用同樣的設定值"
 
-#: ../app/actions/plug-in-actions.c:139
+#: ../app/actions/plug-in-actions.c:140
 msgctxt "plug-in-action"
 msgid "R_e-Show Last"
 msgstr "重新顯示上一個(_E)"
 
-#: ../app/actions/plug-in-actions.c:140
+#: ../app/actions/plug-in-actions.c:141
 msgctxt "plug-in-action"
 msgid "Show the last used plug-in dialog again"
 msgstr "再次顯示前次使用的外掛程式對話盒"
 
-#: ../app/actions/plug-in-actions.c:531
+#: ../app/actions/plug-in-actions.c:551
 #, c-format
 msgid "Re_peat \"%s\""
 msgstr "重複“%s”(_P)"
 
-#: ../app/actions/plug-in-actions.c:532
+#: ../app/actions/plug-in-actions.c:552
 #, c-format
 msgid "R_e-Show \"%s\""
 msgstr "重新顯示“%s”(_E)"
 
-#: ../app/actions/plug-in-actions.c:548
+#: ../app/actions/plug-in-actions.c:568
 msgid "Repeat Last"
 msgstr "重複上一步"
 
-#: ../app/actions/plug-in-actions.c:550
+#: ../app/actions/plug-in-actions.c:570
 msgid "Re-Show Last"
 msgstr "重新顯示上一步"
 
@@ -4241,10 +4230,9 @@ msgid "Mask _Selected Areas"
 msgstr "遮蔽已選取的區域(_S)"
 
 #: ../app/actions/quick-mask-actions.c:70
-#, fuzzy
 msgctxt "quick-mask-action"
 msgid "Mask _Unselected Areas"
-msgstr "可改變大小的文字區域"
+msgstr "遮蔽未選取的區域(_U)"
 
 #: ../app/actions/quick-mask-commands.c:105
 msgid "Quick Mask Attributes"
@@ -4344,7 +4332,7 @@ msgstr "銳利化(_S)"
 
 #: ../app/actions/select-actions.c:82
 msgctxt "select-action"
-msgid "Remove fuzzyness from the selection"
+msgid "Remove fuzziness from the selection"
 msgstr "從選取區域去除模糊性"
 
 #: ../app/actions/select-actions.c:87
@@ -4407,59 +4395,59 @@ msgctxt "select-action"
 msgid "Stroke the selection with last used values"
 msgstr "用上次的設定,依選取區域描邊"
 
-#: ../app/actions/select-commands.c:155
+#: ../app/actions/select-commands.c:156
 msgid "Feather Selection"
 msgstr "羽化選取區域"
 
-#: ../app/actions/select-commands.c:159
+#: ../app/actions/select-commands.c:160
 msgid "Feather selection by"
 msgstr "選取區域邊緣羽化程度:"
 
-#: ../app/actions/select-commands.c:196
+#: ../app/actions/select-commands.c:197
 msgid "Shrink Selection"
 msgstr "縮小選取區域"
 
-#: ../app/actions/select-commands.c:200
+#: ../app/actions/select-commands.c:201
 msgid "Shrink selection by"
 msgstr "選取區域縮小程度:"
 
-#: ../app/actions/select-commands.c:208
+#: ../app/actions/select-commands.c:209
 msgid "_Shrink from image border"
 msgstr "從圖片邊緣開始縮小(_S)"
 
-#: ../app/actions/select-commands.c:236
+#: ../app/actions/select-commands.c:237
 msgid "Grow Selection"
 msgstr "擴大選取區域"
 
-#: ../app/actions/select-commands.c:240
+#: ../app/actions/select-commands.c:241
 msgid "Grow selection by"
 msgstr "選取區域擴大程度:"
 
-#: ../app/actions/select-commands.c:266
+#: ../app/actions/select-commands.c:267
 msgid "Border Selection"
 msgstr "選取區域框線化"
 
-#: ../app/actions/select-commands.c:270
+#: ../app/actions/select-commands.c:271
 msgid "Border selection by"
 msgstr "選取區域框線化程度:"
 
 #. Feather button
-#: ../app/actions/select-commands.c:279
+#: ../app/actions/select-commands.c:280
 msgid "_Feather border"
 msgstr "羽化框線(_F)"
 
 #. Edge lock button
-#: ../app/actions/select-commands.c:292
+#: ../app/actions/select-commands.c:293
 msgid "_Lock selection to image edges"
 msgstr "將選取區域鎖定在圖片邊緣(_L)"
 
-#: ../app/actions/select-commands.c:342 ../app/actions/select-commands.c:375
+#: ../app/actions/select-commands.c:345 ../app/actions/select-commands.c:378
 #: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420
-#: ../app/dialogs/stroke-dialog.c:289
+#: ../app/dialogs/stroke-dialog.c:281
 msgid "There is no active layer or channel to stroke to."
 msgstr "目前沒有任何使用中的圖層或者色版可以用來描邊。"
 
-#: ../app/actions/select-commands.c:348
+#: ../app/actions/select-commands.c:351
 msgid "Stroke Selection"
 msgstr "依選取區域描邊"
 
@@ -4518,24 +4506,24 @@ msgctxt "templates-action"
 msgid "Delete this template"
 msgstr "刪除這個範本"
 
-#: ../app/actions/templates-commands.c:111
+#: ../app/actions/templates-commands.c:110
 msgid "New Template"
 msgstr "新增範本"
 
-#: ../app/actions/templates-commands.c:114
+#: ../app/actions/templates-commands.c:113
 msgid "Create a New Template"
 msgstr "製作新的範本"
 
-#: ../app/actions/templates-commands.c:174
-#: ../app/actions/templates-commands.c:177
+#: ../app/actions/templates-commands.c:173
+#: ../app/actions/templates-commands.c:176
 msgid "Edit Template"
 msgstr "修改範本"
 
-#: ../app/actions/templates-commands.c:212
+#: ../app/actions/templates-commands.c:211
 msgid "Delete Template"
 msgstr "刪除範本"
 
-#: ../app/actions/templates-commands.c:238
+#: ../app/actions/templates-commands.c:237
 #, c-format
 msgid ""
 "Are you sure you want to delete template '%s' from the list and from disk?"
@@ -4588,15 +4576,15 @@ 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/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443
 #: ../app/core/gimpbrushgenerated-load.c:73
 #: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54
-#: ../app/core/gimpgradient-load.c:62 ../app/core/gimppalette-load.c:76
-#: ../app/core/gimppalette-load.c:273 ../app/core/gimppalette-load.c:319
-#: ../app/core/gimppalette-load.c:376 ../app/core/gimppalette-load.c:466
-#: ../app/core/gimppalette-load.c:633 ../app/core/gimppattern-load.c:76
-#: ../app/tools/gimpcurvestool.c:637 ../app/tools/gimplevelstool.c:747
-#: ../app/xcf/xcf.c:329
+#: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77
+#: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320
+#: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467
+#: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76
+#: ../app/tools/gimpcurvestool.c:642 ../app/tools/gimplevelstool.c:747
+#: ../app/xcf/xcf.c:359
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "無法開啟 ‘%s’ 來讀取資料:%s"
@@ -4676,148 +4664,126 @@ msgctxt "text-tool-action"
 msgid "From right to left"
 msgstr "由右至左"
 
-#: ../app/actions/tool-options-actions.c:55
+#: ../app/actions/tool-options-actions.c:56
 msgctxt "tool-options-action"
 msgid "Tool Options Menu"
 msgstr "「工具選項」選單 "
 
-#: ../app/actions/tool-options-actions.c:59
+#: ../app/actions/tool-options-actions.c:60
 msgctxt "tool-options-action"
-msgid "_Save Options To"
-msgstr "儲存選項到(_S)"
+msgid "_Save Tool Preset"
+msgstr "儲存工具預設(_S)"
 
-#: ../app/actions/tool-options-actions.c:63
+#: ../app/actions/tool-options-actions.c:64
 msgctxt "tool-options-action"
-msgid "_Restore Options From"
-msgstr "還原選項自(_R)"
+msgid "_Restore Tool Preset"
+msgstr "還原工具預設(_R)"
 
-#: ../app/actions/tool-options-actions.c:67
+#: ../app/actions/tool-options-actions.c:68
 msgctxt "tool-options-action"
-msgid "Re_name Saved Options"
-msgstr "更改儲存的選項名稱(_N)"
+msgid "E_dit Tool Preset"
+msgstr "編輯工具預設(_D)"
 
-#: ../app/actions/tool-options-actions.c:71
+#: ../app/actions/tool-options-actions.c:72
 msgctxt "tool-options-action"
-msgid "_Delete Saved Options"
-msgstr "刪除已儲存的選項(_D)"
+msgid "_Delete Tool Preset"
+msgstr "刪除工具預設(_D)"
 
-#: ../app/actions/tool-options-actions.c:75
+#: ../app/actions/tool-options-actions.c:76
 msgctxt "tool-options-action"
-msgid "_New Entry..."
-msgstr "新增項目(_N)..."
+msgid "_New Tool Preset..."
+msgstr "新增工具預設(_N)..."
 
-#: ../app/actions/tool-options-actions.c:80
+#: ../app/actions/tool-options-actions.c:81
 msgctxt "tool-options-action"
 msgid "R_eset Tool Options"
 msgstr "重設工具選項(_E)"
 
-#: ../app/actions/tool-options-actions.c:81
+#: ../app/actions/tool-options-actions.c:82
 msgctxt "tool-options-action"
 msgid "Reset to default values"
 msgstr "重置為預設值"
 
-#: ../app/actions/tool-options-actions.c:86
+#: ../app/actions/tool-options-actions.c:87
 msgctxt "tool-options-action"
 msgid "Reset _all Tool Options"
 msgstr "重設所有工具選項(_A)"
 
-#: ../app/actions/tool-options-actions.c:87
+#: ../app/actions/tool-options-actions.c:88
 msgctxt "tool-options-action"
 msgid "Reset all tool options"
 msgstr "重設所有的工具選項"
 
-#: ../app/actions/tool-options-commands.c:70
-msgid "Save Tool Options"
-msgstr "儲存工具選項"
-
-#: ../app/actions/tool-options-commands.c:74
-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
-msgid "Saved Options"
-msgstr "已儲存選項"
-
-#: ../app/actions/tool-options-commands.c:138
-msgid "Rename Saved Tool Options"
-msgstr "更改儲存的工具選項名稱"
-
-#: ../app/actions/tool-options-commands.c:142
-msgid "Enter a new name for the saved options"
-msgstr "輸入已儲存選項的新名稱"
-
-#: ../app/actions/tool-options-commands.c:185
+#: ../app/actions/tool-options-commands.c:186
 msgid "Reset All Tool Options"
 msgstr "重設所有的工具選項"
 
-#: ../app/actions/tool-options-commands.c:208
+#: ../app/actions/tool-options-commands.c:209
 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-presets-actions.c:44
+msgctxt "tool-presets-action"
+msgid "Tool Presets Menu"
+msgstr "工具預設選單"
 
-#: ../app/actions/tool-preset-actions.c:48
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:48
+msgctxt "tool-presets-action"
 msgid "_New Tool Preset"
 msgstr "新增工具預設(_N)"
 
-#: ../app/actions/tool-preset-actions.c:49
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:49
+msgctxt "tool-presets-action"
 msgid "Create a new tool preset"
 msgstr "建立新的工具預設"
 
-#: ../app/actions/tool-preset-actions.c:54
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:54
+msgctxt "tool-presets-action"
 msgid "D_uplicate Tool Preset"
 msgstr "重製工具預設(_U)"
 
-#: ../app/actions/tool-preset-actions.c:55
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:55
+msgctxt "tool-presets-action"
 msgid "Duplicate this tool preset"
 msgstr "重製這個工具預設"
 
-#: ../app/actions/tool-preset-actions.c:60
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:60
+msgctxt "tool-presets-action"
 msgid "Copy Tool Preset _Location"
 msgstr "複製工具預設的位置(_L)"
 
-#: ../app/actions/tool-preset-actions.c:61
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:61
+msgctxt "tool-presets-action"
 msgid "Copy tool preset file location to clipboard"
 msgstr "複製工具預設檔案的位置到剪貼簿"
 
-#: ../app/actions/tool-preset-actions.c:66
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:66
+msgctxt "tool-presets-action"
 msgid "_Delete Tool Preset"
 msgstr "刪除工具預設(_D)"
 
-#: ../app/actions/tool-preset-actions.c:67
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:67
+msgctxt "tool-presets-action"
 msgid "Delete this tool preset"
 msgstr "刪除這個工具預設"
 
-#: ../app/actions/tool-preset-actions.c:72
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:72
+msgctxt "tool-presets-action"
 msgid "_Refresh Tool Presets"
 msgstr "重新整理工具預設(_R)"
 
-#: ../app/actions/tool-preset-actions.c:73
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:73
+msgctxt "tool-presets-action"
 msgid "Refresh tool presets"
 msgstr "重新整理工具預設"
 
-#: ../app/actions/tool-preset-actions.c:81
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:81
+msgctxt "tool-presets-action"
 msgid "_Edit Tool Preset..."
 msgstr "編輯工具預設(_E)..."
 
-#: ../app/actions/tool-preset-actions.c:82
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:82
+msgctxt "tool-presets-action"
 msgid "Edit this tool preset"
 msgstr "編輯這個工具預設"
 
@@ -5033,10 +4999,9 @@ msgstr "已連結(_L)"
 
 #. GIMP_STOCK_LOCK
 #: ../app/actions/vectors-actions.c:159
-#, fuzzy
 msgctxt "vectors-action"
 msgid "L_ock strokes"
-msgstr "中日韓筆畫部件"
+msgstr "鎖定筆劃(_O)"
 
 #: ../app/actions/vectors-actions.c:168
 msgctxt "vectors-action"
@@ -5122,7 +5087,7 @@ msgid "Edit Path Attributes"
 msgstr "編輯路徑屬性"
 
 #: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207
-#: ../app/widgets/gimpvectorstreeview.c:252
+#: ../app/widgets/gimpvectorstreeview.c:250
 msgid "Path"
 msgstr "路徑"
 
@@ -5134,8 +5099,8 @@ msgstr "新增路徑"
 msgid "New Path Options"
 msgstr "新增路徑選項"
 
-#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:198
-#: ../app/tools/gimpvectortool.c:1982
+#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:199
+#: ../app/tools/gimpvectortool.c:1975
 msgid "Stroke Path"
 msgstr "沿著路徑描邊"
 
@@ -5171,13 +5136,13 @@ msgstr "用新的視窗來顯示該圖片"
 
 #: ../app/actions/view-actions.c:82
 msgctxt "view-action"
-msgid "_Close"
-msgstr "關閉(_C)"
+msgid "_Close View"
+msgstr "關閉檢視(_C)"
 
 #: ../app/actions/view-actions.c:83
 msgctxt "view-action"
-msgid "Close this image window"
-msgstr "關閉這個圖片視窗"
+msgid "Close the active image view"
+msgstr "關閉使用中圖片檢視"
 
 #: ../app/actions/view-actions.c:88
 msgctxt "view-action"
@@ -5399,13 +5364,23 @@ msgctxt "view-action"
 msgid "Toggle fullscreen view"
 msgstr "切換全螢幕檢視"
 
+#: ../app/actions/view-actions.c:238
+msgctxt "view-action"
+msgid "Use GEGL"
+msgstr "使用 GEGL"
+
+#: ../app/actions/view-actions.c:239
+msgctxt "view-action"
+msgid "Use GEGL to create this window's projection"
+msgstr "使用 GEGL 建立視窗的投影"
+
 #: ../app/actions/view-actions.c:263
 msgctxt "view-zoom-action"
 msgid "Zoom _Out"
 msgstr "拉遠(_O)"
 
 #: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276
-msgctxt "view-action"
+msgctxt "view-zoom-action"
 msgid "Zoom out"
 msgstr "拉遠"
 
@@ -5415,7 +5390,7 @@ msgid "Zoom _In"
 msgstr "拉近(_I)"
 
 #: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282
-msgctxt "view-action"
+msgctxt "view-zoom-action"
 msgid "Zoom in"
 msgstr "拉近"
 
@@ -5429,230 +5404,248 @@ msgctxt "view-zoom-action"
 msgid "Zoom In"
 msgstr "拉近"
 
-#: ../app/actions/view-actions.c:300
+#: ../app/actions/view-actions.c:300 ../app/actions/view-actions.c:306
 msgctxt "view-zoom-action"
 msgid "1_6:1  (1600%)"
 msgstr "1_6:1 (1600%)"
 
-#: ../app/actions/view-actions.c:301
+#: ../app/actions/view-actions.c:301 ../app/actions/view-actions.c:307
 msgctxt "view-zoom-action"
 msgid "Zoom 16:1"
 msgstr "縮放為 16:1"
 
-#: ../app/actions/view-actions.c:306
+#: ../app/actions/view-actions.c:312 ../app/actions/view-actions.c:318
 msgctxt "view-zoom-action"
 msgid "_8:1  (800%)"
 msgstr "_8:1 (800%)"
 
-#: ../app/actions/view-actions.c:307
+#: ../app/actions/view-actions.c:313 ../app/actions/view-actions.c:319
 msgctxt "view-zoom-action"
 msgid "Zoom 8:1"
 msgstr "縮放為 8:1"
 
-#: ../app/actions/view-actions.c:312
+#: ../app/actions/view-actions.c:324 ../app/actions/view-actions.c:330
 msgctxt "view-zoom-action"
 msgid "_4:1  (400%)"
 msgstr "_4:1 (400%)"
 
-#: ../app/actions/view-actions.c:313
+#: ../app/actions/view-actions.c:325 ../app/actions/view-actions.c:331
 msgctxt "view-zoom-action"
 msgid "Zoom 4:1"
 msgstr "縮放為 4:1"
 
-#: ../app/actions/view-actions.c:318
+#: ../app/actions/view-actions.c:336 ../app/actions/view-actions.c:342
 msgctxt "view-zoom-action"
 msgid "_2:1  (200%)"
 msgstr "_2:1 (200%)"
 
-#: ../app/actions/view-actions.c:319
+#: ../app/actions/view-actions.c:337 ../app/actions/view-actions.c:343
 msgctxt "view-zoom-action"
 msgid "Zoom 2:1"
 msgstr "縮放為 2:1"
 
-#: ../app/actions/view-actions.c:324
+#: ../app/actions/view-actions.c:348 ../app/actions/view-actions.c:354
 msgctxt "view-zoom-action"
 msgid "_1:1  (100%)"
 msgstr "_1:1 (100%)"
 
-#: ../app/actions/view-actions.c:325
+#: ../app/actions/view-actions.c:349 ../app/actions/view-actions.c:355
 msgctxt "view-zoom-action"
 msgid "Zoom 1:1"
 msgstr "原來尺寸"
 
-#: ../app/actions/view-actions.c:330
+#: ../app/actions/view-actions.c:360
 msgctxt "view-zoom-action"
 msgid "1:_2  (50%)"
 msgstr "1:_2 (50%)"
 
-#: ../app/actions/view-actions.c:331
+#: ../app/actions/view-actions.c:361
 msgctxt "view-zoom-action"
 msgid "Zoom 1:2"
 msgstr "縮放為 1:2"
 
-#: ../app/actions/view-actions.c:336
+#: ../app/actions/view-actions.c:366
 msgctxt "view-zoom-action"
 msgid "1:_4  (25%)"
 msgstr "1:_4 (25%)"
 
-#: ../app/actions/view-actions.c:337
+#: ../app/actions/view-actions.c:367
 msgctxt "view-zoom-action"
 msgid "Zoom 1:4"
 msgstr "縮放為 1:4"
 
-#: ../app/actions/view-actions.c:342
+#: ../app/actions/view-actions.c:372
 msgctxt "view-zoom-action"
 msgid "1:_8  (12.5%)"
 msgstr "1:_8 (12.5%)"
 
-#: ../app/actions/view-actions.c:343
+#: ../app/actions/view-actions.c:373
 msgctxt "view-zoom-action"
 msgid "Zoom 1:8"
 msgstr "縮放為 1:8"
 
-#: ../app/actions/view-actions.c:348
+#: ../app/actions/view-actions.c:378
 msgctxt "view-zoom-action"
 msgid "1:1_6  (6.25%)"
 msgstr "1:1_6 (6.25%)"
 
-#: ../app/actions/view-actions.c:349
+#: ../app/actions/view-actions.c:379
 msgctxt "view-zoom-action"
 msgid "Zoom 1:16"
 msgstr "縮放為 1:16"
 
-#: ../app/actions/view-actions.c:354
+#: ../app/actions/view-actions.c:384
 msgctxt "view-zoom-action"
 msgid "Othe_r..."
 msgstr "其他(_R)..."
 
-#: ../app/actions/view-actions.c:355
+#: ../app/actions/view-actions.c:385
 msgctxt "view-zoom-action"
 msgid "Set a custom zoom factor"
 msgstr "設置自訂縮放倍率"
 
-#: ../app/actions/view-actions.c:363
+#: ../app/actions/view-actions.c:393
 msgctxt "view-padding-color"
 msgid "From _Theme"
 msgstr "從佈景主題(_T)"
 
-#: ../app/actions/view-actions.c:364
+#: ../app/actions/view-actions.c:394
 msgctxt "view-padding-color"
 msgid "Use the current theme's background color"
 msgstr "使用目前主題的背景顏色"
 
-#: ../app/actions/view-actions.c:369
+#: ../app/actions/view-actions.c:399
 msgctxt "view-padding-color"
 msgid "_Light Check Color"
 msgstr "棋盤格中的淺色(_L)"
 
-#: ../app/actions/view-actions.c:370
+#: ../app/actions/view-actions.c:400
 msgctxt "view-padding-color"
 msgid "Use the light check color"
 msgstr "使用棋盤格中的淺色"
 
-#: ../app/actions/view-actions.c:375
+#: ../app/actions/view-actions.c:405
 msgctxt "view-padding-color"
 msgid "_Dark Check Color"
 msgstr "棋盤格中的深色(_D)"
 
-#: ../app/actions/view-actions.c:376
+#: ../app/actions/view-actions.c:406
 msgctxt "view-padding-color"
 msgid "Use the dark check color"
 msgstr "使用棋盤格中的深色"
 
-#: ../app/actions/view-actions.c:381
+#: ../app/actions/view-actions.c:411
 msgctxt "view-padding-color"
 msgid "Select _Custom Color..."
 msgstr "選擇自訂顏色(_C)..."
 
-#: ../app/actions/view-actions.c:382
+#: ../app/actions/view-actions.c:412
 msgctxt "view-padding-color"
 msgid "Use an arbitrary color"
 msgstr "使用任意顏色"
 
-#: ../app/actions/view-actions.c:387
+#: ../app/actions/view-actions.c:417
 msgctxt "view-padding-color"
 msgid "As in _Preferences"
 msgstr "如同偏好設定(_P)"
 
-#: ../app/actions/view-actions.c:389
+#: ../app/actions/view-actions.c:419
 msgctxt "view-padding-color"
 msgid "Reset padding color to what's configured in preferences"
 msgstr "重設補白顏色為偏好設定中所設定的"
 
-#: ../app/actions/view-actions.c:588
+#: ../app/actions/view-actions.c:618
 #, c-format
 msgid "Re_vert Zoom (%d%%)"
 msgstr "回復縮放[%d%%](_V)"
 
-#: ../app/actions/view-actions.c:596
+#: ../app/actions/view-actions.c:626
 msgid "Re_vert Zoom"
 msgstr "回復縮放(_V)"
 
-#: ../app/actions/view-actions.c:732
+#: ../app/actions/view-actions.c:761
 #, c-format
 msgid "Othe_r (%s)..."
 msgstr "其他[_R] (%s) ..."
 
-#: ../app/actions/view-actions.c:741
+#: ../app/actions/view-actions.c:770
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "縮放 [%s] (_Z)"
 
-#: ../app/actions/view-commands.c:580
+#: ../app/actions/view-commands.c:603
 msgid "Set Canvas Padding Color"
 msgstr "指定畫布補白所用的顏色"
 
-#: ../app/actions/view-commands.c:582
+#: ../app/actions/view-commands.c:605
 msgid "Set Custom Canvas Padding Color"
 msgstr "自行指定畫布補白所用的顏色"
 
-#: ../app/actions/window-actions.c:168
+#: ../app/actions/window-actions.c:170
 #, c-format
 msgid "Screen %s"
 msgstr "螢幕 %s"
 
-#: ../app/actions/window-actions.c:170
+#: ../app/actions/window-actions.c:172
 #, c-format
 msgid "Move this window to screen %s"
 msgstr "將這個視窗移動至另一個螢幕 %s"
 
-#: ../app/actions/windows-actions.c:85
+#: ../app/actions/windows-actions.c:93
 msgctxt "windows-action"
 msgid "_Windows"
 msgstr "視窗(_W)"
 
-#: ../app/actions/windows-actions.c:87
+#: ../app/actions/windows-actions.c:95
 msgctxt "windows-action"
 msgid "_Recently Closed Docks"
 msgstr "最近關閉的停駐式對話盒(_R)"
 
-#: ../app/actions/windows-actions.c:89
+#: ../app/actions/windows-actions.c:97
 msgctxt "windows-action"
 msgid "_Dockable Dialogs"
 msgstr "停駐式對話盒(_D)"
 
-#: ../app/actions/windows-actions.c:95
+#: ../app/actions/windows-actions.c:100
+msgctxt "windows-action"
+msgid "Next Image"
+msgstr "下一張圖片"
+
+#: ../app/actions/windows-actions.c:101
+msgctxt "windows-action"
+msgid "Switch to the next image"
+msgstr "切換到下一張圖片"
+
+#: ../app/actions/windows-actions.c:106
+msgctxt "windows-action"
+msgid "Previous Image"
+msgstr "上一張圖片"
+
+#: ../app/actions/windows-actions.c:107
+msgctxt "windows-action"
+msgid "Switch to the previous image"
+msgstr "切換回上一張圖片"
+
+#: ../app/actions/windows-actions.c:115
 msgctxt "windows-action"
 msgid "Hide Docks"
 msgstr "隱藏停駐式及其他對話盒"
 
-#: ../app/actions/windows-actions.c:103
+#: ../app/actions/windows-actions.c:116
 msgctxt "windows-action"
 msgid ""
 "When enabled docks and other dialogs are hidden, leaving only image windows."
 msgstr "當啟用本選項,停駐式及其他的對話盒會隱藏,只留下圖片視窗。"
 
-#: ../app/actions/windows-actions.c:109
+#: ../app/actions/windows-actions.c:122
 msgctxt "windows-action"
 msgid "Single-Window Mode"
 msgstr "單一視窗模式"
 
-#: ../app/actions/windows-actions.c:110
+#: ../app/actions/windows-actions.c:123
 msgctxt "windows-action"
-msgid ""
-"When enabled GIMP is in a single-window mode. Far from completely "
-"implemented!"
-msgstr "當啟用本選項,GIMP 是在單一視窗模式。"
+msgid "When enabled GIMP is in a single-window mode."
+msgstr "當啟用本選項,GIMP 會使用單一視窗模式。"
 
 #: ../app/base/base-enums.c:23
 msgctxt "curve-type"
@@ -5935,12 +5928,22 @@ msgctxt "cursor-format"
 msgid "Fancy"
 msgstr "彩色"
 
+#: ../app/config/config-enums.c:236
+msgctxt "handedness"
+msgid "Left-handed"
+msgstr "左手"
+
+#: ../app/config/config-enums.c:237
+msgctxt "handedness"
+msgid "Right-handed"
+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:243 ../app/tools/gimpcurvestool.c:690
+#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56
+#: ../app/gui/themes.c:248 ../app/tools/gimpcurvestool.c:695
 #: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81
-#: ../app/xcf/xcf.c:422
+#: ../app/xcf/xcf.c:452
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "無法開啟‘%s’來寫入資料:%s"
@@ -5996,17 +5999,17 @@ msgid "How to handle embedded color profiles when opening a file."
 msgstr "當開啟檔案時如何處理內嵌的色彩配置檔。"
 
 #: ../app/config/gimprc-blurbs.h:46
-msgid "Ask for confirmation before closing an image without saving."
-msgstr "如果在未儲存圖片的情況下關閉視窗,必須先得到使用者同意。"
-
-#: ../app/config/gimprc-blurbs.h:49
 msgid "Sets the pixel format to use for mouse pointers."
 msgstr "指定 GIMP 顯示滑鼠指標時使用的圖形。"
 
-#: ../app/config/gimprc-blurbs.h:52
+#: ../app/config/gimprc-blurbs.h:49
 msgid "Sets the type of mouse pointers to use."
 msgstr "指定 GIMP 以哪種方式顯示滑鼠指標。"
 
+#: ../app/config/gimprc-blurbs.h:52
+msgid "Sets the handedness for cursor positioning."
+msgstr ""
+
 #: ../app/config/gimprc-blurbs.h:55
 msgid ""
 "Context-dependent mouse pointers are helpful.  They are enabled by default.  "
@@ -6174,47 +6177,51 @@ msgid ""
 msgstr "為圖層及色版指定在新建對話盒中預覽圖的預設尺寸。"
 
 #: ../app/config/gimprc-blurbs.h:284
+msgid "Sets the default quick mask color."
+msgstr "設定預設快速遮罩色彩。"
+
+#: ../app/config/gimprc-blurbs.h:287
 msgid ""
 "When enabled, the image window will automatically resize itself whenever the "
 "physical image size changes."
 msgstr "如啟用本選項,當圖片的實際尺寸有變動時,視窗會自動調整尺寸。"
 
-#: ../app/config/gimprc-blurbs.h:288
+#: ../app/config/gimprc-blurbs.h:291
 msgid ""
 "When enabled, the image window will automatically resize itself when zooming "
 "into and out of images."
 msgstr "如啟用本選項,當拉近或者拉遠圖片時,圖片視窗會自動調整尺寸。"
 
-#: ../app/config/gimprc-blurbs.h:292
+#: ../app/config/gimprc-blurbs.h:295
 msgid "Let GIMP try to restore your last saved session on each startup."
 msgstr "讓 GIMP 在每次啟動時回復上次執行的情況。"
 
-#: ../app/config/gimprc-blurbs.h:295
+#: ../app/config/gimprc-blurbs.h:298
 msgid ""
 "Remember the current tool, pattern, color, and brush across GIMP sessions."
 msgstr "在 GIMP 結束前,記錄目前使用的工具、圖樣、色彩及筆刷。"
 
-#: ../app/config/gimprc-blurbs.h:299
+#: ../app/config/gimprc-blurbs.h:302
 msgid ""
 "Keep a permanent record of all opened and saved files in the Recent "
 "Documents list."
 msgstr "在最近使用文件清單中永久保存所有開啟或儲存過的檔案。"
 
-#: ../app/config/gimprc-blurbs.h:303
+#: ../app/config/gimprc-blurbs.h:306
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
 msgstr "當 GIMP 結束時儲存主要對話盒的位置及尺寸。"
 
-#: ../app/config/gimprc-blurbs.h:306
+#: ../app/config/gimprc-blurbs.h:309
 msgid "Save the tool options when GIMP exits."
 msgstr "當 GIMP 結束時儲存工具選項。"
 
-#: ../app/config/gimprc-blurbs.h:312
+#: ../app/config/gimprc-blurbs.h:315
 msgid ""
 "When enabled, all paint tools will show a preview of the current brush's "
 "outline."
 msgstr "如啟用本選項,使用任何繪畫工具時都會顯示目前的筆刷的形狀。"
 
-#: ../app/config/gimprc-blurbs.h:316
+#: ../app/config/gimprc-blurbs.h:319
 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 "
@@ -6223,13 +6230,13 @@ msgstr ""
 "如啟用本選項,所有對話盒都會顯示「求助」按鈕,讓您瀏覽相關的說明文件。不過即"
 "使沒有這個按鈕,仍然可以按鍵盤的 F1 代替。"
 
-#: ../app/config/gimprc-blurbs.h:321
+#: ../app/config/gimprc-blurbs.h:324
 msgid ""
 "When enabled, the mouse pointer will be shown over the image while using a "
 "paint tool."
 msgstr "如啟用本選項,當使用繪畫工具時也一樣顯示滑鼠指標。"
 
-#: ../app/config/gimprc-blurbs.h:325
+#: ../app/config/gimprc-blurbs.h:328
 msgid ""
 "When enabled, the menubar is visible by default. This can also be toggled "
 "with the \"View->Show Menubar\" command."
@@ -6237,14 +6244,14 @@ msgstr ""
 "如啟用本選項,預設會將選單列顯示出來。您也可以在「顯示→顯示選單列」中更改本設"
 "定。"
 
-#: ../app/config/gimprc-blurbs.h:329
+#: ../app/config/gimprc-blurbs.h:332
 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:333
+#: ../app/config/gimprc-blurbs.h:336
 msgid ""
 "When enabled, the scrollbars are visible by default. This can also be "
 "toggled with the \"View->Show Scrollbars\" command."
@@ -6252,7 +6259,7 @@ msgstr ""
 "如啟用本選項,預設會將捲動列顯示出來。您也可以在「顯示→顯示捲動軸」中更改本設"
 "定。"
 
-#: ../app/config/gimprc-blurbs.h:337
+#: ../app/config/gimprc-blurbs.h:340
 msgid ""
 "When enabled, the statusbar is visible by default. This can also be toggled "
 "with the \"View->Show Statusbar\" command."
@@ -6260,7 +6267,7 @@ msgstr ""
 "如啟用本選項,預設會將狀態列顯示出來。您也可以在「顯示→顯示狀態列」中更改本設"
 "定。"
 
-#: ../app/config/gimprc-blurbs.h:341
+#: ../app/config/gimprc-blurbs.h:344
 msgid ""
 "When enabled, the selection is visible by default. This can also be toggled "
 "with the \"View->Show Selection\" command."
@@ -6268,7 +6275,7 @@ msgstr ""
 "如啟用本選項,預設會將選取區域周圍的虛線顯示出來。您也可以在「顯示→顯示選取區"
 "域」中更改本設定。"
 
-#: ../app/config/gimprc-blurbs.h:345
+#: ../app/config/gimprc-blurbs.h:348
 msgid ""
 "When enabled, the layer boundary is visible by default. This can also be "
 "toggled with the \"View->Show Layer Boundary\" command."
@@ -6276,7 +6283,7 @@ msgstr ""
 "如啟用本選項,預設會將圖層邊界顯示出來。您也可以在「顯示→顯示圖層邊界」中更改"
 "本設定。"
 
-#: ../app/config/gimprc-blurbs.h:349
+#: ../app/config/gimprc-blurbs.h:352
 msgid ""
 "When enabled, the guides are visible by default. This can also be toggled "
 "with the \"View->Show Guides\" command."
@@ -6284,14 +6291,14 @@ msgstr ""
 "如啟用本選項,預設會將參考線顯示出來。您也可以在「顯示→顯示參考線」中更改本設"
 "定。"
 
-#: ../app/config/gimprc-blurbs.h:353
+#: ../app/config/gimprc-blurbs.h:356
 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:357
+#: ../app/config/gimprc-blurbs.h:360
 msgid ""
 "When enabled, the sample points are visible by default. This can also be "
 "toggled with the \"View->Show Sample Points\" command."
@@ -6299,23 +6306,23 @@ msgstr ""
 "如啟用本選項,預設會將取樣點顯示出來。您也可以在「顯示→顯示取樣點」中更改本設"
 "定。"
 
-#: ../app/config/gimprc-blurbs.h:361
+#: ../app/config/gimprc-blurbs.h:364
 msgid "Show a tooltip when the pointer hovers over an item."
 msgstr "當滑鼠指標停在項目上時顯示工具提示。"
 
-#: ../app/config/gimprc-blurbs.h:364
+#: ../app/config/gimprc-blurbs.h:367
 msgid "Use GIMP in a single-window mode."
 msgstr "使用 GIMP 在一個單一視窗模式。"
 
-#: ../app/config/gimprc-blurbs.h:367
+#: ../app/config/gimprc-blurbs.h:370
 msgid "Hide docks and other windows, leaving only image windows."
 msgstr "隱藏停駐式及其他視窗,只留下圖片視窗。"
 
-#: ../app/config/gimprc-blurbs.h:370
+#: ../app/config/gimprc-blurbs.h:373
 msgid "What to do when the space bar is pressed in the image window."
 msgstr "當空白鍵在圖片視窗中按下時要做什麼。"
 
-#: ../app/config/gimprc-blurbs.h:373
+#: ../app/config/gimprc-blurbs.h:376
 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 "
@@ -6329,11 +6336,11 @@ msgstr ""
 "交換檔可以變得很大。另外,如果交換檔目錄是在 NFS 伺服器中,速度可以變得很慢。"
 "基於以上的原因,最好將交換檔案目錄設定為“/tmp”。"
 
-#: ../app/config/gimprc-blurbs.h:382
+#: ../app/config/gimprc-blurbs.h:385
 msgid "When enabled, menus can be torn off."
 msgstr "如啟用本選項,可令選單脫離視窗。"
 
-#: ../app/config/gimprc-blurbs.h:385
+#: ../app/config/gimprc-blurbs.h:388
 msgid ""
 "When enabled, you can change keyboard shortcuts for menu items by hitting a "
 "key combination while the menu item is highlighted."
@@ -6341,15 +6348,15 @@ msgstr ""
 "如啟用本選項,當某個選單項目被選中時,您可即時按下適當的按鍵組合,來更改代表"
 "這個選單項目的捷徑鍵。"
 
-#: ../app/config/gimprc-blurbs.h:389
+#: ../app/config/gimprc-blurbs.h:392
 msgid "Save changed keyboard shortcuts when GIMP exits."
 msgstr "當 GIMP 結束時儲存己修改的捷徑鍵。"
 
-#: ../app/config/gimprc-blurbs.h:392
+#: ../app/config/gimprc-blurbs.h:395
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "當 GIMP 啟動時載入己修改的捷徑鍵。"
 
-#: ../app/config/gimprc-blurbs.h:395
+#: ../app/config/gimprc-blurbs.h:398
 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 "
@@ -6360,18 +6367,18 @@ msgstr ""
 "會在 GIMP 結束後消失,但有可能有一些檔案會留下,因此該目錄最好是不可以分享給"
 "其它使用者。"
 
-#: ../app/config/gimprc-blurbs.h:407
+#: ../app/config/gimprc-blurbs.h:410
 msgid "Sets the size of the thumbnail shown in the Open dialog."
 msgstr "設定開啟對話盒之中預覽圖的尺寸。"
 
-#: ../app/config/gimprc-blurbs.h:410
+#: ../app/config/gimprc-blurbs.h:413
 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:414
+#: ../app/config/gimprc-blurbs.h:417
 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 "
@@ -6382,33 +6389,33 @@ msgstr ""
 "比較慢,但也讓我們可以處理無法完全載入記憶體中的大型圖片。如果您有很多記憶體"
 "(RAM),您可能會把這個選項設為比較高的數值。"
 
-#: ../app/config/gimprc-blurbs.h:420
+#: ../app/config/gimprc-blurbs.h:423
 msgid "Show the current foreground and background colors in the toolbox."
 msgstr "顯示工具箱中目前的前景和背景顏色"
 
-#: ../app/config/gimprc-blurbs.h:423
+#: ../app/config/gimprc-blurbs.h:426
 msgid "Show the currently selected brush, pattern and gradient in the toolbox."
 msgstr "顯示目前在工具箱中選取的筆刷、圖樣及漸層。"
 
-#: ../app/config/gimprc-blurbs.h:426
+#: ../app/config/gimprc-blurbs.h:429
 msgid "Show the currently active image in the toolbox."
 msgstr "顯示工具箱中目前使用的圖片。"
 
-#: ../app/config/gimprc-blurbs.h:432
+#: ../app/config/gimprc-blurbs.h:435
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "指定顯示圖片時透明度的表示方式。"
 
-#: ../app/config/gimprc-blurbs.h:435
+#: ../app/config/gimprc-blurbs.h:438
 msgid "Sets the size of the checkerboard used to display transparency."
 msgstr "以棋盤格代表透明度時,指定棋盤格的尺寸。"
 
-#: ../app/config/gimprc-blurbs.h:438
+#: ../app/config/gimprc-blurbs.h:441
 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:442
+#: ../app/config/gimprc-blurbs.h:445
 msgid ""
 "Sets the minimal number of operations that can be undone. More undo levels "
 "are kept available until the undo-size limit is reached."
@@ -6416,7 +6423,7 @@ msgstr ""
 "指定可以還原的操作程序次數下限。至於額外可還原的操作程序,會保留至用盡指定的"
 "記憶體數目為止。"
 
-#: ../app/config/gimprc-blurbs.h:446
+#: ../app/config/gimprc-blurbs.h:449
 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 "
@@ -6425,21 +6432,21 @@ msgstr ""
 "每幅圖片都會將曾經使用操作程序保留在記憶中,以備將來復原時使用;這裡指定每幅"
 "圖片個別佔用的記憶體上限。但無論本設定為何值,復原次數的設定會優先考慮。"
 
-#: ../app/config/gimprc-blurbs.h:451
+#: ../app/config/gimprc-blurbs.h:454
 msgid "Sets the size of the previews in the Undo History."
 msgstr "設置復原記錄中預覽圖的尺寸。"
 
-#: ../app/config/gimprc-blurbs.h:454
+#: ../app/config/gimprc-blurbs.h:457
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "如啟用本選項,按 F1 會顯示說明文件瀏覽器。"
 
-#: ../app/config/gimprc-deserialize.c:134 ../app/core/gimp-modules.c:133
-#: ../app/core/gimp-units.c:163 ../app/gui/session.c:243
+#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136
+#: ../app/core/gimp-units.c:167 ../app/gui/session.c:286
 #: ../app/plug-in/plug-in-rc.c:212
 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 字串"
@@ -6560,10 +6567,9 @@ msgid "Pattern"
 msgstr "圖樣"
 
 #: ../app/core/core-enums.c:315
-#, fuzzy
 msgctxt "stroke-method"
 msgid "Stroke line"
-msgstr "分隔符號,線段"
+msgstr "筆觸描邊"
 
 #: ../app/core/core-enums.c:316
 msgctxt "stroke-method"
@@ -6573,34 +6579,32 @@ msgstr "用繪畫工具描邊"
 #: ../app/core/core-enums.c:345
 msgctxt "join-style"
 msgid "Miter"
-msgstr "斜接"
+msgstr "尖角"
 
 #: ../app/core/core-enums.c:346
-#, fuzzy
 msgctxt "join-style"
 msgid "Round"
-msgstr "第一次 #:"
+msgstr "圓角"
 
 #: ../app/core/core-enums.c:347
 msgctxt "join-style"
 msgid "Bevel"
-msgstr "斜邊"
+msgstr "斜角"
 
 #: ../app/core/core-enums.c:376
 msgctxt "cap-style"
 msgid "Butt"
-msgstr "對接"
+msgstr "平頂"
 
 #: ../app/core/core-enums.c:377
-#, fuzzy
 msgctxt "cap-style"
 msgid "Round"
-msgstr "第一次 #:"
+msgstr "圓頂"
 
 #: ../app/core/core-enums.c:378
 msgctxt "cap-style"
 msgid "Square"
-msgstr "正方形"
+msgstr "方頂"
 
 #: ../app/core/core-enums.c:415
 msgctxt "dash-preset"
@@ -6608,10 +6612,9 @@ msgid "Custom"
 msgstr "自訂"
 
 #: ../app/core/core-enums.c:416
-#, fuzzy
 msgctxt "dash-preset"
 msgid "Line"
-msgstr "行"
+msgstr "線"
 
 #: ../app/core/core-enums.c:417
 msgctxt "dash-preset"
@@ -6654,10 +6657,9 @@ msgid "Dash, dot"
 msgstr "線點"
 
 #: ../app/core/core-enums.c:425
-#, fuzzy
 msgctxt "dash-preset"
 msgid "Dash, dot, dot"
-msgstr "middle dot"
+msgstr "點、點、點"
 
 #: ../app/core/core-enums.c:454
 msgctxt "brush-generated-shape"
@@ -6930,12 +6932,12 @@ msgctxt "undo-type"
 msgid "Anchor floating selection"
 msgstr "固定浮動的選取區域"
 
-#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:262
+#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:293
 msgctxt "undo-type"
 msgid "Paste"
 msgstr "貼上"
 
-#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:501
+#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:534
 msgctxt "undo-type"
 msgid "Cut"
 msgstr "剪下"
@@ -6946,7 +6948,7 @@ msgid "Text"
 msgstr "文字"
 
 #: ../app/core/core-enums.c:865 ../app/core/core-enums.c:907
-#: ../app/core/gimpdrawable-transform.c:567
+#: ../app/core/gimpdrawable-transform.c:589
 msgctxt "undo-type"
 msgid "Transform"
 msgstr "變換"
@@ -7111,169 +7113,169 @@ msgctxt "undo-type"
 msgid "Not undoable"
 msgstr "無法復原"
 
-#: ../app/core/core-enums.c:1185
+#: ../app/core/core-enums.c:1187
 msgctxt "select-criterion"
 msgid "Composite"
 msgstr "組合"
 
-#: ../app/core/core-enums.c:1186
+#: ../app/core/core-enums.c:1188
 msgctxt "select-criterion"
 msgid "Red"
 msgstr "紅"
 
-#: ../app/core/core-enums.c:1187
+#: ../app/core/core-enums.c:1189
 msgctxt "select-criterion"
 msgid "Green"
 msgstr "綠"
 
-#: ../app/core/core-enums.c:1188
+#: ../app/core/core-enums.c:1190
 msgctxt "select-criterion"
 msgid "Blue"
 msgstr "藍"
 
-#: ../app/core/core-enums.c:1189
+#: ../app/core/core-enums.c:1191
 msgctxt "select-criterion"
 msgid "Hue"
 msgstr "色相"
 
-#: ../app/core/core-enums.c:1190
+#: ../app/core/core-enums.c:1192
 msgctxt "select-criterion"
 msgid "Saturation"
 msgstr "飽和度"
 
-#: ../app/core/core-enums.c:1191
+#: ../app/core/core-enums.c:1193
 msgctxt "select-criterion"
 msgid "Value"
 msgstr "亮度"
 
-#: ../app/core/core-enums.c:1220
+#: ../app/core/core-enums.c:1222
 msgctxt "message-severity"
 msgid "Message"
 msgstr "訊息"
 
-#: ../app/core/core-enums.c:1221
+#: ../app/core/core-enums.c:1223
 msgctxt "message-severity"
 msgid "Warning"
 msgstr "警告"
 
-#: ../app/core/core-enums.c:1222
+#: ../app/core/core-enums.c:1224
 msgctxt "message-severity"
 msgid "Error"
 msgstr "錯誤"
 
-#: ../app/core/core-enums.c:1251
+#: ../app/core/core-enums.c:1253
 msgctxt "color-profile-policy"
 msgid "Ask what to do"
 msgstr "詢問要做什麼"
 
-#: ../app/core/core-enums.c:1252
+#: ../app/core/core-enums.c:1254
 msgctxt "color-profile-policy"
 msgid "Keep embedded profile"
 msgstr "保留嵌入的配置檔"
 
-#: ../app/core/core-enums.c:1253
+#: ../app/core/core-enums.c:1255
 msgctxt "color-profile-policy"
 msgid "Convert to RGB workspace"
 msgstr "轉換到 RGB 工作空間"
 
-#: ../app/core/core-enums.c:1290
+#: ../app/core/core-enums.c:1292
 msgctxt "dynamics-output-type"
 msgid "Opacity"
 msgstr "不透明度"
 
-#: ../app/core/core-enums.c:1291
+#: ../app/core/core-enums.c:1293
 msgctxt "dynamics-output-type"
 msgid "Size"
 msgstr "大小"
 
-#: ../app/core/core-enums.c:1292
+#: ../app/core/core-enums.c:1294
 msgctxt "dynamics-output-type"
 msgid "Angle"
 msgstr "角度"
 
-#: ../app/core/core-enums.c:1293
+#: ../app/core/core-enums.c:1295
 msgctxt "dynamics-output-type"
 msgid "Color"
 msgstr "顏色"
 
-#: ../app/core/core-enums.c:1294
+#: ../app/core/core-enums.c:1296
 msgctxt "dynamics-output-type"
 msgid "Hardness"
 msgstr "硬度"
 
-#: ../app/core/core-enums.c:1295
+#: ../app/core/core-enums.c:1297
 msgctxt "dynamics-output-type"
 msgid "Force"
 msgstr "力量"
 
-#: ../app/core/core-enums.c:1296
+#: ../app/core/core-enums.c:1298
 msgctxt "dynamics-output-type"
 msgid "Aspect ratio"
 msgstr "長寬比"
 
-#: ../app/core/core-enums.c:1297
+#: ../app/core/core-enums.c:1299
 msgctxt "dynamics-output-type"
 msgid "Spacing"
 msgstr "間隔"
 
-#: ../app/core/core-enums.c:1298
+#: ../app/core/core-enums.c:1300
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Rate"
 msgstr "Rate"
 
-#: ../app/core/core-enums.c:1299
+#: ../app/core/core-enums.c:1301
 msgctxt "dynamics-output-type"
 msgid "Flow"
 msgstr "流動"
 
-#: ../app/core/core-enums.c:1300
+#: ../app/core/core-enums.c:1302
 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:270
+#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375
+#: ../app/gui/session.c:408 ../app/menus/menus.c:466
+#: ../app/widgets/gimpdevices.c:208
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
 msgstr "刪除‘%s’失敗:%s"
 
-#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:304
+#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:309
 msgid "Pasted Layer"
 msgstr "貼上的圖層"
 
-#: ../app/core/gimp-edit.c:389
+#: ../app/core/gimp-edit.c:420
 msgctxt "undo-type"
 msgid "Clear"
 msgstr "清除"
 
-#: ../app/core/gimp-edit.c:408
+#: ../app/core/gimp-edit.c:439
 msgctxt "undo-type"
 msgid "Fill with Foreground Color"
 msgstr "填上前景顏色"
 
-#: ../app/core/gimp-edit.c:412
+#: ../app/core/gimp-edit.c:443
 msgctxt "undo-type"
 msgid "Fill with Background Color"
 msgstr "填上背景顏色"
 
-#: ../app/core/gimp-edit.c:416
+#: ../app/core/gimp-edit.c:447
 msgctxt "undo-type"
 msgid "Fill with White"
 msgstr "填上白色"
 
-#: ../app/core/gimp-edit.c:420
+#: ../app/core/gimp-edit.c:451
 msgctxt "undo-type"
 msgid "Fill with Transparency"
 msgstr "填上透明"
 
-#: ../app/core/gimp-edit.c:424
+#: ../app/core/gimp-edit.c:455
 msgctxt "undo-type"
 msgid "Fill with Pattern"
 msgstr "填上圖樣"
 
-#: ../app/core/gimp-edit.c:513
+#: ../app/core/gimp-edit.c:547
 msgid "Global Buffer"
 msgstr "全域緩衝區"
 
@@ -7305,18 +7307,17 @@ msgstr "前景色至透明"
 #. * that would be "tags-locale:lt".
 #.
 #: ../app/core/gimp-tags.c:88
-#, fuzzy
 msgid "tags-locale:C"
-msgstr "目前的地區設定"
+msgstr "tags-locale:zh_TW"
 
-#: ../app/core/gimp-user-install.c:154
+#: ../app/core/gimp-user-install.c:203
 #, 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:208
 #, c-format
 msgid ""
 "It appears that you are using GIMP for the first time.  GIMP will now create "
@@ -7325,110 +7326,128 @@ msgstr ""
 "這似乎是您第一次使用 GIMP。GIMP 現在將建立一個名為“%s”的資料夾並複製一些檔案"
 "進去。"
 
-#: ../app/core/gimp-user-install.c:311
+#: ../app/core/gimp-user-install.c:359
 #, 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:374 ../app/core/gimp-user-install.c:400
 #, 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:385 ../app/core/gimp-user-install.c:411
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "無法建立目錄‘%s’:%s"
 
-#: ../app/core/gimp.c:597
+#: ../app/core/gimp.c:595
 msgid "Initialization"
 msgstr "初始化"
 
 #. register all internal procedures
-#: ../app/core/gimp.c:698
+#: ../app/core/gimp.c:696
 msgid "Internal Procedures"
 msgstr "內部程序"
 
 #. initialize  the global parasite table
-#: ../app/core/gimp.c:949
+#: ../app/core/gimp.c:947
 msgid "Looking for data files"
 msgstr "正在尋找資料檔"
 
-#: ../app/core/gimp.c:949
+#: ../app/core/gimp.c:947
 msgid "Parasites"
 msgstr "附帶資訊"
 
 #. initialize the list of gimp dynamics
-#: ../app/core/gimp.c:958 ../app/dialogs/preferences-dialog.c:2722
-#: ../app/tools/gimppaintoptions-gui.c:159
+#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2750
+#: ../app/tools/gimppaintoptions-gui.c:201
 msgid "Dynamics"
 msgstr "筆刷動態"
 
 #. initialize the list of fonts
-#: ../app/core/gimp.c:978
+#: ../app/core/gimp.c:976
 msgid "Fonts (this may take a while)"
 msgstr "字型(這可能會花點時間)"
 
 #. initialize the module list
-#: ../app/core/gimp.c:992 ../app/dialogs/preferences-dialog.c:2750
+#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2782
 msgid "Modules"
 msgstr "模組"
 
 #. update tag cache
-#: ../app/core/gimp.c:996
-#, fuzzy
+#: ../app/core/gimp.c:997
 msgid "Updating tag cache"
-msgstr "正在更新連絡人快取 (%d)..."
+msgstr "正在更新標籤快取"
 
-#: ../app/core/gimpbrush-load.c:178
-#, c-format
-msgid "Could not read %d bytes from '%s': %s"
-msgstr "無法從‘%2$s’讀取 %1$d 位元組:%3$s"
+#: ../app/core/gimpbrush-load.c:180
+#, fuzzy, c-format
+#| msgid "Could not read %d bytes from '%s': %s"
+msgid "Could not read %d byte from '%s': %s"
+msgid_plural "Could not read %d bytes from '%s': %s"
+msgstr[0] "無法從‘%2$s’讀取 %1$d 位元組:%3$s"
+msgstr[1] "無法從‘%2$s’讀取 %1$d 位元組:%3$s"
 
-#: ../app/core/gimpbrush-load.c:198
+#: ../app/core/gimpbrush-load.c:202
 #, 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:211
 #, 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:220
 #, 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:244
 #, 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:257
 #, 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:273 ../app/core/gimpbrush-load.c:410
+#: ../app/core/gimpbrush-load.c:626 ../app/core/gimpbrush-load.c:700
+#: ../app/core/gimpbrush-load.c:763 ../app/core/gimpbrush-load.c:779
+#: ../app/core/gimpbrush-load.c:822
 #, 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:281 ../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:288 ../app/core/gimppattern-load.c:146
+#: ../app/dialogs/template-options-dialog.c:83
+#: ../app/tools/gimpvectortool.c:317
 msgid "Unnamed"
 msgstr "未命名"
 
-#: ../app/core/gimpbrush-load.c:378
+#: ../app/core/gimpbrush-load.c:354
+#, fuzzy, c-format
+#| msgid ""
+#| "Fatal parse error in brush file '%s': Unsupported brush depth %d\n"
+#| "GIMP brushes must be GRAY or RGBA."
+msgid ""
+"Fatal parse error in brush file '%s': Unsupported brush depth %d\n"
+"GIMP brushes must be GRAY or RGBA.\n"
+"This might be an obsolete GIMP brush file, try loading it as image and save "
+"it again."
+msgstr ""
+"分析筆刷檔 ‘%s’ 時出現嚴重錯誤:不支援筆刷色彩深度 %d\n"
+"GIMP 筆刷必須使用 GRAY 或 RGBA 色系。"
+
+#: ../app/core/gimpbrush-load.c:399
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': Unsupported brush depth %d\n"
@@ -7437,18 +7456,18 @@ msgstr ""
 "分析筆刷檔 ‘%s’ 時出現嚴重錯誤:不支援筆刷色彩深度 %d\n"
 "GIMP 筆刷必須使用 GRAY 或 RGBA 色系。"
 
-#: ../app/core/gimpbrush-load.c:450
+#: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:909
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': unable to decode abr format version %d."
 msgstr "分析筆刷檔 ‘%s’ 時出現嚴重錯誤:版本 %d 不明。"
 
-#: ../app/core/gimpbrush-load.c:617
+#: ../app/core/gimpbrush-load.c:647
 #, c-format
 msgid "Fatal parse error in brush file '%s': Wide brushes are not supported."
 msgstr "分析筆刷檔 ‘%s’ 時出現嚴重錯誤:不支援寬筆刷。"
 
-#: ../app/core/gimpbrush.c:136
+#: ../app/core/gimpbrush.c:148
 msgid "Brush Spacing"
 msgstr "筆刷間隔"
 
@@ -7501,209 +7520,207 @@ msgstr "編輯長釘"
 msgid "Brush Hardness"
 msgstr "筆刷硬度"
 
-#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:143
+#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:151
 msgid "Brush Aspect Ratio"
 msgstr "筆刷長寬比"
 
-#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:147
+#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:155
 msgid "Brush Angle"
 msgstr "筆刷角度"
 
 #: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133
-#: ../app/core/gimpbrushpipe-load.c:224
 #, c-format
 msgid "Fatal parse error in brush file '%s': File is corrupt."
 msgstr "分析筆刷檔 ‘%s’ 時出現嚴重錯誤:檔案內容已經損壞。"
 
-#: ../app/core/gimpchannel-select.c:59
+#: ../app/core/gimpchannel-select.c:60
 msgctxt "undo-type"
 msgid "Rectangle Select"
 msgstr "矩形選取"
 
-#: ../app/core/gimpchannel-select.c:110
+#: ../app/core/gimpchannel-select.c:111
 msgctxt "undo-type"
 msgid "Ellipse Select"
 msgstr "橢圓形選取"
 
-#: ../app/core/gimpchannel-select.c:164
+#: ../app/core/gimpchannel-select.c:165
 msgctxt "undo-type"
 msgid "Rounded Rectangle Select"
 msgstr "圓角矩形選取"
 
-#: ../app/core/gimpchannel-select.c:433 ../app/core/gimplayer.c:273
-#, fuzzy
+#: ../app/core/gimpchannel-select.c:407 ../app/core/gimplayer.c:275
 msgctxt "undo-type"
 msgid "Alpha to Selection"
-msgstr "加入至選擇區域"
+msgstr "Alpha 至選擇區域"
 
-#: ../app/core/gimpchannel-select.c:471
+#: ../app/core/gimpchannel-select.c:445
 #, c-format
 msgctxt "undo-type"
 msgid "%s Channel to Selection"
 msgstr "%s 色版轉為選取區域"
 
-#: ../app/core/gimpchannel-select.c:519
+#: ../app/core/gimpchannel-select.c:493
 msgctxt "undo-type"
 msgid "Fuzzy Select"
 msgstr "模糊選取"
 
-#: ../app/core/gimpchannel-select.c:566
+#: ../app/core/gimpchannel-select.c:540
 msgctxt "undo-type"
 msgid "Select by Color"
 msgstr "依顏色選取"
 
-#: ../app/core/gimpchannel.c:272
+#: ../app/core/gimpchannel.c:273
 msgctxt "undo-type"
 msgid "Rename Channel"
 msgstr "更改色版名稱"
 
-#: ../app/core/gimpchannel.c:273
+#: ../app/core/gimpchannel.c:274
 msgctxt "undo-type"
 msgid "Move Channel"
 msgstr "移動色版"
 
-#: ../app/core/gimpchannel.c:274
+#: ../app/core/gimpchannel.c:275
 msgctxt "undo-type"
 msgid "Scale Channel"
 msgstr "縮放色版"
 
-#: ../app/core/gimpchannel.c:275
+#: ../app/core/gimpchannel.c:276
 msgctxt "undo-type"
 msgid "Resize Channel"
 msgstr "調整色版大小"
 
-#: ../app/core/gimpchannel.c:276
+#: ../app/core/gimpchannel.c:277
 msgctxt "undo-type"
 msgid "Flip Channel"
 msgstr "翻轉色版"
 
-#: ../app/core/gimpchannel.c:277
+#: ../app/core/gimpchannel.c:278
 msgctxt "undo-type"
 msgid "Rotate Channel"
 msgstr "旋轉色版"
 
-#: ../app/core/gimpchannel.c:278 ../app/core/gimpdrawable-transform.c:845
+#: ../app/core/gimpchannel.c:279 ../app/core/gimpdrawable-transform.c:904
 msgctxt "undo-type"
 msgid "Transform Channel"
 msgstr "變換色版"
 
-#: ../app/core/gimpchannel.c:279
+#: ../app/core/gimpchannel.c:280
 msgctxt "undo-type"
 msgid "Stroke Channel"
 msgstr "依色版描邊"
 
-#: ../app/core/gimpchannel.c:280 ../app/core/gimpselection.c:584
+#: ../app/core/gimpchannel.c:281 ../app/core/gimpselection.c:582
 msgctxt "undo-type"
 msgid "Channel to Selection"
 msgstr "色版轉為選取區域"
 
-#: ../app/core/gimpchannel.c:281
+#: ../app/core/gimpchannel.c:282
 msgctxt "undo-type"
 msgid "Reorder Channel"
 msgstr "重新編排色版次序"
 
-#: ../app/core/gimpchannel.c:282
+#: ../app/core/gimpchannel.c:283
 msgctxt "undo-type"
 msgid "Raise Channel"
 msgstr "上移色版"
 
-#: ../app/core/gimpchannel.c:283
+#: ../app/core/gimpchannel.c:284
 msgctxt "undo-type"
 msgid "Raise Channel to Top"
 msgstr "將色版提升到頂端"
 
-#: ../app/core/gimpchannel.c:284
+#: ../app/core/gimpchannel.c:285
 msgctxt "undo-type"
 msgid "Lower Channel"
 msgstr "下移色版"
 
-#: ../app/core/gimpchannel.c:285
+#: ../app/core/gimpchannel.c:286
 msgctxt "undo-type"
 msgid "Lower Channel to Bottom"
 msgstr "將色版降低到底部"
 
-#: ../app/core/gimpchannel.c:286
+#: ../app/core/gimpchannel.c:287
 msgid "Channel cannot be raised higher."
 msgstr "色版無法再向上移。"
 
-#: ../app/core/gimpchannel.c:287
+#: ../app/core/gimpchannel.c:288
 msgid "Channel cannot be lowered more."
 msgstr "色版無法再向下移。"
 
-#: ../app/core/gimpchannel.c:309
+#: ../app/core/gimpchannel.c:310
 msgctxt "undo-type"
 msgid "Feather Channel"
 msgstr "羽化色版"
 
-#: ../app/core/gimpchannel.c:310
+#: ../app/core/gimpchannel.c:311
 msgctxt "undo-type"
 msgid "Sharpen Channel"
 msgstr "銳利化色版"
 
-#: ../app/core/gimpchannel.c:311
+#: ../app/core/gimpchannel.c:312
 msgctxt "undo-type"
 msgid "Clear Channel"
 msgstr "清除色版"
 
-#: ../app/core/gimpchannel.c:312
+#: ../app/core/gimpchannel.c:313
 msgctxt "undo-type"
 msgid "Fill Channel"
 msgstr "填滿色版"
 
-#: ../app/core/gimpchannel.c:313
+#: ../app/core/gimpchannel.c:314
 msgctxt "undo-type"
 msgid "Invert Channel"
 msgstr "反轉色版"
 
-#: ../app/core/gimpchannel.c:314
+#: ../app/core/gimpchannel.c:315
 msgctxt "undo-type"
 msgid "Border Channel"
 msgstr "色版框線化"
 
-#: ../app/core/gimpchannel.c:315
+#: ../app/core/gimpchannel.c:316
 msgctxt "undo-type"
 msgid "Grow Channel"
 msgstr "擴大色版"
 
-#: ../app/core/gimpchannel.c:316
+#: ../app/core/gimpchannel.c:317
 msgctxt "undo-type"
 msgid "Shrink Channel"
 msgstr "縮小色版"
 
-#: ../app/core/gimpchannel.c:728
+#: ../app/core/gimpchannel.c:731
 msgid "Cannot stroke empty channel."
 msgstr "不能為空的色版描邊。"
 
-#: ../app/core/gimpchannel.c:1752
+#: ../app/core/gimpchannel.c:1763
 msgctxt "undo-type"
 msgid "Set Channel Color"
 msgstr "設定色版顏色"
 
-#: ../app/core/gimpchannel.c:1818
+#: ../app/core/gimpchannel.c:1829
 msgctxt "undo-type"
 msgid "Set Channel Opacity"
 msgstr "設定色版不透明度"
 
-#: ../app/core/gimpchannel.c:1926 ../app/core/gimpselection.c:154
+#: ../app/core/gimpchannel.c:1937 ../app/core/gimpselection.c:154
 msgid "Selection Mask"
 msgstr "選取區域遮罩"
 
-#: ../app/core/gimpcontext.c:640 ../app/tools/gimppaintoptions-gui.c:107
-#: ../app/tools/gimptransformoptions.c:332
+#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:109
+#: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:284
 msgid "Opacity"
 msgstr "不透明度"
 
-#: ../app/core/gimpcontext.c:648
+#: ../app/core/gimpcontext.c:647
 msgid "Paint Mode"
 msgstr "筆刷模式"
 
-#: ../app/core/gimpdata.c:679 ../app/core/gimptoolpresets.c:277
+#: ../app/core/gimpdata.c:690
 #, 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:428 ../app/core/gimpdatafactory.c:457
+#: ../app/core/gimpdatafactory.c:623 ../app/core/gimpdatafactory.c:645
 #, c-format
 msgid ""
 "Failed to save data:\n"
@@ -7714,17 +7731,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdatafactory.c:536 ../app/core/gimpdatafactory.c:539
-#: ../app/core/gimpitem.c:422 ../app/core/gimpitem.c:425
+#: ../app/core/gimpdatafactory.c:537 ../app/core/gimpdatafactory.c:540
+#: ../app/core/gimpitem.c:495 ../app/core/gimpitem.c:498
 msgid "copy"
 msgstr "複本"
 
-#: ../app/core/gimpdatafactory.c:548 ../app/core/gimpitem.c:434
+#: ../app/core/gimpdatafactory.c:549 ../app/core/gimpitem.c:507
 #, c-format
 msgid "%s copy"
 msgstr "%s 複本"
 
-#: ../app/core/gimpdatafactory.c:741
+#: ../app/core/gimpdatafactory.c:742
 #, c-format
 msgid ""
 "You have a writable data folder configured (%s), but this folder does not "
@@ -7734,7 +7751,7 @@ msgstr ""
 "您有一可寫入數據的資料夾配置(%s),但這個資料夾不存在。請建立資料夾或修正您在"
 "『偏好設定』對話盒中『資料夾』部份的配置"
 
-#: ../app/core/gimpdatafactory.c:762
+#: ../app/core/gimpdatafactory.c:763
 #, c-format
 msgid ""
 "You have a writable data folder configured, but this folder is not part of "
@@ -7744,12 +7761,12 @@ msgstr ""
 "您有一個可寫數據的資料夾配置,但這個資料夾是不屬於你的數據搜索路徑。你可能要"
 "手動編輯 gimprc 檔案,請在[偏好設定]對話盒中的[資料夾]部份中修復它。"
 
-#: ../app/core/gimpdatafactory.c:772
+#: ../app/core/gimpdatafactory.c:773
 #, c-format
 msgid "You don't have any writable data folder configured."
 msgstr "您沒有設定可寫入的資料夾。"
 
-#: ../app/core/gimpdatafactory.c:889
+#: ../app/core/gimpdatafactory.c:941
 #, c-format
 msgid ""
 "Failed to load data:\n"
@@ -7760,30 +7777,25 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdrawable-blend.c:244
+#: ../app/core/gimpdrawable-blend.c:245
 msgctxt "undo-type"
 msgid "Blend"
 msgstr "混色"
 
 #: ../app/core/gimpdrawable-brightness-contrast.c:70
-msgctxt "undo-type"
-msgid "Brightness_Contrast"
-msgstr "亮度及對比(_C)"
-
-#: ../app/core/gimpdrawable-brightness-contrast.c:81
+#: ../app/core/gimpdrawable-brightness-contrast.c:83
 msgctxt "undo-type"
 msgid "Brightness-Contrast"
 msgstr "亮度及對比"
 
-#: ../app/core/gimpdrawable-bucket-fill.c:91
+#: ../app/core/gimpdrawable-bucket-fill.c:89
 msgid "No patterns available for this operation."
 msgstr "沒有可供本程序使用的圖樣。"
 
-#: ../app/core/gimpdrawable-bucket-fill.c:286
-#, fuzzy
+#: ../app/core/gimpdrawable-bucket-fill.c:284
 msgctxt "undo-type"
 msgid "Bucket Fill"
-msgstr "標籤填滿"
+msgstr "填色"
 
 #: ../app/core/gimpdrawable-color-balance.c:79
 #: ../app/core/gimpdrawable-color-balance.c:89
@@ -7835,7 +7847,7 @@ msgstr "負片效果"
 msgid "Levels"
 msgstr "色階"
 
-#: ../app/core/gimpdrawable-offset.c:315
+#: ../app/core/gimpdrawable-offset.c:316
 #, fuzzy
 msgctxt "undo-type"
 msgid "Offset Drawable"
@@ -7846,160 +7858,163 @@ msgstr "捲動偏移"
 msgid "Posterize"
 msgstr "色調分離"
 
-#: ../app/core/gimpdrawable-stroke.c:327
-#: ../app/paint/gimppaintcore-stroke.c:336 ../app/vectors/gimpvectors.c:557
+#: ../app/core/gimpdrawable-stroke.c:272
+#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556
 msgid "Not enough points to stroke"
 msgstr "沒有足夠的筆劃點"
 
-#: ../app/core/gimpdrawable-stroke.c:455
+#: ../app/core/gimpdrawable-stroke.c:273
 #, fuzzy
+msgid "Not enough points to fill"
+msgstr "沒有足夠的筆劃點可以填充"
+
+#: ../app/core/gimpdrawable-stroke.c:404
 msgctxt "undo-type"
 msgid "Render Stroke"
-msgstr "準備描繪的文字"
+msgstr "描繪筆觸"
 
 #: ../app/core/gimpdrawable-threshold.c:70
-#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:274
-#: ../app/tools/gimpbucketfilloptions.c:284
-#: ../app/tools/gimpregionselectoptions.c:214
+#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:275
+#: ../app/tools/gimpbucketfilloptions.c:285
+#: ../app/tools/gimpregionselectoptions.c:216
 #: ../app/tools/gimpthresholdtool.c:90
 msgid "Threshold"
 msgstr "臨界值"
 
-#: ../app/core/gimpdrawable-transform.c:644
+#: ../app/core/gimpdrawable-transform.c:677
 msgctxt "undo-type"
 msgid "Flip"
 msgstr "翻轉"
 
-#: ../app/core/gimpdrawable-transform.c:718
+#: ../app/core/gimpdrawable-transform.c:762
 msgctxt "undo-type"
 msgid "Rotate"
 msgstr "旋轉"
 
-#: ../app/core/gimpdrawable-transform.c:843 ../app/core/gimplayer.c:272
-#, fuzzy
+#: ../app/core/gimpdrawable-transform.c:902 ../app/core/gimplayer.c:274
 msgctxt "undo-type"
 msgid "Transform Layer"
-msgstr "輔助鍵層級"
+msgstr "變換圖層"
 
-#: ../app/core/gimpdrawable-transform.c:858
+#: ../app/core/gimpdrawable-transform.c:915
 msgid "Transformation"
 msgstr "變換"
 
-#: ../app/core/gimpdrawable.c:483
+#: ../app/core/gimpdrawable.c:494
 msgctxt "undo-type"
 msgid "Scale"
 msgstr "縮放"
 
-#: ../app/core/gimpdynamicsoutput.c:106
+#: ../app/core/gimpdynamicsoutput.c:135
 msgid "Output type"
 msgstr "輸出類型"
 
-#: ../app/core/gimpgradient-load.c:71 ../app/core/gimpgradient-load.c:96
-#: ../app/core/gimpgradient-load.c:117 ../app/core/gimpgradient-load.c:168
+#: ../app/core/gimpgradient-load.c:72 ../app/core/gimpgradient-load.c:97
+#: ../app/core/gimpgradient-load.c:118 ../app/core/gimpgradient-load.c:169
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Read error in line %d."
 msgstr "分析漸層檔案‘%s’的內容時出現嚴重錯誤:讀入第 %d 行時發生錯誤。"
 
-#: ../app/core/gimpgradient-load.c:81
+#: ../app/core/gimpgradient-load.c:82
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file."
 msgstr "分析漸層檔案 ‘%s’ 時出現嚴重錯誤:它不是 GIMP 漸層檔案。"
 
-#: ../app/core/gimpgradient-load.c:109
+#: ../app/core/gimpgradient-load.c:110
 #, c-format
 msgid "Invalid UTF-8 string in gradient file '%s'."
 msgstr "漸層檔案‘%s’中含有無效的 UTF-8 字串。"
 
-#: ../app/core/gimpgradient-load.c:136
+#: ../app/core/gimpgradient-load.c:137
 #, c-format
 msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d."
 msgstr "分析漸層檔案 ‘%s’ 時出現嚴重錯誤:檔案內容第 %d 行已損壞。"
 
-#: ../app/core/gimpgradient-load.c:218 ../app/core/gimpgradient-load.c:229
+#: ../app/core/gimpgradient-load.c:219 ../app/core/gimpgradient-load.c:230
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d."
 msgstr "分析漸層檔案 ‘%1$s’ 時出現嚴重錯誤:第 %3$d 行的片段 %2$d 已損壞。"
 
-#: ../app/core/gimpgradient-load.c:241 ../app/core/gimpgradient-load.c:255
+#: ../app/core/gimpgradient-load.c:242 ../app/core/gimpgradient-load.c:256
 #, c-format
 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:336
 #, c-format
 msgid "No linear gradients found in '%s'"
 msgstr "在‘%s’中找不到任何線性的漸層"
 
-#: ../app/core/gimpgradient-load.c:345
+#: ../app/core/gimpgradient-load.c:346
 #, c-format
 msgid "Failed to import gradients from '%s': %s"
 msgstr "無法從‘%s’匯入路徑:%s"
 
-#: ../app/core/gimpgrid.c:83
+#: ../app/core/gimpgrid.c:85
 msgid "Line style used for the grid."
 msgstr "格線的線條款式。"
 
-#: ../app/core/gimpgrid.c:89
+#: ../app/core/gimpgrid.c:91
 msgid "The foreground color of the grid."
 msgstr "格線的線條顏色。"
 
-#: ../app/core/gimpgrid.c:94
+#: ../app/core/gimpgrid.c:96
 msgid ""
 "The background color of the grid; only used in double dashed line style."
 msgstr "格線的背景顏色;本設定只會在雙重虛線中使用。"
 
-#: ../app/core/gimpgrid.c:100
+#: ../app/core/gimpgrid.c:102
 msgid "Horizontal spacing of grid lines."
 msgstr "每兩條格線之間的水平間距。"
 
-#: ../app/core/gimpgrid.c:105
+#: ../app/core/gimpgrid.c:107
 msgid "Vertical spacing of grid lines."
 msgstr "每兩條格線之間的垂直間距。"
 
-#: ../app/core/gimpgrid.c:114
+#: ../app/core/gimpgrid.c:116
 msgid ""
 "Horizontal offset of the first grid line; this may be a negative number."
 msgstr "第一條水平格線的位置,可以是負數。"
 
-#: ../app/core/gimpgrid.c:121
+#: ../app/core/gimpgrid.c:123
 msgid "Vertical offset of the first grid line; this may be a negative number."
 msgstr "第一條垂直格線的位置,可以是負數。"
 
-#: ../app/core/gimpgrouplayer.c:178
+#: ../app/core/gimpgrouplayer.c:219
 msgid "Layer Group"
 msgstr "圖層群組"
 
-#: ../app/core/gimpgrouplayer.c:179
+#: ../app/core/gimpgrouplayer.c:220
 msgctxt "undo-type"
 msgid "Rename Layer Group"
 msgstr "更改圖層群組名稱"
 
-#: ../app/core/gimpgrouplayer.c:180
+#: ../app/core/gimpgrouplayer.c:221
 msgctxt "undo-type"
 msgid "Move Layer Group"
 msgstr "移動圖層群組"
 
-#: ../app/core/gimpgrouplayer.c:181
+#: ../app/core/gimpgrouplayer.c:222
 msgctxt "undo-type"
 msgid "Scale Layer Group"
 msgstr "縮放圖層群組"
 
-#: ../app/core/gimpgrouplayer.c:182
+#: ../app/core/gimpgrouplayer.c:223
 msgctxt "undo-type"
 msgid "Resize Layer Group"
 msgstr "調整圖層群組大小"
 
-#: ../app/core/gimpgrouplayer.c:183
+#: ../app/core/gimpgrouplayer.c:224
 msgctxt "undo-type"
 msgid "Flip Layer Group"
 msgstr "翻轉圖層群組"
 
-#: ../app/core/gimpgrouplayer.c:184
+#: ../app/core/gimpgrouplayer.c:225
 msgctxt "undo-type"
 msgid "Rotate Layer Group"
 msgstr "旋轉圖層群組"
 
-#: ../app/core/gimpgrouplayer.c:185
+#: ../app/core/gimpgrouplayer.c:226
 msgctxt "undo-type"
 msgid "Transform Layer Group"
 msgstr "變換圖層群組"
@@ -8009,50 +8024,55 @@ msgctxt "undo-type"
 msgid "Arrange Objects"
 msgstr "排列物件"
 
-#: ../app/core/gimpimage-colormap.c:63
+#: ../app/core/gimpimage-colormap.c:64
 #, c-format
 msgid "Colormap of Image #%d (%s)"
-msgstr ""
+msgstr "圖片 #%d (%s) 的顏色對應表"
 
-#: ../app/core/gimpimage-colormap.c:161
+#: ../app/core/gimpimage-colormap.c:162
 msgctxt "undo-type"
 msgid "Set Colormap"
 msgstr "設置顏色對應表"
 
-#: ../app/core/gimpimage-colormap.c:242
+#: ../app/core/gimpimage-colormap.c:210
+msgctxt "undo-type"
+msgid "Unset Colormap"
+msgstr "取消顏色對應表設置"
+
+#: ../app/core/gimpimage-colormap.c:263
 msgctxt "undo-type"
 msgid "Change Colormap entry"
 msgstr "改變顏色對應表項目"
 
-#: ../app/core/gimpimage-colormap.c:270
+#: ../app/core/gimpimage-colormap.c:291
 msgctxt "undo-type"
 msgid "Add Color to Colormap"
 msgstr "加入顏色至顏色對應表"
 
-#: ../app/core/gimpimage-convert.c:792
+#: ../app/core/gimpimage-convert.c:793
 msgid "Cannot convert image: palette is empty."
 msgstr "不能轉換圖片:調色盤是空的。"
 
-#: ../app/core/gimpimage-convert.c:808
+#: ../app/core/gimpimage-convert.c:809
 msgctxt "undo-type"
 msgid "Convert Image to RGB"
 msgstr "轉換圖片為 RGB 模式"
 
-#: ../app/core/gimpimage-convert.c:812
+#: ../app/core/gimpimage-convert.c:813
 msgctxt "undo-type"
 msgid "Convert Image to Grayscale"
 msgstr "圖片轉換為灰階"
 
-#: ../app/core/gimpimage-convert.c:816
+#: ../app/core/gimpimage-convert.c:817
 msgctxt "undo-type"
 msgid "Convert Image to Indexed"
 msgstr "將圖片模式轉換為索引色"
 
-#: ../app/core/gimpimage-convert.c:895
+#: ../app/core/gimpimage-convert.c:896
 msgid "Converting to indexed colors (stage 2)"
 msgstr "將圖片色系轉換為索引色 (第 2 步驟)"
 
-#: ../app/core/gimpimage-convert.c:940
+#: ../app/core/gimpimage-convert.c:941
 msgid "Converting to indexed colors (stage 3)"
 msgstr "將圖片色系轉換為索引色 (第 3 步驟)"
 
@@ -8102,62 +8122,65 @@ msgid "Rotate Items"
 msgstr "旋轉項目"
 
 #: ../app/core/gimpimage-item-list.c:135
-#, fuzzy
 msgctxt "undo-type"
 msgid "Transform Items"
-msgstr "浮動項目"
+msgstr "變換項目"
 
-#: ../app/core/gimpimage-merge.c:108 ../app/core/gimpimage-merge.c:122
+#: ../app/core/gimpimage-merge.c:132
 msgctxt "undo-type"
 msgid "Merge Visible Layers"
 msgstr "合併看得見的圖層"
 
-#: ../app/core/gimpimage-merge.c:176
+#: ../app/core/gimpimage-merge.c:195
 msgctxt "undo-type"
 msgid "Flatten Image"
 msgstr "影像平面化"
 
-#: ../app/core/gimpimage-merge.c:225
+#: ../app/core/gimpimage-merge.c:217
+msgid "Cannot flatten an image without any visible layer."
+msgstr ""
+
+#: ../app/core/gimpimage-merge.c:260
 msgid "Cannot merge down to a layer group."
 msgstr "無法向下合併到圖層群組。"
 
-#: ../app/core/gimpimage-merge.c:232
+#: ../app/core/gimpimage-merge.c:267
 msgid "The layer to merge down to is locked."
 msgstr "圖層向下合併的功能是被鎖住的。"
 
-#: ../app/core/gimpimage-merge.c:244
+#: ../app/core/gimpimage-merge.c:279
 msgid "There is no visible layer to merge down to."
 msgstr "沒有看得見的圖層可以向下合併"
 
-#: ../app/core/gimpimage-merge.c:255
+#: ../app/core/gimpimage-merge.c:289
 msgctxt "undo-type"
 msgid "Merge Down"
 msgstr "向下合併"
 
-#: ../app/core/gimpimage-merge.c:277
+#: ../app/core/gimpimage-merge.c:317
 msgctxt "undo-type"
 msgid "Merge Layer Group"
 msgstr "合併圖層群組"
 
-#: ../app/core/gimpimage-merge.c:330
+#: ../app/core/gimpimage-merge.c:370
 msgctxt "undo-type"
 msgid "Merge Visible Paths"
 msgstr "合併看得見的路徑"
 
-#: ../app/core/gimpimage-merge.c:366
+#: ../app/core/gimpimage-merge.c:406
 msgid "Not enough visible paths for a merge. There must be at least two."
 msgstr "沒有足夠的看得見路徑提供合併。最少要有兩條路徑。"
 
-#: ../app/core/gimpimage-new.c:135
+#: ../app/core/gimpimage-new.c:140
 msgid "Background"
 msgstr "背景顏色"
 
-#: ../app/core/gimpimage-quick-mask.c:85
+#: ../app/core/gimpimage-quick-mask.c:86
 msgctxt "undo-type"
 msgid "Enable Quick Mask"
 msgstr "啟用快速遮罩"
 
-#: ../app/core/gimpimage-quick-mask.c:135
+#: ../app/core/gimpimage-quick-mask.c:136
 msgctxt "undo-type"
 msgid "Disable Quick Mask"
 msgstr "停用快速遮罩"
@@ -8177,7 +8200,7 @@ msgctxt "undo-type"
 msgid "Move Sample Point"
 msgstr "移動取樣點"
 
-#: ../app/core/gimpimage-scale.c:87
+#: ../app/core/gimpimage-scale.c:88
 msgctxt "undo-type"
 msgid "Scale Image"
 msgstr "縮放圖片"
@@ -8187,17 +8210,29 @@ msgstr "縮放圖片"
 msgid "Can't undo %s"
 msgstr "無法復原 %s"
 
-#: ../app/core/gimpimage.c:1648
+#: ../app/core/gimpimage.c:1784
+msgid " (exported)"
+msgstr "(匯出)"
+
+#: ../app/core/gimpimage.c:1788
+msgid " (overwritten)"
+msgstr "(覆蓋)"
+
+#: ../app/core/gimpimage.c:1797
+msgid " (imported)"
+msgstr "(匯入)"
+
+#: ../app/core/gimpimage.c:1939
 msgctxt "undo-type"
 msgid "Change Image Resolution"
 msgstr "更改圖片解析度"
 
-#: ../app/core/gimpimage.c:1700
+#: ../app/core/gimpimage.c:1991
 msgctxt "undo-type"
 msgid "Change Image Unit"
 msgstr "更改圖片的量度單位"
 
-#: ../app/core/gimpimage.c:2692
+#: ../app/core/gimpimage.c:3004
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite to Image"
@@ -8205,124 +8240,132 @@ msgstr ""
 "無法載入圖片:\n"
 "%s"
 
-#: ../app/core/gimpimage.c:2733
+#: ../app/core/gimpimage.c:3045
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Parasite from Image"
 msgstr "從播放清單中移除檔案"
 
-#: ../app/core/gimpimage.c:3442
+#: ../app/core/gimpimage.c:3754
 msgctxt "undo-type"
 msgid "Add Layer"
 msgstr "加入圖層"
 
-#: ../app/core/gimpimage.c:3492 ../app/core/gimpimage.c:3512
+#: ../app/core/gimpimage.c:3804 ../app/core/gimpimage.c:3824
 msgctxt "undo-type"
 msgid "Remove Layer"
 msgstr "移除圖層"
 
-#: ../app/core/gimpimage.c:3505
+#: ../app/core/gimpimage.c:3818
 msgctxt "undo-type"
 msgid "Remove Floating Selection"
 msgstr "移除浮動選取區域"
 
-#: ../app/core/gimpimage.c:3671
+#: ../app/core/gimpimage.c:3983
 msgctxt "undo-type"
 msgid "Add Channel"
 msgstr "新增色版"
 
-#: ../app/core/gimpimage.c:3709 ../app/core/gimpimage.c:3721
+#: ../app/core/gimpimage.c:4021 ../app/core/gimpimage.c:4034
 msgctxt "undo-type"
 msgid "Remove Channel"
 msgstr "移除色版"
 
-#: ../app/core/gimpimage.c:3768
+#: ../app/core/gimpimage.c:4088
 msgctxt "undo-type"
 msgid "Add Path"
 msgstr "加入路徑"
 
-#: ../app/core/gimpimage.c:3799
+#: ../app/core/gimpimage.c:4119
 msgctxt "undo-type"
 msgid "Remove Path"
 msgstr "移除路徑"
 
-#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1711
+#: ../app/core/gimpimagefile.c:719 ../app/dialogs/preferences-dialog.c:1715
 msgid "Folder"
 msgstr "資料夾"
 
-#: ../app/core/gimpimagefile.c:539
+#: ../app/core/gimpimagefile.c:724
 msgid "Special File"
 msgstr "特殊檔案"
 
-#: ../app/core/gimpimagefile.c:555
+#: ../app/core/gimpimagefile.c:740
 msgid "Remote File"
 msgstr "遠端檔案"
 
-#: ../app/core/gimpimagefile.c:574
+#: ../app/core/gimpimagefile.c:759
 msgid "Click to create preview"
 msgstr "按這裡產生預覽圖"
 
-#: ../app/core/gimpimagefile.c:580
+#: ../app/core/gimpimagefile.c:765
 msgid "Loading preview..."
 msgstr "正在載入預覽..."
 
-#: ../app/core/gimpimagefile.c:586
+#: ../app/core/gimpimagefile.c:771
 msgid "Preview is out of date"
 msgstr "預覽圖已過時"
 
-#: ../app/core/gimpimagefile.c:592
+#: ../app/core/gimpimagefile.c:777
 msgid "Cannot create preview"
 msgstr "無法產生預覽圖"
 
-#: ../app/core/gimpimagefile.c:602
+#: ../app/core/gimpimagefile.c:787
 msgid "(Preview may be out of date)"
 msgstr "(預覽圖已過時)"
 
 #. pixel size
-#: ../app/core/gimpimagefile.c:611 ../app/widgets/gimpimagepropview.c:446
-#: ../app/widgets/gimpsizebox.c:437 ../app/widgets/gimptemplateeditor.c:568
+#: ../app/core/gimpimagefile.c:796 ../app/widgets/gimpimagepropview.c:440
+#: ../app/widgets/gimpsizebox.c:432 ../app/widgets/gimptemplateeditor.c:581
 #, c-format
 msgid "%d × %d pixel"
 msgid_plural "%d × %d pixels"
 msgstr[0] "%d × %d 像素"
 msgstr[1] "%d × %d 像素"
 
-#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:339
+#: ../app/core/gimpimagefile.c:819 ../app/display/gimpdisplayshell-title.c:317
 #, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
 msgstr[0] "%d 個圖層"
 msgstr[1] "%d 個圖層"
 
-#: ../app/core/gimpimagefile.c:681
+#: ../app/core/gimpimagefile.c:867
 #, c-format
 msgid "Could not open thumbnail '%s': %s"
 msgstr "無法開啟縮圖‘%s’:%s"
 
-#: ../app/core/gimpitem.c:1561
+#: ../app/core/gimpitem.c:1819
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite"
 msgstr "附加視窗元件"
 
-#: ../app/core/gimpitem.c:1571
+#: ../app/core/gimpitem.c:1829
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite to Item"
 msgstr "尋找加入至“%s”的項目(_I):"
 
-#: ../app/core/gimpitem.c:1613 ../app/core/gimpitem.c:1620
+#: ../app/core/gimpitem.c:1880 ../app/core/gimpitem.c:1887
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Parasite from Item"
 msgstr "從工具列移除選取的項目"
 
+#: ../app/core/gimpitem-exclusive.c:81
+msgid "Set Item Exclusive Visible"
+msgstr "設定項目排除可見性"
+
+#: ../app/core/gimpitem-exclusive.c:172
+msgid "Set Item Exclusive Linked"
+msgstr "設定項目排除連結"
+
 #: ../app/core/gimplayer-floating-sel.c:95
 msgctxt "undo-type"
 msgid "Anchor Floating Selection"
 msgstr "固定浮動的選取區域"
 
-#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:595
+#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:620
 msgid ""
 "Cannot create a new layer from the floating selection because it belongs to "
 "a layer mask or channel."
@@ -8333,76 +8376,76 @@ msgctxt "undo-type"
 msgid "Floating Selection to Layer"
 msgstr "浮動選取區域轉換為圖層"
 
-#: ../app/core/gimplayer.c:266
+#: ../app/core/gimplayer.c:268
 msgctxt "undo-type"
 msgid "Rename Layer"
 msgstr "更改圖層名稱"
 
-#: ../app/core/gimplayer.c:267
+#: ../app/core/gimplayer.c:269
 msgctxt "undo-type"
 msgid "Move Layer"
 msgstr "移動圖層"
 
-#: ../app/core/gimplayer.c:268
+#: ../app/core/gimplayer.c:270
 msgctxt "undo-type"
 msgid "Scale Layer"
 msgstr "縮放圖層"
 
-#: ../app/core/gimplayer.c:269
+#: ../app/core/gimplayer.c:271
 msgctxt "undo-type"
 msgid "Resize Layer"
 msgstr "調整圖層大小"
 
-#: ../app/core/gimplayer.c:270
+#: ../app/core/gimplayer.c:272
 msgctxt "undo-type"
 msgid "Flip Layer"
 msgstr "翻轉圖層"
 
-#: ../app/core/gimplayer.c:271
+#: ../app/core/gimplayer.c:273
 msgctxt "undo-type"
 msgid "Rotate Layer"
 msgstr "旋轉圖層"
 
-#: ../app/core/gimplayer.c:274
+#: ../app/core/gimplayer.c:276
 msgctxt "undo-type"
 msgid "Reorder Layer"
 msgstr "重新編排圖層次序"
 
-#: ../app/core/gimplayer.c:275
+#: ../app/core/gimplayer.c:277
 msgctxt "undo-type"
 msgid "Raise Layer"
 msgstr "提升圖層"
 
-#: ../app/core/gimplayer.c:276
+#: ../app/core/gimplayer.c:278
 msgctxt "undo-type"
 msgid "Raise Layer to Top"
 msgstr "提升圖層至頂層"
 
-#: ../app/core/gimplayer.c:277
+#: ../app/core/gimplayer.c:279
 msgctxt "undo-type"
 msgid "Lower Layer"
 msgstr "降低圖層"
 
-#: ../app/core/gimplayer.c:278
+#: ../app/core/gimplayer.c:280
 msgctxt "undo-type"
 msgid "Lower Layer to Bottom"
 msgstr "降低圖層至底層"
 
-#: ../app/core/gimplayer.c:279
+#: ../app/core/gimplayer.c:281
 msgid "Layer cannot be raised higher."
 msgstr "圖層無法再向上移。"
 
-#: ../app/core/gimplayer.c:280
+#: ../app/core/gimplayer.c:282
 msgid "Layer cannot be lowered more."
 msgstr "圖層無法再向下移。"
 
-#: ../app/core/gimplayer.c:437 ../app/core/gimplayer.c:1488
-#: ../app/core/gimplayermask.c:233
+#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1529
+#: ../app/core/gimplayermask.c:236
 #, c-format
 msgid "%s mask"
 msgstr "%s 遮罩"
 
-#: ../app/core/gimplayer.c:476
+#: ../app/core/gimplayer.c:489
 #, c-format
 msgid ""
 "Floating Selection\n"
@@ -8411,46 +8454,46 @@ msgstr ""
 "浮動選取區域\n"
 " (%s)"
 
-#: ../app/core/gimplayer.c:1412
+#: ../app/core/gimplayer.c:1449
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "無法新增圖層遮罩,因為該圖層已經有一個遮罩了。"
 
-#: ../app/core/gimplayer.c:1423
+#: ../app/core/gimplayer.c:1460
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr "無法加入圖層遮罩,因為遮罩的尺寸和指定圖層的尺寸不同。"
 
-#: ../app/core/gimplayer.c:1429
+#: ../app/core/gimplayer.c:1466
 msgctxt "undo-type"
 msgid "Add Layer Mask"
 msgstr "加入圖層遮罩"
 
-#: ../app/core/gimplayer.c:1543
+#: ../app/core/gimplayer.c:1584
 #, fuzzy
 msgctxt "undo-type"
 msgid "Transfer Alpha to Mask"
 msgstr "在 GdkPixmap 上使用的遮罩點陣圖"
 
-#: ../app/core/gimplayer.c:1713 ../app/core/gimplayermask.c:259
+#: ../app/core/gimplayer.c:1754
 msgctxt "undo-type"
 msgid "Apply Layer Mask"
 msgstr "套用圖層遮罩"
 
-#: ../app/core/gimplayer.c:1714
+#: ../app/core/gimplayer.c:1755
 msgctxt "undo-type"
 msgid "Delete Layer Mask"
 msgstr "刪除圖層遮罩"
 
-#: ../app/core/gimplayer.c:1833
+#: ../app/core/gimplayer.c:1874
 msgctxt "undo-type"
 msgid "Add Alpha Channel"
 msgstr "加入透明色版"
 
-#: ../app/core/gimplayer.c:1887
+#: ../app/core/gimplayer.c:1928
 msgctxt "undo-type"
 msgid "Remove Alpha Channel"
 msgstr "移除透明色版"
 
-#: ../app/core/gimplayer.c:1907
+#: ../app/core/gimplayer.c:1948
 msgctxt "undo-type"
 msgid "Layer to Image Size"
 msgstr "圖層符合圖片尺寸"
@@ -8470,71 +8513,81 @@ msgstr "圖層遮罩轉為選取區域"
 msgid "Cannot rename layer masks."
 msgstr "無法更改圖層遮罩名稱。"
 
-#: ../app/core/gimplayermask.c:320
+#: ../app/core/gimplayermask.c:264
+msgctxt "undo-type"
+msgid "Enable Layer Mask"
+msgstr "啟用圖層遮罩"
+
+#: ../app/core/gimplayermask.c:265
+msgctxt "undo-type"
+msgid "Disable Layer Mask"
+msgstr "停用圖層遮罩"
+
+#: ../app/core/gimplayermask.c:327
 msgctxt "undo-type"
 msgid "Show Layer Mask"
 msgstr "顯示圖層遮罩"
 
-#: ../app/core/gimppalette-import.c:438
+#: ../app/core/gimppalette-import.c:439
 #, c-format
 msgid "Index %d"
 msgstr "索引 %d"
 
-#: ../app/core/gimppalette-import.c:548
+#: ../app/core/gimppalette-import.c:549
 #, 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:86 ../app/core/gimppalette-load.c:112
+#: ../app/core/gimppalette-load.c:133 ../app/core/gimppalette-load.c:162
+#: ../app/core/gimppalette-load.c:238
 #, c-format
 msgid "Fatal parse error in palette file '%s': Read error in line %d."
 msgstr "分析調色盤檔案‘%s’的內容時出現嚴重錯誤:讀入第 %d 行時發生錯誤。"
 
-#: ../app/core/gimppalette-load.c:95
+#: ../app/core/gimppalette-load.c:96
 #, c-format
 msgid "Fatal parse error in palette file '%s': Missing magic header."
 msgstr "分析圖樣檔案‘%s’的內容時出現嚴重錯誤:缺少了正確的檔頭。"
 
-#: ../app/core/gimppalette-load.c:124
+#: ../app/core/gimppalette-load.c:125
 #, 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:149
 #, 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:185
 #, c-format
 msgid "Reading palette file '%s': Missing RED component in line %d."
 msgstr "讀取調色盤檔案‘%s’:第 %d 行遺漏了紅色部份。"
 
-#: ../app/core/gimppalette-load.c:192
+#: ../app/core/gimppalette-load.c:193
 #, c-format
 msgid "Reading palette file '%s': Missing GREEN component in line %d."
 msgstr "讀取調色盤檔案「%s」:第 %d 行遺漏了綠色部份。"
 
-#: ../app/core/gimppalette-load.c:200
+#: ../app/core/gimppalette-load.c:201
 #, c-format
 msgid "Reading palette file '%s': Missing BLUE component in line %d."
 msgstr "讀取調色盤檔案‘%s’:第 %d 行遺漏了藍色部份。"
 
-#: ../app/core/gimppalette-load.c:210
+#: ../app/core/gimppalette-load.c:211
 #, 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
+#: ../app/core/gimppalette-load.c:478
 #, 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
+#: ../app/core/gimppalette-load.c:501 ../app/core/gimppalette-load.c:589
 #, c-format
 msgid "Fatal parse error in palette file '%s'"
 msgstr "調色盤檔案'%s'出現嚴重錯誤解析"
@@ -8565,7 +8618,7 @@ 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:279 ../app/widgets/gimppdbdialog.c:331
 #, c-format
 msgid "Unable to run %s callback. The corresponding plug-in may have crashed."
 msgstr "無法執行 %s 的 callback。相應的增效模組可能已經不正常結束。"
@@ -8615,10 +8668,9 @@ msgid "Border Selection"
 msgstr "框線化選取區域"
 
 #: ../app/core/gimpselection.c:178
-#, fuzzy
 msgctxt "undo-type"
 msgid "Grow Selection"
-msgstr "日曆選擇模式"
+msgstr "擴大選取區域"
 
 #: ../app/core/gimpselection.c:179
 msgctxt "undo-type"
@@ -8633,20 +8685,20 @@ msgstr "沒有可以用來描邊的選取區域。"
 msgid "Unable to cut or copy because the selected region is empty."
 msgstr "因為選取區域是空的,所以無法剪下或複製。"
 
-#: ../app/core/gimpselection.c:845
+#: ../app/core/gimpselection.c:847
 msgid "Cannot float selection because the selected region is empty."
 msgstr "因為選取區域是空白的,所以無法令選取區域浮動。"
 
-#: ../app/core/gimpselection.c:852
+#: ../app/core/gimpselection.c:854
 msgctxt "undo-type"
 msgid "Float Selection"
 msgstr "浮動選取區域"
 
-#: ../app/core/gimpselection.c:868
+#: ../app/core/gimpselection.c:870
 msgid "Floated Layer"
 msgstr "浮動的圖層"
 
-#: ../app/core/gimpstrokeoptions.c:151
+#: ../app/core/gimpstrokeoptions.c:180
 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."
@@ -8654,89 +8706,94 @@ msgstr ""
 "如果斜接可以從實際連接點延伸到大於斜接限制 * 線條寬度的距離,將斜接連接轉換為"
 "斜邊連接。"
 
-#: ../app/core/gimptemplate.c:100
+#: ../app/core/gimptoolpreset-load.c:61
+#, c-format
+msgid "Error while parsing '%s'"
+msgstr "解析「%s」時發生錯誤"
+
+#: ../app/core/gimptemplate.c:129
 msgid "The unit used for coordinate display when not in dot-for-dot mode."
 msgstr "當不處於點對點模式時用來顯示坐標的單位。"
 
-#: ../app/core/gimptemplate.c:107
+#: ../app/core/gimptemplate.c:136
 msgid "The horizontal image resolution."
 msgstr "圖片水平解析度。"
 
-#: ../app/core/gimptemplate.c:113
+#: ../app/core/gimptemplate.c:142
 msgid "The vertical image resolution."
 msgstr "圖片垂直解析度。"
 
-#: ../app/core/gimpunit.c:56
+#: ../app/core/gimpunit.c:60
 msgctxt "unit-singular"
 msgid "pixel"
 msgstr "像素"
 
-#: ../app/core/gimpunit.c:56
+#: ../app/core/gimpunit.c:60
 msgctxt "unit-plural"
 msgid "pixels"
 msgstr "像素"
 
-#: ../app/core/gimpunit.c:60
+#: ../app/core/gimpunit.c:64
 msgctxt "unit-singular"
 msgid "inch"
 msgstr "英吋"
 
-#: ../app/core/gimpunit.c:60
+#: ../app/core/gimpunit.c:64
 msgctxt "unit-plural"
 msgid "inches"
 msgstr "英吋"
 
-#: ../app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:67
 msgctxt "unit-singular"
 msgid "millimeter"
 msgstr "毫米"
 
-#: ../app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:67
 msgctxt "unit-plural"
 msgid "millimeters"
 msgstr "毫米"
 
-#: ../app/core/gimpunit.c:67
+#: ../app/core/gimpunit.c:71
 msgctxt "unit-singular"
 msgid "point"
 msgstr "點"
 
-#: ../app/core/gimpunit.c:67
+#: ../app/core/gimpunit.c:71
 msgctxt "unit-plural"
 msgid "points"
 msgstr "點"
 
-#: ../app/core/gimpunit.c:70
+#: ../app/core/gimpunit.c:74
 msgctxt "unit-singular"
 msgid "pica"
 msgstr "pica(鉛點)"
 
-#: ../app/core/gimpunit.c:70
+#: ../app/core/gimpunit.c:74
 msgctxt "unit-plural"
 msgid "picas"
 msgstr "pica(鉛點)"
 
-#: ../app/core/gimpunit.c:78
+#: ../app/core/gimpunit.c:82
 msgctxt "singular"
 msgid "percent"
 msgstr "百分比"
 
-#: ../app/core/gimpunit.c:78
+#: ../app/core/gimpunit.c:82
 msgctxt "plural"
 msgid "percent"
 msgstr "百分比"
 
-#: ../app/dialogs/about-dialog.c:106 ../app/gui/gui.c:479
+#: ../app/dialogs/about-dialog.c:114
 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:121
+#: ../app/dialogs/about-dialog.c:129
 msgid "translator-credits"
 msgstr ""
 "Abel Cheung (張國冠)\n"
@@ -8744,11 +8801,11 @@ msgstr ""
 "林佳宏\n"
 "陳英傑"
 
-#: ../app/dialogs/about-dialog.c:516
+#: ../app/dialogs/about-dialog.c:521
 msgid "GIMP is brought to you by"
 msgstr "GIMP 版本由以下人仕編寫:"
 
-#: ../app/dialogs/about-dialog.c:590
+#: ../app/dialogs/about-dialog.c:596
 msgid "This is an unstable development release."
 msgstr "這是不穩定的發展釋出版本。"
 
@@ -8781,109 +8838,124 @@ msgid "_Remove unused colors from colormap"
 msgstr "從顏色對應表中移除未使用的顏色(_R)"
 
 #. dithering
-#: ../app/dialogs/convert-dialog.c:233 ../app/tools/gimpblendoptions.c:253
+#: ../app/dialogs/convert-dialog.c:234 ../app/tools/gimpblendoptions.c:254
 msgid "Dithering"
 msgstr "擬色(Dithering)"
 
-#: ../app/dialogs/convert-dialog.c:245
+#: ../app/dialogs/convert-dialog.c:246
 msgid "Color _dithering:"
 msgstr "擬色方式(_D):"
 
-#: ../app/dialogs/convert-dialog.c:260
+#: ../app/dialogs/convert-dialog.c:261
 msgid "Enable dithering of _transparency"
 msgstr "擬色時將透明度計算在內(_T)"
 
-#: ../app/dialogs/convert-dialog.c:287
+#: ../app/dialogs/convert-dialog.c:288
 msgid "Converting to indexed colors"
 msgstr "正在轉換為索引色"
 
-#: ../app/dialogs/convert-dialog.c:415 ../app/pdb/convert-cmds.c:152
+#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:153
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "不可以轉換至一個多於 256 色的調色盤。"
 
-#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:163
-#: ../app/gui/gui-message.c:145
+#: ../app/dialogs/data-delete-dialog.c:81
+msgid "Delete Object"
+msgstr "刪除物件"
+
+#: ../app/dialogs/data-delete-dialog.c:104
+#, c-format
+msgid "Delete '%s'?"
+msgstr "刪除 “%s”?"
+
+#: ../app/dialogs/data-delete-dialog.c:107
+#, c-format
+msgid ""
+"Are you sure you want to remove '%s' from the list and delete it on disk?"
+msgstr "是否確定要同時在清單及磁碟裡刪除“%s”?"
+
+#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:162
+#: ../app/gui/gui-message.c:149
 msgid "GIMP Message"
 msgstr "GIMP 訊息"
 
-#: ../app/dialogs/dialogs.c:267
+#: ../app/dialogs/dialogs.c:302
 msgid "Devices"
 msgstr "裝置"
 
-#: ../app/dialogs/dialogs.c:267
+#: ../app/dialogs/dialogs.c:302
 msgid "Device Status"
 msgstr "裝置狀態"
 
-#: ../app/dialogs/dialogs.c:271
+#: ../app/dialogs/dialogs.c:306
 msgid "Errors"
 msgstr "錯誤"
 
-#: ../app/dialogs/dialogs.c:275
+#: ../app/dialogs/dialogs.c:310
 msgid "Pointer"
 msgstr "指標"
 
-#: ../app/dialogs/dialogs.c:294
+#: ../app/dialogs/dialogs.c:329
 msgid "History"
 msgstr "記錄"
 
-#: ../app/dialogs/dialogs.c:296
+#: ../app/dialogs/dialogs.c:331
 msgid "Image Templates"
 msgstr "圖片範本"
 
-#: ../app/dialogs/dialogs.c:323
+#: ../app/dialogs/dialogs.c:358
 msgid "Histogram"
 msgstr "顏色統計圖"
 
-#: ../app/dialogs/dialogs.c:327
+#: ../app/dialogs/dialogs.c:362
 msgid "Selection"
 msgstr "選取區域"
 
-#: ../app/dialogs/dialogs.c:327
+#: ../app/dialogs/dialogs.c:362
 msgid "Selection Editor"
 msgstr "選取區域編輯視窗"
 
-#: ../app/dialogs/dialogs.c:331
+#: ../app/dialogs/dialogs.c:366
 msgid "Undo"
 msgstr "復原"
 
-#: ../app/dialogs/dialogs.c:331
+#: ../app/dialogs/dialogs.c:366
 msgid "Undo History"
 msgstr "復原記錄"
 
-#: ../app/dialogs/dialogs.c:341
+#: ../app/dialogs/dialogs.c:376
 msgid "Navigation"
 msgstr "導覽"
 
-#: ../app/dialogs/dialogs.c:341
+#: ../app/dialogs/dialogs.c:376
 msgid "Display Navigation"
 msgstr "顯示導覽視窗"
 
-#: ../app/dialogs/dialogs.c:347
+#: ../app/dialogs/dialogs.c:382
 msgid "FG/BG"
 msgstr "前景/背景"
 
-#: ../app/dialogs/dialogs.c:347
+#: ../app/dialogs/dialogs.c:382
 msgid "FG/BG Color"
 msgstr "前景/背景色彩"
 
-#: ../app/dialogs/fade-dialog.c:110
+#: ../app/dialogs/fade-dialog.c:109
 #, c-format
 msgid "Fade %s"
 msgstr "淡化 %s"
 
-#: ../app/dialogs/fade-dialog.c:122
+#: ../app/dialogs/fade-dialog.c:121
 msgid "_Fade"
 msgstr "淡化(_F)"
 
-#: ../app/dialogs/fade-dialog.c:157 ../app/widgets/gimpdeviceinfoeditor.c:349
+#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346
 msgid "_Mode:"
 msgstr "模式(_M):"
 
-#: ../app/dialogs/fade-dialog.c:163
+#: ../app/dialogs/fade-dialog.c:162
 msgid "_Opacity:"
 msgstr "不透明度(_O):"
 
-#: ../app/dialogs/file-open-dialog.c:267
+#: ../app/dialogs/file-open-dialog.c:266
 msgid "Open layers"
 msgstr "開啟圖層"
 
@@ -8895,15 +8967,15 @@ msgstr "開啟位置"
 msgid "Enter location (URI):"
 msgstr "輸入位置 (URI):"
 
-#: ../app/dialogs/file-save-dialog.c:105
+#: ../app/dialogs/file-save-dialog.c:113
 msgid "Export Image"
 msgstr "匯出圖片"
 
-#: ../app/dialogs/file-save-dialog.c:106
+#: ../app/dialogs/file-save-dialog.c:114
 msgid "_Export"
 msgstr "匯出(_E)"
 
-#: ../app/dialogs/file-save-dialog.c:468
+#: ../app/dialogs/file-save-dialog.c:458
 msgid ""
 "Saving remote files needs to determine the file format from the file "
 "extension. Please enter a file extension that matches the selected file "
@@ -8912,7 +8984,13 @@ msgstr ""
 "遠端儲存檔案需要依延伸檔名決定檔案格式。請選擇符合選取檔案格式的延伸檔名或完"
 "全不使用延伸檔名。"
 
-#: ../app/dialogs/file-save-dialog.c:595
+#: ../app/dialogs/file-save-dialog.c:605
+#, fuzzy
+#| msgid "The given filename does not have any known file extension."
+msgid "The given filename cannot be used for exporting"
+msgstr "指定的檔案名稱沒有任何已知的延伸檔名。"
+
+#: ../app/dialogs/file-save-dialog.c:606
 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."
@@ -8920,7 +8998,17 @@ msgstr ""
 "您可以使用這個對話盒來匯出不同的檔案格式。如果您想儲存圖片為 GIMP XCF 格式,"
 "請使用[檔案]>[儲存]替代。 "
 
-#: ../app/dialogs/file-save-dialog.c:602
+#: ../app/dialogs/file-save-dialog.c:609
+msgid "Take me to the Save dialog"
+msgstr "帶我去「儲存」對話盒"
+
+#: ../app/dialogs/file-save-dialog.c:613
+#, fuzzy
+#| msgid "The given filename does not have any known file extension."
+msgid "The given filename cannot be used for saving"
+msgstr "指定的檔案名稱沒有任何已知的延伸檔名。"
+
+#: ../app/dialogs/file-save-dialog.c:614
 msgid ""
 "You can use this dialog to save to the GIMP XCF format. Use File→Export to "
 "export to other file formats."
@@ -8928,7 +9016,15 @@ msgstr ""
 "您可以使用這個對話盒儲存為 GIMP XCF 格式。使用[檔案]>[匯出]匯出為其它檔案格"
 "式。"
 
-#: ../app/dialogs/file-save-dialog.c:608
+#: ../app/dialogs/file-save-dialog.c:616
+msgid "Take me to the Export dialog"
+msgstr "帶我去「匯出」對話盒"
+
+#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694
+msgid "Extension Mismatch"
+msgstr "延伸檔名比對不符"
+
+#: ../app/dialogs/file-save-dialog.c:678
 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."
@@ -8936,23 +9032,19 @@ msgstr ""
 "給予的檔案名稱沒有任何已知的延伸檔名。請輸入一個已知的延伸檔名或從檔案格式清"
 "單中選擇一種檔案格式。"
 
-#: ../app/dialogs/file-save-dialog.c:622
-msgid "Extension Mismatch"
-msgstr "延伸檔名比對不符"
-
-#: ../app/dialogs/file-save-dialog.c:638
+#: ../app/dialogs/file-save-dialog.c:710
 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:714
 msgid "Do you want to save the image using this name anyway?"
 msgstr "是否將一定要以此名稱儲存這個圖片?"
 
-#: ../app/dialogs/file-save-dialog.c:697
+#: ../app/dialogs/file-save-dialog.c:776
 msgid "Saving canceled"
 msgstr "儲存已取消"
 
-#: ../app/dialogs/file-save-dialog.c:705 ../app/widgets/gimpdnd-xds.c:185
+#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186
 #, c-format
 msgid ""
 "Saving '%s' failed:\n"
@@ -8975,58 +9067,63 @@ msgstr "設定圖片格線"
 msgid "Grid"
 msgstr "格線"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:64
+#: ../app/dialogs/image-merge-layers-dialog.c:68
 msgid "Merge Layers"
 msgstr "合併圖層"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:66
+#: ../app/dialogs/image-merge-layers-dialog.c:70
 msgid "Layers Merge Options"
 msgstr "圖層合併選項"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:72
+#: ../app/dialogs/image-merge-layers-dialog.c:76
 msgid "_Merge"
 msgstr "合併(_M)"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:92
+#: ../app/dialogs/image-merge-layers-dialog.c:96
 msgid "Final, Merged Layer should be:"
 msgstr "最後合併的圖層應該:"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:96
+#: ../app/dialogs/image-merge-layers-dialog.c:100
 msgid "Expanded as necessary"
 msgstr "必要時擴大"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:99
+#: ../app/dialogs/image-merge-layers-dialog.c:103
 msgid "Clipped to image"
 msgstr "裁剪成圖片尺寸"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:102
+#: ../app/dialogs/image-merge-layers-dialog.c:106
 msgid "Clipped to bottom layer"
 msgstr "裁剪成最底圖層的尺寸"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:110
+#: ../app/dialogs/image-merge-layers-dialog.c:114
+#, fuzzy
+msgid "Merge within active _group only"
+msgstr "僅在使用中群組合併(_G)"
+
+#: ../app/dialogs/image-merge-layers-dialog.c:127
 msgid "_Discard invisible layers"
 msgstr "放棄不可見圖層(_D)"
 
-#: ../app/dialogs/image-new-dialog.c:96
+#: ../app/dialogs/image-new-dialog.c:97
 msgid "Create a New Image"
 msgstr "製作新的圖片"
 
-#: ../app/dialogs/image-new-dialog.c:144
-#: ../app/dialogs/preferences-dialog.c:2008
+#: ../app/dialogs/image-new-dialog.c:135
+#: ../app/dialogs/preferences-dialog.c:2016
 msgid "_Template:"
 msgstr "範本(_T):"
 
-#: ../app/dialogs/image-new-dialog.c:299
+#: ../app/dialogs/image-new-dialog.c:316
 msgid "Confirm Image Size"
 msgstr "確認圖片尺寸"
 
-#: ../app/dialogs/image-new-dialog.c:321
+#: ../app/dialogs/image-new-dialog.c:338
 #: ../app/dialogs/image-scale-dialog.c:239
 #, c-format
 msgid "You are trying to create an image with a size of %s."
 msgstr "您準備產生一幅大小為 %s 的圖片。"
 
-#: ../app/dialogs/image-new-dialog.c:328
+#: ../app/dialogs/image-new-dialog.c:345
 #, c-format
 msgid ""
 "An image of the chosen size will use more memory than what is configured as "
@@ -9115,12 +9212,12 @@ msgstr "圖層名稱(_N):"
 
 #. The size labels
 #: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1076
+#: ../app/tools/gimpmeasuretool.c:1129
 msgid "Width:"
 msgstr "寬度:"
 
 #: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1104
+#: ../app/tools/gimpmeasuretool.c:1157
 msgid "Height:"
 msgstr "高度:"
 
@@ -9144,31 +9241,31 @@ msgstr "您必須重新啟動 GIMP 來讓變更生效。"
 msgid "Module"
 msgstr "模組"
 
-#: ../app/dialogs/module-dialog.c:465
+#: ../app/dialogs/module-dialog.c:468
 msgid "Only in memory"
 msgstr "只在記憶體中"
 
-#: ../app/dialogs/module-dialog.c:470
+#: ../app/dialogs/module-dialog.c:473
 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 "位置:"
 
@@ -9186,8 +9283,8 @@ msgstr "色版偏移"
 
 #. The offset frame
 #: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152
-#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:246
-#: ../app/widgets/gimpgrideditor.c:277
+#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:247
+#: ../app/widgets/gimpgrideditor.c:206
 msgid "Offset"
 msgstr "偏移"
 
@@ -9239,7 +9336,7 @@ msgid "Select Source"
 msgstr "選取來源"
 
 #: ../app/dialogs/palette-import-dialog.c:214
-#: ../app/dialogs/preferences-dialog.c:1923
+#: ../app/dialogs/preferences-dialog.c:1930
 msgid "_Gradient"
 msgstr "漸層(_G)"
 
@@ -9298,15 +9395,15 @@ msgstr "預覽"
 msgid "The selected source contains no colors."
 msgstr "選取的來源沒有包含顏色。"
 
-#: ../app/dialogs/preferences-dialog.c:266
+#: ../app/dialogs/preferences-dialog.c:268
 msgid "Reset All Preferences"
 msgstr "重設所有偏好設定"
 
-#: ../app/dialogs/preferences-dialog.c:284
+#: ../app/dialogs/preferences-dialog.c:286
 msgid "Do you really want to reset all preferences to default values?"
 msgstr "您是否確定要將所有偏好設定還原為預設值?"
 
-#: ../app/dialogs/preferences-dialog.c:354
+#: ../app/dialogs/preferences-dialog.c:356
 msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr "您必須重新啟動 GIMP 令以下的設定生效:"
 
@@ -9342,743 +9439,755 @@ msgid ""
 "GIMP."
 msgstr "下次啟動 GIMP 時會將您的工具選項還原為預設值。"
 
-#: ../app/dialogs/preferences-dialog.c:1266
+#: ../app/dialogs/preferences-dialog.c:1268
 msgid "Show _menubar"
 msgstr "顯示選單列(_M)"
 
-#: ../app/dialogs/preferences-dialog.c:1270
+#: ../app/dialogs/preferences-dialog.c:1272
 msgid "Show _rulers"
 msgstr "顯示尺規(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:1273
+#: ../app/dialogs/preferences-dialog.c:1275
 msgid "Show scroll_bars"
 msgstr "顯示捲軸(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1276
+#: ../app/dialogs/preferences-dialog.c:1278
 msgid "Show s_tatusbar"
 msgstr "顯示狀態列(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:1284
+#: ../app/dialogs/preferences-dialog.c:1286
 msgid "Show s_election"
 msgstr "顯示選取區域(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:1287
+#: ../app/dialogs/preferences-dialog.c:1289
 msgid "Show _layer boundary"
 msgstr "顯示圖層邊界(_L)"
 
-#: ../app/dialogs/preferences-dialog.c:1290
+#: ../app/dialogs/preferences-dialog.c:1292
 msgid "Show _guides"
 msgstr "顯示參考線(_G)"
 
-#: ../app/dialogs/preferences-dialog.c:1293
+#: ../app/dialogs/preferences-dialog.c:1295
 msgid "Show gri_d"
 msgstr "顯示格線(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:1299
+#: ../app/dialogs/preferences-dialog.c:1301
 msgid "Canvas _padding mode:"
 msgstr "圖片外圍補白的方式(_P):"
 
-#: ../app/dialogs/preferences-dialog.c:1304
+#: ../app/dialogs/preferences-dialog.c:1306
 msgid "Custom p_adding color:"
 msgstr "圖片外圍補白的顏色(_A):"
 
-#: ../app/dialogs/preferences-dialog.c:1305
+#: ../app/dialogs/preferences-dialog.c:1307
 msgid "Select Custom Canvas Padding Color"
 msgstr "選擇自訂畫布補白顏色"
 
-#: ../app/dialogs/preferences-dialog.c:1394
+#: ../app/dialogs/preferences-dialog.c:1405
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../app/dialogs/preferences-dialog.c:1507
-#: ../app/dialogs/preferences-dialog.c:2758
+#: ../app/dialogs/preferences-dialog.c:1518
+#: ../app/dialogs/preferences-dialog.c:2790
 msgid "Environment"
 msgstr "系統環境"
 
-#: ../app/dialogs/preferences-dialog.c:1521
+#: ../app/dialogs/preferences-dialog.c:1532
 msgid "Resource Consumption"
 msgstr "資源消耗"
 
-#: ../app/dialogs/preferences-dialog.c:1531
+#: ../app/dialogs/preferences-dialog.c:1542
 msgid "Minimal number of _undo levels:"
 msgstr "復原次數下限(_U):"
 
-#: ../app/dialogs/preferences-dialog.c:1534
+#: ../app/dialogs/preferences-dialog.c:1545
 msgid "Maximum undo _memory:"
 msgstr "復原操作佔用記憶上限(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:1537
+#: ../app/dialogs/preferences-dialog.c:1548
 msgid "Tile cache _size:"
 msgstr "分塊快取大小(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:1540
+#: ../app/dialogs/preferences-dialog.c:1551
 msgid "Maximum _new image size:"
 msgstr "新的圖片的佔用記憶上限(_N):"
 
-#: ../app/dialogs/preferences-dialog.c:1545
+#: ../app/dialogs/preferences-dialog.c:1556
 msgid "Number of _processors to use:"
 msgstr "會使用的 C_PU 數目:"
 
 #. Image Thumbnails
-#: ../app/dialogs/preferences-dialog.c:1550
+#: ../app/dialogs/preferences-dialog.c:1561
 msgid "Image Thumbnails"
 msgstr "縮圖"
 
-#: ../app/dialogs/preferences-dialog.c:1555
+#: ../app/dialogs/preferences-dialog.c:1566
 msgid "Size of _thumbnails:"
 msgstr "縮圖尺寸(_T):"
 
-#: ../app/dialogs/preferences-dialog.c:1559
+#: ../app/dialogs/preferences-dialog.c:1570
 msgid "Maximum _filesize for thumbnailing:"
 msgstr "會自動產生縮圖的原圖大小上限(_F):"
 
-#. File Saving
-#: ../app/dialogs/preferences-dialog.c:1563
-msgid "Saving Images"
-msgstr "儲存圖片"
-
-#: ../app/dialogs/preferences-dialog.c:1566
-msgid "Confirm closing of unsa_ved images"
-msgstr "關閉未儲存的圖片前必須先確認(_V)"
-
-#: ../app/dialogs/preferences-dialog.c:1576
+#: ../app/dialogs/preferences-dialog.c:1580
 msgid "Keep record of used files in the Recent Documents list"
 msgstr "在最近使用的文件清單中保存使用過檔案的紀錄"
 
-#: ../app/dialogs/preferences-dialog.c:1585
+#: ../app/dialogs/preferences-dialog.c:1589
 msgid "User Interface"
 msgstr "使用者介面"
 
-#: ../app/dialogs/preferences-dialog.c:1588
+#: ../app/dialogs/preferences-dialog.c:1592
 msgid "Interface"
 msgstr "介面"
 
-#: ../app/dialogs/preferences-dialog.c:1598
+#: ../app/dialogs/preferences-dialog.c:1602
 msgid "Language"
 msgstr "語言"
 
 #. Previews
-#: ../app/dialogs/preferences-dialog.c:1604
+#: ../app/dialogs/preferences-dialog.c:1608
 msgid "Previews"
 msgstr "預覽"
 
-#: ../app/dialogs/preferences-dialog.c:1607
+#: ../app/dialogs/preferences-dialog.c:1611
 msgid "_Enable layer & channel previews"
 msgstr "可預覽圖層及色版(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:1613
+#: ../app/dialogs/preferences-dialog.c:1617
 msgid "_Default layer & channel preview size:"
 msgstr "預設圖層及色版的預覽圖尺寸(_D):"
 
-#: ../app/dialogs/preferences-dialog.c:1616
+#: ../app/dialogs/preferences-dialog.c:1620
 msgid "Na_vigation preview size:"
 msgstr "導覽圖尺寸(_N):"
 
 #. Keyboard Shortcuts
-#: ../app/dialogs/preferences-dialog.c:1620
+#: ../app/dialogs/preferences-dialog.c:1624
 msgid "Keyboard Shortcuts"
 msgstr "捷徑鍵"
 
-#: ../app/dialogs/preferences-dialog.c:1624
+#: ../app/dialogs/preferences-dialog.c:1628
 msgid "_Use dynamic keyboard shortcuts"
 msgstr "使用動態鍵盤捷徑鍵(_U)"
 
-#: ../app/dialogs/preferences-dialog.c:1628
+#: ../app/dialogs/preferences-dialog.c:1632
 msgid "Configure _Keyboard Shortcuts..."
 msgstr "設定捷徑鍵(_K)..."
 
-#: ../app/dialogs/preferences-dialog.c:1635
+#: ../app/dialogs/preferences-dialog.c:1639
 msgid "_Save keyboard shortcuts on exit"
 msgstr "結束時儲存捷徑鍵設定(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:1639
+#: ../app/dialogs/preferences-dialog.c:1643
 msgid "Save Keyboard Shortcuts _Now"
 msgstr "立刻儲存捷徑鍵設定(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:1646
+#: ../app/dialogs/preferences-dialog.c:1650
 msgid "_Reset Keyboard Shortcuts to Default Values"
 msgstr "重新設定鍵盤捷徑鍵為預設值(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:1655
+#: ../app/dialogs/preferences-dialog.c:1659
 msgid "Remove _All Keyboard Shortcuts"
 msgstr "移除所有鍵盤捷徑鍵(_A)"
 
-#: ../app/dialogs/preferences-dialog.c:1667
-#: ../app/dialogs/preferences-dialog.c:1706
+#: ../app/dialogs/preferences-dialog.c:1671
+#: ../app/dialogs/preferences-dialog.c:1710
 msgid "Theme"
 msgstr "佈景主題"
 
-#: ../app/dialogs/preferences-dialog.c:1676
+#: ../app/dialogs/preferences-dialog.c:1680
 msgid "Select Theme"
 msgstr "選取佈景主題"
 
-#: ../app/dialogs/preferences-dialog.c:1758
+#: ../app/dialogs/preferences-dialog.c:1762
 msgid "Reload C_urrent Theme"
 msgstr "重新載入目前的佈景主題(_U)"
 
-#: ../app/dialogs/preferences-dialog.c:1770
+#: ../app/dialogs/preferences-dialog.c:1774
 msgid "Help System"
 msgstr "說明文件系統"
 
 #. General
-#: ../app/dialogs/preferences-dialog.c:1782
-#: ../app/dialogs/preferences-dialog.c:1866
-#: ../app/dialogs/preferences-dialog.c:2065
-#: ../app/widgets/gimpcontrollereditor.c:191
+#: ../app/dialogs/preferences-dialog.c:1786
+#: ../app/dialogs/preferences-dialog.c:1873
+#: ../app/dialogs/preferences-dialog.c:2086
+#: ../app/widgets/gimpcontrollereditor.c:185
 msgid "General"
 msgstr "一般"
 
-#: ../app/dialogs/preferences-dialog.c:1785
+#: ../app/dialogs/preferences-dialog.c:1789
 msgid "Show _tooltips"
 msgstr "顯示工具提示(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:1788
+#: ../app/dialogs/preferences-dialog.c:1792
 msgid "Show help _buttons"
 msgstr "顯示「求助」按鈕(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1801
+#: ../app/dialogs/preferences-dialog.c:1805
 msgid "Use the online version"
 msgstr "使用線上的版本"
 
-#: ../app/dialogs/preferences-dialog.c:1802
+#: ../app/dialogs/preferences-dialog.c:1806
 msgid "Use a locally installed copy"
 msgstr "使用本地端安裝的複本"
 
-#: ../app/dialogs/preferences-dialog.c:1803
+#: ../app/dialogs/preferences-dialog.c:1807
 msgid "User manual:"
 msgstr "使用者手冊:"
 
-#: ../app/dialogs/preferences-dialog.c:1810
+#: ../app/dialogs/preferences-dialog.c:1814
 msgid "There's a local installation of the user manual."
 msgstr "這裡有本地端安裝的使用者手冊。"
 
-#: ../app/dialogs/preferences-dialog.c:1815
+#: ../app/dialogs/preferences-dialog.c:1819
 msgid "The user manual is not installed locally."
 msgstr "使用者手冊並沒有在本地端安裝。"
 
-#. Help Browser
-#: ../app/dialogs/preferences-dialog.c:1838
+#: ../app/dialogs/preferences-dialog.c:1844
 msgid "Help Browser"
 msgstr "說明文件瀏覽器"
 
-#: ../app/dialogs/preferences-dialog.c:1842
+#: ../app/dialogs/preferences-dialog.c:1848
 msgid "H_elp browser to use:"
 msgstr "指定的說明文件瀏覽器(_E):"
 
-#: ../app/dialogs/preferences-dialog.c:1869
+#: ../app/dialogs/preferences-dialog.c:1876
 msgid "_Save tool options on exit"
 msgstr "結束程式時儲存工具選項(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:1873
+#: ../app/dialogs/preferences-dialog.c:1880
 msgid "Save Tool Options _Now"
 msgstr "立刻儲存工具選項(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:1880
+#: ../app/dialogs/preferences-dialog.c:1887
 msgid "_Reset Saved Tool Options to Default Values"
 msgstr "將工具選項設定為預設值(_R)"
 
 #. Snapping Distance
-#: ../app/dialogs/preferences-dialog.c:1890
+#: ../app/dialogs/preferences-dialog.c:1897
 msgid "Guide & Grid Snapping"
 msgstr "貼緊參考線 & 格線"
 
-#: ../app/dialogs/preferences-dialog.c:1895
+#: ../app/dialogs/preferences-dialog.c:1902
 msgid "_Snap distance:"
 msgstr "自動貼齊生效距離(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:1903
+#: ../app/dialogs/preferences-dialog.c:1910
 msgid "Default _interpolation:"
 msgstr "預設使用的圖片內插法(_I):"
 
 #. Global Brush, Pattern, ...
-#: ../app/dialogs/preferences-dialog.c:1910
+#: ../app/dialogs/preferences-dialog.c:1917
 msgid "Paint Options Shared Between Tools"
 msgstr "所有工具可以共用的繪圖選項"
 
-#: ../app/dialogs/preferences-dialog.c:1914
+#: ../app/dialogs/preferences-dialog.c:1921
 msgid "_Brush"
 msgstr "筆刷(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1917
+#: ../app/dialogs/preferences-dialog.c:1924
 msgid "_Dynamics"
 msgstr "筆刷動態(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:1920
+#: ../app/dialogs/preferences-dialog.c:1927
 msgid "_Pattern"
 msgstr "圖樣(_P)"
 
-#: ../app/dialogs/preferences-dialog.c:1926
+#. Move Tool
+#: ../app/dialogs/preferences-dialog.c:1934
 msgid "Move Tool"
 msgstr "移動工具"
 
-#: ../app/dialogs/preferences-dialog.c:1930
+#: ../app/dialogs/preferences-dialog.c:1938
 msgid "Set layer or path as active"
 msgstr "設定圖層或路徑為使用中"
 
 #. Appearance
-#: ../app/dialogs/preferences-dialog.c:1955
-#: ../app/dialogs/preferences-dialog.c:2138
-#: ../app/widgets/gimpgrideditor.c:205
+#: ../app/dialogs/preferences-dialog.c:1963
+#: ../app/dialogs/preferences-dialog.c:2162
+#: ../app/widgets/gimpgrideditor.c:134
 msgid "Appearance"
 msgstr "外觀"
 
-#: ../app/dialogs/preferences-dialog.c:1959
+#: ../app/dialogs/preferences-dialog.c:1967
 msgid "Show _foreground & background color"
 msgstr "顯示前景及背景顏色(_F)"
 
-#: ../app/dialogs/preferences-dialog.c:1963
+#: ../app/dialogs/preferences-dialog.c:1971
 msgid "Show active _brush, pattern & gradient"
 msgstr "顯示使用中的筆刷、圖樣及漸層(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1967
+#: ../app/dialogs/preferences-dialog.c:1975
 msgid "Show active _image"
 msgstr "顯示使用中的圖片(_I)"
 
 #. Tool Editor
-#: ../app/dialogs/preferences-dialog.c:1975
+#: ../app/dialogs/preferences-dialog.c:1983
 msgid "Tools configuration"
 msgstr "工具配置"
 
-#: ../app/dialogs/preferences-dialog.c:1990
+#: ../app/dialogs/preferences-dialog.c:1998
 msgid "Default New Image"
 msgstr "預設的新圖片"
 
-#: ../app/dialogs/preferences-dialog.c:1993
+#: ../app/dialogs/preferences-dialog.c:2001
 msgid "Default Image"
 msgstr "預設圖片"
 
-#: ../app/dialogs/preferences-dialog.c:2030
+#: ../app/dialogs/preferences-dialog.c:2035
+msgid "Set the default Quick Mask color"
+msgstr "設定預設快速遮罩顏色"
+
+#: ../app/dialogs/preferences-dialog.c:2041
+msgid "Quick Mask color:"
+msgstr "快速遮罩顏色:"
+
+#: ../app/dialogs/preferences-dialog.c:2051
 msgid "Default Image Grid"
 msgstr "預設圖片格線"
 
-#: ../app/dialogs/preferences-dialog.c:2033
+#: ../app/dialogs/preferences-dialog.c:2054
 msgid "Default Grid"
 msgstr "預設格線"
 
-#: ../app/dialogs/preferences-dialog.c:2053
+#: ../app/dialogs/preferences-dialog.c:2074
 msgid "Image Windows"
 msgstr "圖片視窗"
 
-#: ../app/dialogs/preferences-dialog.c:2068
+#: ../app/dialogs/preferences-dialog.c:2089
 msgid "Use \"_Dot for dot\" by default"
 msgstr "預設使用「點對點」模式(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2074
+#: ../app/dialogs/preferences-dialog.c:2095
 msgid "Marching _ants speed:"
 msgstr "選取區域虛線 (Marching _Ants) 移動速度:"
 
 #. Zoom & Resize Behavior
-#: ../app/dialogs/preferences-dialog.c:2078
+#: ../app/dialogs/preferences-dialog.c:2099
 msgid "Zoom & Resize Behavior"
 msgstr "縮放及調整尺寸的運作方式"
 
-#: ../app/dialogs/preferences-dialog.c:2082
+#: ../app/dialogs/preferences-dialog.c:2103
 msgid "Resize window on _zoom"
 msgstr "縮放圖片時調整視窗尺寸(_Z)"
 
-#: ../app/dialogs/preferences-dialog.c:2085
+#: ../app/dialogs/preferences-dialog.c:2106
 msgid "Resize window on image _size change"
 msgstr "圖片尺寸更改時調整視窗尺寸(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2091
+#: ../app/dialogs/preferences-dialog.c:2112
 msgid "Fit to window"
 msgstr "符合視窗尺寸"
 
-#: ../app/dialogs/preferences-dialog.c:2093
+#: ../app/dialogs/preferences-dialog.c:2114
 msgid "Initial zoom _ratio:"
 msgstr "最初縮放比例(_R):"
 
 #. Space Bar
-#: ../app/dialogs/preferences-dialog.c:2097
+#: ../app/dialogs/preferences-dialog.c:2118
 msgid "Space Bar"
 msgstr "空白鍵"
 
-#: ../app/dialogs/preferences-dialog.c:2103
+#: ../app/dialogs/preferences-dialog.c:2124
 msgid "_While space bar is pressed:"
 msgstr "空白鍵被按下(_W):"
 
 #. Mouse Pointers
-#: ../app/dialogs/preferences-dialog.c:2107
+#: ../app/dialogs/preferences-dialog.c:2128
 msgid "Mouse Pointers"
 msgstr "滑鼠指標"
 
-#: ../app/dialogs/preferences-dialog.c:2111
+#: ../app/dialogs/preferences-dialog.c:2132
 msgid "Show _brush outline"
 msgstr "顯示筆刷輪廓(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:2114
+#: ../app/dialogs/preferences-dialog.c:2135
 msgid "Show pointer for paint _tools"
 msgstr "使用繪畫工具時顯示滑鼠指標(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2120
+#: ../app/dialogs/preferences-dialog.c:2141
 msgid "Pointer _mode:"
 msgstr "滑鼠指標模式(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:2123
+#: ../app/dialogs/preferences-dialog.c:2144
 msgid "Pointer re_ndering:"
 msgstr "指標繪製(_N):"
 
-#: ../app/dialogs/preferences-dialog.c:2135
+#: ../app/dialogs/preferences-dialog.c:2147
+#, fuzzy
+msgid "Pointer _handedness:"
+msgstr "指標硬度(_N):"
+
+#: ../app/dialogs/preferences-dialog.c:2159
 msgid "Image Window Appearance"
 msgstr "圖片視窗外觀"
 
-#: ../app/dialogs/preferences-dialog.c:2146
+#: ../app/dialogs/preferences-dialog.c:2170
 msgid "Default Appearance in Normal Mode"
 msgstr "在正常模式的預設外觀"
 
-#: ../app/dialogs/preferences-dialog.c:2151
+#: ../app/dialogs/preferences-dialog.c:2175
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "全螢幕模式中的預設外觀"
 
-#: ../app/dialogs/preferences-dialog.c:2160
+#: ../app/dialogs/preferences-dialog.c:2184
 msgid "Image Title & Statusbar Format"
 msgstr "圖片標題及狀態列顯示格式"
 
-#: ../app/dialogs/preferences-dialog.c:2163
+#: ../app/dialogs/preferences-dialog.c:2187
 msgid "Title & Status"
 msgstr "標題及狀態"
 
-#: ../app/dialogs/preferences-dialog.c:2181
+#: ../app/dialogs/preferences-dialog.c:2205
 msgid "Current format"
 msgstr "目前的格式"
 
-#: ../app/dialogs/preferences-dialog.c:2182
+#: ../app/dialogs/preferences-dialog.c:2206
 msgid "Default format"
 msgstr "預設的格式"
 
-#: ../app/dialogs/preferences-dialog.c:2183
+#: ../app/dialogs/preferences-dialog.c:2207
 msgid "Show zoom percentage"
 msgstr "顯示縮放百分比"
 
-#: ../app/dialogs/preferences-dialog.c:2184
+#: ../app/dialogs/preferences-dialog.c:2208
 msgid "Show zoom ratio"
 msgstr "顯示縮放比例"
 
-#: ../app/dialogs/preferences-dialog.c:2185
+#: ../app/dialogs/preferences-dialog.c:2209
 msgid "Show image size"
 msgstr "顯示圖片尺寸"
 
-#: ../app/dialogs/preferences-dialog.c:2198
+#: ../app/dialogs/preferences-dialog.c:2222
 msgid "Image Title Format"
 msgstr "圖片標題格式"
 
-#: ../app/dialogs/preferences-dialog.c:2200
+#: ../app/dialogs/preferences-dialog.c:2224
 msgid "Image Statusbar Format"
 msgstr "圖片狀態列顯示格式"
 
-#: ../app/dialogs/preferences-dialog.c:2285
+#: ../app/dialogs/preferences-dialog.c:2309
 msgid "Display"
 msgstr "顯示"
 
 #. Transparency
-#: ../app/dialogs/preferences-dialog.c:2297
+#: ../app/dialogs/preferences-dialog.c:2321
 msgid "Transparency"
 msgstr "透明"
 
-#: ../app/dialogs/preferences-dialog.c:2301
+#: ../app/dialogs/preferences-dialog.c:2325
 msgid "_Check style:"
 msgstr "檢查樣式(_C):"
 
-#: ../app/dialogs/preferences-dialog.c:2304
+#: ../app/dialogs/preferences-dialog.c:2328
 msgid "Check _size:"
 msgstr "檢查大小(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:2307
+#: ../app/dialogs/preferences-dialog.c:2331
 msgid "Monitor Resolution"
 msgstr "螢幕解析度"
 
 #. Pixels
-#: ../app/dialogs/preferences-dialog.c:2311
-#: ../app/display/gimpcursorview.c:200 ../app/widgets/gimpgrideditor.c:270
-#: ../app/widgets/gimpgrideditor.c:302
+#: ../app/dialogs/preferences-dialog.c:2335
+#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199
+#: ../app/widgets/gimpgrideditor.c:231
 msgid "Pixels"
 msgstr "像素"
 
-#: ../app/dialogs/preferences-dialog.c:2329
+#: ../app/dialogs/preferences-dialog.c:2353
 msgid "Horizontal"
 msgstr "水平"
 
-#: ../app/dialogs/preferences-dialog.c:2331
+#: ../app/dialogs/preferences-dialog.c:2355
 msgid "Vertical"
 msgstr "垂直"
 
-#: ../app/dialogs/preferences-dialog.c:2333
-#: ../app/widgets/gimpimagepropview.c:475
+#: ../app/dialogs/preferences-dialog.c:2357
+#: ../app/widgets/gimpimagepropview.c:469
 msgid "ppi"
 msgstr "ppi"
 
-#: ../app/dialogs/preferences-dialog.c:2349
+#: ../app/dialogs/preferences-dialog.c:2373
 #, c-format
 msgid "_Detect automatically (currently %d × %d ppi)"
 msgstr "自動偵測(目前 %d × %d ppi)(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2368
+#: ../app/dialogs/preferences-dialog.c:2391
 msgid "_Enter manually"
 msgstr "手動輸入(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:2383
+#: ../app/dialogs/preferences-dialog.c:2406
 msgid "C_alibrate..."
 msgstr "微調(_A)..."
 
-#: ../app/dialogs/preferences-dialog.c:2406
+#: ../app/dialogs/preferences-dialog.c:2434
 msgid "Color Management"
 msgstr "色彩管理"
 
-#: ../app/dialogs/preferences-dialog.c:2426
+#: ../app/dialogs/preferences-dialog.c:2454
 msgid "_RGB profile:"
 msgstr "_RGB 配置檔:"
 
-#: ../app/dialogs/preferences-dialog.c:2427
+#: ../app/dialogs/preferences-dialog.c:2455
 msgid "Select RGB Color Profile"
 msgstr "選擇 RGB 色彩配置檔"
 
-#: ../app/dialogs/preferences-dialog.c:2428
+#: ../app/dialogs/preferences-dialog.c:2456
 msgid "_CMYK profile:"
 msgstr "_CMYK 配置檔:"
 
-#: ../app/dialogs/preferences-dialog.c:2429
+#: ../app/dialogs/preferences-dialog.c:2457
 msgid "Select CMYK Color Profile"
 msgstr "選擇 CMYK 色彩配置檔"
 
-#: ../app/dialogs/preferences-dialog.c:2430
+#: ../app/dialogs/preferences-dialog.c:2458
 msgid "_Monitor profile:"
 msgstr "螢幕配置檔(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:2431
+#: ../app/dialogs/preferences-dialog.c:2459
 msgid "Select Monitor Color Profile"
 msgstr "選擇螢幕色彩配置檔"
 
-#: ../app/dialogs/preferences-dialog.c:2432
+#: ../app/dialogs/preferences-dialog.c:2460
 msgid "_Print simulation profile:"
 msgstr "列印模擬配置檔(_P):"
 
-#: ../app/dialogs/preferences-dialog.c:2433
+#: ../app/dialogs/preferences-dialog.c:2461
 msgid "Select Printer Color Profile"
 msgstr "選擇印表機色彩配置檔"
 
-#: ../app/dialogs/preferences-dialog.c:2444
+#: ../app/dialogs/preferences-dialog.c:2472
 msgid "_Mode of operation:"
 msgstr "操作模式(_M):"
 
-#: ../app/dialogs/preferences-dialog.c:2474
+#: ../app/dialogs/preferences-dialog.c:2502
 msgid "_Try to use the system monitor profile"
 msgstr "嘗試使用系統螢幕配置檔(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2484
+#: ../app/dialogs/preferences-dialog.c:2512
 msgid "_Display rendering intent:"
 msgstr "顯示演色意涵(_D):"
 
-#: ../app/dialogs/preferences-dialog.c:2493
+#: ../app/dialogs/preferences-dialog.c:2521
 msgid "_Softproof rendering intent:"
 msgstr "軟式打樣演色意涵(_S):"
 
-#: ../app/dialogs/preferences-dialog.c:2506
+#: ../app/dialogs/preferences-dialog.c:2534
 msgid "Mark out of gamut colors"
 msgstr "標記超出全色彩範圍"
 
-#: ../app/dialogs/preferences-dialog.c:2511
+#: ../app/dialogs/preferences-dialog.c:2539
 msgid "Select Warning Color"
 msgstr "選擇警告顏色"
 
-#: ../app/dialogs/preferences-dialog.c:2524
+#: ../app/dialogs/preferences-dialog.c:2552
 msgid "File Open behaviour:"
 msgstr "檔案開啟行為:"
 
-#: ../app/dialogs/preferences-dialog.c:2536
+#: ../app/dialogs/preferences-dialog.c:2564
 msgid "Input Devices"
 msgstr "輸入裝置"
 
 #. Extended Input Devices
-#: ../app/dialogs/preferences-dialog.c:2546
+#: ../app/dialogs/preferences-dialog.c:2574
 msgid "Extended Input Devices"
 msgstr "額外輸入裝置"
 
-#: ../app/dialogs/preferences-dialog.c:2550
+#: ../app/dialogs/preferences-dialog.c:2578
 msgid "Configure E_xtended Input Devices..."
 msgstr "設定額外的輸入裝置(_X)..."
 
-#: ../app/dialogs/preferences-dialog.c:2557
+#: ../app/dialogs/preferences-dialog.c:2585
 msgid "_Save input device settings on exit"
 msgstr "結束時儲存輸入裝置的設定(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2561
+#: ../app/dialogs/preferences-dialog.c:2589
 msgid "Save Input Device Settings _Now"
 msgstr "立刻儲存輸入裝置的設定(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2568
+#: ../app/dialogs/preferences-dialog.c:2596
 msgid "_Reset Saved Input Device Settings to Default Values"
 msgstr "重新載入已儲存的輸入裝置設定(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2583
+#: ../app/dialogs/preferences-dialog.c:2611
 msgid "Additional Input Controllers"
 msgstr "額外輸入裝置"
 
-#: ../app/dialogs/preferences-dialog.c:2586
+#: ../app/dialogs/preferences-dialog.c:2614
 msgid "Input Controllers"
 msgstr "輸入裝置"
 
-#: ../app/dialogs/preferences-dialog.c:2602
+#: ../app/dialogs/preferences-dialog.c:2630
 msgid "Window Management"
 msgstr "視窗管理"
 
-#: ../app/dialogs/preferences-dialog.c:2611
+#: ../app/dialogs/preferences-dialog.c:2639
 msgid "Window Manager Hints"
 msgstr "視窗總管的提示"
 
-#: ../app/dialogs/preferences-dialog.c:2617
+#: ../app/dialogs/preferences-dialog.c:2645
 msgid "Hint for _docks and toolbox:"
 msgstr "給停駐式對話盒和工具箱的提示(_D):"
 
-#: ../app/dialogs/preferences-dialog.c:2620
+#: ../app/dialogs/preferences-dialog.c:2648
 msgid "Focus"
 msgstr "焦點"
 
-#: ../app/dialogs/preferences-dialog.c:2624
+#: ../app/dialogs/preferences-dialog.c:2652
 msgid "Activate the _focused image"
 msgstr "使用已獲焦點的圖片(_F)"
 
 #. Window Positions
-#: ../app/dialogs/preferences-dialog.c:2628
+#: ../app/dialogs/preferences-dialog.c:2656
 msgid "Window Positions"
 msgstr "視窗位置"
 
-#: ../app/dialogs/preferences-dialog.c:2631
+#: ../app/dialogs/preferences-dialog.c:2659
 msgid "_Save window positions on exit"
 msgstr "結束程式時儲存視窗位置(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2635
+#: ../app/dialogs/preferences-dialog.c:2663
 msgid "Save Window Positions _Now"
 msgstr "立刻儲存視窗位置(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2642
+#: ../app/dialogs/preferences-dialog.c:2670
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr "將視窗位置設定為程式本身的預設值(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2657
+#: ../app/dialogs/preferences-dialog.c:2685
 msgid "Folders"
 msgstr "資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2677
+#: ../app/dialogs/preferences-dialog.c:2705
 msgid "Temporary folder:"
 msgstr "暫存資料夾:"
 
-#: ../app/dialogs/preferences-dialog.c:2678
+#: ../app/dialogs/preferences-dialog.c:2706
 msgid "Select Folder for Temporary Files"
 msgstr "選擇暫存檔案使用的資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2682
+#: ../app/dialogs/preferences-dialog.c:2710
 msgid "Swap folder:"
 msgstr "交換記憶檔資料夾:"
 
-#: ../app/dialogs/preferences-dialog.c:2683
+#: ../app/dialogs/preferences-dialog.c:2711
 msgid "Select Swap Folder"
 msgstr "選取交換檔資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2718
+#: ../app/dialogs/preferences-dialog.c:2746
 msgid "Brush Folders"
 msgstr "筆刷資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2720
+#: ../app/dialogs/preferences-dialog.c:2748
 msgid "Select Brush Folders"
 msgstr "選取筆刷資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2722
+#: ../app/dialogs/preferences-dialog.c:2750
 msgid "Dynamics Folders"
 msgstr "筆刷動態資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2724
+#: ../app/dialogs/preferences-dialog.c:2752
 msgid "Select Dynamics Folders"
 msgstr "選取筆刷動態資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2726
+#: ../app/dialogs/preferences-dialog.c:2754
 msgid "Pattern Folders"
 msgstr "圖樣資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2728
+#: ../app/dialogs/preferences-dialog.c:2756
 msgid "Select Pattern Folders"
 msgstr "選取圖樣資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2730
+#: ../app/dialogs/preferences-dialog.c:2758
 msgid "Palette Folders"
 msgstr "調色盤資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2732
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Select Palette Folders"
 msgstr "選取調色盤資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2734
+#: ../app/dialogs/preferences-dialog.c:2762
 msgid "Gradient Folders"
 msgstr "漸層資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2736
+#: ../app/dialogs/preferences-dialog.c:2764
 msgid "Select Gradient Folders"
 msgstr "選取漸層資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2738
+#: ../app/dialogs/preferences-dialog.c:2766
 msgid "Font Folders"
 msgstr "字型資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/dialogs/preferences-dialog.c:2768
 msgid "Select Font Folders"
 msgstr "選取字型資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2770
+msgid "Tool Preset Folders"
+msgstr "工具預設資料夾"
+
+#: ../app/dialogs/preferences-dialog.c:2772
+msgid "Select Tool Preset Folders"
+msgstr "選取工具預設資料夾"
+
+#: ../app/dialogs/preferences-dialog.c:2774
 msgid "Plug-In Folders"
 msgstr "增效模組資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/dialogs/preferences-dialog.c:2776
 msgid "Select Plug-In Folders"
 msgstr "選取增效模組資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2778
 msgid "Scripts"
 msgstr "命令稿"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2778
 msgid "Script-Fu Folders"
 msgstr "Script-Fu 資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2780
 msgid "Select Script-Fu Folders"
 msgstr "選取 Script-Fu 資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2782
 msgid "Module Folders"
 msgstr "模組資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2752
+#: ../app/dialogs/preferences-dialog.c:2784
 msgid "Select Module Folders"
 msgstr "選取模組資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2754
+#: ../app/dialogs/preferences-dialog.c:2786
 msgid "Interpreters"
 msgstr "解譯器"
 
-#: ../app/dialogs/preferences-dialog.c:2754
+#: ../app/dialogs/preferences-dialog.c:2786
 msgid "Interpreter Folders"
 msgstr "解譯器資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2788
 msgid "Select Interpreter Folders"
 msgstr "選取解譯器資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2758
+#: ../app/dialogs/preferences-dialog.c:2790
 msgid "Environment Folders"
 msgstr "環境變數資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2792
 msgid "Select Environment Folders"
 msgstr "選取環境變數資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2762
+#: ../app/dialogs/preferences-dialog.c:2794
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../app/dialogs/preferences-dialog.c:2762
+#: ../app/dialogs/preferences-dialog.c:2794
 msgid "Theme Folders"
 msgstr "佈景主題資料夾"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2796
 msgid "Select Theme Folders"
 msgstr "選取佈景主題資料夾"
 
@@ -10087,59 +10196,85 @@ msgid "Print Size"
 msgstr "列印尺寸"
 
 #. the image size labels
-#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:201
-#: ../app/widgets/gimptemplateeditor.c:163
+#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:193
+#: ../app/widgets/gimptemplateeditor.c:180
 msgid "_Width:"
-msgstr "寬度(_W):"
+msgstr "寬度(_W):"
 
-#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:205
-#: ../app/widgets/gimptemplateeditor.c:170
+#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:197
+#: ../app/widgets/gimptemplateeditor.c:187
 msgid "H_eight:"
-msgstr "高度(_E):"
+msgstr "高度(_E):"
 
 #. the resolution labels
-#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:263
-#: ../app/widgets/gimptemplateeditor.c:290
+#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:260
+#: ../app/widgets/gimptemplateeditor.c:309
 msgid "_X resolution:"
-msgstr "水平解析度(_X):"
+msgstr "水平解析度(_X):"
 
-#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:266
-#: ../app/widgets/gimptemplateeditor.c:297
+#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:263
+#: ../app/widgets/gimptemplateeditor.c:316
 msgid "_Y resolution:"
-msgstr "垂直解析度(_Y):"
+msgstr "垂直解析度(_Y):"
 
-#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:259
+#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:256
 #, c-format
 msgid "pixels/%a"
 msgstr "像素/%a"
 
-#: ../app/dialogs/quit-dialog.c:104
+#: ../app/dialogs/quit-dialog.c:144
 msgid "Quit GIMP"
 msgstr "結束 GIMP"
 
-#: ../app/dialogs/quit-dialog.c:104
+#: ../app/dialogs/quit-dialog.c:144
 msgid "Close All Images"
 msgstr "關閉所有圖片"
 
-#: ../app/dialogs/quit-dialog.c:163
+#: ../app/dialogs/quit-dialog.c:212
 msgid "If you quit GIMP now, these changes will be lost."
 msgstr "如果現在結束 GIMP,未儲存的部份將會失去。"
 
-#: ../app/dialogs/quit-dialog.c:166
+#: ../app/dialogs/quit-dialog.c:215
 msgid "If you close these images now, changes will be lost."
 msgstr "如果現在不儲存這些圖片,將會失去最後修改的部份。"
 
-#: ../app/dialogs/quit-dialog.c:213
+#: ../app/dialogs/quit-dialog.c:300
 #, c-format
 msgid "There is one image with unsaved changes:"
 msgid_plural "There are %d images with unsaved changes:"
 msgstr[0] "有 1 幅圖更改後未儲存:"
 msgstr[1] "有 %d 幅圖更改後未儲存:"
 
-#: ../app/dialogs/quit-dialog.c:235
+#: ../app/dialogs/quit-dialog.c:311
+#, c-format
+msgid "Press %s to quit."
+msgstr "按下 %s 結束。"
+
+#: ../app/dialogs/quit-dialog.c:314
+#, c-format
+msgid "Press %s to close all images."
+msgstr "按下 %s 關閉所有影像。"
+
+#: ../app/dialogs/quit-dialog.c:330
+#, c-format
+msgid "Press %s to discard all changes and quit."
+msgstr "按下 %s 丟棄所有更動並結束。"
+
+#: ../app/dialogs/quit-dialog.c:333
+#, c-format
+msgid "Press %s to discard all changes and close all images."
+msgstr "按下 %s 丟棄所有變更並關閉所有圖片。"
+
+#: ../app/dialogs/quit-dialog.c:341
+#: ../app/display/gimpdisplayshell-close.c:180
 msgid "_Discard Changes"
 msgstr "放棄更改(_D)"
 
+#: ../app/dialogs/quit-dialog.c:423
+#, c-format
+msgid "Exported to %s"
+msgstr "已匯出到 %s"
+
 #: ../app/dialogs/resize-dialog.c:119
 msgid "Canvas Size"
 msgstr "畫布尺寸"
@@ -10169,11 +10304,11 @@ msgid "_Vertical:"
 msgstr "垂直(_V):"
 
 #. Image size frame
-#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:141
+#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:158
 msgid "Image Size"
 msgstr "圖片尺寸"
 
-#: ../app/dialogs/scale-dialog.c:176
+#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:391
 msgid "Quality"
 msgstr "品質"
 
@@ -10192,11 +10327,11 @@ msgstr ""
 msgid "Choose Stroke Style"
 msgstr "選擇描邊方式"
 
-#: ../app/dialogs/stroke-dialog.c:222
+#: ../app/dialogs/stroke-dialog.c:214
 msgid "Paint tool:"
 msgstr "繪圖工具:"
 
-#: ../app/dialogs/stroke-dialog.c:236
+#: ../app/dialogs/stroke-dialog.c:228
 msgid "_Emulate brush dynamics"
 msgstr "模擬筆刷動態(_E)"
 
@@ -10276,7 +10411,7 @@ msgid "Import Paths from SVG"
 msgstr "由 SVG 匯入路徑"
 
 #: ../app/dialogs/vectors-import-dialog.c:92
-#: ../app/widgets/gimpprofilechooserdialog.c:131
+#: ../app/widgets/gimpprofilechooserdialog.c:122
 msgid "All files (*.*)"
 msgstr "所有檔案 (*.*)"
 
@@ -10294,96 +10429,135 @@ msgstr "縮放匯入的路徑以符合圖片(_S)"
 
 #: ../app/dialogs/vectors-options-dialog.c:122
 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
+msgstr "路徑名稱:"
+
+#: ../app/display/display-enums.c:60
+msgctxt "guides-type"
+msgid "No guides"
+msgstr "無參考線"
+
+#: ../app/display/display-enums.c:61
+msgctxt "guides-type"
+msgid "Center lines"
+msgstr "中線"
+
+#: ../app/display/display-enums.c:62
+msgctxt "guides-type"
+msgid "Rule of thirds"
+msgstr "三分法"
+
+#: ../app/display/display-enums.c:63
+msgctxt "guides-type"
+msgid "Rule of fifths"
+msgstr "五分法"
+
+#: ../app/display/display-enums.c:64
+msgctxt "guides-type"
+msgid "Golden sections"
+msgstr "黃金分割"
+
+#: ../app/display/display-enums.c:65
+msgctxt "guides-type"
+msgid "Diagonal lines"
+msgstr "對角線"
+
+#: ../app/display/display-enums.c:66
+msgctxt "guides-type"
+msgid "Number of lines"
+msgstr "行數"
+
+#: ../app/display/display-enums.c:67
+msgctxt "guides-type"
+msgid "Line spacing"
+msgstr "行距"
+
+#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222
+#: ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247
+#: ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272
+#: ../app/display/gimpcursorview.c:288 ../app/display/gimpcursorview.c:295
+#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673
+#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675
+#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789
+#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791
 #: ../app/widgets/gimpcolorframe.c:633
 msgid "n/a"
 msgstr "無"
 
-#: ../app/display/gimpcursorview.c:213 ../app/display/gimpcursorview.c:238
-#: ../app/display/gimpcursorview.c:263
-#: ../app/widgets/gimpdeviceinfoeditor.c:140
+#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244
+#: ../app/display/gimpcursorview.c:269
+#: ../app/widgets/gimpdeviceinfoeditor.c:138
 msgid "X"
 msgstr "X"
 
-#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244
-#: ../app/display/gimpcursorview.c:269
-#: ../app/widgets/gimpdeviceinfoeditor.c:141
+#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250
+#: ../app/display/gimpcursorview.c:275
+#: ../app/widgets/gimpdeviceinfoeditor.c:139
 msgid "Y"
 msgstr "Y"
 
 #. Units
-#: ../app/display/gimpcursorview.c:225
+#: ../app/display/gimpcursorview.c:231
 msgid "Units"
 msgstr "長度單位"
 
 #. Selection Bounding Box
-#: ../app/display/gimpcursorview.c:250
+#: ../app/display/gimpcursorview.c:256
 #, fuzzy
 msgid "Selection Bounding Box"
 msgstr "下載此綁定方塊"
 
 #. Width
-#: ../app/display/gimpcursorview.c:286
-#, fuzzy
+#: ../app/display/gimpcursorview.c:292
 msgid "W"
-msgstr "西"
+msgstr "寬"
 
 #. Height
-#: ../app/display/gimpcursorview.c:293
-#, fuzzy
+#: ../app/display/gimpcursorview.c:299
 msgid "H"
-msgstr "H"
+msgstr "高"
 
-#: ../app/display/gimpcursorview.c:320
+#: ../app/display/gimpcursorview.c:328
 msgid "_Sample Merged"
 msgstr "合併樣本(_S)"
 
-#: ../app/display/gimpdisplayshell.c:506
+#: ../app/display/gimpdisplayshell.c:508
 msgid "Access the image menu"
 msgstr "存取圖片選單"
 
-#: ../app/display/gimpdisplayshell.c:617
+#: ../app/display/gimpdisplayshell.c:622
 msgid "Zoom image when window size changes"
 msgstr "視窗尺寸更改時調整縮放比率"
 
-#: ../app/display/gimpdisplayshell.c:646
+#: ../app/display/gimpdisplayshell.c:651
 msgid "Toggle Quick Mask"
 msgstr "切換快速遮罩"
 
-#: ../app/display/gimpdisplayshell.c:669
+#: ../app/display/gimpdisplayshell.c:674
 msgid "Navigate the image display"
 msgstr "導覽至圖片顯示"
 
-#: ../app/display/gimpdisplayshell.c:737
-#: ../app/display/gimpdisplayshell.c:1323 ../app/widgets/gimptoolbox.c:270
+#: ../app/display/gimpdisplayshell.c:746
+#: ../app/display/gimpdisplayshell.c:1331 ../app/widgets/gimptoolbox.c:253
 msgid "Drop image files here to open them"
 msgstr "將圖片檔案拖放至此以開啟它們"
 
-#: ../app/display/gimpdisplayshell-close.c:153
-#: ../app/display/gimpdisplayshell-close.c:223
+#: ../app/display/gimpdisplayshell-close.c:169
+#: ../app/display/gimpdisplayshell-close.c:269
 #, c-format
 msgid "Close %s"
 msgstr "關閉 %s"
 
-#: ../app/display/gimpdisplayshell-close.c:164
-msgid "Close _without Saving"
-msgstr "關閉但不儲存(_W)"
+#: ../app/display/gimpdisplayshell-close.c:217
+#, c-format
+msgid "Press %s to discard all changes and close the image."
+msgstr "按下 %s 丟棄所有變更並關閉圖片。"
 
-#: ../app/display/gimpdisplayshell-close.c:231
+#: ../app/display/gimpdisplayshell-close.c:277
 #, c-format
 msgid "Save the changes to image '%s' before closing?"
 msgstr "關閉視窗之前是否儲存圖片 ‘%s’?"
 
-#: ../app/display/gimpdisplayshell-close.c:254
+#: ../app/display/gimpdisplayshell-close.c:310
 #, c-format
 msgid "If you don't save the image, changes from the last hour will be lost."
 msgid_plural ""
@@ -10391,7 +10565,7 @@ msgid_plural ""
 msgstr[0] "如果現在不儲存圖片,將會失去最後 1 小時所修改的部份。"
 msgstr[1] "如果現在不儲存圖片,將會失去最後 %d 小時所修改的部份。"
 
-#: ../app/display/gimpdisplayshell-close.c:264
+#: ../app/display/gimpdisplayshell-close.c:321
 #, c-format
 msgid ""
 "If you don't save the image, changes from the last hour and %d minute will "
@@ -10402,7 +10576,7 @@ msgid_plural ""
 msgstr[0] "如果現在不儲存圖片,將會失去最後 1 小時 %d 分所修改的部份。"
 msgstr[1] "如果現在不儲存圖片,將會失去最後 1 小時 %d 分所修改的部份。"
 
-#: ../app/display/gimpdisplayshell-close.c:275
+#: ../app/display/gimpdisplayshell-close.c:333
 #, c-format
 msgid "If you don't save the image, changes from the last minute will be lost."
 msgid_plural ""
@@ -10410,60 +10584,66 @@ msgid_plural ""
 msgstr[0] "如果現在不儲存圖片,將會失去最後 1 分鐘所修改的部份。"
 msgstr[1] "如果現在不儲存圖片,將會失去最後 %d 分鐘所修改的部份。"
 
-#: ../app/display/gimpdisplayshell-dnd.c:232
-#: ../app/display/gimpdisplayshell-dnd.c:602
-#: ../app/display/gimpdisplayshell-dnd.c:667
+#: ../app/display/gimpdisplayshell-close.c:354
+#, c-format
+msgid "The image has been exported to '%s'."
+msgstr "圖片已匯出到「%s」。"
+
+#: ../app/display/gimpdisplayshell-dnd.c:246
+#: ../app/display/gimpdisplayshell-dnd.c:649
+#: ../app/display/gimpdisplayshell-dnd.c:707
 msgid "Drop New Layer"
 msgstr "拖放新的圖層"
 
-#: ../app/display/gimpdisplayshell-dnd.c:275
+#: ../app/display/gimpdisplayshell-dnd.c:289
 msgid "Drop New Path"
 msgstr "拖放新的路徑"
 
-#: ../app/display/gimpdisplayshell-dnd.c:347
-#: ../app/display/gimpdisplayshell-dnd.c:442 ../app/tools/gimpblendtool.c:171
-#: ../app/tools/gimpbucketfilltool.c:135 ../app/tools/gimpimagemaptool.c:280
+#: ../app/display/gimpdisplayshell-dnd.c:361
+#: ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173
+#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280
+#: ../app/tools/gimpselectiontool.c:427
 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:178
-#: ../app/tools/gimpbucketfilltool.c:142 ../app/tools/gimpcroptool.c:342
-#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:285
-#: ../app/tools/gimptransformtool.c:315 ../app/tools/gimptransformtool.c:1261
+#: ../app/display/gimpdisplayshell-dnd.c:369
+#: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180
+#: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325
+#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266
+#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:1466
 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:549
+#: ../app/widgets/gimplayertreeview.c:725
 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:276
+#: ../app/display/gimpdisplayshell-dnd.c:682
+#: ../app/display/gimpdisplayshell-dnd.c:699
+#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264
 msgid "Dropped Buffer"
 msgstr "拖放緩衝區"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:78
+#: ../app/display/gimpdisplayshell-filter-dialog.c:83
 msgid "Color Display Filters"
 msgstr "濾色片"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:81
+#: ../app/display/gimpdisplayshell-filter-dialog.c:86
 msgid "Configure Color Display Filters"
 msgstr "設定濾色片"
 
-#: ../app/display/gimpdisplayshell-handlers.c:802
+#: ../app/display/gimpdisplayshell-handlers.c:796
 #, c-format
 msgid "Image saved to '%s'"
 msgstr "圖片儲存為“%s”"
 
-#: ../app/display/gimpdisplayshell-handlers.c:816
+#: ../app/display/gimpdisplayshell-handlers.c:810
 #, c-format
 msgid "Image exported to '%s'"
 msgstr "圖片匯出到 %s"
 
-#: ../app/display/gimpdisplayshell-layer-select.c:120
+#: ../app/display/gimpdisplayshell-layer-select.c:122
 msgid "Layer Select"
 msgstr "圖層選擇"
 
@@ -10483,38 +10663,26 @@ msgstr "縮放率:"
 msgid "Zoom:"
 msgstr "縮放:"
 
-#: ../app/display/gimpdisplayshell-title.c:301
+#: ../app/display/gimpdisplayshell-title.c:282
 msgid "(modified)"
 msgstr "(已修改)"
 
-#: ../app/display/gimpdisplayshell-title.c:306
+#: ../app/display/gimpdisplayshell-title.c:287
 msgid "(clean)"
 msgstr "(清除)"
 
-#: ../app/display/gimpdisplayshell-title.c:360
-#: ../app/display/gimpdisplayshell-title.c:373
-#: ../app/widgets/gimpactiongroup.c:870
+#: ../app/display/gimpdisplayshell-title.c:338
+#: ../app/display/gimpdisplayshell-title.c:351
+#: ../app/widgets/gimpactiongroup.c:884
 msgid "(none)"
 msgstr "(無)"
 
-#: ../app/display/gimpdisplayshell-title.c:504
-msgid " (exported)"
-msgstr "(匯出)"
-
-#: ../app/display/gimpdisplayshell-title.c:506
-msgid " (overwritten)"
-msgstr "(覆蓋)"
-
-#: ../app/display/gimpdisplayshell-title.c:512
-msgid " (imported)"
-msgstr "(匯入)"
-
 #: ../app/display/gimpstatusbar.c:356
 #, c-format
 msgid "Cancel <i>%s</i>"
 msgstr "取消 <i>%s</i>"
 
-#: ../app/file/file-open.c:136 ../app/file/file-save.c:112
+#: ../app/file/file-open.c:136 ../app/file/file-save.c:115
 msgid "Not a regular file"
 msgstr "不是普通檔案"
 
@@ -10528,36 +10696,36 @@ msgstr "%s 增效模組回傳值為 SUCCESS,但沒有產生圖片"
 msgid "%s plug-In could not open image"
 msgstr "%s 增效模組無法開啟圖片"
 
-#: ../app/file/file-open.c:518
+#: ../app/file/file-open.c:530
 msgid "Image doesn't contain any layers"
 msgstr "圖片沒有包含任何圖層"
 
-#: ../app/file/file-open.c:571
+#: ../app/file/file-open.c:590
 #, c-format
 msgid "Opening '%s' failed: %s"
 msgstr "開啟‘%s’失敗:%s"
 
-#: ../app/file/file-open.c:678
+#: ../app/file/file-open.c:700
 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:195
 msgid "Unknown file type"
 msgstr "檔案類型不詳"
 
-#: ../app/file/file-save.c:189
+#: ../app/file/file-save.c:222
 #, c-format
 msgid "%s plug-in could not save image"
 msgstr "%s 增效模組無法儲存圖片"
 
-#: ../app/file/file-utils.c:74
+#: ../app/file/file-utils.c:72
 #, c-format
 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:124
 msgid "Invalid character sequence in URI"
 msgstr "URI 中出現無效的字符次序"
 
@@ -10573,36 +10741,65 @@ msgctxt "cage-mode"
 msgid "Deform the cage to deform the image"
 msgstr "調整圖層為圖片的大小"
 
-#: ../app/gegl/gimpcurvesconfig.c:384
+#: ../app/gegl/gimpcurvesconfig.c:395
 msgid "not a GIMP Curves file"
 msgstr "不是 GIMP 曲線檔案"
 
-#: ../app/gegl/gimpcurvesconfig.c:399 ../app/gegl/gimplevelsconfig.c:710
+#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811
 msgid "parse error"
 msgstr "分析錯誤"
 
-#: ../app/gegl/gimplevelsconfig.c:663
+#: ../app/gegl/gimplevelsconfig.c:764
 msgid "not a GIMP Levels file"
 msgstr "並非 GIMP 色階檔案"
 
+#: ../app/gegl/gimpoperationcagecoefcalc.c:67
+msgid "Compute a set of coefficient buffer for the GIMP cage tool"
+msgstr ""
+
+#: ../app/gegl/gimpoperationcagetransform.c:106
+msgid ""
+"Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage "
+"tool"
+msgstr ""
+
+#: ../app/gegl/gimpoperationcagetransform.c:128
+msgid "Fill with plain color"
+msgstr "填入單一色彩"
+
+#: ../app/gegl/gimpoperationcagetransform.c:129
+#: ../app/tools/gimpcageoptions.c:144
+msgid "Fill the original position of the cage with a plain color"
+msgstr ""
+
+#. Normally this should have been taken care of during command line
+#. * parsing as a post-parse hook of gtk_get_option_group(), using the
+#. * system locales.
+#. * But user config may have overriden the language, therefore we must
+#. * check the widget directions again.
+#.
+#: ../app/gui/gui.c:208
+msgid "default:LTR"
+msgstr "預設:左到右"
+
 #. initialize the document history
-#: ../app/gui/gui.c:422
+#: ../app/gui/gui.c:433
 msgid "Documents"
 msgstr "文件"
 
-#: ../app/gui/splash.c:114
+#: ../app/gui/splash.c:115
 msgid "GIMP Startup"
 msgstr "啟動 GIMP"
 
-#: ../app/paint/gimpairbrush.c:72 ../app/tools/gimpairbrushtool.c:54
+#: ../app/paint/gimpairbrush.c:73 ../app/tools/gimpairbrushtool.c:54
 msgid "Airbrush"
 msgstr "噴槍"
 
-#: ../app/paint/gimpbrushcore.c:432
+#: ../app/paint/gimpbrushcore.c:387
 msgid "No brushes available for use with this tool."
 msgstr "沒有筆刷可配合此工具使用。"
 
-#: ../app/paint/gimpbrushcore.c:439
+#: ../app/paint/gimpbrushcore.c:394
 msgid "No paint dynamics available for use with this tool."
 msgstr "沒有筆刷動態可配合此工具使用。"
 
@@ -10622,15 +10819,15 @@ msgstr "捲積"
 msgid "Dodge/Burn"
 msgstr "漂白/燻黑"
 
-#: ../app/paint/gimperaser.c:65 ../app/tools/gimperasertool.c:65
+#: ../app/paint/gimperaser.c:63 ../app/tools/gimperasertool.c:65
 msgid "Eraser"
 msgstr "橡皮擦"
 
-#: ../app/paint/gimpheal.c:118 ../app/tools/gimphealtool.c:52
+#: ../app/paint/gimpheal.c:131 ../app/tools/gimphealtool.c:52
 msgid "Heal"
 msgstr "修補"
 
-#: ../app/paint/gimpheal.c:157
+#: ../app/paint/gimpheal.c:170
 msgid "Healing does not operate on indexed layers."
 msgstr "修補不適用於索引色的圖層。"
 
@@ -10650,33 +10847,74 @@ msgstr "墨水斑點長寬比"
 msgid "Ink Blob Angle"
 msgstr "墨水斑點角度"
 
-#: ../app/paint/gimppaintbrush.c:65 ../app/tools/gimppaintbrushtool.c:50
+#: ../app/paint/gimppaintbrush.c:66 ../app/tools/gimppaintbrushtool.c:50
 msgid "Paintbrush"
 msgstr "畫筆"
 
-#: ../app/paint/gimppaintcore.c:140
+#: ../app/paint/gimppaintcore.c:141
 msgid "Paint"
 msgstr "繪圖"
 
-#: ../app/paint/gimppaintoptions.c:138
-#, fuzzy
+#: ../app/paint/gimppaintoptions.c:146
 msgid "Brush Size"
-msgstr "編輯長釘"
+msgstr "筆刷大小"
+
+#: ../app/paint/gimppaintoptions.c:160
+#, fuzzy
+msgid "Every stamp has its own opacity"
+msgstr "每個戳記皆有自己的不透明度"
+
+#: ../app/paint/gimppaintoptions.c:166
+msgid "Ignore fuzziness of the current brush"
+msgstr "忽略目前筆刷的模糊度"
+
+#: ../app/paint/gimppaintoptions.c:171
+msgid "Scatter brush as you paint"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:175
+msgid "Distance of scattering"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:185
+msgid "Distance over which strokes fade out"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:193
+#, fuzzy
+msgid "Reverse direction of fading"
+msgstr "反轉的方向"
+
+#: ../app/paint/gimppaintoptions.c:197
+msgid "How fade is repeated as you paint"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:256
+msgid "Paint smoother strokes"
+msgstr "繪製更平滑的筆觸"
+
+#: ../app/paint/gimppaintoptions.c:260
+msgid "Depth of smoothing"
+msgstr "平滑的深度"
+
+#: ../app/paint/gimppaintoptions.c:264
+msgid "Gravity of the pen"
+msgstr "筆的重力"
 
 #: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50
 msgid "Pencil"
 msgstr "鉛筆"
 
-#: ../app/paint/gimpperspectiveclone.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:124
+#: ../app/paint/gimpperspectiveclone.c:95
+#: ../app/tools/gimpperspectiveclonetool.c:133
 msgid "Perspective Clone"
 msgstr "透視法仿製"
 
-#: ../app/paint/gimpperspectiveclone.c:163
+#: ../app/paint/gimpperspectiveclone.c:160
 msgid "Perspective Clone does not operate on indexed layers."
 msgstr "透視法仿製不適用於索引色圖層。"
 
-#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:53
+#: ../app/paint/gimpsmudge.c:84 ../app/tools/gimpsmudgetool.c:53
 msgid "Smudge"
 msgstr "塗抹"
 
@@ -10724,7 +10962,22 @@ msgctxt "convolve-type"
 msgid "Sharpen"
 msgstr "銳利化"
 
-#: ../app/pdb/channel-cmds.c:182
+#: ../app/paint/paint-enums.c:144
+msgctxt "ink-blob-type"
+msgid "Circle"
+msgstr "圓形"
+
+#: ../app/paint/paint-enums.c:145
+msgctxt "ink-blob-type"
+msgid "Square"
+msgstr "正方形"
+
+#: ../app/paint/paint-enums.c:146
+msgctxt "ink-blob-type"
+msgid "Diamond"
+msgstr "菱形"
+
+#: ../app/pdb/channel-cmds.c:194
 msgid "Combine Masks"
 msgstr "組合遮罩"
 
@@ -10732,52 +10985,52 @@ msgstr "組合遮罩"
 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:345
+#: ../app/pdb/drawable-transform-cmds.c:443
+#: ../app/pdb/item-transform-cmds.c:262 ../app/pdb/transform-tools-cmds.c:163
+#: ../app/tools/gimpperspectivetool.c:82
 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:957
+#: ../app/pdb/drawable-transform-cmds.c:1042
+#: ../app/pdb/item-transform-cmds.c:611 ../app/pdb/transform-tools-cmds.c:418
+#: ../app/tools/gimpsheartool.c:112
 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:1138
+#: ../app/pdb/item-transform-cmds.c:709 ../app/pdb/transform-tools-cmds.c:507
 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:1234
+#: ../app/pdb/drawable-transform-cmds.c:1338
+#: ../app/pdb/drawable-transform-cmds.c:1442
+#: ../app/pdb/item-transform-cmds.c:815
 msgid "2D Transforming"
 msgstr "2D 變換"
 
-#: ../app/pdb/edit-cmds.c:725 ../app/tools/gimpblendtool.c:240
+#: ../app/pdb/edit-cmds.c:728 ../app/tools/gimpblendtool.c:249
 msgid "Blending"
 msgstr "進行混色"
 
-#: ../app/pdb/floating-sel-cmds.c:64
+#: ../app/pdb/floating-sel-cmds.c:65
 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:98
 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:131
 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/gimppdb-query.c:299 ../app/pdb/gimppdb.c:315
+#: ../app/pdb/gimppdb.c:385
 #, c-format
 msgid "Procedure '%s' not found"
 msgstr "找不到程序“%s”"
@@ -10801,145 +11054,159 @@ msgstr "筆刷“%s”不可編輯"
 msgid "Brush '%s' is not a generated brush"
 msgstr "筆刷“%s”不是產生的筆刷"
 
-#: ../app/pdb/gimppdb-utils.c:133
+#: ../app/pdb/gimppdb-utils.c:134
+msgid "Invalid empty paint dynamics name"
+msgstr "無效的空白繪圖筆刷動態名稱"
+
+#: ../app/pdb/gimppdb-utils.c:143
+#, c-format
+msgid "Paint dynamics '%s' not found"
+msgstr "找不到「%s」繪圖筆刷動態"
+
+#: ../app/pdb/gimppdb-utils.c:148
+#, c-format
+msgid "Paint dynamics '%s' is not editable"
+msgstr "「%s」繪圖筆刷動態不可編輯"
+
+#: ../app/pdb/gimppdb-utils.c:168
 msgid "Invalid empty pattern name"
 msgstr "無效的空白圖案名稱"
 
-#: ../app/pdb/gimppdb-utils.c:142
+#: ../app/pdb/gimppdb-utils.c:177
 #, c-format
 msgid "Pattern '%s' not found"
 msgstr "找不到圖案“%s”"
 
-#: ../app/pdb/gimppdb-utils.c:162
+#: ../app/pdb/gimppdb-utils.c:197
 msgid "Invalid empty gradient name"
 msgstr "無效的空白漸層名稱"
 
-#: ../app/pdb/gimppdb-utils.c:171
+#: ../app/pdb/gimppdb-utils.c:206
 #, c-format
 msgid "Gradient '%s' not found"
 msgstr "找不到漸層“%s”"
 
-#: ../app/pdb/gimppdb-utils.c:176
+#: ../app/pdb/gimppdb-utils.c:211
 #, c-format
 msgid "Gradient '%s' is not editable"
 msgstr "漸層“%s”不可編輯"
 
-#: ../app/pdb/gimppdb-utils.c:197
+#: ../app/pdb/gimppdb-utils.c:232
 msgid "Invalid empty palette name"
 msgstr "無效的空白調色盤名稱"
 
-#: ../app/pdb/gimppdb-utils.c:206
+#: ../app/pdb/gimppdb-utils.c:241
 #, c-format
 msgid "Palette '%s' not found"
 msgstr "找不到調色盤“%s”"
 
-#: ../app/pdb/gimppdb-utils.c:211
+#: ../app/pdb/gimppdb-utils.c:246
 #, c-format
 msgid "Palette '%s' is not editable"
 msgstr "調色盤“%s”不可編輯"
 
-#: ../app/pdb/gimppdb-utils.c:231
+#: ../app/pdb/gimppdb-utils.c:266
 msgid "Invalid empty font name"
 msgstr "無效的空白字型名稱"
 
-#: ../app/pdb/gimppdb-utils.c:241
+#: ../app/pdb/gimppdb-utils.c:276
 #, c-format
 msgid "Font '%s' not found"
 msgstr "找不到字型“%s”"
 
-#: ../app/pdb/gimppdb-utils.c:260
+#: ../app/pdb/gimppdb-utils.c:295
 msgid "Invalid empty buffer name"
 msgstr "無效的空白緩衝區名稱"
 
-#: ../app/pdb/gimppdb-utils.c:270
+#: ../app/pdb/gimppdb-utils.c:305
 #, c-format
 msgid "Named buffer '%s' not found"
 msgstr "找不到已命名的緩衝區「%s」"
 
-#: ../app/pdb/gimppdb-utils.c:289
+#: ../app/pdb/gimppdb-utils.c:324
 msgid "Invalid empty paint method name"
 msgstr "無效的空白繪圖方式名稱"
 
-#: ../app/pdb/gimppdb-utils.c:299
+#: ../app/pdb/gimppdb-utils.c:334
 #, c-format
 msgid "Paint method '%s' does not exist"
 msgstr "繪圖方式“%s”不存在"
 
-#: ../app/pdb/gimppdb-utils.c:318
+#: ../app/pdb/gimppdb-utils.c:353
 #, 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
+#: ../app/pdb/gimppdb-utils.c:363
 #, 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
+#: ../app/pdb/gimppdb-utils.c:392
 #, 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
+#: ../app/pdb/gimppdb-utils.c:420
 #, 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:445
 #, fuzzy, c-format
 msgid "Item '%s' (%d) must not be an ancestor of '%s' (%d)"
 msgstr "參數「{0}」不能為 null"
 
-#: ../app/pdb/gimppdb-utils.c:434
+#: ../app/pdb/gimppdb-utils.c:469
 #, c-format
 msgid "Item '%s' (%d) has already been added to an image"
 msgstr "項目“%s”(%d) 已被加入圖片中"
 
-#: ../app/pdb/gimppdb-utils.c:442
+#: ../app/pdb/gimppdb-utils.c:477
 #, c-format
 msgid "Trying to add item '%s' (%d) to wrong image"
 msgstr "嘗試將項目『%s』(%d)加入到錯誤的圖片"
 
-#: ../app/pdb/gimppdb-utils.c:461
+#: ../app/pdb/gimppdb-utils.c:496
 #, fuzzy, c-format
 msgid "Item '%s' (%d) cannot be modified because its contents are locked"
 msgstr "不能使用項目“%s”(%d) 因為它尚未被加入圖片中"
 
-#: ../app/pdb/gimppdb-utils.c:481
+#: ../app/pdb/gimppdb-utils.c:516
 #, 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
+#: ../app/pdb/gimppdb-utils.c:536
 #, fuzzy, c-format
 msgid "Item '%s' (%d) cannot be modified because it is a group item"
 msgstr "不能使用項目“%s”(%d) 因為它尚未被加入圖片中"
 
-#: ../app/pdb/gimppdb-utils.c:522
+#: ../app/pdb/gimppdb-utils.c:557
 #, 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:598
 #, c-format
 msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected"
 msgstr "圖片“%s”(%d) 是類型“%s”,但預期的類型為“%s”"
 
-#: ../app/pdb/gimppdb-utils.c:586
+#: ../app/pdb/gimppdb-utils.c:621
 #, c-format
 msgid "Image '%s' (%d) is already of type '%s'"
 msgstr "圖片“%s”(%d) 已經是類型“%s”"
 
-#: ../app/pdb/gimppdb-utils.c:614
+#: ../app/pdb/gimppdb-utils.c:649
 #, 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:420
 #, c-format
 msgid ""
 "Procedure '%s' has been called with a wrong type for argument #%d. Expected "
@@ -10947,18 +11214,18 @@ msgid ""
 msgstr ""
 "在引數 #%2$d 使用了錯誤的類型呼叫程序「%1$s」。預期為 %3$s,卻收到 %4$s。"
 
-#: ../app/pdb/gimppdbcontext.c:78
+#: ../app/pdb/gimppdbcontext.c:89
 #: ../app/tools/gimpforegroundselectoptions.c:79
 #: ../app/tools/gimpselectionoptions.c:78
 msgid "Smooth edges"
 msgstr "將邊緣平滑化"
 
-#: ../app/pdb/gimpprocedure.c:371 ../app/plug-in/gimppluginprocframe.c:208
+#: ../app/pdb/gimpprocedure.c:374 ../app/plug-in/gimppluginprocframe.c:208
 #, c-format
 msgid "Procedure '%s' returned no return values"
 msgstr "程序「%s」傳回「沒有回傳數值」"
 
-#: ../app/pdb/gimpprocedure.c:634
+#: ../app/pdb/gimpprocedure.c:644
 #, c-format
 msgid ""
 "Procedure '%s' returned a wrong value type for return value '%s' (#%d). "
@@ -10966,7 +11233,7 @@ msgid ""
 msgstr ""
 "程序「%s」在回傳數值「%s」(#%d)傳回錯誤的數值類型。預期為 %s,卻收到 %s。"
 
-#: ../app/pdb/gimpprocedure.c:646
+#: ../app/pdb/gimpprocedure.c:656
 #, c-format
 msgid ""
 "Procedure '%s' has been called with a wrong value type for argument '%s' (#"
@@ -10975,7 +11242,7 @@ msgstr ""
 "在引數「%2$s」(#%3$d)使用了錯誤的數值類型呼叫程序「%1$s」。預期為 %4$s,卻收"
 "到 %5$s。"
 
-#: ../app/pdb/gimpprocedure.c:678
+#: ../app/pdb/gimpprocedure.c:689
 #, c-format
 msgid ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
@@ -10984,7 +11251,7 @@ msgstr ""
 "程序「%s」傳回引數「%s」的無效 ID。最有可能的是有增效模組嘗試處理已不存在的圖"
 "層。"
 
-#: ../app/pdb/gimpprocedure.c:690
+#: ../app/pdb/gimpprocedure.c:702
 #, c-format
 msgid ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
@@ -10993,7 +11260,7 @@ msgstr ""
 "在引數「%2$s」使用了無效的 ID 呼叫程序「%1$s」。最有可能的是有增效模組嘗試處"
 "理已不存在的圖層。"
 
-#: ../app/pdb/gimpprocedure.c:706
+#: ../app/pdb/gimpprocedure.c:719
 #, c-format
 msgid ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
@@ -11002,7 +11269,7 @@ msgstr ""
 "程序「%s」傳回引數「%s」的無效 ID。最有可能的是有增效模組嘗試處理已不存在的圖"
 "片。"
 
-#: ../app/pdb/gimpprocedure.c:718
+#: ../app/pdb/gimpprocedure.c:732
 #, c-format
 msgid ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
@@ -11011,7 +11278,7 @@ msgstr ""
 "在引數「%2$s」使用了無效的 ID 呼叫程序「%1$s」。最有可能的是有增效模組嘗試處"
 "理已不存在的圖片。"
 
-#: ../app/pdb/gimpprocedure.c:738
+#: ../app/pdb/gimpprocedure.c:753
 #, c-format
 msgid ""
 "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value "
@@ -11019,7 +11286,7 @@ msgid ""
 msgstr ""
 "程序「%s」傳回「%s」做為回傳數值「%s」(#%d,類型 %s)。這個數值超出了範圍。"
 
-#: ../app/pdb/gimpprocedure.c:751
+#: ../app/pdb/gimpprocedure.c:767
 #, c-format
 msgid ""
 "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type "
@@ -11028,33 +11295,33 @@ msgstr ""
 "在引數「%3$s」(#%4$d,類型 %5$s) 使用數值「%2$s」呼叫程序「%1$s」。這個數值超"
 "出了範圍。"
 
-#: ../app/pdb/image-cmds.c:2650
+#: ../app/pdb/image-cmds.c:2361
 msgid ""
 "Image resolution is out of bounds, using the default resolution instead."
 msgstr "圖片的解析度超出範圍,會使用預設的解析度代替。"
 
-#: ../app/pdb/image-select-cmds.c:164 ../app/pdb/selection-tools-cmds.c:217
-#: ../app/tools/gimpfreeselecttool.c:198
+#: ../app/pdb/image-select-cmds.c:297 ../app/pdb/selection-tools-cmds.c:219
+#: ../app/tools/gimpfreeselecttool.c:196
 msgid "Free Select"
 msgstr "自由選取區域"
 
-#: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516
+#: ../app/pdb/layer-cmds.c:475 ../app/pdb/layer-cmds.c:513
 msgid "Move Layer"
 msgstr "移動圖層"
 
-#: ../app/pdb/text-layer-cmds.c:89
+#: ../app/pdb/text-layer-cmds.c:91
 #, 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:164 ../app/pdb/text-layer-cmds.c:274
+#: ../app/pdb/text-layer-cmds.c:353 ../app/pdb/text-layer-cmds.c:426
+#: ../app/pdb/text-layer-cmds.c:498 ../app/pdb/text-layer-cmds.c:570
+#: ../app/pdb/text-layer-cmds.c:642 ../app/pdb/text-layer-cmds.c:714
+#: ../app/pdb/text-layer-cmds.c:786 ../app/pdb/text-layer-cmds.c:856
+#: ../app/pdb/text-layer-cmds.c:928 ../app/pdb/text-layer-cmds.c:1000
+#: ../app/pdb/text-layer-cmds.c:1072 ../app/pdb/text-layer-cmds.c:1114
+#: ../app/pdb/text-layer-cmds.c:1196
 msgid "Set text layer attribute"
 msgstr "設定文字圖層屬性"
 
@@ -11066,30 +11333,29 @@ msgstr "移除路徑描邊"
 msgid "Close path stroke"
 msgstr "關閉路徑描邊"
 
-#: ../app/pdb/vectors-cmds.c:399
-#, fuzzy
+#: ../app/pdb/vectors-cmds.c:401
 msgid "Translate path stroke"
-msgstr "選單內容的路徑"
+msgstr "平移路徑描編"
 
-#: ../app/pdb/vectors-cmds.c:439
+#: ../app/pdb/vectors-cmds.c:443
 msgid "Scale path stroke"
 msgstr "縮放路徑描邊"
 
-#: ../app/pdb/vectors-cmds.c:481
+#: ../app/pdb/vectors-cmds.c:487
 msgid "Rotate path stroke"
 msgstr "旋轉路徑描邊"
 
-#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565
+#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575
 msgid "Flip path stroke"
 msgstr "翻轉路徑描邊"
 
-#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:816
-#: ../app/pdb/vectors-cmds.c:1035
+#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829
+#: ../app/pdb/vectors-cmds.c:1055
 msgid "Add path stroke"
 msgstr "加入路徑描邊"
 
-#: ../app/pdb/vectors-cmds.c:868 ../app/pdb/vectors-cmds.c:921
-#: ../app/pdb/vectors-cmds.c:982
+#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937
+#: ../app/pdb/vectors-cmds.c:1000
 msgid "Extend path stroke"
 msgstr "擴大路徑描邊"
 
@@ -11135,7 +11401,7 @@ msgstr ""
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../app/plug-in/gimpplugin.c:639
+#: ../app/plug-in/gimpplugin.c:643
 #, c-format
 msgid ""
 "Plug-in crashed: \"%s\"\n"
@@ -11157,35 +11423,35 @@ msgstr ""
 msgid "Failed to run plug-in \"%s\""
 msgstr "執行增效模組「%s」失敗"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:230
+#: ../app/plug-in/gimppluginmanager-restore.c:229
 msgid "Searching Plug-Ins"
 msgstr "正在搜尋外掛程式"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:279
+#: ../app/plug-in/gimppluginmanager-restore.c:284
 msgid "Resource configuration"
 msgstr "資源設定"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:315
+#: ../app/plug-in/gimppluginmanager-restore.c:320
 msgid "Querying new Plug-ins"
 msgstr "查詢新的外掛程式"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:365
+#: ../app/plug-in/gimppluginmanager-restore.c:370
 msgid "Initializing Plug-ins"
 msgstr "初始化外掛程式"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:437
+#: ../app/plug-in/gimppluginmanager-restore.c:442
 msgid "Starting Extensions"
 msgstr "啟動擴展功能"
 
-#: ../app/plug-in/gimppluginmanager.c:297
+#: ../app/plug-in/gimppluginmanager.c:296
 msgid "Plug-In Interpreters"
 msgstr "增效模組解譯器"
 
-#: ../app/plug-in/gimppluginmanager.c:304
+#: ../app/plug-in/gimppluginmanager.c:303
 msgid "Plug-In Environment"
 msgstr "增效模組環境"
 
-#: ../app/plug-in/gimppluginprocedure.c:995
+#: ../app/plug-in/gimppluginprocedure.c:978
 #, c-format
 msgid ""
 "Calling error for '%s':\n"
@@ -11194,7 +11460,7 @@ msgstr ""
 "「%s」的呼叫錯誤:\n"
 "\r%s"
 
-#: ../app/plug-in/gimppluginprocedure.c:1007
+#: ../app/plug-in/gimppluginprocedure.c:990
 #, c-format
 msgid ""
 "Execution error for '%s':\n"
@@ -11203,16 +11469,21 @@ msgstr ""
 "「%s」的執行錯誤:\n"
 "\r%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:74
+#, c-format
+msgid "Can't apply color profile to grayscale image (%s)"
+msgstr ""
+
+#: ../app/plug-in/plug-in-icc-profile.c:117
+#: ../app/plug-in/plug-in-icc-profile.c:192
+#: ../app/plug-in/plug-in-icc-profile.c:251
 #, 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:141
+#: ../app/plug-in/plug-in-icc-profile.c:202
+#: ../app/plug-in/plug-in-icc-profile.c:261
 #, c-format
 msgid "Plug-In missing (%s)"
 msgstr "外掛程式遺失 (%s)"
@@ -11222,73 +11493,81 @@ msgstr "外掛程式遺失 (%s)"
 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:477
 #, 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:492
 #, 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."
-msgstr "This is Chinese test: '中文測試'"
+msgstr ""
+"This is Chinese test: \n"
+"「中文測試」"
 
-#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:1394
+#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1415
 msgid "Add Text Layer"
 msgstr "加入文字圖層"
 
-#: ../app/text/gimptextlayer.c:142
+#: ../app/text/gimptextlayer.c:143
 msgid "Text Layer"
 msgstr "文字圖層"
 
-#: ../app/text/gimptextlayer.c:143
+#: ../app/text/gimptextlayer.c:144
 msgid "Rename Text Layer"
 msgstr "更改文字圖層名稱"
 
-#: ../app/text/gimptextlayer.c:144
+#: ../app/text/gimptextlayer.c:145
 msgid "Move Text Layer"
 msgstr "移動文字圖層"
 
-#: ../app/text/gimptextlayer.c:145
+#: ../app/text/gimptextlayer.c:146
 msgid "Scale Text Layer"
 msgstr "縮放文字圖層"
 
-#: ../app/text/gimptextlayer.c:146
+#: ../app/text/gimptextlayer.c:147
 msgid "Resize Text Layer"
 msgstr "調整文字圖層尺寸"
 
-#: ../app/text/gimptextlayer.c:147
+#: ../app/text/gimptextlayer.c:148
 msgid "Flip Text Layer"
 msgstr "翻轉文字圖層"
 
-#: ../app/text/gimptextlayer.c:148
+#: ../app/text/gimptextlayer.c:149
 msgid "Rotate Text Layer"
 msgstr "旋轉文字圖層"
 
-#: ../app/text/gimptextlayer.c:149
+#: ../app/text/gimptextlayer.c:150
 msgid "Transform Text Layer"
 msgstr "變換文字圖層"
 
-#: ../app/text/gimptextlayer.c:522
+#: ../app/text/gimptextlayer.c:523
 msgid "Discard Text Information"
 msgstr "放棄文字資訊"
 
-#: ../app/text/gimptextlayer.c:575
+#: ../app/text/gimptextlayer.c:582
 msgid "Due to lack of any fonts, text functionality is not available."
 msgstr "因為缺乏可使用的字型,所以無法提供文字功能。"
 
-#: ../app/text/gimptextlayer.c:626
+#: ../app/text/gimptextlayer.c:640
 msgid "Empty Text Layer"
 msgstr "空白文字圖層"
 
-#: ../app/text/gimptextlayer-xcf.c:75
+#: ../app/text/gimptextlayer.c:696
+msgid ""
+"Your text cannot be rendered. It is likely too big. Please make it shorter "
+"or use a smaller font."
+msgstr ""
+
+#: ../app/text/gimptextlayer-xcf.c:76
 #, c-format
 msgid ""
 "Problems parsing the text parasite for layer '%s':\n"
@@ -11302,17 +11581,23 @@ msgstr ""
 "\n"
 "有些文字屬性可能是錯誤的。除非您想要編輯該文字圖層,否則不需要擔心這個。"
 
+#: ../app/text/gimptextlayout.c:577
+msgid ""
+"The new text layout cannot be generated. Most likely the font size is too "
+"big."
+msgstr ""
+
 #: ../app/text/text-enums.c:23
 msgctxt "text-box-mode"
 msgid "Dynamic"
-msgstr "動態的"
+msgstr "動態"
 
 #: ../app/text/text-enums.c:24
 msgctxt "text-box-mode"
 msgid "Fixed"
-msgstr "固定的"
+msgstr "固定"
 
-#: ../app/tools/gimp-tools.c:352
+#: ../app/tools/gimp-tools.c:351
 msgid ""
 "This tool has\n"
 "no options."
@@ -11331,167 +11616,185 @@ msgstr "噴槍(_A)"
 #: ../app/tools/gimpairbrushtool.c:86
 #, fuzzy
 msgid "Motion only"
-msgstr "唯讀"
+msgstr "僅動態"
 
-#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:211
+#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:228
 #: ../app/tools/gimpsmudgetool.c:91
 #, fuzzy
 msgid "Rate"
-msgstr "Rate"
+msgstr "比率"
 
 #: ../app/tools/gimpairbrushtool.c:97
 #, fuzzy
 msgid "Flow"
 msgstr "流動"
 
-#: ../app/tools/gimpaligntool.c:135 ../app/tools/gimpaligntool.c:780
-msgid "Align"
-msgstr "對齊"
-
-#: ../app/tools/gimpaligntool.c:136
-msgid "Alignment Tool: Align or arrange layers and other objects"
-msgstr "對齊工具:對齊或排列圖層與其他物件"
-
-#: ../app/tools/gimpaligntool.c:137
-msgid "_Align"
-msgstr "對齊(_A)"
-
-#: ../app/tools/gimpaligntool.c:599
-msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
-msgstr "點選圖層、路徑或參考線,或使用拖曳來選擇多個圖層"
-
-#: ../app/tools/gimpaligntool.c:608
-msgid "Click to pick this layer as first item"
-msgstr "按下這裡將這個圖層設為第一項目"
-
-#: ../app/tools/gimpaligntool.c:616
-msgid "Click to add this layer to the list"
-msgstr "按下這裡將這個圖層加入清單"
-
-#: ../app/tools/gimpaligntool.c:620
-msgid "Click to pick this guide as first item"
-msgstr "按下這裡將這個參考線設為第一項目"
+#: ../app/tools/gimpalignoptions.c:91
+#, fuzzy
+msgid "Reference image object a layer will be aligned on"
+msgstr "參照圖物件可對齊的圖層"
 
-#: ../app/tools/gimpaligntool.c:628
-msgid "Click to add this guide to the list"
-msgstr "按下這裡將這個參考線加入清單"
+#: ../app/tools/gimpalignoptions.c:98
+#, fuzzy
+msgid "Horizontal offset for distribution"
+msgstr "散布的水平偏移"
 
-#: ../app/tools/gimpaligntool.c:632
-msgid "Click to pick this path as first item"
-msgstr "按下這裡將這個路徑設為第一項目"
+#: ../app/tools/gimpalignoptions.c:104
+#, fuzzy
+msgid "Vertical offset for distribution"
+msgstr "散布的垂直偏移"
 
-#: ../app/tools/gimpaligntool.c:640
-msgid "Click to add this path to the list"
-msgstr "按下這裡將這個路徑加入清單"
+#: ../app/tools/gimpalignoptions.c:272 ../app/tools/gimpaligntool.c:124
+msgid "Align"
+msgstr "對齊"
 
-#: ../app/tools/gimpaligntool.c:792
+#: ../app/tools/gimpalignoptions.c:284
 msgid "Relative to:"
 msgstr "相對於:"
 
-#: ../app/tools/gimpaligntool.c:810
+#: ../app/tools/gimpalignoptions.c:298
 msgid "Align left edge of target"
 msgstr "對齊目標的左緣"
 
-#: ../app/tools/gimpaligntool.c:816
+#: ../app/tools/gimpalignoptions.c:302
 msgid "Align center of target"
 msgstr "對齊目標的中間"
 
-#: ../app/tools/gimpaligntool.c:822
+#: ../app/tools/gimpalignoptions.c:306
 msgid "Align right edge of target"
 msgstr "對齊目標的右緣"
 
-#: ../app/tools/gimpaligntool.c:832
+#: ../app/tools/gimpalignoptions.c:314
 msgid "Align top edge of target"
 msgstr "對齊目標的上緣"
 
-#: ../app/tools/gimpaligntool.c:838
+#: ../app/tools/gimpalignoptions.c:318
 msgid "Align middle of target"
 msgstr "對齊目標的中央"
 
-#: ../app/tools/gimpaligntool.c:844
+#: ../app/tools/gimpalignoptions.c:322
 msgid "Align bottom of target"
 msgstr "對齊目標的下緣"
 
-#: ../app/tools/gimpaligntool.c:848
+#: ../app/tools/gimpalignoptions.c:324
 msgid "Distribute"
 msgstr "分布"
 
-#: ../app/tools/gimpaligntool.c:862
+#: ../app/tools/gimpalignoptions.c:338
 msgid "Distribute left edges of targets"
 msgstr "分布於目標的左緣"
 
-#: ../app/tools/gimpaligntool.c:869
+#: ../app/tools/gimpalignoptions.c:342
 msgid "Distribute horizontal centers of targets"
 msgstr "分布於目標的中間"
 
-#: ../app/tools/gimpaligntool.c:876
+#: ../app/tools/gimpalignoptions.c:346
 msgid "Distribute right edges of targets"
 msgstr "分布於目標的右緣"
 
-#: ../app/tools/gimpaligntool.c:886
+#: ../app/tools/gimpalignoptions.c:354
 msgid "Distribute top edges of targets"
 msgstr "分布於目標的上緣"
 
-#: ../app/tools/gimpaligntool.c:893
+#: ../app/tools/gimpalignoptions.c:358
 msgid "Distribute vertical centers of targets"
 msgstr "分布於目標的中間"
 
-#: ../app/tools/gimpaligntool.c:899
+#: ../app/tools/gimpalignoptions.c:362
 msgid "Distribute bottoms of targets"
 msgstr "分布於目標的下緣"
 
-#: ../app/tools/gimpaligntool.c:907
+#: ../app/tools/gimpalignoptions.c:368
 msgid "Offset:"
 msgstr "偏移:"
 
-#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:285
+#: ../app/tools/gimpaligntool.c:125
+msgid "Alignment Tool: Align or arrange layers and other objects"
+msgstr "對齊工具:對齊或排列圖層與其他物件"
+
+#: ../app/tools/gimpaligntool.c:126
+msgid "_Align"
+msgstr "對齊(_A)"
+
+#: ../app/tools/gimpaligntool.c:549
+msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
+msgstr "點選圖層、路徑或參考線,或使用拖曳來選擇多個圖層"
+
+#: ../app/tools/gimpaligntool.c:557
+msgid "Click to pick this layer as first item"
+msgstr "按下這裡將這個圖層設為第一項目"
+
+#: ../app/tools/gimpaligntool.c:564
+msgid "Click to add this layer to the list"
+msgstr "按下這裡將這個圖層加入清單"
+
+#: ../app/tools/gimpaligntool.c:568
+msgid "Click to pick this guide as first item"
+msgstr "按下這裡將這個參考線設為第一項目"
+
+#: ../app/tools/gimpaligntool.c:575
+msgid "Click to add this guide to the list"
+msgstr "按下這裡將這個參考線加入清單"
+
+#: ../app/tools/gimpaligntool.c:579
+msgid "Click to pick this path as first item"
+msgstr "按下這裡將這個路徑設為第一項目"
+
+#: ../app/tools/gimpaligntool.c:586
+msgid "Click to add this path to the list"
+msgstr "按下這裡將這個路徑加入清單"
+
+#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:344
 msgid "Gradient"
 msgstr "漸層"
 
-#: ../app/tools/gimpblendoptions.c:230 ../app/widgets/gimpbrusheditor.c:145
+#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:139
 msgid "Shape:"
 msgstr "形狀:"
 
-#: ../app/tools/gimpblendoptions.c:237 ../app/tools/gimppaintoptions-gui.c:269
+#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:323
 msgid "Repeat:"
 msgstr "重複:"
 
-#: ../app/tools/gimpblendoptions.c:260
+#: ../app/tools/gimpblendoptions.c:261
 msgid "Adaptive supersampling"
 msgstr "最適性超倍率取樣"
 
-#: ../app/tools/gimpblendoptions.c:267
-#, fuzzy
+#: ../app/tools/gimpblendoptions.c:268
 msgid "Max depth"
-msgstr "最大深度:"
+msgstr "最大深度"
 
-#: ../app/tools/gimpblendtool.c:106
+#: ../app/tools/gimpblendtool.c:109
 msgid "Blend"
 msgstr "混色"
 
-#: ../app/tools/gimpblendtool.c:107
+#: ../app/tools/gimpblendtool.c:110
 msgid "Blend Tool: Fill selected area with a color gradient"
 msgstr "混色工具:用顏色漸層填充選取區域"
 
-#: ../app/tools/gimpblendtool.c:108
+#: ../app/tools/gimpblendtool.c:111
 msgid "Blen_d"
 msgstr "混色(_D)"
 
-#: ../app/tools/gimpblendtool.c:164
+#: ../app/tools/gimpblendtool.c:166
 msgid "Blend does not operate on indexed layers."
 msgstr "混色不適用於索引色的圖層。"
 
-#: ../app/tools/gimpblendtool.c:417 ../app/tools/gimppainttool.c:637
+#: ../app/tools/gimpblendtool.c:187
+msgid "No gradient available for use with this tool."
+msgstr "此工具沒有可以使用的灰階。"
+
+#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%s 可限定角度"
 
-#: ../app/tools/gimpblendtool.c:418
+#: ../app/tools/gimpblendtool.c:453
 #, c-format
 msgid "%s to move the whole line"
 msgstr "%s 會移動整條線"
 
-#: ../app/tools/gimpblendtool.c:422
+#: ../app/tools/gimpblendtool.c:457
 msgid "Blend: "
 msgstr "混色:"
 
@@ -11523,79 +11826,87 @@ msgstr "匯出亮度及對比設定值"
 msgid "Brightness-Contrast does not operate on indexed layers."
 msgstr "「亮度及對比」不適用於索引色圖層。"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:320
+#: ../app/tools/gimpbrightnesscontrasttool.c:318
 msgid "_Brightness:"
 msgstr "亮度(_B):"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:335
+#: ../app/tools/gimpbrightnesscontrasttool.c:331
 msgid "Con_trast:"
 msgstr "對比(_T):"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:349
+#: ../app/tools/gimpbrightnesscontrasttool.c:343
 msgid "Edit these Settings as Levels"
 msgstr "將這些設定值當作色階編輯"
 
-#: ../app/tools/gimpbucketfilloptions.c:100
+#: ../app/tools/gimpbucketfilloptions.c:93
+msgid "Which area will be filled"
+msgstr "要充填哪個區塊"
+
+#: ../app/tools/gimpbucketfilloptions.c:98
 msgid "Allow completely transparent regions to be filled"
 msgstr "允許將完全透明的區域填色"
 
-#: ../app/tools/gimpbucketfilloptions.c:106
+#: ../app/tools/gimpbucketfilloptions.c:104
 msgid "Base filled area on all visible layers"
 msgstr "所有可見的圖層上的基礎填滿區域"
 
-#: ../app/tools/gimpbucketfilloptions.c:112
+#: ../app/tools/gimpbucketfilloptions.c:110
 #: ../app/tools/gimpregionselectoptions.c:95
 msgid "Maximum color difference"
 msgstr "最大顏色差異"
 
+#: ../app/tools/gimpbucketfilloptions.c:115
+msgid "Criterion used for determining color similarity"
+msgstr ""
+
 #. fill type
-#: ../app/tools/gimpbucketfilloptions.c:227
+#: ../app/tools/gimpbucketfilloptions.c:229
 #, c-format
 msgid "Fill Type  (%s)"
 msgstr "填滿類型  (%s)"
 
 #. fill selection
-#: ../app/tools/gimpbucketfilloptions.c:242
+#: ../app/tools/gimpbucketfilloptions.c:244
 #, c-format
 msgid "Affected Area  (%s)"
 msgstr "影響區域  (%s)"
 
-#: ../app/tools/gimpbucketfilloptions.c:246
+#: ../app/tools/gimpbucketfilloptions.c:248
 msgid "Fill whole selection"
 msgstr "填滿整個選取區域"
 
-#: ../app/tools/gimpbucketfilloptions.c:247
+#: ../app/tools/gimpbucketfilloptions.c:249
 msgid "Fill similar colors"
 msgstr "只將近似的顏色填色"
 
-#: ../app/tools/gimpbucketfilloptions.c:256
+#: ../app/tools/gimpbucketfilloptions.c:258
 msgid "Finding Similar Colors"
 msgstr "尋找相近的顏色"
 
-#: ../app/tools/gimpbucketfilloptions.c:272
+#: ../app/tools/gimpbucketfilloptions.c:273
 msgid "Fill transparent areas"
 msgstr "將透明區域填色"
 
-#: ../app/tools/gimpbucketfilloptions.c:278 ../app/tools/gimpclonetool.c:113
-#: ../app/tools/gimpcolorpickeroptions.c:150 ../app/tools/gimphealtool.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:952
-#: ../app/tools/gimpregionselectoptions.c:208
+#: ../app/tools/gimpbucketfilloptions.c:279 ../app/tools/gimpclonetool.c:114
+#: ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:100
+#: ../app/tools/gimpperspectiveclonetool.c:904
+#: ../app/tools/gimpregionselectoptions.c:210
 msgid "Sample merged"
 msgstr "合併樣本"
 
-#: ../app/tools/gimpbucketfilloptions.c:297
+#: ../app/tools/gimpbucketfilloptions.c:298
 msgid "Fill by:"
 msgstr "填上:"
 
-#: ../app/tools/gimpbucketfilltool.c:85
+#: ../app/tools/gimpbucketfilltool.c:86
 msgid "Bucket Fill"
 msgstr "填色"
 
-#: ../app/tools/gimpbucketfilltool.c:86
+#: ../app/tools/gimpbucketfilltool.c:87
 msgid "Bucket Fill Tool: Fill selected area with a color or pattern"
 msgstr "填色工具:將選取的區域填上顏色或圖樣"
 
-#: ../app/tools/gimpbucketfilltool.c:87
+#: ../app/tools/gimpbucketfilltool.c:88
 msgid "_Bucket Fill"
 msgstr "填色(_B)"
 
@@ -11616,33 +11927,29 @@ msgctxt "command"
 msgid "Select by Color"
 msgstr "依顏色選取"
 
-#: ../app/tools/gimpcageoptions.c:144
-msgid "Fill from first point"
-msgstr ""
-
-#: ../app/tools/gimpcagetool.c:136
+#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1128
 #, fuzzy
 msgid "Cage Transform"
 msgstr "變換"
 
-#: ../app/tools/gimpcagetool.c:137
+#: ../app/tools/gimpcagetool.c:159
 msgid "Cage Transform: Deform a selection with a cage"
 msgstr ""
 
-#: ../app/tools/gimpcagetool.c:138
+#: ../app/tools/gimpcagetool.c:160
 #, fuzzy
 msgid "_Cage Transform"
 msgstr "變換(_T)"
 
-#: ../app/tools/gimpcagetool.c:402
+#: ../app/tools/gimpcagetool.c:357
 msgid "Press ENTER to commit the transform"
-msgstr ""
+msgstr "按下 Enter 鍵來提交變換"
 
-#: ../app/tools/gimpcagetool.c:680
-msgid "Coefficient computation"
+#: ../app/tools/gimpcagetool.c:1069
+msgid "Computing Cage Coefficients"
 msgstr ""
 
-#: ../app/tools/gimpcagetool.c:783
+#: ../app/tools/gimpcagetool.c:1246
 #, fuzzy
 msgid "Cage transform"
 msgstr "變換"
@@ -11659,22 +11966,23 @@ msgstr "仿製(_C)"
 msgid "Click to clone"
 msgstr "點選以仿製"
 
-#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:90
+#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:91
 #, c-format
 msgid "%s to set a new clone source"
 msgstr "%s 可以設定新的複製來源"
 
-#: ../app/tools/gimpclonetool.c:89
+#. Translators: the translation of "Click" must be the first word
+#: ../app/tools/gimpclonetool.c:90
 msgid "Click to set a new clone source"
 msgstr "按下這裡可以設定新的複製來源"
 
-#: ../app/tools/gimpclonetool.c:108
-#: ../app/tools/gimpperspectiveclonetool.c:947
+#: ../app/tools/gimpclonetool.c:109
+#: ../app/tools/gimpperspectiveclonetool.c:899
 msgid "Source"
 msgstr "來源"
 
-#: ../app/tools/gimpclonetool.c:130 ../app/tools/gimphealtool.c:110
-#: ../app/tools/gimpperspectiveclonetool.c:969
+#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:109
+#: ../app/tools/gimpperspectiveclonetool.c:918
 msgid "Alignment:"
 msgstr "排列:"
 
@@ -11706,49 +12014,49 @@ msgstr "匯出色彩平衡設定值"
 msgid "Color Balance operates only on RGB color layers."
 msgstr "色彩平衡只適用於 RGB 色系的圖層。"
 
-#: ../app/tools/gimpcolorbalancetool.c:267
+#: ../app/tools/gimpcolorbalancetool.c:266
 msgid "Select Range to Adjust"
 msgstr "選擇要調整的範圍"
 
-#: ../app/tools/gimpcolorbalancetool.c:276 ../app/tools/gimplevelstool.c:172
+#: ../app/tools/gimpcolorbalancetool.c:275 ../app/tools/gimplevelstool.c:172
 msgid "Adjust Color Levels"
 msgstr "調整色階"
 
-#: ../app/tools/gimpcolorbalancetool.c:293
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/tools/gimpcolorbalancetool.c:292
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "Cyan"
 msgstr "青"
 
-#: ../app/tools/gimpcolorbalancetool.c:293
-#: ../app/tools/gimphuesaturationtool.c:249
+#: ../app/tools/gimpcolorbalancetool.c:292
+#: ../app/tools/gimphuesaturationtool.c:248
 msgid "Red"
 msgstr "紅"
 
-#: ../app/tools/gimpcolorbalancetool.c:302
-#: ../app/tools/gimphuesaturationtool.c:254
+#: ../app/tools/gimpcolorbalancetool.c:301
+#: ../app/tools/gimphuesaturationtool.c:253
 msgid "Magenta"
 msgstr "洋紅"
 
-#: ../app/tools/gimpcolorbalancetool.c:302
-#: ../app/tools/gimphuesaturationtool.c:251
+#: ../app/tools/gimpcolorbalancetool.c:301
+#: ../app/tools/gimphuesaturationtool.c:250
 msgid "Green"
 msgstr "綠"
 
-#: ../app/tools/gimpcolorbalancetool.c:311
-#: ../app/tools/gimphuesaturationtool.c:250
+#: ../app/tools/gimpcolorbalancetool.c:310
+#: ../app/tools/gimphuesaturationtool.c:249
 msgid "Yellow"
 msgstr "黃"
 
-#: ../app/tools/gimpcolorbalancetool.c:311
-#: ../app/tools/gimphuesaturationtool.c:253
+#: ../app/tools/gimpcolorbalancetool.c:310
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "Blue"
 msgstr "藍"
 
-#: ../app/tools/gimpcolorbalancetool.c:322
+#: ../app/tools/gimpcolorbalancetool.c:321
 msgid "R_eset Range"
 msgstr "重設範圍(_E)"
 
-#: ../app/tools/gimpcolorbalancetool.c:331
+#: ../app/tools/gimpcolorbalancetool.c:330
 msgid "Preserve _luminosity"
 msgstr "保留亮度(_L)"
 
@@ -11780,22 +12088,22 @@ msgstr "匯出著色設定值"
 msgid "Colorize operates only on RGB color layers."
 msgstr "著色只適用於 RGB 色系的圖層。"
 
-#: ../app/tools/gimpcolorizetool.c:225
+#: ../app/tools/gimpcolorizetool.c:224
 msgid "Select Color"
 msgstr "選取顏色"
 
-#: ../app/tools/gimpcolorizetool.c:242
-#: ../app/tools/gimphuesaturationtool.c:385
+#: ../app/tools/gimpcolorizetool.c:241
+#: ../app/tools/gimphuesaturationtool.c:381
 msgid "_Hue:"
 msgstr "色相(_H):"
 
-#: ../app/tools/gimpcolorizetool.c:257
-#: ../app/tools/gimphuesaturationtool.c:423
+#: ../app/tools/gimpcolorizetool.c:254
+#: ../app/tools/gimphuesaturationtool.c:413
 msgid "_Saturation:"
 msgstr "飽和度(_S):"
 
-#: ../app/tools/gimpcolorizetool.c:272
-#: ../app/tools/gimphuesaturationtool.c:404
+#: ../app/tools/gimpcolorizetool.c:267
+#: ../app/tools/gimphuesaturationtool.c:397
 msgid "_Lightness:"
 msgstr "亮度(_L):"
 
@@ -11804,8 +12112,9 @@ msgid "Color Picker Average Radius"
 msgstr "顏色挑選器平均半徑"
 
 #: ../app/tools/gimpcoloroptions.c:157
-#: ../app/tools/gimprectangleselectoptions.c:160
-#: ../app/tools/gimpselectionoptions.c:270
+#: ../app/tools/gimprectangleselectoptions.c:163
+#: ../app/tools/gimpselectionoptions.c:277
+#: ../app/widgets/gimpbrusheditor.c:155
 msgid "Radius"
 msgstr "半徑"
 
@@ -11813,64 +12122,79 @@ msgstr "半徑"
 msgid "Sample average"
 msgstr "平均取樣"
 
+#: ../app/tools/gimpcolorpickeroptions.c:68
+#, fuzzy
+#| msgctxt "cursor-info-action"
+#| msgid "Use the composite color of all visible layers"
+msgid "Use accumulated color value from all composited visible layers"
+msgstr "使用所有看得見圖層的複合色"
+
+#: ../app/tools/gimpcolorpickeroptions.c:74
+msgid "Choose what color picker will do"
+msgstr "選取顏色挑選器的動作"
+
+#: ../app/tools/gimpcolorpickeroptions.c:80
+msgid ""
+"Open a floating dialog to view picked color values in various color models"
+msgstr ""
+
 #. the pick FG/BG frame
-#: ../app/tools/gimpcolorpickeroptions.c:155
+#: ../app/tools/gimpcolorpickeroptions.c:163
 #, c-format
 msgid "Pick Mode  (%s)"
 msgstr "挑選模式  (%s)"
 
 #. the use_info_window toggle button
-#: ../app/tools/gimpcolorpickeroptions.c:164
+#: ../app/tools/gimpcolorpickeroptions.c:172
 #, c-format
 msgid "Use info window  (%s)"
 msgstr "使用資訊視窗  (%s)"
 
-#: ../app/tools/gimpcolorpickertool.c:96
+#: ../app/tools/gimpcolorpickertool.c:93
 msgid "Color Picker"
 msgstr "顏色挑選器"
 
-#: ../app/tools/gimpcolorpickertool.c:97
+#: ../app/tools/gimpcolorpickertool.c:94
 msgid "Color Picker Tool: Set colors from image pixels"
 msgstr "顏色挑選工具:從圖片像素選取顏色"
 
-#: ../app/tools/gimpcolorpickertool.c:98
+#: ../app/tools/gimpcolorpickertool.c:95
 msgid "C_olor Picker"
 msgstr "顏色挑選器(_O)"
 
-#: ../app/tools/gimpcolorpickertool.c:242
+#: ../app/tools/gimpcolorpickertool.c:231
 msgid "Click in any image to view its color"
 msgstr "點選Gimp開啟的任何圖片以檢視它的顏色"
 
-#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:493
+#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478
 msgid "Click in any image to pick the foreground color"
 msgstr "點選Gimp開啟的任何圖片以挑選前景顏色"
 
-#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:499
+#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484
 msgid "Click in any image to pick the background color"
 msgstr "點選Gimp開啟的任何圖片以挑選背景顏色"
 
-#: ../app/tools/gimpcolorpickertool.c:265
+#: ../app/tools/gimpcolorpickertool.c:254
 msgid "Click in any image to add the color to the palette"
 msgstr "點選Gimp開啟的任何圖片以將顏色加入調色盤"
 
-#. tool->display->shell
-#: ../app/tools/gimpcolorpickertool.c:318
+#: ../app/tools/gimpcolorpickertool.c:309
 msgid "Color Picker Information"
 msgstr "有關顏色挑選器的資訊"
 
-#: ../app/tools/gimpcolortool.c:228 ../app/tools/gimpcolortool.c:401
+#: ../app/tools/gimpcolortool.c:230 ../app/tools/gimpcolortool.c:403
 msgid "Move Sample Point: "
 msgstr "移動取樣點:"
 
-#: ../app/tools/gimpcolortool.c:393
+#: ../app/tools/gimpcolortool.c:395
 msgid "Remove Sample Point"
 msgstr "移除取樣點"
 
-#: ../app/tools/gimpcolortool.c:394
+#: ../app/tools/gimpcolortool.c:396
 msgid "Cancel Sample Point"
 msgstr "取消取樣點"
 
-#: ../app/tools/gimpcolortool.c:402
+#: ../app/tools/gimpcolortool.c:404
 msgid "Add Sample Point: "
 msgstr "加入取樣點:"
 
@@ -11886,124 +12210,140 @@ msgstr "模糊/銳利化工具:使用筆刷選擇性的模糊或銳利化"
 msgid "Bl_ur / Sharpen"
 msgstr "模糊化/銳利化(_U)"
 
-#: ../app/tools/gimpconvolvetool.c:170
+#: ../app/tools/gimpconvolvetool.c:184
 msgid "Click to blur"
 msgstr "點選使其模糊"
 
-#: ../app/tools/gimpconvolvetool.c:171
+#: ../app/tools/gimpconvolvetool.c:185
 msgid "Click to blur the line"
 msgstr "請按這裡以模糊此線條"
 
-#: ../app/tools/gimpconvolvetool.c:172
+#: ../app/tools/gimpconvolvetool.c:186
 #, c-format
 msgid "%s to sharpen"
 msgstr "讓 %s 更銳利"
 
-#: ../app/tools/gimpconvolvetool.c:176
+#: ../app/tools/gimpconvolvetool.c:190
 msgid "Click to sharpen"
 msgstr "請按這裡銳利化"
 
-#: ../app/tools/gimpconvolvetool.c:177
+#: ../app/tools/gimpconvolvetool.c:191
 msgid "Click to sharpen the line"
 msgstr "請按這裡讓線條更銳利"
 
-#: ../app/tools/gimpconvolvetool.c:178
+#: ../app/tools/gimpconvolvetool.c:192
 #, c-format
 msgid "%s to blur"
 msgstr "讓 %s 更模糊"
 
 #. the type radio box
-#: ../app/tools/gimpconvolvetool.c:199
+#: ../app/tools/gimpconvolvetool.c:216
 #, c-format
 msgid "Convolve Type  (%s)"
 msgstr "捲積類型 (%s)"
 
-#: ../app/tools/gimpcropoptions.c:160
+#: ../app/tools/gimpcropoptions.c:76
+#: ../app/tools/gimprectangleselectoptions.c:77
+#, fuzzy
+#| msgctxt "select-action"
+#| msgid "Invert the selection"
+msgid "Dim everything outside selection"
+msgstr "選取和原本相反的區域"
+
+#: ../app/tools/gimpcropoptions.c:82
+msgid "Crop only currently selected layer"
+msgstr "僅裁剪目前選取的圖層"
+
+#: ../app/tools/gimpcropoptions.c:88
+msgid "Allow resizing canvas by dragging cropping frame beyond image boundary"
+msgstr ""
+
+#: ../app/tools/gimpcropoptions.c:164
 msgid "Current layer only"
 msgstr "僅適用於目前圖層"
 
-#: ../app/tools/gimpcropoptions.c:166
+#: ../app/tools/gimpcropoptions.c:170
 msgid "Allow growing"
 msgstr "允許增大"
 
-#: ../app/tools/gimpcroptool.c:128
+#: ../app/tools/gimpcroptool.c:117
 msgid "Crop"
 msgstr "裁剪"
 
-#: ../app/tools/gimpcroptool.c:129
+#: ../app/tools/gimpcroptool.c:118
 msgid "Crop Tool: Remove edge areas from image or layer"
 msgstr "剪裁工具:自圖片或圖層移除邊緣區域"
 
-#: ../app/tools/gimpcroptool.c:130
+#: ../app/tools/gimpcroptool.c:119
 msgid "_Crop"
 msgstr "剪裁(_C)"
 
-#: ../app/tools/gimpcroptool.c:272
+#: ../app/tools/gimpcroptool.c:253
 msgid "Click or press Enter to crop"
 msgstr "點選或按 Enter 進行剪裁"
 
-#: ../app/tools/gimpcroptool.c:335
+#: ../app/tools/gimpcroptool.c:318
 msgid "There is no active layer to crop."
 msgstr "目前沒有任何使用中的圖層可以剪下。"
 
-#: ../app/tools/gimpcurvestool.c:140
+#: ../app/tools/gimpcurvestool.c:143
 msgid "Curves"
 msgstr "曲線"
 
-#: ../app/tools/gimpcurvestool.c:141
+#: ../app/tools/gimpcurvestool.c:144
 msgid "Curves Tool: Adjust color curves"
 msgstr "曲線工具:調整色彩曲線"
 
-#: ../app/tools/gimpcurvestool.c:142
+#: ../app/tools/gimpcurvestool.c:145
 msgid "_Curves..."
 msgstr "曲線(_C)..."
 
-#: ../app/tools/gimpcurvestool.c:168
+#: ../app/tools/gimpcurvestool.c:171
 msgid "Adjust Color Curves"
 msgstr "調整色彩曲線"
 
-#: ../app/tools/gimpcurvestool.c:170
+#: ../app/tools/gimpcurvestool.c:173
 msgid "Import Curves"
 msgstr "匯入曲線"
 
-#: ../app/tools/gimpcurvestool.c:171
+#: ../app/tools/gimpcurvestool.c:174
 msgid "Export Curves"
 msgstr "匯出曲線"
 
-#: ../app/tools/gimpcurvestool.c:222
+#: ../app/tools/gimpcurvestool.c:225
 msgid "Curves does not operate on indexed layers."
 msgstr "曲線不適用於索引色的圖層。"
 
-#: ../app/tools/gimpcurvestool.c:330
+#: ../app/tools/gimpcurvestool.c:333
 msgid "Click to add a control point"
 msgstr "按下這裡加入控制點"
 
-#: ../app/tools/gimpcurvestool.c:335
+#: ../app/tools/gimpcurvestool.c:338
 msgid "Click to add control points to all channels"
 msgstr "點選以加入控制點到所有色版"
 
-#: ../app/tools/gimpcurvestool.c:340
+#: ../app/tools/gimpcurvestool.c:343
 msgid "Click to locate on curve (try Shift, Ctrl)"
-msgstr ""
+msgstr "點選以定位曲線 (可試試 Shift、Ctrl 鍵)"
 
-#: ../app/tools/gimpcurvestool.c:453 ../app/tools/gimplevelstool.c:384
+#: ../app/tools/gimpcurvestool.c:456 ../app/tools/gimplevelstool.c:384
 msgid "Cha_nnel:"
 msgstr "色版(_N):"
 
-#: ../app/tools/gimpcurvestool.c:479 ../app/tools/gimplevelstool.c:408
+#: ../app/tools/gimpcurvestool.c:482 ../app/tools/gimplevelstool.c:408
 msgid "R_eset Channel"
 msgstr "重設色版(_E)"
 
-#: ../app/tools/gimpcurvestool.c:571 ../app/widgets/gimpdeviceinfoeditor.c:463
+#: ../app/tools/gimpcurvestool.c:576 ../app/widgets/gimpdeviceinfoeditor.c:461
 msgid "Curve _type:"
 msgstr "曲線類型(_T):"
 
-#: ../app/tools/gimpcurvestool.c:646 ../app/tools/gimplevelstool.c:756
+#: ../app/tools/gimpcurvestool.c:651 ../app/tools/gimplevelstool.c:756
 #, c-format
 msgid "Could not read header from '%s': %s"
 msgstr "無法從“%s”讀取標頭:%s"
 
-#: ../app/tools/gimpcurvestool.c:719
+#: ../app/tools/gimpcurvestool.c:724
 msgid "Use _old curves file format"
 msgstr "使用舊的曲線檔案格式(_O)"
 
@@ -12039,71 +12379,70 @@ msgstr "漂白 / 燻黑工具:使用筆刷來增亮或變暗"
 msgid "Dod_ge / Burn"
 msgstr "漂白 / 燻黑(_G)"
 
-#: ../app/tools/gimpdodgeburntool.c:173
+#: ../app/tools/gimpdodgeburntool.c:187
 msgid "Click to dodge"
 msgstr "請按這裡漂白"
 
-#: ../app/tools/gimpdodgeburntool.c:174
+#: ../app/tools/gimpdodgeburntool.c:188
 msgid "Click to dodge the line"
 msgstr "請按這裡漂白線條"
 
-#: ../app/tools/gimpdodgeburntool.c:175
+#: ../app/tools/gimpdodgeburntool.c:189
 #, c-format
 msgid "%s to burn"
 msgstr "將 %s 燻黑"
 
-#: ../app/tools/gimpdodgeburntool.c:179
+#: ../app/tools/gimpdodgeburntool.c:193
 msgid "Click to burn"
 msgstr "請按這裡燻黑"
 
-#: ../app/tools/gimpdodgeburntool.c:180
+#: ../app/tools/gimpdodgeburntool.c:194
 msgid "Click to burn the line"
 msgstr "請按這裡燻黑線條"
 
-#: ../app/tools/gimpdodgeburntool.c:181
+#: ../app/tools/gimpdodgeburntool.c:195
 #, c-format
 msgid "%s to dodge"
 msgstr "將 %s 漂白"
 
 #. the type (dodge or burn)
-#: ../app/tools/gimpdodgeburntool.c:202
+#: ../app/tools/gimpdodgeburntool.c:219
 #, c-format
 msgid "Type  (%s)"
 msgstr "類型  (%s)"
 
 #. mode (highlights, midtones, or shadows)
-#: ../app/tools/gimpdodgeburntool.c:213
+#: ../app/tools/gimpdodgeburntool.c:230
 msgid "Range"
 msgstr "範圍"
 
-#: ../app/tools/gimpdodgeburntool.c:219
-#, fuzzy
+#: ../app/tools/gimpdodgeburntool.c:236
 msgid "Exposure"
-msgstr "曝光度:"
+msgstr "曝光"
 
-#: ../app/tools/gimpeditselectiontool.c:239
+#: ../app/tools/gimpeditselectiontool.c:242
 msgid "Move Selection"
 msgstr "移動選取區域"
 
-#: ../app/tools/gimpeditselectiontool.c:243
-#: ../app/tools/gimpeditselectiontool.c:1235
+#: ../app/tools/gimpeditselectiontool.c:246
+#: ../app/tools/gimpeditselectiontool.c:1241
 msgid "Move Floating Selection"
 msgstr "移動浮動選取區域"
 
-#: ../app/tools/gimpeditselectiontool.c:452
-#: ../app/tools/gimpeditselectiontool.c:727
+#: ../app/tools/gimpeditselectiontool.c:455
+#: ../app/tools/gimpeditselectiontool.c:732
 msgid "Move: "
 msgstr "移動:"
 
-#: ../app/tools/gimpellipseselecttool.c:68
+#: ../app/tools/gimpellipseselecttool.c:66
 msgid "Ellipse Select"
 msgstr "橢圓形選取"
 
-#: ../app/tools/gimpellipseselecttool.c:69
+#: ../app/tools/gimpellipseselecttool.c:67
 msgid "Ellipse Select Tool: Select an elliptical region"
 msgstr "橢圓形選取工具:選取一個橢圓形區域 "
 
-#: ../app/tools/gimpellipseselecttool.c:70
+#: ../app/tools/gimpellipseselecttool.c:68
 msgid "_Ellipse Select"
 msgstr "橢圓形選取(_E)"
 
@@ -12134,31 +12473,48 @@ msgstr "%s 以挑選背景顏色"
 msgid "Anti erase  (%s)"
 msgstr "取消擦去  (%s)"
 
-#: ../app/tools/gimpflipoptions.c:129
+#: ../app/tools/gimpflipoptions.c:66
+msgid "Direction of flipping"
+msgstr "翻轉的方向"
+
+#: ../app/tools/gimpflipoptions.c:133
 msgid "Affect:"
 msgstr "效果:"
 
 #. tool toggle
-#: ../app/tools/gimpflipoptions.c:138
+#: ../app/tools/gimpflipoptions.c:142
 #, c-format
 msgid "Flip Type  (%s)"
 msgstr "翻轉類型  (%s)"
 
-#: ../app/tools/gimpfliptool.c:79
+#: ../app/tools/gimpfliptool.c:84
 msgid "Flip"
 msgstr "翻轉"
 
-#: ../app/tools/gimpfliptool.c:80
+#: ../app/tools/gimpfliptool.c:85
 msgid ""
 "Flip Tool: Reverse the layer, selection or path horizontally or vertically"
 msgstr "翻轉工具:水平或垂直反轉圖層、選取區域或路徑"
 
-#: ../app/tools/gimpfliptool.c:82
+#: ../app/tools/gimpfliptool.c:87
 msgid "_Flip"
 msgstr "翻轉(_F)"
 
-#: ../app/tools/gimpfliptool.c:116
-msgctxt "command"
+#: ../app/tools/gimpfliptool.c:187
+msgctxt "undo-type"
+msgid "Flip horizontally"
+msgstr "水平翻轉"
+
+#: ../app/tools/gimpfliptool.c:190
+msgctxt "undo-type"
+msgid "Flip vertically"
+msgstr "垂直翻轉"
+
+#. probably this is not actually reached today, but
+#. * could be if someone defined FLIP_DIAGONAL, say...
+#.
+#: ../app/tools/gimpfliptool.c:196
+msgctxt "undo-desc"
 msgid "Flip"
 msgstr "翻轉"
 
@@ -12166,123 +12522,133 @@ msgstr "翻轉"
 msgid "Select a single contiguous area"
 msgstr "選取單一連續的區域"
 
-#: ../app/tools/gimpforegroundselectoptions.c:96
+#: ../app/tools/gimpforegroundselectoptions.c:91
+msgid ""
+"Paint over areas to mark color values for inclusion or exclusion from "
+"selection"
+msgstr ""
+
+#: ../app/tools/gimpforegroundselectoptions.c:98
 msgid "Size of the brush used for refinements"
 msgstr "用來精製的筆刷大小"
 
-#: ../app/tools/gimpforegroundselectoptions.c:102
+#: ../app/tools/gimpforegroundselectoptions.c:104
 msgid ""
 "Smaller values give a more accurate selection border but may introduce holes "
 "in the selection"
 msgstr "較小的數值可以產生更精確的選取區域框線,但也會造成選取區域出現漏洞"
 
-#: ../app/tools/gimpforegroundselectoptions.c:121
+#: ../app/tools/gimpforegroundselectoptions.c:112
+msgid "Color of selection preview mask"
+msgstr "選取區域預覽遮罩的色彩"
+
+#: ../app/tools/gimpforegroundselectoptions.c:124
 msgid "Sensitivity for brightness component"
 msgstr "亮度元素的靈敏度"
 
-#: ../app/tools/gimpforegroundselectoptions.c:127
+#: ../app/tools/gimpforegroundselectoptions.c:130
 msgid "Sensitivity for red/green component"
 msgstr "紅/綠元素的靈敏度"
 
-#: ../app/tools/gimpforegroundselectoptions.c:133
+#: ../app/tools/gimpforegroundselectoptions.c:136
 msgid "Sensitivity for yellow/blue component"
 msgstr "黃/藍元素的靈敏度"
 
 #. single / multiple objects
-#: ../app/tools/gimpforegroundselectoptions.c:276
+#: ../app/tools/gimpforegroundselectoptions.c:281
 msgid "Contiguous"
 msgstr "連續"
 
 #. foreground / background
-#: ../app/tools/gimpforegroundselectoptions.c:281
+#: ../app/tools/gimpforegroundselectoptions.c:286
 #, c-format
 msgid "Interactive refinement  (%s)"
 msgstr "互動式精製 (%s)"
 
-#: ../app/tools/gimpforegroundselectoptions.c:285
+#: ../app/tools/gimpforegroundselectoptions.c:290
 msgid "Mark background"
 msgstr "標記為背景"
 
-#: ../app/tools/gimpforegroundselectoptions.c:286
+#: ../app/tools/gimpforegroundselectoptions.c:291
 msgid "Mark foreground"
 msgstr "標記為前景"
 
-#: ../app/tools/gimpforegroundselectoptions.c:302
+#: ../app/tools/gimpforegroundselectoptions.c:307
 msgid "Small brush"
 msgstr "小筆刷"
 
-#: ../app/tools/gimpforegroundselectoptions.c:310
+#: ../app/tools/gimpforegroundselectoptions.c:315
 msgid "Large brush"
 msgstr "大筆刷"
 
-#: ../app/tools/gimpforegroundselectoptions.c:334
+#: ../app/tools/gimpforegroundselectoptions.c:338
 msgid "Smoothing:"
 msgstr "平滑化:"
 
-#: ../app/tools/gimpforegroundselectoptions.c:340
+#: ../app/tools/gimpforegroundselectoptions.c:344
 msgid "Preview color:"
 msgstr "預覽顏色:"
 
 #. granularity
-#: ../app/tools/gimpforegroundselectoptions.c:343
+#: ../app/tools/gimpforegroundselectoptions.c:347
 msgid "Color Sensitivity"
 msgstr "顏色靈敏度"
 
-#: ../app/tools/gimpforegroundselecttool.c:145
+#: ../app/tools/gimpforegroundselecttool.c:144
 msgid "Foreground Select"
 msgstr "前景選取"
 
-#: ../app/tools/gimpforegroundselecttool.c:146
+#: ../app/tools/gimpforegroundselecttool.c:145
 msgid "Foreground Select Tool: Select a region containing foreground objects"
 msgstr "前景選取工具:選取包含前景物件的區域"
 
-#: ../app/tools/gimpforegroundselecttool.c:147
+#: ../app/tools/gimpforegroundselecttool.c:146
 msgid "F_oreground Select"
 msgstr "前景選取(_O)"
 
-#: ../app/tools/gimpforegroundselecttool.c:314
+#: ../app/tools/gimpforegroundselecttool.c:304
 msgid "Add more strokes or press Enter to accept the selection"
 msgstr "加入更多的筆劃或按下 Enter 套用選取區域"
 
-#: ../app/tools/gimpforegroundselecttool.c:316
+#: ../app/tools/gimpforegroundselecttool.c:306
 msgid "Mark foreground by painting on the object to extract"
 msgstr "在物件上繪畫以標記出要提取的前景"
 
-#: ../app/tools/gimpforegroundselecttool.c:327
+#: ../app/tools/gimpforegroundselecttool.c:311
 msgid "Roughly outline the object to extract"
 msgstr "粗略地描畫物件的輪廓以提取"
 
-#: ../app/tools/gimpforegroundselecttool.c:779
+#: ../app/tools/gimpforegroundselecttool.c:753
 msgctxt "command"
 msgid "Foreground Select"
 msgstr "前景選取"
 
-#: ../app/tools/gimpfreeselecttool.c:199
+#: ../app/tools/gimpfreeselecttool.c:197
 msgid ""
 "Free Select Tool: Select a hand-drawn region with free and polygonal segments"
 msgstr "自由選取工具:以手繪方式選取任意和多邊形片段的區域"
 
-#: ../app/tools/gimpfreeselecttool.c:200
+#: ../app/tools/gimpfreeselecttool.c:198
 msgid "_Free Select"
 msgstr "自由選取(_F)"
 
-#: ../app/tools/gimpfreeselecttool.c:1119
+#: ../app/tools/gimpfreeselecttool.c:1030
 msgid "Click to complete selection"
 msgstr "請按這裡完成選取區域"
 
-#: ../app/tools/gimpfreeselecttool.c:1123
+#: ../app/tools/gimpfreeselecttool.c:1034
 msgid "Click-Drag to move segment vertex"
 msgstr "按下後拖曳可以移動區段端點"
 
-#: ../app/tools/gimpfreeselecttool.c:1128
+#: ../app/tools/gimpfreeselecttool.c:1039
 msgid "Return commits, Escape cancels, Backspace removes last segment"
 msgstr "Enter 為送出、Escape 為取消、Backspace 為移除上一個區段"
 
-#: ../app/tools/gimpfreeselecttool.c:1132
+#: ../app/tools/gimpfreeselecttool.c:1043
 msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
 msgstr "拖曳可加入自由區段,點選會加入多邊形區段"
 
-#: ../app/tools/gimpfreeselecttool.c:1633
+#: ../app/tools/gimpfreeselecttool.c:1562
 msgctxt "command"
 msgid "Free Select"
 msgstr "智慧型選取"
@@ -12320,16 +12686,16 @@ msgstr "_GEGL 操作..."
 msgid "GEGL operations do not operate on indexed layers."
 msgstr "GEGL 操作不適用於索引色的圖層。"
 
-#: ../app/tools/gimpgegltool.c:371
+#: ../app/tools/gimpgegltool.c:378
 msgid "_Operation:"
 msgstr "操作(_O):"
 
 #. The options vbox
-#: ../app/tools/gimpgegltool.c:430
+#: ../app/tools/gimpgegltool.c:437
 msgid "Operation Settings"
 msgstr "操作設定"
 
-#: ../app/tools/gimpgegltool.c:435
+#: ../app/tools/gimpgegltool.c:442
 #, fuzzy
 msgid "Select an operation from the list above"
 msgstr "請在以下的清單中選取項目。"
@@ -12346,12 +12712,13 @@ msgstr "修補(_H)"
 msgid "Click to heal"
 msgstr "點選以開始修補"
 
-#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:81
+#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:82
 #, c-format
 msgid "%s to set a new heal source"
 msgstr "%s 設定新的修補來源"
 
-#: ../app/tools/gimphealtool.c:80
+#. Translators: the translation of "Click" must be the first word
+#: ../app/tools/gimphealtool.c:81
 msgid "Click to set a new heal source"
 msgstr "按下這裡可以設定新的修補來源"
 
@@ -12383,64 +12750,64 @@ msgstr "匯出色相及飽和度設定值"
 msgid "Hue-Saturation operates only on RGB color layers."
 msgstr "「色相及飽和度」只適用於 RGB 色系的圖層。"
 
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/tools/gimphuesaturationtool.c:247
 msgid "M_aster"
 msgstr "主要(_A)"
 
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/tools/gimphuesaturationtool.c:247
 msgid "Adjust all colors"
 msgstr "調整所有顏色"
 
-#: ../app/tools/gimphuesaturationtool.c:249
+#: ../app/tools/gimphuesaturationtool.c:248
 msgid "_R"
 msgstr "_R"
 
-#: ../app/tools/gimphuesaturationtool.c:250
+#: ../app/tools/gimphuesaturationtool.c:249
 msgid "_Y"
 msgstr "_Y"
 
-#: ../app/tools/gimphuesaturationtool.c:251
+#: ../app/tools/gimphuesaturationtool.c:250
 msgid "_G"
 msgstr "_G"
 
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "_C"
 msgstr "_C"
 
-#: ../app/tools/gimphuesaturationtool.c:253
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "_B"
 msgstr "_B"
 
-#: ../app/tools/gimphuesaturationtool.c:254
+#: ../app/tools/gimphuesaturationtool.c:253
 msgid "_M"
 msgstr "_M"
 
-#: ../app/tools/gimphuesaturationtool.c:259
+#: ../app/tools/gimphuesaturationtool.c:258
 msgid "Select Primary Color to Adjust"
 msgstr "選取要調整的主要顏色"
 
-#: ../app/tools/gimphuesaturationtool.c:349
+#: ../app/tools/gimphuesaturationtool.c:348
 msgid "_Overlap:"
 msgstr "疊加(_O):"
 
-#: ../app/tools/gimphuesaturationtool.c:368
+#: ../app/tools/gimphuesaturationtool.c:364
 msgid "Adjust Selected Color"
 msgstr "調整選取的顏色"
 
-#: ../app/tools/gimphuesaturationtool.c:444
+#: ../app/tools/gimphuesaturationtool.c:431
 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:223
 #, c-format
 msgid "Settings saved to '%s'"
 msgstr "設定值已儲存為“%s”"
 
-#: ../app/tools/gimpimagemaptool.c:368
+#: ../app/tools/gimpimagemaptool.c:363
 msgid "_Preview"
 msgstr "預覽(_P)"
 
@@ -12450,13 +12817,13 @@ msgid "Adjustment"
 msgstr "調整"
 
 #: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87
-#: ../app/tools/gimppaintoptions-gui.c:127
-#, fuzzy
+#: ../app/tools/gimppaintoptions-gui.c:132
 msgid "Size"
 msgstr "大小"
 
 #: ../app/tools/gimpinkoptions-gui.c:71
-#: ../app/tools/gimppaintoptions-gui.c:153
+#: ../app/tools/gimppaintoptions-gui.c:181
+#: ../app/widgets/gimpbrusheditor.c:199
 msgid "Angle"
 msgstr "角度"
 
@@ -12466,8 +12833,8 @@ msgid "Sensitivity"
 msgstr "靈敏度"
 
 #: ../app/tools/gimpinkoptions-gui.c:94
-#: ../app/widgets/gimpdynamicseditor.c:146
-#: ../app/widgets/gimpdynamicsoutputeditor.c:233
+#: ../app/widgets/gimpdynamicseditor.c:144
+#: ../app/widgets/gimpdynamicsoutputeditor.c:72
 msgid "Tilt"
 msgstr "傾斜"
 
@@ -12488,48 +12855,55 @@ msgstr "墨水筆工具:書法風格的上色工具"
 msgid "In_k"
 msgstr "墨水筆(_K)"
 
-#: ../app/tools/gimpiscissorsoptions.c:125
+#: ../app/tools/gimpiscissorsoptions.c:68
+#, fuzzy
+#| msgctxt "view-action"
+#| msgid "Display the selection outline"
+msgid "Display future selection segment as you drag a control node"
+msgstr "顯示選取區域輪廓"
+
+#: ../app/tools/gimpiscissorsoptions.c:127
 msgid "Interactive boundary"
 msgstr "互動式邊界"
 
-#: ../app/tools/gimpiscissorstool.c:277
+#: ../app/tools/gimpiscissorstool.c:275
 msgid "Scissors"
 msgstr "剪刀"
 
-#: ../app/tools/gimpiscissorstool.c:278
+#: ../app/tools/gimpiscissorstool.c:276
 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting"
 msgstr "剪刀選取工具:使用聰明判斷邊緣是否合適的方法,來選取形狀"
 
-#: ../app/tools/gimpiscissorstool.c:279
+#: ../app/tools/gimpiscissorstool.c:277
 msgid "Intelligent _Scissors"
 msgstr "智慧型剪刀(_S)"
 
-#: ../app/tools/gimpiscissorstool.c:931 ../app/tools/gimpmeasuretool.c:609
+#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpmeasuretool.c:605
 msgid "Click-Drag to move this point"
 msgstr "按下後拖曳可以移動這個點"
 
-#: ../app/tools/gimpiscissorstool.c:933 ../app/tools/gimpiscissorstool.c:998
+#: ../app/tools/gimpiscissorstool.c:904 ../app/tools/gimpiscissorstool.c:969
 #, c-format
 msgid "%s: disable auto-snap"
 msgstr "%s:停用自動貼齊"
 
-#: ../app/tools/gimpiscissorstool.c:950
+#: ../app/tools/gimpiscissorstool.c:921
 msgid "Click to close the curve"
 msgstr "請按這裡以關閉曲線"
 
-#: ../app/tools/gimpiscissorstool.c:956
+#: ../app/tools/gimpiscissorstool.c:927
 msgid "Click to add a point on this segment"
 msgstr "按下這裡在此區段中加入控制點"
 
-#: ../app/tools/gimpiscissorstool.c:970
+#: ../app/tools/gimpiscissorstool.c:941
 msgid "Click or press Enter to convert to a selection"
 msgstr "點選或按 Enter 來轉換為擇選區域"
 
-#: ../app/tools/gimpiscissorstool.c:980
+#: ../app/tools/gimpiscissorstool.c:951
 msgid "Press Enter to convert to a selection"
 msgstr "按 Enter 來轉換為擇選區域"
 
-#: ../app/tools/gimpiscissorstool.c:995
+#: ../app/tools/gimpiscissorstool.c:966
 msgid "Click or Click-Drag to add a point"
 msgstr "按下這裡或拖曳可以加入一個點"
 
@@ -12600,42 +12974,53 @@ msgstr "以曲線形式編輯這些設定值"
 msgid "Use _old levels file format"
 msgstr "使用舊的色階檔案格式(_O)"
 
-#: ../app/tools/gimpmagnifyoptions.c:166
+#: ../app/tools/gimpmagnifyoptions.c:79
+msgid "Resize image window to accommodate new zoom level"
+msgstr "重新調整圖片視窗大小以適應新的縮放層級"
+
+#: ../app/tools/gimpmagnifyoptions.c:86
+msgid "Direction of magnification"
+msgstr "放大的方向"
+
+#: ../app/tools/gimpmagnifyoptions.c:172
 msgid "Auto-resize window"
 msgstr "自動調整視窗尺寸"
 
 #. tool toggle
-#: ../app/tools/gimpmagnifyoptions.c:171 ../app/tools/gimpmoveoptions.c:187
+#: ../app/tools/gimpmagnifyoptions.c:177
 #, c-format
-msgid "Tool Toggle  (%s)"
-msgstr "工具切換  (%s)"
+msgid "Direction  (%s)"
+msgstr "方向  (%s)"
 
-#: ../app/tools/gimpmagnifytool.c:87
+#: ../app/tools/gimpmagnifytool.c:91
 msgid "Zoom"
 msgstr "縮放"
 
-#: ../app/tools/gimpmagnifytool.c:88
+#: ../app/tools/gimpmagnifytool.c:92
 msgid "Zoom Tool: Adjust the zoom level"
 msgstr "縮放顯示工具:調整縮放程度"
 
-#: ../app/tools/gimpmagnifytool.c:89
-msgctxt "tool"
+#: ../app/tools/gimpmagnifytool.c:93
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../app/tools/gimpmeasureoptions.c:123
+#: ../app/tools/gimpmeasureoptions.c:67
+msgid "Open a floating dialog to view details about measurements"
+msgstr "開啟浮動對話盒來檢視量測的相關細節"
+
+#: ../app/tools/gimpmeasureoptions.c:125
 msgid "Use info window"
 msgstr "使用資訊視窗"
 
-#: ../app/tools/gimpmeasuretool.c:124
+#: ../app/tools/gimpmeasuretool.c:127
 msgid "Measure"
 msgstr "測量"
 
-#: ../app/tools/gimpmeasuretool.c:125
+#: ../app/tools/gimpmeasuretool.c:128
 msgid "Measure Tool: Measure distances and angles"
 msgstr "測量工具:測量距離和角度"
 
-#: ../app/tools/gimpmeasuretool.c:126
+#: ../app/tools/gimpmeasuretool.c:129
 msgid "_Measure"
 msgstr "測量(_M)"
 
@@ -12643,42 +13028,47 @@ msgstr "測量(_M)"
 msgid "Add Guides"
 msgstr "新增參考線"
 
+#: ../app/tools/gimpmeasuretool.c:313
+#, fuzzy
+#| msgid "Click-Drag to create a new selection"
+msgid "Drag to create a line"
+msgstr "按下後拖曳以建立新的選取區域"
+
 #: ../app/tools/gimpmeasuretool.c:560
 msgid "Click to place vertical and horizontal guides"
 msgstr "點選以放置水平和垂直參考線"
 
-#: ../app/tools/gimpmeasuretool.c:569
+#: ../app/tools/gimpmeasuretool.c:568
 msgid "Click to place a horizontal guide"
 msgstr "請按這裡放置水平參考線"
 
-#: ../app/tools/gimpmeasuretool.c:584
+#: ../app/tools/gimpmeasuretool.c:582
 msgid "Click to place a vertical guide"
 msgstr "請按這裡放置垂直參考線"
 
-#: ../app/tools/gimpmeasuretool.c:598
+#: ../app/tools/gimpmeasuretool.c:595
 msgid "Click-Drag to add a new point"
 msgstr "按下後拖曳可以加入新的點"
 
-#: ../app/tools/gimpmeasuretool.c:629
+#: ../app/tools/gimpmeasuretool.c:624
 msgid "Click-Drag to move all points"
 msgstr "按下後拖曳可以移動所有的點"
 
-#: ../app/tools/gimpmeasuretool.c:886 ../app/tools/gimpmeasuretool.c:1031
-#: ../app/tools/gimpmeasuretool.c:1087 ../app/tools/gimpmeasuretool.c:1115
-#: ../app/tools/gimppainttool.c:646
+#: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084
+#: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168
+#: ../app/tools/gimppainttool.c:633
 msgid "pixels"
 msgstr "像素"
 
-#. tool->display->shell
-#: ../app/tools/gimpmeasuretool.c:999
+#: ../app/tools/gimpmeasuretool.c:1052
 msgid "Measure Distances and Angles"
 msgstr "測量距離及角度"
 
-#: ../app/tools/gimpmeasuretool.c:1020
+#: ../app/tools/gimpmeasuretool.c:1073
 msgid "Distance:"
 msgstr "距離:"
 
-#: ../app/tools/gimpmeasuretool.c:1048 ../app/widgets/gimpbrusheditor.c:207
+#: ../app/tools/gimpmeasuretool.c:1101
 msgid "Angle:"
 msgstr "角度:"
 
@@ -12706,32 +13096,38 @@ msgstr "移動使用中的路徑"
 msgid "Move:"
 msgstr "移動:"
 
-#: ../app/tools/gimpmovetool.c:128
+#. tool toggle
+#: ../app/tools/gimpmoveoptions.c:187
+#, c-format
+msgid "Tool Toggle  (%s)"
+msgstr "工具切換  (%s)"
+
+#: ../app/tools/gimpmovetool.c:127
 msgctxt "tool"
 msgid "Move"
 msgstr "移動"
 
-#: ../app/tools/gimpmovetool.c:129
+#: ../app/tools/gimpmovetool.c:128
 msgid "Move Tool: Move layers, selections, and other objects"
 msgstr "移動工具:移動圖層、選取區域和其他物件"
 
-#: ../app/tools/gimpmovetool.c:130
+#: ../app/tools/gimpmovetool.c:129
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../app/tools/gimpmovetool.c:247 ../app/tools/gimpmovetool.c:538
+#: ../app/tools/gimpmovetool.c:249 ../app/tools/gimpmovetool.c:554
 msgid "Move Guide: "
 msgstr "移動參考線:"
 
-#: ../app/tools/gimpmovetool.c:532
+#: ../app/tools/gimpmovetool.c:548
 msgid "Remove Guide"
 msgstr "移除參考線"
 
-#: ../app/tools/gimpmovetool.c:532
+#: ../app/tools/gimpmovetool.c:548
 msgid "Cancel Guide"
 msgstr "取消參考線"
 
-#: ../app/tools/gimpmovetool.c:538
+#: ../app/tools/gimpmovetool.c:554
 msgid "Add Guide: "
 msgstr "加入參考線:"
 
@@ -12743,84 +13139,97 @@ msgstr "畫筆工具:使用筆刷繪製滑順的筆劃效果"
 msgid "_Paintbrush"
 msgstr "畫筆(_P)"
 
-#: ../app/tools/gimppaintoptions-gui.c:93
-#: ../app/tools/gimpselectionoptions.c:210
-#: ../app/widgets/gimpbrushselect.c:193 ../app/widgets/gimplayertreeview.c:266
+#: ../app/tools/gimppaintoptions-gui.c:89
+#: ../app/tools/gimpselectionoptions.c:217
+#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268
 msgid "Mode:"
 msgstr "模式:"
 
-#: ../app/tools/gimppaintoptions-gui.c:117
+#: ../app/tools/gimppaintoptions-gui.c:121
 msgid "Brush"
 msgstr "筆刷"
 
-#: ../app/tools/gimppaintoptions-gui.c:144
+#: ../app/tools/gimppaintoptions-gui.c:150
 msgid "Reset size to brush's native size"
-msgstr ""
+msgstr "重設大小回筆刷的原生大小"
 
-#: ../app/tools/gimppaintoptions-gui.c:147
+#: ../app/tools/gimppaintoptions-gui.c:157
 msgid "Aspect Ratio"
 msgstr "長寬比"
 
-#: ../app/tools/gimppaintoptions-gui.c:182
+#: ../app/tools/gimppaintoptions-gui.c:174
+msgid "Reset aspect ratio to brush's native"
+msgstr "重設常寬比回筆刷的原生狀態"
+
+#: ../app/tools/gimppaintoptions-gui.c:198
+msgid "Reset angle to zero"
+msgstr "重設角度回零度"
+
+#: ../app/tools/gimppaintoptions-gui.c:236
 msgid "Incremental"
 msgstr "遞增模式"
 
-#: ../app/tools/gimppaintoptions-gui.c:198
+#: ../app/tools/gimppaintoptions-gui.c:254
 msgid "Hard edge"
 msgstr "邊界較分明"
 
-#: ../app/tools/gimppaintoptions-gui.c:227
-#, fuzzy
+#: ../app/tools/gimppaintoptions-gui.c:283
 msgid "Dynamics Options"
-msgstr "筆刷動態資料夾"
+msgstr "筆刷動態選項"
 
-#: ../app/tools/gimppaintoptions-gui.c:233
+#: ../app/tools/gimppaintoptions-gui.c:289
 #, fuzzy
 msgid "Fade Options"
-msgstr "已儲存選項"
+msgstr "淡化選項"
 
-#: ../app/tools/gimppaintoptions-gui.c:247
+#: ../app/tools/gimppaintoptions-gui.c:303
 #, fuzzy
 msgid "Fade length"
-msgstr "淡出"
+msgstr "淡出長度"
 
-#: ../app/tools/gimppaintoptions-gui.c:273
-#: ../app/widgets/gimpviewablebox.c:288
+#: ../app/tools/gimppaintoptions-gui.c:332
+#: ../app/widgets/gimpviewablebox.c:311
 msgid "Reverse"
 msgstr "相反方向"
 
-#: ../app/tools/gimppaintoptions-gui.c:280
-#, fuzzy
+#: ../app/tools/gimppaintoptions-gui.c:339
 msgid "Color Options"
-msgstr "工具選項"
+msgstr "色彩選項"
 
-#: ../app/tools/gimppaintoptions-gui.c:305
-#, fuzzy
+#: ../app/tools/gimppaintoptions-gui.c:365
 msgid "Amount"
-msgstr "總額:"
+msgstr "量"
 
-#: ../app/tools/gimppaintoptions-gui.c:309
+#: ../app/tools/gimppaintoptions-gui.c:369
 msgid "Apply Jitter"
 msgstr "套用抖動"
 
-#: ../app/tools/gimppainttool.c:140
+#: ../app/tools/gimppaintoptions-gui.c:387
+msgid "Smooth stroke"
+msgstr "平滑筆觸"
+
+#: ../app/tools/gimppaintoptions-gui.c:397
+msgid "Weight"
+msgstr "權重"
+
+#: ../app/tools/gimppainttool.c:138
 msgid "Click to paint"
 msgstr "請按這裡繪製"
 
-#: ../app/tools/gimppainttool.c:141
+#: ../app/tools/gimppainttool.c:139
 msgid "Click to draw the line"
 msgstr "請按這裡繪製線條"
 
-#: ../app/tools/gimppainttool.c:142
+#: ../app/tools/gimppainttool.c:140
 #, c-format
 msgid "%s to pick a color"
 msgstr "%s 以挑選顏色"
 
-#: ../app/tools/gimppainttool.c:278
+#: ../app/tools/gimppainttool.c:259
 msgid "Cannot paint on layer groups."
 msgstr "無法在圖層遮罩上繪畫"
 
-#: ../app/tools/gimppainttool.c:692
+#: ../app/tools/gimppainttool.c:679
 #, c-format
 msgid "%s for a straight line"
 msgstr "%s 可繪出直線"
@@ -12833,41 +13242,41 @@ msgstr "鉛筆工具:使用筆刷繪出堅硬邊緣的筆觸"
 msgid "Pe_ncil"
 msgstr "鉛筆(_N)"
 
-#: ../app/tools/gimpperspectiveclonetool.c:125
+#: ../app/tools/gimpperspectiveclonetool.c:134
 msgid ""
 "Perspective Clone Tool: Clone from an image source after applying a "
 "perspective transformation"
 msgstr "透視法仿製工具:在套用透視法變換後從圖片來源仿製"
 
-#: ../app/tools/gimpperspectiveclonetool.c:127
+#: ../app/tools/gimpperspectiveclonetool.c:136
 msgid "_Perspective Clone"
 msgstr "透視法仿製(_P)"
 
-#: ../app/tools/gimpperspectiveclonetool.c:700
+#: ../app/tools/gimpperspectiveclonetool.c:675
 msgid "Ctrl-Click to set a clone source"
 msgstr "請按 Ctrl 並點選以設定複製來源"
 
-#: ../app/tools/gimpperspectivetool.c:70
+#: ../app/tools/gimpperspectivetool.c:83
 msgid "Perspective Tool: Change perspective of the layer, selection or path"
 msgstr "透視法工具:改變圖層、選取區域或路徑的透視"
 
-#: ../app/tools/gimpperspectivetool.c:72
+#: ../app/tools/gimpperspectivetool.c:85
 msgid "_Perspective"
 msgstr "透視法(_P)"
 
-#: ../app/tools/gimpperspectivetool.c:99
-msgctxt "command"
-msgid "Perspective"
-msgstr "透視法"
-
-#: ../app/tools/gimpperspectivetool.c:100
+#: ../app/tools/gimpperspectivetool.c:113
 msgid "Perspective transformation"
 msgstr "透視法變換"
 
-#: ../app/tools/gimpperspectivetool.c:115
+#: ../app/tools/gimpperspectivetool.c:131
 msgid "Transformation Matrix"
 msgstr "變換矩陣"
 
+#: ../app/tools/gimpperspectivetool.c:256
+msgctxt "undo-type"
+msgid "Perspective"
+msgstr "透視法"
+
 #: ../app/tools/gimpposterizetool.c:85
 msgid "Posterize Tool: Reduce to a limited set of colors"
 msgstr "色調分離工具:減少顏色至限制的數目"
@@ -12884,65 +13293,132 @@ msgstr "色調分離 (減少顏色數目)"
 msgid "Posterize does not operate on indexed layers."
 msgstr "色調分離不適用於索引色圖層。"
 
-#: ../app/tools/gimpposterizetool.c:230
+#: ../app/tools/gimpposterizetool.c:229
 msgid "Posterize _levels:"
 msgstr "色調分離程度(_L):"
 
-#: ../app/tools/gimprectangleoptions.c:111
+#: ../app/tools/gimprectangleoptions.c:104
+msgid "Automatically shrink to the nearest rectangular shape in a layer"
+msgstr "自動縮小至圖層中最接近的正方形"
+
+#: ../app/tools/gimprectangleoptions.c:113
 msgid "Use all visible layers when shrinking the selection"
 msgstr "在收縮選取區域時使用所有看得見的圖層"
 
+#: ../app/tools/gimprectangleoptions.c:122
+#: ../app/tools/gimptransformoptions.c:127
+msgid "Composition guides such as rule of thirds"
+msgstr ""
+
+#: ../app/tools/gimprectangleoptions.c:131
+msgid "X coordinate of top left corner"
+msgstr ""
+
+#: ../app/tools/gimprectangleoptions.c:141
+msgid "Y coordinate of top left corner"
+msgstr ""
+
+#: ../app/tools/gimprectangleoptions.c:151
+msgid "Width of selection"
+msgstr "選取區域的寬度"
+
+#: ../app/tools/gimprectangleoptions.c:160
+msgid "Height of selection"
+msgstr "選取區域的高度"
+
+#: ../app/tools/gimprectangleoptions.c:169
+msgid "Unit of top left corner coordinate"
+msgstr "左上角座標的單位"
+
+#: ../app/tools/gimprectangleoptions.c:178
+msgid "Unit of selection size"
+msgstr "選取區域尺寸的單位"
+
+#: ../app/tools/gimprectangleoptions.c:187
+msgid "Enable lock of aspect ratio, width, height or size"
+msgstr "啟用長寬比、寬度、高度或尺寸的鎖定"
+
+#: ../app/tools/gimprectangleoptions.c:196
+#, fuzzy
+#| msgid "The active path's strokes are locked."
+msgid "Choose what has to be locked"
+msgstr "使用中路徑的描邊是鎖住的。"
+
+#: ../app/tools/gimprectangleoptions.c:205
+msgid "Custom fixed width"
+msgstr "自訂固定寬度"
+
+#: ../app/tools/gimprectangleoptions.c:214
+msgid "Custom fixed height"
+msgstr "自訂固定高度"
+
+#: ../app/tools/gimprectangleoptions.c:308
+msgid "Unit of fixed width, height or size"
+msgstr "固定寬度、高度或尺寸的單位"
+
+#: ../app/tools/gimprectangleoptions.c:317
+msgid "Expand selection from center outwards"
+msgstr "從中央往外擴展選取區域"
+
 #. Current, as in what is currently in use.
-#: ../app/tools/gimprectangleoptions.c:745
+#: ../app/tools/gimprectangleoptions.c:761
 msgid "Current"
 msgstr "目前的"
 
-#: ../app/tools/gimprectangleoptions.c:823
+#: ../app/tools/gimprectangleoptions.c:839
 msgid "Expand from center"
 msgstr "從中央擴展"
 
-#: ../app/tools/gimprectangleoptions.c:846
+#: ../app/tools/gimprectangleoptions.c:862
 msgid "Fixed:"
-msgstr "固定:"
+msgstr "固定:"
 
-#: ../app/tools/gimprectangleoptions.c:979
+#: ../app/tools/gimprectangleoptions.c:1010
 msgid "Position:"
-msgstr "位置:"
+msgstr "位置:"
 
-#: ../app/tools/gimprectangleoptions.c:989 ../app/tools/gimptextoptions.c:489
+#: ../app/tools/gimprectangleoptions.c:1020 ../app/tools/gimptextoptions.c:526
 msgid "Size:"
-msgstr "尺寸:"
+msgstr "尺寸:"
 
-#: ../app/tools/gimprectangleoptions.c:997
+#: ../app/tools/gimprectangleoptions.c:1028
 msgid "Highlight"
 msgstr "突顯"
 
 #. Auto Shrink
-#: ../app/tools/gimprectangleoptions.c:1007
+#: ../app/tools/gimprectangleoptions.c:1040
 msgid "Auto Shrink"
 msgstr "自動收縮"
 
-#: ../app/tools/gimprectangleoptions.c:1014
+#: ../app/tools/gimprectangleoptions.c:1050
 msgid "Shrink merged"
 msgstr "收縮合併"
 
-#: ../app/tools/gimprectangleselectoptions.c:164
+#: ../app/tools/gimprectangleselectoptions.c:83
+msgid "Round corners of selection"
+msgstr "把選取區域的四角修圓"
+
+#: ../app/tools/gimprectangleselectoptions.c:89
+msgid "Radius of rounding in pixels"
+msgstr "修圓的半徑 (單位為像素)"
+
+#: ../app/tools/gimprectangleselectoptions.c:167
 msgid "Rounded corners"
 msgstr "圓角"
 
-#: ../app/tools/gimprectangleselecttool.c:169
+#: ../app/tools/gimprectangleselecttool.c:168
 msgid "Rectangle Select"
 msgstr "矩形選取"
 
-#: ../app/tools/gimprectangleselecttool.c:170
+#: ../app/tools/gimprectangleselecttool.c:169
 msgid "Rectangle Select Tool: Select a rectangular region"
 msgstr "矩形選取工具:選取矩形區域"
 
-#: ../app/tools/gimprectangleselecttool.c:171
+#: ../app/tools/gimprectangleselecttool.c:170
 msgid "_Rectangle Select"
 msgstr "矩形選取(_R)"
 
-#: ../app/tools/gimprectangletool.c:1169 ../app/tools/gimprectangletool.c:2165
+#: ../app/tools/gimprectangletool.c:1146 ../app/tools/gimprectangletool.c:2016
 msgid "Rectangle: "
 msgstr "矩形: "
 
@@ -12955,133 +13431,166 @@ msgstr "可選取完全透明的區域"
 msgid "Base selection on all visible layers"
 msgstr "區域選擇以所有可見的圖層為基礎"
 
-#: ../app/tools/gimpregionselectoptions.c:202
+#: ../app/tools/gimpregionselectoptions.c:101
+#, fuzzy
+#| msgid "Selection Editor"
+msgid "Selection criterion"
+msgstr "選取區域編輯視窗"
+
+#: ../app/tools/gimpregionselectoptions.c:204
 msgid "Select transparent areas"
 msgstr "選取透明區域"
 
-#: ../app/tools/gimpregionselectoptions.c:228
+#: ../app/tools/gimpregionselectoptions.c:226
 msgid "Select by:"
 msgstr "選擇依:"
 
-#: ../app/tools/gimpregionselecttool.c:162
+#: ../app/tools/gimpregionselecttool.c:165
 msgid "Move the mouse to change threshold"
 msgstr "移動滑鼠以改變臨界值"
 
-#: ../app/tools/gimprotatetool.c:90
+#: ../app/tools/gimprotatetool.c:93
 msgid "Rotate"
 msgstr "旋轉"
 
-#: ../app/tools/gimprotatetool.c:91
+#: ../app/tools/gimprotatetool.c:94
 msgid "Rotate Tool: Rotate the layer, selection or path"
 msgstr "旋轉工具:旋轉圖層、選取區域或路徑"
 
-#: ../app/tools/gimprotatetool.c:92
+#: ../app/tools/gimprotatetool.c:95
 msgid "_Rotate"
 msgstr "旋轉(_R)"
 
-#: ../app/tools/gimprotatetool.c:121
-msgctxt "command"
-msgid "Rotate"
-msgstr "旋轉"
-
-#: ../app/tools/gimprotatetool.c:188
+#: ../app/tools/gimprotatetool.c:191
 msgid "_Angle:"
 msgstr "角度(_A):"
 
-#: ../app/tools/gimprotatetool.c:204
+#: ../app/tools/gimprotatetool.c:207
 msgid "Center _X:"
 msgstr "中心點的 _X 座標:"
 
-#: ../app/tools/gimprotatetool.c:213
+#: ../app/tools/gimprotatetool.c:216
 msgid "Center _Y:"
 msgstr "中心點的 _Y 座標:"
 
-#: ../app/tools/gimpscaletool.c:77
+#: ../app/tools/gimprotatetool.c:373
+#, c-format
+msgctxt "undo-type"
+msgid "Rotate by %-3.3g° around (%g, %g)"
+msgstr ""
+
+#: ../app/tools/gimpscaletool.c:89
 msgid "Scale"
 msgstr "縮放"
 
-#: ../app/tools/gimpscaletool.c:78
+#: ../app/tools/gimpscaletool.c:90
 msgid "Scale Tool: Scale the layer, selection or path"
 msgstr "縮放比例工具:縮放圖層、選取區域或路徑"
 
-#: ../app/tools/gimpscaletool.c:79
+#: ../app/tools/gimpscaletool.c:91
 msgid "_Scale"
 msgstr "縮放(_S)"
 
-#: ../app/tools/gimpscaletool.c:105
-msgctxt "command"
-msgid "Scale"
-msgstr "縮放"
+#: ../app/tools/gimpscaletool.c:338
+#, c-format
+msgctxt "undo-type"
+msgid "Scale to %d x %d"
+msgstr ""
 
-#: ../app/tools/gimpselectionoptions.c:257 ../app/tools/gimptextoptions.c:502
+#: ../app/tools/gimpselectionoptions.c:84
+#, fuzzy
+#| msgctxt "select-action"
+#| msgid "Enlarge the selection"
+msgid "Enable feathering of selection edges"
+msgstr "擴大選取的區域"
+
+#: ../app/tools/gimpselectionoptions.c:90
+msgid "Radius of feathering"
+msgstr ""
+
+#: ../app/tools/gimpselectionoptions.c:264 ../app/tools/gimptextoptions.c:539
 msgid "Antialiasing"
 msgstr "反鋸齒"
 
-#: ../app/tools/gimpselectionoptions.c:274
+#: ../app/tools/gimpselectionoptions.c:281
 msgid "Feather edges"
 msgstr "羽化邊緣"
 
-#: ../app/tools/gimpselectiontool.c:253
+#: ../app/tools/gimpselectiontool.c:255
 msgid "Click-Drag to replace the current selection"
 msgstr "按下後拖曳以取代目前的選取區域"
 
-#: ../app/tools/gimpselectiontool.c:261
+#: ../app/tools/gimpselectiontool.c:263
 msgid "Click-Drag to create a new selection"
 msgstr "按下後拖曳以建立新的選取區域"
 
-#: ../app/tools/gimpselectiontool.c:266
+#: ../app/tools/gimpselectiontool.c:268
 msgid "Click-Drag to add to the current selection"
 msgstr "按下後拖曳以加入至目前的選取區域"
 
-#: ../app/tools/gimpselectiontool.c:275
+#: ../app/tools/gimpselectiontool.c:277
 msgid "Click-Drag to subtract from the current selection"
 msgstr "按下後拖曳以從目前的選取區域刪減"
 
-#: ../app/tools/gimpselectiontool.c:284
+#: ../app/tools/gimpselectiontool.c:286
 msgid "Click-Drag to intersect with the current selection"
 msgstr "按下後拖曳以計算和目前選取區域的交集區域"
 
-#: ../app/tools/gimpselectiontool.c:294
+#: ../app/tools/gimpselectiontool.c:296
 msgid "Click-Drag to move the selection mask"
 msgstr "按下後拖曳以移動選取區域遮罩"
 
-#: ../app/tools/gimpselectiontool.c:302
+#: ../app/tools/gimpselectiontool.c:304
 msgid "Click-Drag to move the selected pixels"
 msgstr "按下後拖曳以移動選取的像素"
 
-#: ../app/tools/gimpselectiontool.c:306
+#: ../app/tools/gimpselectiontool.c:308
 msgid "Click-Drag to move a copy of the selected pixels"
 msgstr "按下後拖曳以移動選取的像素複本"
 
-#: ../app/tools/gimpselectiontool.c:310
+#: ../app/tools/gimpselectiontool.c:312
 msgid "Click to anchor the floating selection"
 msgstr "按下後拖曳將浮動選取區域的位置固定"
 
-#: ../app/tools/gimpsheartool.c:81
+#: ../app/tools/gimpsheartool.c:83
 msgid "Shear"
 msgstr "推移"
 
-#: ../app/tools/gimpsheartool.c:82
+#: ../app/tools/gimpsheartool.c:84
 msgid "Shear Tool: Shear the layer, selection or path"
 msgstr "推移工具:推移圖層、選取區域或路徑"
 
-#: ../app/tools/gimpsheartool.c:83
+#: ../app/tools/gimpsheartool.c:85
 msgid "S_hear"
 msgstr "推移(_H)"
 
-#: ../app/tools/gimpsheartool.c:109
-msgctxt "command"
-msgid "Shear"
-msgstr "推移"
-
-#: ../app/tools/gimpsheartool.c:133
+#: ../app/tools/gimpsheartool.c:135
 msgid "Shear magnitude _X:"
 msgstr "推移量 _X:"
 
-#: ../app/tools/gimpsheartool.c:143
+#: ../app/tools/gimpsheartool.c:145
 msgid "Shear magnitude _Y:"
 msgstr "推移量 _Y:"
 
+#: ../app/tools/gimpsheartool.c:255
+#, c-format
+msgctxt "undo-type"
+msgid "Shear horizontally by %-3.3g"
+msgstr ""
+
+#: ../app/tools/gimpsheartool.c:259
+#, c-format
+msgctxt "undo-type"
+msgid "Shear vertically by %-3.3g"
+msgstr ""
+
+#. e.g. user entered numbers but no notification callback
+#: ../app/tools/gimpsheartool.c:264
+#, c-format
+msgctxt "undo-type"
+msgid "Shear horizontally by %-3.3g, vertically by %-3.3g"
+msgstr ""
+
 #: ../app/tools/gimpsmudgetool.c:54
 msgid "Smudge Tool: Smudge selectively using a brush"
 msgstr "塗抹工具:使用筆刷進行選擇性的塗抹"
@@ -13098,96 +13607,107 @@ msgstr "請按這裡塗抹"
 msgid "Click to smudge the line"
 msgstr "請按這裡塗抹線條"
 
-#: ../app/tools/gimptextoptions.c:137
+#: ../app/tools/gimptextoptions.c:131
+msgid "Font size unit"
+msgstr "字型大小單位"
+
+#: ../app/tools/gimptextoptions.c:136
+msgid "Font size"
+msgstr "字型大小"
+
+#: ../app/tools/gimptextoptions.c:145
 msgid ""
 "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr "微調修正字型的輪廓以便在小字型時能產生清晰的點陣圖"
 
-#: ../app/tools/gimptextoptions.c:145
+#: ../app/tools/gimptextoptions.c:153
 msgid "The text language may have an effect on the way the text is rendered."
-msgstr ""
+msgstr "文字語言可能會對文字呈現的方式產生影響。"
 
-#: ../app/tools/gimptextoptions.c:161
+#: ../app/tools/gimptextoptions.c:164
+msgid "Text alignment"
+msgstr "文字對齊"
+
+#: ../app/tools/gimptextoptions.c:170
 msgid "Indentation of the first line"
 msgstr "第一行縮排的距離"
 
-#: ../app/tools/gimptextoptions.c:167
+#: ../app/tools/gimptextoptions.c:176
 msgid "Adjust line spacing"
 msgstr "調整行距"
 
-#: ../app/tools/gimptextoptions.c:173
+#: ../app/tools/gimptextoptions.c:182
 msgid "Adjust letter spacing"
 msgstr "調整字距"
 
-#: ../app/tools/gimptextoptions.c:179
-#, fuzzy
-msgid "Text box resize mode"
-msgstr "純文字編輯模式"
-
-#: ../app/tools/gimptextoptions.c:186
+#: ../app/tools/gimptextoptions.c:188
 msgid ""
-"Use an external editor window for text entry, instead of direct-on-canvas "
-"editing"
-msgstr "為文字輸入使用外部編輯器視窗,取代直接在畫布上編輯"
+"Whether text flows into rectangular shape or moves into a new line when you "
+"press Enter"
+msgstr ""
 
-#: ../app/tools/gimptextoptions.c:474
+#: ../app/tools/gimptextoptions.c:196
+msgid "Use an external editor window for text entry"
+msgstr "為文字輸入使用外部編輯器視窗"
+
+#: ../app/tools/gimptextoptions.c:511
 msgid "Font"
 msgstr "字型"
 
-#: ../app/tools/gimptextoptions.c:498
+#: ../app/tools/gimptextoptions.c:535
 msgid "Use editor"
 msgstr "使用編輯器"
 
-#: ../app/tools/gimptextoptions.c:518
+#: ../app/tools/gimptextoptions.c:555
 msgid "Hinting:"
 msgstr "微調字型輪廓:"
 
-#: ../app/tools/gimptextoptions.c:522
+#: ../app/tools/gimptextoptions.c:559
 msgid "Text Color"
 msgstr "文字顏色"
 
-#: ../app/tools/gimptextoptions.c:527
+#: ../app/tools/gimptextoptions.c:564
 msgid "Color:"
 msgstr "顏色:"
 
-#: ../app/tools/gimptextoptions.c:533
+#: ../app/tools/gimptextoptions.c:570
 msgid "Justify:"
 msgstr "對齊方式:"
 
-#: ../app/tools/gimptextoptions.c:556
+#: ../app/tools/gimptextoptions.c:593
 #, fuzzy
 msgid "Box:"
 msgstr "郵政信箱(_B):"
 
-#: ../app/tools/gimptextoptions.c:570
+#: ../app/tools/gimptextoptions.c:610
 msgid "Language:"
 msgstr "語言:"
 
-#: ../app/tools/gimptexttool.c:194
+#: ../app/tools/gimptexttool.c:191
 msgid "Text"
 msgstr "文字"
 
-#: ../app/tools/gimptexttool.c:195
+#: ../app/tools/gimptexttool.c:192
 msgid "Text Tool: Create or edit text layers"
 msgstr "文字工具:建立或編輯文字圖層"
 
-#: ../app/tools/gimptexttool.c:196
+#: ../app/tools/gimptexttool.c:193
 msgid "Te_xt"
 msgstr "文字(_X)"
 
-#: ../app/tools/gimptexttool.c:958
+#: ../app/tools/gimptexttool.c:972
 msgid "Reshape Text Layer"
 msgstr "修整文字圖層"
 
-#: ../app/tools/gimptexttool.c:1505 ../app/tools/gimptexttool.c:1508
+#: ../app/tools/gimptexttool.c:1526 ../app/tools/gimptexttool.c:1529
 msgid "Confirm Text Editing"
 msgstr "確認文字編輯"
 
-#: ../app/tools/gimptexttool.c:1512
+#: ../app/tools/gimptexttool.c:1533
 msgid "Create _New Layer"
 msgstr "建立一個新的圖層(_N)"
 
-#: ../app/tools/gimptexttool.c:1536
+#: ../app/tools/gimptexttool.c:1557
 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 "
@@ -13200,7 +13720,7 @@ msgstr ""
 "\n"
 "您可以編輯此圖層或以它的文字屬性建立一個新的文字圖層。"
 
-#: ../app/tools/gimptexttool-editor.c:1158
+#: ../app/tools/gimptexttool-editor.c:1236
 msgid "GIMP Text Editor"
 msgstr "GIMP 文字編輯器"
 
@@ -13232,56 +13752,98 @@ msgstr "臨界值不適用於索引色圖層。"
 msgid "Automatically adjust to optimal binarization threshold"
 msgstr "自動調整到最佳的二元化臨界值"
 
-#: ../app/tools/gimptool.c:917
+#: ../app/tools/gimptool.c:978
 msgid "Can't work on an empty image, add a layer first"
 msgstr "無法操作在一空的圖片上,所以您首先要加入一個圖層"
 
-#: ../app/tools/gimptransformoptions.c:273
+#: ../app/tools/gimptransformoptions.c:99
+msgid "Direction of transformation"
+msgstr "變換的方向"
+
+#: ../app/tools/gimptransformoptions.c:105
+msgid "Interpolation method"
+msgstr "內插法"
+
+#: ../app/tools/gimptransformoptions.c:111
+msgid "How to clip"
+msgstr "如何剪輯"
+
+#: ../app/tools/gimptransformoptions.c:117
+msgid "Show a preview of the transformed image"
+msgstr "顯示變換後影像的預覽"
+
+#: ../app/tools/gimptransformoptions.c:122
+msgid "Opacity of the preview image"
+msgstr "預覽影像的不透明度"
+
+#: ../app/tools/gimptransformoptions.c:133
+msgid "Size of a grid cell for variable number of composition guides"
+msgstr ""
+
+#: ../app/tools/gimptransformoptions.c:277
 msgid "Transform:"
-msgstr "變換:"
+msgstr "變換:"
 
-#: ../app/tools/gimptransformoptions.c:282
-#: ../app/widgets/gimpdynamicseditor.c:145
-#: ../app/widgets/gimpdynamicsoutputeditor.c:226
+#: ../app/tools/gimptransformoptions.c:286
+#: ../app/widgets/gimpdynamicseditor.c:143
+#: ../app/widgets/gimpdynamicsoutputeditor.c:71
 msgid "Direction"
 msgstr "方向"
 
 #. the interpolation menu
-#: ../app/tools/gimptransformoptions.c:287
+#: ../app/tools/gimptransformoptions.c:291
 msgid "Interpolation:"
 msgstr "內插法:"
 
+#. the clipping menu
 #: ../app/tools/gimptransformoptions.c:300
 msgid "Clipping:"
 msgstr "剪輯:"
 
+#: ../app/tools/gimptransformoptions.c:310
+msgid "Image opacity"
+msgstr "圖片不透明度"
+
+#: ../app/tools/gimptransformoptions.c:312
+msgid "Show image preview"
+msgstr "顯示圖片預覽"
+
+#. the guides frame
 #: ../app/tools/gimptransformoptions.c:318
-msgid "Preview:"
-msgstr "預覽:"
+msgid "Guides"
+msgstr "參考線"
 
-#: ../app/tools/gimptransformoptions.c:364
+#: ../app/tools/gimptransformoptions.c:346
 #, c-format
 msgid "15 degrees  (%s)"
 msgstr "15 度  (%s)"
 
-#: ../app/tools/gimptransformoptions.c:368
+#: ../app/tools/gimptransformoptions.c:347
+msgid "Limit rotation steps to 15 degrees"
+msgstr "限制旋轉階為 15 度"
+
+#: ../app/tools/gimptransformoptions.c:351
 #, c-format
 msgid "Keep aspect  (%s)"
 msgstr "保持長寬比  (%s)"
 
-#: ../app/tools/gimptransformtool.c:237
+#: ../app/tools/gimptransformoptions.c:352
+msgid "Keep the original aspect ratio"
+msgstr "保持原始長寬比"
+
+#: ../app/tools/gimptransformtool.c:220
 msgid "Transforming"
 msgstr "正在進行變換"
 
-#: ../app/tools/gimptransformtool.c:1260
+#: ../app/tools/gimptransformtool.c:1465
 msgid "There is no layer to transform."
 msgstr "目前沒有要變換的圖層。"
 
-#: ../app/tools/gimptransformtool.c:1273
+#: ../app/tools/gimptransformtool.c:1476
 msgid "There is no path to transform."
 msgstr "目前沒有要變換的路徑。"
 
-#: ../app/tools/gimptransformtool.c:1274
+#: ../app/tools/gimptransformtool.c:1477
 msgid "The active path's strokes are locked."
 msgstr "使用中路徑的描邊是鎖住的。"
 
@@ -13293,11 +13855,11 @@ msgstr "限制多邊形的編輯"
 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"
@@ -13311,7 +13873,7 @@ msgstr ""
 " %s 交集"
 
 #. Create a selection from the current path
-#: ../app/tools/gimpvectoroptions.c:188
+#: ../app/tools/gimpvectoroptions.c:189
 msgid "Selection from Path"
 msgstr "路徑轉為選取區域"
 
@@ -13323,261 +13885,201 @@ msgstr "路徑工具:建立和編輯路徑"
 msgid "Pat_hs"
 msgstr "路徑(_H)"
 
-#: ../app/tools/gimpvectortool.c:252
+#: ../app/tools/gimpvectortool.c:250
 msgid "The active path is locked."
 msgstr "使用中路徑是鎖住的。"
 
-#: ../app/tools/gimpvectortool.c:342
+#: ../app/tools/gimpvectortool.c:340
 msgid "Add Stroke"
 msgstr "加入筆劃"
 
-#: ../app/tools/gimpvectortool.c:366
+#: ../app/tools/gimpvectortool.c:365
 msgid "Add Anchor"
 msgstr "加入錨點"
 
-#: ../app/tools/gimpvectortool.c:392
+#: ../app/tools/gimpvectortool.c:391
 msgid "Insert Anchor"
 msgstr "插入錨點"
 
-#: ../app/tools/gimpvectortool.c:423
+#: ../app/tools/gimpvectortool.c:422
 msgid "Drag Handle"
 msgstr "拖曳控制柄"
 
-#: ../app/tools/gimpvectortool.c:454
+#: ../app/tools/gimpvectortool.c:453
 msgid "Drag Anchor"
 msgstr "拖曳錨點"
 
-#: ../app/tools/gimpvectortool.c:472
+#: ../app/tools/gimpvectortool.c:471
 msgid "Drag Anchors"
 msgstr "拖曳錨點"
 
-#: ../app/tools/gimpvectortool.c:495
+#: ../app/tools/gimpvectortool.c:494
 msgid "Drag Curve"
 msgstr "拖曳曲線"
 
-#: ../app/tools/gimpvectortool.c:524
+#: ../app/tools/gimpvectortool.c:523
 msgid "Connect Strokes"
 msgstr "連接筆劃"
 
-#: ../app/tools/gimpvectortool.c:556
+#: ../app/tools/gimpvectortool.c:555
 msgid "Drag Path"
 msgstr "拖曳路徑"
 
-#: ../app/tools/gimpvectortool.c:567
+#: ../app/tools/gimpvectortool.c:566
 msgid "Convert Edge"
 msgstr "轉換邊緣"
 
-#: ../app/tools/gimpvectortool.c:598
+#: ../app/tools/gimpvectortool.c:597
 msgid "Delete Anchor"
 msgstr "刪除向量"
 
-#: ../app/tools/gimpvectortool.c:621
+#: ../app/tools/gimpvectortool.c:620
 msgid "Delete Segment"
 msgstr "刪除區段"
 
-#: ../app/tools/gimpvectortool.c:840
+#: ../app/tools/gimpvectortool.c:842
 msgid "Move Anchors"
 msgstr "移動錨點"
 
-#: ../app/tools/gimpvectortool.c:1203
+#: ../app/tools/gimpvectortool.c:1205
 msgid "Click to pick path to edit"
 msgstr "按下這裡可以選擇您準備編輯的路徑"
 
-#: ../app/tools/gimpvectortool.c:1207
+#: ../app/tools/gimpvectortool.c:1209
 msgid "Click to create a new path"
 msgstr "按下這裡可以製作新的路徑"
 
-#: ../app/tools/gimpvectortool.c:1211
+#: ../app/tools/gimpvectortool.c:1213
 msgid "Click to create a new component of the path"
 msgstr "按下這裡可以製作路徑的新元件"
 
-#: ../app/tools/gimpvectortool.c:1215
+#: ../app/tools/gimpvectortool.c:1217
 msgid "Click or Click-Drag to create a new anchor"
 msgstr "按下後拖曳以建立新的錨點"
 
-#: ../app/tools/gimpvectortool.c:1225 ../app/tools/gimpvectortool.c:1232
+#: ../app/tools/gimpvectortool.c:1229 ../app/tools/gimpvectortool.c:1236
 msgid "Click-Drag to move the anchor around"
 msgstr "按下後拖曳可以移動錨點"
 
-#: ../app/tools/gimpvectortool.c:1236 ../app/tools/gimpvectortool.c:1259
+#: ../app/tools/gimpvectortool.c:1240 ../app/tools/gimpvectortool.c:1263
 msgid "Click-Drag to move the anchors around"
 msgstr "按下後拖曳可以移動錨點"
 
-#: ../app/tools/gimpvectortool.c:1242
+#: ../app/tools/gimpvectortool.c:1246
 msgid "Click-Drag to move the handle around"
 msgstr "按下後拖曳可以移動控制柄"
 
-#: ../app/tools/gimpvectortool.c:1249
+#: ../app/tools/gimpvectortool.c:1253
 #, fuzzy
 msgid "Click-Drag to move the handles around symmetrically"
 msgstr "按下後拖曳可以移動控制柄"
 
-#: ../app/tools/gimpvectortool.c:1264
+#: ../app/tools/gimpvectortool.c:1268
 msgid "Click-Drag to change the shape of the curve"
 msgstr "按下後拖曳可以改變曲線的形狀"
 
-#: ../app/tools/gimpvectortool.c:1267
+#: ../app/tools/gimpvectortool.c:1271
 #, c-format
 msgid "%s: symmetrical"
 msgstr "%s:對稱式"
 
-#: ../app/tools/gimpvectortool.c:1272
+#: ../app/tools/gimpvectortool.c:1276
 msgid "Click-Drag to move the component around"
 msgstr "按下後拖曳可以移動元件"
 
-#: ../app/tools/gimpvectortool.c:1280
+#: ../app/tools/gimpvectortool.c:1284
 msgid "Click-Drag to move the path around"
 msgstr "按下後拖曳可以移動路徑"
 
-#: ../app/tools/gimpvectortool.c:1284
+#: ../app/tools/gimpvectortool.c:1288
 msgid "Click-Drag to insert an anchor on the path"
 msgstr "按下後拖曳可以在路徑中插入錨點"
 
-#: ../app/tools/gimpvectortool.c:1292
+#: ../app/tools/gimpvectortool.c:1296
 msgid "Click to delete this anchor"
 msgstr "點選以刪除這個錨點"
 
-#: ../app/tools/gimpvectortool.c:1296
+#: ../app/tools/gimpvectortool.c:1300
 msgid "Click to connect this anchor with the selected endpoint"
 msgstr "點選以將這個錨點與選取的結束點連接"
 
-#: ../app/tools/gimpvectortool.c:1301
+#: ../app/tools/gimpvectortool.c:1305
 msgid "Click to open up the path"
 msgstr "按下這裡可以開啟路徑"
 
-#: ../app/tools/gimpvectortool.c:1305
+#: ../app/tools/gimpvectortool.c:1309
 msgid "Click to make this node angular"
 msgstr "點選讓這個節點成為稜角"
 
-#: ../app/tools/gimpvectortool.c:1805
+#: ../app/tools/gimpvectortool.c:1810
 msgid "Delete Anchors"
 msgstr "刪除錨點"
 
-#: ../app/tools/gimpvectortool.c:1976
+#: ../app/tools/gimpvectortool.c:1969
 msgid "There is no active layer or channel to stroke to"
 msgstr "目前沒有任何使用中的圖層或者色版可以用來描邊"
 
-#: ../app/tools/tools-enums.c:92
-msgctxt "rectangle-guide"
-msgid "No guides"
-msgstr "沒有參考線"
-
-#: ../app/tools/tools-enums.c:93
-msgctxt "rectangle-guide"
-msgid "Center lines"
-msgstr "中線"
-
-#: ../app/tools/tools-enums.c:94
-msgctxt "rectangle-guide"
-msgid "Rule of thirds"
-msgstr "三分定律"
-
-#: ../app/tools/tools-enums.c:95
-msgctxt "rectangle-guide"
-msgid "Rule of fifths"
-msgstr "五等分法"
-
-#: ../app/tools/tools-enums.c:96
-msgctxt "rectangle-guide"
-msgid "Golden sections"
-msgstr "黃金分割"
-
-#: ../app/tools/tools-enums.c:97
-msgctxt "rectangle-guide"
-msgid "Diagonal lines"
-msgstr "對角線"
-
-#: ../app/tools/tools-enums.c:187
+#: ../app/tools/tools-enums.c:150
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Aspect ratio"
 msgstr "長寬比"
 
-#: ../app/tools/tools-enums.c:188
+#: ../app/tools/tools-enums.c:151
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Width"
 msgstr "寬度"
 
-#: ../app/tools/tools-enums.c:189
+#: ../app/tools/tools-enums.c:152
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Height"
 msgstr "高度"
 
-#: ../app/tools/tools-enums.c:190
+#: ../app/tools/tools-enums.c:153
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Size"
 msgstr "大小"
 
-#: ../app/tools/tools-enums.c:219
+#: ../app/tools/tools-enums.c:182
 msgctxt "rect-select-mode"
 msgid "Free select"
 msgstr "自由選取"
 
-#: ../app/tools/tools-enums.c:220
+#: ../app/tools/tools-enums.c:183
 msgctxt "rect-select-mode"
 msgid "Fixed size"
 msgstr "固定尺寸"
 
-#: ../app/tools/tools-enums.c:221
+#: ../app/tools/tools-enums.c:184
 msgctxt "rect-select-mode"
 msgid "Fixed aspect ratio"
 msgstr "固定長寬比"
 
-#: ../app/tools/tools-enums.c:250
+#: ../app/tools/tools-enums.c:213
 msgctxt "transform-type"
 msgid "Layer"
 msgstr "圖層"
 
-#: ../app/tools/tools-enums.c:251
+#: ../app/tools/tools-enums.c:214
 msgctxt "transform-type"
 msgid "Selection"
 msgstr "選取區域"
 
-#: ../app/tools/tools-enums.c:252
+#: ../app/tools/tools-enums.c:215
 msgctxt "transform-type"
 msgid "Path"
 msgstr "路徑"
 
-#: ../app/tools/tools-enums.c:282
-msgctxt "transform-preview-type"
-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"
-msgid "Image + Grid"
-msgstr "圖片 + 格線"
-
-#: ../app/tools/tools-enums.c:313
-msgctxt "transform-grid-type"
-msgid "Number of grid lines"
-msgstr "格線數"
-
-#: ../app/tools/tools-enums.c:314
-msgctxt "transform-grid-type"
-msgid "Grid line spacing"
-msgstr "格線間距"
-
-#: ../app/tools/tools-enums.c:343
+#: ../app/tools/tools-enums.c:244
 msgctxt "vector-mode"
 msgid "Design"
 msgstr "初步設計"
 
-#: ../app/tools/tools-enums.c:344
+#: ../app/tools/tools-enums.c:245
 msgctxt "vector-mode"
 msgid "Edit"
 msgstr "編輯"
 
-#: ../app/tools/tools-enums.c:345
+#: ../app/tools/tools-enums.c:246
 msgctxt "vector-mode"
 msgid "Move"
 msgstr "移動"
@@ -13660,19 +14162,19 @@ msgstr "路徑無法再向上移。"
 msgid "Path cannot be lowered more."
 msgstr "路徑無法再向下移。"
 
-#: ../app/vectors/gimpvectors.c:365
+#: ../app/vectors/gimpvectors.c:364
 msgid "Move Path"
 msgstr "移動路徑"
 
-#: ../app/vectors/gimpvectors.c:464
+#: ../app/vectors/gimpvectors.c:463
 msgid "Flip Path"
 msgstr "翻轉路徑"
 
-#: ../app/vectors/gimpvectors.c:495
+#: ../app/vectors/gimpvectors.c:494
 msgid "Rotate Path"
 msgstr "旋轉路徑"
 
-#: ../app/vectors/gimpvectors.c:525
+#: ../app/vectors/gimpvectors.c:524
 msgid "Transform Path"
 msgstr "變換路徑"
 
@@ -13707,86 +14209,81 @@ msgstr "無法從‘%s’匯入路徑:%s"
 msgid "_Search:"
 msgstr "搜尋(_S):"
 
-#: ../app/widgets/gimpactiongroup.c:867
+#: ../app/widgets/gimpactiongroup.c:881
 #, 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:347
+#: ../app/widgets/gimpactionview.c:338
+#: ../app/widgets/gimpcontrollereditor.c:341
 msgid "Action"
 msgstr "動作"
 
-#: ../app/widgets/gimpactionview.c:366
+#: ../app/widgets/gimpactionview.c:367
 msgid "Shortcut"
 msgstr "捷徑鍵"
 
-#: ../app/widgets/gimpactionview.c:392
+#: ../app/widgets/gimpactionview.c:393
 msgid "Name"
 msgstr "名稱"
 
-#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832
+#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:843
 msgid "Changing shortcut failed."
 msgstr "無法更改捷徑鍵。"
 
-#: ../app/widgets/gimpactionview.c:669
+#: ../app/widgets/gimpactionview.c:670
 msgid "Conflicting Shortcuts"
 msgstr "捷徑鍵有衝突"
 
-#: ../app/widgets/gimpactionview.c:675
+#: ../app/widgets/gimpactionview.c:676
 msgid "_Reassign shortcut"
 msgstr "重新安排捷徑鍵(_R)"
 
-#: ../app/widgets/gimpactionview.c:690
+#: ../app/widgets/gimpactionview.c:691
 #, c-format
 msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group."
 msgstr "‘%3$s’ 群組中的 ‘%2$s’ 已經使用了捷徑鍵 ‘%1$s’。"
 
-#: ../app/widgets/gimpactionview.c:694
+#: ../app/widgets/gimpactionview.c:695
 #, 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:778
 msgid "Invalid shortcut."
 msgstr "捷徑鍵不合法。"
 
-#: ../app/widgets/gimpactionview.c:856
+#: ../app/widgets/gimpactionview.c:867
 msgid "Removing shortcut failed."
 msgstr "無法移除捷徑鍵。"
 
-#: ../app/widgets/gimpbrusheditor.c:153
-msgid "Radius:"
-msgstr "半徑:"
-
-#: ../app/widgets/gimpbrusheditor.c:168
-msgid "Spikes:"
+#: ../app/widgets/gimpbrusheditor.c:166
+#, fuzzy
+#| msgid "Spikes:"
+msgid "Spikes"
 msgstr "尖端數:"
 
-#: ../app/widgets/gimpbrusheditor.c:181
-msgid "Hardness:"
-msgstr "硬度:"
+#: ../app/widgets/gimpbrusheditor.c:177
+msgid "Hardness"
+msgstr "硬度"
 
-#: ../app/widgets/gimpbrusheditor.c:194
-msgid "Aspect ratio:"
-msgstr "長寬比:"
+#: ../app/widgets/gimpbrusheditor.c:188
+msgid "Aspect ratio"
+msgstr "長寬比"
 
-#: ../app/widgets/gimpbrusheditor.c:220
-#: ../app/widgets/gimpbrushfactoryview.c:81
-msgid "Spacing:"
-msgstr "間隔:"
+#: ../app/widgets/gimpbrusheditor.c:210
+#: ../app/widgets/gimpbrushfactoryview.c:80
+#: ../app/widgets/gimpgrideditor.c:174
+msgid "Spacing"
+msgstr "間隔"
 
-#: ../app/widgets/gimpbrusheditor.c:223
+#: ../app/widgets/gimpbrusheditor.c:215
 #: ../app/widgets/gimpbrushfactoryview.c:84
 msgid "Percentage of width of brush"
 msgstr "筆刷寬度百分比"
 
-#: ../app/widgets/gimpbrushselect.c:180 ../app/widgets/gimplayertreeview.c:289
-msgid "Opacity:"
-msgstr "不透明度:"
-
-#: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257
-#: ../app/widgets/gimpeditor.c:737
+#: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264
+#: ../app/widgets/gimpeditor.c:747
 msgid "(None)"
 msgstr "(無)"
 
@@ -13794,41 +14291,41 @@ msgstr "(無)"
 msgid "Add the current color to the color history"
 msgstr "將目前的顏色加入色彩使用紀錄"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:154
+#: ../app/widgets/gimpcolordisplayeditor.c:157
 msgid "Available Filters"
 msgstr "可使用的濾色片"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:215
+#: ../app/widgets/gimpcolordisplayeditor.c:219
 msgid "Move the selected filter up"
 msgstr "將選取的濾色片上移"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:224
+#: ../app/widgets/gimpcolordisplayeditor.c:228
 msgid "Move the selected filter down"
 msgstr "將選取的濾色片下移"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:270
+#: ../app/widgets/gimpcolordisplayeditor.c:274
 msgid "Active Filters"
 msgstr "使用中的濾色片"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:321
+#: ../app/widgets/gimpcolordisplayeditor.c:325
 msgid "Reset the selected filter to default values"
 msgstr "還原選取的濾鏡為預設數值"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:495
+#: ../app/widgets/gimpcolordisplayeditor.c:527
 #, c-format
 msgid "Add '%s' to the list of active filters"
 msgstr "將「%s」加入使用中濾鏡清單"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:532
+#: ../app/widgets/gimpcolordisplayeditor.c:564
 #, c-format
 msgid "Remove '%s' from the list of active filters"
 msgstr "從使用中濾鏡清單中移除「%s」"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:563
+#: ../app/widgets/gimpcolordisplayeditor.c:595
 msgid "No filter selected"
 msgstr "未選取濾鏡"
 
-#: ../app/widgets/gimpcoloreditor.c:259
+#: ../app/widgets/gimpcoloreditor.c:260
 msgid ""
 "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
 "CSS color names."
@@ -13886,15 +14383,15 @@ msgstr "黑:"
 msgid "Alpha:"
 msgstr "透明:"
 
-#: ../app/widgets/gimpcolormapeditor.c:201
+#: ../app/widgets/gimpcolormapeditor.c:200
 msgid "Color index:"
 msgstr "色彩索引:"
 
-#: ../app/widgets/gimpcolormapeditor.c:211
+#: ../app/widgets/gimpcolormapeditor.c:210
 msgid "HTML notation:"
 msgstr "HTML 方式表示:"
 
-#: ../app/widgets/gimpcolormapeditor.c:473
+#: ../app/widgets/gimpcolormapeditor.c:466
 msgid "Only indexed images have a colormap."
 msgstr "只有索引式圖片有顏色對應表。"
 
@@ -13902,149 +14399,150 @@ msgstr "只有索引式圖片有顏色對應表。"
 msgid "Palette"
 msgstr "調色盤"
 
-#: ../app/widgets/gimpcontainerpopup.c:578
+#: ../app/widgets/gimpcontainerpopup.c:595
 msgid "Smaller Previews"
 msgstr "將預覽圖縮小"
 
-#: ../app/widgets/gimpcontainerpopup.c:583
+#: ../app/widgets/gimpcontainerpopup.c:600
 msgid "Larger Previews"
 msgstr "將預覽圖放大"
 
-#: ../app/widgets/gimpcontrollereditor.c:204
+#: ../app/widgets/gimpcontrollereditor.c:198
 msgid "_Dump events from this controller"
 msgstr "傾印這個控制器的事件(_D)"
 
-#: ../app/widgets/gimpcontrollereditor.c:209
+#: ../app/widgets/gimpcontrollereditor.c:203
 msgid "_Enable this controller"
 msgstr "啟用這個控制器(_E)"
 
-#: ../app/widgets/gimpcontrollereditor.c:230
+#: ../app/widgets/gimpcontrollereditor.c:224
 msgid "Name:"
 msgstr "名稱(_N):"
 
-#: ../app/widgets/gimpcontrollereditor.c:236
+#: ../app/widgets/gimpcontrollereditor.c:230
 msgid "State:"
 msgstr "狀態:"
 
-#: ../app/widgets/gimpcontrollereditor.c:341
+#: ../app/widgets/gimpcontrollereditor.c:335
 msgid "Event"
 msgstr "事件"
 
-#: ../app/widgets/gimpcontrollereditor.c:366
+#: ../app/widgets/gimpcontrollereditor.c:360
 msgid "_Grab event"
 msgstr "抓取事件(_G)"
 
-#: ../app/widgets/gimpcontrollereditor.c:375
+#: ../app/widgets/gimpcontrollereditor.c:369
 msgid "Select the next event arriving from the controller"
 msgstr "選擇下一個送達此控制器的事件"
 
-#: ../app/widgets/gimpcontrollereditor.c:533
+#: ../app/widgets/gimpcontrollereditor.c:525
 #, c-format
 msgid "Remove the action assigned to '%s'"
 msgstr "移除指派給“%s”的動作"
 
-#: ../app/widgets/gimpcontrollereditor.c:538
+#: ../app/widgets/gimpcontrollereditor.c:530
 #, c-format
 msgid "Assign an action to '%s'"
 msgstr "指派動作給“%s”"
 
-#: ../app/widgets/gimpcontrollereditor.c:659
+#: ../app/widgets/gimpcontrollereditor.c:651
 #, c-format
 msgid "Select Action for Event '%s'"
 msgstr "選擇事件“%s”的動作"
 
-#: ../app/widgets/gimpcontrollereditor.c:664
+#: ../app/widgets/gimpcontrollereditor.c:656
 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:67
+#: ../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
 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:92
+#: ../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
 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:117
+#: ../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
 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:142
+#: ../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
 msgid "Cursor Right"
 msgstr "游標右移"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:177
+#: ../app/widgets/gimpcontrollerkeyboard.c:175
 msgid "Keyboard"
 msgstr "鍵盤"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:221
+#: ../app/widgets/gimpcontrollerkeyboard.c:216
 msgid "Keyboard Events"
 msgstr "鍵盤事件"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:222
-#: ../app/widgets/gimpcontrollerwheel.c:224
+#: ../app/widgets/gimpcontrollerkeyboard.c:217
+#: ../app/widgets/gimpcontrollermouse.c:245
+#: ../app/widgets/gimpcontrollerwheel.c:219
 msgid "Ready"
 msgstr "就緒"
 
-#: ../app/widgets/gimpcontrollerlist.c:184
+#: ../app/widgets/gimpcontrollerlist.c:182
 msgid "Available Controllers"
 msgstr "可用的控制器"
 
-#: ../app/widgets/gimpcontrollerlist.c:276
+#: ../app/widgets/gimpcontrollerlist.c:277
 msgid "Active Controllers"
 msgstr "使用中控制器"
 
-#: ../app/widgets/gimpcontrollerlist.c:292
+#: ../app/widgets/gimpcontrollerlist.c:293
 msgid "Configure the selected controller"
 msgstr "設定選取的控制器"
 
-#: ../app/widgets/gimpcontrollerlist.c:300
+#: ../app/widgets/gimpcontrollerlist.c:301
 msgid "Move the selected controller up"
 msgstr "將選取的控制器上移"
 
-#: ../app/widgets/gimpcontrollerlist.c:308
+#: ../app/widgets/gimpcontrollerlist.c:309
 msgid "Move the selected controller down"
 msgstr "將選取的控制器往下移動"
 
-#: ../app/widgets/gimpcontrollerlist.c:432
+#: ../app/widgets/gimpcontrollerlist.c:427
 #, c-format
 msgid "Add '%s' to the list of active controllers"
 msgstr "將“%s”加入使用中控制器的清單"
 
-#: ../app/widgets/gimpcontrollerlist.c:483
+#: ../app/widgets/gimpcontrollerlist.c:478
 #, c-format
 msgid "Remove '%s' from the list of active controllers"
 msgstr "從使用中控制器清單移除「%s」"
 
-#: ../app/widgets/gimpcontrollerlist.c:517
+#: ../app/widgets/gimpcontrollerlist.c:512
 msgid ""
 "There can only be one active keyboard controller.\n"
 "\n"
@@ -14054,7 +14552,7 @@ msgstr ""
 "\n"
 "您的使用中控制器清單中已經有鍵盤控制器了。"
 
-#: ../app/widgets/gimpcontrollerlist.c:528
+#: ../app/widgets/gimpcontrollerlist.c:523
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
@@ -14064,24 +14562,39 @@ msgstr ""
 "\n"
 "您的使用中控制器清單中已經有 wheel 控制器了。"
 
-#: ../app/widgets/gimpcontrollerlist.c:554
+#: ../app/widgets/gimpcontrollerlist.c:534
+#, fuzzy
+#| msgid ""
+#| "There can only be one active wheel controller.\n"
+#| "\n"
+#| "You already have a wheel controller in your list of active controllers."
+msgid ""
+"There can only be one active mouse controller.\n"
+"\n"
+"You already have a mouse controller in your list of active controllers."
+msgstr ""
+"只能有一個使用中的 wheel 控制器。\n"
+"\n"
+"您的使用中控制器清單中已經有 wheel 控制器了。"
+
+#: ../app/widgets/gimpcontrollerlist.c:560
 msgid "Remove Controller?"
 msgstr "是否移除控制器?"
 
-#: ../app/widgets/gimpcontrollerlist.c:559
+#: ../app/widgets/gimpcontrollerlist.c:565
 msgid "Disable Controller"
 msgstr "停用控制器"
 
-#: ../app/widgets/gimpcontrollerlist.c:561
+#: ../app/widgets/gimpcontrollerlist.c:567
 msgid "Remove Controller"
 msgstr "移除控制器"
 
-#: ../app/widgets/gimpcontrollerlist.c:573
+#: ../app/widgets/gimpcontrollerlist.c:579
 #, c-format
 msgid "Remove Controller '%s'?"
 msgstr "是否移除控制器“%s”?"
 
-#: ../app/widgets/gimpcontrollerlist.c:577
+#: ../app/widgets/gimpcontrollerlist.c:583
 msgid ""
 "Removing this controller from the list of active controllers will "
 "permanently delete all event mappings you have configured.\n"
@@ -14093,89 +14606,152 @@ msgstr ""
 "\n"
 "選擇「停用控制器」只會停用該控制器而不會移除它。"
 
-#: ../app/widgets/gimpcontrollerlist.c:629
+#: ../app/widgets/gimpcontrollerlist.c:635
 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/gimpcontrollermouse.c:70
+#: ../app/widgets/gimpcontrollermouse.c:73
+#: ../app/widgets/gimpcontrollermouse.c:76
+#: ../app/widgets/gimpcontrollermouse.c:79
+#: ../app/widgets/gimpcontrollermouse.c:82
+#: ../app/widgets/gimpcontrollermouse.c:85
+#: ../app/widgets/gimpcontrollermouse.c:88
+#: ../app/widgets/gimpcontrollermouse.c:91
+msgid "Button 8"
+msgstr "按鈕 8"
+
+#: ../app/widgets/gimpcontrollermouse.c:95
+#: ../app/widgets/gimpcontrollermouse.c:98
+#: ../app/widgets/gimpcontrollermouse.c:101
+#: ../app/widgets/gimpcontrollermouse.c:104
+#: ../app/widgets/gimpcontrollermouse.c:107
+#: ../app/widgets/gimpcontrollermouse.c:110
+#: ../app/widgets/gimpcontrollermouse.c:113
+#: ../app/widgets/gimpcontrollermouse.c:116
+msgid "Button 9"
+msgstr "按鈕 9"
+
+#: ../app/widgets/gimpcontrollermouse.c:120
+#: ../app/widgets/gimpcontrollermouse.c:123
+#: ../app/widgets/gimpcontrollermouse.c:126
+#: ../app/widgets/gimpcontrollermouse.c:129
+#: ../app/widgets/gimpcontrollermouse.c:132
+#: ../app/widgets/gimpcontrollermouse.c:135
+#: ../app/widgets/gimpcontrollermouse.c:138
+#: ../app/widgets/gimpcontrollermouse.c:141
+msgid "Button 10"
+msgstr "按鈕 10"
+
+#: ../app/widgets/gimpcontrollermouse.c:145
+#: ../app/widgets/gimpcontrollermouse.c:148
+#: ../app/widgets/gimpcontrollermouse.c:151
+#: ../app/widgets/gimpcontrollermouse.c:154
+#: ../app/widgets/gimpcontrollermouse.c:157
+#: ../app/widgets/gimpcontrollermouse.c:160
+#: ../app/widgets/gimpcontrollermouse.c:163
+#: ../app/widgets/gimpcontrollermouse.c:166
+msgid "Button 11"
+msgstr "按鈕 11"
+
+#: ../app/widgets/gimpcontrollermouse.c:170
+#: ../app/widgets/gimpcontrollermouse.c:173
+#: ../app/widgets/gimpcontrollermouse.c:176
+#: ../app/widgets/gimpcontrollermouse.c:179
+#: ../app/widgets/gimpcontrollermouse.c:182
+#: ../app/widgets/gimpcontrollermouse.c:185
+#: ../app/widgets/gimpcontrollermouse.c:188
+#: ../app/widgets/gimpcontrollermouse.c:191
+msgid "Button 12"
+msgstr "按鈕 12"
+
+#: ../app/widgets/gimpcontrollermouse.c:203
+msgid "Mouse Buttons"
+msgstr "滑鼠按鈕"
+
+#: ../app/widgets/gimpcontrollermouse.c:244
+msgid "Mouse Button Events"
+msgstr "滑鼠按鈕事件"
+
+#: ../app/widgets/gimpcontrollerwheel.c:69
+#: ../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
 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:94
+#: ../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
 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:119
+#: ../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
 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:144
+#: ../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
 msgid "Scroll Right"
 msgstr "向右滾動"
 
-#: ../app/widgets/gimpcontrollerwheel.c:179
+#: ../app/widgets/gimpcontrollerwheel.c:177
 msgid "Mouse Wheel"
 msgstr "滑鼠滾輪"
 
-#: ../app/widgets/gimpcontrollerwheel.c:223
+#: ../app/widgets/gimpcontrollerwheel.c:218
 msgid "Mouse Wheel Events"
 msgstr "滑鼠滾輪事件"
 
-#: ../app/widgets/gimpdataeditor.c:221
+#: ../app/widgets/gimpdataeditor.c:215
 msgid "Save"
 msgstr "儲存"
 
-#: ../app/widgets/gimpdataeditor.c:229
+#: ../app/widgets/gimpdataeditor.c:223
 msgid "Revert"
 msgstr "還原"
 
-#: ../app/widgets/gimpdataeditor.c:445
+#: ../app/widgets/gimpdataeditor.c:435
 #, c-format
 msgid "%s (read only)"
 msgstr "%s (唯讀)"
 
-#: ../app/widgets/gimpdeviceeditor.c:168
+#: ../app/widgets/gimpdeviceeditor.c:165
 msgid "Delete the selected device"
 msgstr "刪除選取的裝置"
 
-#: ../app/widgets/gimpdeviceeditor.c:510
+#: ../app/widgets/gimpdeviceeditor.c:502
 msgid "Delete Device Settings"
 msgstr "刪除裝置的設定:"
 
-#: ../app/widgets/gimpdeviceeditor.c:531
+#: ../app/widgets/gimpdeviceeditor.c:523
 #, c-format
 msgid "Delete \"%s\"?"
 msgstr "刪除[%s] ?"
 
-#: ../app/widgets/gimpdeviceeditor.c:534
+#: ../app/widgets/gimpdeviceeditor.c:526
 msgid ""
 "You are about to delete this device's stored settings.\n"
 "The next time this device is plugged, default settings will be used."
@@ -14183,100 +14759,100 @@ msgstr ""
 "您將要刪除這個裝置的儲存設定。\n"
 "下次這個裝置插入時,預設的設定將被使用。"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:142
-#: ../app/widgets/gimpdynamicseditor.c:143
-#: ../app/widgets/gimpdynamicsoutputeditor.c:212
+#: ../app/widgets/gimpdeviceinfoeditor.c:140
+#: ../app/widgets/gimpdynamicseditor.c:141
+#: ../app/widgets/gimpdynamicsoutputeditor.c:69
 msgid "Pressure"
 msgstr "壓力"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:143
+#: ../app/widgets/gimpdeviceinfoeditor.c:141
 msgid "X tilt"
 msgstr "X 傾斜"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:144
+#: ../app/widgets/gimpdeviceinfoeditor.c:142
 msgid "Y tilt"
 msgstr "Y 傾斜"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:145
-#: ../app/widgets/gimpdynamicseditor.c:147
-#: ../app/widgets/gimpdynamicsoutputeditor.c:240
+#. Wheel as in mouse or input device wheel
+#: ../app/widgets/gimpdeviceinfoeditor.c:144
+#: ../app/widgets/gimpdynamicseditor.c:145
+#: ../app/widgets/gimpdynamicsoutputeditor.c:73
 msgid "Wheel"
-msgstr "打轉"
+msgstr "滾輪"
 
 #. the axes
+#. The axes of an input device
 #: ../app/widgets/gimpdeviceinfoeditor.c:195
-#, fuzzy
 msgid "Axes"
-msgstr "軸"
+msgstr "軸向"
 
 #. the keys
 #: ../app/widgets/gimpdeviceinfoeditor.c:269
-#, fuzzy
 msgid "Keys"
 msgstr "接鍵"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:369
-#: ../app/widgets/gimpdeviceinfoeditor.c:587
+#: ../app/widgets/gimpdeviceinfoeditor.c:366
+#: ../app/widgets/gimpdeviceinfoeditor.c:585
 #, c-format
 msgid "none"
 msgstr "無"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:417
+#. e.g. "Pressure Curve" for mapping input device axes
+#: ../app/widgets/gimpdeviceinfoeditor.c:415
 #, c-format
 msgid "%s Curve"
 msgstr "%s 曲線"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:476
-#: ../app/widgets/gimpdynamicsoutputeditor.c:195
+#: ../app/widgets/gimpdeviceinfoeditor.c:474
+#: ../app/widgets/gimpdynamicsoutputeditor.c:209
 msgid "_Reset Curve"
 msgstr "重設曲線(_R)"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:489
-#, fuzzy, c-format
+#: ../app/widgets/gimpdeviceinfoeditor.c:487
+#, c-format
 msgid "The axis '%s' has no curve"
-msgstr "沒有應用程式取得焦點。"
+msgstr "「%s」軸沒有曲線"
 
-#: ../app/widgets/gimpdevicestatus.c:136
+#: ../app/widgets/gimpdevicestatus.c:137
 msgid "Save device status"
 msgstr "儲存裝置狀態"
 
-#: ../app/widgets/gimpdevicestatus.c:440
+#: ../app/widgets/gimpdevicestatus.c:433
 #, c-format
 msgid "Foreground: %d, %d, %d"
 msgstr "前景顏色:%d,%d,%d"
 
-#: ../app/widgets/gimpdevicestatus.c:445
+#: ../app/widgets/gimpdevicestatus.c:438
 #, c-format
 msgid "Background: %d, %d, %d"
 msgstr "背景顏色:%d,%d,%d"
 
-#: ../app/widgets/gimpdnd-xds.c:203
+#: ../app/widgets/gimpdnd-xds.c:204
 msgid "The given filename does not have any known file extension."
 msgstr "指定的檔案名稱沒有任何已知的延伸檔名。"
 
-#: ../app/widgets/gimpdnd-xds.c:221
+#: ../app/widgets/gimpdnd-xds.c:222
 msgid "File Exists"
 msgstr "檔案已存在"
 
-#: ../app/widgets/gimpdnd-xds.c:226
+#: ../app/widgets/gimpdnd-xds.c:227
 msgid "_Replace"
 msgstr "取代(_R)"
 
-#: ../app/widgets/gimpdnd-xds.c:237
+#: ../app/widgets/gimpdnd-xds.c:238
 #, c-format
 msgid "A file named '%s' already exists."
 msgstr "名稱為 ‘%s’ 的檔案已經存在。"
 
-#: ../app/widgets/gimpdnd-xds.c:242
+#: ../app/widgets/gimpdnd-xds.c:243
 msgid "Do you want to replace it with the image you are saving?"
 msgstr "是否將準備儲存的圖片取代原來的圖片?"
 
 #. String used to separate dockables, e.g. "Tool Options, Layers"
 #: ../app/widgets/gimpdock.h:34
-#, fuzzy
 msgctxt "dock"
 msgid ", "
-msgstr " "
+msgstr "、"
 
 #. String used to separate books (GtkNotebooks) within a dock,
 #. e.g. "Tool Options, Layers - Brushes"
@@ -14294,40 +14870,40 @@ msgctxt "dock"
 msgid " | "
 msgstr "|"
 
-#: ../app/widgets/gimpdockbook.c:290
+#: ../app/widgets/gimpdockbook.c:291
 msgid "Configure this tab"
 msgstr "設定這個分頁"
 
 #. Auto button
-#: ../app/widgets/gimpdockwindow.c:353
+#: ../app/widgets/gimpdockwindow.c:384
 msgid "Auto"
 msgstr "自動"
 
-#: ../app/widgets/gimpdockwindow.c:364
+#: ../app/widgets/gimpdockwindow.c:395
 msgid ""
 "When enabled the dialog automatically follows the image you are working on."
 msgstr "啟用時,對話盒會自動隨您正在操作的圖片而變動。"
 
-#: ../app/widgets/gimpdrawabletreeview.c:124
+#: ../app/widgets/gimpdrawabletreeview.c:122
 msgid "Lock pixels"
 msgstr "鎖定像素"
 
-#: ../app/widgets/gimpdynamicseditor.c:137
+#: ../app/widgets/gimpdynamicseditor.c:135
 msgid "Mapping matrix"
 msgstr "映射矩陣"
 
-#: ../app/widgets/gimpdynamicseditor.c:144
-#: ../app/widgets/gimpdynamicsoutputeditor.c:219
+#: ../app/widgets/gimpdynamicseditor.c:142
+#: ../app/widgets/gimpdynamicsoutputeditor.c:70
 msgid "Velocity"
 msgstr "速度"
 
-#: ../app/widgets/gimpdynamicseditor.c:148
-#: ../app/widgets/gimpdynamicsoutputeditor.c:247
+#: ../app/widgets/gimpdynamicseditor.c:146
+#: ../app/widgets/gimpdynamicsoutputeditor.c:74
 msgid "Random"
 msgstr "隨機"
 
-#: ../app/widgets/gimpdynamicseditor.c:149
-#: ../app/widgets/gimpdynamicsoutputeditor.c:254
+#: ../app/widgets/gimpdynamicseditor.c:147
+#: ../app/widgets/gimpdynamicsoutputeditor.c:75
 msgid "Fade"
 msgstr "淡化"
 
@@ -14339,176 +14915,179 @@ msgstr "錯誤訊息太多!"
 msgid "Messages are redirected to stderr."
 msgstr "訊息會重新導向至標準錯誤輸出。"
 
-#: ../app/widgets/gimperrordialog.c:170
+#. %s is a message domain,
+#. * like "GIMP Message" or
+#. * "PNG Message"
+#.
+#: ../app/widgets/gimperrordialog.c:174
 #, c-format
 msgid "%s Message"
 msgstr "%s 提示訊息"
 
-#: ../app/widgets/gimpfiledialog.c:327
+#: ../app/widgets/gimpfiledialog.c:330
 msgid "Automatically Detected"
 msgstr "自動偵測"
 
-#: ../app/widgets/gimpfiledialog.c:344
+#: ../app/widgets/gimpfiledialog.c:347
 msgid "By Extension"
 msgstr "依延伸檔名"
 
-#: ../app/widgets/gimpfiledialog.c:800
+#: ../app/widgets/gimpfiledialog.c:801
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../app/widgets/gimpfiledialog.c:805
+#: ../app/widgets/gimpfiledialog.c:806
 msgid "All images"
 msgstr "所有圖片"
 
-#: ../app/widgets/gimpfiledialog.c:981
+#: ../app/widgets/gimpfiledialog.c:813
+msgid "All XCF images"
+msgstr "所有 XCF 圖片"
+
+#: ../app/widgets/gimpfiledialog.c:815
+msgid "All export images"
+msgstr "所有匯出圖片"
+
+#: ../app/widgets/gimpfiledialog.c:999
 #, c-format
 msgid "Select File _Type (%s)"
-msgstr "選擇檔案格式 [%s] (_T)"
+msgstr "選擇檔案格式 (%s)(_T)"
 
-#: ../app/widgets/gimpfileprocview.c:186
+#: ../app/widgets/gimpfileprocview.c:185
 msgid "File Type"
 msgstr "檔案格式"
 
-#: ../app/widgets/gimpfileprocview.c:198
+#: ../app/widgets/gimpfileprocview.c:197
 msgid "Extensions"
 msgstr "依延伸檔名"
 
-#: ../app/widgets/gimpfilleditor.c:130
+#: ../app/widgets/gimpfilleditor.c:124
 msgid "Fill Color"
 msgstr "填入色彩"
 
-#: ../app/widgets/gimpfilleditor.c:149
+#: ../app/widgets/gimpfilleditor.c:143
 msgid "_Antialiasing"
 msgstr "反鋸齒(_A)"
 
-#. Instant update toggle
-#: ../app/widgets/gimpgradienteditor.c:411
-msgid "Instant update"
-msgstr "即時更新"
-
-#: ../app/widgets/gimpgradienteditor.c:773
+#: ../app/widgets/gimpgradienteditor.c:753
 #, c-format
 msgid "Zoom factor: %d:1"
 msgstr "縮放倍率: %d:1"
 
-#: ../app/widgets/gimpgradienteditor.c:776
+#: ../app/widgets/gimpgradienteditor.c:756
 #, c-format
 msgid "Displaying [%0.4f, %0.4f]"
 msgstr "顯示 [%0.4f, %0.4f]"
 
-#: ../app/widgets/gimpgradienteditor.c:995
+#: ../app/widgets/gimpgradienteditor.c:953
 #, c-format
 msgid "Position: %0.4f"
 msgstr "位置:%0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:996
+#: ../app/widgets/gimpgradienteditor.c:954
 #, c-format
 msgid "RGB (%0.3f, %0.3f, %0.3f)"
 msgstr "RGB (%0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpgradienteditor.c:998
+#: ../app/widgets/gimpgradienteditor.c:956
 #, c-format
 msgid "HSV (%0.1f, %0.1f, %0.1f)"
 msgstr "HSV (%0.1f, %0.1f, %0.1f)"
 
-#: ../app/widgets/gimpgradienteditor.c:1000
+#: ../app/widgets/gimpgradienteditor.c:958
 #, c-format
 msgid "Luminance: %0.1f    Opacity: %0.1f"
 msgstr "亮度:%0.1f  不透明度(透明=0):%0.1f"
 
-#: ../app/widgets/gimpgradienteditor.c:1031
+#: ../app/widgets/gimpgradienteditor.c:989
 #, c-format
 msgid "RGB (%d, %d, %d)"
 msgstr "RGB (%d,%d,%d)"
 
-#: ../app/widgets/gimpgradienteditor.c:1042
+#: ../app/widgets/gimpgradienteditor.c:1000
 msgid "Foreground color set to:"
-msgstr "前景顏色設定為:"
+msgstr "前景顏色設定為:"
 
-#: ../app/widgets/gimpgradienteditor.c:1049
+#: ../app/widgets/gimpgradienteditor.c:1007
 msgid "Background color set to:"
-msgstr "背景顏色設定為:"
+msgstr "背景顏色設定為:"
 
-#: ../app/widgets/gimpgradienteditor.c:1283
-#: ../app/widgets/gimpgradienteditor.c:1349
+#: ../app/widgets/gimpgradienteditor.c:1235
+#: ../app/widgets/gimpgradienteditor.c:1296
 #, c-format
-msgid "%s%sDrag: move & compress"
-msgstr "%s%s拖曳:移動及壓縮"
+msgid "%s-Drag: move & compress"
+msgstr "%s-拖曳:移動及壓縮"
 
-#: ../app/widgets/gimpgradienteditor.c:1289
+#: ../app/widgets/gimpgradienteditor.c:1240
 msgid "Drag: move"
 msgstr "拖曳:移動"
 
-#: ../app/widgets/gimpgradienteditor.c:1296
-#: ../app/widgets/gimpgradienteditor.c:1310
-#: ../app/widgets/gimpgradienteditor.c:1324
-#: ../app/widgets/gimpgradienteditor.c:1346
+#: ../app/widgets/gimpgradienteditor.c:1247
+#: ../app/widgets/gimpgradienteditor.c:1260
+#: ../app/widgets/gimpgradienteditor.c:1273
+#: ../app/widgets/gimpgradienteditor.c:1294
 #, c-format
-msgid "%s%sClick: extend selection"
-msgstr "%s%s按下按鈕:擴展選擇區"
+msgid "%s-Click: extend selection"
+msgstr "%s-點按:擴展選擇區域"
 
-#: ../app/widgets/gimpgradienteditor.c:1302
-#: ../app/widgets/gimpgradienteditor.c:1316
+#: ../app/widgets/gimpgradienteditor.c:1252
+#: ../app/widgets/gimpgradienteditor.c:1265
 msgid "Click: select"
 msgstr "按下按鈕:選取"
 
-#: ../app/widgets/gimpgradienteditor.c:1330
-#: ../app/widgets/gimpgradienteditor.c:1354
+#: ../app/widgets/gimpgradienteditor.c:1278
+#: ../app/widgets/gimpgradienteditor.c:1300
 msgid "Click: select    Drag: move"
 msgstr "按下按鈕:選取    拖曳:移動"
 
-#: ../app/widgets/gimpgradienteditor.c:1569
-#: ../app/widgets/gimpgradienteditor.c:1577
+#: ../app/widgets/gimpgradienteditor.c:1515
+#: ../app/widgets/gimpgradienteditor.c:1523
 #, c-format
 msgid "Handle position: %0.4f"
 msgstr "控制柄位置: %0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:1594
+#: ../app/widgets/gimpgradienteditor.c:1540
 #, c-format
 msgid "Distance: %0.4f"
 msgstr "距離:%0.4f"
 
-#: ../app/widgets/gimpgrideditor.c:218
+#: ../app/widgets/gimpgrideditor.c:147
 msgid "Line _style:"
 msgstr "線條樣式(_S):"
 
-#: ../app/widgets/gimpgrideditor.c:222
+#: ../app/widgets/gimpgrideditor.c:151
 msgid "Change grid foreground color"
 msgstr "更改格線前景顏色"
 
-#: ../app/widgets/gimpgrideditor.c:229
+#: ../app/widgets/gimpgrideditor.c:158
 msgid "_Foreground color:"
 msgstr "前景顏色(_F):"
 
-#: ../app/widgets/gimpgrideditor.c:233
+#: ../app/widgets/gimpgrideditor.c:162
 msgid "Change grid background color"
 msgstr "更改格線背景顏色"
 
-#: ../app/widgets/gimpgrideditor.c:240
+#: ../app/widgets/gimpgrideditor.c:169
 msgid "_Background color:"
 msgstr "背景顏色(_B):"
 
-#: ../app/widgets/gimpgrideditor.c:245
-msgid "Spacing"
-msgstr "間隔"
-
-#: ../app/widgets/gimpgrideditor.c:266 ../app/widgets/gimpgrideditor.c:298
+#: ../app/widgets/gimpgrideditor.c:195 ../app/widgets/gimpgrideditor.c:227
 msgid "Width"
 msgstr "寬度"
 
-#: ../app/widgets/gimpgrideditor.c:268 ../app/widgets/gimpgrideditor.c:300
+#: ../app/widgets/gimpgrideditor.c:197 ../app/widgets/gimpgrideditor.c:229
 msgid "Height"
 msgstr "高度"
 
-#: ../app/widgets/gimphelp.c:293
+#: ../app/widgets/gimphelp.c:297
 msgid "Help browser is missing"
 msgstr "說明文件瀏覽器遺失"
 
-#: ../app/widgets/gimphelp.c:294
+#: ../app/widgets/gimphelp.c:298
 msgid "The GIMP help browser is not available."
 msgstr "GIMP 說明文件瀏覽器無法使用。"
 
-#: ../app/widgets/gimphelp.c:295
+#: ../app/widgets/gimphelp.c:299
 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."
@@ -14516,31 +15095,31 @@ msgstr ""
 "安裝 GIMP 時似乎沒有同時安裝有關說明文件瀏覽器的增效模組。您可以使用網頁瀏覽"
 "器閱讀說明文件。"
 
-#: ../app/widgets/gimphelp.c:336
+#: ../app/widgets/gimphelp.c:340
 msgid "Help browser doesn't start"
 msgstr "說明文件瀏覽器無法啟動"
 
-#: ../app/widgets/gimphelp.c:337
+#: ../app/widgets/gimphelp.c:341
 msgid "Could not start the GIMP help browser plug-in."
 msgstr "無法啟動 GIMP 說明文件瀏覽器增效模組。"
 
-#: ../app/widgets/gimphelp.c:364
+#: ../app/widgets/gimphelp.c:368
 msgid "Use _Web Browser"
 msgstr "使用網頁瀏覽器(_W)"
 
-#: ../app/widgets/gimphelp.c:610
+#: ../app/widgets/gimphelp.c:712
 msgid "GIMP user manual is missing"
 msgstr "GIMP 使用者手冊不見了"
 
-#: ../app/widgets/gimphelp.c:617
+#: ../app/widgets/gimphelp.c:719
 msgid "_Read Online"
 msgstr "線上閱讀(_R)"
 
-#: ../app/widgets/gimphelp.c:641
+#: ../app/widgets/gimphelp.c:743
 msgid "The GIMP user manual is not installed on your computer."
 msgstr "GIMP 使用者手冊並未安裝在您的電腦上。"
 
-#: ../app/widgets/gimphelp.c:644
+#: ../app/widgets/gimphelp.c:746
 msgid ""
 "You may either install the additional help package or change your "
 "preferences to use the online version."
@@ -14585,121 +15164,115 @@ msgid ""
 "Edit→Preferences→Default Image."
 msgstr "替換目前的圖片備註,用設置在[編輯]→[偏好設定]→[預設圖片]中的備註內容。"
 
-#: ../app/widgets/gimpimageprofileview.c:200
+#: ../app/widgets/gimpimageprofileview.c:202
 msgid "Querying..."
 msgstr "查詢中..."
 
-#: ../app/widgets/gimpimagepropview.c:122
+#: ../app/widgets/gimpimagepropview.c:113
 msgid "Size in pixels:"
 msgstr "尺寸以像素計:"
 
-#: ../app/widgets/gimpimagepropview.c:125
+#: ../app/widgets/gimpimagepropview.c:116
 msgid "Print size:"
 msgstr "列印尺寸:"
 
-#: ../app/widgets/gimpimagepropview.c:128
+#: ../app/widgets/gimpimagepropview.c:119
 msgid "Resolution:"
 msgstr "解析度:"
 
-#: ../app/widgets/gimpimagepropview.c:131
+#: ../app/widgets/gimpimagepropview.c:122
 msgid "Color space:"
 msgstr "色彩空間"
 
-#: ../app/widgets/gimpimagepropview.c:136
+#: ../app/widgets/gimpimagepropview.c:127
 msgid "File Name:"
 msgstr "檔案名稱(_N):"
 
-#: ../app/widgets/gimpimagepropview.c:142
+#: ../app/widgets/gimpimagepropview.c:133
 msgid "File Size:"
 msgstr "檔案大小:"
 
-#: ../app/widgets/gimpimagepropview.c:145
+#: ../app/widgets/gimpimagepropview.c:136
 msgid "File Type:"
 msgstr "檔案類型:"
 
-#: ../app/widgets/gimpimagepropview.c:150
+#: ../app/widgets/gimpimagepropview.c:141
 msgid "Size in memory:"
 msgstr "佔用記憶數目:"
 
-#: ../app/widgets/gimpimagepropview.c:153
+#: ../app/widgets/gimpimagepropview.c:144
 msgid "Undo steps:"
 msgstr "還原步驟:"
 
-#: ../app/widgets/gimpimagepropview.c:156
+#: ../app/widgets/gimpimagepropview.c:147
 msgid "Redo steps:"
 msgstr "重做步驟:"
 
-#: ../app/widgets/gimpimagepropview.c:161
+#: ../app/widgets/gimpimagepropview.c:152
 msgid "Number of pixels:"
 msgstr "像素數目:"
 
-#: ../app/widgets/gimpimagepropview.c:164
+#: ../app/widgets/gimpimagepropview.c:155
 msgid "Number of layers:"
 msgstr "圖層數目:"
 
-#: ../app/widgets/gimpimagepropview.c:167
+#: ../app/widgets/gimpimagepropview.c:158
 msgid "Number of channels:"
 msgstr "色版數目:"
 
-#: ../app/widgets/gimpimagepropview.c:170
+#: ../app/widgets/gimpimagepropview.c:161
 msgid "Number of paths:"
 msgstr "路徑數目:"
 
 #. no undo (or redo) steps available
-#: ../app/widgets/gimpimagepropview.c:416
+#: ../app/widgets/gimpimagepropview.c:410
 msgid "None"
 msgstr "無"
 
-#: ../app/widgets/gimpimagepropview.c:470
-#: ../app/widgets/gimptemplateeditor.c:310
+#: ../app/widgets/gimpimagepropview.c:464
+#: ../app/widgets/gimptemplateeditor.c:331
 #, c-format
 msgid "pixels/%s"
 msgstr "像素/%s"
 
-#: ../app/widgets/gimpimagepropview.c:472
+#: ../app/widgets/gimpimagepropview.c:466
 #, c-format
 msgid "%g × %g %s"
 msgstr "%g × %g %s"
 
-#: ../app/widgets/gimpimagepropview.c:493
+#: ../app/widgets/gimpimagepropview.c:487
 msgid "colors"
 msgstr "顏色"
 
-#: ../app/widgets/gimpitemtreeview.c:705
+#: ../app/widgets/gimpitemtreeview.c:716
 msgid "Lock:"
 msgstr "鎖定:"
 
-#: ../app/widgets/gimpitemtreeview.c:1478
-msgid "Set Item Exclusive Visible"
-msgstr "設定項目排除可見性"
-
-#: ../app/widgets/gimpitemtreeview.c:1486
-msgid "Set Item Exclusive Linked"
-msgstr "設定項目排除連結"
-
-#: ../app/widgets/gimplayertreeview.c:309
+#: ../app/widgets/gimplayertreeview.c:307
 msgid "Lock alpha channel"
 msgstr "鎖定透明色版"
 
-#: ../app/widgets/gimpmessagebox.c:442
+#: ../app/widgets/gimpmessagebox.c:433
 #, c-format
-msgid "Message repeated %d times."
-msgstr "訊息已重複 %d 次。"
-
-#: ../app/widgets/gimpmessagebox.c:444
 msgid "Message repeated once."
-msgstr "訊息已重複 1 次。"
+msgid_plural "Message repeated %d times."
+msgstr[0] "訊息已重複一次。"
+msgstr[1] "訊息已重複 %d 次。"
 
-#: ../app/widgets/gimppaletteeditor.c:228
-#: ../app/widgets/gimppaletteeditor.c:693
+#: ../app/widgets/gimppaletteeditor.c:240
+#: ../app/widgets/gimppaletteeditor.c:715
 msgid "Undefined"
 msgstr "未指定"
 
-#: ../app/widgets/gimppaletteeditor.c:236
+#: ../app/widgets/gimppaletteeditor.c:248
 msgid "Columns:"
-msgstr "直行行數:"
+msgstr "欄數:"
 
-#: ../app/widgets/gimpprofilechooserdialog.c:136
+#: ../app/widgets/gimppanedbox.c:58
+msgid "You can drop dockable dialogs here"
+msgstr ""
+
+#: ../app/widgets/gimpprofilechooserdialog.c:127
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC 色彩配置檔 (*.icc, *.icm)"
 
@@ -14722,215 +15295,230 @@ msgstr ""
 msgid "Invalid UTF-8"
 msgstr "無效的 UTF-8 字串"
 
-#: ../app/widgets/gimpsettingsbox.c:244
+#: ../app/widgets/gimpsettingsbox.c:269
 msgid "Pick a setting from the list"
 msgstr "從清單選擇設定值"
 
-#: ../app/widgets/gimpsettingsbox.c:265
+#: ../app/widgets/gimpsettingsbox.c:291
 msgid "Add settings to favorites"
 msgstr "將設定值加入我的最愛"
 
-#: ../app/widgets/gimpsettingsbox.c:293
+#: ../app/widgets/gimpsettingsbox.c:319
 msgid "_Import Settings from File..."
 msgstr "由檔案匯入設定值(_I)..."
 
-#: ../app/widgets/gimpsettingsbox.c:299
+#: ../app/widgets/gimpsettingsbox.c:325
 msgid "_Export Settings to File..."
 msgstr "匯出設定值到檔案(_E)..."
 
-#: ../app/widgets/gimpsettingsbox.c:306
+#: ../app/widgets/gimpsettingsbox.c:332
 msgid "_Manage Settings..."
 msgstr "管理設定值(_M)..."
 
-#: ../app/widgets/gimpsettingsbox.c:593
+#: ../app/widgets/gimpsettingsbox.c:636
 msgid "Add Settings to Favorites"
 msgstr "將設定值加入我的最愛"
 
-#: ../app/widgets/gimpsettingsbox.c:596
+#: ../app/widgets/gimpsettingsbox.c:639
 msgid "Enter a name for the settings"
 msgstr "請輸入設定值的名稱"
 
-#: ../app/widgets/gimpsettingsbox.c:597
+#: ../app/widgets/gimpsettingsbox.c:640
 msgid "Saved Settings"
 msgstr "已儲存的設定值"
 
-#: ../app/widgets/gimpsettingsbox.c:633
+#: ../app/widgets/gimpsettingsbox.c:681
 msgid "Manage Saved Settings"
 msgstr "管理已儲存的設定值"
 
-#: ../app/widgets/gimpsettingseditor.c:177
+#: ../app/widgets/gimpsettingseditor.c:194
 msgid "Import settings from a file"
 msgstr "由檔案匯入設定值"
 
-#: ../app/widgets/gimpsettingseditor.c:186
+#: ../app/widgets/gimpsettingseditor.c:203
 msgid "Export the selected settings to a file"
 msgstr "匯出選取的設定值到檔案"
 
-#: ../app/widgets/gimpsettingseditor.c:195
+#: ../app/widgets/gimpsettingseditor.c:212
 msgid "Delete the selected settings"
 msgstr "刪除選取的設定值"
 
-#: ../app/widgets/gimpsizebox.c:463
+#: ../app/widgets/gimpsizebox.c:458
 #, c-format
 msgid "%d × %d ppi"
 msgstr "%d × %d dpi"
 
-#: ../app/widgets/gimpsizebox.c:465
+#: ../app/widgets/gimpsizebox.c:460
 #, c-format
 msgid "%d ppi"
 msgstr "%d ppi"
 
-#: ../app/widgets/gimpstrokeeditor.c:187
+#: ../app/widgets/gimpstrokeeditor.c:129
 msgid "Line width:"
 msgstr "線條寬度:"
 
-#: ../app/widgets/gimpstrokeeditor.c:199
+#: ../app/widgets/gimpstrokeeditor.c:141
 msgid "_Line Style"
 msgstr "線條樣式(_L):"
 
-#: ../app/widgets/gimpstrokeeditor.c:218
+#: ../app/widgets/gimpstrokeeditor.c:160
 msgid "_Cap style:"
 msgstr "端點樣式(_C):"
 
-#: ../app/widgets/gimpstrokeeditor.c:224
+#: ../app/widgets/gimpstrokeeditor.c:166
 msgid "_Join style:"
 msgstr "連接點樣式(_J):"
 
-#: ../app/widgets/gimpstrokeeditor.c:229
+#: ../app/widgets/gimpstrokeeditor.c:171
 msgid "_Miter limit:"
 msgstr "斜接限制(_M):"
 
-#: ../app/widgets/gimpstrokeeditor.c:236
+#: ../app/widgets/gimpstrokeeditor.c:178
 msgid "Dash pattern:"
 msgstr "虛線樣式:"
 
-#: ../app/widgets/gimpstrokeeditor.c:299
+#: ../app/widgets/gimpstrokeeditor.c:241
 msgid "Dash _preset:"
 msgstr "預設虛線樣式(_P):"
 
-#: ../app/widgets/gimptagentry.c:43
-#, fuzzy
+#: ../app/widgets/gimptagentry.c:45
 msgid "filter"
-msgstr "過濾條件(_F)"
+msgstr "過濾條件"
 
-#: ../app/widgets/gimptagentry.c:44
-#, fuzzy
+#: ../app/widgets/gimptagentry.c:46
 msgid "enter tags"
-msgstr "API 標籤"
+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
+#: ../app/widgets/gimptagentry.c:1734
 msgid ","
 msgstr ","
 
-#: ../app/widgets/gimptemplateeditor.c:182
+#: ../app/widgets/gimptemplateeditor.c:201
 #, c-format
 msgid "%p"
 msgstr "%p"
 
-#: ../app/widgets/gimptemplateeditor.c:257
+#: ../app/widgets/gimptemplateeditor.c:276
 msgid "_Advanced Options"
 msgstr "進階選項(_A)"
 
-#: ../app/widgets/gimptemplateeditor.c:364
+#: ../app/widgets/gimptemplateeditor.c:387
 msgid "Color _space:"
 msgstr "色彩空間(_S):"
 
-#: ../app/widgets/gimptemplateeditor.c:372
+#: ../app/widgets/gimptemplateeditor.c:395
 msgid "_Fill with:"
 msgstr "填上(_F):"
 
-#: ../app/widgets/gimptemplateeditor.c:382
+#: ../app/widgets/gimptemplateeditor.c:405
 msgid "Comme_nt:"
 msgstr "備註(_N):"
 
-#: ../app/widgets/gimptemplateeditor.c:532
+#: ../app/widgets/gimptemplateeditor.c:512
 msgid "_Name:"
 msgstr "名稱(_N):"
 
-#: ../app/widgets/gimptemplateeditor.c:545
+#: ../app/widgets/gimptemplateeditor.c:519
 msgid "_Icon:"
 msgstr "圖示(_I):"
 
-#: ../app/widgets/gimptemplateeditor.c:673
+#: ../app/widgets/gimptemplateeditor.c:699
 #, c-format
 msgid "%d × %d ppi, %s"
 msgstr "%d × %d ppi,%s"
 
-#: ../app/widgets/gimptemplateeditor.c:675
+#: ../app/widgets/gimptemplateeditor.c:701
 #, c-format
 msgid "%d ppi, %s"
 msgstr "%d ppi,%s"
 
-#: ../app/widgets/gimptextbuffer-serialize.c:338
+#: ../app/widgets/gimptextbuffer-serialize.c:344
 #, fuzzy, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "在此關聯選單中,屬性「%s」在 <%s> 元素中是無效的"
 
-#: ../app/widgets/gimptextbuffer-serialize.c:410
+#: ../app/widgets/gimptextbuffer-serialize.c:416
 #, fuzzy, c-format
 msgid "Outermost element in text must be <markup> not <%s>"
 msgstr "在 text 最外的元素應是 <text_view_markup>,而非 <%s>"
 
-#: ../app/widgets/gimptextbuffer.c:1462
+#: ../app/widgets/gimptextbuffer.c:1459
 #, c-format
 msgid "Invalid UTF-8 data in file '%s'."
 msgstr "檔案 ‘%s’ 中含有無效的 UTF-8 文字。"
 
-#: ../app/widgets/gimptexteditor.c:205
+#: ../app/widgets/gimptexteditor.c:222
 msgid "_Use selected font"
 msgstr "使用選取的字型(_U)"
 
-#: ../app/widgets/gimptextstyleeditor.c:203
-#, fuzzy
+#: ../app/widgets/gimptextstyleeditor.c:206
+msgid "Change font of selected text"
+msgstr "變更選取文字的字型"
+
+#: ../app/widgets/gimptextstyleeditor.c:217
 msgid "Change size of selected text"
-msgstr "將已選文字變為大寫"
+msgstr "變更選取文字的大小"
+
+#: ../app/widgets/gimptextstyleeditor.c:236
+msgid "Clear style of selected text"
+msgstr "清除選取文字的樣式"
 
-#: ../app/widgets/gimptextstyleeditor.c:210
+#: ../app/widgets/gimptextstyleeditor.c:247
+#: ../app/widgets/gimptextstyleeditor.c:256
 msgid "Change color of selected text"
 msgstr "改變選取的文字顏色"
 
-#: ../app/widgets/gimptextstyleeditor.c:235
-#, fuzzy
-msgid "Clear style of selected text"
-msgstr "查詢已選字詞(_L)"
-
-#: ../app/widgets/gimptextstyleeditor.c:255
-#, fuzzy
+#: ../app/widgets/gimptextstyleeditor.c:272
 msgid "Change kerning of selected text"
-msgstr "將已選文字變為大寫"
+msgstr "改變選取文字間的字距"
 
-#: ../app/widgets/gimptextstyleeditor.c:271
-#, fuzzy
+#: ../app/widgets/gimptextstyleeditor.c:288
 msgid "Change baseline of selected text"
-msgstr "將已選文字變為大寫"
+msgstr "改變選取文字的底線"
+
+#: ../app/widgets/gimptextstyleeditor.c:328
+msgid "Bold"
+msgstr "粗體"
+
+#: ../app/widgets/gimptextstyleeditor.c:331
+msgid "Italic"
+msgstr "斜體"
+
+#: ../app/widgets/gimptextstyleeditor.c:334
+msgid "Underline"
+msgstr "底線"
+
+#: ../app/widgets/gimptextstyleeditor.c:337
+msgid "Strikethrough"
+msgstr "刪除線"
 
 #: ../app/widgets/gimpthumbbox.c:330
 #, c-format
 msgid ""
 "Click to update preview\n"
-"%s%sClick to force update even if preview is up-to-date"
+"%s-Click to force update even if preview is up-to-date"
 msgstr ""
 "按下這裡更新預覽圖\n"
-"%s%s即使預覽圖是最新的,仍然強制更新內容"
+"%s-點按 可在預覽圖仍是最新狀態下,強制更新內容"
 
-#: ../app/widgets/gimpthumbbox.c:348
+#: ../app/widgets/gimpthumbbox.c:347
 msgid "Pr_eview"
 msgstr "預覽(_E)"
 
-#: ../app/widgets/gimpthumbbox.c:403 ../app/widgets/gimpthumbbox.c:467
+#: ../app/widgets/gimpthumbbox.c:404 ../app/widgets/gimpthumbbox.c:468
 msgid "No selection"
 msgstr "未選擇檔案"
 
-#: ../app/widgets/gimpthumbbox.c:595 ../app/widgets/gimpthumbbox.c:616
+#: ../app/widgets/gimpthumbbox.c:596 ../app/widgets/gimpthumbbox.c:617
 #, c-format
 msgid "Thumbnail %d of %d"
 msgstr "縮圖 %2$d 之 %1$d"
 
-#: ../app/widgets/gimpthumbbox.c:729 ../app/widgets/gimpthumbbox.c:739
+#: ../app/widgets/gimpthumbbox.c:730 ../app/widgets/gimpthumbbox.c:740
 msgid "Creating preview..."
 msgstr "正在建立預覽..."
 
@@ -14954,8 +15542,8 @@ msgstr "更改前景顏色"
 msgid "Change Background Color"
 msgstr "更改背景顏色"
 
-#: ../app/widgets/gimptoolbox-image-area.c:112
-#: ../app/widgets/gimptoolbox-image-area.c:117
+#: ../app/widgets/gimptoolbox-image-area.c:118
+#: ../app/widgets/gimptoolbox-image-area.c:123
 msgid ""
 "The active image.\n"
 "Click to open the Image Dialog."
@@ -14963,11 +15551,11 @@ msgstr ""
 "這是使用中的圖片。\n"
 "按下後可以開啟圖片對話盒。"
 
-#: ../app/widgets/gimptoolbox-image-area.c:114
+#: ../app/widgets/gimptoolbox-image-area.c:120
 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:163
 msgid ""
 "The active brush.\n"
 "Click to open the Brush Dialog."
@@ -14975,7 +15563,7 @@ msgstr ""
 "這是使用中的筆刷。\n"
 "按下後可以開啟筆刷對話盒。"
 
-#: ../app/widgets/gimptoolbox-indicator-area.c:181
+#: ../app/widgets/gimptoolbox-indicator-area.c:195
 msgid ""
 "The active pattern.\n"
 "Click to open the Pattern Dialog."
@@ -14983,7 +15571,7 @@ msgstr ""
 "這是使用中的圖樣。\n"
 "按下後可以開啟圖樣對話盒。"
 
-#: ../app/widgets/gimptoolbox-indicator-area.c:213
+#: ../app/widgets/gimptoolbox-indicator-area.c:227
 msgid ""
 "The active gradient.\n"
 "Click to open the Gradient Dialog."
@@ -15011,123 +15599,124 @@ msgstr "降低這個工具至底層"
 msgid "Reset tool order and visibility"
 msgstr "重設工具順序與可見性"
 
-#: ../app/widgets/gimptooloptionseditor.c:219
-msgid "Save options to..."
-msgstr "儲存選項到..."
+#: ../app/widgets/gimptooloptionseditor.c:202
+msgid "Save Tool Preset..."
+msgstr "儲存工具預設..."
 
-#: ../app/widgets/gimptooloptionseditor.c:227
-msgid "Restore options from..."
-msgstr "還原選項自..."
+#: ../app/widgets/gimptooloptionseditor.c:210
+msgid "Restore Tool Preset..."
+msgstr "還原工具預設..."
 
-#: ../app/widgets/gimptooloptionseditor.c:235
-msgid "Delete saved options..."
-msgstr "刪除已儲存的選項..."
+#: ../app/widgets/gimptooloptionseditor.c:218
+msgid "Delete Tool Preset..."
+msgstr "刪除工具預設..."
 
-#: ../app/widgets/gimptooloptionseditor.c:591
-#, c-format
-msgid "Error saving tool options presets: %s"
-msgstr "儲存工具選項預先設定時發生錯誤:%s"
+#: ../app/widgets/gimptoolpreseteditor.c:148
+msgid "Icon:"
+msgstr "圖示:"
 
-#: ../app/widgets/gimptoolpreseteditor.c:109
+#: ../app/widgets/gimptoolpreseteditor.c:159
 msgid "Apply stored FG/BG"
 msgstr "套用儲存的前景/背景"
 
-#: ../app/widgets/gimptoolpreseteditor.c:115
+#: ../app/widgets/gimptoolpreseteditor.c:165
 msgid "Apply stored brush"
 msgstr "套用儲存的筆刷"
 
-#: ../app/widgets/gimptoolpreseteditor.c:121
-#, fuzzy
+#: ../app/widgets/gimptoolpreseteditor.c:171
 msgid "Apply stored dynamics"
-msgstr "覆蓋儲存的選項"
+msgstr "套用儲存的筆刷動態"
 
-#: ../app/widgets/gimptoolpreseteditor.c:127
+#: ../app/widgets/gimptoolpreseteditor.c:177
 msgid "Apply stored gradient"
 msgstr "套用儲存的漸層"
 
-#: ../app/widgets/gimptoolpreseteditor.c:133
+#: ../app/widgets/gimptoolpreseteditor.c:183
 msgid "Apply stored pattern"
 msgstr "套用儲存的圖樣"
 
-#: ../app/widgets/gimptoolpreseteditor.c:139
-msgid "Apply stored pallete"
+#: ../app/widgets/gimptoolpreseteditor.c:189
+msgid "Apply stored palette"
 msgstr "套用儲存的調色盤"
 
-#: ../app/widgets/gimptoolpreseteditor.c:145
+#: ../app/widgets/gimptoolpreseteditor.c:195
 msgid "Apply stored font"
 msgstr "套用儲存的字型"
 
-#: ../app/widgets/gimptranslationstore.c:105
+#: ../app/widgets/gimptoolpreseteditor.c:292
+#, c-format
+msgid "%s Preset"
+msgstr "%s 預設"
+
+#: ../app/widgets/gimptranslationstore.c:100
 msgid "System Language"
 msgstr "系統語言"
 
-#: ../app/widgets/gimptranslationstore.c:107
+#: ../app/widgets/gimptranslationstore.c:102
 msgid "English"
-msgstr "英語"
+msgstr "英文"
 
-#: ../app/widgets/gimpuimanager.c:750
+#: ../app/widgets/gimpuimanager.c:742
 msgid "Your GIMP installation is incomplete:"
 msgstr "GIMP 安裝未完整︰"
 
-#: ../app/widgets/gimpuimanager.c:752
-#, fuzzy
+#: ../app/widgets/gimpuimanager.c:744
 msgid "Please make sure the menu XML files are correctly installed."
-msgstr "請確保和選單有關的 XML 檔案已正確地安裝。"
+msgstr "請確保選單 XML 檔案已正確地安裝。"
 
-#: ../app/widgets/gimpuimanager.c:758
+#: ../app/widgets/gimpuimanager.c:750
 #, c-format
 msgid "There was an error parsing the menu definition from %s: %s"
 msgstr "解析 %s 的選單定義時發生錯誤:%s"
 
-#: ../app/widgets/gimpundoeditor.c:270
+#: ../app/widgets/gimpundoeditor.c:262
 msgid "[ Base Image ]"
 msgstr "[ 基本圖片 ]"
 
-#: ../app/widgets/gimpvectorstreeview.c:112
+#: ../app/widgets/gimpvectorstreeview.c:111
 msgid "Lock path strokes"
 msgstr "鎖住路徑描邊"
 
-#: ../app/widgets/gimpviewablebox.c:82
+#: ../app/widgets/gimpviewablebox.c:87
 msgid "Open the brush selection dialog"
 msgstr "開啟筆刷選擇對話盒。"
 
-#: ../app/widgets/gimpviewablebox.c:141
-#, fuzzy
+#: ../app/widgets/gimpviewablebox.c:151
 msgid "Open the dynamics selection dialog"
-msgstr "開啟選取字型的對話盒"
+msgstr "開啟筆刷動態的選取對話盒"
 
-#: ../app/widgets/gimpviewablebox.c:202
+#: ../app/widgets/gimpviewablebox.c:216
 msgid "Open the pattern selection dialog"
 msgstr "開啟圖樣選擇對話盒。"
 
-#: ../app/widgets/gimpviewablebox.c:268
+#: ../app/widgets/gimpviewablebox.c:284
 msgid "Open the gradient selection dialog"
 msgstr "開啟漸層選擇對話盒。"
 
-#: ../app/widgets/gimpviewablebox.c:373
+#: ../app/widgets/gimpviewablebox.c:401
 msgid "Open the palette selection dialog"
 msgstr "開啟調色盤選擇對話盒"
 
-#: ../app/widgets/gimpviewablebox.c:434
+#: ../app/widgets/gimpviewablebox.c:466
 msgid "Open the font selection dialog"
 msgstr "開啟選取字型的對話盒"
 
-#: ../app/widgets/gimpwidgets-utils.c:673
+#: ../app/widgets/gimpwidgets-utils.c:595
 #, c-format
 msgid "%s (try %s)"
 msgstr "%s (嘗試 %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:673
+#: ../app/widgets/gimpwidgets-utils.c:595
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:677
+#: ../app/widgets/gimpwidgets-utils.c:599
 #, c-format
 msgid "%s (try %s, %s)"
 msgstr "%s (嘗試 %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:681
+#: ../app/widgets/gimpwidgets-utils.c:603
 #, c-format
 msgid "%s (try %s, %s, %s)"
 msgstr "%s (嘗試 %s, %s, %s)"
@@ -15233,24 +15822,23 @@ msgid "Status & desc"
 msgstr "狀態及描述"
 
 #: ../app/widgets/widgets-enums.c:223
-#, fuzzy
 msgctxt "tab-style"
 msgid "Undefined"
 msgstr "未指定"
 
-#: ../app/xcf/xcf-load.c:332
+#: ../app/xcf/xcf-load.c:392
 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:403
 msgid ""
 "This XCF file is corrupt!  I could not even salvage any partial image data "
 "from it."
 msgstr "這個 XCF 檔案已損毀!我甚至無法從它取得任何部分的圖片資料。"
 
-#: ../app/xcf/xcf-load.c:416
+#: ../app/xcf/xcf-load.c:477
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -15259,87 +15847,258 @@ msgstr ""
 "XCF 警告。版本 0 的 XCF 檔案格式無法\n"
 " 正確地儲存索引的顏色對應表。以灰階圖代替。"
 
-#: ../app/xcf/xcf-read.c:115
+#: ../app/xcf/xcf-read.c:174
 msgid "Invalid UTF-8 string in XCF file"
 msgstr "XCF 檔案中含有無效的 UTF-8 字串"
 
-#: ../app/xcf/xcf-write.c:86
+#: ../app/xcf/xcf-write.c:155
 #, 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:61
 #, c-format
 msgid "Could not seek in XCF file: %s"
 msgstr "無法在 XCF 檔案中搜尋資料:%s"
 
-#: ../app/xcf/xcf.c:99 ../app/xcf/xcf.c:167
+#: ../app/xcf/xcf.c:113 ../app/xcf/xcf.c:181
 msgid "GIMP XCF image"
 msgstr "GIMP XCF 圖片"
 
-#: ../app/xcf/xcf.c:271
+#: ../app/xcf/xcf.c:301
 #, c-format
 msgid "Opening '%s'"
 msgstr "正在開啟“%s”"
 
-#: ../app/xcf/xcf.c:313
+#: ../app/xcf/xcf.c:343
 #, c-format
 msgid "XCF error: unsupported XCF file version %d encountered"
 msgstr "XCF 錯誤:不支援 XCF 檔案版本 %d"
 
-#: ../app/xcf/xcf.c:383
+#: ../app/xcf/xcf.c:413
 #, c-format
 msgid "Saving '%s'"
 msgstr "正在儲存“%s”"
 
-#: ../app/xcf/xcf.c:403
+#: ../app/xcf/xcf.c:433
 #, c-format
 msgid "Error saving XCF file: %s"
 msgstr "儲存 XCF 檔案時發生錯誤:%s"
 
 #: ../data/tags/gimp-tags-default.xml.in.h:1
+#, fuzzy
+msgid "round"
+msgstr "第一次 #:"
+
+#. fuzzy as in a feathered, blurred, unfocused, soft brush
+#: ../data/tags/gimp-tags-default.xml.in.h:3
 msgid "fuzzy"
 msgstr "模糊"
 
-#: ../data/tags/gimp-tags-default.xml.in.h:2
+#: ../desktop/gimp.appdata.xml.in.h:1
 #, fuzzy
-msgid "round"
-msgstr "第一次 #:"
+msgid ""
+"GIMP is an acronym for GNU Image Manipulation Program. It is a freely "
+"distributed program for such tasks as photo retouching, image composition "
+"and image authoring."
+msgstr ""
+"GIMP 是 GNU Image Manipulation Program (GNU 圖片處理程式) 的頭字母縮寫。它是"
+"可以自由散布的程式,能處理圖片、圖片混成與圖片等作業。"
 
-#: ../desktop/gimp.desktop.in.in.h:1
-msgid "Create images and edit photographs"
-msgstr "建立圖像與編輯照片"
+#: ../desktop/gimp.appdata.xml.in.h:2
+#, fuzzy
+msgid ""
+"It has many capabilities. It can be used as a simple paint program, an "
+"expert quality photo retouching program, an online batch processing system, "
+"a mass production image renderer, an image format converter, etc."
+msgstr "它有許多功能。"
 
-#: ../desktop/gimp.desktop.in.in.h:3
+#: ../desktop/gimp.appdata.xml.in.h:3
+msgid ""
+"GIMP is expandable and extensible. It is designed to be augmented with plug-"
+"ins and extensions to do just about anything. The advanced scripting "
+"interface allows everything from the simplest task to the most complex image "
+"manipulation procedures to be easily scripted. GIMP is available for Linux, "
+"Microsoft Windows and OS X."
+msgstr ""
+
+#: ../desktop/gimp.desktop.in.in.h:2
 msgid "Image Editor"
 msgstr "圖片編輯器"
 
-#: ../tools/gimp-remote.c:64
-msgid "Use a running GIMP only, never start a new one"
-msgstr "只使用目前正在執行的 GIMP,不再啟動新的"
+#: ../desktop/gimp.desktop.in.in.h:3
+msgid "Create images and edit photographs"
+msgstr "建立圖像與編輯照片"
+
+#~ msgctxt "file-action"
+#~ msgid "Export to"
+#~ msgstr "匯出到"
 
-#: ../tools/gimp-remote.c:69
-msgid "Only check if GIMP is running, then quit"
-msgstr "只檢查 GIMP 是否在執行,然後離開"
+#~ msgid "Export to"
+#~ msgstr "匯出到"
 
-#: ../tools/gimp-remote.c:75
-msgid "Print X window ID of GIMP toolbox window, then quit"
-msgstr "顯示 GIMP 工具箱視窗的 X window ID,然後離開"
+#~ msgctxt "tool-options-action"
+#~ msgid "_Save Options To"
+#~ msgstr "儲存選項到(_S)"
 
-#: ../tools/gimp-remote.c:81
-msgid "Start GIMP without showing the startup window"
-msgstr "不顯示啟動視窗而啟動 GIMP"
+#~ msgctxt "tool-options-action"
+#~ msgid "_Restore Options From"
+#~ msgstr "還原選項自(_R)"
 
-#: ../tools/gimp-remote-x11.c:66
-msgid "Could not connect to GIMP."
-msgstr "無法連線至 GIMP。"
+#~ msgctxt "tool-options-action"
+#~ msgid "Re_name Saved Options"
+#~ msgstr "更改儲存的選項名稱(_N)"
 
-#: ../tools/gimp-remote-x11.c:67
-msgid "Make sure that the Toolbox is visible!"
-msgstr "確定工具箱為可見!"
+#~ msgctxt "tool-options-action"
+#~ msgid "_Delete Saved Options"
+#~ msgstr "刪除已儲存的選項(_D)"
 
-#. if execv and execvp return, there was an error
-#: ../tools/gimp-remote-x11.c:247
-#, c-format
-msgid "Couldn't start '%s': %s"
-msgstr "無法啟動“%s”:%s"
+#~ msgctxt "tool-options-action"
+#~ msgid "_New Entry..."
+#~ msgstr "新增項目(_N)..."
+
+#~ msgid "Save Tool Options"
+#~ msgstr "儲存工具選項"
+
+#~ msgid "Enter a name for the saved options"
+#~ msgstr "輸入已存選項的名稱"
+
+#~ msgid "Saved Options"
+#~ msgstr "已儲存選項"
+
+#~ msgid "Rename Saved Tool Options"
+#~ msgstr "更改儲存的工具選項名稱"
+
+#~ msgid "Enter a new name for the saved options"
+#~ msgstr "輸入已儲存選項的新名稱"
+
+#~ msgctxt "view-action"
+#~ msgid "Zoom out"
+#~ msgstr "拉遠"
+
+#~ msgctxt "view-action"
+#~ msgid "Zoom in"
+#~ msgstr "拉近"
+
+#~ msgctxt "windows-action"
+#~ msgid ""
+#~ "When enabled GIMP is in a single-window mode. Far from completely "
+#~ "implemented!"
+#~ msgstr "當啟用本選項,GIMP 是在單一視窗模式。"
+
+#~ msgid "Ask for confirmation before closing an image without saving."
+#~ msgstr "如果在未儲存圖片的情況下關閉視窗,必須先得到使用者同意。"
+
+#~ msgctxt "undo-type"
+#~ msgid "Brightness_Contrast"
+#~ msgstr "亮度及對比(_C)"
+
+#~ msgid "Saving Images"
+#~ msgstr "儲存圖片"
+
+#~ msgid "Confirm closing of unsa_ved images"
+#~ msgstr "關閉未儲存的圖片前必須先確認(_V)"
+
+#~ msgid "Close _without Saving"
+#~ msgstr "關閉但不儲存(_W)"
+
+#~ msgctxt "command"
+#~ msgid "Flip"
+#~ msgstr "翻轉"
+
+#~ msgctxt "tool"
+#~ msgid "_Zoom"
+#~ msgstr "縮放(_Z)"
+
+#~ msgctxt "command"
+#~ msgid "Perspective"
+#~ msgstr "透視法"
+
+#~ msgctxt "command"
+#~ msgid "Rotate"
+#~ msgstr "旋轉"
+
+#~ msgctxt "command"
+#~ msgid "Scale"
+#~ msgstr "縮放"
+
+#~ msgctxt "command"
+#~ msgid "Shear"
+#~ msgstr "推移"
+
+#, fuzzy
+#~ msgid "Text box resize mode"
+#~ msgstr "純文字編輯模式"
+
+#~ msgid "Preview:"
+#~ msgstr "預覽:"
+
+#~ msgctxt "transform-preview-type"
+#~ msgid "Outline"
+#~ msgstr "外框"
+
+#~ msgctxt "transform-preview-type"
+#~ msgid "Grid"
+#~ msgstr "格線"
+
+#~ msgctxt "transform-preview-type"
+#~ msgid "Image"
+#~ msgstr "圖片"
+
+#~ msgctxt "transform-preview-type"
+#~ msgid "Image + Grid"
+#~ msgstr "圖片 + 格線"
+
+#~ msgid "Radius:"
+#~ msgstr "半徑:"
+
+#~ msgid "Hardness:"
+#~ msgstr "硬度:"
+
+#~ msgid "Aspect ratio:"
+#~ msgstr "長寬比:"
+
+#~ msgid "Spacing:"
+#~ msgstr "間隔:"
+
+#~ msgid "Opacity:"
+#~ msgstr "不透明度:"
+
+#~ msgid "Instant update"
+#~ msgstr "即時更新"
+
+#~ msgid "Message repeated %d times."
+#~ msgstr "訊息已重複 %d 次。"
+
+#~ msgid "Save options to..."
+#~ msgstr "儲存選項到..."
+
+#~ msgid "Restore options from..."
+#~ msgstr "還原選項自..."
+
+#~ msgid "Delete saved options..."
+#~ msgstr "刪除已儲存的選項..."
+
+#~ msgid "Error saving tool options presets: %s"
+#~ msgstr "儲存工具選項預先設定時發生錯誤:%s"
+
+#~ msgid "Use a running GIMP only, never start a new one"
+#~ msgstr "只使用目前正在執行的 GIMP,不再啟動新的"
+
+#~ msgid "Only check if GIMP is running, then quit"
+#~ msgstr "只檢查 GIMP 是否在執行,然後離開"
+
+#~ msgid "Print X window ID of GIMP toolbox window, then quit"
+#~ msgstr "顯示 GIMP 工具箱視窗的 X window ID,然後離開"
+
+#~ msgid "Start GIMP without showing the startup window"
+#~ msgstr "不顯示啟動視窗而啟動 GIMP"
+
+#~ msgid "Could not connect to GIMP."
+#~ msgstr "無法連線至 GIMP。"
+
+#~ msgid "Make sure that the Toolbox is visible!"
+#~ msgstr "確定工具箱為可見!"
+
+#~ msgid "Couldn't start '%s': %s"
+#~ msgstr "無法啟動“%s”:%s"



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