[gimp] po/vi: import from Damned Lies



commit f672db7fffcb4aabe123719e7c6ade64b4972885
Author: Nguyán ThÃi Ngác Duy <pclouds gmail com>
Date:   Wed Oct 26 08:36:52 2011 +1100

    po/vi: import from Damned Lies

 po/vi.po | 5189 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 2961 insertions(+), 2228 deletions(-)
---
diff --git a/po/vi.po b/po/vi.po
index c51c3a5..5060479 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp Gnome HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-28 16:13+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=gimp&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-10-12 14:11+0000\n"
 "PO-Revision-Date: 2006-09-02 18:03+0930\n"
 "Last-Translator: Clytie Siddall <clytie riverland net au>\n"
 "Language-Team: Vietnamese <gnomevi-list lists sourceforge net>\n"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.6fc1\n"
 
@@ -67,7 +68,7 @@ msgstr ""
 "51 Franklin Street, Fifth Floor,\n"
 "Boston, MA  02110-1301, USA."
 
-#: ../app/app.c:220
+#: ../app/app.c:224
 #, c-format
 msgid ""
 "Unable to open a test swap file.\n"
@@ -90,78 +91,78 @@ msgstr "ChÆa xÃc Äánh bá giái thÃch bà nÃn dÃng mác Äánh  %s
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
 msgstr "Bá thÃng dách bà  %s  khÃng sán sÃng nÃn chá Äá bà bá tát."
 
-#: ../app/main.c:139 ../tools/gimp-remote.c:59
+#: ../app/main.c:148
 msgid "Show version information and exit"
 msgstr "Hián thá thÃng tin phiÃn bán rái thoÃt."
 
-#: ../app/main.c:144
+#: ../app/main.c:153
 msgid "Show license information and exit"
 msgstr "Hián thá thÃng tin phiÃn bán rái thoÃt"
 
-#: ../app/main.c:149
+#: ../app/main.c:158
 msgid "Be more verbose"
 msgstr "Xuát chi tiát"
 
-#: ../app/main.c:154
+#: ../app/main.c:163
 msgid "Start a new GIMP instance"
 msgstr ""
 
-#: ../app/main.c:159
+#: ../app/main.c:168
 #, fuzzy
 msgid "Open images as new"
 msgstr "Má ánh dáng láp"
 
-#: ../app/main.c:164
+#: ../app/main.c:173
 msgid "Run without a user interface"
 msgstr "Cháy khÃng cà giao dián ngÆái dÃng"
 
-#: ../app/main.c:169
+#: ../app/main.c:178
 msgid "Do not load brushes, gradients, patterns, ..."
 msgstr "KhÃng tái cÃc bÃt vá, dác, máu ..."
 
-#: ../app/main.c:174
+#: ../app/main.c:183
 msgid "Do not load any fonts"
 msgstr "KhÃng tái phÃng chá nÃo"
 
-#: ../app/main.c:179
+#: ../app/main.c:188
 #, fuzzy
 msgid "Do not show a splash screen"
 msgstr "KhÃng hián thá cáa sá khái cháy"
 
-#: ../app/main.c:184
+#: ../app/main.c:193
 msgid "Do not use shared memory between GIMP and plugins"
 msgstr "KhÃng dÃng bá nhá chia sá giáa GIMP và bá sung"
 
-#: ../app/main.c:189
+#: ../app/main.c:198
 msgid "Do not use special CPU acceleration functions"
 msgstr "KhÃng dÃng hÃm tÄng tác Äá CPU Äác biát."
 
-#: ../app/main.c:194
+#: ../app/main.c:203
 msgid "Use an alternate sessionrc file"
 msgstr "DÃng mát táp tin  sessionrc  (tÃi nguyÃn phiÃn cháy) thay thá."
 
-#: ../app/main.c:199
+#: ../app/main.c:208
 msgid "Use an alternate user gimprc file"
 msgstr "DÃng mát táp tin  gimprc  (tÃi nguyÃn GIMP) thay thá."
 
-#: ../app/main.c:204
+#: ../app/main.c:213
 msgid "Use an alternate system gimprc file"
 msgstr "DÃng mát táp tin  gimprc  (tÃi nguyÃn GIMP) há tháng thay thá."
 
-#: ../app/main.c:209
+#: ../app/main.c:218
 msgid "Batch command to run (can be used multiple times)"
 msgstr "Lánh bà cán cháy (cà thá dÃng nà nhiáu lán)"
 
-#: ../app/main.c:214
+#: ../app/main.c:223
 msgid "The procedure to process batch commands with"
 msgstr "Thá tác cán dÃng khi xá là lánh bÃ"
 
-#: ../app/main.c:219
+#: ../app/main.c:228
 msgid "Send messages to console instead of using a dialog"
 msgstr "Gái cÃc thÃng Äiáp cho bÃn giao tiáp thay và hián thá thoái."
 
 #. 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 ""
 "Chá Äá tÆÆng thÃch PDB:\n"
@@ -170,7 +171,7 @@ msgstr ""
 " â warn \tcánh bÃo."
 
 #. 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 ""
 "Gá lái trong trÆáng háp Äá vá:\n"
@@ -178,23 +179,27 @@ msgstr ""
 " â query\t\thái\n"
 " â always \tluÃn."
 
-#: ../app/main.c:236
+#: ../app/main.c:245
 msgid "Enable non-fatal debugging signal handlers"
 msgstr "Hiáu lác bá quán là tÃn hiáu gá lái khÃng nghiÃm tráng"
 
-#: ../app/main.c:241
+#: ../app/main.c:250
 msgid "Make all warnings fatal"
 msgstr "Äát mái cánh bÃo là nghiÃm tráng"
 
-#: ../app/main.c:246
+#: ../app/main.c:255
 msgid "Output a gimprc file with default settings"
 msgstr "Xuát mát táp tin  gimprc  (tÃi nguyÃn GIMP) cà thiát láp mác Äánh"
 
-#: ../app/main.c:374
+#: ../app/main.c:271
+msgid "Output a sorted list of deprecated procedures in the PDB"
+msgstr ""
+
+#: ../app/main.c:389
 msgid "[FILE|URI...]"
 msgstr "[TáP_TIN|URI...]"
 
-#: ../app/main.c:392
+#: ../app/main.c:407
 msgid ""
 "GIMP could not initialize the graphical user interface.\n"
 "Make sure a proper setup for your display environment exists."
@@ -202,37 +207,37 @@ msgstr ""
 "GIMP khÃng thá khái táo giao dián ngÆái dÃng Äá háa.\n"
 "HÃy Äám báo thiát láp ÄÃng cho mÃi trÆáng hián thá Äang cÃ."
 
-#: ../app/main.c:411
+#: ../app/main.c:426
 msgid "Another GIMP instance is already running."
 msgstr ""
 
-#: ../app/main.c:481
+#: ../app/main.c:496
 msgid "GIMP output. Type any character to close this window."
 msgstr ""
 
-#: ../app/main.c:482
+#: ../app/main.c:497
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr ""
 
-#: ../app/main.c:499
+#: ../app/main.c:514
 msgid "GIMP output. You can minimize this window, but don't close it."
 msgstr ""
 
-#: ../app/sanity.c:398
+#: ../app/sanity.c:433
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
 "\n"
 "Please check the value of the environment variable G_FILENAME_ENCODING."
 msgstr ""
-"KhÃng thá chuyán Äái báng mà tÃn táp tin Äà cáu hÃnh sang dáng thác UTF-8: "
-"%s\n"
+"KhÃng thá chuyán Äái báng mà tÃn táp tin Äà cáu hÃnh sang dáng thác UTF-8: %"
+"s\n"
 "\n"
 "HÃy kiám tra già trá cáa bián mÃi trÆáng  G_FILENAME_ENCODING  [G báng mà "
 "tÃn táp tin]."
 
-#: ../app/sanity.c:417
+#: ../app/sanity.c:452
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -250,37 +255,37 @@ msgstr ""
 "G_FILENAME_ENCODING  (báng mà tÃn táp tin G)."
 
 #. 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 ""
 
-#: ../app/version.c:127 ../tools/gimp-remote.c:94
+#: ../app/version.c:138
 #, c-format
 msgid "%s version %s"
 msgstr "%s phiÃn bán %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 "Bá sáa bÃt vá"
 
 #. initialize the list of gimp brushes
-#: ../app/actions/actions.c:112 ../app/core/gimp.c:953
-#: ../app/dialogs/dialogs.c:282 ../app/dialogs/preferences-dialog.c:2720
+#: ../app/actions/actions.c:112 ../app/core/gimp.c:951
+#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2725
 msgid "Brushes"
 msgstr "BÃt vá"
 
-#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:292
+#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:327
 msgid "Buffers"
 msgstr "Bá Äám"
 
-#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:311
+#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:346
 msgid "Channels"
 msgstr "KÃnh"
 
 #: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174
-#: ../app/dialogs/dialogs.c:319
+#: ../app/dialogs/dialogs.c:354
 msgid "Colormap"
 msgstr "Bá trà mÃu"
 
@@ -293,7 +298,7 @@ msgstr "Cáu hÃnh tÃi nguyÃn"
 msgid "Context"
 msgstr "Ngá cánh"
 
-#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:275
+#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:310
 msgid "Pointer Information"
 msgstr "ThÃng tin con trá"
 
@@ -314,7 +319,7 @@ msgid "Dockable"
 msgstr "Cá neo ÄÆác"
 
 #. Document History
-#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:294
+#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329
 #: ../app/dialogs/preferences-dialog.c:1573
 msgid "Document History"
 msgstr "LÆác sá TÃi liáu"
@@ -324,12 +329,12 @@ msgid "Drawable"
 msgstr "Vá ÄÆác"
 
 #. 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
 #, fuzzy
 msgid "Paint Dynamics Editor"
 msgstr "Bá sáa Äá dác"
@@ -338,7 +343,7 @@ msgstr "Bá sáa Äá dác"
 msgid "Edit"
 msgstr "Hiáu chánh"
 
-#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:271
+#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:306
 msgid "Error Console"
 msgstr "BÃn giao tiáp Lái"
 
@@ -346,29 +351,28 @@ msgstr "BÃn giao tiáp Lái"
 msgid "File"
 msgstr "Táp tin"
 
-#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:290
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325
+#: ../app/dialogs/preferences-dialog.c:2745
 msgid "Fonts"
 msgstr "PhÃng chá"
 
-#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:361
-#: ../app/widgets/gimpgradienteditor.c:275
+#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:396
+#: ../app/widgets/gimpgradienteditor.c:269
 msgid "Gradient Editor"
 msgstr "Bá sáa Äá dác"
 
 #. initialize the list of gimp gradients
-#: ../app/actions/actions.c:172 ../app/core/gimp.c:973
-#: ../app/dialogs/dialogs.c:286 ../app/dialogs/preferences-dialog.c:2736
+#: ../app/actions/actions.c:172 ../app/core/gimp.c:971
+#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2741
 msgid "Gradients"
 msgstr "Äá dác"
 
-#. 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:2749
 msgid "Tool Presets"
 msgstr ""
 
-#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:369
+#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:404
 #: ../app/widgets/gimptoolpreseteditor.c:75
 #, fuzzy
 msgid "Tool Preset Editor"
@@ -383,41 +387,41 @@ msgid "Image"
 msgstr "ánh"
 
 #. 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 "ánh"
 
-#: ../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 "Láp"
 
-#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:365
-#: ../app/widgets/gimppaletteeditor.c:152
+#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:400
+#: ../app/widgets/gimppaletteeditor.c:143
 msgid "Palette Editor"
 msgstr "Bá sáa báng chán"
 
 #. initialize the list of gimp palettes
-#: ../app/actions/actions.c:196 ../app/core/gimp.c:968
-#: ../app/dialogs/dialogs.c:288 ../app/dialogs/preferences-dialog.c:2732
+#: ../app/actions/actions.c:196 ../app/core/gimp.c:966
+#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2737
 msgid "Palettes"
 msgstr "Báng chán"
 
 #. initialize the list of gimp patterns
-#: ../app/actions/actions.c:199 ../app/core/gimp.c:963
-#: ../app/dialogs/dialogs.c:284 ../app/dialogs/preferences-dialog.c:2728
+#: ../app/actions/actions.c:199 ../app/core/gimp.c:961
+#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2733
 msgid "Patterns"
 msgstr "Máu"
 
-#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2744
+#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2753
 msgid "Plug-Ins"
 msgstr "bá sung"
 
-#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:385
+#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386
 msgid "Quick Mask"
 msgstr "Mát ná nhanh"
 
-#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:335
+#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:370
 msgid "Sample Points"
 msgstr "Äiám máu"
 
@@ -426,8 +430,8 @@ msgid "Select"
 msgstr "Chán"
 
 #. 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 "Biáu máu"
 
@@ -440,17 +444,17 @@ msgstr "CÃng cá _Chá"
 msgid "Text Editor"
 msgstr "Bá sáa chá"
 
-#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:263
-#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:430
+#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298
+#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:424
 msgid "Tool Options"
 msgstr "TÃy chán cÃng cá"
 
-#: ../app/actions/actions.c:226 ../app/widgets/gimptoolbox.c:927
+#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:385
 msgid "Tools"
 msgstr "CÃng cá"
 
-#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:315
-#: ../app/tools/gimpvectortool.c:162
+#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:350
+#: ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "ÄÆáng dán"
 
@@ -811,14 +815,14 @@ msgstr "Sáa mÃu kÃnh"
 msgid "_Fill opacity:"
 msgstr "Äá _má Äác tà Äáy:"
 
-#: ../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 "KÃnh"
 
 #: ../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 "KÃnh mái"
 
@@ -830,10 +834,10 @@ msgstr "TÃy chán kÃnh mái"
 msgid "New Channel Color"
 msgstr "MÃu kÃnh mái"
 
-#: ../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:632
+#: ../app/widgets/gimpchanneltreeview.c:258
+#: ../app/widgets/gimplayertreeview.c:776
 #, c-format
 msgid "%s Channel Copy"
 msgstr "%s KÃnh ChÃp"
@@ -1057,14 +1061,14 @@ msgctxt "cursor-info-action"
 msgid "Use the composite color of all visible layers"
 msgstr "VÃng chán dáa vÃo mái láp hián thá"
 
-#: ../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:88 ../app/actions/documents-commands.c:344
+#: ../app/actions/file-commands.c:194 ../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:178
-#: ../app/widgets/gimptoolbox.c:1222
+#: ../app/display/gimpdisplayshell-dnd.c:578
+#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:170
+#: ../app/widgets/gimptoolbox.c:809
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -1075,468 +1079,454 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/actions/data-commands.c:133
-#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1624
-#: ../app/core/gimppalette-import.c:210 ../app/core/gimppalette-load.c:223
-#: ../app/core/gimppalette.c:379 ../app/dialogs/palette-import-dialog.c:771
+#: ../app/actions/data-commands.c:117
+#: ../app/actions/tool-options-commands.c:69
+#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1521
+#: ../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 "KhÃng tÃn"
 
-#: ../app/actions/data-commands.c:238
-msgid "Delete Object"
-msgstr "Xoà bá Äái tÆáng"
-
-#: ../app/actions/data-commands.c:261
-#, fuzzy, c-format
-msgid "Delete '%s'?"
-msgstr "XÃa bá bÃt vá nÃy."
-
-#: ../app/actions/data-commands.c:264
-#, fuzzy, c-format
-msgid ""
-"Are you sure you want to remove '%s' from the list and delete it on disk?"
-msgstr "Bán cà chác muán xÃa bá  %s  ra danh sÃch và ra ÄÄa khÃng?"
-
-#: ../app/actions/dialogs-actions.c:44
+#: ../app/actions/dialogs-actions.c:49
 #, fuzzy
 msgctxt "windows-action"
 msgid "Tool_box"
 msgstr "_Háp cÃng cá"
 
-#: ../app/actions/dialogs-actions.c:50
+#: ../app/actions/dialogs-actions.c:55
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Tool _Options"
 msgstr "TÃ_y chán cÃng cá"
 
-#: ../app/actions/dialogs-actions.c:51
+#: ../app/actions/dialogs-actions.c:56
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the tool options dialog"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/actions/dialogs-actions.c:56
+#: ../app/actions/dialogs-actions.c:61
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Device Status"
 msgstr "Tráng thÃi _thiát bá:"
 
-#: ../app/actions/dialogs-actions.c:57
+#: ../app/actions/dialogs-actions.c:62
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the device status dialog"
 msgstr "Má thoái chán Äá dác"
 
-#: ../app/actions/dialogs-actions.c:62
+#: ../app/actions/dialogs-actions.c:67
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Layers"
 msgstr "_Láp"
 
-#: ../app/actions/dialogs-actions.c:63
+#: ../app/actions/dialogs-actions.c:68
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the layers dialog"
 msgstr "Má thoái chán máu"
 
-#: ../app/actions/dialogs-actions.c:68
+#: ../app/actions/dialogs-actions.c:73
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Channels"
 msgstr "_KÃnh"
 
-#: ../app/actions/dialogs-actions.c:69
+#: ../app/actions/dialogs-actions.c:74
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the channels dialog"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/actions/dialogs-actions.c:74
+#: ../app/actions/dialogs-actions.c:79
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Paths"
 msgstr "ÄÆáng _dán:"
 
-#: ../app/actions/dialogs-actions.c:75
+#: ../app/actions/dialogs-actions.c:80
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the paths dialog"
 msgstr "Má thoái chán máu"
 
-#: ../app/actions/dialogs-actions.c:80
+#: ../app/actions/dialogs-actions.c:85
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Color_map"
 msgstr "Bá trÃ_mÃu"
 
-#: ../app/actions/dialogs-actions.c:81
+#: ../app/actions/dialogs-actions.c:86
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the colormap dialog"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/actions/dialogs-actions.c:86
+#: ../app/actions/dialogs-actions.c:91
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Histogra_m"
 msgstr "Biáu Äá tán _xuát"
 
-#: ../app/actions/dialogs-actions.c:87
+#: ../app/actions/dialogs-actions.c:92
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the histogram dialog"
 msgstr "Má thoái chán bÃt vá"
 
-#: ../app/actions/dialogs-actions.c:92
+#: ../app/actions/dialogs-actions.c:97
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Selection Editor"
 msgstr "Bá _sáa vÃng chán"
 
-#: ../app/actions/dialogs-actions.c:93
+#: ../app/actions/dialogs-actions.c:98
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the selection editor"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/actions/dialogs-actions.c:98
+#: ../app/actions/dialogs-actions.c:103
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Na_vigation"
 msgstr "CÃch chu_yán"
 
-#: ../app/actions/dialogs-actions.c:99
+#: ../app/actions/dialogs-actions.c:104
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the display navigation dialog"
 msgstr "Má thoái chán Äá dác"
 
-#: ../app/actions/dialogs-actions.c:104
+#: ../app/actions/dialogs-actions.c:109
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Undo _History"
 msgstr "LÆác sá _Háy bÆác"
 
-#: ../app/actions/dialogs-actions.c:105
+#: ../app/actions/dialogs-actions.c:110
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the undo history dialog"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/actions/dialogs-actions.c:110
+#: ../app/actions/dialogs-actions.c:115
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Pointer"
 msgstr "Con trá"
 
-#: ../app/actions/dialogs-actions.c:111
+#: ../app/actions/dialogs-actions.c:116
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the pointer information dialog"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/actions/dialogs-actions.c:116
+#: ../app/actions/dialogs-actions.c:121
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Sample Points"
 msgstr "Äiám _máu"
 
-#: ../app/actions/dialogs-actions.c:117
+#: ../app/actions/dialogs-actions.c:122
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the sample points dialog"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/actions/dialogs-actions.c:122
+#: ../app/actions/dialogs-actions.c:127
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Colo_rs"
 msgstr "MÃu _sác"
 
-#: ../app/actions/dialogs-actions.c:123
+#: ../app/actions/dialogs-actions.c:128
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the FG/BG color dialog"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/actions/dialogs-actions.c:128
+#: ../app/actions/dialogs-actions.c:133
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Brushes"
 msgstr "_BÃt vá"
 
-#: ../app/actions/dialogs-actions.c:129
+#: ../app/actions/dialogs-actions.c:134
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the brushes dialog"
 msgstr "Má thoái chán bÃt vá"
 
-#: ../app/actions/dialogs-actions.c:134
+#: ../app/actions/dialogs-actions.c:139
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Brush Editor"
 msgstr "Bá sáa bÃt vá"
 
-#: ../app/actions/dialogs-actions.c:135
+#: ../app/actions/dialogs-actions.c:140
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the brush editor"
 msgstr "Má thoái chán bÃt vá"
 
-#: ../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
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open paint dynamics dialog"
 msgstr "Háp thoái má ánh"
 
-#: ../app/actions/dialogs-actions.c:146
+#: ../app/actions/dialogs-actions.c:151
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Paint Dynamics Editor"
 msgstr "Bá sáa Äá dác"
 
-#: ../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
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "P_atterns"
 msgstr "Má_u"
 
-#: ../app/actions/dialogs-actions.c:153
+#: ../app/actions/dialogs-actions.c:158
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the patterns dialog"
 msgstr "Má thoái chán máu"
 
-#: ../app/actions/dialogs-actions.c:158
+#: ../app/actions/dialogs-actions.c:163
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Gradients"
 msgstr "_Dác"
 
-#: ../app/actions/dialogs-actions.c:159
+#: ../app/actions/dialogs-actions.c:164
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the gradients dialog"
 msgstr "Má thoái chán Äá dác"
 
-#: ../app/actions/dialogs-actions.c:164
+#: ../app/actions/dialogs-actions.c:169
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Gradient Editor"
 msgstr "Bá sáa Äá dác"
 
-#: ../app/actions/dialogs-actions.c:165
+#: ../app/actions/dialogs-actions.c:170
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the gradient editor"
 msgstr "Má thoái chán Äá dác"
 
-#: ../app/actions/dialogs-actions.c:170
+#: ../app/actions/dialogs-actions.c:175
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Pal_ettes"
 msgstr "Bán_g chán"
 
-#: ../app/actions/dialogs-actions.c:171
+#: ../app/actions/dialogs-actions.c:176
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the palettes dialog"
 msgstr "Má thoái chán báng chán"
 
-#: ../app/actions/dialogs-actions.c:176
+#: ../app/actions/dialogs-actions.c:181
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Palette Editor"
 msgstr "Bá sáa báng chán"
 
-#: ../app/actions/dialogs-actions.c:177
+#: ../app/actions/dialogs-actions.c:182
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the palette editor"
 msgstr "Má thoái chán báng chán"
 
-#: ../app/actions/dialogs-actions.c:182
+#: ../app/actions/dialogs-actions.c:187
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Tool presets"
 msgstr "TÃy chán cÃng cá"
 
-#: ../app/actions/dialogs-actions.c:183
+#: ../app/actions/dialogs-actions.c:188
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open tool presets dialog"
 msgstr "Má thoái chán máu"
 
-#: ../app/actions/dialogs-actions.c:188
+#: ../app/actions/dialogs-actions.c:193
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Fonts"
 msgstr "_PhÃng"
 
-#: ../app/actions/dialogs-actions.c:189
+#: ../app/actions/dialogs-actions.c:194
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the fonts dialog"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/actions/dialogs-actions.c:194
+#: ../app/actions/dialogs-actions.c:199
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "B_uffers"
 msgstr "Bá Äá_m"
 
-#: ../app/actions/dialogs-actions.c:195
+#: ../app/actions/dialogs-actions.c:200
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the named buffers dialog"
 msgstr "Má thoái chán máu"
 
-#: ../app/actions/dialogs-actions.c:200
+#: ../app/actions/dialogs-actions.c:205
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Images"
 msgstr "á_nh"
 
-#: ../app/actions/dialogs-actions.c:201
+#: ../app/actions/dialogs-actions.c:206
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the images dialog"
 msgstr "Háp thoái má ánh"
 
-#: ../app/actions/dialogs-actions.c:206
+#: ../app/actions/dialogs-actions.c:211
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Document Histor_y"
 msgstr "LÆác sá TÃ_i liáu"
 
-#: ../app/actions/dialogs-actions.c:207
+#: ../app/actions/dialogs-actions.c:212
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the document history dialog"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/actions/dialogs-actions.c:212
+#: ../app/actions/dialogs-actions.c:217
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Templates"
 msgstr "_Biáu máu"
 
-#: ../app/actions/dialogs-actions.c:213
+#: ../app/actions/dialogs-actions.c:218
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the image templates dialog"
 msgstr "Háp thoái má ánh"
 
-#: ../app/actions/dialogs-actions.c:218
+#: ../app/actions/dialogs-actions.c:223
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Error Co_nsole"
 msgstr "BÃ_n giao tiáp lái"
 
-#: ../app/actions/dialogs-actions.c:219
+#: ../app/actions/dialogs-actions.c:224
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the error console"
 msgstr "XÃa bÃn giao tiáp lái"
 
-#: ../app/actions/dialogs-actions.c:229
+#: ../app/actions/dialogs-actions.c:234
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Preferences"
 msgstr "TÃ_y thÃch"
 
-#: ../app/actions/dialogs-actions.c:230
+#: ../app/actions/dialogs-actions.c:235
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the preferences dialog"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/actions/dialogs-actions.c:235
+#: ../app/actions/dialogs-actions.c:240
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Input Devices"
 msgstr "Thiát bá nháp"
 
-#: ../app/actions/dialogs-actions.c:236
+#: ../app/actions/dialogs-actions.c:241
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the input devices editor"
 msgstr "Má mác nháp ÄÆác chán."
 
-#: ../app/actions/dialogs-actions.c:241
+#: ../app/actions/dialogs-actions.c:246
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Keyboard Shortcuts"
 msgstr "_PhÃm tát"
 
-#: ../app/actions/dialogs-actions.c:242
+#: ../app/actions/dialogs-actions.c:247
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the keyboard shortcuts editor"
 msgstr "_LÆu cÃc phÃm tát khi thoÃt"
 
-#: ../app/actions/dialogs-actions.c:247
+#: ../app/actions/dialogs-actions.c:252
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Modules"
 msgstr "MÃ-Äun"
 
-#: ../app/actions/dialogs-actions.c:248
+#: ../app/actions/dialogs-actions.c:253
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "Open the module manager dialog"
 msgstr "Háp thoái má ánh"
 
-#: ../app/actions/dialogs-actions.c:253
+#: ../app/actions/dialogs-actions.c:258
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_Tip of the Day"
 msgstr "_Máo cáa hÃm nay"
 
-#: ../app/actions/dialogs-actions.c:254
+#: ../app/actions/dialogs-actions.c:259
 msgctxt "dialogs-action"
 msgid "Show some helpful tips on using GIMP"
 msgstr ""
 
-#: ../app/actions/dialogs-actions.c:259
+#: ../app/actions/dialogs-actions.c:264
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "_About"
 msgstr "_Giái thiáu"
 
-#: ../app/actions/dialogs-actions.c:260
+#: ../app/actions/dialogs-actions.c:265
 #, fuzzy
 msgctxt "dialogs-action"
 msgid "About GIMP"
 msgstr "ThoÃt khái GIMP"
 
-#: ../app/actions/dialogs-actions.c:304
-#: ../app/dialogs/preferences-dialog.c:1943 ../app/widgets/gimptoolbox.c:770
+#: ../app/actions/dialogs-actions.c:326
+#: ../app/dialogs/preferences-dialog.c:1943 ../app/widgets/gimptoolbox.c:549
 msgid "Toolbox"
 msgstr "Háp cÃng cá"
 
-#: ../app/actions/dialogs-actions.c:305
+#: ../app/actions/dialogs-actions.c:327
 #, fuzzy
 msgid "Raise the toolbox"
 msgstr "NÃng cÃng cá"
 
-#: ../app/actions/dialogs-actions.c:309
+#: ../app/actions/dialogs-actions.c:331
 #, fuzzy
 msgid "New Toolbox"
 msgstr "Háp cÃng cá"
 
-#: ../app/actions/dialogs-actions.c:310
+#: ../app/actions/dialogs-actions.c:332
 #, fuzzy
 msgid "Create a new toolbox"
 msgstr "Táo mát biáu máu mái."
@@ -2077,7 +2067,7 @@ msgstr "XÃa bá ánh nÃy."
 #: ../app/actions/dynamics-actions.c:70
 #, fuzzy
 msgctxt "dynamics-action"
-msgid "_Refresh Dynamicss"
+msgid "_Refresh Dynamics"
 msgstr "_Cáp nhát cÃc Äá dác"
 
 #: ../app/actions/dynamics-actions.c:71
@@ -2392,30 +2382,30 @@ msgctxt "edit-action"
 msgid "Fill the selection using the active pattern"
 msgstr "TÃ Äáy vÃng chán báng máu hoát Äáng"
 
-#: ../app/actions/edit-actions.c:295
+#: ../app/actions/edit-actions.c:304
 #, c-format
 msgid "_Undo %s"
 msgstr "_Háy bÆác %s"
 
-#: ../app/actions/edit-actions.c:302
+#: ../app/actions/edit-actions.c:311
 #, c-format
 msgid "_Redo %s"
 msgstr "BÆác _lái %s"
 
-#: ../app/actions/edit-actions.c:317
+#: ../app/actions/edit-actions.c:326
 #, fuzzy, c-format
 msgid "_Fade %s..."
 msgstr "LÆ_u dáng..."
 
-#: ../app/actions/edit-actions.c:329
+#: ../app/actions/edit-actions.c:338
 msgid "_Undo"
 msgstr "_Háy bÆác"
 
-#: ../app/actions/edit-actions.c:330
+#: ../app/actions/edit-actions.c:339
 msgid "_Redo"
 msgstr "BÆác _lái"
 
-#: ../app/actions/edit-actions.c:331
+#: ../app/actions/edit-actions.c:340
 msgid "_Fade..."
 msgstr ""
 
@@ -2447,8 +2437,8 @@ msgstr "Sao chÃp cÃc Äáa Äiám ÄÃ chán vÃo báng tám"
 msgid "There is no image data in the clipboard to paste."
 msgstr ""
 
-#: ../app/actions/edit-commands.c:347 ../app/core/gimpbrushclipboard.c:180
-#: ../app/core/gimppatternclipboard.c:180 ../app/widgets/gimpclipboard.c:345
+#: ../app/actions/edit-commands.c:347 ../app/core/gimpbrushclipboard.c:172
+#: ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345
 msgid "Clipboard"
 msgstr "Báng tám"
 
@@ -2714,7 +2704,7 @@ msgstr "Xuát ÄÆáng dán hoát Äáng"
 
 #: ../app/actions/file-actions.c:152
 msgctxt "file-action"
-msgid "Overwrite"
+msgid "Over_write"
 msgstr ""
 
 #: ../app/actions/file-actions.c:153
@@ -2740,7 +2730,7 @@ msgstr "Xuát ÄÆáng dán vÃo SVG"
 
 #: ../app/actions/file-actions.c:298
 #, c-format
-msgid "Overwrite %s"
+msgid "Over_write %s"
 msgstr ""
 
 #: ../app/actions/file-actions.c:306
@@ -2748,7 +2738,7 @@ msgstr ""
 msgid "Export to"
 msgstr "Xuát ÄÆáng dán vÃo SVG"
 
-#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:475
+#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:492
 #: ../app/dialogs/file-open-dialog.c:77
 msgid "Open Image"
 msgstr "Má ánh"
@@ -2770,29 +2760,29 @@ msgstr "LÆu ánh"
 msgid "Save a Copy of the Image"
 msgstr "LÆu mát bán sao cáa ánh"
 
-#: ../app/actions/file-commands.c:338
+#: ../app/actions/file-commands.c:356
 msgid "Create New Template"
 msgstr "Táo biáu máu mái"
 
-#: ../app/actions/file-commands.c:342
+#: ../app/actions/file-commands.c:360
 msgid "Enter a name for this template"
 msgstr "HÃy n.háp tÃn cho biáu máu nÃy"
 
-#: ../app/actions/file-commands.c:377
+#: ../app/actions/file-commands.c:394
 msgid "Revert failed. No file name associated with this image."
 msgstr ""
 "Viác hoÃn nguyÃn thát bái và chÆa liÃn quan tÃn táp tin nÃo vái ánh nÃy."
 
-#: ../app/actions/file-commands.c:390
+#: ../app/actions/file-commands.c:407
 msgid "Revert Image"
 msgstr "HoÃn nguyÃn ánh"
 
-#: ../app/actions/file-commands.c:421
+#: ../app/actions/file-commands.c:438
 #, c-format
 msgid "Revert '%s' to '%s'?"
 msgstr "HoÃn nguyÃn  %s  thÃnh  %s  khÃng?"
 
-#: ../app/actions/file-commands.c:427
+#: ../app/actions/file-commands.c:444
 msgid ""
 "By reverting the image to the state saved on disk, you will lose all "
 "changes, including all undo information."
@@ -2800,11 +2790,11 @@ msgstr ""
 "Báng cÃch hoÃn nguyÃn ánh nÃy thÃnh tÃnh tráng ÄÆác lÆu trÃn ÄÄa, bán sá mát "
 "toÃn bá cÃc thay Äái ÄÃ lÃm cÅng nhÆ thÃng tin hoÃn tÃc."
 
-#: ../app/actions/file-commands.c:638
+#: ../app/actions/file-commands.c:655
 msgid "(Unnamed Template)"
 msgstr "(Biáu máu khÃng tÃn)"
 
-#: ../app/actions/file-commands.c:690
+#: ../app/actions/file-commands.c:706
 #, c-format
 msgid ""
 "Reverting to '%s' failed:\n"
@@ -3641,54 +3631,54 @@ msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the left"
 msgstr "Xoay ánh 90 Äá sang trÃi"
 
-#: ../app/actions/image-commands.c:236
+#: ../app/actions/image-commands.c:237
 msgid "Set Image Canvas Size"
 msgstr "Äát cá vÃng vá ánh"
 
-#: ../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:583
 msgid "Resizing"
 msgstr "Äang Äái kÃch cá"
 
-#: ../app/actions/image-commands.c:316
+#: ../app/actions/image-commands.c:317
 msgid "Set Image Print Resolution"
 msgstr "Äát Äá phÃn giái in ánh"
 
-#: ../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 "Äang lát"
 
-#: ../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:533
+#: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245
+#: ../app/tools/gimprotatetool.c:125
 msgid "Rotating"
 msgstr "Äang xoay"
 
-#: ../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 "KhÃng thá xÃn gà và hián cà vÃng chán ráng."
 
-#: ../app/actions/image-commands.c:628
+#: ../app/actions/image-commands.c:630
 msgid "Change Print Size"
 msgstr "Äái cá in"
 
-#: ../app/actions/image-commands.c:669
+#: ../app/actions/image-commands.c:671
 msgid "Scale Image"
 msgstr "Co dÃn ánh"
 
 #. Scaling
-#: ../app/actions/image-commands.c:680 ../app/actions/layers-commands.c:1145
+#: ../app/actions/image-commands.c:682 ../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/drawable-transform-cmds.c:783
+#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:405
+#: ../app/pdb/image-cmds.c:441 ../app/pdb/item-transform-cmds.c:524
 #: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378
-#: ../app/pdb/transform-tools-cmds.c:302 ../app/tools/gimpscaletool.c:106
+#: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118
 msgid "Scaling"
 msgstr "Äang tá lá"
 
@@ -3812,7 +3802,7 @@ msgctxt "layers-action"
 msgid "Edit the layer's name"
 msgstr "Sáa Äái tÃn cáa láp ÄÃ"
 
-#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:598
+#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:610
 #, fuzzy
 msgctxt "layers-action"
 msgid "_New Layer..."
@@ -3824,7 +3814,7 @@ msgctxt "layers-action"
 msgid "Create a new layer and add it to the image"
 msgstr "Táo láp mái và thÃm nà vÃo ánh"
 
-#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:599
+#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:611
 #, fuzzy
 msgctxt "layers-action"
 msgid "_New Layer"
@@ -4325,7 +4315,7 @@ msgstr "PhÃm tát"
 msgid "-Click on thumbnail in Layers dockable"
 msgstr ""
 
-#: ../app/actions/layers-actions.c:593 ../app/actions/layers-actions.c:594
+#: ../app/actions/layers-actions.c:605 ../app/actions/layers-actions.c:606
 #, fuzzy
 msgctxt "layers-action"
 msgid "To _New Layer"
@@ -4339,13 +4329,13 @@ msgstr "Thuác tÃnh láp"
 msgid "Edit Layer Attributes"
 msgstr "Sáa thuác tÃnh láp"
 
-#: ../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 "Láp"
 
 #: ../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 "Láp mái"
 
@@ -4985,7 +4975,7 @@ msgstr "MÃi _sác..."
 #: ../app/actions/select-actions.c:82
 #, fuzzy
 msgctxt "select-action"
-msgid "Remove fuzzyness from the selection"
+msgid "Remove fuzziness from the selection"
 msgstr "Gá bá tÃnh má ra vÃng chán"
 
 #: ../app/actions/select-actions.c:87
@@ -5109,7 +5099,7 @@ msgstr "KhÃng cà vÃng chán trong Äà cán vá nÃt."
 
 #: ../app/actions/select-commands.c:342 ../app/actions/select-commands.c:375
 #: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420
-#: ../app/dialogs/stroke-dialog.c:289
+#: ../app/dialogs/stroke-dialog.c:281
 msgid "There is no active layer or channel to stroke to."
 msgstr "KhÃng cà láp hoác kÃnh hoát Äáng nÃo cán nÃt Äán nÃ."
 
@@ -5183,24 +5173,24 @@ msgctxt "templates-action"
 msgid "Delete this template"
 msgstr "XÃa bá ánh nÃy."
 
-#: ../app/actions/templates-commands.c:111
+#: ../app/actions/templates-commands.c:110
 msgid "New Template"
 msgstr "Biáu máu mái"
 
-#: ../app/actions/templates-commands.c:114
+#: ../app/actions/templates-commands.c:113
 msgid "Create a New Template"
 msgstr "Táo biáu máu mái"
 
-#: ../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 "Sáa biáu máu"
 
-#: ../app/actions/templates-commands.c:212
+#: ../app/actions/templates-commands.c:211
 msgid "Delete Template"
 msgstr "XÃa bá biáu máu"
 
-#: ../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?"
@@ -5261,276 +5251,256 @@ msgstr "Má táp tin vÄn bán (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:140 ../app/core/gimpbrush-load.c:424
 #: ../app/core/gimpbrushgenerated-load.c:73
 #: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54
-#: ../app/core/gimpgradient-load.c:62 ../app/core/gimppalette-load.c:76
-#: ../app/core/gimppalette-load.c:273 ../app/core/gimppalette-load.c:319
-#: ../app/core/gimppalette-load.c:376 ../app/core/gimppalette-load.c:466
-#: ../app/core/gimppalette-load.c:633 ../app/core/gimppattern-load.c:76
-#: ../app/tools/gimpcurvestool.c:637 ../app/tools/gimplevelstool.c:747
+#: ../app/core/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:649 ../app/tools/gimplevelstool.c:747
 #: ../app/xcf/xcf.c:329
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "KhÃng thá má  %s  Äá Äác: %s"
 
-#: ../app/actions/text-tool-actions.c:49
+#: ../app/actions/text-tool-actions.c:50
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "Text Tool Menu"
 msgstr "CÃng cá _Chá"
 
-#: ../app/actions/text-tool-actions.c:53
+#: ../app/actions/text-tool-actions.c:54
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "Input _Methods"
 msgstr "Mác gÃ"
 
-#: ../app/actions/text-tool-actions.c:57
+#: ../app/actions/text-tool-actions.c:58
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "Cu_t"
 msgstr "Cá_t"
 
-#: ../app/actions/text-tool-actions.c:62
+#: ../app/actions/text-tool-actions.c:63
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "_Copy"
 msgstr "_ChÃp"
 
-#: ../app/actions/text-tool-actions.c:67
+#: ../app/actions/text-tool-actions.c:68
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "_Paste"
 msgstr "_DÃn"
 
-#: ../app/actions/text-tool-actions.c:72
+#: ../app/actions/text-tool-actions.c:73
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "_Delete"
 msgstr "XÃa bá ÄÆáng _dán"
 
-#: ../app/actions/text-tool-actions.c:77
+#: ../app/actions/text-tool-actions.c:78
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "_Open text file..."
 msgstr "_Má bá trÃnh bÃy..."
 
-#: ../app/actions/text-tool-actions.c:82
+#: ../app/actions/text-tool-actions.c:83
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "Cl_ear"
 msgstr "X_oÃ"
 
-#: ../app/actions/text-tool-actions.c:83
+#: ../app/actions/text-tool-actions.c:84
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "Clear all text"
 msgstr "XÃa hát chá"
 
-#: ../app/actions/text-tool-actions.c:88
+#: ../app/actions/text-tool-actions.c:89
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "_Path from Text"
 msgstr "Táo ÄÆáng dán tá chá"
 
-#: ../app/actions/text-tool-actions.c:90
+#: ../app/actions/text-tool-actions.c:91
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "Create a path from the outlines of the current text"
 msgstr "Táo mát ÄÆáng dán tá láp chá nÃy"
 
-#: ../app/actions/text-tool-actions.c:95
+#: ../app/actions/text-tool-actions.c:96
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "Text _along Path"
 msgstr "Chá theo ÄÆáng dán"
 
-#: ../app/actions/text-tool-actions.c:97
+#: ../app/actions/text-tool-actions.c:98
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "Bend the text along the currently active path"
 msgstr "LÃm oán cÃc chá cáa láp nÃy theo ÄÆáng dán hián cÃ"
 
-#: ../app/actions/text-tool-actions.c:105
+#: ../app/actions/text-tool-actions.c:106
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "From left to right"
 msgstr "Tá trÃi sang phái"
 
-#: ../app/actions/text-tool-actions.c:110
+#: ../app/actions/text-tool-actions.c:111
 #, fuzzy
 msgctxt "text-tool-action"
 msgid "From right to left"
 msgstr "Tá phái sang trÃi"
 
-#: ../app/actions/tool-options-actions.c:55
+#: ../app/actions/tool-options-actions.c:54
 #, fuzzy
 msgctxt "tool-options-action"
 msgid "Tool Options Menu"
 msgstr "TrÃnh ÄÆn TÃy chán CÃng cá"
 
-#: ../app/actions/tool-options-actions.c:59
+#: ../app/actions/tool-options-actions.c:58
 #, fuzzy
 msgctxt "tool-options-action"
-msgid "_Save Options To"
-msgstr "_LÆu tÃy chán vÃo"
+msgid "_Save Tool Preset"
+msgstr "_XÃa bá mÃu"
 
-#: ../app/actions/tool-options-actions.c:63
+#: ../app/actions/tool-options-actions.c:62
 #, fuzzy
 msgctxt "tool-options-action"
-msgid "_Restore Options From"
-msgstr "_Phác hái tÃy chán tá"
+msgid "_Restore Tool Preset"
+msgstr "_Cáp nhát cÃc bÃt vá"
 
-#: ../app/actions/tool-options-actions.c:67
+#: ../app/actions/tool-options-actions.c:66
 #, fuzzy
 msgctxt "tool-options-action"
-msgid "Re_name Saved Options"
-msgstr "Thay tÃ_n cáa tÃy chán ÄÃ lÆu"
+msgid "E_dit Tool Preset"
+msgstr "_Sáa mÃu..."
 
-#: ../app/actions/tool-options-actions.c:71
+#: ../app/actions/tool-options-actions.c:70
 #, fuzzy
 msgctxt "tool-options-action"
-msgid "_Delete Saved Options"
-msgstr "_XÃa bá tÃy chán ÄÃ lÆu"
+msgid "_Delete Tool Preset"
+msgstr "_XÃa bá mÃu"
 
-#: ../app/actions/tool-options-actions.c:75
+#: ../app/actions/tool-options-actions.c:74
 #, fuzzy
 msgctxt "tool-options-action"
-msgid "_New Entry..."
-msgstr "Mác _nháp mái..."
+msgid "_New Tool Preset..."
+msgstr "_Sáa mÃu..."
 
-#: ../app/actions/tool-options-actions.c:80
+#: ../app/actions/tool-options-actions.c:79
 #, fuzzy
 msgctxt "tool-options-action"
 msgid "R_eset Tool Options"
 msgstr "Äát _lái tÃy chán cÃng cá"
 
-#: ../app/actions/tool-options-actions.c:81
+#: ../app/actions/tool-options-actions.c:80
 #, fuzzy
 msgctxt "tool-options-action"
 msgid "Reset to default values"
 msgstr "Äát lái là già trá mác Äánh"
 
-#: ../app/actions/tool-options-actions.c:86
+#: ../app/actions/tool-options-actions.c:85
 #, fuzzy
 msgctxt "tool-options-action"
 msgid "Reset _all Tool Options"
 msgstr "Äát lái _mái tÃy chán cÃng cá"
 
-#: ../app/actions/tool-options-actions.c:87
+#: ../app/actions/tool-options-actions.c:86
 #, fuzzy
 msgctxt "tool-options-action"
 msgid "Reset all tool options"
 msgstr "Äát lái mái tÃy chán cÃng cá."
 
-#: ../app/actions/tool-options-commands.c:70
-msgid "Save Tool Options"
-msgstr "LÆu tÃy chán cÃng cá"
-
-#: ../app/actions/tool-options-commands.c:74
-msgid "Enter a name for the saved options"
-msgstr "HÃy nháp tÃn cho tÃy chán ÄÃ lÆu."
-
-#: ../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 "TÃy chán ÄÃ lÆu"
-
-#: ../app/actions/tool-options-commands.c:138
-msgid "Rename Saved Tool Options"
-msgstr "Äái tÃn cáa tÃy chán cÃng cá ÄÃ lÆu"
-
-#: ../app/actions/tool-options-commands.c:142
-msgid "Enter a new name for the saved options"
-msgstr "HÃy nháp tÃn mái cho tÃy chán ÄÃ lÆu."
-
-#: ../app/actions/tool-options-commands.c:185
+#: ../app/actions/tool-options-commands.c:180
 #, fuzzy
 msgid "Reset All Tool Options"
 msgstr "Äát lái _mái tÃy chán cÃng cá"
 
-#: ../app/actions/tool-options-commands.c:208
+#: ../app/actions/tool-options-commands.c:203
 msgid "Do you really want to reset all tool options to default values?"
 msgstr ""
 "Bán thát sá muán xÃa bá mái tÃy chán cÃng cá là già trá mác Äánh khÃng?"
 
-#: ../app/actions/tool-preset-actions.c:44
+#: ../app/actions/tool-presets-actions.c:44
 #, fuzzy
-msgctxt "tool-preset-action"
-msgid "Tool Preset Menu"
+msgctxt "tool-presets-action"
+msgid "Tool Presets Menu"
 msgstr "TrÃnh ÄÆn CÃng cá"
 
-#: ../app/actions/tool-preset-actions.c:48
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:48
+#, fuzzy
+msgctxt "tool-presets-action"
 msgid "_New Tool Preset"
-msgstr ""
+msgstr "_XÃa bá mÃu"
 
-#: ../app/actions/tool-preset-actions.c:49
+#: ../app/actions/tool-presets-actions.c:49
 #, fuzzy
-msgctxt "tool-preset-action"
+msgctxt "tool-presets-action"
 msgid "Create a new tool preset"
 msgstr "Táo mát biáu máu mái."
 
-#: ../app/actions/tool-preset-actions.c:54
+#: ../app/actions/tool-presets-actions.c:54
 #, fuzzy
-msgctxt "tool-preset-action"
+msgctxt "tool-presets-action"
 msgid "D_uplicate Tool Preset"
 msgstr "NhÃn ÄÃ_i ÄÆáng dán"
 
-#: ../app/actions/tool-preset-actions.c:55
+#: ../app/actions/tool-presets-actions.c:55
 #, fuzzy
-msgctxt "tool-preset-action"
+msgctxt "tool-presets-action"
 msgid "Duplicate this tool preset"
 msgstr "NhÃn ÄÃi báng chán ÄÃ"
 
-#: ../app/actions/tool-preset-actions.c:60
+#: ../app/actions/tool-presets-actions.c:60
 #, fuzzy
-msgctxt "tool-preset-action"
+msgctxt "tool-presets-action"
 msgid "Copy Tool Preset _Location"
 msgstr "ChÃp _vá trà báng chán"
 
-#: ../app/actions/tool-preset-actions.c:61
+#: ../app/actions/tool-presets-actions.c:61
 #, fuzzy
-msgctxt "tool-preset-action"
+msgctxt "tool-presets-action"
 msgid "Copy tool preset file location to clipboard"
 msgstr "Sao chÃp Äáa Äiám cáa táp tin báng chán vÃo báng tám"
 
-#: ../app/actions/tool-preset-actions.c:66
+#: ../app/actions/tool-presets-actions.c:66
 #, fuzzy
-msgctxt "tool-preset-action"
+msgctxt "tool-presets-action"
 msgid "_Delete Tool Preset"
 msgstr "_XÃa bá mÃu"
 
-#: ../app/actions/tool-preset-actions.c:67
+#: ../app/actions/tool-presets-actions.c:67
 #, fuzzy
-msgctxt "tool-preset-action"
+msgctxt "tool-presets-action"
 msgid "Delete this tool preset"
 msgstr "XÃa bá láp nÃy"
 
-#: ../app/actions/tool-preset-actions.c:72
+#: ../app/actions/tool-presets-actions.c:72
 #, fuzzy
-msgctxt "tool-preset-action"
+msgctxt "tool-presets-action"
 msgid "_Refresh Tool Presets"
 msgstr "_Cáp nhát cÃc bÃt vá"
 
-#: ../app/actions/tool-preset-actions.c:73
+#: ../app/actions/tool-presets-actions.c:73
 #, fuzzy
-msgctxt "tool-preset-action"
+msgctxt "tool-presets-action"
 msgid "Refresh tool presets"
 msgstr "Cáp nhát cÃc bÃt vá"
 
-#: ../app/actions/tool-preset-actions.c:81
+#: ../app/actions/tool-presets-actions.c:81
 #, fuzzy
-msgctxt "tool-preset-action"
+msgctxt "tool-presets-action"
 msgid "_Edit Tool Preset..."
 msgstr "_Sáa mÃu..."
 
-#: ../app/actions/tool-preset-actions.c:82
-msgctxt "tool-preset-action"
+#: ../app/actions/tool-presets-actions.c:82
+#, fuzzy
+msgctxt "tool-presets-action"
 msgid "Edit this tool preset"
-msgstr ""
+msgstr "XÃa bá láp nÃy"
 
 #: ../app/actions/tool-preset-editor-actions.c:42
 #, fuzzy
@@ -5888,8 +5858,8 @@ msgstr "Thuác tÃnh ÄÆáng dán"
 msgid "Edit Path Attributes"
 msgstr "Sáa thuác tÃnh ÄÆáng dán"
 
-#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:205
-#: ../app/widgets/gimpvectorstreeview.c:252
+#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207
+#: ../app/widgets/gimpvectorstreeview.c:250
 msgid "Path"
 msgstr "ÄÆáng dán"
 
@@ -5901,545 +5871,545 @@ msgstr "ÄÆáng dán mái"
 msgid "New Path Options"
 msgstr "TÃy chán ÄÆáng dán mái"
 
-#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:198
-#: ../app/tools/gimpvectortool.c:1990
+#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:199
+#: ../app/tools/gimpvectortool.c:1970
 msgid "Stroke Path"
 msgstr "ÄÆáng dán nÃt"
 
-#: ../app/actions/view-actions.c:69
+#: ../app/actions/view-actions.c:68
 #, fuzzy
 msgctxt "view-action"
 msgid "_View"
 msgstr "_Xem"
 
-#: ../app/actions/view-actions.c:70
+#: ../app/actions/view-actions.c:69
 #, fuzzy
 msgctxt "view-action"
 msgid "_Zoom"
 msgstr "Thu _phÃng"
 
-#: ../app/actions/view-actions.c:71
+#: ../app/actions/view-actions.c:70
 #, fuzzy
 msgctxt "view-action"
 msgid "_Padding Color"
 msgstr "_MÃu Äám"
 
-#: ../app/actions/view-actions.c:73
+#: ../app/actions/view-actions.c:72
 #, fuzzy
 msgctxt "view-action"
 msgid "Move to Screen"
 msgstr "Chuyán sang mÃn hÃnh"
 
-#: ../app/actions/view-actions.c:77
+#: ../app/actions/view-actions.c:76
 #, fuzzy
 msgctxt "view-action"
 msgid "_New View"
 msgstr "Ã xem _mái"
 
-#: ../app/actions/view-actions.c:78
+#: ../app/actions/view-actions.c:77
 #, fuzzy
 msgctxt "view-action"
 msgid "Create another view on this image"
 msgstr "Táo à hián thá mái cho ánh nÃy."
 
-#: ../app/actions/view-actions.c:83
+#: ../app/actions/view-actions.c:82
 #, fuzzy
 msgctxt "view-action"
 msgid "_Close"
 msgstr "ÄÃn_g"
 
-#: ../app/actions/view-actions.c:84
+#: ../app/actions/view-actions.c:83
 #, fuzzy
 msgctxt "view-action"
 msgid "Close this image window"
 msgstr "ÄÃng cáa sá ánh nÃy"
 
-#: ../app/actions/view-actions.c:89
+#: ../app/actions/view-actions.c:88
 #, fuzzy
 msgctxt "view-action"
 msgid "_Fit Image in Window"
 msgstr "_Váa ánh khÃt cáa sá"
 
-#: ../app/actions/view-actions.c:90
+#: ../app/actions/view-actions.c:89
 #, fuzzy
 msgctxt "view-action"
 msgid "Adjust the zoom ratio so that the image becomes fully visible"
 msgstr "Äiáu chánh tá lá phong Äá hián rà toÃn bá ánh"
 
-#: ../app/actions/view-actions.c:95
+#: ../app/actions/view-actions.c:94
 #, fuzzy
 msgctxt "view-action"
 msgid "Fi_ll Window"
 msgstr "Váa khÃt cáa sá"
 
-#: ../app/actions/view-actions.c:96
+#: ../app/actions/view-actions.c:95
 #, fuzzy
 msgctxt "view-action"
 msgid "Adjust the zoom ratio so that the entire window is used"
 msgstr "Äiáu chánh tá lá phong Äá váa khÃt cáa sá"
 
-#: ../app/actions/view-actions.c:101
+#: ../app/actions/view-actions.c:100
 #, fuzzy
 msgctxt "view-action"
 msgid "Re_vert Zoom"
 msgstr "H_oÃn nguyÃn"
 
-#: ../app/actions/view-actions.c:102
+#: ../app/actions/view-actions.c:101
 msgctxt "view-action"
 msgid "Restore the previous zoom level"
 msgstr ""
 
-#: ../app/actions/view-actions.c:107
+#: ../app/actions/view-actions.c:106
 #, fuzzy
 msgctxt "view-action"
 msgid "Na_vigation Window"
 msgstr "Cáa sá du_yát"
 
-#: ../app/actions/view-actions.c:108
+#: ../app/actions/view-actions.c:107
 #, fuzzy
 msgctxt "view-action"
 msgid "Show an overview window for this image"
 msgstr "Hián thá cáa sá toÃn cánh cho ánh nÃy"
 
-#: ../app/actions/view-actions.c:113
+#: ../app/actions/view-actions.c:112
 #, fuzzy
 msgctxt "view-action"
 msgid "Display _Filters..."
 msgstr "Hián bá _lác..."
 
-#: ../app/actions/view-actions.c:114
+#: ../app/actions/view-actions.c:113
 #, fuzzy
 msgctxt "view-action"
 msgid "Configure filters applied to this view"
 msgstr "Cáu hÃnh cÃc bá lác ÄÆác Ãp dáng vÃo khung xem nÃy"
 
-#: ../app/actions/view-actions.c:119
+#: ../app/actions/view-actions.c:118
 #, fuzzy
 msgctxt "view-action"
 msgid "Shrink _Wrap"
 msgstr "_Bác khÃt"
 
-#: ../app/actions/view-actions.c:120
+#: ../app/actions/view-actions.c:119
 #, fuzzy
 msgctxt "view-action"
 msgid "Reduce the image window to the size of the image display"
 msgstr "Giám cáa sá ánh thÃnh kÃch cá hián thá ánh"
 
-#: ../app/actions/view-actions.c:125
+#: ../app/actions/view-actions.c:124
 #, fuzzy
 msgctxt "view-action"
 msgid "_Open Display..."
 msgstr "_Má bá trÃnh bÃy..."
 
-#: ../app/actions/view-actions.c:126
+#: ../app/actions/view-actions.c:125
 #, fuzzy
 msgctxt "view-action"
 msgid "Connect to another display"
 msgstr "Kát nái Äán mát bá trÃnh bÃy khÃc"
 
-#: ../app/actions/view-actions.c:134
+#: ../app/actions/view-actions.c:133
 #, fuzzy
 msgctxt "view-action"
 msgid "_Dot for Dot"
 msgstr "Chám _vái chám"
 
-#: ../app/actions/view-actions.c:135
+#: ../app/actions/view-actions.c:134
 #, fuzzy
 msgctxt "view-action"
 msgid "A pixel on the screen represents an image pixel"
 msgstr "Mát Äiám ánh trÃn mÃn hÃnh Äái dián mát Äiám ánh cáa ánh"
 
-#: ../app/actions/view-actions.c:141
+#: ../app/actions/view-actions.c:140
 #, fuzzy
 msgctxt "view-action"
 msgid "Show _Selection"
 msgstr "Hián _vÃng chán"
 
-#: ../app/actions/view-actions.c:142
+#: ../app/actions/view-actions.c:141
 #, fuzzy
 msgctxt "view-action"
 msgid "Display the selection outline"
 msgstr "Hián thá nÃt ngoÃi vÃng chán"
 
-#: ../app/actions/view-actions.c:148
+#: ../app/actions/view-actions.c:147
 #, fuzzy
 msgctxt "view-action"
 msgid "Show _Layer Boundary"
 msgstr "Hián ranh giái _láp"
 
-#: ../app/actions/view-actions.c:149
+#: ../app/actions/view-actions.c:148
 #, fuzzy
 msgctxt "view-action"
 msgid "Draw a border around the active layer"
 msgstr "Vá mát vián á quanh láp hoát Äáng"
 
-#: ../app/actions/view-actions.c:155
+#: ../app/actions/view-actions.c:154
 #, fuzzy
 msgctxt "view-action"
 msgid "Show _Guides"
 msgstr "Hián nÃt _dán"
 
-#: ../app/actions/view-actions.c:156
+#: ../app/actions/view-actions.c:155
 #, fuzzy
 msgctxt "view-action"
 msgid "Display the image's guides"
 msgstr "Hián thá nÃt ngoÃi vÃng chán"
 
-#: ../app/actions/view-actions.c:162
+#: ../app/actions/view-actions.c:161
 #, fuzzy
 msgctxt "view-action"
 msgid "S_how Grid"
 msgstr "_Hián lÆái"
 
-#: ../app/actions/view-actions.c:163
+#: ../app/actions/view-actions.c:162
 msgctxt "view-action"
 msgid "Display the image's grid"
 msgstr ""
 
-#: ../app/actions/view-actions.c:169
+#: ../app/actions/view-actions.c:168
 #, fuzzy
 msgctxt "view-action"
 msgid "Show Sample Points"
 msgstr "Hián Äiám máu"
 
-#: ../app/actions/view-actions.c:170
+#: ../app/actions/view-actions.c:169
 msgctxt "view-action"
 msgid "Display the image's color sample points"
 msgstr ""
 
-#: ../app/actions/view-actions.c:176
+#: ../app/actions/view-actions.c:175
 #, fuzzy
 msgctxt "view-action"
 msgid "Sn_ap to Guides"
 msgstr "_DÃnh nÃt dán"
 
-#: ../app/actions/view-actions.c:177
+#: ../app/actions/view-actions.c:176
 msgctxt "view-action"
 msgid "Tool operations snap to guides"
 msgstr ""
 
-#: ../app/actions/view-actions.c:183
+#: ../app/actions/view-actions.c:182
 #, fuzzy
 msgctxt "view-action"
 msgid "Sna_p to Grid"
 msgstr "DÃnh lÆá_i"
 
-#: ../app/actions/view-actions.c:184
+#: ../app/actions/view-actions.c:183
 msgctxt "view-action"
 msgid "Tool operations snap to the grid"
 msgstr ""
 
-#: ../app/actions/view-actions.c:190
+#: ../app/actions/view-actions.c:189
 #, fuzzy
 msgctxt "view-action"
 msgid "Snap to _Canvas Edges"
 msgstr "DÃnh _cánh vÃng vá"
 
-#: ../app/actions/view-actions.c:191
+#: ../app/actions/view-actions.c:190
 msgctxt "view-action"
 msgid "Tool operations snap to the canvas edges"
 msgstr ""
 
-#: ../app/actions/view-actions.c:197
+#: ../app/actions/view-actions.c:196
 #, fuzzy
 msgctxt "view-action"
 msgid "Snap t_o Active Path"
 msgstr "DÃnh ÄÆáng dán h_oát Äáng"
 
-#: ../app/actions/view-actions.c:198
+#: ../app/actions/view-actions.c:197
 #, fuzzy
 msgctxt "view-action"
 msgid "Tool operations snap to the active path"
 msgstr "Xuát ÄÆáng dán hoát Äáng"
 
-#: ../app/actions/view-actions.c:204
+#: ../app/actions/view-actions.c:203
 #, fuzzy
 msgctxt "view-action"
 msgid "Show _Menubar"
 msgstr "Hián thanh t_rÃnh ÄÆn"
 
-#: ../app/actions/view-actions.c:205
+#: ../app/actions/view-actions.c:204
 #, fuzzy
 msgctxt "view-action"
 msgid "Show this window's menubar"
 msgstr "Hián th_anh trÃnh ÄÆn"
 
-#: ../app/actions/view-actions.c:211
+#: ../app/actions/view-actions.c:210
 #, fuzzy
 msgctxt "view-action"
 msgid "Show R_ulers"
 msgstr "Hián thÆác Ä_o"
 
-#: ../app/actions/view-actions.c:212
+#: ../app/actions/view-actions.c:211
 msgctxt "view-action"
 msgid "Show this window's rulers"
 msgstr ""
 
-#: ../app/actions/view-actions.c:218
+#: ../app/actions/view-actions.c:217
 #, fuzzy
 msgctxt "view-action"
 msgid "Show Scroll_bars"
 msgstr "Hián th_anh cuán"
 
-#: ../app/actions/view-actions.c:219
+#: ../app/actions/view-actions.c:218
 #, fuzzy
 msgctxt "view-action"
 msgid "Show this window's scrollbars"
 msgstr "H_ián thanh cuán"
 
-#: ../app/actions/view-actions.c:225
+#: ../app/actions/view-actions.c:224
 #, fuzzy
 msgctxt "view-action"
 msgid "Show S_tatusbar"
 msgstr "Hián _thanh tráng thÃi"
 
-#: ../app/actions/view-actions.c:226
+#: ../app/actions/view-actions.c:225
 #, fuzzy
 msgctxt "view-action"
 msgid "Show this window's statusbar"
 msgstr "Hián máo khi _khái Äáng"
 
-#: ../app/actions/view-actions.c:232
+#: ../app/actions/view-actions.c:231
 #, fuzzy
 msgctxt "view-action"
 msgid "Fullscr_een"
 msgstr "T_oÃn mÃn hÃnh"
 
-#: ../app/actions/view-actions.c:233
+#: ../app/actions/view-actions.c:232
 #, fuzzy
 msgctxt "view-action"
 msgid "Toggle fullscreen view"
 msgstr "Bát/tát hián toÃn mÃn hÃnh"
 
-#: ../app/actions/view-actions.c:264
+#: ../app/actions/view-actions.c:263
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom _Out"
 msgstr "Thu _nhá"
 
-#: ../app/actions/view-actions.c:265 ../app/actions/view-actions.c:277
+#: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276
 #, fuzzy
 msgctxt "view-action"
 msgid "Zoom out"
 msgstr "Thu nhá"
 
-#: ../app/actions/view-actions.c:270
+#: ../app/actions/view-actions.c:269
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom _In"
 msgstr "PhÃng _to"
 
-#: ../app/actions/view-actions.c:271 ../app/actions/view-actions.c:283
+#: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282
 #, fuzzy
 msgctxt "view-action"
 msgid "Zoom in"
 msgstr "PhÃng to"
 
-#: ../app/actions/view-actions.c:276
+#: ../app/actions/view-actions.c:275
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom Out"
 msgstr "Thu nhá"
 
-#: ../app/actions/view-actions.c:282
+#: ../app/actions/view-actions.c:281
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom In"
 msgstr "PhÃng to"
 
-#: ../app/actions/view-actions.c:301
+#: ../app/actions/view-actions.c:300
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "1_6:1  (1600%)"
 msgstr "1_6:1  (1600%)"
 
-#: ../app/actions/view-actions.c:302
+#: ../app/actions/view-actions.c:301
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom 16:1"
 msgstr "PhÃng to 1:1"
 
-#: ../app/actions/view-actions.c:307
+#: ../app/actions/view-actions.c:306
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "_8:1  (800%)"
 msgstr "_8:1  (800%)"
 
-#: ../app/actions/view-actions.c:308
+#: ../app/actions/view-actions.c:307
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom 8:1"
 msgstr "PhÃng to 1:1"
 
-#: ../app/actions/view-actions.c:313
+#: ../app/actions/view-actions.c:312
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "_4:1  (400%)"
 msgstr "_4:1  (400%)"
 
-#: ../app/actions/view-actions.c:314
+#: ../app/actions/view-actions.c:313
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom 4:1"
 msgstr "PhÃng to 1:1"
 
-#: ../app/actions/view-actions.c:319
+#: ../app/actions/view-actions.c:318
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "_2:1  (200%)"
 msgstr "_2:1  (200%)"
 
-#: ../app/actions/view-actions.c:320
+#: ../app/actions/view-actions.c:319
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom 2:1"
 msgstr "PhÃng to 1:1"
 
-#: ../app/actions/view-actions.c:325
+#: ../app/actions/view-actions.c:324
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "_1:1  (100%)"
 msgstr "_1:1  (100%)"
 
-#: ../app/actions/view-actions.c:326
+#: ../app/actions/view-actions.c:325
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom 1:1"
 msgstr "PhÃng to 1:1"
 
-#: ../app/actions/view-actions.c:331
+#: ../app/actions/view-actions.c:330
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "1:_2  (50%)"
 msgstr "1:_2  (50%)"
 
-#: ../app/actions/view-actions.c:332
+#: ../app/actions/view-actions.c:331
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom 1:2"
 msgstr "PhÃng to 1:1"
 
-#: ../app/actions/view-actions.c:337
+#: ../app/actions/view-actions.c:336
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "1:_4  (25%)"
 msgstr "1:_4  (25%)"
 
-#: ../app/actions/view-actions.c:338
+#: ../app/actions/view-actions.c:337
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom 1:4"
 msgstr "PhÃng to 1:1"
 
-#: ../app/actions/view-actions.c:343
+#: ../app/actions/view-actions.c:342
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "1:_8  (12.5%)"
 msgstr "1:_8  (12.5%)"
 
-#: ../app/actions/view-actions.c:344
+#: ../app/actions/view-actions.c:343
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom 1:8"
 msgstr "PhÃng to 1:1"
 
-#: ../app/actions/view-actions.c:349
+#: ../app/actions/view-actions.c:348
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "1:1_6  (6.25%)"
 msgstr "1:1_6  (6.25%)"
 
-#: ../app/actions/view-actions.c:350
+#: ../app/actions/view-actions.c:349
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Zoom 1:16"
 msgstr "PhÃng to 1:1"
 
-#: ../app/actions/view-actions.c:355
+#: ../app/actions/view-actions.c:354
 #, fuzzy
 msgctxt "view-zoom-action"
 msgid "Othe_r..."
 msgstr "_KhÃc..."
 
-#: ../app/actions/view-actions.c:356
+#: ../app/actions/view-actions.c:355
 msgctxt "view-zoom-action"
 msgid "Set a custom zoom factor"
 msgstr ""
 
-#: ../app/actions/view-actions.c:364
+#: ../app/actions/view-actions.c:363
 #, fuzzy
 msgctxt "view-padding-color"
 msgid "From _Theme"
 msgstr "_Tá sác thÃi"
 
-#: ../app/actions/view-actions.c:365
+#: ../app/actions/view-actions.c:364
 #, fuzzy
 msgctxt "view-padding-color"
 msgid "Use the current theme's background color"
 msgstr "ThÃm mÃu nán hián cÃ"
 
-#: ../app/actions/view-actions.c:370
+#: ../app/actions/view-actions.c:369
 #, fuzzy
 msgctxt "view-padding-color"
 msgid "_Light Check Color"
 msgstr "MÃu ca _rà nhát"
 
-#: ../app/actions/view-actions.c:371
+#: ../app/actions/view-actions.c:370
 #, fuzzy
 msgctxt "view-padding-color"
 msgid "Use the light check color"
 msgstr "MÃu ca rà nhát"
 
-#: ../app/actions/view-actions.c:376
+#: ../app/actions/view-actions.c:375
 #, fuzzy
 msgctxt "view-padding-color"
 msgid "_Dark Check Color"
 msgstr "MÃu ca rà tá_i"
 
-#: ../app/actions/view-actions.c:377
+#: ../app/actions/view-actions.c:376
 #, fuzzy
 msgctxt "view-padding-color"
 msgid "Use the dark check color"
 msgstr "MÃu ca rà tái"
 
-#: ../app/actions/view-actions.c:382
+#: ../app/actions/view-actions.c:381
 #, fuzzy
 msgctxt "view-padding-color"
 msgid "Select _Custom Color..."
 msgstr "_Chán mÃu riÃng..."
 
-#: ../app/actions/view-actions.c:383
+#: ../app/actions/view-actions.c:382
 msgctxt "view-padding-color"
 msgid "Use an arbitrary color"
 msgstr ""
 
-#: ../app/actions/view-actions.c:388
+#: ../app/actions/view-actions.c:387
 #, fuzzy
 msgctxt "view-padding-color"
 msgid "As in _Preferences"
 msgstr "Theo tÃ_y thÃch"
 
-#: ../app/actions/view-actions.c:390
+#: ../app/actions/view-actions.c:389
 msgctxt "view-padding-color"
 msgid "Reset padding color to what's configured in preferences"
 msgstr ""
 
-#: ../app/actions/view-actions.c:589
+#: ../app/actions/view-actions.c:588
 #, fuzzy, c-format
 msgid "Re_vert Zoom (%d%%)"
 msgstr "_PhÃng (%s)"
 
-#: ../app/actions/view-actions.c:597
+#: ../app/actions/view-actions.c:596
 #, fuzzy
 msgid "Re_vert Zoom"
 msgstr "H_oÃn nguyÃn"
 
-#: ../app/actions/view-actions.c:733
+#: ../app/actions/view-actions.c:732
 #, c-format
 msgid "Othe_r (%s)..."
 msgstr "_KhÃc (%s) ..."
 
-#: ../app/actions/view-actions.c:742
+#: ../app/actions/view-actions.c:741
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "_PhÃng (%s)"
@@ -6452,52 +6422,77 @@ msgstr "Äát mÃu Äám vÃng vá"
 msgid "Set Custom Canvas Padding Color"
 msgstr "Äát mÃu Äám vÃng vá riÃng"
 
-#: ../app/actions/window-actions.c:168
+#: ../app/actions/window-actions.c:170
 #, c-format
 msgid "Screen %s"
 msgstr "MÃn hÃnh %s"
 
-#: ../app/actions/window-actions.c:170
+#: ../app/actions/window-actions.c:172
 #, fuzzy, c-format
 msgid "Move this window to screen %s"
 msgstr "Chuyán sang mÃn hÃnh"
 
-#: ../app/actions/windows-actions.c:85
+#: ../app/actions/windows-actions.c:96
 #, fuzzy
 msgctxt "windows-action"
 msgid "_Windows"
 msgstr "Cáa sá ánh"
 
-#: ../app/actions/windows-actions.c:87
+#: ../app/actions/windows-actions.c:98
 #, fuzzy
 msgctxt "windows-action"
 msgid "_Recently Closed Docks"
 msgstr "Váa dÃng"
 
-#: ../app/actions/windows-actions.c:89
+#: ../app/actions/windows-actions.c:100
 #, fuzzy
 msgctxt "windows-action"
 msgid "_Dockable Dialogs"
 msgstr "Cá neo ÄÆác"
 
-#: ../app/actions/windows-actions.c:95
+#: ../app/actions/windows-actions.c:103
+#, fuzzy
+msgctxt "windows-action"
+msgid "Next Image"
+msgstr "á_nh mái"
+
+#: ../app/actions/windows-actions.c:104
+#, fuzzy
+#| msgid "Add text to the image"
+msgctxt "windows-action"
+msgid "Switch to the next image"
+msgstr "ThÃm chá vÃo ánh"
+
+#: ../app/actions/windows-actions.c:109
+#, fuzzy
+#| msgid "_Previous Tip"
+msgctxt "windows-action"
+msgid "Previous Image"
+msgstr "Máo t_rÆác"
+
+#: ../app/actions/windows-actions.c:110
+msgctxt "windows-action"
+msgid "Switch to the previous image"
+msgstr ""
+
+#: ../app/actions/windows-actions.c:118
 #, fuzzy
 msgctxt "windows-action"
 msgid "Hide Docks"
 msgstr "ÄÃng Neo"
 
-#: ../app/actions/windows-actions.c:103
+#: ../app/actions/windows-actions.c:119
 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:125
 msgctxt "windows-action"
 msgid "Single-Window Mode"
 msgstr ""
 
-#: ../app/actions/windows-actions.c:110
+#: ../app/actions/windows-actions.c:126
 msgctxt "windows-action"
 msgid ""
 "When enabled GIMP is in a single-window mode. Far from completely "
@@ -6841,10 +6836,20 @@ msgctxt "cursor-format"
 msgid "Fancy"
 msgstr "Äáp"
 
+#: ../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:238 ../app/tools/gimpcurvestool.c:690
+#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56
+#: ../app/gui/themes.c:243 ../app/tools/gimpcurvestool.c:702
 #: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81
 #: ../app/xcf/xcf.c:422
 #, c-format
@@ -6914,6 +6919,10 @@ msgid "Sets the type of mouse pointers to use."
 msgstr "Äát kiáu con trá chuát cán dÃng."
 
 #: ../app/config/gimprc-blurbs.h:55
+msgid "Sets the handedness for cursor positioning."
+msgstr ""
+
+#: ../app/config/gimprc-blurbs.h:58
 msgid ""
 "Context-dependent mouse pointers are helpful.  They are enabled by default.  "
 "However, they require overhead that you may want to do without."
@@ -6921,7 +6930,7 @@ msgstr ""
 "Con trá chuát phá thuác vÃo ngá cánh là trÆ trÃo. Mác Äánh là bát con trá "
 "kiáu nÃy, nhÆng chÃng cán thiát tiám nÄng thÃm."
 
-#: ../app/config/gimprc-blurbs.h:71
+#: ../app/config/gimprc-blurbs.h:74
 msgid ""
 "When enabled, this will ensure that each pixel of an image gets mapped to a "
 "pixel on the screen."
@@ -6929,13 +6938,13 @@ msgstr ""
 "Khi bát thà tÃnh nÄng nÃy sá Äám báo mái Äiám ánh cáa mát ánh nÃo Äà sá ÄÆác "
 "Ãnh xá tái mát Äiám ánh trÃn mÃn hÃnh."
 
-#: ../app/config/gimprc-blurbs.h:93
+#: ../app/config/gimprc-blurbs.h:96
 msgid "This is the distance in pixels where Guide and Grid snapping activates."
 msgstr ""
 "Già trá nÃy là bao nhiÃu Äiám ánh Äán vá trà sá hoát hÃa khá nÄng DÃnh nÃt "
 "dán và DÃnh lÆái."
 
-#: ../app/config/gimprc-blurbs.h:109
+#: ../app/config/gimprc-blurbs.h:112
 msgid ""
 "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill "
 "algorithm.  The seed fill starts at the initially selected pixel and "
@@ -6948,7 +6957,7 @@ msgstr ""
 "tác vá mái hÆáng Äán khi hiáu cáa Äá mánh Äiám ánh hián cà và Äiáu gác vÆát "
 "quà mát ngÆáng Äà xÃc Äánh. Già trá nÃy là ngÆáng mác Äánh."
 
-#: ../app/config/gimprc-blurbs.h:122
+#: ../app/config/gimprc-blurbs.h:125
 #, fuzzy
 msgid ""
 "The window type hint that is set on dock windows and the toolbox window. "
@@ -6959,36 +6968,36 @@ msgstr ""
 "Äáng tái cÃch nÃo bá quán là cáa sá cáa bán cà trang trà và quán là cáa sá "
 "Neo."
 
-#: ../app/config/gimprc-blurbs.h:154
+#: ../app/config/gimprc-blurbs.h:157
 msgid "When enabled, the selected brush will be used for all tools."
 msgstr "Khi bát thà sá sá dáng bÃt vá ÄÆác chán cho mái cÃng cá."
 
-#: ../app/config/gimprc-blurbs.h:157
+#: ../app/config/gimprc-blurbs.h:160
 #, fuzzy
 msgid "When enabled, the selected dynamics will be used for all tools."
 msgstr "Khi bát thà sá sá dáng bÃt vá ÄÆác chán cho mái cÃng cá."
 
-#: ../app/config/gimprc-blurbs.h:163
+#: ../app/config/gimprc-blurbs.h:166
 msgid "When enabled, the selected gradient will be used for all tools."
 msgstr "Khi bát thà sá sá dáng Äá dác ÄÆác chán cho mái cÃng cá."
 
-#: ../app/config/gimprc-blurbs.h:166
+#: ../app/config/gimprc-blurbs.h:169
 msgid "When enabled, the selected pattern will be used for all tools."
 msgstr "Khi bát thà sá sá dáng máu ÄÆác chán cho mái cÃng cá."
 
-#: ../app/config/gimprc-blurbs.h:180
+#: ../app/config/gimprc-blurbs.h:183
 msgid "Sets the browser used by the help system."
 msgstr "Äát bá duyát há tháng trá giÃp."
 
-#: ../app/config/gimprc-blurbs.h:191
+#: ../app/config/gimprc-blurbs.h:194
 msgid "Sets the text to appear in image window status bars."
 msgstr "Äát chuái sá xuát hián trong thanh tráng thÃi cáa sá ánh."
 
-#: ../app/config/gimprc-blurbs.h:194
+#: ../app/config/gimprc-blurbs.h:197
 msgid "Sets the text to appear in image window titles."
 msgstr "Äát chuái sá xuát hián trong táa Äá cáa sá ánh."
 
-#: ../app/config/gimprc-blurbs.h:197
+#: ../app/config/gimprc-blurbs.h:200
 msgid ""
 "When enabled, this will ensure that the full image is visible after a file "
 "is opened, otherwise it will be displayed with a scale of 1:1."
@@ -6996,13 +7005,6 @@ msgstr ""
 "Khi bát thà khá nÄng nÃy sá Äám báo sá hián thá toÃn ánh sau khi má táp tin; "
 "náu khÃng thà sá hián thá nà báng tá lá 1:1."
 
-#: ../app/config/gimprc-blurbs.h:201
-msgid ""
-"Install a private colormap; might be useful on 8-bit (256 colors) displays."
-msgstr ""
-"CÃi Äát mát bá trà mÃu riÃng; cà thá cà Ãch trÃn bá trÃnh bÃy 8-bit (chá cà "
-"256 mÃu)."
-
 #: ../app/config/gimprc-blurbs.h:204
 msgid ""
 "Sets the level of interpolation used for scaling and other transformations."
@@ -7036,16 +7038,7 @@ msgstr ""
 "TrÃnh GIMP sá cánh bÃo ngÆái dÃng náu cá táo mát ánh sá chiám nhiáu bá nhá "
 "hÆn kÃch thÆác ÄÆác xÃc Äánh vÃo ÄÃy."
 
-#: ../app/config/gimprc-blurbs.h:225
-#, fuzzy
-msgid ""
-"Generally only a concern for 8-bit displays, this sets the minimum number of "
-"system colors allocated for GIMP."
-msgstr ""
-"ThÆáng chá quan tráng cho bá trÃnh bÃy 8-bit (chá 256 mÃu), già trá nÃy Äát "
-"sá mÃu há tháng tái thiáu ÄÆác cáp cho trÃnh GIMP."
-
-#: ../app/config/gimprc-blurbs.h:235
+#: ../app/config/gimprc-blurbs.h:231
 msgid ""
 "Sets the monitor's horizontal resolution, in dots per inch.  If set to 0, "
 "forces the X server to be queried for both horizontal and vertical "
@@ -7054,7 +7047,7 @@ msgstr ""
 "Äát Äá phÃn giái ngang cho mÃn hÃnh, theo Äiám/insÆÂ. Náu Äát là sá 0 thà Ãp "
 "buác trÃnh phác vá X nhán truy ván vá thÃng tin cá ngang lán dác Äáu."
 
-#: ../app/config/gimprc-blurbs.h:240
+#: ../app/config/gimprc-blurbs.h:236
 msgid ""
 "Sets the monitor's vertical resolution, in dots per inch.  If set to 0, "
 "forces the X server to be queried for both horizontal and vertical "
@@ -7063,7 +7056,7 @@ msgstr ""
 "Äát Äá phÃn giái dác cho mÃn hÃnh, theo Äiám/insÆÂ. Náu Äát là sá 0 thà Ãp "
 "buác trÃnh phác vá X nhán truy ván vá thÃng tin cá ngang lán dác Äáu."
 
-#: ../app/config/gimprc-blurbs.h:245
+#: ../app/config/gimprc-blurbs.h:241
 msgid ""
 "If enabled, the move tool sets the edited layer or path as active.  This "
 "used to be the default behaviour in older versions."
@@ -7071,7 +7064,7 @@ msgstr ""
 "Náu bát thà cÃng cá di chuyán Äát láp hay ÄÆáng dán Äà hiáu chánh là hoát "
 "Äáng. Trong phiÃn bán cÅ hÆn, khá nÄng nÃy là áng xá mác Äánh."
 
-#: ../app/config/gimprc-blurbs.h:249
+#: ../app/config/gimprc-blurbs.h:245
 msgid ""
 "Sets the size of the navigation preview available in the lower right corner "
 "of the image window."
@@ -7079,11 +7072,11 @@ msgstr ""
 "Äát kÃch thÆác cáa khung xem thá duyát sán sÃng trong gÃc dÆái phái cáa cáa "
 "sá ánh."
 
-#: ../app/config/gimprc-blurbs.h:253
+#: ../app/config/gimprc-blurbs.h:249
 msgid "Sets how many processors GIMP should try to use simultaneously."
 msgstr "Äát sá bá xá là GIMP nÃn thá dÃng Äáng thái."
 
-#: ../app/config/gimprc-blurbs.h:266
+#: ../app/config/gimprc-blurbs.h:262
 #, fuzzy
 msgid ""
 "When enabled, the X server is queried for the mouse's current position on "
@@ -7097,7 +7090,7 @@ msgstr ""
 "sÆn báng bÃt vá lán nÃn là chÃnh xÃc hÆn, mà chám hÆn. Tuy nhiÃn, trÃn mát "
 "sá mÃy cháy trÃnh phác vá X, bát tÃy chán nÃy gÃy ra viác sÆn nhanh hÆn."
 
-#: ../app/config/gimprc-blurbs.h:282
+#: ../app/config/gimprc-blurbs.h:278
 msgid ""
 "Sets whether GIMP should create previews of layers and channels. Previews in "
 "the layers and channels dialog are nice to have but they can slow things "
@@ -7107,7 +7100,7 @@ msgstr ""
 "khung xem thá nÃy cà thá cà Ãch, nhÆng cÅng cà thá lÃm cho trÃnh cháy chám "
 "hÆn khi thao tÃc ánh lán."
 
-#: ../app/config/gimprc-blurbs.h:287
+#: ../app/config/gimprc-blurbs.h:283
 msgid ""
 "Sets the preview size used for layers and channel previews in newly created "
 "dialogs."
@@ -7115,7 +7108,7 @@ msgstr ""
 "TÃy chán nÃy Äát kÃch thÆác cáa khung xem thá láp và kÃnh trong thoái mái "
 "táo."
 
-#: ../app/config/gimprc-blurbs.h:291
+#: ../app/config/gimprc-blurbs.h:287
 msgid ""
 "When enabled, the image window will automatically resize itself whenever the "
 "physical image size changes."
@@ -7123,7 +7116,7 @@ msgstr ""
 "Khi bát thà tÃy chán nÃy cho phÃp cáa sá ánh cà tá Äáng thay Äái kÃch thÆác "
 "chÃnh nÃ, khi nÃo kÃch thÆác vát là cà thay Äái."
 
-#: ../app/config/gimprc-blurbs.h:295
+#: ../app/config/gimprc-blurbs.h:291
 msgid ""
 "When enabled, the image window will automatically resize itself when zooming "
 "into and out of images."
@@ -7131,35 +7124,35 @@ msgstr ""
 "Khi bát thà tÃy chán nÃy cho phÃp cáa sá ánh cà tá Äáng thay Äái kÃch thÆác "
 "chÃnh nÃ, khi phÃng to và thu nhá ánh."
 
-#: ../app/config/gimprc-blurbs.h:299
+#: ../app/config/gimprc-blurbs.h:295
 msgid "Let GIMP try to restore your last saved session on each startup."
 msgstr ""
 "Cho phÃp GIMP cá phác hái phiÃn cháy ÄÃ lÆu trÆác vÃo mái lÃc khái cháy."
 
-#: ../app/config/gimprc-blurbs.h:302
+#: ../app/config/gimprc-blurbs.h:298
 msgid ""
 "Remember the current tool, pattern, color, and brush across GIMP sessions."
 msgstr ""
 "Nhá cÃng cá, máu, mÃu và bÃt vá hián thái qua nhiáu phiÃn cháy GIMP khÃc."
 
-#: ../app/config/gimprc-blurbs.h:306
+#: ../app/config/gimprc-blurbs.h:302
 #, fuzzy
 msgid ""
 "Keep a permanent record of all opened and saved files in the Recent "
 "Documents list."
 msgstr "ThÃm mái táp tin Äà má và Äà lÆu vÃo lÆác sá tÃi liáu trÃn ÄÄa."
 
-#: ../app/config/gimprc-blurbs.h:310
+#: ../app/config/gimprc-blurbs.h:306
 #, fuzzy
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
 msgstr "LÆu cÃc vá trà và kÃch thÆác cáa nháng thoái chÃnh, khi GIMP thoÃt."
 
-#: ../app/config/gimprc-blurbs.h:313
+#: ../app/config/gimprc-blurbs.h:309
 #, fuzzy
 msgid "Save the tool options when GIMP exits."
 msgstr "LÆu cÃc tÃy chán cÃng cá, khi GIMP thoÃt."
 
-#: ../app/config/gimprc-blurbs.h:319
+#: ../app/config/gimprc-blurbs.h:315
 msgid ""
 "When enabled, all paint tools will show a preview of the current brush's "
 "outline."
@@ -7167,7 +7160,7 @@ msgstr ""
 "Khi bát thà mái cÃng cá sÆn sá hián thá khung xem thá phÃc tháo cáa bÃt vá "
 "hián thái."
 
-#: ../app/config/gimprc-blurbs.h:323
+#: ../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 "
@@ -7177,13 +7170,13 @@ msgstr ""
 "trang trá giÃp thÃch háp. Náu khÃng cà cÃi nÃt nÃy, ván cÃn cà thá tái trang "
 "trá giÃp báng cÃch bám phÃm F1."
 
-#: ../app/config/gimprc-blurbs.h:328
+#: ../app/config/gimprc-blurbs.h:324
 msgid ""
 "When enabled, the mouse pointer will be shown over the image while using a "
 "paint tool."
 msgstr "Khi bát thà hián thá con trá á trÃn ánh khi sá dáng mát cÃng cá sÆn."
 
-#: ../app/config/gimprc-blurbs.h:332
+#: ../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."
@@ -7191,7 +7184,7 @@ msgstr ""
 "Khi bát thà hián thá thanh trÃnh ÄÆn theo mác Äánh. CÅng cà thá bát tát khá "
 "nÄng nÃy báng lánh  Xem â Hián thanh trÃnh ÄÆn Â."
 
-#: ../app/config/gimprc-blurbs.h:336
+#: ../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."
@@ -7199,7 +7192,7 @@ msgstr ""
 "Khi bát thà hián thá nháng thÆác Äo theo mác Äánh. CÅng cà thá bát tát khá "
 "nÄng nÃy báng lánh  Xem â Hián thÆác Äo Â."
 
-#: ../app/config/gimprc-blurbs.h:340
+#: ../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."
@@ -7207,7 +7200,7 @@ msgstr ""
 "Khi bát thà hián thá nháng thanh cuán theo mác Äánh. CÅng cà thá bát tát khá "
 "nÄng nÃy báng lánh  Xem â Hián thanh cuán Â."
 
-#: ../app/config/gimprc-blurbs.h:344
+#: ../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."
@@ -7215,7 +7208,7 @@ msgstr ""
 "Khi bát thà hián thá thanh tráng thÃi theo mác Äánh. CÅng cà thá bát tát khá "
 "nÄng nÃy báng lánh  Xem â Hián thanh tráng thÃi Â."
 
-#: ../app/config/gimprc-blurbs.h:348
+#: ../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."
@@ -7223,7 +7216,7 @@ msgstr ""
 "Khi bát thà hián thá vÃng chán theo mác Äánh. CÅng cà thá bát tát khá nÄng "
 "nÃy báng lánh  Xem â Hián vÃng chán Â."
 
-#: ../app/config/gimprc-blurbs.h:352
+#: ../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."
@@ -7231,7 +7224,7 @@ msgstr ""
 "Khi bát thà hián thá ranh giái láp theo mác Äánh. CÅng cà thá bát tát khá "
 "nÄng nÃy báng lánh  Xem â Hián ranh giái láp Â."
 
-#: ../app/config/gimprc-blurbs.h:356
+#: ../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."
@@ -7239,7 +7232,7 @@ msgstr ""
 "Khi bát thà hián thá nháng nÃt dán theo mác Äánh. CÅng cà thá bát tát khá "
 "nÄng nÃy báng lánh  Xem â Hián nÃt dán Â."
 
-#: ../app/config/gimprc-blurbs.h:360
+#: ../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."
@@ -7247,7 +7240,7 @@ msgstr ""
 "Khi bát thà hián thá lÆái theo mác Äánh. CÅng cà thá bát tát khá nÄng nÃy "
 "báng lánh  Xem â Hián lÆái Â."
 
-#: ../app/config/gimprc-blurbs.h:364
+#: ../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."
@@ -7255,23 +7248,23 @@ msgstr ""
 "Khi bát thà hián thá nháng Äiám máu theo mác Äánh. CÅng cà thá bát tát khá "
 "nÄng nÃy báng lánh  Xem â Hián Äiám máu Â."
 
-#: ../app/config/gimprc-blurbs.h:368
+#: ../app/config/gimprc-blurbs.h:364
 msgid "Show a tooltip when the pointer hovers over an item."
 msgstr "Hián máo cÃng cá khi con trá di chuyán á trÃn mác."
 
-#: ../app/config/gimprc-blurbs.h:371
+#: ../app/config/gimprc-blurbs.h:367
 msgid "Use GIMP in a single-window mode."
 msgstr ""
 
-#: ../app/config/gimprc-blurbs.h:374
+#: ../app/config/gimprc-blurbs.h:370
 msgid "Hide docks and other windows, leaving only image windows."
 msgstr ""
 
-#: ../app/config/gimprc-blurbs.h:377
+#: ../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:380
+#: ../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 "
@@ -7288,11 +7281,11 @@ msgstr ""
 "qua NFS. Và nháng là do nÃy, Äá nghá bán Äá táp tin trao Äái vÃo thÆ mác </"
 "tmp>."
 
-#: ../app/config/gimprc-blurbs.h:389
+#: ../app/config/gimprc-blurbs.h:385
 msgid "When enabled, menus can be torn off."
 msgstr "Khi bát thà cà thá tÃch trÃnh ÄÆn rái."
 
-#: ../app/config/gimprc-blurbs.h:392
+#: ../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."
@@ -7300,16 +7293,16 @@ msgstr ""
 "Khi bát thà bán cà thá thay Äái phÃm tát cho mác trÃnh ÄÆn, báng cÃch gà tá "
 "háp phÃm khi mác trÃnh ÄÆn ÄÆác tà sÃng."
 
-#: ../app/config/gimprc-blurbs.h:396
+#: ../app/config/gimprc-blurbs.h:392
 #, fuzzy
 msgid "Save changed keyboard shortcuts when GIMP exits."
 msgstr "LÆu cÃc phÃm tát ÄÃ thay Äái khi GIMP thoÃt."
 
-#: ../app/config/gimprc-blurbs.h:399
+#: ../app/config/gimprc-blurbs.h:395
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "Phác hái cÃc phÃm tát ÄÃ lÆu vÃo mái lÃc khái cháy GIMP."
 
-#: ../app/config/gimprc-blurbs.h:402
+#: ../app/config/gimprc-blurbs.h:398
 #, fuzzy
 msgid ""
 "Sets the folder for temporary storage. Files will appear here during the "
@@ -7321,12 +7314,12 @@ msgstr ""
 "cháy GIMP. Phán lán táp tin sá bián mát khi GIMP thoÃt, nhÆng mát sá Äiáu cà "
 "thá cÃn lái, váy Äá nghá ngÆái khÃc khÃng sá dáng thÆ mác nÃy."
 
-#: ../app/config/gimprc-blurbs.h:414
+#: ../app/config/gimprc-blurbs.h:410
 #, fuzzy
 msgid "Sets the size of the thumbnail shown in the Open dialog."
 msgstr "Äát kÃch thÆác cáa khung xem thá trong LÆác sá Háy bÆác."
 
-#: ../app/config/gimprc-blurbs.h:417
+#: ../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."
@@ -7334,7 +7327,7 @@ msgstr ""
 "HÃnh thu nhá trong thoái Má sá tá Äáng ÄÆác cáp nhát náu táp tin Äang ÄÆác "
 "xem thá là nhá hÆn kÃch thÆác ÄÆác Äát vÃo ÄÃy."
 
-#: ../app/config/gimprc-blurbs.h:421
+#: ../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 "
@@ -7342,34 +7335,34 @@ msgid ""
 "you may want to set this to a higher value."
 msgstr ""
 "Khi sá lÆáng dá liáu Äiám ánh vÆát quà hán chá nÃy, GIMP sá bát Äáu trao Äái "
-"cÃc  à  (256Ã256 Äiám ánh) vái ÄÄa. Tián trÃnh nÃy là rát chám hÆn, cÃn "
-"cho bán ván cà khá nÄng thao tÃc ánh mà báng bát cá cÃch khÃc nÃo chiám quà "
+"cÃc  à  (256Ã256 Äiám ánh) vái ÄÄa. Tián trÃnh nÃy là rát chám hÆn, cÃn cho "
+"bán ván cà khá nÄng thao tÃc ánh mà báng bát cá cÃch khÃc nÃo chiám quà "
 "nhiáu bá nhá. Náu bán cà rát nhiáu bá nhá RAM, bán cà thá Äát già trá nÃy là "
 "cao hÆn."
 
-#: ../app/config/gimprc-blurbs.h:427
+#: ../app/config/gimprc-blurbs.h:423
 #, fuzzy
 msgid "Show the current foreground and background colors in the toolbox."
 msgstr "Trao Äái mÃu cánh gán và nán"
 
-#: ../app/config/gimprc-blurbs.h:430
+#: ../app/config/gimprc-blurbs.h:426
 #, fuzzy
 msgid "Show the currently selected brush, pattern and gradient in the toolbox."
 msgstr "Hián _bÃt vá, máu và Äá dác hoát Äáng"
 
-#: ../app/config/gimprc-blurbs.h:433
+#: ../app/config/gimprc-blurbs.h:429
 msgid "Show the currently active image in the toolbox."
 msgstr ""
 
-#: ../app/config/gimprc-blurbs.h:439
+#: ../app/config/gimprc-blurbs.h:435
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "Äát cÃch hián thá Äá trong suát trong ánh."
 
-#: ../app/config/gimprc-blurbs.h:442
+#: ../app/config/gimprc-blurbs.h:438
 msgid "Sets the size of the checkerboard used to display transparency."
 msgstr "Äát kÃch thÆác cáa báng à ÄÆác dÃng Äá hián thá Äá trong suát."
 
-#: ../app/config/gimprc-blurbs.h:445
+#: ../app/config/gimprc-blurbs.h:441
 #, fuzzy
 msgid ""
 "When enabled, GIMP will not save an image if it has not been changed since "
@@ -7378,7 +7371,7 @@ msgstr ""
 "Khi bát thà GIMP sá khÃng lÆu mát ánh nÃo Äà náu nà chÆa ÄÆác thay Äái ká tá "
 "viác má nÃ."
 
-#: ../app/config/gimprc-blurbs.h:449
+#: ../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."
@@ -7386,7 +7379,7 @@ msgstr ""
 "Già trá nÃy Äát sá thao tÃc tái thiáu cà thá ÄÆác háy bÆác. Cà mác háy bÆác "
 "thÃm náa sán sÃng Äán khi tái giái hán trÃn cáa kÃch thÆác háy bÆác."
 
-#: ../app/config/gimprc-blurbs.h:453
+#: ../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 "
@@ -7396,21 +7389,21 @@ msgstr ""
 "Äáng háy bÆác. Bát cháp thiát láp nÃy, cà thá háy bÆác Ãt nhát sá mác háy "
 "bÆác ÄÃ cáu hÃnh."
 
-#: ../app/config/gimprc-blurbs.h:458
+#: ../app/config/gimprc-blurbs.h:454
 msgid "Sets the size of the previews in the Undo History."
 msgstr "Äát kÃch thÆác cáa khung xem thá trong LÆác sá Háy bÆác."
 
-#: ../app/config/gimprc-blurbs.h:461
+#: ../app/config/gimprc-blurbs.h:457
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "Khi bát thà bám phÃm F1 sá má bá duyát trá giÃp."
 
-#: ../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:133
+#: ../app/core/gimp-units.c:167 ../app/gui/session.c:243
 #: ../app/plug-in/plug-in-rc.c:212
 msgid "fatal parse error"
 msgstr "lái phÃn tÃch nghiÃm tráng"
 
-#: ../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 "già trá cho hiáu bÃi %s khÃng phái là chuái UTF-8 háp lá"
@@ -7793,547 +7786,547 @@ msgctxt "view-type"
 msgid "View as grid"
 msgstr "Xem kiáu lÆái"
 
-#: ../app/core/core-enums.c:691
+#: ../app/core/core-enums.c:654
 #, fuzzy
 msgctxt "thumbnail-size"
 msgid "No thumbnails"
 msgstr "KhÃng cà hÃnh thu nhá"
 
-#: ../app/core/core-enums.c:692
+#: ../app/core/core-enums.c:655
 #, fuzzy
 msgctxt "thumbnail-size"
 msgid "Normal (128x128)"
 msgstr "BÃnh thÆáng (128x128)"
 
-#: ../app/core/core-enums.c:693
+#: ../app/core/core-enums.c:656
 #, fuzzy
 msgctxt "thumbnail-size"
 msgid "Large (256x256)"
 msgstr "Lán (256x256)"
 
-#: ../app/core/core-enums.c:870
+#: ../app/core/core-enums.c:833
 #, fuzzy
 msgctxt "undo-type"
 msgid "<<invalid>>"
 msgstr "ââ khÃng háp lá ââ"
 
-#: ../app/core/core-enums.c:871
+#: ../app/core/core-enums.c:834
 #, fuzzy
 msgctxt "undo-type"
 msgid "Scale image"
 msgstr "Co dÃn ánh"
 
-#: ../app/core/core-enums.c:872
+#: ../app/core/core-enums.c:835
 #, fuzzy
 msgctxt "undo-type"
 msgid "Resize image"
 msgstr "Äái cá ánh"
 
-#: ../app/core/core-enums.c:873
+#: ../app/core/core-enums.c:836
 #, fuzzy
 msgctxt "undo-type"
 msgid "Flip image"
 msgstr "Lát ánh"
 
-#: ../app/core/core-enums.c:874
+#: ../app/core/core-enums.c:837
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rotate image"
 msgstr "Xoay ánh"
 
-#: ../app/core/core-enums.c:875
+#: ../app/core/core-enums.c:838
 #, fuzzy
 msgctxt "undo-type"
 msgid "Crop image"
 msgstr "XÃn ánh"
 
-#: ../app/core/core-enums.c:876
+#: ../app/core/core-enums.c:839
 #, fuzzy
 msgctxt "undo-type"
 msgid "Convert image"
 msgstr "Chuyán Äái ánh"
 
-#: ../app/core/core-enums.c:877
+#: ../app/core/core-enums.c:840
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove item"
 msgstr "Gá bá mác"
 
-#: ../app/core/core-enums.c:878
+#: ../app/core/core-enums.c:841
 #, fuzzy
 msgctxt "undo-type"
 msgid "Merge layers"
 msgstr "Trán cÃc láp"
 
-#: ../app/core/core-enums.c:879
+#: ../app/core/core-enums.c:842
 #, fuzzy
 msgctxt "undo-type"
 msgid "Merge paths"
 msgstr "Háp nhát ÄÆáng dán"
 
-#: ../app/core/core-enums.c:880
+#: ../app/core/core-enums.c:843
 #, fuzzy
 msgctxt "undo-type"
 msgid "Quick Mask"
 msgstr "Mát ná nhanh"
 
-#: ../app/core/core-enums.c:881 ../app/core/core-enums.c:911
+#: ../app/core/core-enums.c:844 ../app/core/core-enums.c:874
 #: ../app/core/gimpimage-grid.c:63
 #, fuzzy
 msgctxt "undo-type"
 msgid "Grid"
 msgstr "LÆái"
 
-#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:913
+#: ../app/core/core-enums.c:845 ../app/core/core-enums.c:876
 #, fuzzy
 msgctxt "undo-type"
 msgid "Guide"
 msgstr "NÃt dán"
 
-#: ../app/core/core-enums.c:883 ../app/core/core-enums.c:914
+#: ../app/core/core-enums.c:846 ../app/core/core-enums.c:877
 #, fuzzy
 msgctxt "undo-type"
 msgid "Sample Point"
 msgstr "Äiám máu"
 
-#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:915
+#: ../app/core/core-enums.c:847 ../app/core/core-enums.c:878
 #, fuzzy
 msgctxt "undo-type"
 msgid "Layer/Channel"
 msgstr "Láp/KÃnh"
 
-#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:916
+#: ../app/core/core-enums.c:848 ../app/core/core-enums.c:879
 #, fuzzy
 msgctxt "undo-type"
 msgid "Layer/Channel modification"
 msgstr "CÃch sáa Äái Láp/KÃnh"
 
-#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:917
+#: ../app/core/core-enums.c:849 ../app/core/core-enums.c:880
 #, fuzzy
 msgctxt "undo-type"
 msgid "Selection mask"
 msgstr "Mát ná vÃng chán"
 
-#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:921
+#: ../app/core/core-enums.c:850 ../app/core/core-enums.c:884
 #, fuzzy
 msgctxt "undo-type"
 msgid "Item visibility"
 msgstr "Mác hián thá"
 
-#: ../app/core/core-enums.c:888 ../app/core/core-enums.c:922
+#: ../app/core/core-enums.c:851 ../app/core/core-enums.c:885
 #, fuzzy
 msgctxt "undo-type"
 msgid "Link/Unlink item"
 msgstr "LiÃn kát/Bá liÃn kát mác"
 
-#: ../app/core/core-enums.c:889
+#: ../app/core/core-enums.c:852
 #, fuzzy
 msgctxt "undo-type"
 msgid "Item properties"
 msgstr "Thuác tÃnh mác"
 
-#: ../app/core/core-enums.c:890 ../app/core/core-enums.c:920
+#: ../app/core/core-enums.c:853 ../app/core/core-enums.c:883
 #, fuzzy
 msgctxt "undo-type"
 msgid "Move item"
 msgstr "Chuyán mác"
 
-#: ../app/core/core-enums.c:891
+#: ../app/core/core-enums.c:854
 #, fuzzy
 msgctxt "undo-type"
 msgid "Scale item"
 msgstr "Co dÃn mác"
 
-#: ../app/core/core-enums.c:892
+#: ../app/core/core-enums.c:855
 #, fuzzy
 msgctxt "undo-type"
 msgid "Resize item"
 msgstr "Äái cá mác"
 
-#: ../app/core/core-enums.c:893
+#: ../app/core/core-enums.c:856
 #, fuzzy
 msgctxt "undo-type"
 msgid "Add layer"
 msgstr "ThÃm láp"
 
-#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:933
+#: ../app/core/core-enums.c:857 ../app/core/core-enums.c:896
 #, fuzzy
 msgctxt "undo-type"
 msgid "Add layer mask"
 msgstr "ThÃm mát ná láp"
 
-#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:935
+#: ../app/core/core-enums.c:858 ../app/core/core-enums.c:898
 #, fuzzy
 msgctxt "undo-type"
 msgid "Apply layer mask"
 msgstr "Ãp dáng mát ná láp"
 
-#: ../app/core/core-enums.c:896 ../app/core/core-enums.c:943
+#: ../app/core/core-enums.c:859 ../app/core/core-enums.c:906
 #, fuzzy
 msgctxt "undo-type"
 msgid "Floating selection to layer"
 msgstr "Äang nái vÃng chán tái láp"
 
-#: ../app/core/core-enums.c:897
+#: ../app/core/core-enums.c:860
 #, fuzzy
 msgctxt "undo-type"
 msgid "Float selection"
 msgstr "Nái vÃng chán"
 
-#: ../app/core/core-enums.c:898
+#: ../app/core/core-enums.c:861
 #, fuzzy
 msgctxt "undo-type"
 msgid "Anchor floating selection"
 msgstr "Neo vÃng chán Äang nái"
 
-#: ../app/core/core-enums.c:899 ../app/core/gimp-edit.c:262
+#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:261
 #, fuzzy
 msgctxt "undo-type"
 msgid "Paste"
 msgstr "DÃn"
 
-#: ../app/core/core-enums.c:900 ../app/core/gimp-edit.c:501
+#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:502
 #, fuzzy
 msgctxt "undo-type"
 msgid "Cut"
 msgstr "Cát"
 
-#: ../app/core/core-enums.c:901
+#: ../app/core/core-enums.c:864
 #, fuzzy
 msgctxt "undo-type"
 msgid "Text"
 msgstr "Chá"
 
-#: ../app/core/core-enums.c:902 ../app/core/core-enums.c:944
-#: ../app/core/gimpdrawable-transform.c:567
+#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:907
+#: ../app/core/gimpdrawable-transform.c:589
 #, fuzzy
 msgctxt "undo-type"
 msgid "Transform"
 msgstr "Chuyán dáng"
 
-#: ../app/core/core-enums.c:903 ../app/core/core-enums.c:945
+#: ../app/core/core-enums.c:866 ../app/core/core-enums.c:908
 #, fuzzy
 msgctxt "undo-type"
 msgid "Paint"
 msgstr "SÆn"
 
-#: ../app/core/core-enums.c:904 ../app/core/core-enums.c:948
+#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:911
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach parasite"
 msgstr "ÄÃnh bá bÃm"
 
-#: ../app/core/core-enums.c:905 ../app/core/core-enums.c:949
+#: ../app/core/core-enums.c:868 ../app/core/core-enums.c:912
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove parasite"
 msgstr "Gá bá bá bÃm"
 
-#: ../app/core/core-enums.c:906
+#: ../app/core/core-enums.c:869
 #, fuzzy
 msgctxt "undo-type"
 msgid "Import paths"
 msgstr "Nháp ÄÆáng dán"
 
-#: ../app/core/core-enums.c:907
+#: ../app/core/core-enums.c:870
 #, fuzzy
 msgctxt "undo-type"
 msgid "Plug-In"
 msgstr "bá sung"
 
-#: ../app/core/core-enums.c:908
+#: ../app/core/core-enums.c:871
 #, fuzzy
 msgctxt "undo-type"
 msgid "Image type"
 msgstr "Kiáu ánh"
 
-#: ../app/core/core-enums.c:909
+#: ../app/core/core-enums.c:872
 #, fuzzy
 msgctxt "undo-type"
 msgid "Image size"
 msgstr "Cá ánh"
 
-#: ../app/core/core-enums.c:910
+#: ../app/core/core-enums.c:873
 #, fuzzy
 msgctxt "undo-type"
 msgid "Image resolution change"
 msgstr "CÃch thay Äái Äá phÃn giái"
 
-#: ../app/core/core-enums.c:912
+#: ../app/core/core-enums.c:875
 #, fuzzy
 msgctxt "undo-type"
 msgid "Change indexed palette"
 msgstr "Äái báng chán ÄÃ phá lác"
 
-#: ../app/core/core-enums.c:918
+#: ../app/core/core-enums.c:881
 #, fuzzy
 msgctxt "undo-type"
 msgid "Reorder item"
 msgstr "Gá bá mác"
 
-#: ../app/core/core-enums.c:919
+#: ../app/core/core-enums.c:882
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rename item"
 msgstr "Äái tÃn mác"
 
-#: ../app/core/core-enums.c:923
+#: ../app/core/core-enums.c:886
 #, fuzzy
 msgctxt "undo-type"
 msgid "New layer"
 msgstr "Láp mái"
 
-#: ../app/core/core-enums.c:924
+#: ../app/core/core-enums.c:887
 #, fuzzy
 msgctxt "undo-type"
 msgid "Delete layer"
 msgstr "XÃa bá láp"
 
-#: ../app/core/core-enums.c:925
+#: ../app/core/core-enums.c:888
 #, fuzzy
 msgctxt "undo-type"
 msgid "Set layer mode"
 msgstr "Äát chá Äá láp"
 
-#: ../app/core/core-enums.c:926
+#: ../app/core/core-enums.c:889
 #, fuzzy
 msgctxt "undo-type"
 msgid "Set layer opacity"
 msgstr "Äát má Äá Äác mác"
 
-#: ../app/core/core-enums.c:927
+#: ../app/core/core-enums.c:890
 #, fuzzy
 msgctxt "undo-type"
 msgid "Lock/Unlock alpha channel"
 msgstr "(Má) KhÃa kÃnh anfa"
 
-#: ../app/core/core-enums.c:928
+#: ../app/core/core-enums.c:891
 msgctxt "undo-type"
 msgid "Suspend group layer resize"
 msgstr ""
 
-#: ../app/core/core-enums.c:929
+#: ../app/core/core-enums.c:892
 msgctxt "undo-type"
 msgid "Resume group layer resize"
 msgstr ""
 
-#: ../app/core/core-enums.c:930
+#: ../app/core/core-enums.c:893
 #, fuzzy
 msgctxt "undo-type"
 msgid "Convert group layer"
 msgstr "Chuyán Äái cánh"
 
-#: ../app/core/core-enums.c:931
+#: ../app/core/core-enums.c:894
 #, fuzzy
 msgctxt "undo-type"
 msgid "Text layer"
 msgstr "Láp chá"
 
-#: ../app/core/core-enums.c:932
+#: ../app/core/core-enums.c:895
 #, fuzzy
 msgctxt "undo-type"
 msgid "Text layer modification"
 msgstr "CÃch sáa Äái láp chá"
 
-#: ../app/core/core-enums.c:934
+#: ../app/core/core-enums.c:897
 #, fuzzy
 msgctxt "undo-type"
 msgid "Delete layer mask"
 msgstr "XÃa bá mát ná láp"
 
-#: ../app/core/core-enums.c:936
+#: ../app/core/core-enums.c:899
 #, fuzzy
 msgctxt "undo-type"
 msgid "Show layer mask"
 msgstr "Hián mát ná láp"
 
-#: ../app/core/core-enums.c:937
+#: ../app/core/core-enums.c:900
 #, fuzzy
 msgctxt "undo-type"
 msgid "New channel"
 msgstr "KÃnh mái"
 
-#: ../app/core/core-enums.c:938
+#: ../app/core/core-enums.c:901
 #, fuzzy
 msgctxt "undo-type"
 msgid "Delete channel"
 msgstr "XÃa bá kÃnh ÄÃ."
 
-#: ../app/core/core-enums.c:939
+#: ../app/core/core-enums.c:902
 #, fuzzy
 msgctxt "undo-type"
 msgid "Channel color"
 msgstr "MÃu kÃnh"
 
-#: ../app/core/core-enums.c:940
+#: ../app/core/core-enums.c:903
 #, fuzzy
 msgctxt "undo-type"
 msgid "New path"
 msgstr "ÄÆáng dán mái"
 
-#: ../app/core/core-enums.c:941
+#: ../app/core/core-enums.c:904
 #, fuzzy
 msgctxt "undo-type"
 msgid "Delete path"
 msgstr "XÃa bá ÄÆáng dán"
 
-#: ../app/core/core-enums.c:942
+#: ../app/core/core-enums.c:905
 #, fuzzy
 msgctxt "undo-type"
 msgid "Path modification"
 msgstr "CÃch sáa Äái ÄÆáng dán"
 
-#: ../app/core/core-enums.c:946
+#: ../app/core/core-enums.c:909
 #, fuzzy
 msgctxt "undo-type"
 msgid "Ink"
 msgstr "Mác"
 
-#: ../app/core/core-enums.c:947
+#: ../app/core/core-enums.c:910
 #, fuzzy
 msgctxt "undo-type"
 msgid "Select foreground"
 msgstr "Chán cánh gán"
 
-#: ../app/core/core-enums.c:950
+#: ../app/core/core-enums.c:913
 msgctxt "undo-type"
 msgid "Not undoable"
 msgstr ""
 
-#: ../app/core/core-enums.c:1222
+#: ../app/core/core-enums.c:1185
 #, fuzzy
 msgctxt "select-criterion"
 msgid "Composite"
 msgstr "GhÃp"
 
-#: ../app/core/core-enums.c:1223
+#: ../app/core/core-enums.c:1186
 #, fuzzy
 msgctxt "select-criterion"
 msgid "Red"
 msgstr "Äá"
 
-#: ../app/core/core-enums.c:1224
+#: ../app/core/core-enums.c:1187
 #, fuzzy
 msgctxt "select-criterion"
 msgid "Green"
 msgstr "Xanh là cÃy"
 
-#: ../app/core/core-enums.c:1225
+#: ../app/core/core-enums.c:1188
 #, fuzzy
 msgctxt "select-criterion"
 msgid "Blue"
 msgstr "Xanh dÆÆng"
 
-#: ../app/core/core-enums.c:1226
+#: ../app/core/core-enums.c:1189
 #, fuzzy
 msgctxt "select-criterion"
 msgid "Hue"
 msgstr "Sác mÃu"
 
-#: ../app/core/core-enums.c:1227
+#: ../app/core/core-enums.c:1190
 #, fuzzy
 msgctxt "select-criterion"
 msgid "Saturation"
 msgstr "Äá bÃo hÃa"
 
-#: ../app/core/core-enums.c:1228
+#: ../app/core/core-enums.c:1191
 #, fuzzy
 msgctxt "select-criterion"
 msgid "Value"
 msgstr "Già trá"
 
-#: ../app/core/core-enums.c:1257
+#: ../app/core/core-enums.c:1220
 #, fuzzy
 msgctxt "message-severity"
 msgid "Message"
 msgstr "ThÃng Äiáp %s"
 
-#: ../app/core/core-enums.c:1258
+#: ../app/core/core-enums.c:1221
 msgctxt "message-severity"
 msgid "Warning"
 msgstr ""
 
-#: ../app/core/core-enums.c:1259
+#: ../app/core/core-enums.c:1222
 #, fuzzy
 msgctxt "message-severity"
 msgid "Error"
 msgstr "Lái"
 
-#: ../app/core/core-enums.c:1288
+#: ../app/core/core-enums.c:1251
 msgctxt "color-profile-policy"
 msgid "Ask what to do"
 msgstr ""
 
-#: ../app/core/core-enums.c:1289
+#: ../app/core/core-enums.c:1252
 msgctxt "color-profile-policy"
 msgid "Keep embedded profile"
 msgstr ""
 
-#: ../app/core/core-enums.c:1290
+#: ../app/core/core-enums.c:1253
 #, fuzzy
 msgctxt "color-profile-policy"
 msgid "Convert to RGB workspace"
 msgstr "Chuyán Äái ánh thÃnh mián mÃu RGB"
 
-#: ../app/core/core-enums.c:1327
+#: ../app/core/core-enums.c:1290
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Opacity"
 msgstr "Äá má Äác"
 
-#: ../app/core/core-enums.c:1328
+#: ../app/core/core-enums.c:1291
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Size"
 msgstr "Cá"
 
-#: ../app/core/core-enums.c:1329
+#: ../app/core/core-enums.c:1292
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Angle"
 msgstr "GÃc:"
 
-#: ../app/core/core-enums.c:1330
+#: ../app/core/core-enums.c:1293
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Color"
 msgstr "MÃu"
 
-#: ../app/core/core-enums.c:1331
+#: ../app/core/core-enums.c:1294
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Hardness"
 msgstr "Äá cáng"
 
-#: ../app/core/core-enums.c:1332
+#: ../app/core/core-enums.c:1295
 msgctxt "dynamics-output-type"
 msgid "Force"
 msgstr ""
 
-#: ../app/core/core-enums.c:1333
+#: ../app/core/core-enums.c:1296
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Aspect ratio"
 msgstr "Tá lá hÃnh thá:"
 
-#: ../app/core/core-enums.c:1334
+#: ../app/core/core-enums.c:1297
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Spacing"
 msgstr "Khoáng cÃch"
 
-#: ../app/core/core-enums.c:1335
+#: ../app/core/core-enums.c:1298
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Rate"
 msgstr "Tá lá"
 
-#: ../app/core/core-enums.c:1336
+#: ../app/core/core-enums.c:1299
 msgctxt "dynamics-output-type"
 msgid "Flow"
 msgstr ""
 
-#: ../app/core/core-enums.c:1337
+#: ../app/core/core-enums.c:1300
 #, fuzzy
 msgctxt "dynamics-output-type"
 msgid "Jitter"
@@ -8341,52 +8334,52 @@ msgstr "Ãp dáng Jitter"
 
 #: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:344
 #: ../app/gui/session.c:349 ../app/menus/menus.c:464
-#: ../app/widgets/gimpdevices.c:269
+#: ../app/widgets/gimpdevices.c:206
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
 msgstr "XÃa bá  %s  thát bái: %s."
 
-#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:304
+#: ../app/core/gimp-edit.c:189 ../app/core/gimpimage-new.c:309
 msgid "Pasted Layer"
 msgstr "Láp ÄÃ dÃn"
 
-#: ../app/core/gimp-edit.c:389
+#: ../app/core/gimp-edit.c:388
 #, fuzzy
 msgctxt "undo-type"
 msgid "Clear"
 msgstr "XÃa"
 
-#: ../app/core/gimp-edit.c:408
+#: ../app/core/gimp-edit.c:407
 #, fuzzy
 msgctxt "undo-type"
 msgid "Fill with Foreground Color"
 msgstr "TÃ Äáy báng mÃu cánh gán"
 
-#: ../app/core/gimp-edit.c:412
+#: ../app/core/gimp-edit.c:411
 #, fuzzy
 msgctxt "undo-type"
 msgid "Fill with Background Color"
 msgstr "TÃ Äáy báng mÃu nán"
 
-#: ../app/core/gimp-edit.c:416
+#: ../app/core/gimp-edit.c:415
 #, fuzzy
 msgctxt "undo-type"
 msgid "Fill with White"
 msgstr "TÃ báng mÃu tráng"
 
-#: ../app/core/gimp-edit.c:420
+#: ../app/core/gimp-edit.c:419
 #, fuzzy
 msgctxt "undo-type"
 msgid "Fill with Transparency"
 msgstr "TÃ báng Äá trong suát"
 
-#: ../app/core/gimp-edit.c:424
+#: ../app/core/gimp-edit.c:423
 #, fuzzy
 msgctxt "undo-type"
 msgid "Fill with Pattern"
 msgstr "TÃ báng máu"
 
-#: ../app/core/gimp-edit.c:513
+#: ../app/core/gimp-edit.c:515
 msgid "Global Buffer"
 msgstr "Bá Äám toÃn các"
 
@@ -8422,7 +8415,7 @@ msgstr "Cánh gán tái trong suát"
 msgid "tags-locale:C"
 msgstr "tips-locale:vi"
 
-#: ../app/core/gimp-user-install.c:154
+#: ../app/core/gimp-user-install.c:159
 #, c-format
 msgid ""
 "It seems you have used GIMP %s before.  GIMP will now migrate your user "
@@ -8431,7 +8424,7 @@ msgstr ""
 "Cà vá là bán Äà sá dáng GIMP %s lán trÆác. NhÆ thá thà GIMP sá chuyán thiát "
 "láp ngÆái dÃng cáa bán sang  %s Â."
 
-#: ../app/core/gimp-user-install.c:159
+#: ../app/core/gimp-user-install.c:164
 #, c-format
 msgid ""
 "It appears that you are using GIMP for the first time.  GIMP will now create "
@@ -8440,113 +8433,115 @@ msgstr ""
 "Cà vá là bán Äang sá dáng GIMP lán Äáu tiÃn. NhÆ thá thà GIMP sá táo mát thÆ "
 "mác tÃn  %s  và sao chÃp mát sá táp tin vÃo nÃ."
 
-#: ../app/core/gimp-user-install.c:311
+#: ../app/core/gimp-user-install.c:316
 #, c-format
 msgid "Copying file '%s' from '%s'..."
 msgstr "Äang sao chÃp táp tin  %s  tá  %s  ..."
 
-#: ../app/core/gimp-user-install.c:326 ../app/core/gimp-user-install.c:352
+#: ../app/core/gimp-user-install.c:331 ../app/core/gimp-user-install.c:357
 #, c-format
 msgid "Creating folder '%s'..."
 msgstr "Äang táo thÆ mác  %s  ..."
 
-#: ../app/core/gimp-user-install.c:337 ../app/core/gimp-user-install.c:363
+#: ../app/core/gimp-user-install.c:342 ../app/core/gimp-user-install.c:368
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "KhÃng thá táo thÆ mác  %s Â: %s"
 
-#: ../app/core/gimp.c:597
+#: ../app/core/gimp.c:595
 msgid "Initialization"
 msgstr "CÃch khái Äáng"
 
 #. register all internal procedures
-#: ../app/core/gimp.c:698
+#: ../app/core/gimp.c:696
 msgid "Internal Procedures"
 msgstr "Thá tác Nái bá"
 
 #. initialize  the global parasite table
-#: ../app/core/gimp.c:949
+#: ../app/core/gimp.c:947
 msgid "Looking for data files"
 msgstr "Äang tÃm táp tin dá liáu"
 
-#: ../app/core/gimp.c:949
+#: ../app/core/gimp.c:947
 msgid "Parasites"
 msgstr "Bá bÃm"
 
 #. initialize the list of gimp dynamics
-#: ../app/core/gimp.c:958 ../app/dialogs/preferences-dialog.c:2724
+#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2729
+#: ../app/tools/gimppaintoptions-gui.c:203
 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:2752
+#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2761
 msgid "Modules"
 msgstr "MÃ-Äun"
 
 #. update tag cache
-#: ../app/core/gimp.c:996
+#: ../app/core/gimp.c:997
 msgid "Updating tag cache"
 msgstr ""
 
 #: ../app/core/gimpbrush-load.c:178
-#, c-format
-msgid "Could not read %d bytes from '%s': %s"
-msgstr "KhÃng thá Äác %d byte tá Â %s Â: %s"
+#, 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] "KhÃng thá Äác %d byte tá Â %s Â: %s"
 
-#: ../app/core/gimpbrush-load.c:198
+#: ../app/core/gimpbrush-load.c:200
 #, c-format
 msgid "Fatal parse error in brush file '%s': Width = 0."
 msgstr "Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá Â %s Â: Äá ráng = 0."
 
-#: ../app/core/gimpbrush-load.c:207
+#: ../app/core/gimpbrush-load.c:209
 #, c-format
 msgid "Fatal parse error in brush file '%s': Height = 0."
 msgstr "Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá Â %s Â: Äá cao = 0."
 
-#: ../app/core/gimpbrush-load.c:216
+#: ../app/core/gimpbrush-load.c:218
 #, c-format
 msgid "Fatal parse error in brush file '%s': Bytes = 0."
 msgstr "Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá Â %s Â: sá byte = 0."
 
-#: ../app/core/gimpbrush-load.c:240
+#: ../app/core/gimpbrush-load.c:242
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown depth %d."
 msgstr ""
 "Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá  %s Â: Äá sÃu khÃng rà %d."
 
-#: ../app/core/gimpbrush-load.c:253
+#: ../app/core/gimpbrush-load.c:255
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown version %d."
 msgstr ""
-"Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá  %s Â: phiÃn bán khÃng rà "
-"%d."
+"Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá  %s Â: phiÃn bán khÃng rà %d."
 
-#: ../app/core/gimpbrush-load.c:269 ../app/core/gimpbrush-load.c:389
-#: ../app/core/gimpbrush-load.c:722
+#: ../app/core/gimpbrush-load.c:271 ../app/core/gimpbrush-load.c:391
+#: ../app/core/gimpbrush-load.c:725
 #, c-format
 msgid "Fatal parse error in brush file '%s': File appears truncated."
 msgstr ""
 "Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá Â %s Â: hÃnh nhÆ táp tin bá "
 "cát."
 
-#: ../app/core/gimpbrush-load.c:277 ../app/core/gimpbrushgenerated-load.c:128
+#: ../app/core/gimpbrush-load.c:279 ../app/core/gimpbrushgenerated-load.c:128
 #: ../app/core/gimpbrushpipe-load.c:97
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "Chuái UTF-8 khÃng háp lá trong táp tin bÃt vá Â %s Â."
 
-#: ../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:286 ../app/core/gimppattern-load.c:146
+#: ../app/dialogs/template-options-dialog.c:83
+#: ../app/tools/gimpvectortool.c:318
 msgid "Unnamed"
 msgstr "KhÃng tÃn"
 
-#: ../app/core/gimpbrush-load.c:378
+#: ../app/core/gimpbrush-load.c:380
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': Unsupported brush depth %d\n"
@@ -8556,7 +8551,7 @@ msgstr ""
 "bÃt vá %d.\n"
 "Mái bÃt vá GIMP phái là GRAY hay RGBA."
 
-#: ../app/core/gimpbrush-load.c:450
+#: ../app/core/gimpbrush-load.c:452
 #, c-format
 msgid ""
 "Fatal parse error in brush file '%s': unable to decode abr format version %d."
@@ -8564,14 +8559,14 @@ msgstr ""
 "Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá  %s Â: khÃng thá giái mà "
 "phiÃn bán dáng thác ABR %d."
 
-#: ../app/core/gimpbrush-load.c:617
+#: ../app/core/gimpbrush-load.c:619
 #, fuzzy, c-format
 msgid "Fatal parse error in brush file '%s': Wide brushes are not supported."
 msgstr ""
 "Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá Â %s Â: hÃnh nhÆ táp tin bá "
 "cát."
 
-#: ../app/core/gimpbrush.c:136
+#: ../app/core/gimpbrush.c:148
 #, fuzzy
 msgid "Brush Spacing"
 msgstr "Khoáng cÃch"
@@ -8580,16 +8575,16 @@ msgstr "Khoáng cÃch"
 #, c-format
 msgid "Fatal parse error in brush file '%s': Not a GIMP brush file."
 msgstr ""
-"Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá  %s Â: khÃng phái là táp "
-"tin bÃt vá GIMP."
+"Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá  %s Â: khÃng phái là táp tin "
+"bÃt vá GIMP."
 
 #: ../app/core/gimpbrushgenerated-load.c:104
 #, fuzzy, c-format
 msgid ""
 "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
 msgstr ""
-"Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá Â %s Â: phiÃn bán bÃt vá "
-"GIMP khÃng rÃ."
+"Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá Â %s Â: phiÃn bán bÃt vá GIMP "
+"khÃng rÃ."
 
 #: ../app/core/gimpbrushgenerated-load.c:150
 #, fuzzy, c-format
@@ -8634,12 +8629,12 @@ msgstr "BÃt vá"
 msgid "Brush Hardness"
 msgstr "Äá cáng"
 
-#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:143
+#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:150
 #, fuzzy
 msgid "Brush Aspect Ratio"
 msgstr "Tá lá hÃnh thá:"
 
-#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:147
+#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:154
 #, fuzzy
 msgid "Brush Angle"
 msgstr "ThÆ mác bÃt vá"
@@ -8652,218 +8647,219 @@ msgstr ""
 "Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá Â %s Â: táp tin bá háng."
 
 # Rect is abbreviation for Rectangle / Rect là viát tát cho Chá nhát
-#: ../app/core/gimpchannel-select.c:59
+#: ../app/core/gimpchannel-select.c:60
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rectangle Select"
 msgstr "Chán chá nhát"
 
-#: ../app/core/gimpchannel-select.c:110
+#: ../app/core/gimpchannel-select.c:111
 #, fuzzy
 msgctxt "undo-type"
 msgid "Ellipse Select"
 msgstr "Chán hÃnh báu dác"
 
-#: ../app/core/gimpchannel-select.c:164
+#: ../app/core/gimpchannel-select.c:165
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rounded Rectangle Select"
 msgstr "Chán hÃnh chá nhát"
 
-#: ../app/core/gimpchannel-select.c:433 ../app/core/gimplayer.c:273
+#: ../app/core/gimpchannel-select.c:407 ../app/core/gimplayer.c:275
 #, fuzzy
 msgctxt "undo-type"
 msgid "Alpha to Selection"
 msgstr "Anfa vÃo vÃng chán"
 
-#: ../app/core/gimpchannel-select.c:471
+#: ../app/core/gimpchannel-select.c:445
 #, fuzzy, c-format
 msgctxt "undo-type"
 msgid "%s Channel to Selection"
 msgstr "%s KÃnh tái tÃy chán"
 
-#: ../app/core/gimpchannel-select.c:519
+#: ../app/core/gimpchannel-select.c:493
 #, fuzzy
 msgctxt "undo-type"
 msgid "Fuzzy Select"
 msgstr "Chán má"
 
-#: ../app/core/gimpchannel-select.c:566
+#: ../app/core/gimpchannel-select.c:540
 #, fuzzy
 msgctxt "undo-type"
 msgid "Select by Color"
 msgstr "Chán theo mÃu"
 
-#: ../app/core/gimpchannel.c:272
+#: ../app/core/gimpchannel.c:273
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rename Channel"
 msgstr "Äái tÃn kÃnh"
 
-#: ../app/core/gimpchannel.c:273
+#: ../app/core/gimpchannel.c:274
 #, fuzzy
 msgctxt "undo-type"
 msgid "Move Channel"
 msgstr "Chuyán kÃnh"
 
-#: ../app/core/gimpchannel.c:274
+#: ../app/core/gimpchannel.c:275
 #, fuzzy
 msgctxt "undo-type"
 msgid "Scale Channel"
 msgstr "Co dÃn kÃnh"
 
-#: ../app/core/gimpchannel.c:275
+#: ../app/core/gimpchannel.c:276
 #, fuzzy
 msgctxt "undo-type"
 msgid "Resize Channel"
 msgstr "Äái cá kÃnh"
 
-#: ../app/core/gimpchannel.c:276
+#: ../app/core/gimpchannel.c:277
 #, fuzzy
 msgctxt "undo-type"
 msgid "Flip Channel"
 msgstr "Lát kÃnh"
 
-#: ../app/core/gimpchannel.c:277
+#: ../app/core/gimpchannel.c:278
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rotate Channel"
 msgstr "Xoay kÃnh"
 
-#: ../app/core/gimpchannel.c:278 ../app/core/gimpdrawable-transform.c:845
+#: ../app/core/gimpchannel.c:279 ../app/core/gimpdrawable-transform.c:904
 #, fuzzy
 msgctxt "undo-type"
 msgid "Transform Channel"
 msgstr "Chuyán dáng kÃnh"
 
-#: ../app/core/gimpchannel.c:279
+#: ../app/core/gimpchannel.c:280
 #, fuzzy
 msgctxt "undo-type"
 msgid "Stroke Channel"
 msgstr "Vá nÃt kÃnh"
 
-#: ../app/core/gimpchannel.c:280 ../app/core/gimpselection.c:584
+#: ../app/core/gimpchannel.c:281 ../app/core/gimpselection.c:582
 #, fuzzy
 msgctxt "undo-type"
 msgid "Channel to Selection"
 msgstr "KÃnh tái vÃng chán"
 
-#: ../app/core/gimpchannel.c:281
+#: ../app/core/gimpchannel.c:282
 #, fuzzy
 msgctxt "undo-type"
 msgid "Reorder Channel"
 msgstr "Sáp xáp lái kÃnh"
 
-#: ../app/core/gimpchannel.c:282
+#: ../app/core/gimpchannel.c:283
 #, fuzzy
 msgctxt "undo-type"
 msgid "Raise Channel"
 msgstr "NÃng kÃnh"
 
-#: ../app/core/gimpchannel.c:283
+#: ../app/core/gimpchannel.c:284
 #, fuzzy
 msgctxt "undo-type"
 msgid "Raise Channel to Top"
 msgstr "NÃng kÃnh lÃn trÃn"
 
-#: ../app/core/gimpchannel.c:284
+#: ../app/core/gimpchannel.c:285
 #, fuzzy
 msgctxt "undo-type"
 msgid "Lower Channel"
 msgstr "Há kÃnh"
 
-#: ../app/core/gimpchannel.c:285
+#: ../app/core/gimpchannel.c:286
 #, fuzzy
 msgctxt "undo-type"
 msgid "Lower Channel to Bottom"
 msgstr "Há kÃnh xuáng dÆái"
 
-#: ../app/core/gimpchannel.c:286
+#: ../app/core/gimpchannel.c:287
 msgid "Channel cannot be raised higher."
 msgstr "KhÃng thá nÃng kÃnh lÃn cao hÆn."
 
-#: ../app/core/gimpchannel.c:287
+#: ../app/core/gimpchannel.c:288
 msgid "Channel cannot be lowered more."
 msgstr "KhÃng thá há tháp hÆn náa."
 
-#: ../app/core/gimpchannel.c:309
+#: ../app/core/gimpchannel.c:310
 #, fuzzy
 msgctxt "undo-type"
 msgid "Feather Channel"
 msgstr "Táo hÃnh lÃng kÃnh"
 
-#: ../app/core/gimpchannel.c:310
+#: ../app/core/gimpchannel.c:311
 #, fuzzy
 msgctxt "undo-type"
 msgid "Sharpen Channel"
 msgstr "MÃi sác kÃnh"
 
-#: ../app/core/gimpchannel.c:311
+#: ../app/core/gimpchannel.c:312
 #, fuzzy
 msgctxt "undo-type"
 msgid "Clear Channel"
 msgstr "XÃa kÃnh"
 
-#: ../app/core/gimpchannel.c:312
+#: ../app/core/gimpchannel.c:313
 #, fuzzy
 msgctxt "undo-type"
 msgid "Fill Channel"
 msgstr "TÃ Äáy kÃnh"
 
-#: ../app/core/gimpchannel.c:313
+#: ../app/core/gimpchannel.c:314
 #, fuzzy
 msgctxt "undo-type"
 msgid "Invert Channel"
 msgstr "Äáo kÃnh"
 
-#: ../app/core/gimpchannel.c:314
+#: ../app/core/gimpchannel.c:315
 #, fuzzy
 msgctxt "undo-type"
 msgid "Border Channel"
 msgstr "Táo vián kÃnh"
 
-#: ../app/core/gimpchannel.c:315
+#: ../app/core/gimpchannel.c:316
 #, fuzzy
 msgctxt "undo-type"
 msgid "Grow Channel"
 msgstr "Nái kÃnh"
 
-#: ../app/core/gimpchannel.c:316
+#: ../app/core/gimpchannel.c:317
 #, fuzzy
 msgctxt "undo-type"
 msgid "Shrink Channel"
 msgstr "Thu nhá kÃnh"
 
-#: ../app/core/gimpchannel.c:728
+#: ../app/core/gimpchannel.c:731
 msgid "Cannot stroke empty channel."
 msgstr "KhÃng thá vá nát kÃnh ráng."
 
-#: ../app/core/gimpchannel.c:1752
+#: ../app/core/gimpchannel.c:1758
 #, fuzzy
 msgctxt "undo-type"
 msgid "Set Channel Color"
 msgstr "Äát mÃu kÃnh"
 
-#: ../app/core/gimpchannel.c:1818
+#: ../app/core/gimpchannel.c:1824
 #, fuzzy
 msgctxt "undo-type"
 msgid "Set Channel Opacity"
 msgstr "Äát Äá má Äác kÃnh"
 
-#: ../app/core/gimpchannel.c:1926 ../app/core/gimpselection.c:154
+#: ../app/core/gimpchannel.c:1932 ../app/core/gimpselection.c:154
 msgid "Selection Mask"
 msgstr "Mát ná vÃng chán"
 
-#: ../app/core/gimpcontext.c:640
+#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:113
+#: ../app/widgets/gimplayertreeview.c:284
 msgid "Opacity"
 msgstr "Äá má Äác"
 
-#: ../app/core/gimpcontext.c:648
+#: ../app/core/gimpcontext.c:647
 #, fuzzy
 msgid "Paint Mode"
 msgstr "Chá Äá _sÆn"
 
-#: ../app/core/gimpdata.c:679 ../app/core/gimptoolpresets.c:277
+#: ../app/core/gimpdata.c:670
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "KhÃng thá xÃa bá Â %s Â: %s"
@@ -8881,11 +8877,11 @@ msgstr ""
 "%s"
 
 #: ../app/core/gimpdatafactory.c:536 ../app/core/gimpdatafactory.c:539
-#: ../app/core/gimpitem.c:425 ../app/core/gimpitem.c:428
+#: ../app/core/gimpitem.c:493 ../app/core/gimpitem.c:496
 msgid "copy"
 msgstr "bán sao"
 
-#: ../app/core/gimpdatafactory.c:548 ../app/core/gimpitem.c:437
+#: ../app/core/gimpdatafactory.c:548 ../app/core/gimpitem.c:505
 #, c-format
 msgid "%s copy"
 msgstr "bán sao %s"
@@ -8922,7 +8918,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdrawable-blend.c:244
+#: ../app/core/gimpdrawable-blend.c:245
 #, fuzzy
 msgctxt "undo-type"
 msgid "Blend"
@@ -8940,11 +8936,11 @@ msgctxt "undo-type"
 msgid "Brightness-Contrast"
 msgstr "Äá tÆÆng phán-Äá sÃng"
 
-#: ../app/core/gimpdrawable-bucket-fill.c:91
+#: ../app/core/gimpdrawable-bucket-fill.c:89
 msgid "No patterns available for this operation."
 msgstr "KhÃng cà máu sán sÃng cho thao tÃc nÃy."
 
-#: ../app/core/gimpdrawable-bucket-fill.c:286
+#: ../app/core/gimpdrawable-bucket-fill.c:284
 #, fuzzy
 msgctxt "undo-type"
 msgid "Bucket Fill"
@@ -9005,7 +9001,7 @@ msgstr "Äáo"
 msgid "Levels"
 msgstr "Mác"
 
-#: ../app/core/gimpdrawable-offset.c:315
+#: ../app/core/gimpdrawable-offset.c:316
 #, fuzzy
 msgctxt "undo-type"
 msgid "Offset Drawable"
@@ -9016,170 +9012,184 @@ msgstr "Hiáu sá vá ÄÆác"
 msgid "Posterize"
 msgstr "BÃch chÆÆng hÃa"
 
-#: ../app/core/gimpdrawable-stroke.c:435
+#: ../app/core/gimpdrawable-stroke.c:272
+#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556
+#, fuzzy
+msgid "Not enough points to stroke"
+msgstr "KhÃng cà vÃng chán trong Äà cán vá nÃt."
+
+#: ../app/core/gimpdrawable-stroke.c:273
+#, fuzzy
+msgid "Not enough points to fill"
+msgstr "KhÃng cà vÃng chán trong Äà cán vá nÃt."
+
+#: ../app/core/gimpdrawable-stroke.c:404
 #, fuzzy
 msgctxt "undo-type"
 msgid "Render Stroke"
 msgstr "VÃ nÃt"
 
 #: ../app/core/gimpdrawable-threshold.c:70
-#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpthresholdtool.c:90
+#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:275
+#: ../app/tools/gimpbucketfilloptions.c:285
+#: ../app/tools/gimpregionselectoptions.c:215
+#: ../app/tools/gimpthresholdtool.c:90
 msgid "Threshold"
 msgstr "NgÆáng"
 
-#: ../app/core/gimpdrawable-transform.c:644
+#: ../app/core/gimpdrawable-transform.c:677
 #, fuzzy
 msgctxt "undo-type"
 msgid "Flip"
 msgstr "Lát"
 
-#: ../app/core/gimpdrawable-transform.c:718
+#: ../app/core/gimpdrawable-transform.c:762
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rotate"
 msgstr "Xoay"
 
-#: ../app/core/gimpdrawable-transform.c:843 ../app/core/gimplayer.c:272
+#: ../app/core/gimpdrawable-transform.c:902 ../app/core/gimplayer.c:274
 #, fuzzy
 msgctxt "undo-type"
 msgid "Transform Layer"
 msgstr "Chuyán dáng láp"
 
-#: ../app/core/gimpdrawable-transform.c:858
+#: ../app/core/gimpdrawable-transform.c:915
 msgid "Transformation"
 msgstr "Chuyán dáng"
 
-#: ../app/core/gimpdrawable.c:486
+#: ../app/core/gimpdrawable.c:494
 #, fuzzy
 msgctxt "undo-type"
 msgid "Scale"
 msgstr "Co dÃn"
 
-#: ../app/core/gimpdynamicsoutput.c:106
+#: ../app/core/gimpdynamicsoutput.c:135
 #, fuzzy
 msgid "Output type"
 msgstr "Mác xuát"
 
-#: ../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
 #, fuzzy, c-format
 msgid "Fatal parse error in gradient file '%s': Read error in line %d."
 msgstr ""
 "Gáp lái phÃn tÃch nghiÃm tráng trong táp tin báng chán  %s Â: lái Äác trong "
 "dÃng %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 ""
-"Lái phÃn tÃch nghiÃm tráng trong táp tin Äá dác  %s Â: khÃng phái là táp "
-"tin Äá dác GIMP."
+"Lái phÃn tÃch nghiÃm tráng trong táp tin Äá dác  %s Â: khÃng phái là táp tin "
+"Äá dác 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 "Gáp chuái UTF-8 khÃng háp lá trong táp tin Äá dác  %s Â."
 
-#: ../app/core/gimpgradient-load.c:136
+#: ../app/core/gimpgradient-load.c:137
 #, fuzzy, c-format
 msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d."
 msgstr ""
 "Lái phÃn tÃch nghiÃm tráng trong táp tin Äá dác  %s Â: táp tin bá háng."
 
-#: ../app/core/gimpgradient-load.c:218 ../app/core/gimpgradient-load.c:229
+#: ../app/core/gimpgradient-load.c:219 ../app/core/gimpgradient-load.c:230
 #, fuzzy, c-format
 msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d."
 msgstr ""
-"Lái phÃn tÃch nghiÃm tráng trong táp tin Äá dác  %s Â: khÃng phái là táp "
-"tin Äá dác GIMP."
+"Lái phÃn tÃch nghiÃm tráng trong táp tin Äá dác  %s Â: khÃng phái là táp tin "
+"Äá dác GIMP."
 
-#: ../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 "Táp tin Äá dác  %s  bá háng. CÃc Äoán khÃng qua phám vi 0-1."
 
-#: ../app/core/gimpgradient-load.c:335
+#: ../app/core/gimpgradient-load.c:336
 #, c-format
 msgid "No linear gradients found in '%s'"
 msgstr "KhÃng tÃm tháy Äá dác tuyán trong  %s Â."
 
-#: ../app/core/gimpgradient-load.c:345
+#: ../app/core/gimpgradient-load.c:346
 #, c-format
 msgid "Failed to import gradients from '%s': %s"
 msgstr "Lái nháp Äá dác tá Â %s Â: %s"
 
-#: ../app/core/gimpgrid.c:83
+#: ../app/core/gimpgrid.c:84
 msgid "Line style used for the grid."
 msgstr "Kiáu dÃng dÃng ÄÆác dÃng cho lÆái."
 
-#: ../app/core/gimpgrid.c:89
+#: ../app/core/gimpgrid.c:90
 msgid "The foreground color of the grid."
 msgstr "MÃu cánh gán cáa lÆái."
 
-#: ../app/core/gimpgrid.c:94
+#: ../app/core/gimpgrid.c:95
 msgid ""
 "The background color of the grid; only used in double dashed line style."
 msgstr "MÃu nán cáa lÆái; ÄÆác dÃng chá trong kiáu dÃng dÃng gách ÄÃi."
 
-#: ../app/core/gimpgrid.c:100
+#: ../app/core/gimpgrid.c:101
 msgid "Horizontal spacing of grid lines."
 msgstr "Khoáng cÃch ngang giáa cÃc dÃng lÆái."
 
-#: ../app/core/gimpgrid.c:105
+#: ../app/core/gimpgrid.c:106
 msgid "Vertical spacing of grid lines."
 msgstr "Khoáng cÃch dác giáa cÃc dÃng lÆái."
 
-#: ../app/core/gimpgrid.c:114
+#: ../app/core/gimpgrid.c:115
 msgid ""
 "Horizontal offset of the first grid line; this may be a negative number."
 msgstr "Hiáu sá ngang cáa dÃng lÆái thá nhát; nà cà thá là mát sá Ãm."
 
-#: ../app/core/gimpgrid.c:121
+#: ../app/core/gimpgrid.c:122
 msgid "Vertical offset of the first grid line; this may be a negative number."
 msgstr "Hiáu sá dác cáa dÃng lÆái thá nhát; nà cà thá là mát sá Ãm."
 
-#: ../app/core/gimpgrouplayer.c:178
+#: ../app/core/gimpgrouplayer.c:219
 #, fuzzy
 msgid "Layer Group"
 msgstr "Láp Äán _trÃn"
 
-#: ../app/core/gimpgrouplayer.c:179
+#: ../app/core/gimpgrouplayer.c:220
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rename Layer Group"
 msgstr "Äái tÃn láp"
 
-#: ../app/core/gimpgrouplayer.c:180
+#: ../app/core/gimpgrouplayer.c:221
 #, fuzzy
 msgctxt "undo-type"
 msgid "Move Layer Group"
 msgstr "Chuyán láp"
 
-#: ../app/core/gimpgrouplayer.c:181
+#: ../app/core/gimpgrouplayer.c:222
 #, fuzzy
 msgctxt "undo-type"
 msgid "Scale Layer Group"
 msgstr "Co dÃn láp"
 
-#: ../app/core/gimpgrouplayer.c:182
+#: ../app/core/gimpgrouplayer.c:223
 #, fuzzy
 msgctxt "undo-type"
 msgid "Resize Layer Group"
 msgstr "Äái cá láp"
 
-#: ../app/core/gimpgrouplayer.c:183
+#: ../app/core/gimpgrouplayer.c:224
 #, fuzzy
 msgctxt "undo-type"
 msgid "Flip Layer Group"
 msgstr "Lát láp"
 
-#: ../app/core/gimpgrouplayer.c:184
+#: ../app/core/gimpgrouplayer.c:225
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rotate Layer Group"
 msgstr "Xoay láp"
 
-#: ../app/core/gimpgrouplayer.c:185
+#: ../app/core/gimpgrouplayer.c:226
 #, fuzzy
 msgctxt "undo-type"
 msgid "Transform Layer Group"
@@ -9191,52 +9201,57 @@ msgctxt "undo-type"
 msgid "Arrange Objects"
 msgstr "Sáp xáp Äái tÆáng"
 
-#: ../app/core/gimpimage-colormap.c:67
+#: ../app/core/gimpimage-colormap.c:64
+#, c-format
+msgid "Colormap of Image #%d (%s)"
+msgstr ""
+
+#: ../app/core/gimpimage-colormap.c:162
 #, fuzzy
 msgctxt "undo-type"
 msgid "Set Colormap"
 msgstr "Äát bá trà mÃu"
 
-#: ../app/core/gimpimage-colormap.c:132
+#: ../app/core/gimpimage-colormap.c:243
 #, fuzzy
 msgctxt "undo-type"
 msgid "Change Colormap entry"
 msgstr "Äái mác nháp bá trà mÃu"
 
-#: ../app/core/gimpimage-colormap.c:157
+#: ../app/core/gimpimage-colormap.c:271
 #, fuzzy
 msgctxt "undo-type"
 msgid "Add Color to Colormap"
 msgstr "ThÃm mÃu vÃo bá trà mÃu"
 
-#: ../app/core/gimpimage-convert.c:791
+#: ../app/core/gimpimage-convert.c:793
 msgid "Cannot convert image: palette is empty."
 msgstr "KhÃng thá chuyán Äái cánh và báng chán ráng."
 
-#: ../app/core/gimpimage-convert.c:807
+#: ../app/core/gimpimage-convert.c:809
 #, fuzzy
 msgctxt "undo-type"
 msgid "Convert Image to RGB"
 msgstr "Chuyán Äái ánh sang RGB"
 
-#: ../app/core/gimpimage-convert.c:811
+#: ../app/core/gimpimage-convert.c:813
 #, fuzzy
 msgctxt "undo-type"
 msgid "Convert Image to Grayscale"
 msgstr "Chuyán Äái ánh sang CÃn báng XÃm"
 
-#: ../app/core/gimpimage-convert.c:815
+#: ../app/core/gimpimage-convert.c:817
 #, fuzzy
 msgctxt "undo-type"
 msgid "Convert Image to Indexed"
 msgstr "Chuyán Äái ánh sang ÄÃ phá lác"
 
-#: ../app/core/gimpimage-convert.c:894
+#: ../app/core/gimpimage-convert.c:896
 #, fuzzy
 msgid "Converting to indexed colors (stage 2)"
 msgstr "Äang chuyán Äái sang ÄÃ phá lác (giái Äoán 2)"
 
-#: ../app/core/gimpimage-convert.c:939
+#: ../app/core/gimpimage-convert.c:941
 #, fuzzy
 msgid "Converting to indexed colors (stage 3)"
 msgstr "Äang chuyán Äái sang ÄÃ phá lác (giái Äoán 3)"
@@ -9265,7 +9280,7 @@ msgctxt "undo-type"
 msgid "Add Vertical Guide"
 msgstr "ThÃm nÃt dán dác"
 
-#: ../app/core/gimpimage-guides.c:119
+#: ../app/core/gimpimage-guides.c:117
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Guide"
@@ -9301,64 +9316,64 @@ msgctxt "undo-type"
 msgid "Transform Items"
 msgstr "Chuyán dáng mác"
 
-#: ../app/core/gimpimage-merge.c:108 ../app/core/gimpimage-merge.c:122
+#: ../app/core/gimpimage-merge.c:132
 #, fuzzy
 msgctxt "undo-type"
 msgid "Merge Visible Layers"
 msgstr "Trán cÃc láp hián thá"
 
-#: ../app/core/gimpimage-merge.c:176
+#: ../app/core/gimpimage-merge.c:178
 #, fuzzy
 msgctxt "undo-type"
 msgid "Flatten Image"
 msgstr "LÃm pháng ánh"
 
-#: ../app/core/gimpimage-merge.c:225
+#: ../app/core/gimpimage-merge.c:248
 msgid "Cannot merge down to a layer group."
 msgstr ""
 
-#: ../app/core/gimpimage-merge.c:232
+#: ../app/core/gimpimage-merge.c:255
 msgid "The layer to merge down to is locked."
 msgstr ""
 
-#: ../app/core/gimpimage-merge.c:244
+#: ../app/core/gimpimage-merge.c:267
 #, fuzzy
 msgid "There is no visible layer to merge down to."
 msgstr "KhÃng cà láp cán chuyán dáng."
 
-#: ../app/core/gimpimage-merge.c:255
+#: ../app/core/gimpimage-merge.c:277
 #, fuzzy
 msgctxt "undo-type"
 msgid "Merge Down"
 msgstr "Trán xuáng"
 
-#: ../app/core/gimpimage-merge.c:277
+#: ../app/core/gimpimage-merge.c:305
 #, fuzzy
 msgctxt "undo-type"
 msgid "Merge Layer Group"
 msgstr "Trán cÃc láp"
 
-#: ../app/core/gimpimage-merge.c:330
+#: ../app/core/gimpimage-merge.c:358
 #, fuzzy
 msgctxt "undo-type"
 msgid "Merge Visible Paths"
 msgstr "Trán cÃc ÄÆáng dán hián thá"
 
-#: ../app/core/gimpimage-merge.c:366
+#: ../app/core/gimpimage-merge.c:394
 msgid "Not enough visible paths for a merge. There must be at least two."
 msgstr "KhÃng Äá sá ÄÆáng dán hián thá Äá trán ÄÆác. Phái cà Ãt nhát 2 ÄÆáng."
 
-#: ../app/core/gimpimage-new.c:135
+#: ../app/core/gimpimage-new.c:140
 msgid "Background"
 msgstr "Nán"
 
-#: ../app/core/gimpimage-quick-mask.c:85
+#: ../app/core/gimpimage-quick-mask.c:86
 #, fuzzy
 msgctxt "undo-type"
 msgid "Enable Quick Mask"
 msgstr "Bát Mát ná nhanh"
 
-#: ../app/core/gimpimage-quick-mask.c:135
+#: ../app/core/gimpimage-quick-mask.c:136
 #, fuzzy
 msgctxt "undo-type"
 msgid "Disable Quick Mask"
@@ -9370,13 +9385,13 @@ msgctxt "undo-type"
 msgid "Add Sample Point"
 msgstr "ThÃm Äiám máu : "
 
-#: ../app/core/gimpimage-sample-points.c:101
+#: ../app/core/gimpimage-sample-points.c:98
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Sample Point"
 msgstr "Gá bá Äiám máu"
 
-#: ../app/core/gimpimage-sample-points.c:138
+#: ../app/core/gimpimage-sample-points.c:126
 #, fuzzy
 msgctxt "undo-type"
 msgid "Move Sample Point"
@@ -9393,148 +9408,152 @@ msgstr "Co dÃn ánh"
 msgid "Can't undo %s"
 msgstr "KhÃng thá háy bÆác %s."
 
-#: ../app/core/gimpimage.c:1734
+#: ../app/core/gimpimage.c:1806
 #, fuzzy
 msgctxt "undo-type"
 msgid "Change Image Resolution"
 msgstr "Äái Äá phÃn giái ánh"
 
-#: ../app/core/gimpimage.c:1786
+#: ../app/core/gimpimage.c:1858
 #, fuzzy
 msgctxt "undo-type"
 msgid "Change Image Unit"
 msgstr "Äái ÄÆn vá ánh"
 
-#: ../app/core/gimpimage.c:2767
+#: ../app/core/gimpimage.c:2850
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite to Image"
 msgstr "ÄÃnh bá bÃm vÃo ánh"
 
-#: ../app/core/gimpimage.c:2808
+#: ../app/core/gimpimage.c:2891
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Parasite from Image"
 msgstr "Gá bá bá bÃm ra ánh"
 
-#: ../app/core/gimpimage.c:3517
+#: ../app/core/gimpimage.c:3600
 #, fuzzy
 msgctxt "undo-type"
 msgid "Add Layer"
 msgstr "ThÃm láp"
 
-#: ../app/core/gimpimage.c:3567 ../app/core/gimpimage.c:3587
+#: ../app/core/gimpimage.c:3650 ../app/core/gimpimage.c:3670
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Layer"
 msgstr "Gá bá láp"
 
-#: ../app/core/gimpimage.c:3580
+#: ../app/core/gimpimage.c:3664
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Floating Selection"
 msgstr "Gá bá vÃng chán nái"
 
-#: ../app/core/gimpimage.c:3746
+#: ../app/core/gimpimage.c:3832
 #, fuzzy
 msgctxt "undo-type"
 msgid "Add Channel"
 msgstr "ThÃm kÃnh"
 
-#: ../app/core/gimpimage.c:3784 ../app/core/gimpimage.c:3796
+#: ../app/core/gimpimage.c:3870 ../app/core/gimpimage.c:3883
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Channel"
 msgstr "Gá bá kÃnh"
 
-#: ../app/core/gimpimage.c:3843
+#: ../app/core/gimpimage.c:3937
 #, fuzzy
 msgctxt "undo-type"
 msgid "Add Path"
 msgstr "ThÃm ÄÆáng dán"
 
-#: ../app/core/gimpimage.c:3874
+#: ../app/core/gimpimage.c:3968
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Path"
 msgstr "Gá bá ÄÆáng dán"
 
-#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1711
+#: ../app/core/gimpimagefile.c:697 ../app/dialogs/preferences-dialog.c:1711
 msgid "Folder"
 msgstr "ThÆ mác"
 
-#: ../app/core/gimpimagefile.c:539
+#: ../app/core/gimpimagefile.c:702
 msgid "Special File"
 msgstr "Táp tin Äác biát"
 
-#: ../app/core/gimpimagefile.c:555
+#: ../app/core/gimpimagefile.c:718
 msgid "Remote File"
 msgstr "Táp tin á xa"
 
-#: ../app/core/gimpimagefile.c:574
+#: ../app/core/gimpimagefile.c:737
 msgid "Click to create preview"
 msgstr "Nháp Äá táo khung xem thá"
 
-#: ../app/core/gimpimagefile.c:580
+#: ../app/core/gimpimagefile.c:743
 msgid "Loading preview..."
 msgstr "Äang tái khung xem thá..."
 
-#: ../app/core/gimpimagefile.c:586
+#: ../app/core/gimpimagefile.c:749
 msgid "Preview is out of date"
 msgstr "Khung xem thá quà thái"
 
-#: ../app/core/gimpimagefile.c:592
+#: ../app/core/gimpimagefile.c:755
 msgid "Cannot create preview"
 msgstr "KhÃng thá táo khung xem thá"
 
-#: ../app/core/gimpimagefile.c:602
+#: ../app/core/gimpimagefile.c:765
 msgid "(Preview may be out of date)"
 msgstr "(Cà lá khung xem thá quà thái)"
 
 #. pixel size
-#: ../app/core/gimpimagefile.c:611 ../app/widgets/gimpimagepropview.c:446
-#: ../app/widgets/gimpsizebox.c:434 ../app/widgets/gimptemplateeditor.c:565
+#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:438
+#: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565
 #, c-format
 msgid "%d à %d pixel"
 msgid_plural "%d à %d pixels"
 msgstr[0] "%d à %d Äiám ánh"
 
-#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:335
+#: ../app/core/gimpimagefile.c:797 ../app/display/gimpdisplayshell-title.c:339
 #, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
 msgstr[0] "%d láp"
 
-#: ../app/core/gimpimagefile.c:681
+#: ../app/core/gimpimagefile.c:845
 #, c-format
 msgid "Could not open thumbnail '%s': %s"
 msgstr "KhÃng thá má hÃnh thu nhá Â %s Â: %s"
 
-#: ../app/core/gimpitem.c:1564
+#: ../app/core/gimpitem.c:1815
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite"
 msgstr "ÄÃnh bá bÃm"
 
-#: ../app/core/gimpitem.c:1574
+#: ../app/core/gimpitem.c:1825
 #, fuzzy
 msgctxt "undo-type"
 msgid "Attach Parasite to Item"
 msgstr "ÄÃnh bá bÃm vÃo mác"
 
-#: ../app/core/gimpitem.c:1616 ../app/core/gimpitem.c:1623
+#: ../app/core/gimpitem.c:1876 ../app/core/gimpitem.c:1883
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Parasite from Item"
 msgstr "Gá bá bá bÃm ra mác"
 
+#: ../app/core/gimpitem-exclusive.c:79
+msgid "Set Item Exclusive Visible"
+msgstr "Äát mác hián thá dÃnh riÃng"
+
 #: ../app/core/gimplayer-floating-sel.c:95
 #, fuzzy
 msgctxt "undo-type"
 msgid "Anchor Floating Selection"
 msgstr "Neo vÃng chán nái"
 
-#: ../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."
@@ -9548,240 +9567,252 @@ msgctxt "undo-type"
 msgid "Floating Selection to Layer"
 msgstr "VÃng chán nái tái láp"
 
-#: ../app/core/gimplayer.c:266
+#: ../app/core/gimplayer.c:268
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rename Layer"
 msgstr "Äái tÃn láp"
 
-#: ../app/core/gimplayer.c:267
+#: ../app/core/gimplayer.c:269
 #, fuzzy
 msgctxt "undo-type"
 msgid "Move Layer"
 msgstr "Chuyán láp"
 
-#: ../app/core/gimplayer.c:268
+#: ../app/core/gimplayer.c:270
 #, fuzzy
 msgctxt "undo-type"
 msgid "Scale Layer"
 msgstr "Co dÃn láp"
 
-#: ../app/core/gimplayer.c:269
+#: ../app/core/gimplayer.c:271
 #, fuzzy
 msgctxt "undo-type"
 msgid "Resize Layer"
 msgstr "Äái cá láp"
 
-#: ../app/core/gimplayer.c:270
+#: ../app/core/gimplayer.c:272
 #, fuzzy
 msgctxt "undo-type"
 msgid "Flip Layer"
 msgstr "Lát láp"
 
-#: ../app/core/gimplayer.c:271
+#: ../app/core/gimplayer.c:273
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rotate Layer"
 msgstr "Xoay láp"
 
-#: ../app/core/gimplayer.c:274
+#: ../app/core/gimplayer.c:276
 #, fuzzy
 msgctxt "undo-type"
 msgid "Reorder Layer"
 msgstr "Sáp xáp lái láp"
 
-#: ../app/core/gimplayer.c:275
+#: ../app/core/gimplayer.c:277
 #, fuzzy
 msgctxt "undo-type"
 msgid "Raise Layer"
 msgstr "NÃng láp"
 
-#: ../app/core/gimplayer.c:276
+#: ../app/core/gimplayer.c:278
 #, fuzzy
 msgctxt "undo-type"
 msgid "Raise Layer to Top"
 msgstr "NÃng láp lÃn trÃn"
 
-#: ../app/core/gimplayer.c:277
+#: ../app/core/gimplayer.c:279
 #, fuzzy
 msgctxt "undo-type"
 msgid "Lower Layer"
 msgstr "Há láp"
 
-#: ../app/core/gimplayer.c:278
+#: ../app/core/gimplayer.c:280
 #, fuzzy
 msgctxt "undo-type"
 msgid "Lower Layer to Bottom"
 msgstr "Há láp xuáng dÆái"
 
-#: ../app/core/gimplayer.c:279
+#: ../app/core/gimplayer.c:281
 msgid "Layer cannot be raised higher."
 msgstr "KhÃng thá nÃng láp lÃn cao hÆn."
 
-#: ../app/core/gimplayer.c:280
+#: ../app/core/gimplayer.c:282
 msgid "Layer cannot be lowered more."
 msgstr "KhÃng thá há tháp láp hÆn náa."
 
-#: ../app/core/gimplayer.c:437 ../app/core/gimplayer.c:1491
-#: ../app/core/gimplayermask.c:235
+#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1528
+#: ../app/core/gimplayermask.c:236
 #, c-format
 msgid "%s mask"
 msgstr "%s mát ná"
 
-#: ../app/core/gimplayer.c:476
+#: ../app/core/gimplayer.c:489
 #, c-format
 msgid ""
 "Floating Selection\n"
 "(%s)"
 msgstr "VÃng chán nái(%s)"
 
-#: ../app/core/gimplayer.c:1415
+#: ../app/core/gimplayer.c:1448
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "KhÃng thá thÃm mát ná láp và láp Äà cà nÃ."
 
-#: ../app/core/gimplayer.c:1426
+#: ../app/core/gimplayer.c:1459
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr "KhÃng thá thÃm mát ná láp cáa cÃc chiáu khÃc ngoÃi láp chá Äánh."
 
-#: ../app/core/gimplayer.c:1432
+#: ../app/core/gimplayer.c:1465
 #, fuzzy
 msgctxt "undo-type"
 msgid "Add Layer Mask"
 msgstr "ThÃm mát ná láp"
 
-#: ../app/core/gimplayer.c:1546
+#: ../app/core/gimplayer.c:1583
 #, fuzzy
 msgctxt "undo-type"
 msgid "Transfer Alpha to Mask"
 msgstr "Chuyán Anfa sang Mát ná"
 
-#: ../app/core/gimplayer.c:1716 ../app/core/gimplayermask.c:261
+#: ../app/core/gimplayer.c:1753
 #, fuzzy
 msgctxt "undo-type"
 msgid "Apply Layer Mask"
 msgstr "Ãp dáng mát ná láp"
 
-#: ../app/core/gimplayer.c:1717
+#: ../app/core/gimplayer.c:1754
 #, fuzzy
 msgctxt "undo-type"
 msgid "Delete Layer Mask"
 msgstr "XÃa bá mát ná láp"
 
-#: ../app/core/gimplayer.c:1836
+#: ../app/core/gimplayer.c:1873
 #, fuzzy
 msgctxt "undo-type"
 msgid "Add Alpha Channel"
 msgstr "ThÃm kÃnh anfa."
 
-#: ../app/core/gimplayer.c:1890
+#: ../app/core/gimplayer.c:1927
 #, fuzzy
 msgctxt "undo-type"
 msgid "Remove Alpha Channel"
 msgstr "Gá bá kÃnh anfa"
 
-#: ../app/core/gimplayer.c:1910
+#: ../app/core/gimplayer.c:1947
 #, fuzzy
 msgctxt "undo-type"
 msgid "Layer to Image Size"
 msgstr "Láp tái cá ánh"
 
-#: ../app/core/gimplayermask.c:110
+#: ../app/core/gimplayermask.c:108
 #, fuzzy
 msgctxt "undo-type"
 msgid "Move Layer Mask"
 msgstr "Chuyán mát ná láp"
 
-#: ../app/core/gimplayermask.c:111
+#: ../app/core/gimplayermask.c:109
 #, fuzzy
 msgctxt "undo-type"
 msgid "Layer Mask to Selection"
 msgstr "Mát ná láp kháp vÃng chán"
 
-#: ../app/core/gimplayermask.c:185
+#: ../app/core/gimplayermask.c:183
 #, fuzzy, c-format
 msgid "Cannot rename layer masks."
 msgstr "KhÃng thá táo thÆ mác  %s Â: %s"
 
-#: ../app/core/gimplayermask.c:329
+#: ../app/core/gimplayermask.c:264
+#, fuzzy
+msgctxt "undo-type"
+msgid "Enable Layer Mask"
+msgstr "_Tát mát ná láp"
+
+#: ../app/core/gimplayermask.c:265
+#, fuzzy
+msgctxt "undo-type"
+msgid "Disable Layer Mask"
+msgstr "_Tát mát ná láp"
+
+#: ../app/core/gimplayermask.c:327
 #, fuzzy
 msgctxt "undo-type"
 msgid "Show Layer Mask"
 msgstr "Hián mát ná láp"
 
-#: ../app/core/gimppalette-import.c:438
+#: ../app/core/gimppalette-import.c:439
 #, c-format
 msgid "Index %d"
 msgstr "phá lác %d"
 
-#: ../app/core/gimppalette-import.c:548
+#: ../app/core/gimppalette-import.c:549
 #, c-format
 msgid "Unknown type of palette file: %s"
 msgstr "KhÃng biát kiáu táp tin báng chán: %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 ""
 "Gáp lái phÃn tÃch nghiÃm tráng trong táp tin báng chán  %s Â: lái Äác trong "
 "dÃng %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 ""
 "Gáp lái phÃn tÃch nghiÃm tráng trong táp tin báng chán  %s Â:\n"
 "thiáu phán Äáu ma thuát."
 
-#: ../app/core/gimppalette-load.c:124
+#: ../app/core/gimppalette-load.c:125
 #, c-format
 msgid "Invalid UTF-8 string in palette file '%s'"
 msgstr "Gáp chuái UTF-8 khÃng háp lá trong táp tin báng chán  %s Â."
 
-#: ../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 ""
-"Äang Äác táp tin báng chán  %s Â: gáp sá lÆáng cát khÃng háp lá trong dÃng "
-"%d, nÃn dÃng già trá mác Äánh."
+"Äang Äác táp tin báng chán  %s Â: gáp sá lÆáng cát khÃng háp lá trong dÃng %"
+"d, nÃn dÃng già trá mác Äánh."
 
-#: ../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 ""
-"Äang Äác táp tin báng chán  %s Â: thiáu thÃnh phán mÃu Äá (RED) trong dÃng "
-"%d."
+"Äang Äác táp tin báng chán  %s Â: thiáu thÃnh phán mÃu Äá (RED) trong dÃng %"
+"d."
 
-#: ../app/core/gimppalette-load.c:192
+#: ../app/core/gimppalette-load.c:193
 #, fuzzy, c-format
 msgid "Reading palette file '%s': Missing GREEN component in line %d."
 msgstr ""
-"Äang Äác táp tin báng chán  %s Â: thiáu thÃnh phán mÃu Äá (RED) trong dÃng "
-"%d."
+"Äang Äác táp tin báng chán  %s Â: thiáu thÃnh phán mÃu Äá (RED) trong dÃng %"
+"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 ""
 "Äang Äác táp tin báng chán  %s Â: thiáu thÃnh phán mÃu Xanh dÆÆng (BLUE) "
 "trong dÃng %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 ""
-"Äang Äác táp tin báng chán  %s Â: già trá RGB nám ngoÃi phám vi trong dÃng "
-"%d."
+"Äang Äác táp tin báng chán  %s Â: già trá RGB nám ngoÃi phám vi trong dÃng %"
+"d."
 
-#: ../app/core/gimppalette-load.c:477
+#: ../app/core/gimppalette-load.c:478
 #, fuzzy, c-format
 msgid "Could not read header from palette file '%s'"
 msgstr "KhÃng thá Äác %d byte tá Â %s Â: %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
 #, fuzzy, c-format
 msgid "Fatal parse error in palette file '%s'"
 msgstr "Lái phÃn tÃch nghiÃm tráng trong táp tin bÃt vá Â %s Â."
@@ -9817,7 +9848,7 @@ msgstr ""
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "Gáp chuái UTF-8 khÃng háp lá trong táp tin máu  %s Â."
 
-#: ../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 "KhÃng thá cháy Callback %s. bá sung tÆÆng áng cà lá Äà Äá vá."
@@ -9897,21 +9928,21 @@ msgstr "KhÃng cà vÃng chán cán chuyán dáng."
 msgid "Unable to cut or copy because the selected region is empty."
 msgstr "KhÃng thá cát hoác sao chÃp và vÃng chán ráng."
 
-#: ../app/core/gimpselection.c:845
+#: ../app/core/gimpselection.c:847
 msgid "Cannot float selection because the selected region is empty."
 msgstr "KhÃng thá nái vÃng chán và vÃng ÄÆác chán ráng."
 
-#: ../app/core/gimpselection.c:852
+#: ../app/core/gimpselection.c:854
 #, fuzzy
 msgctxt "undo-type"
 msgid "Float Selection"
 msgstr "Nái vÃng chán"
 
-#: ../app/core/gimpselection.c:868
+#: ../app/core/gimpselection.c:870
 msgid "Floated Layer"
 msgstr "Láp ÄÃ nái"
 
-#: ../app/core/gimpstrokeoptions.c:151
+#: ../app/core/gimpstrokeoptions.c:181
 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."
@@ -9920,111 +9951,112 @@ msgstr ""
 "xiÃn náu vuÃng gÃc sá má ráng trong khoáng cÃch hÆn giái hán vuÃng gÃc "
 "(miter-limit) nhÃn Äá ráng dÃng tá Äiám nái kát thát."
 
-#: ../app/core/gimptemplate.c:100
+#: ../app/core/gimptemplate.c:129
 msgid "The unit used for coordinate display when not in dot-for-dot mode."
 msgstr ""
 "ÄÆn vá ÄÆác dÃng Äá hián thá toá Äá khi khÃng phái trong chá Äá chám-vái-"
 "chám."
 
-#: ../app/core/gimptemplate.c:107
+#: ../app/core/gimptemplate.c:136
 msgid "The horizontal image resolution."
 msgstr "Äá phÃn giái ngang cáa ánh"
 
-#: ../app/core/gimptemplate.c:113
+#: ../app/core/gimptemplate.c:142
 msgid "The vertical image resolution."
 msgstr "Äá phÃn giái dác cáa ánh"
 
-#: ../app/core/gimpunit.c:56
+#: ../app/core/gimpunit.c:60
 #, fuzzy
 msgctxt "unit-singular"
 msgid "pixel"
 msgstr "Äiám ánh"
 
-#: ../app/core/gimpunit.c:56
+#: ../app/core/gimpunit.c:60
 #, fuzzy
 msgctxt "unit-plural"
 msgid "pixels"
 msgstr "Äiám ánh"
 
-#: ../app/core/gimpunit.c:60
+#: ../app/core/gimpunit.c:64
 #, fuzzy
 msgctxt "unit-singular"
 msgid "inch"
 msgstr "insÆ"
 
-#: ../app/core/gimpunit.c:60
+#: ../app/core/gimpunit.c:64
 #, fuzzy
 msgctxt "unit-plural"
 msgid "inches"
 msgstr "insÆ"
 
-#: ../app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:67
 #, fuzzy
 msgctxt "unit-singular"
 msgid "millimeter"
 msgstr "mili-mÃt"
 
-#: ../app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:67
 #, fuzzy
 msgctxt "unit-plural"
 msgid "millimeters"
 msgstr "mili-mÃt"
 
-#: ../app/core/gimpunit.c:67
+#: ../app/core/gimpunit.c:71
 #, fuzzy
 msgctxt "unit-singular"
 msgid "point"
 msgstr "Äiám"
 
-#: ../app/core/gimpunit.c:67
+#: ../app/core/gimpunit.c:71
 #, fuzzy
 msgctxt "unit-plural"
 msgid "points"
 msgstr "Äiám"
 
-#: ../app/core/gimpunit.c:70
+#: ../app/core/gimpunit.c:74
 #, fuzzy
 msgctxt "unit-singular"
 msgid "pica"
 msgstr "pi-ca"
 
-#: ../app/core/gimpunit.c:70
+#: ../app/core/gimpunit.c:74
 #, fuzzy
 msgctxt "unit-plural"
 msgid "picas"
 msgstr "pi-ca"
 
-#: ../app/core/gimpunit.c:78
+#: ../app/core/gimpunit.c:82
 #, fuzzy
 msgctxt "singular"
 msgid "percent"
 msgstr "phán trÄm"
 
-#: ../app/core/gimpunit.c:78
+#: ../app/core/gimpunit.c:82
 #, fuzzy
 msgctxt "plural"
 msgid "percent"
 msgstr "phán trÄm"
 
-#: ../app/dialogs/about-dialog.c:106 ../app/gui/gui.c:484
+#: ../app/dialogs/about-dialog.c:113 ../app/gui/gui.c:478
 #, fuzzy
 msgid "About GIMP"
 msgstr "ThoÃt khái GIMP"
 
-#: ../app/dialogs/about-dialog.c:115
+#: ../app/dialogs/about-dialog.c:122
 msgid "Visit the GIMP website"
 msgstr "Xin hÃy ghà thÄm nÆi Máng GIMP"
 
-#. Translators: insert your names here, separated by newline
-#: ../app/dialogs/about-dialog.c:120
+#. Translators: insert your names here,
+#. separated by newline
+#: ../app/dialogs/about-dialog.c:128
 msgid "translator-credits"
 msgstr "NhÃm Viát hÃa Gnome <gnomevi-list lists sourceforge net>"
 
-#: ../app/dialogs/about-dialog.c:515
+#: ../app/dialogs/about-dialog.c:518
 msgid "GIMP is brought to you by"
 msgstr "GIMP ÄÆác táo bái"
 
-#: ../app/dialogs/about-dialog.c:589
+#: ../app/dialogs/about-dialog.c:592
 msgid "This is an unstable development release."
 msgstr "PhiÃn bán nÃy là bán phÃt hÃnh phÃt trián chÆa án Äánh."
 
@@ -10057,112 +10089,127 @@ msgid "_Remove unused colors from colormap"
 msgstr "Gá bá cÃc mÃu khÃng dÃng _ra sÆ Äá mÃu"
 
 #. dithering
-#: ../app/dialogs/convert-dialog.c:233 ../app/tools/gimpblendoptions.c:246
+#: ../app/dialogs/convert-dialog.c:234 ../app/tools/gimpblendoptions.c:254
 msgid "Dithering"
 msgstr "Rung Äáng"
 
-#: ../app/dialogs/convert-dialog.c:245
+#: ../app/dialogs/convert-dialog.c:246
 msgid "Color _dithering:"
 msgstr "R_ung Äáng mÃu :"
 
-#: ../app/dialogs/convert-dialog.c:260
+#: ../app/dialogs/convert-dialog.c:261
 msgid "Enable dithering of _transparency"
 msgstr "Bát rung Äáng Äá _trong suát"
 
-#: ../app/dialogs/convert-dialog.c:287
+#: ../app/dialogs/convert-dialog.c:288
 msgid "Converting to indexed colors"
 msgstr "Äang chuyán Äái sang cÃc mÃu phá lác"
 
-#: ../app/dialogs/convert-dialog.c:414 ../app/pdb/convert-cmds.c:152
+#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:152
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "KhÃng thá chuyán Äái sang mát báng chán cà hÆn 256 mÃu."
 
-#: ../app/dialogs/dialogs-constructors.c:212 ../app/gui/gui.c:164
+#: ../app/dialogs/data-delete-dialog.c:81
+msgid "Delete Object"
+msgstr "Xoà bá Äái tÆáng"
+
+#: ../app/dialogs/data-delete-dialog.c:104
+#, fuzzy, c-format
+msgid "Delete '%s'?"
+msgstr "XÃa bá bÃt vá nÃy."
+
+#: ../app/dialogs/data-delete-dialog.c:107
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want to remove '%s' from the list and delete it on disk?"
+msgstr "Bán cà chác muán xÃa bá  %s  ra danh sÃch và ra ÄÄa khÃng?"
+
+#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:161
 #: ../app/gui/gui-message.c:145
 msgid "GIMP Message"
 msgstr "ThÃng Äiáp GIMP"
 
-#: ../app/dialogs/dialogs.c:267
+#: ../app/dialogs/dialogs.c:302
 msgid "Devices"
 msgstr "Thiát bá"
 
-#: ../app/dialogs/dialogs.c:267
+#: ../app/dialogs/dialogs.c:302
 msgid "Device Status"
 msgstr "Tráng thÃi thiát bá"
 
-#: ../app/dialogs/dialogs.c:271
+#: ../app/dialogs/dialogs.c:306
 msgid "Errors"
 msgstr "Lái"
 
-#: ../app/dialogs/dialogs.c:275
+#: ../app/dialogs/dialogs.c:310
 msgid "Pointer"
 msgstr "Con trá"
 
-#: ../app/dialogs/dialogs.c:294
+#: ../app/dialogs/dialogs.c:329
 msgid "History"
 msgstr "LÆác sá"
 
-#: ../app/dialogs/dialogs.c:296
+#: ../app/dialogs/dialogs.c:331
 msgid "Image Templates"
 msgstr "Biáu máu ánh"
 
-#: ../app/dialogs/dialogs.c:323
+#: ../app/dialogs/dialogs.c:358
 msgid "Histogram"
 msgstr "Biáu Äá tán xuát"
 
-#: ../app/dialogs/dialogs.c:327
+#: ../app/dialogs/dialogs.c:362
 msgid "Selection"
 msgstr "VÃng chán"
 
-#: ../app/dialogs/dialogs.c:327
+#: ../app/dialogs/dialogs.c:362
 msgid "Selection Editor"
 msgstr "Bá sáa vÃng chán"
 
-#: ../app/dialogs/dialogs.c:331
+#: ../app/dialogs/dialogs.c:366
 msgid "Undo"
 msgstr "Háy bÆác"
 
-#: ../app/dialogs/dialogs.c:331
+#: ../app/dialogs/dialogs.c:366
 msgid "Undo History"
 msgstr "LÆác sá Háy bÆác"
 
-#: ../app/dialogs/dialogs.c:341
+#: ../app/dialogs/dialogs.c:376
 msgid "Navigation"
 msgstr "CÃch chuyán"
 
-#: ../app/dialogs/dialogs.c:341
+#: ../app/dialogs/dialogs.c:376
 msgid "Display Navigation"
 msgstr "HIán cÃch chuyán"
 
-#: ../app/dialogs/dialogs.c:347
+#: ../app/dialogs/dialogs.c:382
 msgid "FG/BG"
 msgstr "Cánh gán/Nán"
 
-#: ../app/dialogs/dialogs.c:347
+#: ../app/dialogs/dialogs.c:382
 msgid "FG/BG Color"
 msgstr "MÃu Cánh gán/Nán"
 
-#: ../app/dialogs/fade-dialog.c:110
+#: ../app/dialogs/fade-dialog.c:109
 #, fuzzy, c-format
 msgid "Fade %s"
 msgstr "LÃm má dán"
 
-#: ../app/dialogs/fade-dialog.c:122
+#: ../app/dialogs/fade-dialog.c:121
 #, fuzzy
 msgid "_Fade"
 msgstr "LÃm má dán"
 
-#: ../app/dialogs/fade-dialog.c:157 ../app/widgets/gimpdeviceinfoeditor.c:346
+#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:344
 #, fuzzy
 msgid "_Mode:"
 msgstr "_Chá Äá"
 
-#: ../app/dialogs/fade-dialog.c:163
+#: ../app/dialogs/fade-dialog.c:162
 #, fuzzy
 msgid "_Opacity:"
 msgstr "Äá _má Äác:"
 
-#: ../app/dialogs/file-open-dialog.c:267
+#: ../app/dialogs/file-open-dialog.c:266
 #, fuzzy
 msgid "Open layers"
 msgstr "Láp mái"
@@ -10185,7 +10232,7 @@ msgstr "HoÃn nguyÃn ánh"
 msgid "_Export"
 msgstr "Nhá_p"
 
-#: ../app/dialogs/file-save-dialog.c:468
+#: ../app/dialogs/file-save-dialog.c:430
 msgid ""
 "Saving remote files needs to determine the file format from the file "
 "extension. Please enter a file extension that matches the selected file "
@@ -10195,19 +10242,19 @@ msgstr ""
 "ráng táp tin. HÃy gà mát phán má ráng táp tin kháp dáng thác Äà chán, hoác "
 "khÃng gà gÃ."
 
-#: ../app/dialogs/file-save-dialog.c:595
+#: ../app/dialogs/file-save-dialog.c:557
 msgid ""
 "You can use this dialog to export to various file formats. If you want to "
 "save the image to the GIMP XCF format, use FileâSave instead."
 msgstr ""
 
-#: ../app/dialogs/file-save-dialog.c:602
+#: ../app/dialogs/file-save-dialog.c:564
 msgid ""
 "You can use this dialog to save to the GIMP XCF format. Use FileâExport to "
 "export to other file formats."
 msgstr ""
 
-#: ../app/dialogs/file-save-dialog.c:608
+#: ../app/dialogs/file-save-dialog.c:570
 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."
@@ -10216,24 +10263,24 @@ msgstr ""
 "ráng táp tin ÄÃ biát, hoác chán mát dáng thác táp tin trong danh sÃch dáng "
 "thác táp tin."
 
-#: ../app/dialogs/file-save-dialog.c:622
+#: ../app/dialogs/file-save-dialog.c:584
 msgid "Extension Mismatch"
 msgstr "Phán má ráng sai kiáu"
 
-#: ../app/dialogs/file-save-dialog.c:638
+#: ../app/dialogs/file-save-dialog.c:600
 msgid "The given file extension does not match the chosen file type."
 msgstr "Phán má ráng táp tin ÄÃ cho khÃng kháp kiáu táp tin ÄÃ cho."
 
-#: ../app/dialogs/file-save-dialog.c:642
+#: ../app/dialogs/file-save-dialog.c:604
 msgid "Do you want to save the image using this name anyway?"
 msgstr "Váy bán ván cà muán lÆu ánh vái tÃn nÃy khÃng?"
 
-#: ../app/dialogs/file-save-dialog.c:697
+#: ../app/dialogs/file-save-dialog.c:659
 #, fuzzy
 msgid "Saving canceled"
 msgstr "Äang lÆu ánh"
 
-#: ../app/dialogs/file-save-dialog.c:705 ../app/widgets/gimpdnd-xds.c:185
+#: ../app/dialogs/file-save-dialog.c:667 ../app/widgets/gimpdnd-xds.c:185
 #, c-format
 msgid ""
 "Saving '%s' failed:\n"
@@ -10256,35 +10303,39 @@ msgstr "Cáu hÃnh lÆái ánh"
 msgid "Grid"
 msgstr "LÆái"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:64
+#: ../app/dialogs/image-merge-layers-dialog.c:68
 msgid "Merge Layers"
 msgstr "Trán cÃc láp"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:66
+#: ../app/dialogs/image-merge-layers-dialog.c:70
 msgid "Layers Merge Options"
 msgstr "TÃy chán trán cÃc láp"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:72
+#: ../app/dialogs/image-merge-layers-dialog.c:76
 msgid "_Merge"
 msgstr "T_rán"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:92
+#: ../app/dialogs/image-merge-layers-dialog.c:96
 msgid "Final, Merged Layer should be:"
 msgstr "Láp ÄÃ trán cuái cÃng nÃn lÃ:"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:96
+#: ../app/dialogs/image-merge-layers-dialog.c:100
 msgid "Expanded as necessary"
 msgstr "Má ráng nhÆ cán thiát"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:99
+#: ../app/dialogs/image-merge-layers-dialog.c:103
 msgid "Clipped to image"
 msgstr "XÃn Äá váa ánh"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:102
+#: ../app/dialogs/image-merge-layers-dialog.c:106
 msgid "Clipped to bottom layer"
 msgstr "XÃn Äá váa láp dÆái"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:110
+#: ../app/dialogs/image-merge-layers-dialog.c:114
+msgid "Merge within active _group only"
+msgstr ""
+
+#: ../app/dialogs/image-merge-layers-dialog.c:127
 msgid "_Discard invisible layers"
 msgstr "_Háy cÃc láp và hÃnh"
 
@@ -10297,24 +10348,24 @@ msgstr "Táo ánh mái"
 msgid "_Template:"
 msgstr "_Biáu máu :"
 
-#: ../app/dialogs/image-new-dialog.c:299
+#: ../app/dialogs/image-new-dialog.c:303
 msgid "Confirm Image Size"
 msgstr "Kháng Äánh cá ánh"
 
-#: ../app/dialogs/image-new-dialog.c:321
+#: ../app/dialogs/image-new-dialog.c:325
 #: ../app/dialogs/image-scale-dialog.c:239
 #, c-format
 msgid "You are trying to create an image with a size of %s."
 msgstr "Bán Äang cá táo mát ánh cà kÃch thÆác %s."
 
-#: ../app/dialogs/image-new-dialog.c:328
+#: ../app/dialogs/image-new-dialog.c:332
 #, c-format
 msgid ""
 "An image of the chosen size will use more memory than what is configured as "
 "\"Maximum Image Size\" in the Preferences dialog (currently %s)."
 msgstr ""
-"Mát ánh cà kÃch thÆác Äà chán thà sá chiám nhiáu bá nhá hÆn  Cá ánh tái Äa "
-" Äà cáu hÃnh trong thoái TÃy thÃch (hián cà %s)."
+"Mát ánh cà kÃch thÆác Äà chán thà sá chiám nhiáu bá nhá hÆn  Cá ánh tái Äa  "
+"Äà cáu hÃnh trong thoái TÃy thÃch (hián cà %s)."
 
 #: ../app/dialogs/image-properties-dialog.c:60
 #: ../app/dialogs/image-properties-dialog.c:63
@@ -10409,12 +10460,12 @@ msgstr "TÃ_n láp:"
 
 #. The size labels
 #: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1088
+#: ../app/tools/gimpmeasuretool.c:1129
 msgid "Width:"
 msgstr "Ráng:"
 
 #: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1116
+#: ../app/tools/gimpmeasuretool.c:1157
 msgid "Height:"
 msgstr "Cao:"
 
@@ -10483,7 +10534,8 @@ msgstr "Dách kÃnh"
 
 #. The offset frame
 #: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152
-#: ../app/dialogs/resize-dialog.c:198 ../app/widgets/gimpgrideditor.c:275
+#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:247
+#: ../app/widgets/gimpgrideditor.c:206
 msgid "Offset"
 msgstr "Äá dách"
 
@@ -10606,7 +10658,7 @@ msgstr "Bán thát sá muán Äát lái mái tÃy thÃch thÃnh già tr
 msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr "Bán cán phái khái cháy lái GIMP Äá hoát hÃa cÃc thay Äái sau:"
 
-#: ../app/dialogs/preferences-dialog.c:538
+#: ../app/dialogs/preferences-dialog.c:536
 msgid ""
 "Your keyboard shortcuts will be reset to default values the next time you "
 "start GIMP."
@@ -10614,15 +10666,15 @@ msgstr ""
 "CÃc phÃm tát cáa bán sá bá Äát lái thÃnh già trá mác Äánh lán ká tiáp bán "
 "khái cháy GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:549
+#: ../app/dialogs/preferences-dialog.c:547
 msgid "Remove all Keyboard Shortcuts"
 msgstr "Gá bá mái phÃm tát"
 
-#: ../app/dialogs/preferences-dialog.c:571
+#: ../app/dialogs/preferences-dialog.c:569
 msgid "Do you really want to remove all keyboard shortcuts from all menus?"
 msgstr "Bán thát sá muán gá bá mái phÃm tát ra mái trÃnh ÄÆn khÃng?"
 
-#: ../app/dialogs/preferences-dialog.c:612
+#: ../app/dialogs/preferences-dialog.c:610
 msgid ""
 "Your window setup will be reset to default values the next time you start "
 "GIMP."
@@ -10630,7 +10682,7 @@ msgstr ""
 "Thiát láp cáa sá cáa bán sá bá Äát lái thÃnh già trá mác Äánh lán ká tiáp "
 "bán khái cháy GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:647
+#: ../app/dialogs/preferences-dialog.c:645
 msgid ""
 "Your input device settings will be reset to default values the next time you "
 "start GIMP."
@@ -10638,7 +10690,7 @@ msgstr ""
 "Thiát láp thiát bá gà cáa bán sá bá Äát lái thÃnh già trá mác Äánh lán ká "
 "tiáp bán khái cháy GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:682
+#: ../app/dialogs/preferences-dialog.c:680
 msgid ""
 "Your tool options will be reset to default values the next time you start "
 "GIMP."
@@ -10695,7 +10747,7 @@ msgid "Preferences"
 msgstr "TÃy thÃch"
 
 #: ../app/dialogs/preferences-dialog.c:1507
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2769
 msgid "Environment"
 msgstr "MÃi trÆáng"
 
@@ -10830,8 +10882,8 @@ msgstr "Há tháng trá giÃp"
 #. General
 #: ../app/dialogs/preferences-dialog.c:1782
 #: ../app/dialogs/preferences-dialog.c:1866
-#: ../app/dialogs/preferences-dialog.c:2066
-#: ../app/widgets/gimpcontrollereditor.c:188
+#: ../app/dialogs/preferences-dialog.c:2065
+#: ../app/widgets/gimpcontrollereditor.c:185
 msgid "General"
 msgstr "Chung"
 
@@ -10924,8 +10976,8 @@ msgstr "Äát láp hay ÄÆáng dán là hoát Äáng"
 
 #. Appearance
 #: ../app/dialogs/preferences-dialog.c:1955
-#: ../app/dialogs/preferences-dialog.c:2139
-#: ../app/widgets/gimpgrideditor.c:203
+#: ../app/dialogs/preferences-dialog.c:2141
+#: ../app/widgets/gimpgrideditor.c:134
 msgid "Appearance"
 msgstr "Dián máo"
 
@@ -10963,160 +11015,166 @@ msgstr "LÆái ánh mác Äánh"
 msgid "Default Grid"
 msgstr "LÆái mác Äánh"
 
-#: ../app/dialogs/preferences-dialog.c:2054
+#: ../app/dialogs/preferences-dialog.c:2053
 msgid "Image Windows"
 msgstr "Cáa sá ánh"
 
-#: ../app/dialogs/preferences-dialog.c:2069
+#: ../app/dialogs/preferences-dialog.c:2068
 msgid "Use \"_Dot for dot\" by default"
 msgstr "_DÃng  chám-vái-chám  theo mác Äánh"
 
-#: ../app/dialogs/preferences-dialog.c:2075
+#: ../app/dialogs/preferences-dialog.c:2074
 msgid "Marching _ants speed:"
 msgstr "Tác Äá con _kián bÆác Äi:"
 
 #. Zoom & Resize Behavior
-#: ../app/dialogs/preferences-dialog.c:2079
+#: ../app/dialogs/preferences-dialog.c:2078
 msgid "Zoom & Resize Behavior"
 msgstr "áng xá thu phÃng và Äái cá"
 
-#: ../app/dialogs/preferences-dialog.c:2083
+#: ../app/dialogs/preferences-dialog.c:2082
 msgid "Resize window on _zoom"
 msgstr "Äái cá cáa sá khi thu _phÃng"
 
-#: ../app/dialogs/preferences-dialog.c:2086
+#: ../app/dialogs/preferences-dialog.c:2085
 msgid "Resize window on image _size change"
 msgstr "Äái cá cáa _sá khi Äái cá ánh"
 
-#: ../app/dialogs/preferences-dialog.c:2092
+#: ../app/dialogs/preferences-dialog.c:2091
 msgid "Fit to window"
 msgstr "Váa khÃt cáa sá"
 
-#: ../app/dialogs/preferences-dialog.c:2094
+#: ../app/dialogs/preferences-dialog.c:2093
 msgid "Initial zoom _ratio:"
 msgstr "Tá lá th_u phÃng ban Äáu :"
 
 #. Space Bar
-#: ../app/dialogs/preferences-dialog.c:2098
+#: ../app/dialogs/preferences-dialog.c:2097
 msgid "Space Bar"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2104
+#: ../app/dialogs/preferences-dialog.c:2103
 msgid "_While space bar is pressed:"
 msgstr ""
 
 #. Mouse Pointers
-#: ../app/dialogs/preferences-dialog.c:2108
+#: ../app/dialogs/preferences-dialog.c:2107
 msgid "Mouse Pointers"
 msgstr "Con trá chuát"
 
-#: ../app/dialogs/preferences-dialog.c:2112
+#: ../app/dialogs/preferences-dialog.c:2111
 msgid "Show _brush outline"
 msgstr "Hián phÃc tháo _bÃt vá"
 
-#: ../app/dialogs/preferences-dialog.c:2115
+#: ../app/dialogs/preferences-dialog.c:2114
 msgid "Show pointer for paint _tools"
 msgstr "Hián con _trá cÃng cá sÆn"
 
-#: ../app/dialogs/preferences-dialog.c:2121
+#: ../app/dialogs/preferences-dialog.c:2120
 msgid "Pointer _mode:"
 msgstr "Chá Äá con t_rá :"
 
-#: ../app/dialogs/preferences-dialog.c:2124
+#: ../app/dialogs/preferences-dialog.c:2123
 msgid "Pointer re_ndering:"
 msgstr "Vá co_n trá :"
 
-#: ../app/dialogs/preferences-dialog.c:2136
+#: ../app/dialogs/preferences-dialog.c:2126
+#, fuzzy
+#| msgid "Pointer re_ndering:"
+msgid "Pointer _handedness:"
+msgstr "Vá co_n trá :"
+
+#: ../app/dialogs/preferences-dialog.c:2138
 msgid "Image Window Appearance"
 msgstr "HÃnh thác cáa sá ánh"
 
-#: ../app/dialogs/preferences-dialog.c:2147
+#: ../app/dialogs/preferences-dialog.c:2149
 msgid "Default Appearance in Normal Mode"
 msgstr "HÃnh thác mác Äánh trong chá Äá chuán"
 
-#: ../app/dialogs/preferences-dialog.c:2152
+#: ../app/dialogs/preferences-dialog.c:2154
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "HÃnh thác mác Äánh trong chá Äá toÃn mÃn hÃnh"
 
-#: ../app/dialogs/preferences-dialog.c:2161
+#: ../app/dialogs/preferences-dialog.c:2163
 msgid "Image Title & Statusbar Format"
 msgstr "Dáng thác táa Äá ánh và thanh tráng thÃi"
 
-#: ../app/dialogs/preferences-dialog.c:2164
+#: ../app/dialogs/preferences-dialog.c:2166
 msgid "Title & Status"
 msgstr "Táa Äá và Tráng thÃi"
 
-#: ../app/dialogs/preferences-dialog.c:2182
+#: ../app/dialogs/preferences-dialog.c:2184
 msgid "Current format"
 msgstr "Dáng thác hián cÃ"
 
-#: ../app/dialogs/preferences-dialog.c:2183
+#: ../app/dialogs/preferences-dialog.c:2185
 msgid "Default format"
 msgstr "Dáng thác mác Äánh"
 
-#: ../app/dialogs/preferences-dialog.c:2184
+#: ../app/dialogs/preferences-dialog.c:2186
 msgid "Show zoom percentage"
 msgstr "Hián phán trÄm thu phÃng"
 
-#: ../app/dialogs/preferences-dialog.c:2185
+#: ../app/dialogs/preferences-dialog.c:2187
 msgid "Show zoom ratio"
 msgstr "Hián tá lá thu phÃng"
 
-#: ../app/dialogs/preferences-dialog.c:2186
+#: ../app/dialogs/preferences-dialog.c:2188
 msgid "Show image size"
 msgstr "Hián cá ánh"
 
-#: ../app/dialogs/preferences-dialog.c:2199
+#: ../app/dialogs/preferences-dialog.c:2201
 msgid "Image Title Format"
 msgstr "Dáng thác táa Äá ánh"
 
-#: ../app/dialogs/preferences-dialog.c:2201
+#: ../app/dialogs/preferences-dialog.c:2203
 msgid "Image Statusbar Format"
 msgstr "Äánh dáng thanh tráng thÃi ánh"
 
-#: ../app/dialogs/preferences-dialog.c:2286
+#: ../app/dialogs/preferences-dialog.c:2288
 msgid "Display"
 msgstr "Hián thá"
 
 #. Transparency
-#: ../app/dialogs/preferences-dialog.c:2298
+#: ../app/dialogs/preferences-dialog.c:2300
 msgid "Transparency"
 msgstr "Äá trong suát"
 
-#: ../app/dialogs/preferences-dialog.c:2302
+#: ../app/dialogs/preferences-dialog.c:2304
 msgid "_Check style:"
 msgstr "_Kiám trá kiáu dÃng:"
 
-#: ../app/dialogs/preferences-dialog.c:2305
+#: ../app/dialogs/preferences-dialog.c:2307
 msgid "Check _size:"
 msgstr "Kiám tra _cá :"
 
-#: ../app/dialogs/preferences-dialog.c:2308
+#: ../app/dialogs/preferences-dialog.c:2310
 #, fuzzy
 msgid "Monitor Resolution"
 msgstr "Láy Äá phÃn giái mÃn hÃnh"
 
 #. Pixels
-#: ../app/dialogs/preferences-dialog.c:2312
-#: ../app/display/gimpcursorview.c:200 ../app/widgets/gimpgrideditor.c:268
-#: ../app/widgets/gimpgrideditor.c:300
+#: ../app/dialogs/preferences-dialog.c:2314
+#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199
+#: ../app/widgets/gimpgrideditor.c:231
 msgid "Pixels"
 msgstr "Äiám ánh"
 
-#: ../app/dialogs/preferences-dialog.c:2330
+#: ../app/dialogs/preferences-dialog.c:2332
 msgid "Horizontal"
 msgstr "Ngang"
 
-#: ../app/dialogs/preferences-dialog.c:2332
+#: ../app/dialogs/preferences-dialog.c:2334
 msgid "Vertical"
 msgstr "Dác"
 
-#: ../app/dialogs/preferences-dialog.c:2334
-#: ../app/widgets/gimpimagepropview.c:475
+#: ../app/dialogs/preferences-dialog.c:2336
+#: ../app/widgets/gimpimagepropview.c:467
 msgid "ppi"
 msgstr "ppi"
 
-#: ../app/dialogs/preferences-dialog.c:2350
+#: ../app/dialogs/preferences-dialog.c:2352
 #, fuzzy, c-format
 msgid "_Detect automatically (currently %d à %d ppi)"
 msgstr "Tá há tháng _cáa sá (hián cà %d à %d ppi)"
@@ -11130,271 +11188,282 @@ msgstr "Tá lÃ_m"
 msgid "C_alibrate..."
 msgstr "Äánh ch_uán..."
 
-#: ../app/dialogs/preferences-dialog.c:2408
+#: ../app/dialogs/preferences-dialog.c:2413
 msgid "Color Management"
 msgstr "Quán là mÃu"
 
-#: ../app/dialogs/preferences-dialog.c:2428
+#: ../app/dialogs/preferences-dialog.c:2433
 msgid "_RGB profile:"
 msgstr "XÃc láp _RGB:"
 
-#: ../app/dialogs/preferences-dialog.c:2429
+#: ../app/dialogs/preferences-dialog.c:2434
 msgid "Select RGB Color Profile"
 msgstr "Chán xÃc láp mÃu RGB"
 
-#: ../app/dialogs/preferences-dialog.c:2430
+#: ../app/dialogs/preferences-dialog.c:2435
 msgid "_CMYK profile:"
 msgstr "XÃc láp _CMYK:"
 
-#: ../app/dialogs/preferences-dialog.c:2431
+#: ../app/dialogs/preferences-dialog.c:2436
 msgid "Select CMYK Color Profile"
 msgstr "Chán xÃc láp mÃu CMYK"
 
-#: ../app/dialogs/preferences-dialog.c:2432
+#: ../app/dialogs/preferences-dialog.c:2437
 msgid "_Monitor profile:"
 msgstr "XÃc láp _mÃn hÃnh:"
 
-#: ../app/dialogs/preferences-dialog.c:2433
+#: ../app/dialogs/preferences-dialog.c:2438
 msgid "Select Monitor Color Profile"
 msgstr "Chán xÃc láp mÃu mÃn hÃnh"
 
-#: ../app/dialogs/preferences-dialog.c:2434
+#: ../app/dialogs/preferences-dialog.c:2439
 msgid "_Print simulation profile:"
 msgstr "In ra xÃc láp mà _pháng in:"
 
-#: ../app/dialogs/preferences-dialog.c:2435
+#: ../app/dialogs/preferences-dialog.c:2440
 msgid "Select Printer Color Profile"
 msgstr "Chán xÃc láp mÃu mÃy in"
 
-#: ../app/dialogs/preferences-dialog.c:2446
+#: ../app/dialogs/preferences-dialog.c:2451
 msgid "_Mode of operation:"
 msgstr "_Chá Äá thao tÃc:"
 
-#: ../app/dialogs/preferences-dialog.c:2476
+#: ../app/dialogs/preferences-dialog.c:2481
 #, fuzzy
 msgid "_Try to use the system monitor profile"
 msgstr "_Thá láy xÃc láp mÃn hÃnh tá trÃnh phác vá X"
 
-#: ../app/dialogs/preferences-dialog.c:2486
+#: ../app/dialogs/preferences-dialog.c:2491
 msgid "_Display rendering intent:"
 msgstr "Hián thá mác ÄÃch _vá:"
 
-#: ../app/dialogs/preferences-dialog.c:2495
+#: ../app/dialogs/preferences-dialog.c:2500
 msgid "_Softproof rendering intent:"
 msgstr "_Mác ÄÃch vá bán in thá mám:"
 
-#: ../app/dialogs/preferences-dialog.c:2508
+#: ../app/dialogs/preferences-dialog.c:2513
 msgid "Mark out of gamut colors"
 msgstr ""
 
-#: ../app/dialogs/preferences-dialog.c:2513
+#: ../app/dialogs/preferences-dialog.c:2518
 #, fuzzy
 msgid "Select Warning Color"
 msgstr "Chán mÃu"
 
-#: ../app/dialogs/preferences-dialog.c:2526
+#: ../app/dialogs/preferences-dialog.c:2531
 #, fuzzy
 msgid "File Open behaviour:"
 msgstr "_Háp thoái Má táp tin"
 
-#: ../app/dialogs/preferences-dialog.c:2538
+#: ../app/dialogs/preferences-dialog.c:2543
 msgid "Input Devices"
 msgstr "Thiát bá nháp"
 
 #. Extended Input Devices
-#: ../app/dialogs/preferences-dialog.c:2548
+#: ../app/dialogs/preferences-dialog.c:2553
 msgid "Extended Input Devices"
 msgstr "Thiát bá gà Äà má ráng"
 
-#: ../app/dialogs/preferences-dialog.c:2552
+#: ../app/dialogs/preferences-dialog.c:2557
 msgid "Configure E_xtended Input Devices..."
 msgstr "Cáu hÃnh thiát bá nháp ÄÃ má _ráng..."
 
-#: ../app/dialogs/preferences-dialog.c:2559
+#: ../app/dialogs/preferences-dialog.c:2564
 msgid "_Save input device settings on exit"
 msgstr "_LÆu thiát láp thiát bá nháp khi thoÃt"
 
-#: ../app/dialogs/preferences-dialog.c:2563
+#: ../app/dialogs/preferences-dialog.c:2568
 msgid "Save Input Device Settings _Now"
 msgstr "LÆu thiát láp thiát bá nháp _ngay"
 
-#: ../app/dialogs/preferences-dialog.c:2570
+#: ../app/dialogs/preferences-dialog.c:2575
 msgid "_Reset Saved Input Device Settings to Default Values"
 msgstr "Äát lái thiát láp thiát bá nháp Äà lÆu thÃnh già t_rá mác Äánh"
 
-#: ../app/dialogs/preferences-dialog.c:2585
+#: ../app/dialogs/preferences-dialog.c:2590
 msgid "Additional Input Controllers"
 msgstr "Bá Äiáu khián nháp thÃm"
 
-#: ../app/dialogs/preferences-dialog.c:2588
+#: ../app/dialogs/preferences-dialog.c:2593
 msgid "Input Controllers"
 msgstr "Bá Äiáu khián nháp"
 
-#: ../app/dialogs/preferences-dialog.c:2604
+#: ../app/dialogs/preferences-dialog.c:2609
 msgid "Window Management"
 msgstr "Quán là cáa sá"
 
-#: ../app/dialogs/preferences-dialog.c:2613
+#: ../app/dialogs/preferences-dialog.c:2618
 msgid "Window Manager Hints"
 msgstr "Gái à Bá quán là cáa sá"
 
-#: ../app/dialogs/preferences-dialog.c:2619
+#: ../app/dialogs/preferences-dialog.c:2624
 #, fuzzy
 msgid "Hint for _docks and toolbox:"
 msgstr "_Gái à cho Háp cÃng cá :"
 
-#: ../app/dialogs/preferences-dialog.c:2622
+#: ../app/dialogs/preferences-dialog.c:2627
 msgid "Focus"
 msgstr "TiÃu Äiám"
 
-#: ../app/dialogs/preferences-dialog.c:2626
+#: ../app/dialogs/preferences-dialog.c:2631
 msgid "Activate the _focused image"
 msgstr "KÃch hoát ánh cà tiÃ_u Äiám"
 
 #. Window Positions
-#: ../app/dialogs/preferences-dialog.c:2630
+#: ../app/dialogs/preferences-dialog.c:2635
 msgid "Window Positions"
 msgstr "Vá trà cáa sá"
 
-#: ../app/dialogs/preferences-dialog.c:2633
+#: ../app/dialogs/preferences-dialog.c:2638
 msgid "_Save window positions on exit"
 msgstr "_LÆu vá trà cáa sá khi thoÃt"
 
-#: ../app/dialogs/preferences-dialog.c:2637
+#: ../app/dialogs/preferences-dialog.c:2642
 msgid "Save Window Positions _Now"
 msgstr "LÆu vá trà cáa sá _ngay"
 
-#: ../app/dialogs/preferences-dialog.c:2644
+#: ../app/dialogs/preferences-dialog.c:2649
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr "Äát lái vá trà cáa sá Äà lÆu thÃnh già t_rá mác Äánh"
 
-#: ../app/dialogs/preferences-dialog.c:2659
+#: ../app/dialogs/preferences-dialog.c:2664
 msgid "Folders"
 msgstr "ThÆ mác"
 
-#: ../app/dialogs/preferences-dialog.c:2679
+#: ../app/dialogs/preferences-dialog.c:2684
 msgid "Temporary folder:"
 msgstr "ThÆ mác tám:"
 
-#: ../app/dialogs/preferences-dialog.c:2680
+#: ../app/dialogs/preferences-dialog.c:2685
 msgid "Select Folder for Temporary Files"
 msgstr "Chán thÆ mác sá cháa cÃc táp tin tám thái"
 
-#: ../app/dialogs/preferences-dialog.c:2684
+#: ../app/dialogs/preferences-dialog.c:2689
 msgid "Swap folder:"
 msgstr "ThÆ mác trao Äái:"
 
-#: ../app/dialogs/preferences-dialog.c:2685
+#: ../app/dialogs/preferences-dialog.c:2690
 msgid "Select Swap Folder"
 msgstr "Chán thÆ mác trao Äái"
 
-#: ../app/dialogs/preferences-dialog.c:2720
+#: ../app/dialogs/preferences-dialog.c:2725
 msgid "Brush Folders"
 msgstr "ThÆ mác bÃt vá"
 
-#: ../app/dialogs/preferences-dialog.c:2722
+#: ../app/dialogs/preferences-dialog.c:2727
 msgid "Select Brush Folders"
 msgstr "Chán thÆ mác bÃt vá"
 
-#: ../app/dialogs/preferences-dialog.c:2724
+#: ../app/dialogs/preferences-dialog.c:2729
 #, fuzzy
 msgid "Dynamics Folders"
 msgstr "ThÆ mác phÃng chá"
 
-#: ../app/dialogs/preferences-dialog.c:2726
+#: ../app/dialogs/preferences-dialog.c:2731
 #, fuzzy
 msgid "Select Dynamics Folders"
 msgstr "Chán thÆ mác phÃng chá"
 
-#: ../app/dialogs/preferences-dialog.c:2728
+#: ../app/dialogs/preferences-dialog.c:2733
 msgid "Pattern Folders"
 msgstr "ThÆ mác máu"
 
-#: ../app/dialogs/preferences-dialog.c:2730
+#: ../app/dialogs/preferences-dialog.c:2735
 msgid "Select Pattern Folders"
 msgstr "Chán thÆ mác máu"
 
-#: ../app/dialogs/preferences-dialog.c:2732
+#: ../app/dialogs/preferences-dialog.c:2737
 msgid "Palette Folders"
 msgstr "ThÆ mác báng chán"
 
-#: ../app/dialogs/preferences-dialog.c:2734
+#: ../app/dialogs/preferences-dialog.c:2739
 msgid "Select Palette Folders"
 msgstr "Chán thÆ mác báng chán"
 
-#: ../app/dialogs/preferences-dialog.c:2736
+#: ../app/dialogs/preferences-dialog.c:2741
 msgid "Gradient Folders"
 msgstr "ThÆ mác Äá dác"
 
-#: ../app/dialogs/preferences-dialog.c:2738
+#: ../app/dialogs/preferences-dialog.c:2743
 msgid "Select Gradient Folders"
 msgstr "Chán thÆ mác Äá dác"
 
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/dialogs/preferences-dialog.c:2745
 msgid "Font Folders"
 msgstr "ThÆ mác phÃng chá"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2747
 msgid "Select Font Folders"
 msgstr "Chán thÆ mác phÃng chá"
 
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/dialogs/preferences-dialog.c:2749
+#, fuzzy
+msgid "Tool Preset Folders"
+msgstr "Bá sáa chá"
+
+#: ../app/dialogs/preferences-dialog.c:2751
+#, fuzzy
+#| msgid "Select Theme Folders"
+msgid "Select Tool Preset Folders"
+msgstr "Chán thÆ mác sác thÃi"
+
+#: ../app/dialogs/preferences-dialog.c:2753
 msgid "Plug-In Folders"
 msgstr "ThÆ mác bá sung"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2755
 msgid "Select Plug-In Folders"
 msgstr "Chán thÆ mác bá sung"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2757
 msgid "Scripts"
 msgstr "Táp lánh"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2757
 msgid "Script-Fu Folders"
 msgstr "ThÆ mác Script-Fu"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2759
 msgid "Select Script-Fu Folders"
 msgstr "Chán thÆ mác Script-Fu"
 
-#: ../app/dialogs/preferences-dialog.c:2752
+#: ../app/dialogs/preferences-dialog.c:2761
 msgid "Module Folders"
 msgstr "ThÆ mác mÃ-Äun"
 
-#: ../app/dialogs/preferences-dialog.c:2754
+#: ../app/dialogs/preferences-dialog.c:2763
 msgid "Select Module Folders"
 msgstr "Chán thÆ mác mÃ-Äun"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2765
 msgid "Interpreters"
 msgstr "Bá thÃng dách:"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2765
 msgid "Interpreter Folders"
 msgstr "ThÆ mác thÃng dách"
 
-#: ../app/dialogs/preferences-dialog.c:2758
+#: ../app/dialogs/preferences-dialog.c:2767
 msgid "Select Interpreter Folders"
 msgstr "Chán thÆ mác thÃng dách"
 
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2769
 msgid "Environment Folders"
 msgstr "ThÆ mác mÃi trÆáng"
 
-#: ../app/dialogs/preferences-dialog.c:2762
+#: ../app/dialogs/preferences-dialog.c:2771
 msgid "Select Environment Folders"
 msgstr "Chán thÆ mác mÃi trÆáng"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2773
 msgid "Themes"
 msgstr "Sác thÃi"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2773
 msgid "Theme Folders"
 msgstr "ThÆ mác sác thÃi"
 
-#: ../app/dialogs/preferences-dialog.c:2766
+#: ../app/dialogs/preferences-dialog.c:2775
 msgid "Select Theme Folders"
 msgstr "Chán thÆ mác sác thÃi"
 
@@ -11403,29 +11472,28 @@ msgid "Print Size"
 msgstr "Cá in án"
 
 #. the image size labels
-#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:198
-#: ../app/widgets/gimptemplateeditor.c:160
+#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:193
+#: ../app/widgets/gimptemplateeditor.c:180
 msgid "_Width:"
 msgstr "_Ráng:"
 
-#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:202
-#: ../app/widgets/gimptemplateeditor.c:167
+#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:197
+#: ../app/widgets/gimptemplateeditor.c:187
 msgid "H_eight:"
 msgstr "C_ao :"
 
 #. the resolution labels
-#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:260
-#: ../app/widgets/gimptemplateeditor.c:287
+#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:255
+#: ../app/widgets/gimptemplateeditor.c:309
 msgid "_X resolution:"
 msgstr "Äá phÃn giái _X:"
 
-#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:263
-#: ../app/widgets/gimptemplateeditor.c:294
+#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:258
+#: ../app/widgets/gimptemplateeditor.c:316
 msgid "_Y resolution:"
 msgstr "Äá phÃn giái _Y:"
 
-#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:256
-#: ../app/widgets/gimptemplateeditor.c:307
+#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:251
 #, c-format
 msgid "pixels/%a"
 msgstr "Äiám ánh/%a"
@@ -11485,11 +11553,11 @@ msgid "_Vertical:"
 msgstr "_Dác:"
 
 #. Image size frame
-#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:138
+#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:158
 msgid "Image Size"
 msgstr "Cá ánh"
 
-#: ../app/dialogs/scale-dialog.c:176
+#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:386
 msgid "Quality"
 msgstr "Chát lÆáng"
 
@@ -11510,11 +11578,11 @@ msgstr ""
 msgid "Choose Stroke Style"
 msgstr "Chán kiáu dÃng vá nÃt"
 
-#: ../app/dialogs/stroke-dialog.c:222
+#: ../app/dialogs/stroke-dialog.c:214
 msgid "Paint tool:"
 msgstr "CÃng cá sÆn"
 
-#: ../app/dialogs/stroke-dialog.c:236
+#: ../app/dialogs/stroke-dialog.c:228
 msgid "_Emulate brush dynamics"
 msgstr ""
 
@@ -11597,7 +11665,7 @@ msgid "Import Paths from SVG"
 msgstr "Nháp ÄÆáng dán tá SVG"
 
 #: ../app/dialogs/vectors-import-dialog.c:92
-#: ../app/widgets/gimpprofilechooserdialog.c:131
+#: ../app/widgets/gimpprofilechooserdialog.c:122
 msgid "All files (*.*)"
 msgstr "Mái táp tin (*.*)"
 
@@ -11617,75 +11685,122 @@ msgstr "C_o dÃn ÄÆáng dán nháp Äá váa khÃt ánh"
 msgid "Path name:"
 msgstr "TÃn ÄÆáng dán:"
 
-#: ../app/display/gimpcursorview.c:210 ../app/display/gimpcursorview.c:216
-#: ../app/display/gimpcursorview.c:235 ../app/display/gimpcursorview.c:241
-#: ../app/display/gimpcursorview.c:260 ../app/display/gimpcursorview.c:266
-#: ../app/display/gimpcursorview.c:282 ../app/display/gimpcursorview.c:289
-#: ../app/display/gimpcursorview.c:664 ../app/display/gimpcursorview.c:665
-#: ../app/display/gimpcursorview.c:666 ../app/display/gimpcursorview.c:667
-#: ../app/display/gimpcursorview.c:780 ../app/display/gimpcursorview.c:781
-#: ../app/display/gimpcursorview.c:782 ../app/display/gimpcursorview.c:783
-#: ../app/widgets/gimpcolorframe.c:630
+#: ../app/display/display-enums.c:60
+#, fuzzy
+msgctxt "guides-type"
+msgid "No guides"
+msgstr "KhÃng cà nÃt dán"
+
+#: ../app/display/display-enums.c:61
+#, fuzzy
+msgctxt "guides-type"
+msgid "Center lines"
+msgstr "Äát cÃc ÄÆáng á giáa"
+
+#: ../app/display/display-enums.c:62
+#, fuzzy
+msgctxt "guides-type"
+msgid "Rule of thirds"
+msgstr "Quy tác phán ba"
+
+#: ../app/display/display-enums.c:63
+#, fuzzy
+msgctxt "guides-type"
+msgid "Rule of fifths"
+msgstr "Quy tác phán ba"
+
+#: ../app/display/display-enums.c:64
+#, fuzzy
+msgctxt "guides-type"
+msgid "Golden sections"
+msgstr "CÃc phán vÃng"
+
+#: ../app/display/display-enums.c:65
+msgctxt "guides-type"
+msgid "Diagonal lines"
+msgstr ""
+
+#: ../app/display/display-enums.c:66
+#, fuzzy
+msgctxt "guides-type"
+msgid "Number of lines"
+msgstr "Sá dÃng lÆái"
+
+#: ../app/display/display-enums.c:67
+#, fuzzy
+msgctxt "guides-type"
+msgid "Line spacing"
+msgstr "Khoáng cÃch dÃng lÆái"
+
+#: ../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:634
 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 "ÄÆn vá"
 
 #. Selection Bounding Box
-#: ../app/display/gimpcursorview.c:250
+#: ../app/display/gimpcursorview.c:256
 #, fuzzy
 msgid "Selection Bounding Box"
 msgstr "Bá sáa vÃng chán"
 
 #. Width
-#: ../app/display/gimpcursorview.c:286
+#: ../app/display/gimpcursorview.c:292
 msgid "W"
 msgstr ""
 
 #. Height
-#: ../app/display/gimpcursorview.c:293
+#: ../app/display/gimpcursorview.c:299
 msgid "H"
 msgstr ""
 
-#: ../app/display/gimpcursorview.c:320
+#: ../app/display/gimpcursorview.c:328
 msgid "_Sample Merged"
 msgstr "_Máu ÄÃ trán"
 
-#: ../app/display/gimpdisplayshell.c:499
+#: ../app/display/gimpdisplayshell.c:509
 #, fuzzy
 msgid "Access the image menu"
 msgstr "Chánh cÃc chiáu ánh"
 
-#: ../app/display/gimpdisplayshell.c:613
+#: ../app/display/gimpdisplayshell.c:623
 msgid "Zoom image when window size changes"
 msgstr "Thu phÃng ánh khi cá ánh Äái"
 
-#: ../app/display/gimpdisplayshell.c:642
+#: ../app/display/gimpdisplayshell.c:652
 msgid "Toggle Quick Mask"
 msgstr "Bát/tát mát ná nhanh"
 
-#: ../app/display/gimpdisplayshell.c:665
+#: ../app/display/gimpdisplayshell.c:675
 #, fuzzy
 msgid "Navigate the image display"
 msgstr "NÃng cÃc khung hián thá ánh nÃy lÃn."
 
-#: ../app/display/gimpdisplayshell.c:733
-#: ../app/display/gimpdisplayshell.c:1311 ../app/widgets/gimptoolbox.c:315
+#: ../app/display/gimpdisplayshell.c:743
+#: ../app/display/gimpdisplayshell.c:1321 ../app/widgets/gimptoolbox.c:250
 msgid "Drop image files here to open them"
 msgstr ""
 
@@ -11735,8 +11850,8 @@ msgstr[0] ""
 "mát hoÃn toÃn."
 
 #: ../app/display/gimpdisplayshell-dnd.c:232
-#: ../app/display/gimpdisplayshell-dnd.c:602
-#: ../app/display/gimpdisplayshell-dnd.c:667
+#: ../app/display/gimpdisplayshell-dnd.c:635
+#: ../app/display/gimpdisplayshell-dnd.c:695
 msgid "Drop New Layer"
 msgstr "Thá láp mái"
 
@@ -11745,28 +11860,28 @@ msgid "Drop New Path"
 msgstr "Thá ÄÆáng dán mái"
 
 #: ../app/display/gimpdisplayshell-dnd.c:347
-#: ../app/display/gimpdisplayshell-dnd.c:442 ../app/tools/gimpblendtool.c:174
-#: ../app/tools/gimpbucketfilltool.c:135 ../app/tools/gimpimagemaptool.c:279
+#: ../app/display/gimpdisplayshell-dnd.c:449 ../app/tools/gimpblendtool.c:173
+#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:279
 msgid "Cannot modify the pixels of layer groups."
 msgstr ""
 
 #: ../app/display/gimpdisplayshell-dnd.c:355
-#: ../app/display/gimpdisplayshell-dnd.c:450 ../app/tools/gimpblendtool.c:181
-#: ../app/tools/gimpbucketfilltool.c:142 ../app/tools/gimpcroptool.c:335
-#: ../app/tools/gimpimagemaptool.c:286 ../app/tools/gimppainttool.c:286
-#: ../app/tools/gimptransformtool.c:350 ../app/tools/gimptransformtool.c:1178
+#: ../app/display/gimpdisplayshell-dnd.c:457 ../app/tools/gimpblendtool.c:180
+#: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325
+#: ../app/tools/gimpimagemaptool.c:286 ../app/tools/gimppainttool.c:266
+#: ../app/tools/gimptransformtool.c:246 ../app/tools/gimptransformtool.c:1062
 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:535
+#: ../app/widgets/gimplayertreeview.c:725
 #, fuzzy
 msgid "Drop layers"
 msgstr "XÃn láp"
 
-#: ../app/display/gimpdisplayshell-dnd.c:635
-#: ../app/display/gimpdisplayshell-dnd.c:657
-#: ../app/widgets/gimplayertreeview.c:811 ../app/widgets/gimptoolbox-dnd.c:274
+#: ../app/display/gimpdisplayshell-dnd.c:668
+#: ../app/display/gimpdisplayshell-dnd.c:685
+#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:266
 msgid "Dropped Buffer"
 msgstr "Bá Äám ÄÃ thá"
 
@@ -11778,17 +11893,17 @@ msgstr "Bá lác hián thá mÃu"
 msgid "Configure Color Display Filters"
 msgstr "Cáu hÃnh Bá lác hián thá mÃu"
 
-#: ../app/display/gimpdisplayshell-handlers.c:561
+#: ../app/display/gimpdisplayshell-handlers.c:796
 #, c-format
 msgid "Image saved to '%s'"
 msgstr ""
 
-#: ../app/display/gimpdisplayshell-handlers.c:575
+#: ../app/display/gimpdisplayshell-handlers.c:810
 #, c-format
 msgid "Image exported to '%s'"
 msgstr ""
 
-#: ../app/display/gimpdisplayshell-layer-select.c:120
+#: ../app/display/gimpdisplayshell-layer-select.c:122
 msgid "Layer Select"
 msgstr "Chán láp"
 
@@ -11808,34 +11923,34 @@ msgstr "Tá lá thu phÃng:"
 msgid "Zoom:"
 msgstr "Thu phÃng:"
 
-#: ../app/display/gimpdisplayshell-title.c:303
+#: ../app/display/gimpdisplayshell-title.c:301
 msgid "(modified)"
 msgstr "(ÄÃ sáa Äái)"
 
-#: ../app/display/gimpdisplayshell-title.c:308
+#: ../app/display/gimpdisplayshell-title.c:306
 msgid "(clean)"
 msgstr "(gát)"
 
-#: ../app/display/gimpdisplayshell-title.c:356
-#: ../app/display/gimpdisplayshell-title.c:369
-#: ../app/widgets/gimpactiongroup.c:870
+#: ../app/display/gimpdisplayshell-title.c:360
+#: ../app/display/gimpdisplayshell-title.c:373
+#: ../app/widgets/gimpactiongroup.c:891
 msgid "(none)"
 msgstr "(khÃng cÃ)"
 
-#: ../app/display/gimpdisplayshell-title.c:500
+#: ../app/display/gimpdisplayshell-title.c:502
 msgid " (exported)"
 msgstr ""
 
-#: ../app/display/gimpdisplayshell-title.c:502
+#: ../app/display/gimpdisplayshell-title.c:504
 msgid " (overwritten)"
 msgstr ""
 
-#: ../app/display/gimpdisplayshell-title.c:508
+#: ../app/display/gimpdisplayshell-title.c:510
 #, fuzzy
 msgid " (imported)"
 msgstr "Nháp mái"
 
-#: ../app/display/gimpstatusbar.c:358
+#: ../app/display/gimpstatusbar.c:356
 #, c-format
 msgid "Cancel <i>%s</i>"
 msgstr ""
@@ -11854,27 +11969,27 @@ msgstr "bá sung trá lái THÃNH CÃNG nhÆng chÆa trá ánh."
 msgid "%s plug-In could not open image"
 msgstr "bá sung khÃng thá má ánh"
 
-#: ../app/file/file-open.c:518
+#: ../app/file/file-open.c:523
 #, fuzzy
 msgid "Image doesn't contain any layers"
 msgstr "ánh khÃng cháa láp hián thá nÃo"
 
-#: ../app/file/file-open.c:571
+#: ../app/file/file-open.c:576
 #, c-format
 msgid "Opening '%s' failed: %s"
 msgstr "Viác má  %s  thát bái: %s"
 
-#: ../app/file/file-open.c:678
+#: ../app/file/file-open.c:683
 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 "KhÃng biát kiáu táp tin"
 
-#: ../app/file/file-save.c:189
+#: ../app/file/file-save.c:208
 #, fuzzy, c-format
 msgid "%s plug-in could not save image"
 msgstr "bá sung khÃng thá lÆu ánh"
@@ -11888,39 +12003,73 @@ msgstr ""
 msgid "Invalid character sequence in URI"
 msgstr "Gáp dÃy kà tá khÃng háp lá trong URI"
 
-#: ../app/gegl/gimpcurvesconfig.c:384
+#: ../app/gegl/gimp-gegl-enums.c:24
+#, fuzzy
+#| msgid "Create a New Image"
+msgctxt "cage-mode"
+msgid "Create or adjust the cage"
+msgstr "Táo ánh mái"
+
+#: ../app/gegl/gimp-gegl-enums.c:25
+#, fuzzy
+msgctxt "cage-mode"
+msgid "Deform the cage to deform the image"
+msgstr "Thay Äái kÃch cá cáa láp thÃnh kÃch cá cáa ánh"
+
+#: ../app/gegl/gimpcurvesconfig.c:385
 #, fuzzy
 msgid "not a GIMP Curves file"
 msgstr "khÃng phái là mát táp tin Cáp GIMP"
 
-#: ../app/gegl/gimpcurvesconfig.c:399 ../app/gegl/gimplevelsconfig.c:710
+#: ../app/gegl/gimpcurvesconfig.c:400 ../app/gegl/gimplevelsconfig.c:711
 msgid "parse error"
 msgstr "lái phÃn tÃch"
 
-#: ../app/gegl/gimplevelsconfig.c:663
+#: ../app/gegl/gimplevelsconfig.c:664
 msgid "not a GIMP Levels file"
 msgstr "khÃng phái là mát táp tin Cáp GIMP"
 
+#: ../app/gegl/gimpoperationcagecoefcalc.c:65
+msgid "Compute a set of coefficient buffer for the GIMP cage tool"
+msgstr ""
+
+#: ../app/gegl/gimpoperationcagetransform.c:104
+msgid ""
+"Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage "
+"tool"
+msgstr ""
+
+#: ../app/gegl/gimpoperationcagetransform.c:125
+#, fuzzy
+#| msgid "Fill with _background color"
+msgid "Fill with plain color"
+msgstr "TÃ _báng mÃu nán"
+
+#: ../app/gegl/gimpoperationcagetransform.c:126
+#: ../app/tools/gimpcageoptions.c:144
+msgid "Fill the original position of the cage with a plain color"
+msgstr ""
+
 # 48x48/emblems/emblem-documents.icon.in.h:1
 # 48x48/emblems/emblem-documents.icon.in.h:1
 #. initialize the document history
-#: ../app/gui/gui.c:427
+#: ../app/gui/gui.c:421
 msgid "Documents"
 msgstr "TÃi liáu"
 
-#: ../app/gui/splash.c:114
+#: ../app/gui/splash.c:115
 msgid "GIMP Startup"
 msgstr "Khái cháy GIMP"
 
-#: ../app/paint/gimpairbrush.c:72 ../app/tools/gimpairbrushtool.c:53
+#: ../app/paint/gimpairbrush.c:73 ../app/tools/gimpairbrushtool.c:54
 msgid "Airbrush"
 msgstr "Chái khÃ"
 
-#: ../app/paint/gimpbrushcore.c:435
+#: ../app/paint/gimpbrushcore.c:387
 msgid "No brushes available for use with this tool."
 msgstr "KhÃng cà bÃt vá sán sÃng dÃng vái cÃng cá nÃy."
 
-#: ../app/paint/gimpbrushcore.c:442
+#: ../app/paint/gimpbrushcore.c:394
 #, fuzzy
 msgid "No paint dynamics available for use with this tool."
 msgstr "KhÃng cà bÃt vá sán sÃng dÃng vái cÃng cá nÃy."
@@ -11942,7 +12091,7 @@ msgstr "Quán lái"
 msgid "Dodge/Burn"
 msgstr "TrÃnh/ChÃy"
 
-#: ../app/paint/gimperaser.c:65 ../app/tools/gimperasertool.c:65
+#: ../app/paint/gimperaser.c:63 ../app/tools/gimperasertool.c:65
 msgid "Eraser"
 msgstr "XÃa"
 
@@ -11972,40 +12121,77 @@ msgstr "Tá lá hÃnh thá:"
 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 "Chái sÆn"
 
-#: ../app/paint/gimppaintcore-stroke.c:335
-#, fuzzy
-msgid "Not enough points to stroke"
-msgstr "KhÃng cà vÃng chán trong Äà cán vá nÃt."
-
-#: ../app/paint/gimppaintcore.c:140
+#: ../app/paint/gimppaintcore.c:141
 msgid "Paint"
 msgstr "SÆn"
 
-#: ../app/paint/gimppaintoptions.c:138
+#: ../app/paint/gimppaintoptions.c:145
 #, fuzzy
-msgid "Brush Scale"
-msgstr "ThÆ mác bÃt vá"
+msgid "Brush Size"
+msgstr "BÃt vá"
+
+#: ../app/paint/gimppaintoptions.c:159
+msgid "Every stamp has its own opacity"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:165
+msgid "Ignore fuzziness of the current brush"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:170
+msgid "Scatter brush as you paint"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:174
+msgid "Distance of scattering"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:184
+msgid "Distance over which strokes fade out"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:192
+msgid "Reverse direction of fading"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:196
+msgid "How fade is repeated as you paint"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:255
+#, fuzzy
+#| msgid "Paint fuzzy brush strokes"
+msgid "Paint smoother strokes"
+msgstr "SÆn nÃt bÃt vá má"
+
+#: ../app/paint/gimppaintoptions.c:259
+msgid "Depth of smoothing"
+msgstr ""
+
+#: ../app/paint/gimppaintoptions.c:263
+msgid "Gravity of the pen"
+msgstr ""
 
 #: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50
 msgid "Pencil"
 msgstr "BÃt chÃ"
 
-#: ../app/paint/gimpperspectiveclone.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:128
+#: ../app/paint/gimpperspectiveclone.c:95
+#: ../app/tools/gimpperspectiveclonetool.c:133
 #, fuzzy
 msgid "Perspective Clone"
 msgstr "Phái cánh..."
 
-#: ../app/paint/gimpperspectiveclone.c:163
+#: ../app/paint/gimpperspectiveclone.c:160
 #, fuzzy
 msgid "Perspective Clone does not operate on indexed layers."
 msgstr "BÃch chÆÆng hÃa khÃng hoát Äáng trÃn láp phá lác."
 
-#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:52
+#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:53
 msgid "Smudge"
 msgstr "NhoÃ"
 
@@ -12061,7 +12247,7 @@ msgctxt "convolve-type"
 msgid "Sharpen"
 msgstr "MÃi sác"
 
-#: ../app/pdb/channel-cmds.c:182
+#: ../app/pdb/channel-cmds.c:184
 msgid "Combine Masks"
 msgstr "Kát háp mát ná"
 
@@ -12069,33 +12255,33 @@ msgstr "Kát háp mát ná"
 msgid "Plug-In"
 msgstr "bá sung"
 
-#: ../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 "Phái cánh..."
 
-#: ../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 "Äang kÃo cát..."
 
-#: ../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 "Chuyán dáng 2 chiáu"
 
-#: ../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 "Äang chuyán dáng 2 chiáu..."
 
-#: ../app/pdb/edit-cmds.c:725 ../app/tools/gimpblendtool.c:243
+#: ../app/pdb/edit-cmds.c:725 ../app/tools/gimpblendtool.c:249
 msgid "Blending"
 msgstr "Äang háp nhau..."
 
@@ -12115,8 +12301,8 @@ msgid ""
 "selection."
 msgstr "KhÃng thá neo láp nÃy và nà khÃng phái là vÃng chán nái."
 
-#: ../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:305
+#: ../app/pdb/gimppdb.c:375
 #, fuzzy, c-format
 msgid "Procedure '%s' not found"
 msgstr ""
@@ -12281,108 +12467,109 @@ msgstr ""
 msgid "Vectors object %d does not contain stroke with ID %d"
 msgstr ""
 
-#: ../app/pdb/gimppdb.c:410
+#: ../app/pdb/gimppdb.c:409
 #, c-format
 msgid ""
-"Procedure '%s' has been called with a wrong type for argument #%d. Expected "
-"%s, got %s."
+"Procedure '%s' has been called with a wrong type for argument #%d. Expected %"
+"s, got %s."
 msgstr ""
 
-#: ../app/pdb/gimppdbcontext.c:78
-#: ../app/tools/gimpforegroundselectoptions.c:78
+#: ../app/pdb/gimppdbcontext.c:82
+#: ../app/tools/gimpforegroundselectoptions.c:79
 #: ../app/tools/gimpselectionoptions.c:78
 msgid "Smooth edges"
 msgstr "LÃm mán cánh"
 
-#: ../app/pdb/gimpprocedure.c:371 ../app/plug-in/gimppluginprocframe.c:208
+#: ../app/pdb/gimpprocedure.c:370 ../app/plug-in/gimppluginprocframe.c:208
 #, c-format
 msgid "Procedure '%s' returned no return values"
 msgstr ""
 
-#: ../app/pdb/gimpprocedure.c:634
+#: ../app/pdb/gimpprocedure.c:641
 #, c-format
 msgid ""
 "Procedure '%s' returned a wrong value type for return value '%s' (#%d). "
 "Expected %s, got %s."
 msgstr ""
 
-#: ../app/pdb/gimpprocedure.c:646
+#: ../app/pdb/gimpprocedure.c:653
 #, c-format
 msgid ""
-"Procedure '%s' has been called with a wrong value type for argument '%s' (#"
-"%d). Expected %s, got %s."
+"Procedure '%s' has been called with a wrong value type for argument '%s' (#%"
+"d). Expected %s, got %s."
 msgstr ""
 
-#: ../app/pdb/gimpprocedure.c:678
+#: ../app/pdb/gimpprocedure.c:685
 #, c-format
 msgid ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
 "in is trying to work on a layer that doesn't exist any longer."
 msgstr ""
 
-#: ../app/pdb/gimpprocedure.c:690
+#: ../app/pdb/gimpprocedure.c:697
 #, c-format
 msgid ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
 "likely a plug-in is trying to work on a layer that doesn't exist any longer."
 msgstr ""
 
-#: ../app/pdb/gimpprocedure.c:706
+#: ../app/pdb/gimpprocedure.c:713
 #, c-format
 msgid ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
 "in is trying to work on an image that doesn't exist any longer."
 msgstr ""
 
-#: ../app/pdb/gimpprocedure.c:718
+#: ../app/pdb/gimpprocedure.c:725
 #, c-format
 msgid ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
 "likely a plug-in is trying to work on an image that doesn't exist any longer."
 msgstr ""
 
-#: ../app/pdb/gimpprocedure.c:738
+#: ../app/pdb/gimpprocedure.c:745
 #, c-format
 msgid ""
 "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value "
 "is out of range."
 msgstr ""
 
-#: ../app/pdb/gimpprocedure.c:751
+#: ../app/pdb/gimpprocedure.c:758
 #, c-format
 msgid ""
-"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type "
-"%s). This value is out of range."
+"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %"
+"s). This value is out of range."
 msgstr ""
 
-#: ../app/pdb/image-cmds.c:2650
+#: ../app/pdb/image-cmds.c:2359
 msgid ""
 "Image resolution is out of bounds, using the default resolution instead."
 msgstr ""
 "Äá phÃn giái ánh nám ngoÃi giái hán, nÃn dÃng Äá phÃn giái mác Äánh Äá thay "
 "thá."
 
+#: ../app/pdb/image-select-cmds.c:297 ../app/pdb/selection-tools-cmds.c:219
+#: ../app/tools/gimpfreeselecttool.c:196
+msgid "Free Select"
+msgstr "Chán tá do"
+
 #: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516
 msgid "Move Layer"
 msgstr "Chuyán láp"
 
-#: ../app/pdb/selection-tools-cmds.c:217 ../app/tools/gimpfreeselecttool.c:199
-msgid "Free Select"
-msgstr "Chán tá do"
-
-#: ../app/pdb/text-layer-cmds.c:89
+#: ../app/pdb/text-layer-cmds.c:91
 #, fuzzy, c-format
 msgid "Failed to create text layer"
 msgstr "XÃn Äá váa láp dÆái"
 
-#: ../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
 #, fuzzy
 msgid "Set text layer attribute"
 msgstr "Sáa thuác tÃnh láp"
@@ -12491,42 +12678,42 @@ msgstr ""
 msgid "Failed to run plug-in \"%s\""
 msgstr ""
 
-#: ../app/plug-in/gimppluginmanager-restore.c:230
+#: ../app/plug-in/gimppluginmanager-restore.c:229
 msgid "Searching Plug-Ins"
 msgstr "Äang tÃm cÃc bá sung"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:279
+#: ../app/plug-in/gimppluginmanager-restore.c:284
 msgid "Resource configuration"
 msgstr "Cáu hÃnh tÃi nguyÃn"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:315
+#: ../app/plug-in/gimppluginmanager-restore.c:320
 msgid "Querying new Plug-ins"
 msgstr "Äang truy ván bá sung mái"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:365
+#: ../app/plug-in/gimppluginmanager-restore.c:370
 msgid "Initializing Plug-ins"
 msgstr "Äang khái táo bá sung"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:437
+#: ../app/plug-in/gimppluginmanager-restore.c:442
 msgid "Starting Extensions"
 msgstr "Äang khái cháy phán má ráng"
 
-#: ../app/plug-in/gimppluginmanager.c:297
+#: ../app/plug-in/gimppluginmanager.c:296
 msgid "Plug-In Interpreters"
 msgstr "Bá thÃng dách bá sung"
 
-#: ../app/plug-in/gimppluginmanager.c:304
+#: ../app/plug-in/gimppluginmanager.c:303
 msgid "Plug-In Environment"
 msgstr "MÃi trÆáng bá sung"
 
-#: ../app/plug-in/gimppluginprocedure.c:995
+#: ../app/plug-in/gimppluginprocedure.c:980
 #, fuzzy, c-format
 msgid ""
 "Calling error for '%s':\n"
 "%s"
 msgstr "KhÃng thá táo thÆ mác  %s Â: %s"
 
-#: ../app/plug-in/gimppluginprocedure.c:1007
+#: ../app/plug-in/gimppluginprocedure.c:992
 #, fuzzy, c-format
 msgid ""
 "Execution error for '%s':\n"
@@ -12552,12 +12739,12 @@ msgstr ""
 msgid "Skipping '%s': wrong GIMP protocol version."
 msgstr "Äang bá qua  %s  và phiÃn bán giao thác GIMP khÃng ÄÃng."
 
-#: ../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 "già trá khÃng háp lá  %s  cho kiáu biáu tÆáng"
 
-#: ../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 "già trá khÃng háp lá  %ld  cho kiáu biáu tÆáng"
@@ -12572,51 +12759,51 @@ msgstr ""
 "aÄÃbcdÄeÃghiklmnoÃÆ\n"
 "pqrstuÆvxyâáÃáááá"
 
-#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:1386
+#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1367
 msgid "Add Text Layer"
 msgstr "ThÃm láp chá"
 
-#: ../app/text/gimptextlayer.c:141
+#: ../app/text/gimptextlayer.c:143
 msgid "Text Layer"
 msgstr "Láp chá"
 
-#: ../app/text/gimptextlayer.c:142
+#: ../app/text/gimptextlayer.c:144
 msgid "Rename Text Layer"
 msgstr "Äái láp chá"
 
-#: ../app/text/gimptextlayer.c:143
+#: ../app/text/gimptextlayer.c:145
 msgid "Move Text Layer"
 msgstr "Chuyán láp chá"
 
-#: ../app/text/gimptextlayer.c:144
+#: ../app/text/gimptextlayer.c:146
 msgid "Scale Text Layer"
 msgstr "Co dÃn láp chá"
 
-#: ../app/text/gimptextlayer.c:145
+#: ../app/text/gimptextlayer.c:147
 msgid "Resize Text Layer"
 msgstr "Äái cá láp chá"
 
-#: ../app/text/gimptextlayer.c:146
+#: ../app/text/gimptextlayer.c:148
 msgid "Flip Text Layer"
 msgstr "Lát láp chá"
 
-#: ../app/text/gimptextlayer.c:147
+#: ../app/text/gimptextlayer.c:149
 msgid "Rotate Text Layer"
 msgstr "Xoay láp chá"
 
-#: ../app/text/gimptextlayer.c:148
+#: ../app/text/gimptextlayer.c:150
 msgid "Transform Text Layer"
 msgstr "Chuyán dáng láp chá"
 
-#: ../app/text/gimptextlayer.c:509
+#: ../app/text/gimptextlayer.c:523
 msgid "Discard Text Information"
 msgstr "Háy thÃng tin chá"
 
-#: ../app/text/gimptextlayer.c:562
+#: ../app/text/gimptextlayer.c:581
 msgid "Due to lack of any fonts, text functionality is not available."
 msgstr "KhÃng cà chác nÄng hián thá chá và khÃng cà phÃng chá nÃo cá."
 
-#: ../app/text/gimptextlayer.c:613
+#: ../app/text/gimptextlayer.c:634
 msgid "Empty Text Layer"
 msgstr "Láp chá ráng"
 
@@ -12646,7 +12833,7 @@ msgctxt "text-box-mode"
 msgid "Fixed"
 msgstr "ÄÃ sáa"
 
-#: ../app/tools/gimp-tools.c:352
+#: ../app/tools/gimp-tools.c:351
 msgid ""
 "This tool has\n"
 "no options."
@@ -12654,165 +12841,176 @@ msgstr ""
 "CÃng cá nÃy\n"
 "khÃng cà tÃy chán."
 
-#: ../app/tools/gimpairbrushtool.c:54
+#: ../app/tools/gimpairbrushtool.c:55
 #, fuzzy
 msgid "Airbrush Tool: Paint using a brush, with variable pressure"
 msgstr "Chái khà vái Ãp suát thay Äái"
 
-#: ../app/tools/gimpairbrushtool.c:55
+#: ../app/tools/gimpairbrushtool.c:56
 msgid "_Airbrush"
 msgstr "Chá_i khÃ"
 
-#: ../app/tools/gimpairbrushtool.c:88
+#: ../app/tools/gimpairbrushtool.c:86
 #, fuzzy
 msgid "Motion only"
 msgstr "Chá lÃm nhát"
 
-#: ../app/tools/gimpairbrushtool.c:97 ../app/tools/gimpconvolvetool.c:216
-#: ../app/tools/gimpsmudgetool.c:96
-msgid "Rate:"
-msgstr "Tá lá:"
-
-#: ../app/tools/gimpairbrushtool.c:103
+#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:228
+#: ../app/tools/gimpsmudgetool.c:91
 #, fuzzy
-msgid "Flow:"
-msgstr "VÃng:"
-
-#: ../app/tools/gimpaligntool.c:135 ../app/tools/gimpaligntool.c:764
-msgid "Align"
-msgstr "Canh lá"
+msgid "Rate"
+msgstr "Tá lá"
 
-#: ../app/tools/gimpaligntool.c:136
+#: ../app/tools/gimpairbrushtool.c:97
 #, fuzzy
-msgid "Alignment Tool: Align or arrange layers and other objects"
-msgstr "Canh lá hay sáp xáp cÃc láp và mác khÃc"
-
-#: ../app/tools/gimpaligntool.c:137
-msgid "_Align"
-msgstr "C_anh lá"
+msgid "Flow"
+msgstr "VÃng:"
 
-#: ../app/tools/gimpaligntool.c:599
-msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
+#: ../app/tools/gimpalignoptions.c:91
+msgid "Reference image object a layer will be aligned on"
 msgstr ""
 
-#: ../app/tools/gimpaligntool.c:608
-#, fuzzy
-msgid "Click to pick this layer as first item"
-msgstr "Nháp vÃo ÄÆáng dán cán sáa Äái."
-
-#: ../app/tools/gimpaligntool.c:616
-#, fuzzy
-msgid "Click to add this layer to the list"
-msgstr "Nhán Äá nà trÃnh ÄÆáng."
-
-#: ../app/tools/gimpaligntool.c:620
-#, fuzzy
-msgid "Click to pick this guide as first item"
-msgstr "Nháp vÃo ÄÆáng dán cán sáa Äái."
-
-#: ../app/tools/gimpaligntool.c:628
-#, fuzzy
-msgid "Click to add this guide to the list"
-msgstr "Nhán Äá nà trÃnh ÄÆáng."
+#: ../app/tools/gimpalignoptions.c:98
+msgid "Horizontal offset for distribution"
+msgstr ""
 
-#: ../app/tools/gimpaligntool.c:632
-#, fuzzy
-msgid "Click to pick this path as first item"
-msgstr "Nháp vÃo ÄÆáng dán cán sáa Äái."
+#: ../app/tools/gimpalignoptions.c:104
+msgid "Vertical offset for distribution"
+msgstr ""
 
-#: ../app/tools/gimpaligntool.c:640
-#, fuzzy
-msgid "Click to add this path to the list"
-msgstr "Nháp vÃo ÄÆáng dán cán sáa Äái."
+#: ../app/tools/gimpalignoptions.c:272 ../app/tools/gimpaligntool.c:124
+msgid "Align"
+msgstr "Canh lá"
 
-#: ../app/tools/gimpaligntool.c:776
+#: ../app/tools/gimpalignoptions.c:284
 #, fuzzy
 msgid "Relative to:"
 msgstr "TÆÆng Äái so vái"
 
-#: ../app/tools/gimpaligntool.c:794
+#: ../app/tools/gimpalignoptions.c:298
 msgid "Align left edge of target"
 msgstr "Canh lá cánh bÃn trÃi cáa ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:800
+#: ../app/tools/gimpalignoptions.c:302
 msgid "Align center of target"
 msgstr "Canh lá trung tÃm cáa ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:806
+#: ../app/tools/gimpalignoptions.c:306
 msgid "Align right edge of target"
 msgstr "Canh lá cánh bÃn phái cáa ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:816
+#: ../app/tools/gimpalignoptions.c:314
 msgid "Align top edge of target"
 msgstr "Canh lá cánh bÃn trÃn cáa ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:822
+#: ../app/tools/gimpalignoptions.c:318
 msgid "Align middle of target"
 msgstr "Canh lá vÃng á giáa cáa ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:828
+#: ../app/tools/gimpalignoptions.c:322
 msgid "Align bottom of target"
 msgstr "Canh lá cánh bÃn dÆái cáa ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:832
+#: ../app/tools/gimpalignoptions.c:324
 msgid "Distribute"
 msgstr "PhÃn phái"
 
-#: ../app/tools/gimpaligntool.c:846
+#: ../app/tools/gimpalignoptions.c:338
 msgid "Distribute left edges of targets"
 msgstr "PhÃn phái cÃc cánh bÃn trÃi cáa cÃc ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:853
+#: ../app/tools/gimpalignoptions.c:342
 #, fuzzy
 msgid "Distribute horizontal centers of targets"
 msgstr "PhÃn phái cÃc trung tÃm ngang cáa cÃc ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:860
+#: ../app/tools/gimpalignoptions.c:346
 msgid "Distribute right edges of targets"
 msgstr "PhÃn phái cÃc cánh bÃn phái cáa cÃc ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:870
+#: ../app/tools/gimpalignoptions.c:354
 msgid "Distribute top edges of targets"
 msgstr "PhÃn phái cÃc cánh bÃn trÃn cáa cÃc ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:877
+#: ../app/tools/gimpalignoptions.c:358
 msgid "Distribute vertical centers of targets"
 msgstr "PhÃn phái cÃc trung tÃm dác cáa cÃc ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:883
+#: ../app/tools/gimpalignoptions.c:362
 msgid "Distribute bottoms of targets"
 msgstr "PhÃn phái cÃc cánh bÃn dÆái cáa cÃc ÄÃch"
 
-#: ../app/tools/gimpaligntool.c:891 ../app/tools/gimpblendoptions.c:221
+#: ../app/tools/gimpalignoptions.c:368
 msgid "Offset:"
 msgstr "Hiáu sá:"
 
-#: ../app/tools/gimpblendoptions.c:215 ../app/tools/gimppaintoptions-gui.c:305
-msgid "Gradient:"
-msgstr "Äá dác:"
+#: ../app/tools/gimpaligntool.c:125
+#, fuzzy
+msgid "Alignment Tool: Align or arrange layers and other objects"
+msgstr "Canh lá hay sáp xáp cÃc láp và mác khÃc"
+
+#: ../app/tools/gimpaligntool.c:126
+msgid "_Align"
+msgstr "C_anh lá"
+
+#: ../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
+#, fuzzy
+msgid "Click to pick this layer as first item"
+msgstr "Nháp vÃo ÄÆáng dán cán sáa Äái."
+
+#: ../app/tools/gimpaligntool.c:564
+#, fuzzy
+msgid "Click to add this layer to the list"
+msgstr "Nhán Äá nà trÃnh ÄÆáng."
+
+#: ../app/tools/gimpaligntool.c:568
+#, fuzzy
+msgid "Click to pick this guide as first item"
+msgstr "Nháp vÃo ÄÆáng dán cán sáa Äái."
+
+#: ../app/tools/gimpaligntool.c:575
+#, fuzzy
+msgid "Click to add this guide to the list"
+msgstr "Nhán Äá nà trÃnh ÄÆáng."
+
+#: ../app/tools/gimpaligntool.c:579
+#, fuzzy
+msgid "Click to pick this path as first item"
+msgstr "Nháp vÃo ÄÆáng dán cán sáa Äái."
+
+#: ../app/tools/gimpaligntool.c:586
+#, fuzzy
+msgid "Click to add this path to the list"
+msgstr "Nháp vÃo ÄÆáng dán cán sáa Äái."
+
+#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:339
+#, fuzzy
+#| msgid "Gradients"
+msgid "Gradient"
+msgstr "Äá dác"
 
-#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:145
+#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:139
 msgid "Shape:"
 msgstr "HÃnh"
 
-#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:236
+#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:323
 msgid "Repeat:"
 msgstr "Láp lái"
 
-#: ../app/tools/gimpblendoptions.c:256
+#: ../app/tools/gimpblendoptions.c:261
 msgid "Adaptive supersampling"
 msgstr "SiÃu láy máu thÃch nghi"
 
-#: ../app/tools/gimpblendoptions.c:264
-msgid "Max depth:"
+#: ../app/tools/gimpblendoptions.c:268
+#, fuzzy
+#| msgid "Max depth:"
+msgid "Max depth"
 msgstr "DÃi tái Äa:"
 
-#: ../app/tools/gimpblendoptions.c:271
-#: ../app/tools/gimpbucketfilloptions.c:287
-#: ../app/tools/gimpregionselectoptions.c:219
-msgid "Threshold:"
-msgstr "NgÆáng:"
-
 #: ../app/tools/gimpblendtool.c:109
 msgid "Blend"
 msgstr "Háp nhau"
@@ -12826,22 +13024,27 @@ msgstr "TÃ báng chuyán mÃu sác"
 msgid "Blen_d"
 msgstr "Há_p nhau"
 
-#: ../app/tools/gimpblendtool.c:167
+#: ../app/tools/gimpblendtool.c:166
 #, fuzzy
 msgid "Blend does not operate on indexed layers."
 msgstr "Viác lÃm báng khÃng hoát Äáng trÃn láp ÄÃ phá lác."
 
-#: ../app/tools/gimpblendtool.c:420 ../app/tools/gimppainttool.c:634
+#: ../app/tools/gimpblendtool.c:187
+#, fuzzy
+msgid "No gradient available for use with this tool."
+msgstr "KhÃng cà bÃt vá sán sÃng dÃng vái cÃng cá nÃy."
+
+#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%s cho gÃc bá Ãp buác"
 
-#: ../app/tools/gimpblendtool.c:421
+#: ../app/tools/gimpblendtool.c:453
 #, fuzzy, c-format
 msgid "%s to move the whole line"
 msgstr "Nhán Äá nà trÃnh ÄÆáng."
 
-#: ../app/tools/gimpblendtool.c:425
+#: ../app/tools/gimpblendtool.c:457
 msgid "Blend: "
 msgstr "Háp nhau : "
 
@@ -12876,80 +13079,88 @@ msgstr "Äá tÆÆng phán-Äá sÃng"
 msgid "Brightness-Contrast does not operate on indexed layers."
 msgstr "SÃng-TÆÆng phán khÃng hoát Äáng trÃn láp phá lác."
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:320
+#: ../app/tools/gimpbrightnesscontrasttool.c:314
 msgid "_Brightness:"
 msgstr "Äá _sÃng:"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:335
+#: ../app/tools/gimpbrightnesscontrasttool.c:327
 msgid "Con_trast:"
 msgstr "Äá _tÆÆng phán:"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:349
+#: ../app/tools/gimpbrightnesscontrasttool.c:339
 msgid "Edit these Settings as Levels"
 msgstr ""
 
-#: ../app/tools/gimpbucketfilloptions.c:99
+#: ../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 "Cho phÃp tà Äáy vÃng trong suát hoÃn toÃn"
 
-#: ../app/tools/gimpbucketfilloptions.c:105
+#: ../app/tools/gimpbucketfilloptions.c:104
 msgid "Base filled area on all visible layers"
 msgstr "VÃng tà Äáy dáa vÃo mái láp hián thá"
 
-#: ../app/tools/gimpbucketfilloptions.c:111
+#: ../app/tools/gimpbucketfilloptions.c:110
 #: ../app/tools/gimpregionselectoptions.c:95
 msgid "Maximum color difference"
 msgstr "Hiáu sá mÃu tái Äa"
 
+#: ../app/tools/gimpbucketfilloptions.c:115
+msgid "Criterion used for determining color similarity"
+msgstr ""
+
 #. fill type
-#: ../app/tools/gimpbucketfilloptions.c:225
+#: ../app/tools/gimpbucketfilloptions.c:229
 #, c-format
 msgid "Fill Type  (%s)"
 msgstr "Kiáu tà Äáy (%s)"
 
 #. fill selection
-#: ../app/tools/gimpbucketfilloptions.c:239
+#: ../app/tools/gimpbucketfilloptions.c:244
 #, c-format
 msgid "Affected Area  (%s)"
 msgstr "VÃng cà tÃc Äáng (%s)"
 
-#: ../app/tools/gimpbucketfilloptions.c:243
+#: ../app/tools/gimpbucketfilloptions.c:248
 msgid "Fill whole selection"
 msgstr "TÃ Äáy toÃn vÃng chán."
 
-#: ../app/tools/gimpbucketfilloptions.c:244
+#: ../app/tools/gimpbucketfilloptions.c:249
 msgid "Fill similar colors"
 msgstr "TÃ Äáy cÃc mÃu tÆÆng tá"
 
-#: ../app/tools/gimpbucketfilloptions.c:253
+#: ../app/tools/gimpbucketfilloptions.c:258
 msgid "Finding Similar Colors"
 msgstr "TÃm mÃu tÆÆng tá"
 
-#: ../app/tools/gimpbucketfilloptions.c:269
+#: ../app/tools/gimpbucketfilloptions.c:273
 msgid "Fill transparent areas"
 msgstr "TÃ Äáy cÃc vÃng trong suát"
 
-#: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:113
-#: ../app/tools/gimpcolorpickeroptions.c:150 ../app/tools/gimphealtool.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:963
-#: ../app/tools/gimpregionselectoptions.c:207
+#: ../app/tools/gimpbucketfilloptions.c:279 ../app/tools/gimpclonetool.c:114
+#: ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:99
+#: ../app/tools/gimpperspectiveclonetool.c:904
+#: ../app/tools/gimpregionselectoptions.c:209
 msgid "Sample merged"
 msgstr "Máu ÄÃ háp nhau"
 
-#: ../app/tools/gimpbucketfilloptions.c:294
+#: ../app/tools/gimpbucketfilloptions.c:298
 msgid "Fill by:"
 msgstr "TÃ báng:"
 
-#: ../app/tools/gimpbucketfilltool.c:85
+#: ../app/tools/gimpbucketfilltool.c:86
 msgid "Bucket Fill"
 msgstr "TÃ cÃi xÃ"
 
-#: ../app/tools/gimpbucketfilltool.c:86
+#: ../app/tools/gimpbucketfilltool.c:87
 #, fuzzy
 msgid "Bucket Fill Tool: Fill selected area with a color or pattern"
 msgstr "TÃ Äáy báng mÃu hay máu"
 
-#: ../app/tools/gimpbucketfilltool.c:87
+#: ../app/tools/gimpbucketfilltool.c:88
 msgid "_Bucket Fill"
 msgstr "TÃ Äáy _xÃ"
 
@@ -12971,6 +13182,33 @@ msgctxt "command"
 msgid "Select by Color"
 msgstr "Chán theo mÃu"
 
+#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1154
+#, fuzzy
+msgid "Cage Transform"
+msgstr "Chuyán dáng"
+
+#: ../app/tools/gimpcagetool.c:153
+msgid "Cage Transform: Deform a selection with a cage"
+msgstr ""
+
+#: ../app/tools/gimpcagetool.c:154
+#, fuzzy
+msgid "_Cage Transform"
+msgstr "Chu_yán dáng"
+
+#: ../app/tools/gimpcagetool.c:351
+msgid "Press ENTER to commit the transform"
+msgstr ""
+
+#: ../app/tools/gimpcagetool.c:1095
+msgid "Computing Cage Coefficients"
+msgstr ""
+
+#: ../app/tools/gimpcagetool.c:1272
+#, fuzzy
+msgid "Cage transform"
+msgstr "Chuyán dáng"
+
 #: ../app/tools/gimpclonetool.c:61
 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush"
 msgstr ""
@@ -12984,23 +13222,24 @@ msgstr "NhÃn ÄÃ_i"
 msgid "Click to clone"
 msgstr "Nhán Äá nhÃn ÄÃi"
 
-#: ../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 Äá Äát nguán nhÃn ÄÃi mái"
 
-#: ../app/tools/gimpclonetool.c:89
+#. Translators: the translation of "Click" must be the first word
+#: ../app/tools/gimpclonetool.c:90
 #, fuzzy
 msgid "Click to set a new clone source"
 msgstr "Nhán Äá Äát nguán nhÃn ÄÃi."
 
-#: ../app/tools/gimpclonetool.c:108
-#: ../app/tools/gimpperspectiveclonetool.c:958
+#: ../app/tools/gimpclonetool.c:109
+#: ../app/tools/gimpperspectiveclonetool.c:899
 msgid "Source"
 msgstr "Nguán"
 
-#: ../app/tools/gimpclonetool.c:129 ../app/tools/gimphealtool.c:110
-#: ../app/tools/gimpperspectiveclonetool.c:979
+#: ../app/tools/gimpclonetool.c:131 ../app/tools/gimphealtool.c:111
+#: ../app/tools/gimpperspectiveclonetool.c:921
 msgid "Alignment:"
 msgstr "Canh lá :"
 
@@ -13035,49 +13274,49 @@ msgstr "CÃn báng mÃu"
 msgid "Color Balance operates only on RGB color layers."
 msgstr "CÃn báng mÃu hoát Äáng chá trÃn láp mÃu RGB."
 
-#: ../app/tools/gimpcolorbalancetool.c:267
+#: ../app/tools/gimpcolorbalancetool.c:266
 msgid "Select Range to Adjust"
 msgstr "Chán phám vi cán chánh"
 
-#: ../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 "Chánh mác mÃu"
 
-#: ../app/tools/gimpcolorbalancetool.c:293
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/tools/gimpcolorbalancetool.c:292
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "Cyan"
 msgstr "Xanh lÃng mÃng"
 
-#: ../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 "Äá tÆÆi"
 
-#: ../app/tools/gimpcolorbalancetool.c:302
-#: ../app/tools/gimphuesaturationtool.c:251
+#: ../app/tools/gimpcolorbalancetool.c:301
+#: ../app/tools/gimphuesaturationtool.c:250
 msgid "Green"
 msgstr "Xanh là cÃy"
 
-#: ../app/tools/gimpcolorbalancetool.c:311
-#: ../app/tools/gimphuesaturationtool.c:250
+#: ../app/tools/gimpcolorbalancetool.c:310
+#: ../app/tools/gimphuesaturationtool.c:249
 msgid "Yellow"
 msgstr "VÃng"
 
-#: ../app/tools/gimpcolorbalancetool.c:311
-#: ../app/tools/gimphuesaturationtool.c:253
+#: ../app/tools/gimpcolorbalancetool.c:310
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "Blue"
 msgstr "Xanh dÆÆng"
 
-#: ../app/tools/gimpcolorbalancetool.c:322
+#: ../app/tools/gimpcolorbalancetool.c:321
 msgid "R_eset Range"
 msgstr "Äát lái phám _vi"
 
-#: ../app/tools/gimpcolorbalancetool.c:331
+#: ../app/tools/gimpcolorbalancetool.c:330
 msgid "Preserve _luminosity"
 msgstr "Báo tán Äá t_rÆng"
 
@@ -13110,253 +13349,282 @@ msgstr ""
 msgid "Colorize operates only on RGB color layers."
 msgstr "MÃu hÃa hoát Äáng chá trÃn láp mÃu RGB."
 
-#: ../app/tools/gimpcolorizetool.c:225
+#: ../app/tools/gimpcolorizetool.c:224
 msgid "Select Color"
 msgstr "Chán mÃu"
 
-#: ../app/tools/gimpcolorizetool.c:242
-#: ../app/tools/gimphuesaturationtool.c:385
+#: ../app/tools/gimpcolorizetool.c:241
+#: ../app/tools/gimphuesaturationtool.c:381
 msgid "_Hue:"
 msgstr "_Sác mÃu:"
 
-#: ../app/tools/gimpcolorizetool.c:257
-#: ../app/tools/gimphuesaturationtool.c:423
+#: ../app/tools/gimpcolorizetool.c:254
+#: ../app/tools/gimphuesaturationtool.c:413
 msgid "_Saturation:"
 msgstr "Äá _bÃo hÃa:"
 
-#: ../app/tools/gimpcolorizetool.c:272
-#: ../app/tools/gimphuesaturationtool.c:404
+#: ../app/tools/gimpcolorizetool.c:267
+#: ../app/tools/gimphuesaturationtool.c:397
 msgid "_Lightness:"
 msgstr "Äá _nhát:"
 
-#: ../app/tools/gimpcoloroptions.c:75
+#: ../app/tools/gimpcoloroptions.c:77
 #, fuzzy
 msgid "Color Picker Average Radius"
 msgstr "ThÃng tin bá chán lác mÃu"
 
-#: ../app/tools/gimpcoloroptions.c:161
+#: ../app/tools/gimpcoloroptions.c:157
+#: ../app/tools/gimprectangleselectoptions.c:163
+#: ../app/tools/gimpselectionoptions.c:277
+#: ../app/widgets/gimpbrusheditor.c:155
+#, fuzzy
+#| msgid "Radius:"
+msgid "Radius"
+msgstr "BÃn kÃnh:"
+
+#: ../app/tools/gimpcoloroptions.c:163
 msgid "Sample average"
 msgstr "Máu trung bÃnh"
 
-#: ../app/tools/gimpcoloroptions.c:171
-#: ../app/tools/gimprectangleselectoptions.c:175
-#: ../app/tools/gimpselectionoptions.c:280
-#: ../app/widgets/gimpbrusheditor.c:153
-msgid "Radius:"
-msgstr "BÃn kÃnh:"
+#: ../app/tools/gimpcolorpickeroptions.c:68
+#, fuzzy
+msgid "Use accumulated color value from all composited visible layers"
+msgstr "VÃng chán dáa vÃo mái láp hián thá"
+
+#: ../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 "Chá Äá chán lác (%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 "DÃng cáa sà thÃng tin (%s)"
 
-#: ../app/tools/gimpcolorpickertool.c:96
+#: ../app/tools/gimpcolorpickertool.c:93
 msgid "Color Picker"
 msgstr "Bá chán lác mÃu"
 
-#: ../app/tools/gimpcolorpickertool.c:97
+#: ../app/tools/gimpcolorpickertool.c:94
 #, fuzzy
 msgid "Color Picker Tool: Set colors from image pixels"
 msgstr "Chán lác mÃu tá ánh"
 
-#: ../app/tools/gimpcolorpickertool.c:98
+#: ../app/tools/gimpcolorpickertool.c:95
 msgid "C_olor Picker"
 msgstr "Bá kÃn mÃ_u"
 
-#: ../app/tools/gimpcolorpickertool.c:242
+#: ../app/tools/gimpcolorpickertool.c:228
 #, fuzzy
 msgid "Click in any image to view its color"
 msgstr "Nhán vÃo ánh nÃo Äá kÃn mÃu cánh gán."
 
-#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:493
+#: ../app/tools/gimpcolorpickertool.c:235 ../app/tools/gimppainttool.c:477
 #, fuzzy
 msgid "Click in any image to pick the foreground color"
 msgstr "Nhán vÃo ánh nÃo Äá kÃn mÃu cánh gán."
 
-#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:499
+#: ../app/tools/gimpcolorpickertool.c:243 ../app/tools/gimppainttool.c:483
 #, fuzzy
 msgid "Click in any image to pick the background color"
 msgstr "Nhán vÃo ánh nÃo Äá kÃn mÃu nán."
 
-#: ../app/tools/gimpcolorpickertool.c:265
+#: ../app/tools/gimpcolorpickertool.c:251
 #, fuzzy
 msgid "Click in any image to add the color to the palette"
 msgstr "Nhán vÃo ánh nÃo Äá kÃn mÃu cánh gán."
 
-#. tool->display->shell
-#: ../app/tools/gimpcolorpickertool.c:318
+#: ../app/tools/gimpcolorpickertool.c:306
 msgid "Color Picker Information"
 msgstr "ThÃng tin bá chán lác mÃu"
 
-#: ../app/tools/gimpcolortool.c:268 ../app/tools/gimpcolortool.c:446
+#: ../app/tools/gimpcolortool.c:229 ../app/tools/gimpcolortool.c:402
 msgid "Move Sample Point: "
 msgstr "Chuyán Äiám máu : "
 
-#: ../app/tools/gimpcolortool.c:438
+#: ../app/tools/gimpcolortool.c:394
 msgid "Remove Sample Point"
 msgstr "Gá bá Äiám máu"
 
-#: ../app/tools/gimpcolortool.c:439
+#: ../app/tools/gimpcolortool.c:395
 msgid "Cancel Sample Point"
 msgstr "ThÃi Äiám máu"
 
-#: ../app/tools/gimpcolortool.c:447
+#: ../app/tools/gimpcolortool.c:403
 msgid "Add Sample Point: "
 msgstr "ThÃm Äiám máu : "
 
-#: ../app/tools/gimpconvolvetool.c:72
+#: ../app/tools/gimpconvolvetool.c:73
 #, fuzzy
 msgid "Blur / Sharpen"
 msgstr "LÃm má hay MÃi sác"
 
-#: ../app/tools/gimpconvolvetool.c:73
+#: ../app/tools/gimpconvolvetool.c:74
 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush"
 msgstr ""
 
-#: ../app/tools/gimpconvolvetool.c:74
+#: ../app/tools/gimpconvolvetool.c:75
 #, fuzzy
 msgid "Bl_ur / Sharpen"
 msgstr "LÃm má hay MÃi sác"
 
-#: ../app/tools/gimpconvolvetool.c:169
+#: ../app/tools/gimpconvolvetool.c:184
 #, fuzzy
 msgid "Click to blur"
 msgstr "Nhán Äá che má."
 
-#: ../app/tools/gimpconvolvetool.c:170
+#: ../app/tools/gimpconvolvetool.c:185
 #, fuzzy
 msgid "Click to blur the line"
 msgstr "Nhán Äá che má ÄÆáng."
 
-#: ../app/tools/gimpconvolvetool.c:171
+#: ../app/tools/gimpconvolvetool.c:186
 #, c-format
 msgid "%s to sharpen"
 msgstr "%s Äá mÃi sác"
 
-#: ../app/tools/gimpconvolvetool.c:175
+#: ../app/tools/gimpconvolvetool.c:190
 #, fuzzy
 msgid "Click to sharpen"
 msgstr "Nhán Äá mÃi sác"
 
-#: ../app/tools/gimpconvolvetool.c:176
+#: ../app/tools/gimpconvolvetool.c:191
 #, fuzzy
 msgid "Click to sharpen the line"
 msgstr "Nhán Äá mÃi sác ÄÆáng."
 
-#: ../app/tools/gimpconvolvetool.c:177
+#: ../app/tools/gimpconvolvetool.c:192
 #, c-format
 msgid "%s to blur"
 msgstr "%s Äá che má"
 
 #. the type radio box
-#: ../app/tools/gimpconvolvetool.c:198
+#: ../app/tools/gimpconvolvetool.c:216
 #, c-format
 msgid "Convolve Type  (%s)"
 msgstr "Kiáu quán lái (%s)"
 
-#: ../app/tools/gimpcropoptions.c:160
+#: ../app/tools/gimpcropoptions.c:76
+#: ../app/tools/gimprectangleselectoptions.c:77
+#, fuzzy
+msgid "Dim everything outside selection"
+msgstr "Äáo vÃng chán"
+
+#: ../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 "Chá láp hián cÃ"
 
-#: ../app/tools/gimpcropoptions.c:166
+#: ../app/tools/gimpcropoptions.c:170
 msgid "Allow growing"
 msgstr ""
 
-#: ../app/tools/gimpcroptool.c:127
+#: ../app/tools/gimpcroptool.c:117
 msgid "Crop"
 msgstr "XÃn"
 
-#: ../app/tools/gimpcroptool.c:128
+#: ../app/tools/gimpcroptool.c:118
 msgid "Crop Tool: Remove edge areas from image or layer"
 msgstr ""
 
-#: ../app/tools/gimpcroptool.c:129
+#: ../app/tools/gimpcroptool.c:119
 #, fuzzy
 msgid "_Crop"
 msgstr "XÃn"
 
-#: ../app/tools/gimpcroptool.c:271
+#: ../app/tools/gimpcroptool.c:253
 #, fuzzy
 msgid "Click or press Enter to crop"
 msgstr "Nháp chuát hay bám phÃm Enter Äá xÃn."
 
-#: ../app/tools/gimpcroptool.c:328
+#: ../app/tools/gimpcroptool.c:318
 #, fuzzy
 msgid "There is no active layer to crop."
 msgstr "KhÃng cà láp hoát Äáng hoác kÃnh nÃo tá Äà cán cát."
 
-#: ../app/tools/gimpcurvestool.c:140
+#: ../app/tools/gimpcurvestool.c:150
 msgid "Curves"
 msgstr "Cong"
 
-#: ../app/tools/gimpcurvestool.c:141
+#: ../app/tools/gimpcurvestool.c:151
 #, fuzzy
 msgid "Curves Tool: Adjust color curves"
 msgstr "Chánh cong mÃu"
 
-#: ../app/tools/gimpcurvestool.c:142
+#: ../app/tools/gimpcurvestool.c:152
 msgid "_Curves..."
 msgstr "_Cong..."
 
-#: ../app/tools/gimpcurvestool.c:168
+#: ../app/tools/gimpcurvestool.c:178
 msgid "Adjust Color Curves"
 msgstr "Chánh cong mÃu"
 
-#: ../app/tools/gimpcurvestool.c:170
+#: ../app/tools/gimpcurvestool.c:180
 #, fuzzy
 msgid "Import Curves"
 msgstr "Tái cong"
 
-#: ../app/tools/gimpcurvestool.c:171
+#: ../app/tools/gimpcurvestool.c:181
 #, fuzzy
 msgid "Export Curves"
 msgstr "Tái cong"
 
-#: ../app/tools/gimpcurvestool.c:222
+#: ../app/tools/gimpcurvestool.c:232
 #, fuzzy
 msgid "Curves does not operate on indexed layers."
 msgstr "Viác Äáo khÃng hoát Äáng trÃn láp ÄÃ phá lác."
 
-#: ../app/tools/gimpcurvestool.c:330
+#: ../app/tools/gimpcurvestool.c:340
 #, fuzzy
 msgid "Click to add a control point"
 msgstr "Nháp chuát Äá thÃm mát Äiám Äiáu khián."
 
-#: ../app/tools/gimpcurvestool.c:335
+#: ../app/tools/gimpcurvestool.c:345
 #, fuzzy
 msgid "Click to add control points to all channels"
 msgstr "Nháp Äá thÃm Äiám Äiáu khián vÃo mái kÃnh"
 
-#: ../app/tools/gimpcurvestool.c:340
+#: ../app/tools/gimpcurvestool.c:350
 msgid "Click to locate on curve (try Shift, Ctrl)"
 msgstr ""
 
-#: ../app/tools/gimpcurvestool.c:453 ../app/tools/gimplevelstool.c:384
+#: ../app/tools/gimpcurvestool.c:463 ../app/tools/gimplevelstool.c:384
 msgid "Cha_nnel:"
 msgstr "KÃ_nh:"
 
-#: ../app/tools/gimpcurvestool.c:479 ../app/tools/gimplevelstool.c:408
+#: ../app/tools/gimpcurvestool.c:489 ../app/tools/gimplevelstool.c:408
 msgid "R_eset Channel"
 msgstr "Äát _lái kÃnh"
 
-#: ../app/tools/gimpcurvestool.c:571 ../app/widgets/gimpdeviceinfoeditor.c:460
+#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:458
 #, fuzzy
 msgid "Curve _type:"
 msgstr "Kiáu cong"
 
-#: ../app/tools/gimpcurvestool.c:646 ../app/tools/gimplevelstool.c:756
+#: ../app/tools/gimpcurvestool.c:658 ../app/tools/gimplevelstool.c:756
 #, fuzzy, c-format
 msgid "Could not read header from '%s': %s"
 msgstr "KhÃng thá Äác %d byte tá Â %s Â: %s"
 
-#: ../app/tools/gimpcurvestool.c:719
+#: ../app/tools/gimpcurvestool.c:731
 msgid "Use _old curves file format"
 msgstr ""
 
@@ -13383,89 +13651,91 @@ msgstr "Viác giám bÃo hoà mÃu sác hoát Äáng chá trÃn láp mÃu
 msgid "Choose shade of gray based on:"
 msgstr "HÃy chán sác mÃu xÃm dáa vÃo :"
 
-#: ../app/tools/gimpdodgeburntool.c:72
+#: ../app/tools/gimpdodgeburntool.c:73
 #, fuzzy
 msgid "Dodge / Burn"
 msgstr "TrÃnh/ChÃy"
 
-#: ../app/tools/gimpdodgeburntool.c:73
+#: ../app/tools/gimpdodgeburntool.c:74
 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush"
 msgstr ""
 
-#: ../app/tools/gimpdodgeburntool.c:74
+#: ../app/tools/gimpdodgeburntool.c:75
 #, fuzzy
 msgid "Dod_ge / Burn"
 msgstr "TrÃnhChÃ_y"
 
-#: ../app/tools/gimpdodgeburntool.c:172
+#: ../app/tools/gimpdodgeburntool.c:187
 #, fuzzy
 msgid "Click to dodge"
 msgstr "Nhán Äá nà trÃnh."
 
-#: ../app/tools/gimpdodgeburntool.c:173
+#: ../app/tools/gimpdodgeburntool.c:188
 #, fuzzy
 msgid "Click to dodge the line"
 msgstr "Nhán Äá nà trÃnh ÄÆáng."
 
-#: ../app/tools/gimpdodgeburntool.c:174
+#: ../app/tools/gimpdodgeburntool.c:189
 #, c-format
 msgid "%s to burn"
 msgstr "%s Äá Äát"
 
-#: ../app/tools/gimpdodgeburntool.c:178
+#: ../app/tools/gimpdodgeburntool.c:193
 #, fuzzy
 msgid "Click to burn"
 msgstr "Nhán Äá Äát."
 
-#: ../app/tools/gimpdodgeburntool.c:179
+#: ../app/tools/gimpdodgeburntool.c:194
 #, fuzzy
 msgid "Click to burn the line"
 msgstr "Nhán Äá Äát ÄÆáng."
 
-#: ../app/tools/gimpdodgeburntool.c:180
+#: ../app/tools/gimpdodgeburntool.c:195
 #, c-format
 msgid "%s to dodge"
 msgstr "%s Äá nà trÃnh"
 
 #. the type (dodge or burn)
-#: ../app/tools/gimpdodgeburntool.c:201
+#: ../app/tools/gimpdodgeburntool.c:219
 #, c-format
 msgid "Type  (%s)"
 msgstr "Kiáu (%s)"
 
 #. mode (highlights, midtones, or shadows)
-#: ../app/tools/gimpdodgeburntool.c:212
+#: ../app/tools/gimpdodgeburntool.c:230
 msgid "Range"
 msgstr ""
 
-#: ../app/tools/gimpdodgeburntool.c:224
-msgid "Exposure:"
+#: ../app/tools/gimpdodgeburntool.c:236
+#, fuzzy
+#| msgid "Exposure:"
+msgid "Exposure"
 msgstr "PhÆi náng:"
 
-#: ../app/tools/gimpeditselectiontool.c:240
+#: ../app/tools/gimpeditselectiontool.c:244
 msgid "Move Selection"
 msgstr "Chuyán vÃng chán"
 
-#: ../app/tools/gimpeditselectiontool.c:244
-#: ../app/tools/gimpeditselectiontool.c:1233
+#: ../app/tools/gimpeditselectiontool.c:248
+#: ../app/tools/gimpeditselectiontool.c:1243
 msgid "Move Floating Selection"
 msgstr "Chuyán vÃng chán nái"
 
-#: ../app/tools/gimpeditselectiontool.c:453
-#: ../app/tools/gimpeditselectiontool.c:728
+#: ../app/tools/gimpeditselectiontool.c:457
+#: ../app/tools/gimpeditselectiontool.c:734
 msgid "Move: "
 msgstr "Chuyán: "
 
-#: ../app/tools/gimpellipseselecttool.c:68
+#: ../app/tools/gimpellipseselecttool.c:66
 msgid "Ellipse Select"
 msgstr "Chán hÃnh báu dác"
 
-#: ../app/tools/gimpellipseselecttool.c:69
+#: ../app/tools/gimpellipseselecttool.c:67
 #, fuzzy
 msgid "Ellipse Select Tool: Select an elliptical region"
 msgstr "Chán vÃng hÃnh báu dác"
 
-#: ../app/tools/gimpellipseselecttool.c:70
+#: ../app/tools/gimpellipseselecttool.c:68
 msgid "_Ellipse Select"
 msgstr "Chán _báu dác"
 
@@ -13499,44 +13769,71 @@ msgstr "%s Äá chán mÃu nán"
 msgid "Anti erase  (%s)"
 msgstr "Cháng xÃa (%s)"
 
-#: ../app/tools/gimpflipoptions.c:129
+#: ../app/tools/gimpflipoptions.c:66
+#, fuzzy
+msgid "Direction of flipping"
+msgstr "MÃ tá"
+
+#: ../app/tools/gimpflipoptions.c:133
 msgid "Affect:"
 msgstr "ánh hÆáng:"
 
 #. tool toggle
-#: ../app/tools/gimpflipoptions.c:138
+#: ../app/tools/gimpflipoptions.c:142
 #, c-format
 msgid "Flip Type  (%s)"
 msgstr "Kiáu lát (%s)"
 
-#: ../app/tools/gimpfliptool.c:79
+#: ../app/tools/gimpfliptool.c:84
 msgid "Flip"
 msgstr "Lát"
 
-#: ../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 "_Lát"
 
-#: ../app/tools/gimpfliptool.c:116
+#: ../app/tools/gimpfliptool.c:187
 #, fuzzy
-msgctxt "command"
+msgctxt "undo-type"
+msgid "Flip horizontally"
+msgstr "Lát ngang"
+
+#: ../app/tools/gimpfliptool.c:190
+#, fuzzy
+msgctxt "undo-type"
+msgid "Flip vertically"
+msgstr "Lát dác"
+
+#. probably this is not actually reached today, but
+#. * could be if someone defined FLIP_DIAGONAL, say...
+#.
+#: ../app/tools/gimpfliptool.c:196
+#, fuzzy
+#| msgid "Flip"
+msgctxt "undo-desc"
 msgid "Flip"
 msgstr "Lát"
 
-#: ../app/tools/gimpforegroundselectoptions.c:84
+#: ../app/tools/gimpforegroundselectoptions.c:85
 msgid "Select a single contiguous area"
 msgstr "Chán mát vÃng ká nhau riÃng lá"
 
-#: ../app/tools/gimpforegroundselectoptions.c:95
+#: ../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 "KÃch thÆác cáa bÃt vá ÄÆác dÃng cho tinh chá."
 
-#: ../app/tools/gimpforegroundselectoptions.c:101
+#: ../app/tools/gimpforegroundselectoptions.c:104
 msgid ""
 "Smaller values give a more accurate selection border but may introduce holes "
 "in the selection"
@@ -13544,117 +13841,121 @@ msgstr ""
 "Già trá nhá hÆn cho vián chán chÃnh xÃc hÆn, mà cà thá giái thiáu lá vÃo "
 "vÃng chán."
 
-#: ../app/tools/gimpforegroundselectoptions.c:120
+#: ../app/tools/gimpforegroundselectoptions.c:112
+msgid "Color of selection preview mask"
+msgstr ""
+
+#: ../app/tools/gimpforegroundselectoptions.c:124
 msgid "Sensitivity for brightness component"
 msgstr "Äá nháy cho thÃnh phán Äá sÃng"
 
-#: ../app/tools/gimpforegroundselectoptions.c:126
+#: ../app/tools/gimpforegroundselectoptions.c:130
 msgid "Sensitivity for red/green component"
 msgstr "Äá nháy cho thÃnh phán xanh là cÃy"
 
-#: ../app/tools/gimpforegroundselectoptions.c:132
+#: ../app/tools/gimpforegroundselectoptions.c:136
 msgid "Sensitivity for yellow/blue component"
 msgstr "Äá nháy cho thÃnh phán vÃng/xanh dÆÆng"
 
 #. single / multiple objects
-#: ../app/tools/gimpforegroundselectoptions.c:275
+#: ../app/tools/gimpforegroundselectoptions.c:281
 msgid "Contiguous"
 msgstr "Ká nhau"
 
 #. foreground / background
-#: ../app/tools/gimpforegroundselectoptions.c:280
+#: ../app/tools/gimpforegroundselectoptions.c:286
 #, c-format
 msgid "Interactive refinement  (%s)"
 msgstr "Tinh chá tÆÆng tÃc (%s)"
 
-#: ../app/tools/gimpforegroundselectoptions.c:284
+#: ../app/tools/gimpforegroundselectoptions.c:290
 msgid "Mark background"
 msgstr "ÄÃnh dáu nán"
 
-#: ../app/tools/gimpforegroundselectoptions.c:285
+#: ../app/tools/gimpforegroundselectoptions.c:291
 msgid "Mark foreground"
 msgstr "ÄÃnh dáu cánh gán"
 
-#: ../app/tools/gimpforegroundselectoptions.c:301
+#: ../app/tools/gimpforegroundselectoptions.c:307
 msgid "Small brush"
 msgstr "BÃt vá nhá"
 
-#: ../app/tools/gimpforegroundselectoptions.c:309
+#: ../app/tools/gimpforegroundselectoptions.c:315
 msgid "Large brush"
 msgstr "BÃt vá lán"
 
-#: ../app/tools/gimpforegroundselectoptions.c:333
+#: ../app/tools/gimpforegroundselectoptions.c:338
 msgid "Smoothing:"
 msgstr "LÃm mán:"
 
-#: ../app/tools/gimpforegroundselectoptions.c:339
+#: ../app/tools/gimpforegroundselectoptions.c:344
 msgid "Preview color:"
 msgstr "MÃu xem thá :"
 
 #. granularity
-#: ../app/tools/gimpforegroundselectoptions.c:342
+#: ../app/tools/gimpforegroundselectoptions.c:347
 msgid "Color Sensitivity"
 msgstr "Äá nháy mÃu"
 
-#: ../app/tools/gimpforegroundselecttool.c:146
+#: ../app/tools/gimpforegroundselecttool.c:144
 msgid "Foreground Select"
 msgstr "Chán cánh gán"
 
-#: ../app/tools/gimpforegroundselecttool.c:147
+#: ../app/tools/gimpforegroundselecttool.c:145
 msgid "Foreground Select Tool: Select a region containing foreground objects"
 msgstr ""
 
-#: ../app/tools/gimpforegroundselecttool.c:148
+#: ../app/tools/gimpforegroundselecttool.c:146
 msgid "F_oreground Select"
 msgstr "Chán cánh _gán"
 
-#: ../app/tools/gimpforegroundselecttool.c:315
+#: ../app/tools/gimpforegroundselecttool.c:302
 msgid "Add more strokes or press Enter to accept the selection"
 msgstr "ThÃm nÃt vá náa hoác bám phÃm Enter Äá cháp nhán vÃng chán hián cÃ."
 
-#: ../app/tools/gimpforegroundselecttool.c:317
+#: ../app/tools/gimpforegroundselecttool.c:304
 msgid "Mark foreground by painting on the object to extract"
 msgstr "ÄÃnh dáu cánh gán báng cÃch sÆn vÃo Äái tÆáng cán chiát."
 
-#: ../app/tools/gimpforegroundselecttool.c:328
+#: ../app/tools/gimpforegroundselecttool.c:309
 #, fuzzy
 msgid "Roughly outline the object to extract"
 msgstr "Vá mát hÃnh trÃn xáp xá á quanh Äái tÆáng cán chiát."
 
-#: ../app/tools/gimpforegroundselecttool.c:774
+#: ../app/tools/gimpforegroundselecttool.c:751
 #, fuzzy
 msgctxt "command"
 msgid "Foreground Select"
 msgstr "Chán cánh gán"
 
-#: ../app/tools/gimpfreeselecttool.c:200
+#: ../app/tools/gimpfreeselecttool.c:197
 msgid ""
 "Free Select Tool: Select a hand-drawn region with free and polygonal segments"
 msgstr ""
 
-#: ../app/tools/gimpfreeselecttool.c:201
+#: ../app/tools/gimpfreeselecttool.c:198
 msgid "_Free Select"
 msgstr "Chán tá d_o"
 
-#: ../app/tools/gimpfreeselecttool.c:1120
+#: ../app/tools/gimpfreeselecttool.c:1031
 #, fuzzy
 msgid "Click to complete selection"
 msgstr "Nhán-kÃo Äá táo mát vÃng chán mái."
 
-#: ../app/tools/gimpfreeselecttool.c:1124
+#: ../app/tools/gimpfreeselecttool.c:1035
 #, fuzzy
 msgid "Click-Drag to move segment vertex"
 msgstr "Nhán-kÃo Äá di chuyán thÃnh phán chung quanh."
 
-#: ../app/tools/gimpfreeselecttool.c:1129
+#: ../app/tools/gimpfreeselecttool.c:1040
 msgid "Return commits, Escape cancels, Backspace removes last segment"
 msgstr ""
 
-#: ../app/tools/gimpfreeselecttool.c:1133
+#: ../app/tools/gimpfreeselecttool.c:1044
 msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
 msgstr ""
 
-#: ../app/tools/gimpfreeselecttool.c:1643
+#: ../app/tools/gimpfreeselecttool.c:1563
 #, fuzzy
 msgctxt "command"
 msgid "Free Select"
@@ -13696,17 +13997,17 @@ msgstr "Má Äá_a chá..."
 msgid "GEGL operations do not operate on indexed layers."
 msgstr "Viác Äáo khÃng hoát Äáng trÃn láp ÄÃ phá lác."
 
-#: ../app/tools/gimpgegltool.c:371
+#: ../app/tools/gimpgegltool.c:377
 #, fuzzy
 msgid "_Operation:"
 msgstr "Äá _bÃo hÃa:"
 
 #. The options vbox
-#: ../app/tools/gimpgegltool.c:430
+#: ../app/tools/gimpgegltool.c:436
 msgid "Operation Settings"
 msgstr ""
 
-#: ../app/tools/gimpgegltool.c:435
+#: ../app/tools/gimpgegltool.c:441
 #, fuzzy
 msgid "Select an operation from the list above"
 msgstr "Gá bá mái thao tÃc ra lÆác sá háy bÆác"
@@ -13724,12 +14025,13 @@ msgstr ""
 msgid "Click to heal"
 msgstr "Nhán Äá xoÃ."
 
-#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:81
+#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:82
 #, fuzzy, c-format
 msgid "%s to set a new heal source"
 msgstr "%s Äá Äát nguán nhÃn ÄÃi mái"
 
-#: ../app/tools/gimphealtool.c:80
+#. Translators: the translation of "Click" must be the first word
+#: ../app/tools/gimphealtool.c:81
 #, fuzzy
 msgid "Click to set a new heal source"
 msgstr "%s%sNhán Äá Äát nguán nhÃn ÄÃi."
@@ -13764,102 +14066,105 @@ msgstr "Sác mÃu-Äá bÃo hÃa"
 msgid "Hue-Saturation operates only on RGB color layers."
 msgstr "Sác mÃu-Äá bÃo hoà hoát Äáng chá trÃn láp mÃu RGB."
 
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/tools/gimphuesaturationtool.c:247
 msgid "M_aster"
 msgstr "_ChÃnh"
 
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/tools/gimphuesaturationtool.c:247
 msgid "Adjust all colors"
 msgstr "Chánh mái mÃu"
 
-#: ../app/tools/gimphuesaturationtool.c:249
+#: ../app/tools/gimphuesaturationtool.c:248
 msgid "_R"
 msgstr "_MÄ"
 
-#: ../app/tools/gimphuesaturationtool.c:250
+#: ../app/tools/gimphuesaturationtool.c:249
 msgid "_Y"
 msgstr "_V"
 
-#: ../app/tools/gimphuesaturationtool.c:251
+#: ../app/tools/gimphuesaturationtool.c:250
 msgid "_G"
 msgstr "_XLC"
 
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "_C"
 msgstr "XL_M"
 
-#: ../app/tools/gimphuesaturationtool.c:253
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "_B"
 msgstr "_XD"
 
-#: ../app/tools/gimphuesaturationtool.c:254
+#: ../app/tools/gimphuesaturationtool.c:253
 msgid "_M"
 msgstr "Ä_T"
 
-#: ../app/tools/gimphuesaturationtool.c:259
+#: ../app/tools/gimphuesaturationtool.c:258
 msgid "Select Primary Color to Adjust"
 msgstr "Chán mÃu chÃnh cán Äiáu chánh"
 
-#: ../app/tools/gimphuesaturationtool.c:349
+#: ../app/tools/gimphuesaturationtool.c:348
 msgid "_Overlap:"
 msgstr "Cháng lá_p:"
 
-#: ../app/tools/gimphuesaturationtool.c:368
+#: ../app/tools/gimphuesaturationtool.c:364
 msgid "Adjust Selected Color"
 msgstr "Chánh mÃu ÄÃ chán"
 
-#: ../app/tools/gimphuesaturationtool.c:444
+#: ../app/tools/gimphuesaturationtool.c:431
 msgid "R_eset Color"
 msgstr "Äát _lái mÃu"
 
-#: ../app/tools/gimpimagemaptool-settings.c:80
+#: ../app/tools/gimpimagemaptool-settings.c:81
 msgid "Pre_sets:"
 msgstr ""
 
-#: ../app/tools/gimpimagemaptool-settings.c:222
+#: ../app/tools/gimpimagemaptool-settings.c:223
 #, fuzzy, c-format
 msgid "Settings saved to '%s'"
 msgstr "Äang khái cháy phán má ráng: Â %s Â\n"
 
-#: ../app/tools/gimpimagemaptool.c:367
+#: ../app/tools/gimpimagemaptool.c:362
 msgid "_Preview"
 msgstr "_Xem thá"
 
 #. adjust sliders
-#: ../app/tools/gimpinkoptions-gui.c:55
+#: ../app/tools/gimpinkoptions-gui.c:54
 msgid "Adjustment"
 msgstr "Äiáu chánh"
 
-#: ../app/tools/gimpinkoptions-gui.c:67 ../app/tools/gimpinkoptions-gui.c:92
-#: ../app/tools/gimprectangleoptions.c:972 ../app/tools/gimptextoptions.c:489
-msgid "Size:"
-msgstr "Cá :"
+#: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87
+#: ../app/tools/gimppaintoptions-gui.c:134
+#, fuzzy
+msgid "Size"
+msgstr "Cá"
 
-#: ../app/tools/gimpinkoptions-gui.c:75 ../app/tools/gimpmeasuretool.c:1060
-#: ../app/tools/gimppaintoptions-gui.c:137
-#: ../app/widgets/gimpbrusheditor.c:207
-msgid "Angle:"
+#: ../app/tools/gimpinkoptions-gui.c:71
+#: ../app/tools/gimppaintoptions-gui.c:183
+#: ../app/widgets/gimpbrusheditor.c:199
+#, fuzzy
+msgid "Angle"
 msgstr "GÃc:"
 
 #. sens sliders
-#: ../app/tools/gimpinkoptions-gui.c:80
+#: ../app/tools/gimpinkoptions-gui.c:77
 msgid "Sensitivity"
 msgstr "Äá nháy"
 
-#: ../app/tools/gimpinkoptions-gui.c:99
-msgid "Tilt:"
+#: ../app/tools/gimpinkoptions-gui.c:94
+#: ../app/widgets/gimpdynamicseditor.c:144
+#: ../app/widgets/gimpdynamicsoutputeditor.c:71
+#, fuzzy
+msgid "Tilt"
 msgstr "NghiÃng:"
 
-#: ../app/tools/gimpinkoptions-gui.c:106
-msgid "Speed:"
+#: ../app/tools/gimpinkoptions-gui.c:101
+#, fuzzy
+#| msgid "Speed:"
+msgid "Speed"
 msgstr "Tác Äá:"
 
-#: ../app/tools/gimpinkoptions-gui.c:117
-msgid "Type"
-msgstr "Kiáu"
-
-#. Blob shape widget
-#: ../app/tools/gimpinkoptions-gui.c:148
+#. Blob shape widgets
+#: ../app/tools/gimpinkoptions-gui.c:107
 msgid "Shape"
 msgstr "HÃnh"
 
@@ -13871,54 +14176,59 @@ msgstr ""
 msgid "In_k"
 msgstr "_Mác"
 
-#: ../app/tools/gimpiscissorsoptions.c:125
+#: ../app/tools/gimpiscissorsoptions.c:68
+#, fuzzy
+msgid "Display future selection segment as you drag a control node"
+msgstr "Hián thá nÃt ngoÃi vÃng chán"
+
+#: ../app/tools/gimpiscissorsoptions.c:127
 #, fuzzy
 msgid "Interactive boundary"
 msgstr "Hián ranh giái tÆÆng tÃc"
 
-#: ../app/tools/gimpiscissorstool.c:279
+#: ../app/tools/gimpiscissorstool.c:275
 msgid "Scissors"
 msgstr "KÃo cát"
 
-#: ../app/tools/gimpiscissorstool.c:280
+#: ../app/tools/gimpiscissorstool.c:276
 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting"
 msgstr ""
 
-#: ../app/tools/gimpiscissorstool.c:281
+#: ../app/tools/gimpiscissorstool.c:277
 msgid "Intelligent _Scissors"
 msgstr "_KÃo cát thÃng minh"
 
-#: ../app/tools/gimpiscissorstool.c:931 ../app/tools/gimpmeasuretool.c:617
+#: ../app/tools/gimpiscissorstool.c:900 ../app/tools/gimpmeasuretool.c:605
 #, fuzzy
 msgid "Click-Drag to move this point"
 msgstr "Nháp-kÃo Äá di chuyán ÄÆáng dán quanh."
 
-#: ../app/tools/gimpiscissorstool.c:933 ../app/tools/gimpiscissorstool.c:997
+#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpiscissorstool.c:967
 #, c-format
 msgid "%s: disable auto-snap"
 msgstr ""
 
-#: ../app/tools/gimpiscissorstool.c:949
+#: ../app/tools/gimpiscissorstool.c:919
 #, fuzzy
 msgid "Click to close the curve"
 msgstr "Nhán Äá Äát nguán nhÃn ÄÃi."
 
-#: ../app/tools/gimpiscissorstool.c:955
+#: ../app/tools/gimpiscissorstool.c:925
 #, fuzzy
 msgid "Click to add a point on this segment"
 msgstr "Nháp chuát Äá thÃm mát Äiám Äiáu khián."
 
-#: ../app/tools/gimpiscissorstool.c:969
+#: ../app/tools/gimpiscissorstool.c:939
 #, fuzzy
 msgid "Click or press Enter to convert to a selection"
 msgstr "Nháp chuát hay bám phÃm Enter Äá xÃn."
 
-#: ../app/tools/gimpiscissorstool.c:979
+#: ../app/tools/gimpiscissorstool.c:949
 #, fuzzy
 msgid "Press Enter to convert to a selection"
 msgstr "ThÃm nÃt vá náa hoác bám phÃm Enter Äá cháp nhán vÃng chán hián cÃ."
 
-#: ../app/tools/gimpiscissorstool.c:994
+#: ../app/tools/gimpiscissorstool.c:964
 #, fuzzy
 msgid "Click or Click-Drag to add a point"
 msgstr "Nháp chuát Äá thÃm mát Äiám Äiáu khián."
@@ -13994,90 +14304,110 @@ msgstr ""
 msgid "Use _old levels file format"
 msgstr ""
 
-#: ../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 "Tá Äáng Äái cá cáa sá"
 
 #. tool toggle
-#: ../app/tools/gimpmagnifyoptions.c:171 ../app/tools/gimpmoveoptions.c:187
-#, c-format
-msgid "Tool Toggle  (%s)"
-msgstr "Bát tát cÃng cá (%s)"
+#: ../app/tools/gimpmagnifyoptions.c:177
+#, fuzzy, c-format
+msgid "Direction  (%s)"
+msgstr "MÃ tá"
 
-#: ../app/tools/gimpmagnifytool.c:87
+#: ../app/tools/gimpmagnifytool.c:91
 msgid "Zoom"
 msgstr "Thu phÃng"
 
-#: ../app/tools/gimpmagnifytool.c:88
+#: ../app/tools/gimpmagnifytool.c:92
 msgid "Zoom Tool: Adjust the zoom level"
 msgstr ""
 
-#: ../app/tools/gimpmagnifytool.c:89
+#: ../app/tools/gimpmagnifytool.c:93
 #, fuzzy
 msgctxt "tool"
 msgid "_Zoom"
 msgstr "Thu _phÃng"
 
-#: ../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 "DÃng cáa sà thÃng tin"
 
-#: ../app/tools/gimpmeasuretool.c:125
+#: ../app/tools/gimpmeasuretool.c:127
 msgid "Measure"
 msgstr "Äo"
 
-#: ../app/tools/gimpmeasuretool.c:126
+#: ../app/tools/gimpmeasuretool.c:128
 #, fuzzy
 msgid "Measure Tool: Measure distances and angles"
 msgstr "Äo khoáng cÃch và gÃc"
 
-#: ../app/tools/gimpmeasuretool.c:127
+#: ../app/tools/gimpmeasuretool.c:129
 msgid "_Measure"
 msgstr "Ä_o"
 
-#: ../app/tools/gimpmeasuretool.c:246
+#: ../app/tools/gimpmeasuretool.c:247
 msgid "Add Guides"
 msgstr "ThÃm nÃt dán"
 
-#: ../app/tools/gimpmeasuretool.c:568
+#: ../app/tools/gimpmeasuretool.c:313
+#, fuzzy
+msgid "Drag to create a line"
+msgstr "Nhán-kÃo Äá táo mát vÃng chán mái."
+
+#: ../app/tools/gimpmeasuretool.c:560
 msgid "Click to place vertical and horizontal guides"
 msgstr ""
 
-#: ../app/tools/gimpmeasuretool.c:577
+#: ../app/tools/gimpmeasuretool.c:568
 #, fuzzy
 msgid "Click to place a horizontal guide"
 msgstr "Chán láp hay nÃt dán"
 
-#: ../app/tools/gimpmeasuretool.c:592
+#: ../app/tools/gimpmeasuretool.c:582
 #, fuzzy
 msgid "Click to place a vertical guide"
 msgstr "Chán láp hay nÃt dán"
 
-#: ../app/tools/gimpmeasuretool.c:606
+#: ../app/tools/gimpmeasuretool.c:595
 #, fuzzy
 msgid "Click-Drag to add a new point"
 msgstr "Nháp chuát Äá thÃm mát Äiám Äiáu khián."
 
-#: ../app/tools/gimpmeasuretool.c:637
+#: ../app/tools/gimpmeasuretool.c:624
 #, fuzzy
 msgid "Click-Drag to move all points"
 msgstr "Nhán-kÃo Äá di chuyán mÃc chung quanh."
 
-#: ../app/tools/gimpmeasuretool.c:898 ../app/tools/gimpmeasuretool.c:1043
-#: ../app/tools/gimpmeasuretool.c:1099 ../app/tools/gimpmeasuretool.c:1127
-#: ../app/tools/gimppainttool.c:643
+#: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084
+#: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168
+#: ../app/tools/gimppainttool.c:632
 msgid "pixels"
 msgstr "Äiám ánh"
 
-#. tool->display->shell
-#: ../app/tools/gimpmeasuretool.c:1011
+#: ../app/tools/gimpmeasuretool.c:1052
 msgid "Measure Distances and Angles"
 msgstr "Äo khoáng cÃch và gÃc"
 
-#: ../app/tools/gimpmeasuretool.c:1032
+#: ../app/tools/gimpmeasuretool.c:1073
 msgid "Distance:"
 msgstr "Khoáng cÃch:"
 
+#: ../app/tools/gimpmeasuretool.c:1101
+msgid "Angle:"
+msgstr "GÃc:"
+
 #: ../app/tools/gimpmoveoptions.c:139
 msgid "Pick a layer or guide"
 msgstr "Chán láp hay nÃt dán"
@@ -14103,33 +14433,39 @@ msgstr "Chuyán ÄÆáng dán hoát Äáng"
 msgid "Move:"
 msgstr "Chuyán: "
 
-#: ../app/tools/gimpmovetool.c:129
+#. tool toggle
+#: ../app/tools/gimpmoveoptions.c:187
+#, c-format
+msgid "Tool Toggle  (%s)"
+msgstr "Bát tát cÃng cá (%s)"
+
+#: ../app/tools/gimpmovetool.c:127
 #, fuzzy
 msgctxt "tool"
 msgid "Move"
 msgstr "Chuyán"
 
-#: ../app/tools/gimpmovetool.c:130
+#: ../app/tools/gimpmovetool.c:128
 msgid "Move Tool: Move layers, selections, and other objects"
 msgstr ""
 
-#: ../app/tools/gimpmovetool.c:131
+#: ../app/tools/gimpmovetool.c:129
 msgid "_Move"
 msgstr "Chu_yán"
 
-#: ../app/tools/gimpmovetool.c:285 ../app/tools/gimpmovetool.c:580
+#: ../app/tools/gimpmovetool.c:247 ../app/tools/gimpmovetool.c:552
 msgid "Move Guide: "
 msgstr "Chuyán nÃt dán: "
 
-#: ../app/tools/gimpmovetool.c:574
+#: ../app/tools/gimpmovetool.c:546
 msgid "Remove Guide"
 msgstr "Gá bá nÃt dán"
 
-#: ../app/tools/gimpmovetool.c:574
+#: ../app/tools/gimpmovetool.c:546
 msgid "Cancel Guide"
 msgstr "Háy nÃt dán"
 
-#: ../app/tools/gimpmovetool.c:580
+#: ../app/tools/gimpmovetool.c:552
 msgid "Add Guide: "
 msgstr "ThÃm nÃt dán: "
 
@@ -14141,85 +14477,114 @@ msgstr ""
 msgid "_Paintbrush"
 msgstr "Chái _sÆn"
 
-#: ../app/tools/gimppaintoptions-gui.c:90
-#: ../app/tools/gimpselectionoptions.c:210
-#: ../app/widgets/gimpbrushselect.c:193 ../app/widgets/gimplayertreeview.c:266
+#: ../app/tools/gimppaintoptions-gui.c:99
+#: ../app/tools/gimpselectionoptions.c:217
+#: ../app/widgets/gimpbrushselect.c:185 ../app/widgets/gimplayertreeview.c:268
 msgid "Mode:"
 msgstr "Chá Äá:"
 
-#: ../app/tools/gimppaintoptions-gui.c:105
-#: ../app/tools/gimptransformoptions.c:347
-#: ../app/widgets/gimpbrushselect.c:180 ../app/widgets/gimplayertreeview.c:289
-msgid "Opacity:"
-msgstr "Äá má Äác:"
-
-#: ../app/tools/gimppaintoptions-gui.c:118
-msgid "Brush:"
-msgstr "BÃt vá:"
-
 #: ../app/tools/gimppaintoptions-gui.c:123
 #, fuzzy
-msgid "Scale:"
-msgstr "Co dÃn"
+#| msgid "_Brush"
+msgid "Brush"
+msgstr "_BÃt vá"
+
+#: ../app/tools/gimppaintoptions-gui.c:152
+msgid "Reset size to brush's native size"
+msgstr ""
 
-#: ../app/tools/gimppaintoptions-gui.c:130
+#: ../app/tools/gimppaintoptions-gui.c:159
 #, fuzzy
-msgid "Aspect Ratio:"
+msgid "Aspect Ratio"
 msgstr "Tá lá hÃnh thá:"
 
-#: ../app/tools/gimppaintoptions-gui.c:162
+#: ../app/tools/gimppaintoptions-gui.c:176
+msgid "Reset aspect ratio to brush's native"
+msgstr ""
+
+#: ../app/tools/gimppaintoptions-gui.c:200
+#, fuzzy
+#| msgid "Reset all Filters"
+msgid "Reset angle to zero"
+msgstr "Äát lái mái bá lác"
+
+#: ../app/tools/gimppaintoptions-gui.c:235
 msgid "Incremental"
 msgstr "Dán dán"
 
-#: ../app/tools/gimppaintoptions-gui.c:178
+#: ../app/tools/gimppaintoptions-gui.c:251
 msgid "Hard edge"
 msgstr "Cánh cáng"
 
-#: ../app/tools/gimppaintoptions-gui.c:212
-msgid "Fade out"
-msgstr "LÃm má dán"
+#: ../app/tools/gimppaintoptions-gui.c:280
+#, fuzzy
+msgid "Dynamics Options"
+msgstr "ThÆ mác phÃng chá"
+
+#: ../app/tools/gimppaintoptions-gui.c:286
+#, fuzzy
+#| msgid "Saved Options"
+msgid "Fade Options"
+msgstr "TÃy chán ÄÃ lÆu"
 
-#: ../app/tools/gimppaintoptions-gui.c:221
-msgid "Length:"
-msgstr "Äá dÃi:"
+#: ../app/tools/gimppaintoptions-gui.c:300
+#, fuzzy
+#| msgid "Fade out"
+msgid "Fade length"
+msgstr "LÃm má dán"
 
-#: ../app/tools/gimppaintoptions-gui.c:241
-#: ../app/widgets/gimpviewablebox.c:223
+#: ../app/tools/gimppaintoptions-gui.c:327
+#: ../app/widgets/gimpviewablebox.c:310
 msgid "Reverse"
 msgstr "NgÆác lái"
 
-#: ../app/tools/gimppaintoptions-gui.c:261
+#: ../app/tools/gimppaintoptions-gui.c:334
+#, fuzzy
+#| msgid "Tool Options"
+msgid "Color Options"
+msgstr "TÃy chán cÃng cá"
+
+#: ../app/tools/gimppaintoptions-gui.c:360
+#, fuzzy
+#| msgid "Amount:"
+msgid "Amount"
+msgstr "LÆáng:"
+
+#: ../app/tools/gimppaintoptions-gui.c:364
 msgid "Apply Jitter"
 msgstr "Ãp dáng Jitter"
 
-#: ../app/tools/gimppaintoptions-gui.c:266
-msgid "Amount:"
-msgstr "LÆáng:"
+#: ../app/tools/gimppaintoptions-gui.c:382
+#, fuzzy
+msgid "Smooth stroke"
+msgstr "Gá bá bá bÃm"
 
-#: ../app/tools/gimppaintoptions-gui.c:288
-msgid "Use color from gradient"
-msgstr "DÃng mÃu tá Äá dác"
+#: ../app/tools/gimppaintoptions-gui.c:392
+#, fuzzy
+#| msgid "Height"
+msgid "Weight"
+msgstr "Cao"
 
-#: ../app/tools/gimppainttool.c:142
+#: ../app/tools/gimppainttool.c:138
 #, fuzzy
 msgid "Click to paint"
 msgstr "Nhán Äá sÆn."
 
-#: ../app/tools/gimppainttool.c:143
+#: ../app/tools/gimppainttool.c:139
 #, fuzzy
 msgid "Click to draw the line"
 msgstr "Nhán Äá vá ÄÆáng."
 
-#: ../app/tools/gimppainttool.c:144
+#: ../app/tools/gimppainttool.c:140
 #, c-format
 msgid "%s to pick a color"
 msgstr "%s Äá kÃn mÃu"
 
-#: ../app/tools/gimppainttool.c:279
+#: ../app/tools/gimppainttool.c:259
 msgid "Cannot paint on layer groups."
 msgstr ""
 
-#: ../app/tools/gimppainttool.c:689
+#: ../app/tools/gimppainttool.c:678
 #, c-format
 msgid "%s for a straight line"
 msgstr "%s cho mát ÄÆáng tháng"
@@ -14232,46 +14597,47 @@ msgstr ""
 msgid "Pe_ncil"
 msgstr "_BÃt chÃ"
 
-#: ../app/tools/gimpperspectiveclonetool.c:129
+#: ../app/tools/gimpperspectiveclonetool.c:134
 msgid ""
 "Perspective Clone Tool: Clone from an image source after applying a "
 "perspective transformation"
 msgstr ""
 
-#: ../app/tools/gimpperspectiveclonetool.c:131
+#: ../app/tools/gimpperspectiveclonetool.c:136
 #, fuzzy
 msgid "_Perspective Clone"
 msgstr "_Phái cánh"
 
-#: ../app/tools/gimpperspectiveclonetool.c:704
+#: ../app/tools/gimpperspectiveclonetool.c:675
 #, fuzzy
 msgid "Ctrl-Click to set a clone source"
 msgstr "%s%sNhán Äá Äát nguán nhÃn ÄÃi."
 
-#: ../app/tools/gimpperspectivetool.c:70
+#: ../app/tools/gimpperspectivetool.c:83
 #, fuzzy
 msgid "Perspective Tool: Change perspective of the layer, selection or path"
 msgstr "Thay Äái phái cánh cáa láp hay vÃng chán"
 
-#: ../app/tools/gimpperspectivetool.c:72
+#: ../app/tools/gimpperspectivetool.c:85
 msgid "_Perspective"
 msgstr "_Phái cánh"
 
-#: ../app/tools/gimpperspectivetool.c:99
-#, fuzzy
-msgctxt "command"
-msgid "Perspective"
-msgstr "Phái cánh..."
-
-#: ../app/tools/gimpperspectivetool.c:100
+#: ../app/tools/gimpperspectivetool.c:113
 #, fuzzy
 msgid "Perspective transformation"
 msgstr "ThÃng tin vá chuyán dáng phái cánh"
 
-#: ../app/tools/gimpperspectivetool.c:115
+#: ../app/tools/gimpperspectivetool.c:131
 msgid "Transformation Matrix"
 msgstr "Ma trán chuyán dáng"
 
+#: ../app/tools/gimpperspectivetool.c:256
+#, fuzzy
+#| msgid "Perspective"
+msgctxt "undo-type"
+msgid "Perspective"
+msgstr "Phái cánh..."
+
 #: ../app/tools/gimpposterizetool.c:85
 #, fuzzy
 msgid "Posterize Tool: Reduce to a limited set of colors"
@@ -14289,50 +14655,126 @@ msgstr "BÃch chÆÆng hÃa (giám sá lÆáng mÃu)"
 msgid "Posterize does not operate on indexed layers."
 msgstr "BÃch chÆÆng hÃa khÃng hoát Äáng trÃn láp phá lác."
 
-#: ../app/tools/gimpposterizetool.c:230
+#: ../app/tools/gimpposterizetool.c:229
 msgid "Posterize _levels:"
 msgstr "BÃch chÆÆng hÃa _láp:"
 
-#: ../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 "DÃng mái láp hián thá khi thu nhá vÃng chán"
 
+#: ../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
+#, fuzzy
+msgid "Width of selection"
+msgstr "ÄÆáng dán Äán vÃng chán"
+
+#: ../app/tools/gimprectangleoptions.c:160
+#, fuzzy
+msgid "Height of selection"
+msgstr "ÄÆáng dán Äán vÃng chán"
+
+#: ../app/tools/gimprectangleoptions.c:169
+msgid "Unit of top left corner coordinate"
+msgstr ""
+
+#: ../app/tools/gimprectangleoptions.c:178
+#, fuzzy
+msgid "Unit of selection size"
+msgstr "ÄÆáng dán Äán vÃng chán"
+
+#: ../app/tools/gimprectangleoptions.c:187
+msgid "Enable lock of aspect ratio, width, height or size"
+msgstr ""
+
+#: ../app/tools/gimprectangleoptions.c:196
+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
+#, fuzzy
+#| msgid "Expand from center"
+msgid "Expand selection from center outwards"
+msgstr "Bung tá tÃm"
+
 #. Current, as in what is currently in use.
-#: ../app/tools/gimprectangleoptions.c:728
+#: ../app/tools/gimprectangleoptions.c:761
 #, fuzzy
 msgid "Current"
 msgstr "Dáng thác hián cÃ"
 
-#: ../app/tools/gimprectangleoptions.c:806
+#: ../app/tools/gimprectangleoptions.c:839
 msgid "Expand from center"
 msgstr "Bung tá tÃm"
 
-#: ../app/tools/gimprectangleoptions.c:829
+#: ../app/tools/gimprectangleoptions.c:862
 #, fuzzy
 msgid "Fixed:"
 msgstr "ÄÃ sáa"
 
-#: ../app/tools/gimprectangleoptions.c:962
+#: ../app/tools/gimprectangleoptions.c:1010
 #, fuzzy
 msgid "Position:"
 msgstr "ÄÃ Äánh vá"
 
-#: ../app/tools/gimprectangleoptions.c:980
+#: ../app/tools/gimprectangleoptions.c:1020 ../app/tools/gimptextoptions.c:525
+msgid "Size:"
+msgstr "Cá :"
+
+#: ../app/tools/gimprectangleoptions.c:1028
 msgid "Highlight"
 msgstr "TÃ sÃng"
 
 #. Auto Shrink
-#: ../app/tools/gimprectangleoptions.c:990
+#: ../app/tools/gimprectangleoptions.c:1040
 #, fuzzy
 msgid "Auto Shrink"
 msgstr "Tá Äáng thu nhá vÃng chán"
 
-#: ../app/tools/gimprectangleoptions.c:997
+#: ../app/tools/gimprectangleoptions.c:1050
 #, fuzzy
 msgid "Shrink merged"
 msgstr "Trán hát"
 
-#: ../app/tools/gimprectangleselectoptions.c:163
+#: ../app/tools/gimprectangleselectoptions.c:83
+#, fuzzy
+#| msgid "Move layers & selections"
+msgid "Round corners of selection"
+msgstr "Chuyán láp và vÃng chán"
+
+#: ../app/tools/gimprectangleselectoptions.c:89
+msgid "Radius of rounding in pixels"
+msgstr ""
+
+#: ../app/tools/gimprectangleselectoptions.c:167
 msgid "Rounded corners"
 msgstr ""
 
@@ -14351,7 +14793,7 @@ msgstr ""
 msgid "_Rectangle Select"
 msgstr "Chán c_há nhát"
 
-#: ../app/tools/gimprectangletool.c:1158 ../app/tools/gimprectangletool.c:2220
+#: ../app/tools/gimprectangletool.c:1146 ../app/tools/gimprectangletool.c:2015
 msgid "Rectangle: "
 msgstr "HÃnh chá nhát:"
 
@@ -14363,266 +14805,312 @@ msgstr "Cho phÃp chán vÃng hoÃn toÃn trong suát"
 msgid "Base selection on all visible layers"
 msgstr "VÃng chán dáa vÃo mái láp hián thá"
 
-#: ../app/tools/gimpregionselectoptions.c:201
+#: ../app/tools/gimpregionselectoptions.c:101
+#, fuzzy
+#| msgid "Selection Editor"
+msgid "Selection criterion"
+msgstr "Bá sáa vÃng chán"
+
+#: ../app/tools/gimpregionselectoptions.c:203
 msgid "Select transparent areas"
 msgstr "Chán cÃc vÃng trong suát"
 
-#: ../app/tools/gimpregionselectoptions.c:226
+#: ../app/tools/gimpregionselectoptions.c:229
 msgid "Select by:"
 msgstr "Chán báng:"
 
-#: ../app/tools/gimpregionselecttool.c:162
+#: ../app/tools/gimpregionselecttool.c:165
 #, fuzzy
 msgid "Move the mouse to change threshold"
 msgstr "Chuyán con chuát Äá thay Äái ngÆáng."
 
-#: ../app/tools/gimprotatetool.c:90
+#: ../app/tools/gimprotatetool.c:93
 msgid "Rotate"
 msgstr "Xoay"
 
-#: ../app/tools/gimprotatetool.c:91
+#: ../app/tools/gimprotatetool.c:94
 #, fuzzy
 msgid "Rotate Tool: Rotate the layer, selection or path"
 msgstr "Xoay láp hay vÃng chán"
 
-#: ../app/tools/gimprotatetool.c:92
+#: ../app/tools/gimprotatetool.c:95
 msgid "_Rotate"
 msgstr "_Xoay"
 
-#: ../app/tools/gimprotatetool.c:121
-#, fuzzy
-msgctxt "command"
-msgid "Rotate"
-msgstr "Xoay"
-
-#: ../app/tools/gimprotatetool.c:188
+#: ../app/tools/gimprotatetool.c:191
 #, fuzzy
 msgid "_Angle:"
 msgstr "GÃc:"
 
-#: ../app/tools/gimprotatetool.c:204
+#: ../app/tools/gimprotatetool.c:207
 #, fuzzy
 msgid "Center _X:"
 msgstr "Giáa lái X:"
 
-#: ../app/tools/gimprotatetool.c:213
+#: ../app/tools/gimprotatetool.c:216
 #, fuzzy
 msgid "Center _Y:"
 msgstr "Giáa lái 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 "Co dÃn"
 
-#: ../app/tools/gimpscaletool.c:78
+#: ../app/tools/gimpscaletool.c:90
 #, fuzzy
 msgid "Scale Tool: Scale the layer, selection or path"
 msgstr "Co dÃn láp hay vÃng chán."
 
-#: ../app/tools/gimpscaletool.c:79
+#: ../app/tools/gimpscaletool.c:91
 msgid "_Scale"
 msgstr "C_o dÃn"
 
-#: ../app/tools/gimpscaletool.c:105
+#: ../app/tools/gimpscaletool.c:338
+#, c-format
+msgctxt "undo-type"
+msgid "Scale to %d x %d"
+msgstr ""
+
+#: ../app/tools/gimpselectionoptions.c:84
 #, fuzzy
-msgctxt "command"
-msgid "Scale"
-msgstr "Co dÃn"
+msgid "Enable feathering of selection edges"
+msgstr "Má ráng vÃng chán"
+
+#: ../app/tools/gimpselectionoptions.c:90
+msgid "Radius of feathering"
+msgstr ""
 
-#: ../app/tools/gimpselectionoptions.c:257 ../app/tools/gimptextoptions.c:502
+#: ../app/tools/gimpselectionoptions.c:264 ../app/tools/gimptextoptions.c:538
 msgid "Antialiasing"
 msgstr "LÃm trÆn"
 
-#: ../app/tools/gimpselectionoptions.c:272
+#: ../app/tools/gimpselectionoptions.c:281
 msgid "Feather edges"
 msgstr "LÃm hÃnh lÃng cÃc cánh"
 
-#: ../app/tools/gimpselectiontool.c:253
+#: ../app/tools/gimpselectiontool.c:250
 #, fuzzy
 msgid "Click-Drag to replace the current selection"
 msgstr "Nhán-kÃo Äá thay thá vÃng chán hián cÃ."
 
-#: ../app/tools/gimpselectiontool.c:261
+#: ../app/tools/gimpselectiontool.c:258
 #, fuzzy
 msgid "Click-Drag to create a new selection"
 msgstr "Nhán-kÃo Äá táo mát vÃng chán mái."
 
-#: ../app/tools/gimpselectiontool.c:266
+#: ../app/tools/gimpselectiontool.c:263
 #, fuzzy
 msgid "Click-Drag to add to the current selection"
 msgstr "Nhán-kÃo Äá thÃm vÃo vÃng chán hián cÃ."
 
-#: ../app/tools/gimpselectiontool.c:275
+#: ../app/tools/gimpselectiontool.c:272
 #, fuzzy
 msgid "Click-Drag to subtract from the current selection"
 msgstr "Nhán-kÃo Äá trá khái vÃng chán hián cÃ."
 
-#: ../app/tools/gimpselectiontool.c:284
+#: ../app/tools/gimpselectiontool.c:281
 #, fuzzy
 msgid "Click-Drag to intersect with the current selection"
 msgstr "Nhán-kÃo Äá cát chÃo vái vÃng chán hián cÃ."
 
-#: ../app/tools/gimpselectiontool.c:294
+#: ../app/tools/gimpselectiontool.c:291
 #, fuzzy
 msgid "Click-Drag to move the selection mask"
 msgstr "Nhán-kÃo Äá di chuyán mát ná láa chán."
 
-#: ../app/tools/gimpselectiontool.c:302
+#: ../app/tools/gimpselectiontool.c:299
 #, fuzzy
 msgid "Click-Drag to move the selected pixels"
 msgstr "Nhán-kÃo Äá di chuyán cÃc Äiám ánh ÄÃ chán."
 
-#: ../app/tools/gimpselectiontool.c:306
+#: ../app/tools/gimpselectiontool.c:303
 #, fuzzy
 msgid "Click-Drag to move a copy of the selected pixels"
 msgstr "Nhán-kÃo Äá di chuyán mát bán sao cáa cÃc Äiám ánh ÄÃ chán."
 
-#: ../app/tools/gimpselectiontool.c:310
+#: ../app/tools/gimpselectiontool.c:307
 #, fuzzy
 msgid "Click to anchor the floating selection"
 msgstr "Nhán Äá cá neo vÃng chán Äang nái."
 
-#: ../app/tools/gimpsheartool.c:81
+#: ../app/tools/gimpsheartool.c:83
 msgid "Shear"
 msgstr "KÃo cát"
 
-#: ../app/tools/gimpsheartool.c:82
+#: ../app/tools/gimpsheartool.c:84
 #, fuzzy
 msgid "Shear Tool: Shear the layer, selection or path"
 msgstr "KÃo cát láp hay vÃng chán"
 
-#: ../app/tools/gimpsheartool.c:83
+#: ../app/tools/gimpsheartool.c:85
 msgid "S_hear"
 msgstr "_KÃo cát"
 
-#: ../app/tools/gimpsheartool.c:109
-#, fuzzy
-msgctxt "command"
-msgid "Shear"
-msgstr "KÃo cát"
-
-#: ../app/tools/gimpsheartool.c:133
+#: ../app/tools/gimpsheartool.c:135
 #, fuzzy
 msgid "Shear magnitude _X:"
 msgstr "Äá kÃo cát X:"
 
-#: ../app/tools/gimpsheartool.c:143
+#: ../app/tools/gimpsheartool.c:145
 #, fuzzy
 msgid "Shear magnitude _Y:"
 msgstr "Äá kÃo cát Y:"
 
-#: ../app/tools/gimpsmudgetool.c:53
-msgid "Smudge Tool: Smudge selectively using a brush"
+#: ../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 ""
+
+#: ../app/tools/gimpsmudgetool.c:55
 msgid "_Smudge"
 msgstr "_NhoÃ"
 
-#: ../app/tools/gimpsmudgetool.c:73
+#: ../app/tools/gimpsmudgetool.c:74
 #, fuzzy
 msgid "Click to smudge"
 msgstr "Nhán Äá nhoÃ."
 
-#: ../app/tools/gimpsmudgetool.c:74
+#: ../app/tools/gimpsmudgetool.c:75
 #, fuzzy
 msgid "Click to smudge the line"
 msgstr "Nhán Äá nhoà ÄÆáng."
 
-#: ../app/tools/gimptextoptions.c:137
+#: ../app/tools/gimptextoptions.c:131
+msgid "Font size unit"
+msgstr ""
+
+#: ../app/tools/gimptextoptions.c:136
+#, fuzzy
+#| msgid "Fonts"
+msgid "Font size"
+msgstr "PhÃng chá"
+
+#: ../app/tools/gimptextoptions.c:145
 msgid ""
 "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr ""
 "Gái à thà thay Äái cÃc cánh cáa phÃng chá, Äá hián thá máng ánh chÃnh xÃc "
 "ngay cá khi dÃng kÃch thÆác nhá."
 
-#: ../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 ""
 
-#: ../app/tools/gimptextoptions.c:161
+#: ../app/tools/gimptextoptions.c:164
+#, fuzzy
+#| msgid "Alignment:"
+msgid "Text alignment"
+msgstr "Canh lá :"
+
+#: ../app/tools/gimptextoptions.c:170
 msgid "Indentation of the first line"
 msgstr "Thát lá dÃng Äáu"
 
-#: ../app/tools/gimptextoptions.c:167
+#: ../app/tools/gimptextoptions.c:176
 msgid "Adjust line spacing"
 msgstr "Chánh khoáng cÃch dÃng"
 
-#: ../app/tools/gimptextoptions.c:173
+#: ../app/tools/gimptextoptions.c:182
 msgid "Adjust letter spacing"
 msgstr "Chánh khoáng cÃch chá"
 
-#: ../app/tools/gimptextoptions.c:179
-msgid "Text box resize mode"
+#: ../app/tools/gimptextoptions.c:188
+msgid ""
+"Whether text flows into rectangular shape or moves into a new line when you "
+"press Enter"
 msgstr ""
 
-#: ../app/tools/gimptextoptions.c:186
-msgid ""
-"Use an external editor window for text entry, instead of direct-on-canvas "
-"editing"
+#: ../app/tools/gimptextoptions.c:196
+msgid "Use an external editor window for text entry"
 msgstr ""
 
-#: ../app/tools/gimptextoptions.c:482
-msgid "Font:"
-msgstr "PhÃng chá :"
+#: ../app/tools/gimptextoptions.c:510
+#, fuzzy
+#| msgid "Fonts"
+msgid "Font"
+msgstr "PhÃng chá"
 
-#: ../app/tools/gimptextoptions.c:498
+#: ../app/tools/gimptextoptions.c:534
 #, fuzzy
 msgid "Use editor"
 msgstr "Bá sáa chá"
 
-#: ../app/tools/gimptextoptions.c:518
+#: ../app/tools/gimptextoptions.c:554
 #, fuzzy
 msgid "Hinting:"
 msgstr "Gái Ã"
 
-#: ../app/tools/gimptextoptions.c:522
+#: ../app/tools/gimptextoptions.c:558
 msgid "Text Color"
 msgstr "MÃu chá"
 
-#: ../app/tools/gimptextoptions.c:527
+#: ../app/tools/gimptextoptions.c:563
 msgid "Color:"
 msgstr "MÃu:"
 
-#: ../app/tools/gimptextoptions.c:533
+#: ../app/tools/gimptextoptions.c:569
 msgid "Justify:"
 msgstr "Canh Äáu:"
 
-#: ../app/tools/gimptextoptions.c:556
+#: ../app/tools/gimptextoptions.c:592
 msgid "Box:"
 msgstr ""
 
-#: ../app/tools/gimptextoptions.c:570
+#: ../app/tools/gimptextoptions.c:609
 msgid "Language:"
 msgstr ""
 
-#: ../app/tools/gimptexttool.c:194
+#: ../app/tools/gimptexttool.c:189
 msgid "Text"
 msgstr "Chá"
 
-#: ../app/tools/gimptexttool.c:195
+#: ../app/tools/gimptexttool.c:190
 msgid "Text Tool: Create or edit text layers"
 msgstr ""
 
-#: ../app/tools/gimptexttool.c:196
+#: ../app/tools/gimptexttool.c:191
 msgid "Te_xt"
 msgstr "_Chá"
 
-#: ../app/tools/gimptexttool.c:959
+#: ../app/tools/gimptexttool.c:943
 #, fuzzy
 msgid "Reshape Text Layer"
 msgstr "Äái láp chá"
 
-#: ../app/tools/gimptexttool.c:1497 ../app/tools/gimptexttool.c:1500
+#: ../app/tools/gimptexttool.c:1478 ../app/tools/gimptexttool.c:1481
 msgid "Confirm Text Editing"
 msgstr "Kháng Äánh sáa Äái vÄn bán"
 
-#: ../app/tools/gimptexttool.c:1504
+#: ../app/tools/gimptexttool.c:1485
 #, fuzzy
 msgid "Create _New Layer"
 msgstr "Táo láp mái"
 
-#: ../app/tools/gimptexttool.c:1528
+#: ../app/tools/gimptexttool.c:1509
 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 "
@@ -14636,7 +15124,7 @@ msgstr ""
 "Bán cà thá sáa Äái láp nÃy, hoác táo mát láp chá mái tá thuác tÃnh chá cáa "
 "nÃ."
 
-#: ../app/tools/gimptexttool-editor.c:1118
+#: ../app/tools/gimptexttool-editor.c:1159
 msgid "GIMP Text Editor"
 msgstr "Bá hiáu chánh vÄn bán GIMP"
 
@@ -14669,59 +15157,107 @@ msgstr "NgÆáng khÃng hoát Äáng trÃn láp phá lác."
 msgid "Automatically adjust to optimal binarization threshold"
 msgstr "Äiáu chánh tá Äáng thÃnh ngÆáng lÃm nhá phÃn tái Æu"
 
-#: ../app/tools/gimptool.c:886
+#: ../app/tools/gimptool.c:978
 msgid "Can't work on an empty image, add a layer first"
 msgstr ""
 
-#: ../app/tools/gimptransformoptions.c:272
+#: ../app/tools/gimptransformoptions.c:99
+#, fuzzy
+msgid "Direction of transformation"
+msgstr "ThÃng tin vá chuyán dáng phái cánh"
+
+#: ../app/tools/gimptransformoptions.c:105
+#, fuzzy
+#| msgid "Interpolation:"
+msgid "Interpolation method"
+msgstr "Nái suy:"
+
+#: ../app/tools/gimptransformoptions.c:111
+#, fuzzy
+#| msgid "Show _tooltips"
+msgid "How to clip"
+msgstr "Hián _máo cÃng cá"
+
+#: ../app/tools/gimptransformoptions.c:117
+#, fuzzy
+msgid "Show a preview of the transformed image"
+msgstr "Hián thá cáa sá toÃn cánh cho ánh nÃy"
+
+#: ../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:138
+msgid "Limit rotation steps to 15 degrees"
+msgstr ""
+
+#: ../app/tools/gimptransformoptions.c:276
 #, fuzzy
 msgid "Transform:"
 msgstr "Chuyán dáng"
 
-#: ../app/tools/gimptransformoptions.c:281
-#: ../app/widgets/gimpdynamicseditor.c:150
-#: ../app/widgets/gimpdynamicsoutputeditor.c:227
+#: ../app/tools/gimptransformoptions.c:285
+#: ../app/widgets/gimpdynamicseditor.c:143
+#: ../app/widgets/gimpdynamicsoutputeditor.c:70
 #, fuzzy
 msgid "Direction"
 msgstr "MÃ tá"
 
 #. the interpolation menu
-#: ../app/tools/gimptransformoptions.c:286
+#: ../app/tools/gimptransformoptions.c:290
 msgid "Interpolation:"
 msgstr "Nái suy:"
 
+#. the clipping menu
 #: ../app/tools/gimptransformoptions.c:299
 #, fuzzy
 msgid "Clipping:"
 msgstr "Äang lát"
 
+#: ../app/tools/gimptransformoptions.c:309
+#, fuzzy
+msgid "Image opacity"
+msgstr "Kiáu ánh"
+
+#: ../app/tools/gimptransformoptions.c:311
+#, fuzzy
+#| msgid "Show image size"
+msgid "Show image preview"
+msgstr "Hián cá ánh"
+
+#. the guides frame
 #: ../app/tools/gimptransformoptions.c:317
-msgid "Preview:"
-msgstr "Xem thá:"
+#, fuzzy
+msgid "Guides"
+msgstr "NÃt _dán"
 
-#: ../app/tools/gimptransformoptions.c:388
+#: ../app/tools/gimptransformoptions.c:345
 #, c-format
 msgid "15 degrees  (%s)"
 msgstr "15Â  (%s)"
 
-#: ../app/tools/gimptransformoptions.c:392
+#: ../app/tools/gimptransformoptions.c:349
 #, c-format
 msgid "Keep aspect  (%s)"
 msgstr "Giá khÃa cánh (%s)"
 
-#: ../app/tools/gimptransformtool.c:240
+#: ../app/tools/gimptransformtool.c:212
 msgid "Transforming"
 msgstr "Äang chuyán dáng..."
 
-#: ../app/tools/gimptransformtool.c:1177
+#: ../app/tools/gimptransformtool.c:1061
 msgid "There is no layer to transform."
 msgstr "KhÃng cà láp cán chuyán dáng."
 
-#: ../app/tools/gimptransformtool.c:1190
+#: ../app/tools/gimptransformtool.c:1074
 msgid "There is no path to transform."
 msgstr "KhÃng cà ÄÆáng dán cán chuyán dáng."
 
-#: ../app/tools/gimptransformtool.c:1191
+#: ../app/tools/gimptransformtool.c:1075
 msgid "The active path's strokes are locked."
 msgstr ""
 
@@ -14733,11 +15269,11 @@ msgstr "Giái hán khá nÄng sáa Äái thÃnh Äa giÃc"
 msgid "Edit Mode"
 msgstr "Chá Äá sáa Äái"
 
-#: ../app/tools/gimpvectoroptions.c:173
+#: ../app/tools/gimpvectoroptions.c:174
 msgid "Polygonal"
 msgstr "Äa giÃc"
 
-#: ../app/tools/gimpvectoroptions.c:177
+#: ../app/tools/gimpvectoroptions.c:178
 #, c-format
 msgid ""
 "Path to Selection\n"
@@ -14751,38 +15287,38 @@ msgstr ""
 "%s\tGiao nhau"
 
 #. Create a selection from the current path
-#: ../app/tools/gimpvectoroptions.c:188
+#: ../app/tools/gimpvectoroptions.c:189
 #, fuzzy
 msgid "Selection from Path"
 msgstr "_VÃng chán tái ÄÆáng dán"
 
-#: ../app/tools/gimpvectortool.c:163
+#: ../app/tools/gimpvectortool.c:161
 #, fuzzy
 msgid "Paths Tool: Create and edit paths"
 msgstr "Táo và sáa Äái ÄÆáng dán"
 
-#: ../app/tools/gimpvectortool.c:164
+#: ../app/tools/gimpvectortool.c:162
 msgid "Pat_hs"
 msgstr ""
 
-#: ../app/tools/gimpvectortool.c:254
+#: ../app/tools/gimpvectortool.c:251
 #, fuzzy
 msgid "The active path is locked."
 msgstr "Chuyán ÄÆáng dán hoát Äáng"
 
-#: ../app/tools/gimpvectortool.c:342
+#: ../app/tools/gimpvectortool.c:341
 msgid "Add Stroke"
 msgstr "ThÃm nÃt vá"
 
-#: ../app/tools/gimpvectortool.c:366
+#: ../app/tools/gimpvectortool.c:365
 msgid "Add Anchor"
 msgstr "ThÃm neo"
 
-#: ../app/tools/gimpvectortool.c:392
+#: ../app/tools/gimpvectortool.c:391
 msgid "Insert Anchor"
 msgstr "ChÃn neo"
 
-#: ../app/tools/gimpvectortool.c:423
+#: ../app/tools/gimpvectortool.c:422
 msgid "Drag Handle"
 msgstr "KÃo mÃc"
 
@@ -14822,337 +15358,266 @@ msgstr "XÃa bá Äoán"
 msgid "Move Anchors"
 msgstr "Chuyán cÃc neo"
 
-#: ../app/tools/gimpvectortool.c:1199
+#: ../app/tools/gimpvectortool.c:1202
 #, fuzzy
 msgid "Click to pick path to edit"
 msgstr "Nháp vÃo ÄÆáng dán cán sáa Äái."
 
-#: ../app/tools/gimpvectortool.c:1203
+#: ../app/tools/gimpvectortool.c:1206
 #, fuzzy
 msgid "Click to create a new path"
 msgstr "Nháp chuát Äá táo mát ÄÆáng dán mái."
 
-#: ../app/tools/gimpvectortool.c:1207
+#: ../app/tools/gimpvectortool.c:1210
 #, fuzzy
 msgid "Click to create a new component of the path"
 msgstr "Nháp chuát Äá táo mát thÃnh phán mái cáa ÄÆáng dán nÃy."
 
-#: ../app/tools/gimpvectortool.c:1211
+#: ../app/tools/gimpvectortool.c:1214
 #, fuzzy
 msgid "Click or Click-Drag to create a new anchor"
 msgstr "Nhán Äá táo mát neo mái."
 
-#: ../app/tools/gimpvectortool.c:1221 ../app/tools/gimpvectortool.c:1228
+#: ../app/tools/gimpvectortool.c:1226 ../app/tools/gimpvectortool.c:1233
 #, fuzzy
 msgid "Click-Drag to move the anchor around"
 msgstr "Nháp-kÃo Äá di chuyán neo quanh."
 
-#: ../app/tools/gimpvectortool.c:1232 ../app/tools/gimpvectortool.c:1255
+#: ../app/tools/gimpvectortool.c:1237 ../app/tools/gimpvectortool.c:1260
 #, fuzzy
 msgid "Click-Drag to move the anchors around"
 msgstr "Nháp-kÃo Äá di chuyán cÃc neo quanh."
 
-#: ../app/tools/gimpvectortool.c:1238
+#: ../app/tools/gimpvectortool.c:1243
 #, fuzzy
 msgid "Click-Drag to move the handle around"
 msgstr "Nhán-kÃo Äá di chuyán mÃc chung quanh."
 
-#: ../app/tools/gimpvectortool.c:1245
+#: ../app/tools/gimpvectortool.c:1250
 #, fuzzy
 msgid "Click-Drag to move the handles around symmetrically"
 msgstr "Nhán-kÃo Äá di chuyán mÃc chung quanh."
 
-#: ../app/tools/gimpvectortool.c:1260
+#: ../app/tools/gimpvectortool.c:1265
 #, fuzzy
 msgid "Click-Drag to change the shape of the curve"
 msgstr "Nhán-kÃo Äá thay Äái hÃnh cáa cong."
 
-#: ../app/tools/gimpvectortool.c:1263
+#: ../app/tools/gimpvectortool.c:1268
 #, c-format
 msgid "%s: symmetrical"
 msgstr "%s: Äái xáng"
 
-#: ../app/tools/gimpvectortool.c:1268
+#: ../app/tools/gimpvectortool.c:1273
 #, fuzzy
 msgid "Click-Drag to move the component around"
 msgstr "Nhán-kÃo Äá di chuyán thÃnh phán chung quanh."
 
-#: ../app/tools/gimpvectortool.c:1276
+#: ../app/tools/gimpvectortool.c:1281
 #, fuzzy
 msgid "Click-Drag to move the path around"
 msgstr "Nháp-kÃo Äá di chuyán ÄÆáng dán quanh."
 
-#: ../app/tools/gimpvectortool.c:1280
+#: ../app/tools/gimpvectortool.c:1285
 #, fuzzy
 msgid "Click-Drag to insert an anchor on the path"
 msgstr "Nhán-kÃo Äá chÃn mát neo trÃn ÄÆáng dán."
 
-#: ../app/tools/gimpvectortool.c:1288
+#: ../app/tools/gimpvectortool.c:1293
 #, fuzzy
 msgid "Click to delete this anchor"
 msgstr "Nháp chuát Äá xÃa bá neo nÃy."
 
-#: ../app/tools/gimpvectortool.c:1292
+#: ../app/tools/gimpvectortool.c:1297
 #, fuzzy
 msgid "Click to connect this anchor with the selected endpoint"
 msgstr "Nháp chuát Äá kát nái neo nÃy Äán Äiám cuái cÃng ÄÆác chán."
 
-#: ../app/tools/gimpvectortool.c:1297
-#, fuzzy
-msgid "Click to open up the path"
-msgstr "Nháp chuát Äá má ra ÄÆáng dán."
-
-#: ../app/tools/gimpvectortool.c:1301
-#, fuzzy
-msgid "Click to make this node angular"
-msgstr "Nháp chuát Äá lÃm cho nÃt nÃy cà hÃnh gÃc."
-
-#: ../app/tools/gimpvectortool.c:1813
-msgid "Delete Anchors"
-msgstr "XÃa bá cÃc neo"
-
-#: ../app/tools/gimpvectortool.c:1984
-msgid "There is no active layer or channel to stroke to"
-msgstr "KhÃng cà láp hay kÃnh hoát Äáng tái Äà cán vá nÃt."
-
-#: ../app/tools/tools-enums.c:92
-#, fuzzy
-msgctxt "rectangle-guide"
-msgid "No guides"
-msgstr "KhÃng cà nÃt dán"
-
-#: ../app/tools/tools-enums.c:93
-#, fuzzy
-msgctxt "rectangle-guide"
-msgid "Center lines"
-msgstr "Äát cÃc ÄÆáng á giáa"
-
-#: ../app/tools/tools-enums.c:94
+#: ../app/tools/gimpvectortool.c:1302
 #, fuzzy
-msgctxt "rectangle-guide"
-msgid "Rule of thirds"
-msgstr "Quy tác phán ba"
+msgid "Click to open up the path"
+msgstr "Nháp chuát Äá má ra ÄÆáng dán."
 
-#: ../app/tools/tools-enums.c:95
+#: ../app/tools/gimpvectortool.c:1306
 #, fuzzy
-msgctxt "rectangle-guide"
-msgid "Rule of fifths"
-msgstr "Quy tác phán ba"
+msgid "Click to make this node angular"
+msgstr "Nháp chuát Äá lÃm cho nÃt nÃy cà hÃnh gÃc."
 
-#: ../app/tools/tools-enums.c:96
-#, fuzzy
-msgctxt "rectangle-guide"
-msgid "Golden sections"
-msgstr "CÃc phán vÃng"
+#: ../app/tools/gimpvectortool.c:1806
+msgid "Delete Anchors"
+msgstr "XÃa bá cÃc neo"
 
-#: ../app/tools/tools-enums.c:97
-msgctxt "rectangle-guide"
-msgid "Diagonal lines"
-msgstr ""
+#: ../app/tools/gimpvectortool.c:1964
+msgid "There is no active layer or channel to stroke to"
+msgstr "KhÃng cà láp hay kÃnh hoát Äáng tái Äà cán vá nÃt."
 
-#: ../app/tools/tools-enums.c:187
+#: ../app/tools/tools-enums.c:150
 #, fuzzy
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Aspect ratio"
 msgstr "Tá lá hÃnh thá:"
 
-#: ../app/tools/tools-enums.c:188
+#: ../app/tools/tools-enums.c:151
 #, fuzzy
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Width"
 msgstr "Ráng"
 
-#: ../app/tools/tools-enums.c:189
+#: ../app/tools/tools-enums.c:152
 #, fuzzy
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Height"
 msgstr "Cao"
 
-#: ../app/tools/tools-enums.c:190
+#: ../app/tools/tools-enums.c:153
 #, fuzzy
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Size"
 msgstr "Cá"
 
-#: ../app/tools/tools-enums.c:219
+#: ../app/tools/tools-enums.c:182
 #, fuzzy
 msgctxt "rect-select-mode"
 msgid "Free select"
 msgstr "Chán tá do"
 
-#: ../app/tools/tools-enums.c:220
+#: ../app/tools/tools-enums.c:183
 #, fuzzy
 msgctxt "rect-select-mode"
 msgid "Fixed size"
 msgstr "Cá cá Äánh"
 
-#: ../app/tools/tools-enums.c:221
+#: ../app/tools/tools-enums.c:184
 #, fuzzy
 msgctxt "rect-select-mode"
 msgid "Fixed aspect ratio"
 msgstr "Tá lá hÃnh thá cá Äánh"
 
-#: ../app/tools/tools-enums.c:250
+#: ../app/tools/tools-enums.c:213
 #, fuzzy
 msgctxt "transform-type"
 msgid "Layer"
 msgstr "Láp"
 
-#: ../app/tools/tools-enums.c:251
+#: ../app/tools/tools-enums.c:214
 #, fuzzy
 msgctxt "transform-type"
 msgid "Selection"
 msgstr "VÃng chán"
 
-#: ../app/tools/tools-enums.c:252
+#: ../app/tools/tools-enums.c:215
 #, fuzzy
 msgctxt "transform-type"
 msgid "Path"
 msgstr "ÄÆáng dán"
 
-#: ../app/tools/tools-enums.c:282
-#, fuzzy
-msgctxt "transform-preview-type"
-msgid "Outline"
-msgstr "PhÃc tháo"
-
-#: ../app/tools/tools-enums.c:283
-#, fuzzy
-msgctxt "transform-preview-type"
-msgid "Grid"
-msgstr "LÆái"
-
-#: ../app/tools/tools-enums.c:284
-#, fuzzy
-msgctxt "transform-preview-type"
-msgid "Image"
-msgstr "ánh"
-
-#: ../app/tools/tools-enums.c:285
-#, fuzzy
-msgctxt "transform-preview-type"
-msgid "Image + Grid"
-msgstr "ánh + LÆái"
-
-#: ../app/tools/tools-enums.c:313
-#, fuzzy
-msgctxt "transform-grid-type"
-msgid "Number of grid lines"
-msgstr "Sá dÃng lÆái"
-
-#: ../app/tools/tools-enums.c:314
-#, fuzzy
-msgctxt "transform-grid-type"
-msgid "Grid line spacing"
-msgstr "Khoáng cÃch dÃng lÆái"
-
-#: ../app/tools/tools-enums.c:343
+#: ../app/tools/tools-enums.c:244
 #, fuzzy
 msgctxt "vector-mode"
 msgid "Design"
 msgstr "Thiát ká"
 
-#: ../app/tools/tools-enums.c:344
+#: ../app/tools/tools-enums.c:245
 #, fuzzy
 msgctxt "vector-mode"
 msgid "Edit"
 msgstr "Hiáu chánh"
 
-#: ../app/tools/tools-enums.c:345
+#: ../app/tools/tools-enums.c:246
 #, fuzzy
 msgctxt "vector-mode"
 msgid "Move"
 msgstr "Chuyán"
 
-#: ../app/vectors/gimpvectors.c:206
+#: ../app/vectors/gimpvectors.c:208
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rename Path"
 msgstr "Äái tÃn ÄÆáng dán"
 
-#: ../app/vectors/gimpvectors.c:207
+#: ../app/vectors/gimpvectors.c:209
 #, fuzzy
 msgctxt "undo-type"
 msgid "Move Path"
 msgstr "Chuyán ÄÆáng dán"
 
-#: ../app/vectors/gimpvectors.c:208
+#: ../app/vectors/gimpvectors.c:210
 #, fuzzy
 msgctxt "undo-type"
 msgid "Scale Path"
 msgstr "Co dÃn ÄÆáng dán"
 
-#: ../app/vectors/gimpvectors.c:209
+#: ../app/vectors/gimpvectors.c:211
 #, fuzzy
 msgctxt "undo-type"
 msgid "Resize Path"
 msgstr "Äái cá ÄÆáng dán"
 
-#: ../app/vectors/gimpvectors.c:210
+#: ../app/vectors/gimpvectors.c:212
 #, fuzzy
 msgctxt "undo-type"
 msgid "Flip Path"
 msgstr "Lát ÄÆáng dán"
 
-#: ../app/vectors/gimpvectors.c:211
+#: ../app/vectors/gimpvectors.c:213
 #, fuzzy
 msgctxt "undo-type"
 msgid "Rotate Path"
 msgstr "Xoay ÄÆáng dán"
 
-#: ../app/vectors/gimpvectors.c:212
+#: ../app/vectors/gimpvectors.c:214
 #, fuzzy
 msgctxt "undo-type"
 msgid "Transform Path"
 msgstr "Chuyán Äái ÄÆáng dán"
 
-#: ../app/vectors/gimpvectors.c:213
+#: ../app/vectors/gimpvectors.c:215
 #, fuzzy
 msgctxt "undo-type"
 msgid "Stroke Path"
 msgstr "ÄÆáng dán nÃt"
 
-#: ../app/vectors/gimpvectors.c:214
+#: ../app/vectors/gimpvectors.c:216
 #, fuzzy
 msgctxt "undo-type"
 msgid "Path to Selection"
 msgstr "ÄÆáng dán Äán vÃng chán"
 
-#: ../app/vectors/gimpvectors.c:215
+#: ../app/vectors/gimpvectors.c:217
 #, fuzzy
 msgctxt "undo-type"
 msgid "Reorder Path"
 msgstr "Sáp xáp lái ÄÆáng dán"
 
-#: ../app/vectors/gimpvectors.c:216
+#: ../app/vectors/gimpvectors.c:218
 #, fuzzy
 msgctxt "undo-type"
 msgid "Raise Path"
 msgstr "NÃng ÄÆáng dán"
 
-#: ../app/vectors/gimpvectors.c:217
+#: ../app/vectors/gimpvectors.c:219
 #, fuzzy
 msgctxt "undo-type"
 msgid "Raise Path to Top"
 msgstr "NÃng ÄÆáng dán lÃn trÃn"
 
-#: ../app/vectors/gimpvectors.c:218
+#: ../app/vectors/gimpvectors.c:220
 #, fuzzy
 msgctxt "undo-type"
 msgid "Lower Path"
 msgstr "Há ÄÆáng dán"
 
-#: ../app/vectors/gimpvectors.c:219
+#: ../app/vectors/gimpvectors.c:221
 #, fuzzy
 msgctxt "undo-type"
 msgid "Lower Path to Bottom"
 msgstr "Há ÄÆáng dán xuáng dÆái"
 
-#: ../app/vectors/gimpvectors.c:220
+#: ../app/vectors/gimpvectors.c:222
 msgid "Path cannot be raised higher."
 msgstr "ÄÆáng dán khÃng thá nÃng cao hÆn."
 
-#: ../app/vectors/gimpvectors.c:221
+#: ../app/vectors/gimpvectors.c:223
 msgid "Path cannot be lowered more."
 msgstr "ÄÆáng dán khÃng thá há tháp hÆn."
 
@@ -15199,17 +15664,17 @@ msgstr "KhÃng tÃm tháy ÄÆáng dán nÃo trong bá Äám."
 msgid "Failed to import paths from '%s': %s"
 msgstr "Lái nháp ÄÆáng dán tá Â %s Â: %s"
 
-#: ../app/widgets/gimpactioneditor.c:66
+#: ../app/widgets/gimpactioneditor.c:69
 msgid "_Search:"
 msgstr ""
 
-#: ../app/widgets/gimpactiongroup.c:867
+#: ../app/widgets/gimpactiongroup.c:888
 #, c-format
 msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 
 #: ../app/widgets/gimpactionview.c:337
-#: ../app/widgets/gimpcontrollereditor.c:344
+#: ../app/widgets/gimpcontrollereditor.c:341
 msgid "Action"
 msgstr "HÃnh Äáng"
 
@@ -15251,30 +15716,39 @@ msgstr "PhÃm tát khÃng háp lá."
 msgid "Removing shortcut failed."
 msgstr "Lái gá bá phÃm tát."
 
-#: ../app/widgets/gimpbrusheditor.c:168
-msgid "Spikes:"
+#: ../app/widgets/gimpbrusheditor.c:166
+#, fuzzy
+#| msgid "Spikes:"
+msgid "Spikes"
 msgstr "Gai:"
 
-#: ../app/widgets/gimpbrusheditor.c:181
-msgid "Hardness:"
-msgstr "Äá cáng:"
+#: ../app/widgets/gimpbrusheditor.c:177
+#, fuzzy
+msgid "Hardness"
+msgstr "Äá cáng"
 
-#: ../app/widgets/gimpbrusheditor.c:194
-msgid "Aspect ratio:"
+#: ../app/widgets/gimpbrusheditor.c:188
+#, fuzzy
+msgid "Aspect ratio"
 msgstr "Tá lá hÃnh thá:"
 
-#: ../app/widgets/gimpbrusheditor.c:220
-#: ../app/widgets/gimpbrushfactoryview.c:81
-msgid "Spacing:"
-msgstr "Khoáng cÃch:"
+#: ../app/widgets/gimpbrusheditor.c:210
+#: ../app/widgets/gimpbrushfactoryview.c:80
+#: ../app/widgets/gimpgrideditor.c:174
+msgid "Spacing"
+msgstr "Khoáng cÃch"
 
-#: ../app/widgets/gimpbrusheditor.c:223
+#: ../app/widgets/gimpbrusheditor.c:215
 #: ../app/widgets/gimpbrushfactoryview.c:84
 msgid "Percentage of width of brush"
 msgstr "Phán trÄm cáa Äá ráng bÃt vá"
 
-#: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257
-#: ../app/widgets/gimpeditor.c:735
+#: ../app/widgets/gimpbrushselect.c:172
+msgid "Opacity:"
+msgstr "Äá má Äác:"
+
+#: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264
+#: ../app/widgets/gimpeditor.c:748
 msgid "(None)"
 msgstr "(KhÃng cÃ)"
 
@@ -15282,41 +15756,41 @@ msgstr "(KhÃng cÃ)"
 msgid "Add the current color to the color history"
 msgstr "ThÃm mÃu hián thái vÃo lÆác sá mÃu"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:151
+#: ../app/widgets/gimpcolordisplayeditor.c:154
 msgid "Available Filters"
 msgstr "Bá lác sán sÃng"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:212
+#: ../app/widgets/gimpcolordisplayeditor.c:216
 msgid "Move the selected filter up"
 msgstr "Chuyán bá lác ÄÆác chán lÃn"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:221
+#: ../app/widgets/gimpcolordisplayeditor.c:225
 msgid "Move the selected filter down"
 msgstr "Chuyán bá lác ÄÆác chán xuáng"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:267
+#: ../app/widgets/gimpcolordisplayeditor.c:271
 msgid "Active Filters"
 msgstr "Bá lác hoát Äáng"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:318
+#: ../app/widgets/gimpcolordisplayeditor.c:322
 msgid "Reset the selected filter to default values"
 msgstr "Äát lái bá lác ÄÆác chán thÃnh già trá mác Äánh"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:492
+#: ../app/widgets/gimpcolordisplayeditor.c:496
 #, c-format
 msgid "Add '%s' to the list of active filters"
 msgstr "ThÃm  %s  vÃo danh sÃch cÃc bá lác hoát Äáng"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:529
+#: ../app/widgets/gimpcolordisplayeditor.c:533
 #, c-format
 msgid "Remove '%s' from the list of active filters"
 msgstr "Gá bá  %s  ra danh sÃch cÃc bá lác hoát Äáng"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:560
+#: ../app/widgets/gimpcolordisplayeditor.c:564
 msgid "No filter selected"
 msgstr "ChÆa chán bá lác nÃo"
 
-#: ../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."
@@ -15324,67 +15798,67 @@ msgstr ""
 "CÃch ghi mÃu tháp lác phÃn nhÆ dáng HTML và CSS. Mác nháp nÃy cÅng cháp nhán "
 "cÃc tÃn mÃu kiáu CSS."
 
-#: ../app/widgets/gimpcolorframe.c:508
+#: ../app/widgets/gimpcolorframe.c:512
 msgid "Index:"
 msgstr "Phá lác:"
 
-#: ../app/widgets/gimpcolorframe.c:521 ../app/widgets/gimpcolorframe.c:547
+#: ../app/widgets/gimpcolorframe.c:525 ../app/widgets/gimpcolorframe.c:551
 msgid "Red:"
 msgstr "Äá:"
 
-#: ../app/widgets/gimpcolorframe.c:522 ../app/widgets/gimpcolorframe.c:548
+#: ../app/widgets/gimpcolorframe.c:526 ../app/widgets/gimpcolorframe.c:552
 msgid "Green:"
 msgstr "Xanh là cÃy:"
 
-#: ../app/widgets/gimpcolorframe.c:523 ../app/widgets/gimpcolorframe.c:549
+#: ../app/widgets/gimpcolorframe.c:527 ../app/widgets/gimpcolorframe.c:553
 msgid "Blue:"
 msgstr "Xanh dÆÆng:"
 
-#: ../app/widgets/gimpcolorframe.c:536 ../app/widgets/gimpcolorframe.c:569
+#: ../app/widgets/gimpcolorframe.c:540 ../app/widgets/gimpcolorframe.c:573
 msgid "Value:"
 msgstr "Già trá:"
 
-#: ../app/widgets/gimpcolorframe.c:560
+#: ../app/widgets/gimpcolorframe.c:564
 msgid "Hex:"
 msgstr "TLP:"
 
-#: ../app/widgets/gimpcolorframe.c:567
+#: ../app/widgets/gimpcolorframe.c:571
 msgid "Hue:"
 msgstr "Sác mÃu:"
 
-#: ../app/widgets/gimpcolorframe.c:568
+#: ../app/widgets/gimpcolorframe.c:572
 msgid "Sat.:"
 msgstr "BÃo hoÃ:"
 
-#: ../app/widgets/gimpcolorframe.c:586
+#: ../app/widgets/gimpcolorframe.c:590
 msgid "Cyan:"
 msgstr "X.lÃng mÃng:"
 
-#: ../app/widgets/gimpcolorframe.c:587
+#: ../app/widgets/gimpcolorframe.c:591
 msgid "Magenta:"
 msgstr "Äá tÆÆi:"
 
-#: ../app/widgets/gimpcolorframe.c:588
+#: ../app/widgets/gimpcolorframe.c:592
 msgid "Yellow:"
 msgstr "VÃng:"
 
-#: ../app/widgets/gimpcolorframe.c:589
+#: ../app/widgets/gimpcolorframe.c:593
 msgid "Black:"
 msgstr "Äen:"
 
-#: ../app/widgets/gimpcolorframe.c:609
+#: ../app/widgets/gimpcolorframe.c:613
 msgid "Alpha:"
 msgstr "Anfa"
 
-#: ../app/widgets/gimpcolormapeditor.c:208
+#: ../app/widgets/gimpcolormapeditor.c:200
 msgid "Color index:"
 msgstr "Phá lác mÃu:"
 
-#: ../app/widgets/gimpcolormapeditor.c:218
+#: ../app/widgets/gimpcolormapeditor.c:210
 msgid "HTML notation:"
 msgstr "CÃch ghi HTML:"
 
-#: ../app/widgets/gimpcolormapeditor.c:472
+#: ../app/widgets/gimpcolormapeditor.c:466
 msgid "Only indexed images have a colormap."
 msgstr ""
 
@@ -15393,151 +15867,152 @@ msgstr ""
 msgid "Palette"
 msgstr "Báng chán"
 
-#: ../app/widgets/gimpcontainerpopup.c:578
+#: ../app/widgets/gimpcontainerpopup.c:590
 msgid "Smaller Previews"
 msgstr "Xem thá nhá"
 
-#: ../app/widgets/gimpcontainerpopup.c:583
+#: ../app/widgets/gimpcontainerpopup.c:595
 msgid "Larger Previews"
 msgstr "Xem thá lán"
 
-#: ../app/widgets/gimpcontrollereditor.c:201
+#: ../app/widgets/gimpcontrollereditor.c:198
 #, fuzzy
 msgid "_Dump events from this controller"
 msgstr "Äá cÃc sá kián tá bá Äiáu khián nÃy"
 
-#: ../app/widgets/gimpcontrollereditor.c:206
+#: ../app/widgets/gimpcontrollereditor.c:203
 #, fuzzy
 msgid "_Enable this controller"
 msgstr "Bát cháy bá Äiáu khián nÃy"
 
-#: ../app/widgets/gimpcontrollereditor.c:227
+#: ../app/widgets/gimpcontrollereditor.c:224
 msgid "Name:"
 msgstr "TÃn:"
 
-#: ../app/widgets/gimpcontrollereditor.c:233
+#: ../app/widgets/gimpcontrollereditor.c:230
 msgid "State:"
 msgstr "TÃnh tráng:"
 
-#: ../app/widgets/gimpcontrollereditor.c:338
+#: ../app/widgets/gimpcontrollereditor.c:335
 msgid "Event"
 msgstr "Sá kián"
 
-#: ../app/widgets/gimpcontrollereditor.c:363
+#: ../app/widgets/gimpcontrollereditor.c:360
 msgid "_Grab event"
 msgstr "_Láy sá kián"
 
-#: ../app/widgets/gimpcontrollereditor.c:372
+#: ../app/widgets/gimpcontrollereditor.c:369
 msgid "Select the next event arriving from the controller"
 msgstr "Chán sá kián ká tiáp Äán vÃo tá bá Äiáu khián"
 
-#: ../app/widgets/gimpcontrollereditor.c:530
+#: ../app/widgets/gimpcontrollereditor.c:525
 #, c-format
 msgid "Remove the action assigned to '%s'"
 msgstr "Gá bá hÃnh Äáng ÄÆác gÃn cho  %s Â"
 
-#: ../app/widgets/gimpcontrollereditor.c:535
+#: ../app/widgets/gimpcontrollereditor.c:530
 #, c-format
 msgid "Assign an action to '%s'"
 msgstr "GÃn mát hÃnh Äáng cho  %s Â"
 
-#: ../app/widgets/gimpcontrollereditor.c:656
+#: ../app/widgets/gimpcontrollereditor.c:651
 #, c-format
 msgid "Select Action for Event '%s'"
 msgstr "Chán hÃnh Äáng cho dá kián  %s Â"
 
-#: ../app/widgets/gimpcontrollereditor.c:661
+#: ../app/widgets/gimpcontrollereditor.c:656
 msgid "Select Controller Event Action"
 msgstr "Chán hÃnh Äáng sá kián bá Äiáu khián"
 
-#: ../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 "Con trá lÃn"
 
-#: ../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 "Con trá xuáng"
 
-#: ../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 "Con trá bÃn trÃi"
 
-#: ../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 "Con trá bÃn trÃi"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:177
+#: ../app/widgets/gimpcontrollerkeyboard.c:175
 msgid "Keyboard"
 msgstr "BÃn phÃm"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:221
+#: ../app/widgets/gimpcontrollerkeyboard.c:216
 msgid "Keyboard Events"
 msgstr "Sá kián bÃn phÃm"
 
-#: ../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 "Sán sÃng"
 
-#: ../app/widgets/gimpcontrollerlist.c:181
+#: ../app/widgets/gimpcontrollerlist.c:182
 msgid "Available Controllers"
 msgstr "Bá Äiáu khián sán sÃng"
 
-#: ../app/widgets/gimpcontrollerlist.c:273
+#: ../app/widgets/gimpcontrollerlist.c:275
 msgid "Active Controllers"
 msgstr "Bá Äiáu khián hoát Äáng"
 
-#: ../app/widgets/gimpcontrollerlist.c:289
+#: ../app/widgets/gimpcontrollerlist.c:291
 msgid "Configure the selected controller"
 msgstr "Cáu hÃnh bá Äiáu khián ÄÆác chán"
 
-#: ../app/widgets/gimpcontrollerlist.c:297
+#: ../app/widgets/gimpcontrollerlist.c:299
 msgid "Move the selected controller up"
 msgstr "Chuyán bá Äiáu khián ÄÆác chán lÃn"
 
-#: ../app/widgets/gimpcontrollerlist.c:305
+#: ../app/widgets/gimpcontrollerlist.c:307
 msgid "Move the selected controller down"
 msgstr "Chuyán bá Äiáu khián ÄÆác chán xuáng"
 
-#: ../app/widgets/gimpcontrollerlist.c:429
+#: ../app/widgets/gimpcontrollerlist.c:425
 #, c-format
 msgid "Add '%s' to the list of active controllers"
 msgstr "ThÃm  %s  vÃo danh sÃch cÃc bá Äiáu khián hoát Äáng"
 
-#: ../app/widgets/gimpcontrollerlist.c:480
+#: ../app/widgets/gimpcontrollerlist.c:476
 #, c-format
 msgid "Remove '%s' from the list of active controllers"
 msgstr "Gá bá  %s  ra danh sÃch cÃc bá Äiáu khián hoát Äáng"
 
-#: ../app/widgets/gimpcontrollerlist.c:514
+#: ../app/widgets/gimpcontrollerlist.c:510
 msgid ""
 "There can only be one active keyboard controller.\n"
 "\n"
@@ -15548,7 +16023,7 @@ msgstr ""
 "Bán Äà cà mát bá Äiáu khián trong bÃn phÃm danh sÃch cÃc bá Äiáu khián hoát "
 "Äáng."
 
-#: ../app/widgets/gimpcontrollerlist.c:525
+#: ../app/widgets/gimpcontrollerlist.c:521
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
@@ -15559,24 +16034,40 @@ msgstr ""
 "Bán Äà cà mát bá Äiáu khián bÃnh xe trong danh sÃch cÃc bá Äiáu khián hoát "
 "Äáng."
 
-#: ../app/widgets/gimpcontrollerlist.c:551
+#: ../app/widgets/gimpcontrollerlist.c:532
+#, 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 ""
+"Cà thá cà chá mát bá Äiáu khián bÃnh xe hoát Äáng thÃi.\n"
+"\n"
+"Bán Äà cà mát bá Äiáu khián bÃnh xe trong danh sÃch cÃc bá Äiáu khián hoát "
+"Äáng."
+
+#: ../app/widgets/gimpcontrollerlist.c:558
 msgid "Remove Controller?"
 msgstr "Gá bá bá Äiáu khián khÃng?"
 
-#: ../app/widgets/gimpcontrollerlist.c:556
+#: ../app/widgets/gimpcontrollerlist.c:563
 msgid "Disable Controller"
 msgstr "Tát bá Äiáu khián"
 
-#: ../app/widgets/gimpcontrollerlist.c:558
+#: ../app/widgets/gimpcontrollerlist.c:565
 msgid "Remove Controller"
 msgstr "Gá bá bá Äiáu khián"
 
-#: ../app/widgets/gimpcontrollerlist.c:570
+#: ../app/widgets/gimpcontrollerlist.c:577
 #, c-format
 msgid "Remove Controller '%s'?"
 msgstr "Gá bá bá Äiáu khián  %s  khÃng?"
 
-#: ../app/widgets/gimpcontrollerlist.c:574
+#: ../app/widgets/gimpcontrollerlist.c:581
 msgid ""
 "Removing this controller from the list of active controllers will "
 "permanently delete all event mappings you have configured.\n"
@@ -15587,166 +16078,238 @@ msgstr ""
 "Gá bá bá Äiáu khián nÃy ra danh sÃch cÃc bá Äiáu khián hoát Äáng thà sá xÃa "
 "bá vÄnh vián mái sá Ãnh xá sá kián bán ÄÃ cáu hÃnh.\n"
 "\n"
-"CÃn chán  Tát bá Äiáu khián sá và hiáu hÃa bá Äiáu khián ÄÃ, khÃng cà gá "
-"bá nÃ."
+"CÃn chán  Tát bá Äiáu khián sá và hiáu hÃa bá Äiáu khián ÄÃ, khÃng cà gá bá "
+"nÃ."
 
 # Type: text
 # Description
 # Item in the main menu to select this package
-#: ../app/widgets/gimpcontrollerlist.c:626
+#: ../app/widgets/gimpcontrollerlist.c:633
 msgid "Configure Input Controller"
 msgstr "Cáu hÃnh bá Äiáu khián gÃ"
 
-#: ../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
+#, fuzzy
+msgid "Button 8"
+msgstr "NÃt"
+
+#: ../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
+#, fuzzy
+msgid "Button 9"
+msgstr "NÃt"
+
+#: ../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
+#, fuzzy
+msgid "Button 10"
+msgstr "NÃt"
+
+#: ../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
+#, fuzzy
+msgid "Button 11"
+msgstr "NÃt"
+
+#: ../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
+#, fuzzy
+msgid "Button 12"
+msgstr "NÃt"
+
+#: ../app/widgets/gimpcontrollermouse.c:203
+#, fuzzy
+#| msgid "Mouse Pointers"
+msgid "Mouse Buttons"
+msgstr "Con trá chuát"
+
+#: ../app/widgets/gimpcontrollermouse.c:244
+#, fuzzy
+#| msgid "Mouse Wheel Events"
+msgid "Mouse Button Events"
+msgstr "Sá kián bÃnh xe chuát"
+
+#: ../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 "Cuán lÃn"
 
-#: ../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 "Cuán xuáng"
 
-#: ../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 "Cuán bÃn trÃi"
 
-#: ../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 "Cuán bÃn phái"
 
-#: ../app/widgets/gimpcontrollerwheel.c:179
+#: ../app/widgets/gimpcontrollerwheel.c:177
 msgid "Mouse Wheel"
 msgstr "BÃnh xe chuát"
 
-#: ../app/widgets/gimpcontrollerwheel.c:223
+#: ../app/widgets/gimpcontrollerwheel.c:218
 msgid "Mouse Wheel Events"
 msgstr "Sá kián bÃnh xe chuát"
 
-#: ../app/widgets/gimpdataeditor.c:221
+#: ../app/widgets/gimpdataeditor.c:215
 msgid "Save"
 msgstr "LÆu"
 
-#: ../app/widgets/gimpdataeditor.c:229
+#: ../app/widgets/gimpdataeditor.c:223
 msgid "Revert"
 msgstr "HoÃn nguyÃn"
 
-#: ../app/widgets/gimpdataeditor.c:445
+#: ../app/widgets/gimpdataeditor.c:435
 #, c-format
 msgid "%s (read only)"
 msgstr "%s (chá Äác)"
 
-#: ../app/widgets/gimpdeviceeditor.c:161
+#: ../app/widgets/gimpdeviceeditor.c:165
 #, fuzzy
 msgid "Delete the selected device"
 msgstr "XÃa bá biáu máu ÄÆác chán."
 
-#: ../app/widgets/gimpdeviceeditor.c:469
+#: ../app/widgets/gimpdeviceeditor.c:502
 #, fuzzy
 msgid "Delete Device Settings"
 msgstr "LÆu thiát láp thiát bá nháp _ngay"
 
-#: ../app/widgets/gimpdeviceeditor.c:490
+#: ../app/widgets/gimpdeviceeditor.c:523
 #, fuzzy, c-format
 msgid "Delete \"%s\"?"
 msgstr "XÃa bá bÃt vá nÃy."
 
-#: ../app/widgets/gimpdeviceeditor.c:493
+#: ../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."
 msgstr ""
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:142
-#: ../app/widgets/gimpdynamicseditor.c:148
-#: ../app/widgets/gimpdynamicsoutputeditor.c:213
+#: ../app/widgets/gimpdeviceinfoeditor.c:140
+#: ../app/widgets/gimpdynamicseditor.c:141
+#: ../app/widgets/gimpdynamicsoutputeditor.c:68
 #, fuzzy
 msgid "Pressure"
 msgstr "Ãp suát:"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:143
+#: ../app/widgets/gimpdeviceinfoeditor.c:141
 msgid "X tilt"
 msgstr ""
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:144
+#: ../app/widgets/gimpdeviceinfoeditor.c:142
 msgid "Y tilt"
 msgstr ""
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:145
-#: ../app/widgets/gimpdynamicseditor.c:152
-#: ../app/widgets/gimpdynamicsoutputeditor.c:241
+#: ../app/widgets/gimpdeviceinfoeditor.c:143
+#: ../app/widgets/gimpdynamicseditor.c:145
+#: ../app/widgets/gimpdynamicsoutputeditor.c:72
 #, fuzzy
 msgid "Wheel"
 msgstr "BÃnh xe chuát"
 
 #. the axes
-#: ../app/widgets/gimpdeviceinfoeditor.c:192
+#: ../app/widgets/gimpdeviceinfoeditor.c:193
 msgid "Axes"
 msgstr ""
 
 #. the keys
-#: ../app/widgets/gimpdeviceinfoeditor.c:266
+#: ../app/widgets/gimpdeviceinfoeditor.c:267
 msgid "Keys"
 msgstr ""
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:366
-#: ../app/widgets/gimpdeviceinfoeditor.c:584
+#: ../app/widgets/gimpdeviceinfoeditor.c:364
+#: ../app/widgets/gimpdeviceinfoeditor.c:580
 #, fuzzy, c-format
 msgid "none"
 msgstr "(khÃng cÃ)"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:414
+#: ../app/widgets/gimpdeviceinfoeditor.c:412
 #, fuzzy, c-format
 msgid "%s Curve"
 msgstr "Cong"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:473
-#: ../app/widgets/gimpdynamicsoutputeditor.c:196
+#: ../app/widgets/gimpdeviceinfoeditor.c:471
+#: ../app/widgets/gimpdynamicsoutputeditor.c:195
 #, fuzzy
 msgid "_Reset Curve"
 msgstr "Äát _lái mÃu"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:486
+#: ../app/widgets/gimpdeviceinfoeditor.c:484
 #, c-format
 msgid "The axis '%s' has no curve"
 msgstr ""
 
-#: ../app/widgets/gimpdevicestatus.c:139
+#: ../app/widgets/gimpdevicestatus.c:136
 msgid "Save device status"
 msgstr "LÆu tráng thÃi thiát bá"
 
-#: ../app/widgets/gimpdevicestatus.c:448
+#: ../app/widgets/gimpdevicestatus.c:432
 #, c-format
 msgid "Foreground: %d, %d, %d"
 msgstr "Cánh gán: %d, %d, %d"
 
-#: ../app/widgets/gimpdevicestatus.c:453
+#: ../app/widgets/gimpdevicestatus.c:437
 #, c-format
 msgid "Background: %d, %d, %d"
 msgstr "Nán: %d, %d, %d"
@@ -15794,48 +16357,41 @@ msgctxt "dock"
 msgid " | "
 msgstr ""
 
-#: ../app/widgets/gimpdockbook.c:290
+#: ../app/widgets/gimpdockbook.c:292
 msgid "Configure this tab"
 msgstr "Cáu hÃnh thanh nÃy"
 
 #. Auto button
-#: ../app/widgets/gimpdockwindow.c:353
+#: ../app/widgets/gimpdockwindow.c:382
 msgid "Auto"
 msgstr "Tá Äáng"
 
-#: ../app/widgets/gimpdockwindow.c:364
+#: ../app/widgets/gimpdockwindow.c:393
 msgid ""
 "When enabled the dialog automatically follows the image you are working on."
 msgstr "Khi bát thà thoái tá Äáng theo ánh bán Äang táo."
 
-#: ../app/widgets/gimpdrawabletreeview.c:124
+#: ../app/widgets/gimpdrawabletreeview.c:122
 #, fuzzy
 msgid "Lock pixels"
 msgstr "Äiám ánh"
 
-#: ../app/widgets/gimpdynamicseditor.c:133
-#: ../app/widgets/gimpdynamicseditor.c:139
+#: ../app/widgets/gimpdynamicseditor.c:135
 msgid "Mapping matrix"
 msgstr ""
 
-#: ../app/widgets/gimpdynamicseditor.c:149
-#: ../app/widgets/gimpdynamicsoutputeditor.c:220
+#: ../app/widgets/gimpdynamicseditor.c:142
+#: ../app/widgets/gimpdynamicsoutputeditor.c:69
 msgid "Velocity"
 msgstr ""
 
-#: ../app/widgets/gimpdynamicseditor.c:151
-#: ../app/widgets/gimpdynamicsoutputeditor.c:234
-#, fuzzy
-msgid "Tilt"
-msgstr "NghiÃng:"
-
-#: ../app/widgets/gimpdynamicseditor.c:153
-#: ../app/widgets/gimpdynamicsoutputeditor.c:248
+#: ../app/widgets/gimpdynamicseditor.c:146
+#: ../app/widgets/gimpdynamicsoutputeditor.c:73
 msgid "Random"
 msgstr ""
 
-#: ../app/widgets/gimpdynamicseditor.c:154
-#: ../app/widgets/gimpdynamicsoutputeditor.c:255
+#: ../app/widgets/gimpdynamicseditor.c:147
+#: ../app/widgets/gimpdynamicsoutputeditor.c:74
 #, fuzzy
 msgid "Fade"
 msgstr "LÃm má dán"
@@ -15853,160 +16409,153 @@ msgstr "Chuyán hÆáng lái cÃc thÃng Äiáp vÃo thiát bá lái chu
 msgid "%s Message"
 msgstr "ThÃng Äiáp %s"
 
-#: ../app/widgets/gimpfiledialog.c:326
+#: ../app/widgets/gimpfiledialog.c:327
 msgid "Automatically Detected"
 msgstr "Tá Äáng phÃt hián"
 
-#: ../app/widgets/gimpfiledialog.c:343
+#: ../app/widgets/gimpfiledialog.c:344
 msgid "By Extension"
 msgstr "Theo phán má ráng"
 
-#: ../app/widgets/gimpfiledialog.c:799
+#: ../app/widgets/gimpfiledialog.c:790
 msgid "All files"
 msgstr "Mái táp tin"
 
-#: ../app/widgets/gimpfiledialog.c:804
+#: ../app/widgets/gimpfiledialog.c:795
 msgid "All images"
 msgstr "Mái ánh"
 
-#: ../app/widgets/gimpfiledialog.c:980
+#: ../app/widgets/gimpfiledialog.c:971
 #, c-format
 msgid "Select File _Type (%s)"
 msgstr "Chán kiáu _táp tin (%s)"
 
-#: ../app/widgets/gimpfileprocview.c:186
+#: ../app/widgets/gimpfileprocview.c:185
 msgid "File Type"
 msgstr "Kiáu táp tin"
 
-#: ../app/widgets/gimpfileprocview.c:198
+#: ../app/widgets/gimpfileprocview.c:197
 msgid "Extensions"
 msgstr "Phán má ráng"
 
-#: ../app/widgets/gimpfilleditor.c:127
+#: ../app/widgets/gimpfilleditor.c:124
 #, fuzzy
 msgid "Fill Color"
 msgstr "TÃ _báng mÃu cánh gán"
 
-#: ../app/widgets/gimpfilleditor.c:145
+#: ../app/widgets/gimpfilleditor.c:143
 msgid "_Antialiasing"
 msgstr "LÃm t_rÆn"
 
-#. Instant update toggle
-#: ../app/widgets/gimpgradienteditor.c:413
-msgid "Instant update"
-msgstr "Cáp nhát ngay"
-
-#: ../app/widgets/gimpgradienteditor.c:775
+#: ../app/widgets/gimpgradienteditor.c:753
 #, c-format
 msgid "Zoom factor: %d:1"
 msgstr "Há sá thu phÃng: %d:1"
 
-#: ../app/widgets/gimpgradienteditor.c:778
+#: ../app/widgets/gimpgradienteditor.c:756
 #, fuzzy, c-format
 msgid "Displaying [%0.4f, %0.4f]"
 msgstr "Hián thá [%0.6f, %0.6f]"
 
-#: ../app/widgets/gimpgradienteditor.c:997
+#: ../app/widgets/gimpgradienteditor.c:953
 #, fuzzy, c-format
 msgid "Position: %0.4f"
 msgstr "Vá trÃ: %0.6f"
 
-#: ../app/widgets/gimpgradienteditor.c:998
+#: ../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:1000
+#: ../app/widgets/gimpgradienteditor.c:956
 #, fuzzy, c-format
 msgid "HSV (%0.1f, %0.1f, %0.1f)"
 msgstr "HSV (%0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpgradienteditor.c:1002
+#: ../app/widgets/gimpgradienteditor.c:958
 #, fuzzy, c-format
 msgid "Luminance: %0.1f    Opacity: %0.1f"
 msgstr "Äá trÆng: %0.3f    Äá má Äác: %0.3f"
 
-#: ../app/widgets/gimpgradienteditor.c:1033
+#: ../app/widgets/gimpgradienteditor.c:989
 #, c-format
 msgid "RGB (%d, %d, %d)"
 msgstr "RGB (%d, %d, %d)"
 
-#: ../app/widgets/gimpgradienteditor.c:1044
+#: ../app/widgets/gimpgradienteditor.c:1000
 msgid "Foreground color set to:"
 msgstr "MÃu cánh gán Äát lÃ:"
 
-#: ../app/widgets/gimpgradienteditor.c:1051
+#: ../app/widgets/gimpgradienteditor.c:1007
 msgid "Background color set to:"
 msgstr "MÃu nán Äát lÃ:"
 
-#: ../app/widgets/gimpgradienteditor.c:1285
-#: ../app/widgets/gimpgradienteditor.c:1351
-#, c-format
-msgid "%s%sDrag: move & compress"
+#: ../app/widgets/gimpgradienteditor.c:1235
+#: ../app/widgets/gimpgradienteditor.c:1296
+#, fuzzy, c-format
+#| msgid "%s%sDrag: move & compress"
+msgid "%s-Drag: move & compress"
 msgstr "%s%sKÃo: chuyán và nÃn"
 
-#: ../app/widgets/gimpgradienteditor.c:1291
+#: ../app/widgets/gimpgradienteditor.c:1240
 msgid "Drag: move"
 msgstr "KÃo: chuyán"
 
-#: ../app/widgets/gimpgradienteditor.c:1298
-#: ../app/widgets/gimpgradienteditor.c:1312
-#: ../app/widgets/gimpgradienteditor.c:1326
-#: ../app/widgets/gimpgradienteditor.c:1348
-#, c-format
-msgid "%s%sClick: extend selection"
+#: ../app/widgets/gimpgradienteditor.c:1247
+#: ../app/widgets/gimpgradienteditor.c:1260
+#: ../app/widgets/gimpgradienteditor.c:1273
+#: ../app/widgets/gimpgradienteditor.c:1294
+#, fuzzy, c-format
+#| msgid "%s%sClick: extend selection"
+msgid "%s-Click: extend selection"
 msgstr "%s%sNháp: má ráng vÃng chán"
 
-#: ../app/widgets/gimpgradienteditor.c:1304
-#: ../app/widgets/gimpgradienteditor.c:1318
+#: ../app/widgets/gimpgradienteditor.c:1252
+#: ../app/widgets/gimpgradienteditor.c:1265
 msgid "Click: select"
 msgstr "Nháp: chán"
 
-#: ../app/widgets/gimpgradienteditor.c:1332
-#: ../app/widgets/gimpgradienteditor.c:1356
+#: ../app/widgets/gimpgradienteditor.c:1278
+#: ../app/widgets/gimpgradienteditor.c:1300
 msgid "Click: select    Drag: move"
 msgstr "Nháp: chán    KÃo: chuyán"
 
-#: ../app/widgets/gimpgradienteditor.c:1571
-#: ../app/widgets/gimpgradienteditor.c:1579
+#: ../app/widgets/gimpgradienteditor.c:1515
+#: ../app/widgets/gimpgradienteditor.c:1523
 #, fuzzy, c-format
 msgid "Handle position: %0.4f"
 msgstr "Vá trà mÃc: %0.6f"
 
-#: ../app/widgets/gimpgradienteditor.c:1596
+#: ../app/widgets/gimpgradienteditor.c:1540
 #, fuzzy, c-format
 msgid "Distance: %0.4f"
 msgstr "Khoáng cÃch: %0.6f"
 
-#: ../app/widgets/gimpgrideditor.c:216
+#: ../app/widgets/gimpgrideditor.c:147
 msgid "Line _style:"
 msgstr "_Kiáu dÃng:"
 
-#: ../app/widgets/gimpgrideditor.c:220
+#: ../app/widgets/gimpgrideditor.c:151
 msgid "Change grid foreground color"
 msgstr "Äái mÃu cánh gán lÆái"
 
-#: ../app/widgets/gimpgrideditor.c:227
+#: ../app/widgets/gimpgrideditor.c:158
 msgid "_Foreground color:"
 msgstr "MÃu cánh _gán:"
 
-#: ../app/widgets/gimpgrideditor.c:231
+#: ../app/widgets/gimpgrideditor.c:162
 msgid "Change grid background color"
 msgstr "Äái mÃu nán lÆái"
 
-#: ../app/widgets/gimpgrideditor.c:238
+#: ../app/widgets/gimpgrideditor.c:169
 msgid "_Background color:"
 msgstr "MÃu _nán:"
 
-#: ../app/widgets/gimpgrideditor.c:243
-msgid "Spacing"
-msgstr "Khoáng cÃch"
-
-#: ../app/widgets/gimpgrideditor.c:264 ../app/widgets/gimpgrideditor.c:296
+#: ../app/widgets/gimpgrideditor.c:195 ../app/widgets/gimpgrideditor.c:227
 msgid "Width"
 msgstr "Ráng"
 
-#: ../app/widgets/gimpgrideditor.c:266 ../app/widgets/gimpgrideditor.c:298
+#: ../app/widgets/gimpgrideditor.c:197 ../app/widgets/gimpgrideditor.c:229
 msgid "Height"
 msgstr "Cao"
 
@@ -16103,120 +16652,111 @@ msgstr ""
 msgid "Querying..."
 msgstr "Truy ván"
 
-#: ../app/widgets/gimpimagepropview.c:122
+#: ../app/widgets/gimpimagepropview.c:120
 #, fuzzy
 msgid "Size in pixels:"
 msgstr "Cá trong bá nhá:"
 
-#: ../app/widgets/gimpimagepropview.c:125
+#: ../app/widgets/gimpimagepropview.c:123
 msgid "Print size:"
 msgstr "Cá in án:"
 
-#: ../app/widgets/gimpimagepropview.c:128
+#: ../app/widgets/gimpimagepropview.c:126
 msgid "Resolution:"
 msgstr "Äá phÃn giái:"
 
-#: ../app/widgets/gimpimagepropview.c:131
+#: ../app/widgets/gimpimagepropview.c:129
 msgid "Color space:"
 msgstr "Mián mÃu:"
 
-#: ../app/widgets/gimpimagepropview.c:136
+#: ../app/widgets/gimpimagepropview.c:134
 #, fuzzy
 msgid "File Name:"
 msgstr "TÃn:"
 
-#: ../app/widgets/gimpimagepropview.c:142
+#: ../app/widgets/gimpimagepropview.c:140
 #, fuzzy
 msgid "File Size:"
 msgstr "Cá :"
 
-#: ../app/widgets/gimpimagepropview.c:145
+#: ../app/widgets/gimpimagepropview.c:143
 #, fuzzy
 msgid "File Type:"
 msgstr "Kiáu táp tin"
 
-#: ../app/widgets/gimpimagepropview.c:150
+#: ../app/widgets/gimpimagepropview.c:148
 msgid "Size in memory:"
 msgstr "Cá trong bá nhá:"
 
-#: ../app/widgets/gimpimagepropview.c:153
+#: ../app/widgets/gimpimagepropview.c:151
 msgid "Undo steps:"
 msgstr "BÆác háy bÆác:"
 
-#: ../app/widgets/gimpimagepropview.c:156
+#: ../app/widgets/gimpimagepropview.c:154
 msgid "Redo steps:"
 msgstr "BÆác lÃm lái:"
 
-#: ../app/widgets/gimpimagepropview.c:161
+#: ../app/widgets/gimpimagepropview.c:159
 msgid "Number of pixels:"
 msgstr "Sá Äiám ánh:"
 
-#: ../app/widgets/gimpimagepropview.c:164
+#: ../app/widgets/gimpimagepropview.c:162
 msgid "Number of layers:"
 msgstr "Sá láp:"
 
-#: ../app/widgets/gimpimagepropview.c:167
+#: ../app/widgets/gimpimagepropview.c:165
 msgid "Number of channels:"
 msgstr "Sá kÃnh:"
 
-#: ../app/widgets/gimpimagepropview.c:170
+#: ../app/widgets/gimpimagepropview.c:168
 msgid "Number of paths:"
 msgstr "Sá ÄÆáng dán:"
 
 #. no undo (or redo) steps available
-#: ../app/widgets/gimpimagepropview.c:416
+#: ../app/widgets/gimpimagepropview.c:408
 msgid "None"
 msgstr "KhÃng cÃ"
 
-#: ../app/widgets/gimpimagepropview.c:470
+#: ../app/widgets/gimpimagepropview.c:462
+#: ../app/widgets/gimptemplateeditor.c:331
 #, c-format
 msgid "pixels/%s"
 msgstr "Äiám ánh/%s"
 
-#: ../app/widgets/gimpimagepropview.c:472
+#: ../app/widgets/gimpimagepropview.c:464
 #, c-format
 msgid "%g à %g %s"
 msgstr "%g à %g %s"
 
-#: ../app/widgets/gimpimagepropview.c:493
+#: ../app/widgets/gimpimagepropview.c:485
 msgid "colors"
 msgstr "mÃu"
 
-#: ../app/widgets/gimpitemtreeview.c:708
+#: ../app/widgets/gimpitemtreeview.c:716
 msgid "Lock:"
 msgstr "KhÃa:"
 
-#: ../app/widgets/gimpitemtreeview.c:1481
-msgid "Set Item Exclusive Visible"
-msgstr "Äát mác hián thá dÃnh riÃng"
-
-#: ../app/widgets/gimpitemtreeview.c:1489
-msgid "Set Item Exclusive Linked"
-msgstr "Äát mác ÄÃ liÃn kát dÃnh riÃng"
-
-#: ../app/widgets/gimplayertreeview.c:309
+#: ../app/widgets/gimplayertreeview.c:307
 msgid "Lock alpha channel"
 msgstr "KhÃa kÃnh anfa"
 
-#: ../app/widgets/gimpmessagebox.c:439
-#, c-format
-msgid "Message repeated %d times."
-msgstr "Láp lái thÃng Äiáp %d lán."
-
-#: ../app/widgets/gimpmessagebox.c:441
+#: ../app/widgets/gimpmessagebox.c:433
+#, fuzzy, c-format
+#| msgid "Message repeated once."
 msgid "Message repeated once."
-msgstr "Láp lái thÃng Äiáp mát lán."
+msgid_plural "Message repeated %d times."
+msgstr[0] "Láp lái thÃng Äiáp mát lán."
 
-#: ../app/widgets/gimppaletteeditor.c:252
-#: ../app/widgets/gimppaletteeditor.c:743
+#: ../app/widgets/gimppaletteeditor.c:226
+#: ../app/widgets/gimppaletteeditor.c:682
 msgid "Undefined"
 msgstr "ChÆa Äánh nghÄa"
 
-#: ../app/widgets/gimppaletteeditor.c:260
+#: ../app/widgets/gimppaletteeditor.c:234
 msgid "Columns:"
 msgstr "Cát:"
 
-#: ../app/widgets/gimpprofilechooserdialog.c:136
+#: ../app/widgets/gimpprofilechooserdialog.c:127
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr ""
 
@@ -16239,109 +16779,109 @@ msgstr ""
 msgid "Invalid UTF-8"
 msgstr "UTF-8 khÃng háp lá"
 
-#: ../app/widgets/gimpsettingsbox.c:241
+#: ../app/widgets/gimpsettingsbox.c:269
 #, fuzzy
 msgid "Pick a setting from the list"
 msgstr "Chán lác mÃu tá ánh"
 
-#: ../app/widgets/gimpsettingsbox.c:262
+#: ../app/widgets/gimpsettingsbox.c:291
 #, fuzzy
 msgid "Add settings to favorites"
 msgstr "LÆu thiát láp ÄÆáng cong vÃo táp tin."
 
-#: ../app/widgets/gimpsettingsbox.c:290
+#: ../app/widgets/gimpsettingsbox.c:319
 #, fuzzy
 msgid "_Import Settings from File..."
 msgstr "Tái thiát láp ÄÆáng cong tá táp tin."
 
-#: ../app/widgets/gimpsettingsbox.c:296
+#: ../app/widgets/gimpsettingsbox.c:325
 #, fuzzy
 msgid "_Export Settings to File..."
 msgstr "_LÆu bán ghi lái vÃo táp tin..."
 
-#: ../app/widgets/gimpsettingsbox.c:303
+#: ../app/widgets/gimpsettingsbox.c:332
 #, fuzzy
 msgid "_Manage Settings..."
 msgstr "T_rán cÃc báng chán..."
 
-#: ../app/widgets/gimpsettingsbox.c:590
+#: ../app/widgets/gimpsettingsbox.c:625
 msgid "Add Settings to Favorites"
 msgstr ""
 
-#: ../app/widgets/gimpsettingsbox.c:593
+#: ../app/widgets/gimpsettingsbox.c:628
 #, fuzzy
 msgid "Enter a name for the settings"
 msgstr "HÃy nháp tÃn cho tÃy chán ÄÃ lÆu."
 
-#: ../app/widgets/gimpsettingsbox.c:594
+#: ../app/widgets/gimpsettingsbox.c:629
 #, fuzzy
 msgid "Saved Settings"
 msgstr "TÃy chán ÄÃ lÆu"
 
-#: ../app/widgets/gimpsettingsbox.c:630
+#: ../app/widgets/gimpsettingsbox.c:670
 #, fuzzy
 msgid "Manage Saved Settings"
 msgstr "Thay tÃ_n cáa tÃy chán ÄÃ lÆu"
 
-#: ../app/widgets/gimpsettingseditor.c:174
+#: ../app/widgets/gimpsettingseditor.c:194
 #, fuzzy
 msgid "Import settings from a file"
 msgstr "Tái thiát láp ÄÆáng cong tá táp tin."
 
-#: ../app/widgets/gimpsettingseditor.c:183
+#: ../app/widgets/gimpsettingseditor.c:203
 #, fuzzy
 msgid "Export the selected settings to a file"
 msgstr "LÆu thiát láp mác vÃo táp tin"
 
-#: ../app/widgets/gimpsettingseditor.c:192
+#: ../app/widgets/gimpsettingseditor.c:212
 #, fuzzy
 msgid "Delete the selected settings"
 msgstr "XÃa bá biáu máu ÄÆác chán."
 
-#: ../app/widgets/gimpsizebox.c:460
+#: ../app/widgets/gimpsizebox.c:453
 #, c-format
 msgid "%d à %d ppi"
 msgstr "%d à %d ppi"
 
-#: ../app/widgets/gimpsizebox.c:462
+#: ../app/widgets/gimpsizebox.c:455
 #, c-format
 msgid "%d ppi"
 msgstr "%d ppi"
 
-#: ../app/widgets/gimpstrokeeditor.c:187
+#: ../app/widgets/gimpstrokeeditor.c:129
 msgid "Line width:"
 msgstr "Äá ráng dÃng:"
 
-#: ../app/widgets/gimpstrokeeditor.c:199
+#: ../app/widgets/gimpstrokeeditor.c:141
 msgid "_Line Style"
 msgstr "_Kiáu dÃng dÃng"
 
-#: ../app/widgets/gimpstrokeeditor.c:218
+#: ../app/widgets/gimpstrokeeditor.c:160
 msgid "_Cap style:"
 msgstr "Kiáu dÃng _cháp:"
 
-#: ../app/widgets/gimpstrokeeditor.c:224
+#: ../app/widgets/gimpstrokeeditor.c:166
 msgid "_Join style:"
 msgstr "Kiáu dÃng _nái kát:"
 
-#: ../app/widgets/gimpstrokeeditor.c:229
+#: ../app/widgets/gimpstrokeeditor.c:171
 msgid "_Miter limit:"
 msgstr "Giái hán _vuÃng gÃc:"
 
-#: ../app/widgets/gimpstrokeeditor.c:236
+#: ../app/widgets/gimpstrokeeditor.c:178
 msgid "Dash pattern:"
 msgstr "Máu gách:"
 
-#: ../app/widgets/gimpstrokeeditor.c:299
+#: ../app/widgets/gimpstrokeeditor.c:241
 msgid "Dash _preset:"
 msgstr "Gách Äánh _sán:"
 
-#: ../app/widgets/gimptagentry.c:43
+#: ../app/widgets/gimptagentry.c:45
 #, fuzzy
 msgid "filter"
 msgstr "Bá _lác"
 
-#: ../app/widgets/gimptagentry.c:44
+#: ../app/widgets/gimptagentry.c:46
 #, fuzzy
 msgid "enter tags"
 msgstr "Äát cÃc ÄÆáng á giáa"
@@ -16350,45 +16890,45 @@ msgstr "Äát cÃc ÄÆáng á giáa"
 #. * 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:1714
 msgid ","
 msgstr ""
 
-#: ../app/widgets/gimptemplateeditor.c:179
+#: ../app/widgets/gimptemplateeditor.c:201
 #, c-format
 msgid "%p"
 msgstr "%p"
 
-#: ../app/widgets/gimptemplateeditor.c:254
+#: ../app/widgets/gimptemplateeditor.c:276
 msgid "_Advanced Options"
 msgstr "TÃy chán nÃng c_ao"
 
-#: ../app/widgets/gimptemplateeditor.c:361
+#: ../app/widgets/gimptemplateeditor.c:387
 msgid "Color _space:"
 msgstr "_Mián mÃu:"
 
-#: ../app/widgets/gimptemplateeditor.c:369
+#: ../app/widgets/gimptemplateeditor.c:395
 msgid "_Fill with:"
 msgstr "TÃ Äáy _báng:"
 
-#: ../app/widgets/gimptemplateeditor.c:379
+#: ../app/widgets/gimptemplateeditor.c:405
 msgid "Comme_nt:"
 msgstr "_Ghi chà :"
 
-#: ../app/widgets/gimptemplateeditor.c:529
+#: ../app/widgets/gimptemplateeditor.c:512
 msgid "_Name:"
 msgstr "TÃ_n:"
 
-#: ../app/widgets/gimptemplateeditor.c:542
+#: ../app/widgets/gimptemplateeditor.c:519
 msgid "_Icon:"
 msgstr "B_iáu tÆáng:"
 
-#: ../app/widgets/gimptemplateeditor.c:670
+#: ../app/widgets/gimptemplateeditor.c:683
 #, c-format
 msgid "%d à %d ppi, %s"
 msgstr "%d à %d ppi, %s"
 
-#: ../app/widgets/gimptemplateeditor.c:672
+#: ../app/widgets/gimptemplateeditor.c:685
 #, c-format
 msgid "%d ppi, %s"
 msgstr "%d ppi, %s"
@@ -16403,61 +16943,90 @@ msgstr ""
 msgid "Outermost element in text must be <markup> not <%s>"
 msgstr ""
 
-#: ../app/widgets/gimptextbuffer.c:1456
+#: ../app/widgets/gimptextbuffer.c:1454
 #, c-format
 msgid "Invalid UTF-8 data in file '%s'."
 msgstr "Gáp dá liáu UTF-8 khÃng háp lá trong táp tin  %s Â."
 
-#: ../app/widgets/gimptexteditor.c:205
+#: ../app/widgets/gimptexteditor.c:222
 msgid "_Use selected font"
 msgstr "_DÃng phÃng chá ÄÆác chán"
 
-#: ../app/widgets/gimptextstyleeditor.c:199
+#: ../app/widgets/gimptextstyleeditor.c:206
 #, fuzzy
-msgid "Change size of selected text"
+msgid "Change font of selected text"
 msgstr "Thay Äái kÃch cá cáa nái dung láp"
 
-#: ../app/widgets/gimptextstyleeditor.c:206
-msgid "Change color of selected text"
-msgstr ""
+#: ../app/widgets/gimptextstyleeditor.c:217
+#, fuzzy
+msgid "Change size of selected text"
+msgstr "Thay Äái kÃch cá cáa nái dung láp"
 
-#: ../app/widgets/gimptextstyleeditor.c:231
+#: ../app/widgets/gimptextstyleeditor.c:236
 #, fuzzy
 msgid "Clear style of selected text"
 msgstr "Xoà cÃc Äiám ánh Äà chán"
 
-#: ../app/widgets/gimptextstyleeditor.c:251
+#: ../app/widgets/gimptextstyleeditor.c:247
+#: ../app/widgets/gimptextstyleeditor.c:256
+msgid "Change color of selected text"
+msgstr ""
+
+#: ../app/widgets/gimptextstyleeditor.c:272
 msgid "Change kerning of selected text"
 msgstr ""
 
-#: ../app/widgets/gimptextstyleeditor.c:267
+#: ../app/widgets/gimptextstyleeditor.c:288
 #, fuzzy
 msgid "Change baseline of selected text"
 msgstr "Thay Äái kÃch cá cáa nái dung láp"
 
+#: ../app/widgets/gimptextstyleeditor.c:325
+#, fuzzy
+#| msgid "Blend"
+msgid "Bold"
+msgstr "Háp nhau"
+
+#: ../app/widgets/gimptextstyleeditor.c:328
+msgid "Italic"
+msgstr ""
+
+#: ../app/widgets/gimptextstyleeditor.c:331
+#, fuzzy
+#| msgid "Undefined"
+msgid "Underline"
+msgstr "ChÆa Äánh nghÄa"
+
+#: ../app/widgets/gimptextstyleeditor.c:334
+msgid "Strikethrough"
+msgstr ""
+
 #: ../app/widgets/gimpthumbbox.c:330
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Click to update preview\n"
+#| "%s%sClick to force update even if preview is up-to-date"
 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 ""
 "HÃy nháp Äá cáp nhát khung xem thá\n"
 "%s%sNháp Äá Ãp buác cáp nhát thám chà náu khung xem thá Äang hián thái"
 
-#: ../app/widgets/gimpthumbbox.c:348
+#: ../app/widgets/gimpthumbbox.c:347
 msgid "Pr_eview"
 msgstr "X_em thá"
 
-#: ../app/widgets/gimpthumbbox.c:403 ../app/widgets/gimpthumbbox.c:467
+#: ../app/widgets/gimpthumbbox.c:404 ../app/widgets/gimpthumbbox.c:468
 msgid "No selection"
 msgstr "ChÆa chán gÃ"
 
-#: ../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 "HÃnh thu nhá %d trÃn %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 "Äang táo à xem thá..."
 
@@ -16543,122 +17112,138 @@ msgstr "Há tháp cÃng cá nÃy xuáng dÆái cÃc Äiáu khÃc."
 msgid "Reset tool order and visibility"
 msgstr "Äát lái thá tá cÃc cÃng cá và cÃch hián thá chÃng."
 
-#: ../app/widgets/gimptooloptionseditor.c:218
-msgid "Save options to..."
-msgstr "LÆu cÃc tÃy chán vÃo..."
+#: ../app/widgets/gimptooloptionseditor.c:202
+#, fuzzy
+msgid "Save Tool Preset..."
+msgstr "_Sáa mÃu..."
 
-#: ../app/widgets/gimptooloptionseditor.c:226
-msgid "Restore options from..."
-msgstr "Phác hái cÃc tÃy chán tá..."
+#: ../app/widgets/gimptooloptionseditor.c:210
+#, fuzzy
+msgid "Restore Tool Preset..."
+msgstr "_Sáa mÃu..."
 
-#: ../app/widgets/gimptooloptionseditor.c:234
-msgid "Delete saved options..."
-msgstr "XÃa bá cÃc tÃy chán ÄÃ lÆu..."
+#: ../app/widgets/gimptooloptionseditor.c:218
+#, fuzzy
+msgid "Delete Tool Preset..."
+msgstr "_XÃa bá mÃu"
 
-#: ../app/widgets/gimptooloptionseditor.c:592
-#, fuzzy, c-format
-msgid "Error saving tool options presets: %s"
-msgstr "Gáp lái khi lÆu táp tin XCF: %s"
+#: ../app/widgets/gimptoolpreseteditor.c:126
+#, fuzzy
+#| msgid "_Icon:"
+msgid "Icon:"
+msgstr "B_iáu tÆáng:"
 
-#: ../app/widgets/gimptoolpreseteditor.c:109
+#: ../app/widgets/gimptoolpreseteditor.c:136
 msgid "Apply stored FG/BG"
 msgstr ""
 
-#: ../app/widgets/gimptoolpreseteditor.c:115
+#: ../app/widgets/gimptoolpreseteditor.c:141
 #, fuzzy
 msgid "Apply stored brush"
 msgstr "NhÃn ÄÃi bÃt vá nÃy"
 
-#: ../app/widgets/gimptoolpreseteditor.c:121
+#: ../app/widgets/gimptoolpreseteditor.c:146
 msgid "Apply stored dynamics"
 msgstr ""
 
-#: ../app/widgets/gimptoolpreseteditor.c:127
+#: ../app/widgets/gimptoolpreseteditor.c:151
 #, fuzzy
 msgid "Apply stored gradient"
 msgstr "NhÃn ÄÃi Äá dác"
 
-#: ../app/widgets/gimptoolpreseteditor.c:133
+#: ../app/widgets/gimptoolpreseteditor.c:156
 #, fuzzy
 msgid "Apply stored pattern"
 msgstr "NhÃn ÄÃi máu nÃy"
 
-#: ../app/widgets/gimptoolpreseteditor.c:139
+#: ../app/widgets/gimptoolpreseteditor.c:161
 #, fuzzy
-msgid "Apply stored pallete"
+msgid "Apply stored palette"
 msgstr "ThÃm vÃo báng chán"
 
-#: ../app/widgets/gimptoolpreseteditor.c:145
+#: ../app/widgets/gimptoolpreseteditor.c:166
 msgid "Apply stored font"
 msgstr ""
 
-#: ../app/widgets/gimptranslationstore.c:105
+#: ../app/widgets/gimptoolpreseteditor.c:258
+#, fuzzy, c-format
+#| msgid "Dash _preset:"
+msgid "%s Preset"
+msgstr "Gách Äánh _sán:"
+
+#: ../app/widgets/gimptranslationstore.c:100
 msgid "System Language"
 msgstr ""
 
-#: ../app/widgets/gimptranslationstore.c:107
+#: ../app/widgets/gimptranslationstore.c:102
 msgid "English"
 msgstr ""
 
-#: ../app/widgets/gimpuimanager.c:750
+#: ../app/widgets/gimpuimanager.c:742
 msgid "Your GIMP installation is incomplete:"
 msgstr "CÃi Äát GIMP xong rái."
 
-#: ../app/widgets/gimpuimanager.c:752
+#: ../app/widgets/gimpuimanager.c:744
 #, fuzzy
 msgid "Please make sure the menu XML files are correctly installed."
 msgstr "HÃy kiám tra ÄÃ cÃi Äát ÄÃng cÃc táp tin trÃnh ÄÆn 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 "Gáp lái khi phÃn tÃch lái Äánh nghÄa trÃnh ÄÆn tá %s: %s"
 
-#: ../app/widgets/gimpundoeditor.c:270
+#: ../app/widgets/gimpundoeditor.c:262
 msgid "[ Base Image ]"
 msgstr "[ ánh cÆ bán ]"
 
-#: ../app/widgets/gimpvectorstreeview.c:112
+#: ../app/widgets/gimpvectorstreeview.c:111
 #, fuzzy
 msgid "Lock path strokes"
 msgstr "Kát nái cÃc nÃt vá"
 
-#: ../app/widgets/gimpviewablebox.c:80
+#: ../app/widgets/gimpviewablebox.c:86
 msgid "Open the brush selection dialog"
 msgstr "Má thoái chán bÃt vá"
 
-#: ../app/widgets/gimpviewablebox.c:137
+#: ../app/widgets/gimpviewablebox.c:150
+#, fuzzy
+#| msgid "Open the font selection dialog"
+msgid "Open the dynamics selection dialog"
+msgstr "Má thoái chán phÃng chá"
+
+#: ../app/widgets/gimpviewablebox.c:215
 msgid "Open the pattern selection dialog"
 msgstr "Má thoái chán máu"
 
-#: ../app/widgets/gimpviewablebox.c:203
+#: ../app/widgets/gimpviewablebox.c:283
 msgid "Open the gradient selection dialog"
 msgstr "Má thoái chán Äá dác"
 
-#: ../app/widgets/gimpviewablebox.c:305
+#: ../app/widgets/gimpviewablebox.c:400
 msgid "Open the palette selection dialog"
 msgstr "Má thoái chán báng chán"
 
-#: ../app/widgets/gimpviewablebox.c:363
+#: ../app/widgets/gimpviewablebox.c:465
 msgid "Open the font selection dialog"
 msgstr "Má thoái chán phÃng chá"
 
-#: ../app/widgets/gimpwidgets-utils.c:670
+#: ../app/widgets/gimpwidgets-utils.c:595
 #, c-format
 msgid "%s (try %s)"
 msgstr "%s (thá %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:670
+#: ../app/widgets/gimpwidgets-utils.c:595
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (thá %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:674
+#: ../app/widgets/gimpwidgets-utils.c:599
 #, c-format
 msgid "%s (try %s, %s)"
 msgstr "%s (thá %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:678
+#: ../app/widgets/gimpwidgets-utils.c:603
 #, c-format
 msgid "%s (try %s, %s, %s)"
 msgstr "%s (thá %s, %s, %s)"
@@ -16789,19 +17374,19 @@ msgctxt "tab-style"
 msgid "Undefined"
 msgstr "ChÆa Äánh nghÄa"
 
-#: ../app/xcf/xcf-load.c:332
+#: ../app/xcf/xcf-load.c:334
 msgid ""
 "This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
 "incomplete."
 msgstr ""
 
-#: ../app/xcf/xcf-load.c:343
+#: ../app/xcf/xcf-load.c:345
 msgid ""
 "This XCF file is corrupt!  I could not even salvage any partial image data "
 "from it."
 msgstr ""
 
-#: ../app/xcf/xcf-load.c:407
+#: ../app/xcf/xcf-load.c:418
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -16811,7 +17396,7 @@ msgstr ""
 "táp tin XCF Äà khÃng lÆu ÄÃng bá trà mÃu.\n"
 "NhÆ thá thà Äang thay thá bá trà cÃn báng xÃm."
 
-#: ../app/xcf/xcf-read.c:108
+#: ../app/xcf/xcf-read.c:115
 msgid "Invalid UTF-8 string in XCF file"
 msgstr "Gáp chuái UTF-8 khÃng háp lá trong táp tin XCF."
 
@@ -16866,35 +17451,192 @@ msgstr "Táo và biÃn soán ánh hay ánh cháp"
 msgid "Image Editor"
 msgstr "Bá biÃn soán ánh"
 
-#: ../tools/gimp-remote.c:64
-msgid "Use a running GIMP only, never start a new one"
-msgstr "Chá dÃng thá hián cháy cáa GIMP, khÃng bao giá khái cháy Äiáu mái."
+#, fuzzy
+#~ msgctxt "tool-options-action"
+#~ msgid "_Save Options To"
+#~ msgstr "_LÆu tÃy chán vÃo"
+
+#, fuzzy
+#~ msgctxt "tool-options-action"
+#~ msgid "_Restore Options From"
+#~ msgstr "_Phác hái tÃy chán tá"
+
+#, fuzzy
+#~ msgctxt "tool-options-action"
+#~ msgid "Re_name Saved Options"
+#~ msgstr "Thay tÃ_n cáa tÃy chán ÄÃ lÆu"
+
+#, fuzzy
+#~ msgctxt "tool-options-action"
+#~ msgid "_Delete Saved Options"
+#~ msgstr "_XÃa bá tÃy chán ÄÃ lÆu"
 
-#: ../tools/gimp-remote.c:69
-msgid "Only check if GIMP is running, then quit"
-msgstr "Chá kiám tra náu GIMP cà cháy, rái thoÃt."
+#, fuzzy
+#~ msgctxt "tool-options-action"
+#~ msgid "_New Entry..."
+#~ msgstr "Mác _nháp mái..."
 
-#: ../tools/gimp-remote.c:75
-msgid "Print X window ID of GIMP toolbox window, then quit"
-msgstr "In mà nhán dián cáa sá X cáa cáa sá háp cÃng cá GIMP, rái thoÃt"
+#~ msgid "Save Tool Options"
+#~ msgstr "LÆu tÃy chán cÃng cá"
 
-#: ../tools/gimp-remote.c:81
-msgid "Start GIMP without showing the startup window"
-msgstr "Khái cháy GIMP, khÃng cà hián thá cáa sá khái cháy."
+#~ msgid "Enter a name for the saved options"
+#~ msgstr "HÃy nháp tÃn cho tÃy chán ÄÃ lÆu."
 
-#: ../tools/gimp-remote-x11.c:66
-msgid "Could not connect to GIMP."
-msgstr "KhÃng thá kát nái tái GIMP."
+#~ msgid "Rename Saved Tool Options"
+#~ msgstr "Äái tÃn cáa tÃy chán cÃng cá ÄÃ lÆu"
 
-#: ../tools/gimp-remote-x11.c:67
-msgid "Make sure that the Toolbox is visible!"
-msgstr "â HÃy báo Äám là Háp cÃng cá hián thá. â"
+#~ msgid "Enter a new name for the saved options"
+#~ msgstr "HÃy nháp tÃn mái cho tÃy chán ÄÃ lÆu."
 
-#. if execv and execvp return, there was an error
-#: ../tools/gimp-remote-x11.c:247
-#, c-format
-msgid "Couldn't start '%s': %s"
-msgstr "KhÃng thá khái cháy  %s Â: %s"
+#~ msgid ""
+#~ "Install a private colormap; might be useful on 8-bit (256 colors) "
+#~ "displays."
+#~ msgstr ""
+#~ "CÃi Äát mát bá trà mÃu riÃng; cà thá cà Ãch trÃn bá trÃnh bÃy 8-bit (chá "
+#~ "cà 256 mÃu)."
+
+#, fuzzy
+#~ msgid ""
+#~ "Generally only a concern for 8-bit displays, this sets the minimum number "
+#~ "of system colors allocated for GIMP."
+#~ msgstr ""
+#~ "ThÆáng chá quan tráng cho bá trÃnh bÃy 8-bit (chá 256 mÃu), già trá nÃy "
+#~ "Äát sá mÃu há tháng tái thiáu ÄÆác cáp cho trÃnh GIMP."
+
+#, fuzzy
+#~ msgid "Brush Scale"
+#~ msgstr "ThÆ mác bÃt vá"
+
+#~ msgid "Rate:"
+#~ msgstr "Tá lá:"
+
+#~ msgid "Gradient:"
+#~ msgstr "Äá dác:"
+
+#~ msgid "Threshold:"
+#~ msgstr "NgÆáng:"
+
+#, fuzzy
+#~ msgctxt "command"
+#~ msgid "Flip"
+#~ msgstr "Lát"
+
+#~ msgid "Tilt:"
+#~ msgstr "NghiÃng:"
+
+#~ msgid "Type"
+#~ msgstr "Kiáu"
+
+#~ msgid "Brush:"
+#~ msgstr "BÃt vá:"
+
+#, fuzzy
+#~ msgid "Scale:"
+#~ msgstr "Co dÃn"
+
+#~ msgid "Length:"
+#~ msgstr "Äá dÃi:"
+
+#~ msgid "Use color from gradient"
+#~ msgstr "DÃng mÃu tá Äá dác"
+
+#, fuzzy
+#~ msgctxt "command"
+#~ msgid "Perspective"
+#~ msgstr "Phái cánh..."
+
+#, fuzzy
+#~ msgctxt "command"
+#~ msgid "Rotate"
+#~ msgstr "Xoay"
+
+#, fuzzy
+#~ msgctxt "command"
+#~ msgid "Scale"
+#~ msgstr "Co dÃn"
+
+#, fuzzy
+#~ msgctxt "command"
+#~ msgid "Shear"
+#~ msgstr "KÃo cát"
+
+#~ msgid "Font:"
+#~ msgstr "PhÃng chá :"
+
+#~ msgid "Preview:"
+#~ msgstr "Xem thá:"
+
+#, fuzzy
+#~ msgctxt "transform-preview-type"
+#~ msgid "Outline"
+#~ msgstr "PhÃc tháo"
+
+#, fuzzy
+#~ msgctxt "transform-preview-type"
+#~ msgid "Grid"
+#~ msgstr "LÆái"
+
+#, fuzzy
+#~ msgctxt "transform-preview-type"
+#~ msgid "Image"
+#~ msgstr "ánh"
+
+#, fuzzy
+#~ msgctxt "transform-preview-type"
+#~ msgid "Image + Grid"
+#~ msgstr "ánh + LÆái"
+
+#~ msgid "Hardness:"
+#~ msgstr "Äá cáng:"
+
+#~ msgid "Aspect ratio:"
+#~ msgstr "Tá lá hÃnh thá:"
+
+#~ msgid "Spacing:"
+#~ msgstr "Khoáng cÃch:"
+
+#~ msgid "Instant update"
+#~ msgstr "Cáp nhát ngay"
+
+#~ msgid "Set Item Exclusive Linked"
+#~ msgstr "Äát mác ÄÃ liÃn kát dÃnh riÃng"
+
+#~ msgid "Message repeated %d times."
+#~ msgstr "Láp lái thÃng Äiáp %d lán."
+
+#~ msgid "Save options to..."
+#~ msgstr "LÆu cÃc tÃy chán vÃo..."
+
+#~ msgid "Restore options from..."
+#~ msgstr "Phác hái cÃc tÃy chán tá..."
+
+#~ msgid "Delete saved options..."
+#~ msgstr "XÃa bá cÃc tÃy chán ÄÃ lÆu..."
+
+#, fuzzy
+#~ msgid "Error saving tool options presets: %s"
+#~ msgstr "Gáp lái khi lÆu táp tin XCF: %s"
+
+#~ msgid "Use a running GIMP only, never start a new one"
+#~ msgstr "Chá dÃng thá hián cháy cáa GIMP, khÃng bao giá khái cháy Äiáu mái."
+
+#~ msgid "Only check if GIMP is running, then quit"
+#~ msgstr "Chá kiám tra náu GIMP cà cháy, rái thoÃt."
+
+#~ msgid "Print X window ID of GIMP toolbox window, then quit"
+#~ msgstr "In mà nhán dián cáa sá X cáa cáa sá háp cÃng cá GIMP, rái thoÃt"
+
+#~ msgid "Start GIMP without showing the startup window"
+#~ msgstr "Khái cháy GIMP, khÃng cà hián thá cáa sá khái cháy."
+
+#~ msgid "Could not connect to GIMP."
+#~ msgstr "KhÃng thá kát nái tái GIMP."
+
+#~ msgid "Make sure that the Toolbox is visible!"
+#~ msgstr "â HÃy báo Äám là Háp cÃng cá hián thá. â"
+
+#~ msgid "Couldn't start '%s': %s"
+#~ msgstr "KhÃng thá khái cháy  %s Â: %s"
 
 #~ msgid "(This console window will close in ten seconds)\n"
 #~ msgstr "(Cáa sá bÃn giao tiáp nÃy sá ÄÃng sau 10 giÃy.)\n"
@@ -17296,8 +18038,8 @@ msgstr "KhÃng thá khái cháy  %s Â: %s"
 
 #~ msgid ""
 #~ "PDB calling error for procedure '%s':\n"
-#~ "Argument '%s' (#%d, type %s) out of bounds (validation changed '%s' to "
-#~ "'%s')"
+#~ "Argument '%s' (#%d, type %s) out of bounds (validation changed '%s' to '%"
+#~ "s')"
 #~ msgstr ""
 #~ "Gáp lái gái PDB cho thá tác  %s Â:\n"
 #~ "Äái sá  %s  (#%d, kiáu %s) á ngoái phám vi\n"
@@ -17420,12 +18162,6 @@ msgstr "KhÃng thá khái cháy  %s Â: %s"
 #~ msgid "tool|Move"
 #~ msgstr "Chuyán"
 
-#~ msgid "Move layers & selections"
-#~ msgstr "Chuyán láp và vÃng chán"
-
-#~ msgid "Paint fuzzy brush strokes"
-#~ msgstr "SÆn nÃt bÃt vá má"
-
 #~ msgid "Pressure sensitivity"
 #~ msgstr "Äá nháy Ãp suát"
 
@@ -17487,9 +18223,6 @@ msgstr "KhÃng thá khái cháy  %s Â: %s"
 #~ msgid "Force auto-hinter"
 #~ msgstr "Buác bá gái à tá Äáng"
 
-#~ msgid "Add text to the image"
-#~ msgstr "ThÃm chá vÃo ánh"
-
 #~ msgid "Transform Direction"
 #~ msgstr "Chuyán dáng hÆáng"
 



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