[gimp] Partially revert "Fixed gettext issues in galician translations"



commit c7614f182b173d238bb9e5bd36f2d826d989b471
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Sun Aug 28 19:05:11 2011 +0100

    Partially revert "Fixed gettext issues in galician translations"
    
    This reverts commit f866a1dc084d50091fc741ea2eab03b3379fc1d8.
    
    This reverted my changes to the British English translation.

 po/en_GB.po | 4537 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 2550 insertions(+), 1987 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index 4b93850..703b76c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,13 +4,13 @@
 # Piers Cornwell <piers cornwell usa net>, 2000.
 # Gareth Owen <gowen72 yahoo com>, David Lodge <dave cirt net>, 2004
 # Thomas Thurman <thomas thurman org uk>
-# Bruce Cowan <bruce bcowan me uk>, 2009, 2010.
+# Bruce Cowan <bruce bcowan me uk>, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-15 12:03+0100\n"
-"PO-Revision-Date: 2010-10-16 19:28+0100\n"
+"POT-Creation-Date: 2011-08-27 12:49+0100\n"
+"PO-Revision-Date: 2011-08-27 13:11+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -18,7 +18,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.1-beta1\n"
+"X-Project-Style: gnome\n"
 
 #: ../app/about.h:23
 msgid "GIMP"
@@ -89,101 +90,105 @@ msgstr "No batch interpreter specified, using the default '%s'.\n"
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
 msgstr "The batch interpreter '%s' is not available. Batch mode disabled."
 
-#: ../app/main.c:139 ../tools/gimp-remote.c:59
+#: ../app/main.c:148
 msgid "Show version information and exit"
 msgstr "Show version information and exit"
 
-#: ../app/main.c:144
+#: ../app/main.c:153
 msgid "Show license information and exit"
 msgstr "Show licence information and exit"
 
-#: ../app/main.c:149
+#: ../app/main.c:158
 msgid "Be more verbose"
 msgstr "Be more verbose"
 
-#: ../app/main.c:154
+#: ../app/main.c:163
 msgid "Start a new GIMP instance"
 msgstr "Start a new GIMP instance"
 
-#: ../app/main.c:159
+#: ../app/main.c:168
 msgid "Open images as new"
 msgstr "Open images as new"
 
-#: ../app/main.c:164
+#: ../app/main.c:173
 msgid "Run without a user interface"
 msgstr "Run without a user interface"
 
-#: ../app/main.c:169
+#: ../app/main.c:178
 msgid "Do not load brushes, gradients, patterns, ..."
 msgstr "Do not load brushes, gradients, patterns, ..."
 
-#: ../app/main.c:174
+#: ../app/main.c:183
 msgid "Do not load any fonts"
 msgstr "Do not load any fonts"
 
-#: ../app/main.c:179
+#: ../app/main.c:188
 msgid "Do not show a splash screen"
 msgstr "Do not show a splash screen"
 
-#: ../app/main.c:184
+#: ../app/main.c:193
 msgid "Do not use shared memory between GIMP and plugins"
 msgstr "Do not use shared memory between GIMP and plugins"
 
-#: ../app/main.c:189
+#: ../app/main.c:198
 msgid "Do not use special CPU acceleration functions"
 msgstr "Do not use special CPU acceleration functions"
 
-#: ../app/main.c:194
+#: ../app/main.c:203
 msgid "Use an alternate sessionrc file"
 msgstr "Use an alternate sessionrc file"
 
-#: ../app/main.c:199
+#: ../app/main.c:208
 msgid "Use an alternate user gimprc file"
 msgstr "Use an alternate user gimprc file"
 
-#: ../app/main.c:204
+#: ../app/main.c:213
 msgid "Use an alternate system gimprc file"
 msgstr "Use an alternate system gimprc file"
 
-#: ../app/main.c:209
+#: ../app/main.c:218
 msgid "Batch command to run (can be used multiple times)"
 msgstr "Batch command to run (can be used multiple times)"
 
-#: ../app/main.c:214
+#: ../app/main.c:223
 msgid "The procedure to process batch commands with"
 msgstr "The procedure to process batch commands with"
 
-#: ../app/main.c:219
+#: ../app/main.c:228
 msgid "Send messages to console instead of using a dialog"
 msgstr "Send messages to console instead of using a dialogue"
 
 #. don't translate the mode names (off|on|warn)
-#: ../app/main.c:225
+#: ../app/main.c:234
 msgid "PDB compatibility mode (off|on|warn)"
 msgstr "PDB compatibility mode (off|on|warn)"
 
 #. don't translate the mode names (never|query|always)
-#: ../app/main.c:231
+#: ../app/main.c:240
 msgid "Debug in case of a crash (never|query|always)"
 msgstr "Debug in case of a crash (never|query|always)"
 
-#: ../app/main.c:236
+#: ../app/main.c:245
 msgid "Enable non-fatal debugging signal handlers"
 msgstr "Enable non-fatal debugging signal handlers"
 
-#: ../app/main.c:241
+#: ../app/main.c:250
 msgid "Make all warnings fatal"
 msgstr "Make all warnings fatal"
 
-#: ../app/main.c:246
+#: ../app/main.c:255
 msgid "Output a gimprc file with default settings"
 msgstr "Output a gimprc file with default settings"
 
-#: ../app/main.c:374
+#: ../app/main.c:271
+msgid "Output a sorted list of deprecated procedures in the PDB"
+msgstr "Output a sorted list of deprecated procedures in the PDB"
+
+#: ../app/main.c:389
 msgid "[FILE|URI...]"
 msgstr "[FILE|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."
@@ -191,24 +196,24 @@ msgstr ""
 "GIMP could not initialise the graphical user interface.\n"
 "Make sure a proper setup for your display environment exists."
 
-#: ../app/main.c:411
+#: ../app/main.c:426
 msgid "Another GIMP instance is already running."
 msgstr "Another GIMP instance is already running."
 
-#: ../app/main.c:481
+#: ../app/main.c:496
 msgid "GIMP output. Type any character to close this window."
 msgstr "GIMP output. Type any character to close this window."
 
-#: ../app/main.c:482
+#: ../app/main.c:497
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(Type any character to close this window)\n"
 
-#: ../app/main.c:499
+#: ../app/main.c:514
 msgid "GIMP output. You can minimize this window, but don't close it."
 msgstr "GIMP output. You can minimise this window, but don't close it."
 
-#: ../app/sanity.c:398
+#: ../app/sanity.c:433
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -219,7 +224,7 @@ msgstr ""
 "\n"
 "Please check the value of the environment variable G_FILENAME_ENCODING."
 
-#: ../app/sanity.c:417
+#: ../app/sanity.c:452
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -237,37 +242,37 @@ msgstr ""
 "G_FILENAME_ENCODING."
 
 #. show versions of libraries used by GIMP
-#: ../app/version.c:64
+#: ../app/version.c:63 ../app/version.c:130
 #, c-format
 msgid "using %s version %s (compiled against version %s)"
 msgstr "using %s version %s (compiled against version %s)"
 
-#: ../app/version.c:127 ../tools/gimp-remote.c:94
+#: ../app/version.c:138
 #, c-format
 msgid "%s version %s"
 msgstr "%s version %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 "Brush Editor"
 
 #. 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:2723
 msgid "Brushes"
 msgstr "Brushes"
 
-#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:292
+#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:327
 msgid "Buffers"
 msgstr "Buffers"
 
-#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:311
+#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:346
 msgid "Channels"
 msgstr "Channels"
 
 #: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174
-#: ../app/dialogs/dialogs.c:319
+#: ../app/dialogs/dialogs.c:354
 msgid "Colormap"
 msgstr "Colourmap"
 
@@ -279,7 +284,7 @@ msgstr "Configuration"
 msgid "Context"
 msgstr "Context"
 
-#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:275
+#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:310
 msgid "Pointer Information"
 msgstr "Pointer Information"
 
@@ -300,8 +305,8 @@ msgid "Dockable"
 msgstr "Dockable"
 
 #. Document History
-#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:294
-#: ../app/dialogs/preferences-dialog.c:1573
+#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329
+#: ../app/dialogs/preferences-dialog.c:1571
 msgid "Document History"
 msgstr "Document History"
 
@@ -310,12 +315,12 @@ msgid "Drawable"
 msgstr "Drawable"
 
 #. 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 "Paint Dynamics"
 
-#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:357
-#: ../app/widgets/gimpdynamicseditor.c:94
+#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:392
+#: ../app/widgets/gimpdynamicseditor.c:92
 msgid "Paint Dynamics Editor"
 msgstr "Paint Dynamics Editor"
 
@@ -323,7 +328,7 @@ msgstr "Paint Dynamics Editor"
 msgid "Edit"
 msgstr "Edit"
 
-#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:271
+#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:306
 msgid "Error Console"
 msgstr "Error Console"
 
@@ -331,29 +336,28 @@ msgstr "Error Console"
 msgid "File"
 msgstr "File"
 
-#: ../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:2743
 msgid "Fonts"
 msgstr "Fonts"
 
-#: ../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 "Gradient Editor"
 
 #. 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:2739
 msgid "Gradients"
 msgstr "Gradients"
 
-#. 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
 msgid "Tool Presets"
 msgstr "Tool Presets"
 
-#: ../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
 msgid "Tool Preset Editor"
 msgstr "Tool Preset Editor"
@@ -367,41 +371,41 @@ msgid "Image"
 msgstr "Image"
 
 #. 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 "Images"
 
-#: ../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 "Layers"
 
-#: ../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 "Palette Editor"
 
 #. 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:2735
 msgid "Palettes"
 msgstr "Palettes"
 
 #. 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:2731
 msgid "Patterns"
 msgstr "Patterns"
 
-#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2744
+#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2747
 msgid "Plug-Ins"
 msgstr "Plug-Ins"
 
-#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:385
+#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386
 msgid "Quick Mask"
 msgstr "Quick Mask"
 
-#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:335
+#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:370
 msgid "Sample Points"
 msgstr "Sample Points"
 
@@ -410,8 +414,8 @@ msgid "Select"
 msgstr "Select"
 
 #. 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 "Templates"
 
@@ -423,17 +427,17 @@ msgstr "Text Tool"
 msgid "Text Editor"
 msgstr "Text Editor"
 
-#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:263
-#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:428
+#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298
+#: ../app/dialogs/preferences-dialog.c:1852 ../app/gui/gui.c:424
 msgid "Tool Options"
 msgstr "Tool Options"
 
-#: ../app/actions/actions.c:226 ../app/widgets/gimptoolbox.c:927
+#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:385
 msgid "Tools"
 msgstr "Tools"
 
-#: ../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:159
 msgid "Paths"
 msgstr "Paths"
 
@@ -740,14 +744,14 @@ msgstr "Edit Channel Colour"
 msgid "_Fill opacity:"
 msgstr "_Fill opacity:"
 
-#: ../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:324
 msgid "Channel"
 msgstr "Channel"
 
 #: ../app/actions/channels-commands.c:117
 #: ../app/actions/channels-commands.c:159
-#: ../app/widgets/gimpchanneltreeview.c:329
+#: ../app/widgets/gimpchanneltreeview.c:319
 msgid "New Channel"
 msgstr "New Channel"
 
@@ -759,10 +763,10 @@ msgstr "New Channel Options"
 msgid "New Channel Color"
 msgstr "New Channel Colour"
 
-#: ../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:251
+#: ../app/widgets/gimplayertreeview.c:775
 #, c-format
 msgid "%s Channel Copy"
 msgstr "%s Channel Copy"
@@ -780,7 +784,7 @@ msgstr "_Edit Colour..."
 #: ../app/actions/colormap-actions.c:49
 msgctxt "colormap-action"
 msgid "Edit this color"
-msgstr "Edit this color"
+msgstr "Edit this colour"
 
 #: ../app/actions/colormap-actions.c:57
 msgctxt "colormap-action"
@@ -956,14 +960,14 @@ msgctxt "cursor-info-action"
 msgid "Use the composite color of all visible layers"
 msgstr "Use the composite colour of all visible layers"
 
-#: ../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:735 ../app/widgets/gimptoolbox-dnd.c:170
+#: ../app/widgets/gimptoolbox.c:809
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -974,399 +978,384 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/actions/data-commands.c:133
-#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1545
-#: ../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 "Untitled"
 
-#: ../app/actions/data-commands.c:238
-msgid "Delete Object"
-msgstr "Delete Object"
-
-#: ../app/actions/data-commands.c:261
-#, c-format
-msgid "Delete '%s'?"
-msgstr "Delete '%s'?"
-
-#: ../app/actions/data-commands.c:264
-#, c-format
-msgid ""
-"Are you sure you want to remove '%s' from the list and delete it on disk?"
-msgstr ""
-"Are you sure you want to remove '%s' from the list and delete it on disk?"
-
-#: ../app/actions/dialogs-actions.c:44
+#: ../app/actions/dialogs-actions.c:49
 msgctxt "windows-action"
 msgid "Tool_box"
 msgstr "Tool_box"
 
-#: ../app/actions/dialogs-actions.c:50
+#: ../app/actions/dialogs-actions.c:55
 msgctxt "dialogs-action"
 msgid "Tool _Options"
 msgstr "Tool _Options"
 
-#: ../app/actions/dialogs-actions.c:51
+#: ../app/actions/dialogs-actions.c:56
 msgctxt "dialogs-action"
 msgid "Open the tool options dialog"
 msgstr "Open the tool options dialogue"
 
-#: ../app/actions/dialogs-actions.c:56
+#: ../app/actions/dialogs-actions.c:61
 msgctxt "dialogs-action"
 msgid "_Device Status"
 msgstr "_Device Status"
 
-#: ../app/actions/dialogs-actions.c:57
+#: ../app/actions/dialogs-actions.c:62
 msgctxt "dialogs-action"
 msgid "Open the device status dialog"
 msgstr "Open the device status dialogue"
 
-#: ../app/actions/dialogs-actions.c:62
+#: ../app/actions/dialogs-actions.c:67
 msgctxt "dialogs-action"
 msgid "_Layers"
 msgstr "_Layers"
 
-#: ../app/actions/dialogs-actions.c:63
+#: ../app/actions/dialogs-actions.c:68
 msgctxt "dialogs-action"
 msgid "Open the layers dialog"
 msgstr "Open the layers dialogue"
 
-#: ../app/actions/dialogs-actions.c:68
+#: ../app/actions/dialogs-actions.c:73
 msgctxt "dialogs-action"
 msgid "_Channels"
 msgstr "_Channels"
 
-#: ../app/actions/dialogs-actions.c:69
+#: ../app/actions/dialogs-actions.c:74
 msgctxt "dialogs-action"
 msgid "Open the channels dialog"
 msgstr "Open the channels dialogue"
 
-#: ../app/actions/dialogs-actions.c:74
+#: ../app/actions/dialogs-actions.c:79
 msgctxt "dialogs-action"
 msgid "_Paths"
 msgstr "_Paths"
 
-#: ../app/actions/dialogs-actions.c:75
+#: ../app/actions/dialogs-actions.c:80
 msgctxt "dialogs-action"
 msgid "Open the paths dialog"
 msgstr "Open the paths dialogue"
 
-#: ../app/actions/dialogs-actions.c:80
+#: ../app/actions/dialogs-actions.c:85
 msgctxt "dialogs-action"
 msgid "Color_map"
 msgstr "Colour_map"
 
-#: ../app/actions/dialogs-actions.c:81
+#: ../app/actions/dialogs-actions.c:86
 msgctxt "dialogs-action"
 msgid "Open the colormap dialog"
 msgstr "Open the colourmap dialogue"
 
-#: ../app/actions/dialogs-actions.c:86
+#: ../app/actions/dialogs-actions.c:91
 msgctxt "dialogs-action"
 msgid "Histogra_m"
 msgstr "Histogra_m"
 
-#: ../app/actions/dialogs-actions.c:87
+#: ../app/actions/dialogs-actions.c:92
 msgctxt "dialogs-action"
 msgid "Open the histogram dialog"
 msgstr "Open the histogram dialogue"
 
-#: ../app/actions/dialogs-actions.c:92
+#: ../app/actions/dialogs-actions.c:97
 msgctxt "dialogs-action"
 msgid "_Selection Editor"
 msgstr "_Selection Editor"
 
-#: ../app/actions/dialogs-actions.c:93
+#: ../app/actions/dialogs-actions.c:98
 msgctxt "dialogs-action"
 msgid "Open the selection editor"
 msgstr "Open the selection editor"
 
-#: ../app/actions/dialogs-actions.c:98
+#: ../app/actions/dialogs-actions.c:103
 msgctxt "dialogs-action"
 msgid "Na_vigation"
 msgstr "Na_vigation"
 
-#: ../app/actions/dialogs-actions.c:99
+#: ../app/actions/dialogs-actions.c:104
 msgctxt "dialogs-action"
 msgid "Open the display navigation dialog"
 msgstr "Open the display navigation dialogue"
 
-#: ../app/actions/dialogs-actions.c:104
+#: ../app/actions/dialogs-actions.c:109
 msgctxt "dialogs-action"
 msgid "Undo _History"
 msgstr "Undo _History"
 
-#: ../app/actions/dialogs-actions.c:105
+#: ../app/actions/dialogs-actions.c:110
 msgctxt "dialogs-action"
 msgid "Open the undo history dialog"
 msgstr "Open the undo history dialogue"
 
-#: ../app/actions/dialogs-actions.c:110
+#: ../app/actions/dialogs-actions.c:115
 msgctxt "dialogs-action"
 msgid "Pointer"
 msgstr "Pointer"
 
-#: ../app/actions/dialogs-actions.c:111
+#: ../app/actions/dialogs-actions.c:116
 msgctxt "dialogs-action"
 msgid "Open the pointer information dialog"
 msgstr "Open the pointer information dialogue"
 
-#: ../app/actions/dialogs-actions.c:116
+#: ../app/actions/dialogs-actions.c:121
 msgctxt "dialogs-action"
 msgid "_Sample Points"
 msgstr "_Sample Points"
 
-#: ../app/actions/dialogs-actions.c:117
+#: ../app/actions/dialogs-actions.c:122
 msgctxt "dialogs-action"
 msgid "Open the sample points dialog"
 msgstr "Open the sample points dialogue"
 
-#: ../app/actions/dialogs-actions.c:122
+#: ../app/actions/dialogs-actions.c:127
 msgctxt "dialogs-action"
 msgid "Colo_rs"
 msgstr "Colou_rs"
 
-#: ../app/actions/dialogs-actions.c:123
+#: ../app/actions/dialogs-actions.c:128
 msgctxt "dialogs-action"
 msgid "Open the FG/BG color dialog"
 msgstr "Open the FG/BG colour dialogue"
 
-#: ../app/actions/dialogs-actions.c:128
+#: ../app/actions/dialogs-actions.c:133
 msgctxt "dialogs-action"
 msgid "_Brushes"
 msgstr "_Brushes"
 
-#: ../app/actions/dialogs-actions.c:129
+#: ../app/actions/dialogs-actions.c:134
 msgctxt "dialogs-action"
 msgid "Open the brushes dialog"
 msgstr "Open the brushes dialogue"
 
-#: ../app/actions/dialogs-actions.c:134
+#: ../app/actions/dialogs-actions.c:139
 msgctxt "dialogs-action"
 msgid "Brush Editor"
 msgstr "Brush Editor"
 
-#: ../app/actions/dialogs-actions.c:135
+#: ../app/actions/dialogs-actions.c:140
 msgctxt "dialogs-action"
 msgid "Open the brush editor"
 msgstr "Open the brush editor"
 
-#: ../app/actions/dialogs-actions.c:140
+#: ../app/actions/dialogs-actions.c:145
 msgctxt "dialogs-action"
 msgid "Paint Dynamics"
 msgstr "Paint Dynamics"
 
-#: ../app/actions/dialogs-actions.c:141
+#: ../app/actions/dialogs-actions.c:146
 msgctxt "dialogs-action"
 msgid "Open paint dynamics dialog"
-msgstr "Open paint dynamics dialog"
+msgstr "Open paint dynamics dialogue"
 
-#: ../app/actions/dialogs-actions.c:146
+#: ../app/actions/dialogs-actions.c:151
 msgctxt "dialogs-action"
 msgid "Paint Dynamics Editor"
 msgstr "Paint Dynamics Editor"
 
-#: ../app/actions/dialogs-actions.c:147
+#: ../app/actions/dialogs-actions.c:152
 msgctxt "dialogs-action"
 msgid "Open the paint dynamics editor"
 msgstr "Open the paint dynamics editor"
 
-#: ../app/actions/dialogs-actions.c:152
+#: ../app/actions/dialogs-actions.c:157
 msgctxt "dialogs-action"
 msgid "P_atterns"
 msgstr "P_atterns"
 
-#: ../app/actions/dialogs-actions.c:153
+#: ../app/actions/dialogs-actions.c:158
 msgctxt "dialogs-action"
 msgid "Open the patterns dialog"
 msgstr "Open the patterns dialogue"
 
-#: ../app/actions/dialogs-actions.c:158
+#: ../app/actions/dialogs-actions.c:163
 msgctxt "dialogs-action"
 msgid "_Gradients"
 msgstr "_Gradients"
 
-#: ../app/actions/dialogs-actions.c:159
+#: ../app/actions/dialogs-actions.c:164
 msgctxt "dialogs-action"
 msgid "Open the gradients dialog"
 msgstr "Open the gradients dialogue"
 
-#: ../app/actions/dialogs-actions.c:164
+#: ../app/actions/dialogs-actions.c:169
 msgctxt "dialogs-action"
 msgid "Gradient Editor"
 msgstr "Gradient Editor"
 
-#: ../app/actions/dialogs-actions.c:165
+#: ../app/actions/dialogs-actions.c:170
 msgctxt "dialogs-action"
 msgid "Open the gradient editor"
 msgstr "Open the gradient editor"
 
-#: ../app/actions/dialogs-actions.c:170
+#: ../app/actions/dialogs-actions.c:175
 msgctxt "dialogs-action"
 msgid "Pal_ettes"
 msgstr "Pal_ettes"
 
-#: ../app/actions/dialogs-actions.c:171
+#: ../app/actions/dialogs-actions.c:176
 msgctxt "dialogs-action"
 msgid "Open the palettes dialog"
 msgstr "Open the palettes dialogue"
 
-#: ../app/actions/dialogs-actions.c:176
+#: ../app/actions/dialogs-actions.c:181
 msgctxt "dialogs-action"
 msgid "Palette Editor"
 msgstr "Palette Editor"
 
-#: ../app/actions/dialogs-actions.c:177
+#: ../app/actions/dialogs-actions.c:182
 msgctxt "dialogs-action"
 msgid "Open the palette editor"
 msgstr "Open the palette editor"
 
-#: ../app/actions/dialogs-actions.c:182
+#: ../app/actions/dialogs-actions.c:187
 msgctxt "dialogs-action"
 msgid "Tool presets"
 msgstr "Tool presets"
 
-#: ../app/actions/dialogs-actions.c:183
+#: ../app/actions/dialogs-actions.c:188
 msgctxt "dialogs-action"
 msgid "Open tool presets dialog"
 msgstr "Open tool presets dialogue"
 
-#: ../app/actions/dialogs-actions.c:188
+#: ../app/actions/dialogs-actions.c:193
 msgctxt "dialogs-action"
 msgid "_Fonts"
 msgstr "_Fonts"
 
-#: ../app/actions/dialogs-actions.c:189
+#: ../app/actions/dialogs-actions.c:194
 msgctxt "dialogs-action"
 msgid "Open the fonts dialog"
 msgstr "Open the fonts dialogue"
 
-#: ../app/actions/dialogs-actions.c:194
+#: ../app/actions/dialogs-actions.c:199
 msgctxt "dialogs-action"
 msgid "B_uffers"
 msgstr "B_uffers"
 
-#: ../app/actions/dialogs-actions.c:195
+#: ../app/actions/dialogs-actions.c:200
 msgctxt "dialogs-action"
 msgid "Open the named buffers dialog"
 msgstr "Open the named buffers dialogue"
 
-#: ../app/actions/dialogs-actions.c:200
+#: ../app/actions/dialogs-actions.c:205
 msgctxt "dialogs-action"
 msgid "_Images"
 msgstr "_Images"
 
-#: ../app/actions/dialogs-actions.c:201
+#: ../app/actions/dialogs-actions.c:206
 msgctxt "dialogs-action"
 msgid "Open the images dialog"
 msgstr "Open the images dialogue"
 
-#: ../app/actions/dialogs-actions.c:206
+#: ../app/actions/dialogs-actions.c:211
 msgctxt "dialogs-action"
 msgid "Document Histor_y"
 msgstr "Document Histor_y"
 
-#: ../app/actions/dialogs-actions.c:207
+#: ../app/actions/dialogs-actions.c:212
 msgctxt "dialogs-action"
 msgid "Open the document history dialog"
 msgstr "Open the document history dialogue"
 
-#: ../app/actions/dialogs-actions.c:212
+#: ../app/actions/dialogs-actions.c:217
 msgctxt "dialogs-action"
 msgid "_Templates"
 msgstr "_Templates"
 
-#: ../app/actions/dialogs-actions.c:213
+#: ../app/actions/dialogs-actions.c:218
 msgctxt "dialogs-action"
 msgid "Open the image templates dialog"
 msgstr "Open the image templates dialogue"
 
-#: ../app/actions/dialogs-actions.c:218
+#: ../app/actions/dialogs-actions.c:223
 msgctxt "dialogs-action"
 msgid "Error Co_nsole"
 msgstr "Error Co_nsole"
 
-#: ../app/actions/dialogs-actions.c:219
+#: ../app/actions/dialogs-actions.c:224
 msgctxt "dialogs-action"
 msgid "Open the error console"
 msgstr "Open the error console"
 
-#: ../app/actions/dialogs-actions.c:229
+#: ../app/actions/dialogs-actions.c:234
 msgctxt "dialogs-action"
 msgid "_Preferences"
 msgstr "_Preferences"
 
-#: ../app/actions/dialogs-actions.c:230
+#: ../app/actions/dialogs-actions.c:235
 msgctxt "dialogs-action"
 msgid "Open the preferences dialog"
 msgstr "Open the preferences dialogue"
 
-#: ../app/actions/dialogs-actions.c:235
+#: ../app/actions/dialogs-actions.c:240
 msgctxt "dialogs-action"
 msgid "_Input Devices"
 msgstr "_Input Devices"
 
-#: ../app/actions/dialogs-actions.c:236
+#: ../app/actions/dialogs-actions.c:241
 msgctxt "dialogs-action"
 msgid "Open the input devices editor"
 msgstr "Open the input devices editor"
 
-#: ../app/actions/dialogs-actions.c:241
+#: ../app/actions/dialogs-actions.c:246
 msgctxt "dialogs-action"
 msgid "_Keyboard Shortcuts"
 msgstr "_Keyboard Shortcuts"
 
-#: ../app/actions/dialogs-actions.c:242
+#: ../app/actions/dialogs-actions.c:247
 msgctxt "dialogs-action"
 msgid "Open the keyboard shortcuts editor"
 msgstr "Open the keyboard shortcuts editor"
 
-#: ../app/actions/dialogs-actions.c:247
+#: ../app/actions/dialogs-actions.c:252
 msgctxt "dialogs-action"
 msgid "_Modules"
 msgstr "_Modules"
 
-#: ../app/actions/dialogs-actions.c:248
+#: ../app/actions/dialogs-actions.c:253
 msgctxt "dialogs-action"
 msgid "Open the module manager dialog"
 msgstr "Open the module manager dialogue"
 
-#: ../app/actions/dialogs-actions.c:253
+#: ../app/actions/dialogs-actions.c:258
 msgctxt "dialogs-action"
 msgid "_Tip of the Day"
 msgstr "_Tip of the Day"
 
-#: ../app/actions/dialogs-actions.c:254
+#: ../app/actions/dialogs-actions.c:259
 msgctxt "dialogs-action"
 msgid "Show some helpful tips on using GIMP"
 msgstr "Show some helpful tips on using GIMP"
 
-#: ../app/actions/dialogs-actions.c:259
+#: ../app/actions/dialogs-actions.c:264
 msgctxt "dialogs-action"
 msgid "_About"
 msgstr "_About"
 
-#: ../app/actions/dialogs-actions.c:260
+#: ../app/actions/dialogs-actions.c:265
 msgctxt "dialogs-action"
 msgid "About GIMP"
 msgstr "About 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:1941 ../app/widgets/gimptoolbox.c:549
 msgid "Toolbox"
 msgstr "Toolbox"
 
-#: ../app/actions/dialogs-actions.c:305
+#: ../app/actions/dialogs-actions.c:327
 msgid "Raise the toolbox"
 msgstr "Raise the toolbox"
 
-#: ../app/actions/dialogs-actions.c:309
+#: ../app/actions/dialogs-actions.c:331
 msgid "New Toolbox"
 msgstr "New Toolbox"
 
-#: ../app/actions/dialogs-actions.c:310
+#: ../app/actions/dialogs-actions.c:332
 msgid "Create a new toolbox"
 msgstr "Create a new toolbox"
 
@@ -1821,7 +1810,7 @@ msgstr "Delete this dynamics"
 
 #: ../app/actions/dynamics-actions.c:70
 msgctxt "dynamics-action"
-msgid "_Refresh Dynamicss"
+msgid "_Refresh Dynamics"
 msgstr "_Refresh Dynamics"
 
 #: ../app/actions/dynamics-actions.c:71
@@ -2086,30 +2075,30 @@ msgctxt "edit-action"
 msgid "Fill the selection using the active pattern"
 msgstr "Fill the selection using the active pattern"
 
-#: ../app/actions/edit-actions.c:295
+#: ../app/actions/edit-actions.c:304
 #, c-format
 msgid "_Undo %s"
 msgstr "_Undo %s"
 
-#: ../app/actions/edit-actions.c:302
+#: ../app/actions/edit-actions.c:311
 #, c-format
 msgid "_Redo %s"
 msgstr "_Redo %s"
 
-#: ../app/actions/edit-actions.c:317
+#: ../app/actions/edit-actions.c:326
 #, c-format
 msgid "_Fade %s..."
 msgstr "_Fade %s..."
 
-#: ../app/actions/edit-actions.c:329
+#: ../app/actions/edit-actions.c:338
 msgid "_Undo"
 msgstr "_Undo"
 
-#: ../app/actions/edit-actions.c:330
+#: ../app/actions/edit-actions.c:339
 msgid "_Redo"
 msgstr "_Redo"
 
-#: ../app/actions/edit-actions.c:331
+#: ../app/actions/edit-actions.c:340
 msgid "_Fade..."
 msgstr "_Fade..."
 
@@ -2139,8 +2128,8 @@ msgstr "Copied pixels to the clipboard"
 msgid "There is no image data in the clipboard to paste."
 msgstr "There is no image data in the clipboard to paste."
 
-#: ../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 "Clipboard"
 
@@ -2377,8 +2366,8 @@ msgstr "Export the image again"
 
 #: ../app/actions/file-actions.c:152
 msgctxt "file-action"
-msgid "Overwrite"
-msgstr "Overwrite"
+msgid "Over_write"
+msgstr "Over_write"
 
 #: ../app/actions/file-actions.c:153
 msgctxt "file-action"
@@ -2402,14 +2391,14 @@ msgstr "Export to %s"
 
 #: ../app/actions/file-actions.c:298
 #, c-format
-msgid "Overwrite %s"
-msgstr "Overwrite %s"
+msgid "Over_write %s"
+msgstr "Over_write %s"
 
 #: ../app/actions/file-actions.c:306
 msgid "Export to"
 msgstr "Export to"
 
-#: ../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 "Open Image"
@@ -2430,28 +2419,28 @@ msgstr "Save Image"
 msgid "Save a Copy of the Image"
 msgstr "Save a Copy of the Image"
 
-#: ../app/actions/file-commands.c:338
+#: ../app/actions/file-commands.c:356
 msgid "Create New Template"
 msgstr "Create New Template"
 
-#: ../app/actions/file-commands.c:342
+#: ../app/actions/file-commands.c:360
 msgid "Enter a name for this template"
 msgstr "Enter a name for this template"
 
-#: ../app/actions/file-commands.c:377
+#: ../app/actions/file-commands.c:394
 msgid "Revert failed. No file name associated with this image."
 msgstr "Revert failed. No file name associated with this image."
 
-#: ../app/actions/file-commands.c:390
+#: ../app/actions/file-commands.c:407
 msgid "Revert Image"
 msgstr "Revert Image"
 
-#: ../app/actions/file-commands.c:421
+#: ../app/actions/file-commands.c:438
 #, c-format
 msgid "Revert '%s' to '%s'?"
 msgstr "Revert '%s' to '%s'?"
 
-#: ../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."
@@ -2459,11 +2448,11 @@ msgstr ""
 "By reverting the image to the state saved on disk, you will lose all "
 "changes, including all undo information."
 
-#: ../app/actions/file-commands.c:638
+#: ../app/actions/file-commands.c:655
 msgid "(Unnamed Template)"
 msgstr "(Unnamed Template)"
 
-#: ../app/actions/file-commands.c:690
+#: ../app/actions/file-commands.c:706
 #, c-format
 msgid ""
 "Reverting to '%s' failed:\n"
@@ -3198,54 +3187,54 @@ msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the left"
 msgstr "Rotate the image 90 degrees to the left"
 
-#: ../app/actions/image-commands.c:236
+#: ../app/actions/image-commands.c:237
 msgid "Set Image Canvas Size"
 msgstr "Set Image Canvas Size"
 
-#: ../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 "Resizing"
 
-#: ../app/actions/image-commands.c:316
+#: ../app/actions/image-commands.c:317
 msgid "Set Image Print Resolution"
 msgstr "Set Image Print Resolution"
 
-#: ../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:161
+#: ../app/pdb/drawable-transform-cmds.c:249
+#: ../app/pdb/item-transform-cmds.c:162
 msgid "Flipping"
 msgstr "Flipping"
 
-#: ../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:608
+#: ../app/pdb/drawable-transform-cmds.c:700 ../app/pdb/image-cmds.c:538
+#: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245
+#: ../app/tools/gimprotatetool.c:125
 msgid "Rotating"
 msgstr "Rotating"
 
-#: ../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 "Cannot crop because the current selection is empty."
 
-#: ../app/actions/image-commands.c:628
+#: ../app/actions/image-commands.c:630
 msgid "Change Print Size"
 msgstr "Change Print Size"
 
-#: ../app/actions/image-commands.c:669
+#: ../app/actions/image-commands.c:671
 msgid "Scale Image"
 msgstr "Scale Image"
 
 #. Scaling
-#: ../app/actions/image-commands.c:680 ../app/actions/layers-commands.c:1145
-#: ../app/dialogs/preferences-dialog.c:1899
-#: ../app/pdb/drawable-transform-cmds.c:708
-#: ../app/pdb/drawable-transform-cmds.c:786 ../app/pdb/image-cmds.c:408
-#: ../app/pdb/image-cmds.c:444 ../app/pdb/item-transform-cmds.c:512
+#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145
+#: ../app/dialogs/preferences-dialog.c:1897
+#: ../app/pdb/drawable-transform-cmds.c:791
+#: ../app/pdb/drawable-transform-cmds.c:880 ../app/pdb/image-cmds.c:410
+#: ../app/pdb/image-cmds.c:446 ../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 "Scaling"
 
@@ -3791,13 +3780,13 @@ msgstr "Layer Attributes"
 msgid "Edit Layer Attributes"
 msgstr "Edit Layer Attributes"
 
-#: ../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 "Layer"
 
 #: ../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:836
 msgid "New Layer"
 msgstr "New Layer"
 
@@ -4458,7 +4447,7 @@ msgstr "_Lock selection to image edges"
 
 #: ../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 "There is no active layer or channel to stroke to."
 
@@ -4521,24 +4510,24 @@ msgctxt "templates-action"
 msgid "Delete this template"
 msgstr "Delete this template"
 
-#: ../app/actions/templates-commands.c:111
+#: ../app/actions/templates-commands.c:110
 msgid "New Template"
 msgstr "New Template"
 
-#: ../app/actions/templates-commands.c:114
+#: ../app/actions/templates-commands.c:113
 msgid "Create a New Template"
 msgstr "Create a New Template"
 
-#: ../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 "Edit Template"
 
-#: ../app/actions/templates-commands.c:212
+#: ../app/actions/templates-commands.c:211
 msgid "Delete Template"
 msgstr "Delete Template"
 
-#: ../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?"
@@ -4595,11 +4584,11 @@ msgstr "Open Text File (UTF-8)"
 #: ../app/core/gimpbrush-load.c:140 ../app/core/gimpbrush-load.c:422
 #: ../app/core/gimpbrushgenerated-load.c:73
 #: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54
-#: ../app/core/gimpgradient-load.c:62 ../app/core/gimppalette-load.c:76
-#: ../app/core/gimppalette-load.c:273 ../app/core/gimppalette-load.c:319
-#: ../app/core/gimppalette-load.c:376 ../app/core/gimppalette-load.c:466
-#: ../app/core/gimppalette-load.c:633 ../app/core/gimppattern-load.c:76
-#: ../app/tools/gimpcurvestool.c:637 ../app/tools/gimplevelstool.c:747
+#: ../app/core/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:647 ../app/tools/gimplevelstool.c:747
 #: ../app/xcf/xcf.c:329
 #, c-format
 msgid "Could not open '%s' for reading: %s"
@@ -4680,83 +4669,61 @@ msgctxt "text-tool-action"
 msgid "From right to left"
 msgstr "From right to left"
 
-#: ../app/actions/tool-options-actions.c:55
+#: ../app/actions/tool-options-actions.c:54
 msgctxt "tool-options-action"
 msgid "Tool Options Menu"
 msgstr "Tool Options Menu"
 
-#: ../app/actions/tool-options-actions.c:59
+#: ../app/actions/tool-options-actions.c:58
 msgctxt "tool-options-action"
-msgid "_Save Options To"
-msgstr "_Save Options To"
+msgid "_Save Tool Preset"
+msgstr "_Save Tool Preset"
 
-#: ../app/actions/tool-options-actions.c:63
+#: ../app/actions/tool-options-actions.c:62
 msgctxt "tool-options-action"
-msgid "_Restore Options From"
-msgstr "_Restore Options From"
+msgid "_Restore Tool Preset"
+msgstr "_Restore Tool Preset"
 
-#: ../app/actions/tool-options-actions.c:67
+#: ../app/actions/tool-options-actions.c:66
 msgctxt "tool-options-action"
-msgid "Re_name Saved Options"
-msgstr "Re_name Saved Options"
+msgid "E_dit Tool Preset"
+msgstr "E_dit Tool Preset"
 
-#: ../app/actions/tool-options-actions.c:71
+#: ../app/actions/tool-options-actions.c:70
 msgctxt "tool-options-action"
-msgid "_Delete Saved Options"
-msgstr "_Delete Saved Options"
+msgid "_Delete Tool Preset"
+msgstr "_Delete Tool Preset"
 
-#: ../app/actions/tool-options-actions.c:75
+#: ../app/actions/tool-options-actions.c:74
 msgctxt "tool-options-action"
-msgid "_New Entry..."
-msgstr "_New Entry..."
+msgid "_New Tool Preset..."
+msgstr "_New Tool Preset..."
 
-#: ../app/actions/tool-options-actions.c:80
+#: ../app/actions/tool-options-actions.c:79
 msgctxt "tool-options-action"
 msgid "R_eset Tool Options"
 msgstr "R_eset Tool Options"
 
-#: ../app/actions/tool-options-actions.c:81
+#: ../app/actions/tool-options-actions.c:80
 msgctxt "tool-options-action"
 msgid "Reset to default values"
 msgstr "Reset to default values"
 
-#: ../app/actions/tool-options-actions.c:86
+#: ../app/actions/tool-options-actions.c:85
 msgctxt "tool-options-action"
 msgid "Reset _all Tool Options"
 msgstr "Reset _all Tool Options"
 
-#: ../app/actions/tool-options-actions.c:87
+#: ../app/actions/tool-options-actions.c:86
 msgctxt "tool-options-action"
 msgid "Reset all tool options"
 msgstr "Reset all tool options"
 
-#: ../app/actions/tool-options-commands.c:70
-msgid "Save Tool Options"
-msgstr "Save Tool Options"
-
-#: ../app/actions/tool-options-commands.c:74
-msgid "Enter a name for the saved options"
-msgstr "Enter a name for the saved options"
-
-#: ../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 "Saved Options"
-
-#: ../app/actions/tool-options-commands.c:138
-msgid "Rename Saved Tool Options"
-msgstr "Rename Saved Tool Options"
-
-#: ../app/actions/tool-options-commands.c:142
-msgid "Enter a new name for the saved options"
-msgstr "Enter a new name for the saved options"
-
-#: ../app/actions/tool-options-commands.c:185
+#: ../app/actions/tool-options-commands.c:180
 msgid "Reset All Tool Options"
 msgstr "Reset All Tool Options"
 
-#: ../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 "Do you really want to reset all tool options to default values?"
 
@@ -5124,8 +5091,8 @@ msgstr "Path Attributes"
 msgid "Edit Path Attributes"
 msgstr "Edit Path Attributes"
 
-#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:206
-#: ../app/widgets/gimpvectorstreeview.c:252
+#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207
+#: ../app/widgets/gimpvectorstreeview.c:243
 msgid "Path"
 msgstr "Path"
 
@@ -5138,7 +5105,7 @@ msgid "New Path Options"
 msgstr "New Path Options"
 
 #: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:198
-#: ../app/tools/gimpvectortool.c:1978
+#: ../app/tools/gimpvectortool.c:1980
 msgid "Stroke Path"
 msgstr "Stroke Path"
 
@@ -5619,27 +5586,47 @@ msgstr "Screen %s"
 msgid "Move this window to screen %s"
 msgstr "Move this window to screen %s"
 
-#: ../app/actions/windows-actions.c:85
+#: ../app/actions/windows-actions.c:96
 msgctxt "windows-action"
 msgid "_Windows"
 msgstr "_Windows"
 
-#: ../app/actions/windows-actions.c:87
+#: ../app/actions/windows-actions.c:98
 msgctxt "windows-action"
 msgid "_Recently Closed Docks"
 msgstr "_Recently Closed Docks"
 
-#: ../app/actions/windows-actions.c:89
+#: ../app/actions/windows-actions.c:100
 msgctxt "windows-action"
 msgid "_Dockable Dialogs"
 msgstr "_Dockable Dialogues"
 
-#: ../app/actions/windows-actions.c:95
+#: ../app/actions/windows-actions.c:103
+msgctxt "windows-action"
+msgid "Next Image"
+msgstr "Next Image"
+
+#: ../app/actions/windows-actions.c:104
+msgctxt "windows-action"
+msgid "Switch to the next image"
+msgstr "Switch to the next image"
+
+#: ../app/actions/windows-actions.c:109
+msgctxt "windows-action"
+msgid "Previous Image"
+msgstr "Previous Image"
+
+#: ../app/actions/windows-actions.c:110
+msgctxt "windows-action"
+msgid "Switch to the previous image"
+msgstr "Switch to the previous image"
+
+#: ../app/actions/windows-actions.c:118
 msgctxt "windows-action"
 msgid "Hide Docks"
 msgstr "Hide Docks"
 
-#: ../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."
@@ -5647,12 +5634,12 @@ msgstr ""
 "When enabled docks and other dialogues are hidden, leaving only image "
 "windows."
 
-#: ../app/actions/windows-actions.c:109
+#: ../app/actions/windows-actions.c:125
 msgctxt "windows-action"
 msgid "Single-Window Mode"
 msgstr "Single-Window Mode"
 
-#: ../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 "
@@ -5943,10 +5930,20 @@ msgctxt "cursor-format"
 msgid "Fancy"
 msgstr "Fancy"
 
+#: ../app/config/config-enums.c:236
+msgctxt "handedness"
+msgid "Left-handed"
+msgstr "Left-handed"
+
+#: ../app/config/config-enums.c:237
+msgctxt "handedness"
+msgid "Right-handed"
+msgstr "Right-handed"
+
 #: ../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:700
 #: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81
 #: ../app/xcf/xcf.c:422
 #, c-format
@@ -6019,6 +6016,10 @@ msgid "Sets the type of mouse pointers to use."
 msgstr "Sets the type of mouse pointers to use."
 
 #: ../app/config/gimprc-blurbs.h:55
+msgid "Sets the handedness for cursor positioning."
+msgstr "Sets the handedness for cursor positioning."
+
+#: ../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."
@@ -6026,7 +6027,7 @@ msgstr ""
 "Context-dependent mouse pointers are helpful.  They are enabled by default.  "
 "However, they require overhead that you may want to do without."
 
-#: ../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."
@@ -6034,12 +6035,12 @@ msgstr ""
 "When enabled, this will ensure that each pixel of an image gets mapped to a "
 "pixel on the screen."
 
-#: ../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 ""
 "This is the distance in pixels where Guide and Grid snapping activates."
 
-#: ../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 "
@@ -6053,7 +6054,7 @@ msgstr ""
 "the original is greater than a specified threshold. This value represents "
 "the default threshold."
 
-#: ../app/config/gimprc-blurbs.h:122
+#: ../app/config/gimprc-blurbs.h:125
 msgid ""
 "The window type hint that is set on dock windows and the toolbox window. "
 "This may affect the way your window manager decorates and handles these "
@@ -6063,35 +6064,35 @@ msgstr ""
 "This may affect the way your window manager decorates and handles these "
 "windows."
 
-#: ../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 "When enabled, the selected brush will be used for all tools."
 
-#: ../app/config/gimprc-blurbs.h:157
+#: ../app/config/gimprc-blurbs.h:160
 msgid "When enabled, the selected dynamics will be used for all tools."
 msgstr "When enabled, the selected dynamics will be used for all tools."
 
-#: ../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 "When enabled, the selected gradient will be used for all tools."
 
-#: ../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 "When enabled, the selected pattern will be used for all tools."
 
-#: ../app/config/gimprc-blurbs.h:180
+#: ../app/config/gimprc-blurbs.h:183
 msgid "Sets the browser used by the help system."
 msgstr "Sets the browser used by the help system."
 
-#: ../app/config/gimprc-blurbs.h:191
+#: ../app/config/gimprc-blurbs.h:194
 msgid "Sets the text to appear in image window status bars."
 msgstr "Sets the text to appear in image window status bars."
 
-#: ../app/config/gimprc-blurbs.h:194
+#: ../app/config/gimprc-blurbs.h:197
 msgid "Sets the text to appear in image window titles."
 msgstr "Sets the text to appear in image window titles."
 
-#: ../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."
@@ -6099,13 +6100,6 @@ msgstr ""
 "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."
 
-#: ../app/config/gimprc-blurbs.h:201
-msgid ""
-"Install a private colormap; might be useful on 8-bit (256 colors) displays."
-msgstr ""
-"Install a private colourmap; might be useful on 8-bit (256 colours) "
-"displays."
-
 #: ../app/config/gimprc-blurbs.h:204
 msgid ""
 "Sets the level of interpolation used for scaling and other transformations."
@@ -6136,15 +6130,7 @@ msgstr ""
 "GIMP will warn the user if an attempt is made to create an image that would "
 "take more memory than the size specified here."
 
-#: ../app/config/gimprc-blurbs.h:225
-msgid ""
-"Generally only a concern for 8-bit displays, this sets the minimum number of "
-"system colors allocated for GIMP."
-msgstr ""
-"Generally only a concern for 8-bit displays, this sets the minimum number of "
-"system colours allocated for 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 "
@@ -6154,7 +6140,7 @@ msgstr ""
 "forces the X server to be queried for both horizontal and vertical "
 "resolution information."
 
-#: ../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 "
@@ -6164,7 +6150,7 @@ msgstr ""
 "forces the X server to be queried for both horizontal and vertical "
 "resolution information."
 
-#: ../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."
@@ -6172,7 +6158,7 @@ msgstr ""
 "If enabled, the move tool sets the edited layer or path as active.  This "
 "used to be the default behaviour in older versions."
 
-#: ../app/config/gimprc-blurbs.h: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."
@@ -6180,11 +6166,11 @@ msgstr ""
 "Sets the size of the navigation preview available in the lower right corner "
 "of the image window."
 
-#: ../app/config/gimprc-blurbs.h:253
+#: ../app/config/gimprc-blurbs.h:249
 msgid "Sets how many processors GIMP should try to use simultaneously."
 msgstr "Sets how many processors GIMP should try to use simultaneously."
 
-#: ../app/config/gimprc-blurbs.h:266
+#: ../app/config/gimprc-blurbs.h:262
 msgid ""
 "When enabled, the X server is queried for the mouse's current position on "
 "each motion event, rather than relying on the position hint.  This means "
@@ -6198,7 +6184,7 @@ msgstr ""
 "Conversely, on some X servers enabling this option results in faster "
 "painting."
 
-#: ../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 "
@@ -6208,7 +6194,7 @@ msgstr ""
 "the layers and channels dialogue are nice to have but they can slow things "
 "down when working with large images."
 
-#: ../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."
@@ -6216,7 +6202,7 @@ msgstr ""
 "Sets the preview size used for layers and channel previews in newly created "
 "dialogues."
 
-#: ../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."
@@ -6224,7 +6210,7 @@ msgstr ""
 "When enabled, the image window will automatically resize itself whenever the "
 "physical image size changes."
 
-#: ../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."
@@ -6232,17 +6218,17 @@ msgstr ""
 "When enabled, the image window will automatically resize itself when zooming "
 "into and out of images."
 
-#: ../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 "Let GIMP try to restore your last saved session on each startup."
 
-#: ../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 ""
 "Remember the current tool, pattern, colour and brush across GIMP sessions."
 
-#: ../app/config/gimprc-blurbs.h:306
+#: ../app/config/gimprc-blurbs.h:302
 msgid ""
 "Keep a permanent record of all opened and saved files in the Recent "
 "Documents list."
@@ -6250,15 +6236,15 @@ msgstr ""
 "Keep a permanent record of all opened and saved files in the Recent "
 "Documents list."
 
-#: ../app/config/gimprc-blurbs.h:310
+#: ../app/config/gimprc-blurbs.h:306
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
 msgstr "Save the positions and sizes of the main dialogues when GIMP exits."
 
-#: ../app/config/gimprc-blurbs.h:313
+#: ../app/config/gimprc-blurbs.h:309
 msgid "Save the tool options when GIMP exits."
 msgstr "Save the tool options when GIMP exits."
 
-#: ../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."
@@ -6266,7 +6252,7 @@ msgstr ""
 "When enabled, all paint tools will show a preview of the current brush's "
 "outline."
 
-#: ../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 "
@@ -6276,7 +6262,7 @@ msgstr ""
 "related help page.  Without this button, the help page can still be reached "
 "by pressing 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."
@@ -6284,7 +6270,7 @@ msgstr ""
 "When enabled, the mouse pointer will be shown over the image while using a "
 "paint tool."
 
-#: ../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."
@@ -6292,7 +6278,7 @@ msgstr ""
 "When enabled, the menubar is visible by default. This can also be toggled "
 "with the \"View->Show Menubar\" command."
 
-#: ../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."
@@ -6300,7 +6286,7 @@ msgstr ""
 "When enabled, the rulers are visible by default. This can also be toggled "
 "with the \"View->Show Rulers\" command."
 
-#: ../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."
@@ -6308,7 +6294,7 @@ msgstr ""
 "When enabled, the scrollbars are visible by default. This can also be "
 "toggled with the \"View->Show Scrollbars\" command."
 
-#: ../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."
@@ -6316,7 +6302,7 @@ msgstr ""
 "When enabled, the statusbar is visible by default. This can also be toggled "
 "with the \"View->Show Statusbar\" command."
 
-#: ../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."
@@ -6324,7 +6310,7 @@ msgstr ""
 "When enabled, the selection is visible by default. This can also be toggled "
 "with the \"View->Show Selection\" command."
 
-#: ../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."
@@ -6332,7 +6318,7 @@ msgstr ""
 "When enabled, the layer boundary is visible by default. This can also be "
 "toggled with the \"View->Show Layer Boundary\" command."
 
-#: ../app/config/gimprc-blurbs.h: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."
@@ -6340,7 +6326,7 @@ msgstr ""
 "When enabled, the guides are visible by default. This can also be toggled "
 "with the \"View->Show Guides\" command."
 
-#: ../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."
@@ -6348,7 +6334,7 @@ msgstr ""
 "When enabled, the grid is visible by default. This can also be toggled with "
 "the \"View->Show Grid\" command."
 
-#: ../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."
@@ -6356,23 +6342,23 @@ msgstr ""
 "When enabled, the sample points are visible by default. This can also be "
 "toggled with the \"View->Show Sample Points\" command."
 
-#: ../app/config/gimprc-blurbs.h:368
+#: ../app/config/gimprc-blurbs.h:364
 msgid "Show a tooltip when the pointer hovers over an item."
 msgstr "Show a tooltip when the pointer hovers over an item."
 
-#: ../app/config/gimprc-blurbs.h:371
+#: ../app/config/gimprc-blurbs.h:367
 msgid "Use GIMP in a single-window mode."
 msgstr "Use GIMP in a single-window mode."
 
-#: ../app/config/gimprc-blurbs.h:374
+#: ../app/config/gimprc-blurbs.h:370
 msgid "Hide docks and other windows, leaving only image windows."
 msgstr "Hide docks and other windows, leaving only image windows."
 
-#: ../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 "What to do when the space bar is pressed in the image window."
 
-#: ../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 "
@@ -6388,11 +6374,11 @@ msgstr ""
 "file is created on a folder that is mounted over NFS.  For these reasons, it "
 "may be desirable to put your swap file in \"/tmp\"."
 
-#: ../app/config/gimprc-blurbs.h:389
+#: ../app/config/gimprc-blurbs.h:385
 msgid "When enabled, menus can be torn off."
 msgstr "When enabled, menus can be torn off."
 
-#: ../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."
@@ -6400,15 +6386,15 @@ msgstr ""
 "When enabled, you can change keyboard shortcuts for menu items by hitting a "
 "key combination while the menu item is highlighted."
 
-#: ../app/config/gimprc-blurbs.h:396
+#: ../app/config/gimprc-blurbs.h:392
 msgid "Save changed keyboard shortcuts when GIMP exits."
 msgstr "Save changed keyboard shortcuts when GIMP exits."
 
-#: ../app/config/gimprc-blurbs.h:399
+#: ../app/config/gimprc-blurbs.h:395
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "Restore saved keyboard shortcuts on each GIMP startup."
 
-#: ../app/config/gimprc-blurbs.h:402
+#: ../app/config/gimprc-blurbs.h:398
 msgid ""
 "Sets the folder for temporary storage. Files will appear here during the "
 "course of running GIMP.  Most files will disappear when GIMP exits, but some "
@@ -6420,11 +6406,11 @@ msgstr ""
 "files are likely to remain, so it is best if this folder not be one that is "
 "shared by other users."
 
-#: ../app/config/gimprc-blurbs.h:414
+#: ../app/config/gimprc-blurbs.h:410
 msgid "Sets the size of the thumbnail shown in the Open dialog."
 msgstr "Sets the size of the thumbnail shown in the Open dialogue."
 
-#: ../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."
@@ -6432,7 +6418,7 @@ msgstr ""
 "The thumbnail in the Open dialogue will be automatically updated if the file "
 "being previewed is smaller than the size set here."
 
-#: ../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 "
@@ -6444,28 +6430,28 @@ msgstr ""
 "images that wouldn't fit into memory otherwise.  If you have a lot of RAM, "
 "you may want to set this to a higher value."
 
-#: ../app/config/gimprc-blurbs.h:427
+#: ../app/config/gimprc-blurbs.h:423
 msgid "Show the current foreground and background colors in the toolbox."
 msgstr "Show the current foreground and background colours in the toolbox."
 
-#: ../app/config/gimprc-blurbs.h:430
+#: ../app/config/gimprc-blurbs.h:426
 msgid "Show the currently selected brush, pattern and gradient in the toolbox."
 msgstr ""
 "Show the currently selected brush, pattern and gradient in the toolbox."
 
-#: ../app/config/gimprc-blurbs.h:433
+#: ../app/config/gimprc-blurbs.h:429
 msgid "Show the currently active image in the toolbox."
 msgstr "Show the currently active image in the toolbox."
 
-#: ../app/config/gimprc-blurbs.h:439
+#: ../app/config/gimprc-blurbs.h:435
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "Sets the manner in which transparency is displayed in images."
 
-#: ../app/config/gimprc-blurbs.h:442
+#: ../app/config/gimprc-blurbs.h:438
 msgid "Sets the size of the checkerboard used to display transparency."
 msgstr "Sets the size of the chequerboard used to display transparency."
 
-#: ../app/config/gimprc-blurbs.h:445
+#: ../app/config/gimprc-blurbs.h:441
 msgid ""
 "When enabled, GIMP will not save an image if it has not been changed since "
 "it was opened."
@@ -6473,7 +6459,7 @@ msgstr ""
 "When enabled, GIMP will not save an image if it has not been changed since "
 "it was opened."
 
-#: ../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."
@@ -6481,7 +6467,7 @@ msgstr ""
 "Sets the minimal number of operations that can be undone. More undo levels "
 "are kept available until the undo-size limit is reached."
 
-#: ../app/config/gimprc-blurbs.h: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 "
@@ -6491,21 +6477,21 @@ msgstr ""
 "on the undo stack. Regardless of this setting, at least as many undo-levels "
 "as configured can be undone."
 
-#: ../app/config/gimprc-blurbs.h:458
+#: ../app/config/gimprc-blurbs.h:454
 msgid "Sets the size of the previews in the Undo History."
 msgstr "Sets the size of the previews in the Undo History."
 
-#: ../app/config/gimprc-blurbs.h:461
+#: ../app/config/gimprc-blurbs.h:457
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "When enabled, pressing F1 will open the help browser."
 
-#: ../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 "fatal parse error"
 
-#: ../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 "value for token %s is not a valid UTF-8 string"
@@ -6986,12 +6972,12 @@ msgctxt "undo-type"
 msgid "Anchor floating selection"
 msgstr "Anchor floating selection"
 
-#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:262
+#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:261
 msgctxt "undo-type"
 msgid "Paste"
 msgstr "Paste"
 
-#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:501
+#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:502
 msgctxt "undo-type"
 msgid "Cut"
 msgstr "Cut"
@@ -7002,7 +6988,7 @@ msgid "Text"
 msgstr "Text"
 
 #: ../app/core/core-enums.c:865 ../app/core/core-enums.c:907
-#: ../app/core/gimpdrawable-transform.c:567
+#: ../app/core/gimpdrawable-transform.c:589
 msgctxt "undo-type"
 msgid "Transform"
 msgstr "Transform"
@@ -7289,46 +7275,46 @@ msgstr "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 "Deleting \"%s\" failed: %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 "Pasted Layer"
 
-#: ../app/core/gimp-edit.c:389
+#: ../app/core/gimp-edit.c:388
 msgctxt "undo-type"
 msgid "Clear"
 msgstr "Clear"
 
-#: ../app/core/gimp-edit.c:408
+#: ../app/core/gimp-edit.c:407
 msgctxt "undo-type"
 msgid "Fill with Foreground Color"
 msgstr "Fill with Foreground Colour"
 
-#: ../app/core/gimp-edit.c:412
+#: ../app/core/gimp-edit.c:411
 msgctxt "undo-type"
 msgid "Fill with Background Color"
 msgstr "Fill with Background Colour"
 
-#: ../app/core/gimp-edit.c:416
+#: ../app/core/gimp-edit.c:415
 msgctxt "undo-type"
 msgid "Fill with White"
 msgstr "Fill with White"
 
-#: ../app/core/gimp-edit.c:420
+#: ../app/core/gimp-edit.c:419
 msgctxt "undo-type"
 msgid "Fill with Transparency"
 msgstr "Fill with Transparency"
 
-#: ../app/core/gimp-edit.c:424
+#: ../app/core/gimp-edit.c:423
 msgctxt "undo-type"
 msgid "Fill with Pattern"
 msgstr "Fill with Pattern"
 
-#: ../app/core/gimp-edit.c:513
+#: ../app/core/gimp-edit.c:515
 msgid "Global Buffer"
 msgstr "Global Buffer"
 
@@ -7362,7 +7348,7 @@ msgstr "FG to Transparent"
 msgid "tags-locale:C"
 msgstr "tips-locale:en_GB"
 
-#: ../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 "
@@ -7371,7 +7357,7 @@ msgstr ""
 "It seems you have used GIMP %s before.  GIMP will now migrate your user "
 "settings to '%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 "
@@ -7380,56 +7366,57 @@ msgstr ""
 "It appears that you are using GIMP for the first time.  GIMP will now create "
 "a folder named '%s' and copy some files to it."
 
-#: ../app/core/gimp-user-install.c:311
+#: ../app/core/gimp-user-install.c:316
 #, c-format
 msgid "Copying file '%s' from '%s'..."
 msgstr "Copying file '%s' from '%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 "Creating folder '%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 "Cannot create folder '%s': %s"
 
-#: ../app/core/gimp.c:597
+#: ../app/core/gimp.c:595
 msgid "Initialization"
 msgstr "Initialisation"
 
 #. register all internal procedures
-#: ../app/core/gimp.c:698
+#: ../app/core/gimp.c:696
 msgid "Internal Procedures"
 msgstr "Internal Procedures"
 
 #. initialize  the global parasite table
-#: ../app/core/gimp.c:949
+#: ../app/core/gimp.c:947
 msgid "Looking for data files"
 msgstr "Looking for data files"
 
-#: ../app/core/gimp.c:949
+#: ../app/core/gimp.c:947
 msgid "Parasites"
 msgstr "Parasites"
 
 #. 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:2727
+#: ../app/tools/gimppaintoptions-gui.c:203
 msgid "Dynamics"
 msgstr "Dynamics"
 
 #. initialize the list of fonts
-#: ../app/core/gimp.c:978
+#: ../app/core/gimp.c:976
 msgid "Fonts (this may take a while)"
 msgstr "Fonts (this may take a while)"
 
 #. 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:2755
 msgid "Modules"
 msgstr "Modules"
 
 #. update tag cache
-#: ../app/core/gimp.c:996
+#: ../app/core/gimp.c:997
 msgid "Updating tag cache"
 msgstr "Updating tag cache"
 
@@ -7464,7 +7451,7 @@ msgid "Fatal parse error in brush file '%s': Unknown version %d."
 msgstr "Fatal parse error in brush file '%s': Unknown version %d."
 
 #: ../app/core/gimpbrush-load.c:269 ../app/core/gimpbrush-load.c:389
-#: ../app/core/gimpbrush-load.c:722
+#: ../app/core/gimpbrush-load.c:723
 #, c-format
 msgid "Fatal parse error in brush file '%s': File appears truncated."
 msgstr "Fatal parse error in brush file '%s': File appears truncated."
@@ -7477,7 +7464,7 @@ msgstr "Invalid UTF-8 string in brush file '%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/tools/gimpvectortool.c:317
 msgid "Unnamed"
 msgstr "Unnamed"
 
@@ -7502,7 +7489,7 @@ msgstr ""
 msgid "Fatal parse error in brush file '%s': Wide brushes are not supported."
 msgstr "Fatal parse error in brush file '%s': Wide brushes are not supported."
 
-#: ../app/core/gimpbrush.c:136
+#: ../app/core/gimpbrush.c:148
 msgid "Brush Spacing"
 msgstr "Brush Spacing"
 
@@ -7556,11 +7543,11 @@ msgstr "Brush Spikes"
 msgid "Brush Hardness"
 msgstr "Brush Hardness"
 
-#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:143
+#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:150
 msgid "Brush Aspect Ratio"
 msgstr "Brush Aspect Ratio"
 
-#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:147
+#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:154
 msgid "Brush Angle"
 msgstr "Brush Angle"
 
@@ -7570,187 +7557,188 @@ msgstr "Brush Angle"
 msgid "Fatal parse error in brush file '%s': File is corrupt."
 msgstr "Fatal parse error in brush file '%s': File is corrupt."
 
-#: ../app/core/gimpchannel-select.c:59
+#: ../app/core/gimpchannel-select.c:60
 msgctxt "undo-type"
 msgid "Rectangle Select"
 msgstr "Rectangle Select"
 
-#: ../app/core/gimpchannel-select.c:110
+#: ../app/core/gimpchannel-select.c:111
 msgctxt "undo-type"
 msgid "Ellipse Select"
 msgstr "Ellipse Select"
 
-#: ../app/core/gimpchannel-select.c:164
+#: ../app/core/gimpchannel-select.c:165
 msgctxt "undo-type"
 msgid "Rounded Rectangle Select"
 msgstr "Rounded Rectangle Select"
 
-#: ../app/core/gimpchannel-select.c:433 ../app/core/gimplayer.c:273
+#: ../app/core/gimpchannel-select.c:407 ../app/core/gimplayer.c:275
 msgctxt "undo-type"
 msgid "Alpha to Selection"
 msgstr "Alpha to Selection"
 
-#: ../app/core/gimpchannel-select.c:471
+#: ../app/core/gimpchannel-select.c:445
 #, c-format
 msgctxt "undo-type"
 msgid "%s Channel to Selection"
 msgstr "%s Channel to Selection"
 
-#: ../app/core/gimpchannel-select.c:519
+#: ../app/core/gimpchannel-select.c:493
 msgctxt "undo-type"
 msgid "Fuzzy Select"
 msgstr "Fuzzy Select"
 
-#: ../app/core/gimpchannel-select.c:566
+#: ../app/core/gimpchannel-select.c:540
 msgctxt "undo-type"
 msgid "Select by Color"
 msgstr "Select by Colour"
 
-#: ../app/core/gimpchannel.c:272
+#: ../app/core/gimpchannel.c:273
 msgctxt "undo-type"
 msgid "Rename Channel"
 msgstr "Rename Channel"
 
-#: ../app/core/gimpchannel.c:273
+#: ../app/core/gimpchannel.c:274
 msgctxt "undo-type"
 msgid "Move Channel"
 msgstr "Move Channel"
 
-#: ../app/core/gimpchannel.c:274
+#: ../app/core/gimpchannel.c:275
 msgctxt "undo-type"
 msgid "Scale Channel"
 msgstr "Scale Channel"
 
-#: ../app/core/gimpchannel.c:275
+#: ../app/core/gimpchannel.c:276
 msgctxt "undo-type"
 msgid "Resize Channel"
 msgstr "Resize Channel"
 
-#: ../app/core/gimpchannel.c:276
+#: ../app/core/gimpchannel.c:277
 msgctxt "undo-type"
 msgid "Flip Channel"
 msgstr "Flip Channel"
 
-#: ../app/core/gimpchannel.c:277
+#: ../app/core/gimpchannel.c:278
 msgctxt "undo-type"
 msgid "Rotate Channel"
 msgstr "Rotate Channel"
 
-#: ../app/core/gimpchannel.c:278 ../app/core/gimpdrawable-transform.c:845
+#: ../app/core/gimpchannel.c:279 ../app/core/gimpdrawable-transform.c:904
 msgctxt "undo-type"
 msgid "Transform Channel"
 msgstr "Transform Channel"
 
-#: ../app/core/gimpchannel.c:279
+#: ../app/core/gimpchannel.c:280
 msgctxt "undo-type"
 msgid "Stroke Channel"
 msgstr "Stroke Channel"
 
-#: ../app/core/gimpchannel.c:280 ../app/core/gimpselection.c:584
+#: ../app/core/gimpchannel.c:281 ../app/core/gimpselection.c:582
 msgctxt "undo-type"
 msgid "Channel to Selection"
 msgstr "Channel to Selection"
 
-#: ../app/core/gimpchannel.c:281
+#: ../app/core/gimpchannel.c:282
 msgctxt "undo-type"
 msgid "Reorder Channel"
 msgstr "Reorder Channel"
 
-#: ../app/core/gimpchannel.c:282
+#: ../app/core/gimpchannel.c:283
 msgctxt "undo-type"
 msgid "Raise Channel"
 msgstr "Raise Channel"
 
-#: ../app/core/gimpchannel.c:283
+#: ../app/core/gimpchannel.c:284
 msgctxt "undo-type"
 msgid "Raise Channel to Top"
 msgstr "Raise Channel to Top"
 
-#: ../app/core/gimpchannel.c:284
+#: ../app/core/gimpchannel.c:285
 msgctxt "undo-type"
 msgid "Lower Channel"
 msgstr "Lower Channel"
 
-#: ../app/core/gimpchannel.c:285
+#: ../app/core/gimpchannel.c:286
 msgctxt "undo-type"
 msgid "Lower Channel to Bottom"
 msgstr "Lower Channel to Bottom"
 
-#: ../app/core/gimpchannel.c:286
+#: ../app/core/gimpchannel.c:287
 msgid "Channel cannot be raised higher."
 msgstr "Channel cannot be raised higher."
 
-#: ../app/core/gimpchannel.c:287
+#: ../app/core/gimpchannel.c:288
 msgid "Channel cannot be lowered more."
 msgstr "Channel cannot be lowered more."
 
-#: ../app/core/gimpchannel.c:309
+#: ../app/core/gimpchannel.c:310
 msgctxt "undo-type"
 msgid "Feather Channel"
 msgstr "Feather Channel"
 
-#: ../app/core/gimpchannel.c:310
+#: ../app/core/gimpchannel.c:311
 msgctxt "undo-type"
 msgid "Sharpen Channel"
 msgstr "Sharpen Channel"
 
-#: ../app/core/gimpchannel.c:311
+#: ../app/core/gimpchannel.c:312
 msgctxt "undo-type"
 msgid "Clear Channel"
 msgstr "Clear Channel"
 
-#: ../app/core/gimpchannel.c:312
+#: ../app/core/gimpchannel.c:313
 msgctxt "undo-type"
 msgid "Fill Channel"
 msgstr "Fill Channel"
 
-#: ../app/core/gimpchannel.c:313
+#: ../app/core/gimpchannel.c:314
 msgctxt "undo-type"
 msgid "Invert Channel"
 msgstr "Invert Channel"
 
-#: ../app/core/gimpchannel.c:314
+#: ../app/core/gimpchannel.c:315
 msgctxt "undo-type"
 msgid "Border Channel"
 msgstr "Border Channel"
 
-#: ../app/core/gimpchannel.c:315
+#: ../app/core/gimpchannel.c:316
 msgctxt "undo-type"
 msgid "Grow Channel"
 msgstr "Grow Channel"
 
-#: ../app/core/gimpchannel.c:316
+#: ../app/core/gimpchannel.c:317
 msgctxt "undo-type"
 msgid "Shrink Channel"
 msgstr "Shrink Channel"
 
-#: ../app/core/gimpchannel.c:728
+#: ../app/core/gimpchannel.c:731
 msgid "Cannot stroke empty channel."
 msgstr "Cannot stroke empty channel."
 
-#: ../app/core/gimpchannel.c:1752
+#: ../app/core/gimpchannel.c:1758
 msgctxt "undo-type"
 msgid "Set Channel Color"
 msgstr "Set Channel Colour"
 
-#: ../app/core/gimpchannel.c:1818
+#: ../app/core/gimpchannel.c:1824
 msgctxt "undo-type"
 msgid "Set Channel Opacity"
 msgstr "Set Channel Opacity"
 
-#: ../app/core/gimpchannel.c:1926 ../app/core/gimpselection.c:154
+#: ../app/core/gimpchannel.c:1932 ../app/core/gimpselection.c:154
 msgid "Selection Mask"
 msgstr "Selection Mask"
 
-#: ../app/core/gimpcontext.c:640
+#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:113
+#: ../app/widgets/gimplayertreeview.c:283
 msgid "Opacity"
 msgstr "Opacity"
 
-#: ../app/core/gimpcontext.c:648
+#: ../app/core/gimpcontext.c:647
 msgid "Paint Mode"
 msgstr "Paint Mode"
 
-#: ../app/core/gimpdata.c:679 ../app/core/gimptoolpresets.c:277
+#: ../app/core/gimpdata.c:670
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "Could not delete '%s': %s"
@@ -7768,11 +7756,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 "copy"
 
-#: ../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 "%s copy"
@@ -7815,7 +7803,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdrawable-blend.c:244
+#: ../app/core/gimpdrawable-blend.c:245
 msgctxt "undo-type"
 msgid "Blend"
 msgstr "Blend"
@@ -7830,11 +7818,11 @@ msgctxt "undo-type"
 msgid "Brightness-Contrast"
 msgstr "Brightness-Contrast"
 
-#: ../app/core/gimpdrawable-bucket-fill.c:91
+#: ../app/core/gimpdrawable-bucket-fill.c:89
 msgid "No patterns available for this operation."
 msgstr "No patterns available for this operation."
 
-#: ../app/core/gimpdrawable-bucket-fill.c:286
+#: ../app/core/gimpdrawable-bucket-fill.c:284
 msgctxt "undo-type"
 msgid "Bucket Fill"
 msgstr "Bucket Fill"
@@ -7889,7 +7877,7 @@ msgstr "Invert"
 msgid "Levels"
 msgstr "Levels"
 
-#: ../app/core/gimpdrawable-offset.c:315
+#: ../app/core/gimpdrawable-offset.c:316
 msgctxt "undo-type"
 msgid "Offset Drawable"
 msgstr "Offset Drawable"
@@ -7899,153 +7887,165 @@ msgstr "Offset Drawable"
 msgid "Posterize"
 msgstr "Posterise"
 
-#: ../app/core/gimpdrawable-stroke.c:435
+#: ../app/core/gimpdrawable-stroke.c:272
+#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556
+msgid "Not enough points to stroke"
+msgstr "Not enough points to stroke"
+
+#: ../app/core/gimpdrawable-stroke.c:273
+msgid "Not enough points to fill"
+msgstr "Not enough points to fill"
+
+#: ../app/core/gimpdrawable-stroke.c:404
 msgctxt "undo-type"
 msgid "Render Stroke"
 msgstr "Render Stroke"
 
 #: ../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:282
+#: ../app/tools/gimpregionselectoptions.c:215
+#: ../app/tools/gimpthresholdtool.c:90
 msgid "Threshold"
 msgstr "Threshold"
 
-#: ../app/core/gimpdrawable-transform.c:644
+#: ../app/core/gimpdrawable-transform.c:677
 msgctxt "undo-type"
 msgid "Flip"
 msgstr "Flip"
 
-#: ../app/core/gimpdrawable-transform.c:718
+#: ../app/core/gimpdrawable-transform.c:762
 msgctxt "undo-type"
 msgid "Rotate"
 msgstr "Rotate"
 
-#: ../app/core/gimpdrawable-transform.c:843 ../app/core/gimplayer.c:272
+#: ../app/core/gimpdrawable-transform.c:902 ../app/core/gimplayer.c:274
 msgctxt "undo-type"
 msgid "Transform Layer"
 msgstr "Transform Layer"
 
-#: ../app/core/gimpdrawable-transform.c:858
+#: ../app/core/gimpdrawable-transform.c:915
 msgid "Transformation"
 msgstr "Transformation"
 
-#: ../app/core/gimpdrawable.c:486
+#: ../app/core/gimpdrawable.c:484
 msgctxt "undo-type"
 msgid "Scale"
 msgstr "Scale"
 
-#: ../app/core/gimpdynamicsoutput.c:106
+#: ../app/core/gimpdynamicsoutput.c:135
 msgid "Output type"
 msgstr "Output type"
 
-#: ../app/core/gimpgradient-load.c:71 ../app/core/gimpgradient-load.c:96
-#: ../app/core/gimpgradient-load.c:117 ../app/core/gimpgradient-load.c:168
+#: ../app/core/gimpgradient-load.c:72 ../app/core/gimpgradient-load.c:97
+#: ../app/core/gimpgradient-load.c:118 ../app/core/gimpgradient-load.c:169
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Read error in line %d."
 msgstr "Fatal parse error in gradient file '%s': Read error in line %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 "Fatal parse error in gradient file '%s': Not a GIMP gradient file."
 
-#: ../app/core/gimpgradient-load.c:109
+#: ../app/core/gimpgradient-load.c:110
 #, c-format
 msgid "Invalid UTF-8 string in gradient file '%s'."
 msgstr "Invalid UTF-8 string in gradient file '%s'."
 
-#: ../app/core/gimpgradient-load.c:136
+#: ../app/core/gimpgradient-load.c:137
 #, c-format
 msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d."
 msgstr "Fatal parse error in gradient file '%s': File is corrupt in line %d."
 
-#: ../app/core/gimpgradient-load.c:218 ../app/core/gimpgradient-load.c:229
+#: ../app/core/gimpgradient-load.c:219 ../app/core/gimpgradient-load.c:230
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d."
 msgstr ""
 "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d."
 
-#: ../app/core/gimpgradient-load.c:241 ../app/core/gimpgradient-load.c:255
+#: ../app/core/gimpgradient-load.c:242 ../app/core/gimpgradient-load.c:256
 #, c-format
 msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1."
 msgstr "Gradient file '%s' is corrupt: Segments do not span the range 0-1."
 
-#: ../app/core/gimpgradient-load.c:335
+#: ../app/core/gimpgradient-load.c:336
 #, c-format
 msgid "No linear gradients found in '%s'"
 msgstr "No linear gradients found in '%s'"
 
-#: ../app/core/gimpgradient-load.c:345
+#: ../app/core/gimpgradient-load.c:346
 #, c-format
 msgid "Failed to import gradients from '%s': %s"
 msgstr "Failed to import gradients from '%s': %s"
 
-#: ../app/core/gimpgrid.c:83
+#: ../app/core/gimpgrid.c:84
 msgid "Line style used for the grid."
 msgstr "Line style used for the grid."
 
-#: ../app/core/gimpgrid.c:89
+#: ../app/core/gimpgrid.c:90
 msgid "The foreground color of the grid."
 msgstr "The foreground colour of the grid."
 
-#: ../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 ""
 "The background colour of the grid; only used in double dashed line style."
 
-#: ../app/core/gimpgrid.c:100
+#: ../app/core/gimpgrid.c:101
 msgid "Horizontal spacing of grid lines."
 msgstr "Horizontal spacing of grid lines."
 
-#: ../app/core/gimpgrid.c:105
+#: ../app/core/gimpgrid.c:106
 msgid "Vertical spacing of grid lines."
 msgstr "Vertical spacing of grid lines."
 
-#: ../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 ""
 "Horizontal offset of the first grid line; this may be a negative number."
 
-#: ../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 "Vertical offset of the first grid line; this may be a negative number."
 
-#: ../app/core/gimpgrouplayer.c:178
+#: ../app/core/gimpgrouplayer.c:213
 msgid "Layer Group"
 msgstr "Layer Group"
 
-#: ../app/core/gimpgrouplayer.c:179
+#: ../app/core/gimpgrouplayer.c:214
 msgctxt "undo-type"
 msgid "Rename Layer Group"
 msgstr "Rename Layer Group"
 
-#: ../app/core/gimpgrouplayer.c:180
+#: ../app/core/gimpgrouplayer.c:215
 msgctxt "undo-type"
 msgid "Move Layer Group"
 msgstr "Move Layer Group"
 
-#: ../app/core/gimpgrouplayer.c:181
+#: ../app/core/gimpgrouplayer.c:216
 msgctxt "undo-type"
 msgid "Scale Layer Group"
 msgstr "Scale Layer Group"
 
-#: ../app/core/gimpgrouplayer.c:182
+#: ../app/core/gimpgrouplayer.c:217
 msgctxt "undo-type"
 msgid "Resize Layer Group"
 msgstr "Resize Layer Group"
 
-#: ../app/core/gimpgrouplayer.c:183
+#: ../app/core/gimpgrouplayer.c:218
 msgctxt "undo-type"
 msgid "Flip Layer Group"
 msgstr "Flip Layer Group"
 
-#: ../app/core/gimpgrouplayer.c:184
+#: ../app/core/gimpgrouplayer.c:219
 msgctxt "undo-type"
 msgid "Rotate Layer Group"
 msgstr "Rotate Layer Group"
 
-#: ../app/core/gimpgrouplayer.c:185
+#: ../app/core/gimpgrouplayer.c:220
 msgctxt "undo-type"
 msgid "Transform Layer Group"
 msgstr "Transform Layer Group"
@@ -8055,45 +8055,50 @@ msgctxt "undo-type"
 msgid "Arrange Objects"
 msgstr "Arrange Objects"
 
-#: ../app/core/gimpimage-colormap.c:67
+#: ../app/core/gimpimage-colormap.c:64
+#, c-format
+msgid "Colormap of Image #%d (%s)"
+msgstr "Colourmap of Image #%d (%s)"
+
+#: ../app/core/gimpimage-colormap.c:162
 msgctxt "undo-type"
 msgid "Set Colormap"
 msgstr "Set Colourmap"
 
-#: ../app/core/gimpimage-colormap.c:132
+#: ../app/core/gimpimage-colormap.c:243
 msgctxt "undo-type"
 msgid "Change Colormap entry"
 msgstr "Change Colourmap entry"
 
-#: ../app/core/gimpimage-colormap.c:157
+#: ../app/core/gimpimage-colormap.c:271
 msgctxt "undo-type"
 msgid "Add Color to Colormap"
 msgstr "Add Colour to Colourmap"
 
-#: ../app/core/gimpimage-convert.c:791
+#: ../app/core/gimpimage-convert.c:793
 msgid "Cannot convert image: palette is empty."
 msgstr "Cannot convert image: palette is empty."
 
-#: ../app/core/gimpimage-convert.c:807
+#: ../app/core/gimpimage-convert.c:809
 msgctxt "undo-type"
 msgid "Convert Image to RGB"
 msgstr "Convert Image to RGB"
 
-#: ../app/core/gimpimage-convert.c:811
+#: ../app/core/gimpimage-convert.c:813
 msgctxt "undo-type"
 msgid "Convert Image to Grayscale"
 msgstr "Convert Image to Greyscale"
 
-#: ../app/core/gimpimage-convert.c:815
+#: ../app/core/gimpimage-convert.c:817
 msgctxt "undo-type"
 msgid "Convert Image to Indexed"
 msgstr "Convert Image to Indexed"
 
-#: ../app/core/gimpimage-convert.c:894
+#: ../app/core/gimpimage-convert.c:896
 msgid "Converting to indexed colors (stage 2)"
 msgstr "Converting to indexed colours (stage 2)"
 
-#: ../app/core/gimpimage-convert.c:939
+#: ../app/core/gimpimage-convert.c:941
 msgid "Converting to indexed colors (stage 3)"
 msgstr "Converting to indexed colours (stage 3)"
 
@@ -8147,57 +8152,57 @@ msgctxt "undo-type"
 msgid "Transform Items"
 msgstr "Transform Items"
 
-#: ../app/core/gimpimage-merge.c:108 ../app/core/gimpimage-merge.c:122
+#: ../app/core/gimpimage-merge.c:132
 msgctxt "undo-type"
 msgid "Merge Visible Layers"
 msgstr "Merge Visible Layers"
 
-#: ../app/core/gimpimage-merge.c:176
+#: ../app/core/gimpimage-merge.c:178
 msgctxt "undo-type"
 msgid "Flatten Image"
 msgstr "Flatten Image"
 
-#: ../app/core/gimpimage-merge.c:225
+#: ../app/core/gimpimage-merge.c:248
 msgid "Cannot merge down to a layer group."
 msgstr "Cannot merge down to a layer group."
 
-#: ../app/core/gimpimage-merge.c:232
+#: ../app/core/gimpimage-merge.c:255
 msgid "The layer to merge down to is locked."
 msgstr "The layer to merge down to is locked."
 
-#: ../app/core/gimpimage-merge.c:244
+#: ../app/core/gimpimage-merge.c:267
 msgid "There is no visible layer to merge down to."
 msgstr "There is no visible layer to merge down to."
 
-#: ../app/core/gimpimage-merge.c:255
+#: ../app/core/gimpimage-merge.c:277
 msgctxt "undo-type"
 msgid "Merge Down"
 msgstr "Merge Down"
 
-#: ../app/core/gimpimage-merge.c:277
+#: ../app/core/gimpimage-merge.c:305
 msgctxt "undo-type"
 msgid "Merge Layer Group"
 msgstr "Merge Layer Group"
 
-#: ../app/core/gimpimage-merge.c:330
+#: ../app/core/gimpimage-merge.c:358
 msgctxt "undo-type"
 msgid "Merge Visible Paths"
 msgstr "Merge Visible Paths"
 
-#: ../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 "Not enough visible paths for a merge. There must be at least two."
 
-#: ../app/core/gimpimage-new.c:135
+#: ../app/core/gimpimage-new.c:140
 msgid "Background"
 msgstr "Background"
 
-#: ../app/core/gimpimage-quick-mask.c:85
+#: ../app/core/gimpimage-quick-mask.c:86
 msgctxt "undo-type"
 msgid "Enable Quick Mask"
 msgstr "Enable Quick Mask"
 
-#: ../app/core/gimpimage-quick-mask.c:135
+#: ../app/core/gimpimage-quick-mask.c:136
 msgctxt "undo-type"
 msgid "Disable Quick Mask"
 msgstr "Disable Quick Mask"
@@ -8227,125 +8232,125 @@ msgstr "Scale Image"
 msgid "Can't undo %s"
 msgstr "Can't undo %s"
 
-#: ../app/core/gimpimage.c:1655
+#: ../app/core/gimpimage.c:1806
 msgctxt "undo-type"
 msgid "Change Image Resolution"
 msgstr "Change Image Resolution"
 
-#: ../app/core/gimpimage.c:1707
+#: ../app/core/gimpimage.c:1858
 msgctxt "undo-type"
 msgid "Change Image Unit"
 msgstr "Change Image Unit"
 
-#: ../app/core/gimpimage.c:2699
+#: ../app/core/gimpimage.c:2850
 msgctxt "undo-type"
 msgid "Attach Parasite to Image"
 msgstr "Attach Parasite to Image"
 
-#: ../app/core/gimpimage.c:2740
+#: ../app/core/gimpimage.c:2891
 msgctxt "undo-type"
 msgid "Remove Parasite from Image"
 msgstr "Remove Parasite from Image"
 
-#: ../app/core/gimpimage.c:3449
+#: ../app/core/gimpimage.c:3600
 msgctxt "undo-type"
 msgid "Add Layer"
 msgstr "Add Layer"
 
-#: ../app/core/gimpimage.c:3499 ../app/core/gimpimage.c:3519
+#: ../app/core/gimpimage.c:3650 ../app/core/gimpimage.c:3670
 msgctxt "undo-type"
 msgid "Remove Layer"
 msgstr "Remove Layer"
 
-#: ../app/core/gimpimage.c:3512
+#: ../app/core/gimpimage.c:3663
 msgctxt "undo-type"
 msgid "Remove Floating Selection"
 msgstr "Remove Floating Selection"
 
-#: ../app/core/gimpimage.c:3678
+#: ../app/core/gimpimage.c:3832
 msgctxt "undo-type"
 msgid "Add Channel"
 msgstr "Add Channel"
 
-#: ../app/core/gimpimage.c:3716 ../app/core/gimpimage.c:3728
+#: ../app/core/gimpimage.c:3870 ../app/core/gimpimage.c:3882
 msgctxt "undo-type"
 msgid "Remove Channel"
 msgstr "Remove Channel"
 
-#: ../app/core/gimpimage.c:3775
+#: ../app/core/gimpimage.c:3936
 msgctxt "undo-type"
 msgid "Add Path"
 msgstr "Add Path"
 
-#: ../app/core/gimpimage.c:3806
+#: ../app/core/gimpimage.c:3967
 msgctxt "undo-type"
 msgid "Remove Path"
 msgstr "Remove Path"
 
-#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1711
+#: ../app/core/gimpimagefile.c:697 ../app/dialogs/preferences-dialog.c:1709
 msgid "Folder"
 msgstr "Folder"
 
-#: ../app/core/gimpimagefile.c:539
+#: ../app/core/gimpimagefile.c:702
 msgid "Special File"
 msgstr "Special File"
 
-#: ../app/core/gimpimagefile.c:555
+#: ../app/core/gimpimagefile.c:718
 msgid "Remote File"
 msgstr "Remote File"
 
-#: ../app/core/gimpimagefile.c:574
+#: ../app/core/gimpimagefile.c:737
 msgid "Click to create preview"
 msgstr "Click to create preview"
 
-#: ../app/core/gimpimagefile.c:580
+#: ../app/core/gimpimagefile.c:743
 msgid "Loading preview..."
 msgstr "Loading preview..."
 
-#: ../app/core/gimpimagefile.c:586
+#: ../app/core/gimpimagefile.c:749
 msgid "Preview is out of date"
 msgstr "Preview is out of date"
 
-#: ../app/core/gimpimagefile.c:592
+#: ../app/core/gimpimagefile.c:755
 msgid "Cannot create preview"
 msgstr "Cannot create preview"
 
-#: ../app/core/gimpimagefile.c:602
+#: ../app/core/gimpimagefile.c:765
 msgid "(Preview may be out of date)"
 msgstr "(Preview may be out of date)"
 
 #. 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 pixel"
 msgstr[1] "%d à %d pixels"
 
-#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:339
+#: ../app/core/gimpimagefile.c:797 ../app/display/gimpdisplayshell-title.c:339
 #, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
 msgstr[0] "%d layer"
 msgstr[1] "%d layers"
 
-#: ../app/core/gimpimagefile.c:681
+#: ../app/core/gimpimagefile.c:845
 #, c-format
 msgid "Could not open thumbnail '%s': %s"
 msgstr "Could not open thumbnail '%s': %s"
 
-#: ../app/core/gimpitem.c:1564
+#: ../app/core/gimpitem.c:1815
 msgctxt "undo-type"
 msgid "Attach Parasite"
 msgstr "Attach Parasite"
 
-#: ../app/core/gimpitem.c:1574
+#: ../app/core/gimpitem.c:1825
 msgctxt "undo-type"
 msgid "Attach Parasite to Item"
 msgstr "Attach Parasite to Item"
 
-#: ../app/core/gimpitem.c:1616 ../app/core/gimpitem.c:1623
+#: ../app/core/gimpitem.c:1876 ../app/core/gimpitem.c:1883
 msgctxt "undo-type"
 msgid "Remove Parasite from Item"
 msgstr "Remove Parasite from Item"
@@ -8355,7 +8360,7 @@ msgctxt "undo-type"
 msgid "Anchor Floating Selection"
 msgstr "Anchor Floating Selection"
 
-#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:595
+#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:609
 msgid ""
 "Cannot create a new layer from the floating selection because it belongs to "
 "a layer mask or channel."
@@ -8368,76 +8373,76 @@ msgctxt "undo-type"
 msgid "Floating Selection to Layer"
 msgstr "Floating Selection to Layer"
 
-#: ../app/core/gimplayer.c:266
+#: ../app/core/gimplayer.c:268
 msgctxt "undo-type"
 msgid "Rename Layer"
 msgstr "Rename Layer"
 
-#: ../app/core/gimplayer.c:267
+#: ../app/core/gimplayer.c:269
 msgctxt "undo-type"
 msgid "Move Layer"
 msgstr "Move Layer"
 
-#: ../app/core/gimplayer.c:268
+#: ../app/core/gimplayer.c:270
 msgctxt "undo-type"
 msgid "Scale Layer"
 msgstr "Scale Layer"
 
-#: ../app/core/gimplayer.c:269
+#: ../app/core/gimplayer.c:271
 msgctxt "undo-type"
 msgid "Resize Layer"
 msgstr "Resize Layer"
 
-#: ../app/core/gimplayer.c:270
+#: ../app/core/gimplayer.c:272
 msgctxt "undo-type"
 msgid "Flip Layer"
 msgstr "Flip Layer"
 
-#: ../app/core/gimplayer.c:271
+#: ../app/core/gimplayer.c:273
 msgctxt "undo-type"
 msgid "Rotate Layer"
 msgstr "Rotate Layer"
 
-#: ../app/core/gimplayer.c:274
+#: ../app/core/gimplayer.c:276
 msgctxt "undo-type"
 msgid "Reorder Layer"
 msgstr "Reorder Layer"
 
-#: ../app/core/gimplayer.c:275
+#: ../app/core/gimplayer.c:277
 msgctxt "undo-type"
 msgid "Raise Layer"
 msgstr "Raise Layer"
 
-#: ../app/core/gimplayer.c:276
+#: ../app/core/gimplayer.c:278
 msgctxt "undo-type"
 msgid "Raise Layer to Top"
 msgstr "Raise Layer to Top"
 
-#: ../app/core/gimplayer.c:277
+#: ../app/core/gimplayer.c:279
 msgctxt "undo-type"
 msgid "Lower Layer"
 msgstr "Lower Layer"
 
-#: ../app/core/gimplayer.c:278
+#: ../app/core/gimplayer.c:280
 msgctxt "undo-type"
 msgid "Lower Layer to Bottom"
 msgstr "Lower Layer to Bottom"
 
-#: ../app/core/gimplayer.c:279
+#: ../app/core/gimplayer.c:281
 msgid "Layer cannot be raised higher."
 msgstr "Layer cannot be raised higher."
 
-#: ../app/core/gimplayer.c:280
+#: ../app/core/gimplayer.c:282
 msgid "Layer cannot be lowered more."
 msgstr "Layer cannot be lowered more."
 
-#: ../app/core/gimplayer.c:437 ../app/core/gimplayer.c:1488
-#: ../app/core/gimplayermask.c:233
+#: ../app/core/gimplayer.c:439 ../app/core/gimplayer.c:1505
+#: ../app/core/gimplayermask.c:236
 #, c-format
 msgid "%s mask"
 msgstr "%s mask"
 
-#: ../app/core/gimplayer.c:476
+#: ../app/core/gimplayer.c:478
 #, c-format
 msgid ""
 "Floating Selection\n"
@@ -8446,45 +8451,45 @@ msgstr ""
 "Floating Selection\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:1412
+#: ../app/core/gimplayer.c:1425
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "Unable to add a layer mask since the layer already has one."
 
-#: ../app/core/gimplayer.c:1423
+#: ../app/core/gimplayer.c:1436
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr "Cannot add layer mask of different dimensions than specified layer."
 
-#: ../app/core/gimplayer.c:1429
+#: ../app/core/gimplayer.c:1442
 msgctxt "undo-type"
 msgid "Add Layer Mask"
 msgstr "Add Layer Mask"
 
-#: ../app/core/gimplayer.c:1543
+#: ../app/core/gimplayer.c:1560
 msgctxt "undo-type"
 msgid "Transfer Alpha to Mask"
 msgstr "Transfer Alpha to Mask"
 
-#: ../app/core/gimplayer.c:1713 ../app/core/gimplayermask.c:259
+#: ../app/core/gimplayer.c:1730
 msgctxt "undo-type"
 msgid "Apply Layer Mask"
 msgstr "Apply Layer Mask"
 
-#: ../app/core/gimplayer.c:1714
+#: ../app/core/gimplayer.c:1731
 msgctxt "undo-type"
 msgid "Delete Layer Mask"
 msgstr "Delete Layer Mask"
 
-#: ../app/core/gimplayer.c:1833
+#: ../app/core/gimplayer.c:1850
 msgctxt "undo-type"
 msgid "Add Alpha Channel"
 msgstr "Add Alpha Channel"
 
-#: ../app/core/gimplayer.c:1887
+#: ../app/core/gimplayer.c:1904
 msgctxt "undo-type"
 msgid "Remove Alpha Channel"
 msgstr "Remove Alpha Channel"
 
-#: ../app/core/gimplayer.c:1907
+#: ../app/core/gimplayer.c:1924
 msgctxt "undo-type"
 msgid "Layer to Image Size"
 msgstr "Layer to Image Size"
@@ -8504,39 +8509,49 @@ msgstr "Layer Mask to Selection"
 msgid "Cannot rename layer masks."
 msgstr "Cannot rename layer masks."
 
-#: ../app/core/gimplayermask.c:320
+#: ../app/core/gimplayermask.c:264
+msgctxt "undo-type"
+msgid "Enable Layer Mask"
+msgstr "Enable Layer Mask"
+
+#: ../app/core/gimplayermask.c:265
+msgctxt "undo-type"
+msgid "Disable Layer Mask"
+msgstr "Disable Layer Mask"
+
+#: ../app/core/gimplayermask.c:327
 msgctxt "undo-type"
 msgid "Show Layer Mask"
 msgstr "Show Layer Mask"
 
-#: ../app/core/gimppalette-import.c:438
+#: ../app/core/gimppalette-import.c:439
 #, c-format
 msgid "Index %d"
 msgstr "Index %d"
 
-#: ../app/core/gimppalette-import.c:548
+#: ../app/core/gimppalette-import.c:549
 #, c-format
 msgid "Unknown type of palette file: %s"
 msgstr "Unknown type of palette file: %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 "Fatal parse error in palette file '%s': Read error in line %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 "Fatal parse error in palette file '%s': Missing magic header."
 
-#: ../app/core/gimppalette-load.c:124
+#: ../app/core/gimppalette-load.c:125
 #, c-format
 msgid "Invalid UTF-8 string in palette file '%s'"
 msgstr "Invalid UTF-8 string in palette file '%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 "
@@ -8545,32 +8560,32 @@ msgstr ""
 "Reading palette file '%s': Invalid number of columns in line %d. Using "
 "default value."
 
-#: ../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 "Reading palette file '%s': Missing RED component in line %d."
 
-#: ../app/core/gimppalette-load.c:192
+#: ../app/core/gimppalette-load.c:193
 #, c-format
 msgid "Reading palette file '%s': Missing GREEN component in line %d."
 msgstr "Reading palette file '%s': Missing GREEN component in line %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 "Reading palette file '%s': Missing BLUE component in line %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 "Reading palette file '%s': RGB value out of range in line %d."
 
-#: ../app/core/gimppalette-load.c:477
+#: ../app/core/gimppalette-load.c:478
 #, c-format
 msgid "Could not read header from palette file '%s'"
 msgstr "Could not read header from palette file '%s'"
 
-#: ../app/core/gimppalette-load.c:500 ../app/core/gimppalette-load.c:588
+#: ../app/core/gimppalette-load.c:501 ../app/core/gimppalette-load.c:589
 #, c-format
 msgid "Fatal parse error in palette file '%s'"
 msgstr "Fatal parse error in palette file '%s'"
@@ -8602,7 +8617,7 @@ msgstr ""
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "Invalid UTF-8 string in pattern file '%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 "Unable to run %s callback. The corresponding plug-in may have crashed."
@@ -8669,20 +8684,20 @@ msgstr "There is no selection to stroke."
 msgid "Unable to cut or copy because the selected region is empty."
 msgstr "Unable to cut or copy because the selected region is empty."
 
-#: ../app/core/gimpselection.c:845
+#: ../app/core/gimpselection.c:847
 msgid "Cannot float selection because the selected region is empty."
 msgstr "Cannot float selection because the selected region is empty."
 
-#: ../app/core/gimpselection.c:852
+#: ../app/core/gimpselection.c:854
 msgctxt "undo-type"
 msgid "Float Selection"
 msgstr "Float Selection"
 
-#: ../app/core/gimpselection.c:868
+#: ../app/core/gimpselection.c:870
 msgid "Floated Layer"
 msgstr "Floated Layer"
 
-#: ../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."
@@ -8690,89 +8705,89 @@ msgstr ""
 "Convert a mitred join to a bevelled join if the mitre would extend to a "
 "distance of more than mitre-limit * line-width from the actual join point."
 
-#: ../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 "The unit used for coordinate display when not in dot-for-dot mode."
 
-#: ../app/core/gimptemplate.c:107
+#: ../app/core/gimptemplate.c:136
 msgid "The horizontal image resolution."
 msgstr "The horizontal image resolution."
 
-#: ../app/core/gimptemplate.c:113
+#: ../app/core/gimptemplate.c:142
 msgid "The vertical image resolution."
 msgstr "The vertical image resolution."
 
-#: ../app/core/gimpunit.c:56
+#: ../app/core/gimpunit.c:60
 msgctxt "unit-singular"
 msgid "pixel"
 msgstr "pixel"
 
-#: ../app/core/gimpunit.c:56
+#: ../app/core/gimpunit.c:60
 msgctxt "unit-plural"
 msgid "pixels"
 msgstr "pixels"
 
-#: ../app/core/gimpunit.c:60
+#: ../app/core/gimpunit.c:64
 msgctxt "unit-singular"
 msgid "inch"
 msgstr "inch"
 
-#: ../app/core/gimpunit.c:60
+#: ../app/core/gimpunit.c:64
 msgctxt "unit-plural"
 msgid "inches"
 msgstr "inches"
 
-#: ../app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:67
 msgctxt "unit-singular"
 msgid "millimeter"
 msgstr "millimetre"
 
-#: ../app/core/gimpunit.c:63
+#: ../app/core/gimpunit.c:67
 msgctxt "unit-plural"
 msgid "millimeters"
 msgstr "millimetres"
 
-#: ../app/core/gimpunit.c:67
+#: ../app/core/gimpunit.c:71
 msgctxt "unit-singular"
 msgid "point"
 msgstr "point"
 
-#: ../app/core/gimpunit.c:67
+#: ../app/core/gimpunit.c:71
 msgctxt "unit-plural"
 msgid "points"
 msgstr "points"
 
-#: ../app/core/gimpunit.c:70
+#: ../app/core/gimpunit.c:74
 msgctxt "unit-singular"
 msgid "pica"
 msgstr "pica"
 
-#: ../app/core/gimpunit.c:70
+#: ../app/core/gimpunit.c:74
 msgctxt "unit-plural"
 msgid "picas"
 msgstr "picas"
 
-#: ../app/core/gimpunit.c:78
+#: ../app/core/gimpunit.c:82
 msgctxt "singular"
 msgid "percent"
 msgstr "percent"
 
-#: ../app/core/gimpunit.c:78
+#: ../app/core/gimpunit.c:82
 msgctxt "plural"
 msgid "percent"
 msgstr "percent"
 
-#: ../app/dialogs/about-dialog.c:106 ../app/gui/gui.c:482
+#: ../app/dialogs/about-dialog.c:113 ../app/gui/gui.c:478
 msgid "About GIMP"
 msgstr "About GIMP"
 
-#: ../app/dialogs/about-dialog.c:115
+#: ../app/dialogs/about-dialog.c:122
 msgid "Visit the GIMP website"
 msgstr "Visit the GIMP website"
 
 #. Translators: insert your names here,
 #. separated by newline
-#: ../app/dialogs/about-dialog.c:121
+#: ../app/dialogs/about-dialog.c:128
 msgid "translator-credits"
 msgstr ""
 "Robert Brady\n"
@@ -8780,11 +8795,11 @@ msgstr ""
 "Gareth Owen\n"
 "Bruce Cowan"
 
-#: ../app/dialogs/about-dialog.c:516
+#: ../app/dialogs/about-dialog.c:518
 msgid "GIMP is brought to you by"
 msgstr "GIMP is brought to you by"
 
-#: ../app/dialogs/about-dialog.c:590
+#: ../app/dialogs/about-dialog.c:592
 msgid "This is an unstable development release."
 msgstr "This is an unstable development release."
 
@@ -8817,109 +8832,125 @@ msgid "_Remove unused colors from colormap"
 msgstr "_Remove unused colours from colourmap"
 
 #. 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 "Dithering"
 
-#: ../app/dialogs/convert-dialog.c:245
+#: ../app/dialogs/convert-dialog.c:246
 msgid "Color _dithering:"
 msgstr "Colour _dithering:"
 
-#: ../app/dialogs/convert-dialog.c:260
+#: ../app/dialogs/convert-dialog.c:261
 msgid "Enable dithering of _transparency"
 msgstr "Enable dithering of _transparency"
 
-#: ../app/dialogs/convert-dialog.c:287
+#: ../app/dialogs/convert-dialog.c:288
 msgid "Converting to indexed colors"
 msgstr "Converting to indexed colours"
 
-#: ../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 "Cannot convert to a palette with more than 256 colours."
 
-#: ../app/dialogs/dialogs-constructors.c:212 ../app/gui/gui.c:163
-#: ../app/gui/gui-message.c:145
-msgid "GIMP Message"
-msgstr "GIMP Message"
+#: ../app/dialogs/data-delete-dialog.c:81
+msgid "Delete Object"
+msgstr "Delete Object"
 
-#: ../app/dialogs/dialogs.c:267
-msgid "Devices"
-msgstr "Devices"
+#: ../app/dialogs/data-delete-dialog.c:104
+#, c-format
+msgid "Delete '%s'?"
+msgstr "Delete '%s'?"
 
-#: ../app/dialogs/dialogs.c:267
+#: ../app/dialogs/data-delete-dialog.c:107
+#, c-format
+msgid ""
+"Are you sure you want to remove '%s' from the list and delete it on disk?"
+msgstr ""
+"Are you sure you want to remove '%s' from the list and delete it on disk?"
+
+#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:161
+#: ../app/gui/gui-message.c:145
+msgid "GIMP Message"
+msgstr "GIMP Message"
+
+#: ../app/dialogs/dialogs.c:302
+msgid "Devices"
+msgstr "Devices"
+
+#: ../app/dialogs/dialogs.c:302
 msgid "Device Status"
 msgstr "Device Status"
 
-#: ../app/dialogs/dialogs.c:271
+#: ../app/dialogs/dialogs.c:306
 msgid "Errors"
 msgstr "Errors"
 
-#: ../app/dialogs/dialogs.c:275
+#: ../app/dialogs/dialogs.c:310
 msgid "Pointer"
 msgstr "Pointer"
 
-#: ../app/dialogs/dialogs.c:294
+#: ../app/dialogs/dialogs.c:329
 msgid "History"
 msgstr "History"
 
-#: ../app/dialogs/dialogs.c:296
+#: ../app/dialogs/dialogs.c:331
 msgid "Image Templates"
 msgstr "Image Templates"
 
-#: ../app/dialogs/dialogs.c:323
+#: ../app/dialogs/dialogs.c:358
 msgid "Histogram"
 msgstr "Histogram"
 
-#: ../app/dialogs/dialogs.c:327
+#: ../app/dialogs/dialogs.c:362
 msgid "Selection"
 msgstr "Selection"
 
-#: ../app/dialogs/dialogs.c:327
+#: ../app/dialogs/dialogs.c:362
 msgid "Selection Editor"
 msgstr "Selection Editor"
 
-#: ../app/dialogs/dialogs.c:331
+#: ../app/dialogs/dialogs.c:366
 msgid "Undo"
 msgstr "Undo"
 
-#: ../app/dialogs/dialogs.c:331
+#: ../app/dialogs/dialogs.c:366
 msgid "Undo History"
 msgstr "Undo History"
 
-#: ../app/dialogs/dialogs.c:341
+#: ../app/dialogs/dialogs.c:376
 msgid "Navigation"
 msgstr "Navigation"
 
-#: ../app/dialogs/dialogs.c:341
+#: ../app/dialogs/dialogs.c:376
 msgid "Display Navigation"
 msgstr "Display Navigation"
 
-#: ../app/dialogs/dialogs.c:347
+#: ../app/dialogs/dialogs.c:382
 msgid "FG/BG"
 msgstr "FG/BG"
 
-#: ../app/dialogs/dialogs.c:347
+#: ../app/dialogs/dialogs.c:382
 msgid "FG/BG Color"
 msgstr "FG/BG Colour"
 
-#: ../app/dialogs/fade-dialog.c:110
+#: ../app/dialogs/fade-dialog.c:109
 #, c-format
 msgid "Fade %s"
 msgstr "Fade %s"
 
-#: ../app/dialogs/fade-dialog.c:122
+#: ../app/dialogs/fade-dialog.c:121
 msgid "_Fade"
 msgstr "_Fade"
 
-#: ../app/dialogs/fade-dialog.c:157 ../app/widgets/gimpdeviceinfoeditor.c:346
+#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:344
 msgid "_Mode:"
 msgstr "_Mode:"
 
-#: ../app/dialogs/fade-dialog.c:163
+#: ../app/dialogs/fade-dialog.c:162
 msgid "_Opacity:"
 msgstr "_Opacity:"
 
-#: ../app/dialogs/file-open-dialog.c:267
+#: ../app/dialogs/file-open-dialog.c:266
 msgid "Open layers"
 msgstr "Open layers"
 
@@ -8939,7 +8970,7 @@ msgstr "Export Image"
 msgid "_Export"
 msgstr "_Export"
 
-#: ../app/dialogs/file-save-dialog.c:468
+#: ../app/dialogs/file-save-dialog.c:436
 msgid ""
 "Saving remote files needs to determine the file format from the file "
 "extension. Please enter a file extension that matches the selected file "
@@ -8949,7 +8980,7 @@ msgstr ""
 "extension. Please enter a file extension that matches the selected file "
 "format or enter no file extension at all."
 
-#: ../app/dialogs/file-save-dialog.c:595
+#: ../app/dialogs/file-save-dialog.c:563
 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."
@@ -8957,7 +8988,7 @@ msgstr ""
 "You can use this dialogue to export to various file formats. If you want to "
 "save the image to the GIMP XCF format, use FileâSave instead."
 
-#: ../app/dialogs/file-save-dialog.c:602
+#: ../app/dialogs/file-save-dialog.c:570
 msgid ""
 "You can use this dialog to save to the GIMP XCF format. Use FileâExport to "
 "export to other file formats."
@@ -8965,7 +8996,7 @@ msgstr ""
 "You can use this dialogue to save to the GIMP XCF format. Use FileâExport to "
 "export to other file formats."
 
-#: ../app/dialogs/file-save-dialog.c:608
+#: ../app/dialogs/file-save-dialog.c:576
 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."
@@ -8973,23 +9004,23 @@ msgstr ""
 "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."
 
-#: ../app/dialogs/file-save-dialog.c:622
+#: ../app/dialogs/file-save-dialog.c:590
 msgid "Extension Mismatch"
 msgstr "Extension Mismatch"
 
-#: ../app/dialogs/file-save-dialog.c:638
+#: ../app/dialogs/file-save-dialog.c:606
 msgid "The given file extension does not match the chosen file type."
 msgstr "The given file extension does not match the chosen file type."
 
-#: ../app/dialogs/file-save-dialog.c:642
+#: ../app/dialogs/file-save-dialog.c:610
 msgid "Do you want to save the image using this name anyway?"
 msgstr "Do you want to save the image using this name anyway?"
 
-#: ../app/dialogs/file-save-dialog.c:697
+#: ../app/dialogs/file-save-dialog.c:665
 msgid "Saving canceled"
 msgstr "Saving cancelled"
 
-#: ../app/dialogs/file-save-dialog.c:705 ../app/widgets/gimpdnd-xds.c:185
+#: ../app/dialogs/file-save-dialog.c:673 ../app/widgets/gimpdnd-xds.c:185
 #, c-format
 msgid ""
 "Saving '%s' failed:\n"
@@ -9012,35 +9043,39 @@ msgstr "Configure Image Grid"
 msgid "Grid"
 msgstr "Grid"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:64
+#: ../app/dialogs/image-merge-layers-dialog.c:68
 msgid "Merge Layers"
 msgstr "Merge Layers"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:66
+#: ../app/dialogs/image-merge-layers-dialog.c:70
 msgid "Layers Merge Options"
 msgstr "Layers Merge Options"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:72
+#: ../app/dialogs/image-merge-layers-dialog.c:76
 msgid "_Merge"
 msgstr "_Merge"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:92
+#: ../app/dialogs/image-merge-layers-dialog.c:96
 msgid "Final, Merged Layer should be:"
 msgstr "Final, Merged Layer should be:"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:96
+#: ../app/dialogs/image-merge-layers-dialog.c:100
 msgid "Expanded as necessary"
 msgstr "Expanded as necessary"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:99
+#: ../app/dialogs/image-merge-layers-dialog.c:103
 msgid "Clipped to image"
 msgstr "Clipped to image"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:102
+#: ../app/dialogs/image-merge-layers-dialog.c:106
 msgid "Clipped to bottom layer"
 msgstr "Clipped to bottom layer"
 
-#: ../app/dialogs/image-merge-layers-dialog.c:110
+#: ../app/dialogs/image-merge-layers-dialog.c:114
+msgid "Merge within active _group only"
+msgstr "Merge within active _group only"
+
+#: ../app/dialogs/image-merge-layers-dialog.c:127
 msgid "_Discard invisible layers"
 msgstr "_Discard invisible layers"
 
@@ -9049,21 +9084,21 @@ msgid "Create a New Image"
 msgstr "Create a New Image"
 
 #: ../app/dialogs/image-new-dialog.c:144
-#: ../app/dialogs/preferences-dialog.c:2008
+#: ../app/dialogs/preferences-dialog.c:2006
 msgid "_Template:"
 msgstr "_Template:"
 
-#: ../app/dialogs/image-new-dialog.c:299
+#: ../app/dialogs/image-new-dialog.c:303
 msgid "Confirm Image Size"
 msgstr "Confirm Image Size"
 
-#: ../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 "You are trying to create an image with a size of %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 "
@@ -9106,8 +9141,8 @@ msgid ""
 "%s)."
 msgstr ""
 "Scaling the image to the chosen size will make it use more memory than what "
-"is configured as \"Maximum Image Size\" in the Preferences dialogue "
-"(currently %s)."
+"is configured as \"Maximum Image Size\" in the Preferences dialogue (currently "
+"%s)."
 
 #: ../app/dialogs/image-scale-dialog.c:260
 msgid ""
@@ -9157,12 +9192,12 @@ msgstr "Layer _name:"
 
 #. The size labels
 #: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1075
+#: ../app/tools/gimpmeasuretool.c:1122
 msgid "Width:"
 msgstr "Width:"
 
 #: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1103
+#: ../app/tools/gimpmeasuretool.c:1150
 msgid "Height:"
 msgstr "Height:"
 
@@ -9228,7 +9263,8 @@ msgstr "Offset Channel"
 
 #. 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 "Offset"
 
@@ -9280,7 +9316,7 @@ msgid "Select Source"
 msgstr "Select Source"
 
 #: ../app/dialogs/palette-import-dialog.c:214
-#: ../app/dialogs/preferences-dialog.c:1923
+#: ../app/dialogs/preferences-dialog.c:1921
 msgid "_Gradient"
 msgstr "_Gradient"
 
@@ -9352,7 +9388,7 @@ msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr ""
 "You will have to restart GIMP for the following changes to take effect:"
 
-#: ../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."
@@ -9360,15 +9396,15 @@ msgstr ""
 "Your keyboard shortcuts will be reset to default values the next time you "
 "start GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:549
+#: ../app/dialogs/preferences-dialog.c:547
 msgid "Remove all Keyboard Shortcuts"
 msgstr "Remove all Keyboard Shortcuts"
 
-#: ../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 "Do you really want to remove all keyboard shortcuts from all menus?"
 
-#: ../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."
@@ -9376,7 +9412,7 @@ msgstr ""
 "Your window setup will be reset to default values the next time you start "
 "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."
@@ -9384,7 +9420,7 @@ msgstr ""
 "Your input device settings will be reset to default values the next time you "
 "start 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."
@@ -9392,382 +9428,386 @@ msgstr ""
 "Your tool options will be reset to default values the next time you start "
 "GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:1266
+#: ../app/dialogs/preferences-dialog.c:1264
 msgid "Show _menubar"
 msgstr "Show _menubar"
 
-#: ../app/dialogs/preferences-dialog.c:1270
+#: ../app/dialogs/preferences-dialog.c:1268
 msgid "Show _rulers"
 msgstr "Show _rulers"
 
-#: ../app/dialogs/preferences-dialog.c:1273
+#: ../app/dialogs/preferences-dialog.c:1271
 msgid "Show scroll_bars"
 msgstr "Show scroll_bars"
 
-#: ../app/dialogs/preferences-dialog.c:1276
+#: ../app/dialogs/preferences-dialog.c:1274
 msgid "Show s_tatusbar"
 msgstr "Show s_tatusbar"
 
-#: ../app/dialogs/preferences-dialog.c:1284
+#: ../app/dialogs/preferences-dialog.c:1282
 msgid "Show s_election"
 msgstr "Show s_election"
 
-#: ../app/dialogs/preferences-dialog.c:1287
+#: ../app/dialogs/preferences-dialog.c:1285
 msgid "Show _layer boundary"
 msgstr "Show _layer boundary"
 
-#: ../app/dialogs/preferences-dialog.c:1290
+#: ../app/dialogs/preferences-dialog.c:1288
 msgid "Show _guides"
 msgstr "Show _guides"
 
-#: ../app/dialogs/preferences-dialog.c:1293
+#: ../app/dialogs/preferences-dialog.c:1291
 msgid "Show gri_d"
 msgstr "Show gri_d"
 
-#: ../app/dialogs/preferences-dialog.c:1299
+#: ../app/dialogs/preferences-dialog.c:1297
 msgid "Canvas _padding mode:"
 msgstr "Canvas _padding mode:"
 
-#: ../app/dialogs/preferences-dialog.c:1304
+#: ../app/dialogs/preferences-dialog.c:1302
 msgid "Custom p_adding color:"
 msgstr "Custom p_adding colour:"
 
-#: ../app/dialogs/preferences-dialog.c:1305
+#: ../app/dialogs/preferences-dialog.c:1303
 msgid "Select Custom Canvas Padding Color"
 msgstr "Select Custom Canvas Padding Colour"
 
-#: ../app/dialogs/preferences-dialog.c:1394
+#: ../app/dialogs/preferences-dialog.c:1392
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../app/dialogs/preferences-dialog.c:1507
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:1505
+#: ../app/dialogs/preferences-dialog.c:2763
 msgid "Environment"
 msgstr "Environment"
 
-#: ../app/dialogs/preferences-dialog.c:1521
+#: ../app/dialogs/preferences-dialog.c:1519
 msgid "Resource Consumption"
 msgstr "Resource Consumption"
 
-#: ../app/dialogs/preferences-dialog.c:1531
+#: ../app/dialogs/preferences-dialog.c:1529
 msgid "Minimal number of _undo levels:"
 msgstr "Minimal number of _undo levels:"
 
-#: ../app/dialogs/preferences-dialog.c:1534
+#: ../app/dialogs/preferences-dialog.c:1532
 msgid "Maximum undo _memory:"
 msgstr "Maximum undo _memory:"
 
-#: ../app/dialogs/preferences-dialog.c:1537
+#: ../app/dialogs/preferences-dialog.c:1535
 msgid "Tile cache _size:"
 msgstr "Tile cache _size:"
 
-#: ../app/dialogs/preferences-dialog.c:1540
+#: ../app/dialogs/preferences-dialog.c:1538
 msgid "Maximum _new image size:"
 msgstr "Maximum _new image size:"
 
-#: ../app/dialogs/preferences-dialog.c:1545
+#: ../app/dialogs/preferences-dialog.c:1543
 msgid "Number of _processors to use:"
 msgstr "Number of _processors to use:"
 
 #. Image Thumbnails
-#: ../app/dialogs/preferences-dialog.c:1550
+#: ../app/dialogs/preferences-dialog.c:1548
 msgid "Image Thumbnails"
 msgstr "Image Thumbnails"
 
-#: ../app/dialogs/preferences-dialog.c:1555
+#: ../app/dialogs/preferences-dialog.c:1553
 msgid "Size of _thumbnails:"
 msgstr "Size of _thumbnails:"
 
-#: ../app/dialogs/preferences-dialog.c:1559
+#: ../app/dialogs/preferences-dialog.c:1557
 msgid "Maximum _filesize for thumbnailing:"
 msgstr "Maximum _filesize for thumbnailing:"
 
 #. File Saving
-#: ../app/dialogs/preferences-dialog.c:1563
+#: ../app/dialogs/preferences-dialog.c:1561
 msgid "Saving Images"
 msgstr "Saving Images"
 
-#: ../app/dialogs/preferences-dialog.c:1566
+#: ../app/dialogs/preferences-dialog.c:1564
 msgid "Confirm closing of unsa_ved images"
 msgstr "Confirm closing of unsa_ved images"
 
-#: ../app/dialogs/preferences-dialog.c:1576
+#: ../app/dialogs/preferences-dialog.c:1574
 msgid "Keep record of used files in the Recent Documents list"
 msgstr "Keep record of used files in the Recent Documents list"
 
-#: ../app/dialogs/preferences-dialog.c:1585
+#: ../app/dialogs/preferences-dialog.c:1583
 msgid "User Interface"
 msgstr "User Interface"
 
-#: ../app/dialogs/preferences-dialog.c:1588
+#: ../app/dialogs/preferences-dialog.c:1586
 msgid "Interface"
 msgstr "Interface"
 
-#: ../app/dialogs/preferences-dialog.c:1598
+#: ../app/dialogs/preferences-dialog.c:1596
 msgid "Language"
 msgstr "Language"
 
 #. Previews
-#: ../app/dialogs/preferences-dialog.c:1604
+#: ../app/dialogs/preferences-dialog.c:1602
 msgid "Previews"
 msgstr "Previews"
 
-#: ../app/dialogs/preferences-dialog.c:1607
+#: ../app/dialogs/preferences-dialog.c:1605
 msgid "_Enable layer & channel previews"
 msgstr "_Enable layer & channel previews"
 
-#: ../app/dialogs/preferences-dialog.c:1613
+#: ../app/dialogs/preferences-dialog.c:1611
 msgid "_Default layer & channel preview size:"
 msgstr "_Default layer & channel preview size:"
 
-#: ../app/dialogs/preferences-dialog.c:1616
+#: ../app/dialogs/preferences-dialog.c:1614
 msgid "Na_vigation preview size:"
 msgstr "Na_vigation preview size:"
 
 #. Keyboard Shortcuts
-#: ../app/dialogs/preferences-dialog.c:1620
+#: ../app/dialogs/preferences-dialog.c:1618
 msgid "Keyboard Shortcuts"
 msgstr "Keyboard Shortcuts"
 
-#: ../app/dialogs/preferences-dialog.c:1624
+#: ../app/dialogs/preferences-dialog.c:1622
 msgid "_Use dynamic keyboard shortcuts"
 msgstr "_Use dynamic keyboard shortcuts"
 
-#: ../app/dialogs/preferences-dialog.c:1628
+#: ../app/dialogs/preferences-dialog.c:1626
 msgid "Configure _Keyboard Shortcuts..."
 msgstr "Configure _Keyboard Shortcuts..."
 
-#: ../app/dialogs/preferences-dialog.c:1635
+#: ../app/dialogs/preferences-dialog.c:1633
 msgid "_Save keyboard shortcuts on exit"
 msgstr "_Save keyboard shortcuts on exit"
 
-#: ../app/dialogs/preferences-dialog.c:1639
+#: ../app/dialogs/preferences-dialog.c:1637
 msgid "Save Keyboard Shortcuts _Now"
 msgstr "Save Keyboard Shortcuts _Now"
 
-#: ../app/dialogs/preferences-dialog.c:1646
+#: ../app/dialogs/preferences-dialog.c:1644
 msgid "_Reset Keyboard Shortcuts to Default Values"
 msgstr "_Reset Keyboard Shortcuts to Default Values"
 
-#: ../app/dialogs/preferences-dialog.c:1655
+#: ../app/dialogs/preferences-dialog.c:1653
 msgid "Remove _All Keyboard Shortcuts"
 msgstr "Remove _All Keyboard Shortcuts"
 
-#: ../app/dialogs/preferences-dialog.c:1667
-#: ../app/dialogs/preferences-dialog.c:1706
+#: ../app/dialogs/preferences-dialog.c:1665
+#: ../app/dialogs/preferences-dialog.c:1704
 msgid "Theme"
 msgstr "Theme"
 
-#: ../app/dialogs/preferences-dialog.c:1676
+#: ../app/dialogs/preferences-dialog.c:1674
 msgid "Select Theme"
 msgstr "Select Theme"
 
-#: ../app/dialogs/preferences-dialog.c:1758
+#: ../app/dialogs/preferences-dialog.c:1756
 msgid "Reload C_urrent Theme"
 msgstr "Reload C_urrent Theme"
 
-#: ../app/dialogs/preferences-dialog.c:1770
+#: ../app/dialogs/preferences-dialog.c:1768
 msgid "Help System"
 msgstr "Help System"
 
 #. 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:1780
+#: ../app/dialogs/preferences-dialog.c:1864
+#: ../app/dialogs/preferences-dialog.c:2063
+#: ../app/widgets/gimpcontrollereditor.c:185
 msgid "General"
 msgstr "General"
 
-#: ../app/dialogs/preferences-dialog.c:1785
+#: ../app/dialogs/preferences-dialog.c:1783
 msgid "Show _tooltips"
 msgstr "Show _tooltips"
 
-#: ../app/dialogs/preferences-dialog.c:1788
+#: ../app/dialogs/preferences-dialog.c:1786
 msgid "Show help _buttons"
 msgstr "Show help _buttons"
 
-#: ../app/dialogs/preferences-dialog.c:1801
+#: ../app/dialogs/preferences-dialog.c:1799
 msgid "Use the online version"
 msgstr "Use the online version"
 
-#: ../app/dialogs/preferences-dialog.c:1802
+#: ../app/dialogs/preferences-dialog.c:1800
 msgid "Use a locally installed copy"
 msgstr "Use a locally installed copy"
 
-#: ../app/dialogs/preferences-dialog.c:1803
+#: ../app/dialogs/preferences-dialog.c:1801
 msgid "User manual:"
 msgstr "User manual:"
 
-#: ../app/dialogs/preferences-dialog.c:1810
+#: ../app/dialogs/preferences-dialog.c:1808
 msgid "There's a local installation of the user manual."
 msgstr "There's a local installation of the user manual."
 
-#: ../app/dialogs/preferences-dialog.c:1815
+#: ../app/dialogs/preferences-dialog.c:1813
 msgid "The user manual is not installed locally."
 msgstr "The user manual is not installed locally."
 
 #. Help Browser
-#: ../app/dialogs/preferences-dialog.c:1838
+#: ../app/dialogs/preferences-dialog.c:1836
 msgid "Help Browser"
 msgstr "Help Browser"
 
-#: ../app/dialogs/preferences-dialog.c:1842
+#: ../app/dialogs/preferences-dialog.c:1840
 msgid "H_elp browser to use:"
 msgstr "H_elp browser to use:"
 
-#: ../app/dialogs/preferences-dialog.c:1869
+#: ../app/dialogs/preferences-dialog.c:1867
 msgid "_Save tool options on exit"
 msgstr "_Save tool options on exit"
 
-#: ../app/dialogs/preferences-dialog.c:1873
+#: ../app/dialogs/preferences-dialog.c:1871
 msgid "Save Tool Options _Now"
 msgstr "Save Tool Options _Now"
 
-#: ../app/dialogs/preferences-dialog.c:1880
+#: ../app/dialogs/preferences-dialog.c:1878
 msgid "_Reset Saved Tool Options to Default Values"
 msgstr "_Reset Saved Tool Options to Default Values"
 
 #. Snapping Distance
-#: ../app/dialogs/preferences-dialog.c:1890
+#: ../app/dialogs/preferences-dialog.c:1888
 msgid "Guide & Grid Snapping"
 msgstr "Guide & Grid Snapping"
 
-#: ../app/dialogs/preferences-dialog.c:1895
+#: ../app/dialogs/preferences-dialog.c:1893
 msgid "_Snap distance:"
 msgstr "_Snap distance:"
 
-#: ../app/dialogs/preferences-dialog.c:1903
+#: ../app/dialogs/preferences-dialog.c:1901
 msgid "Default _interpolation:"
 msgstr "Default _interpolation:"
 
 #. Global Brush, Pattern, ...
-#: ../app/dialogs/preferences-dialog.c:1910
+#: ../app/dialogs/preferences-dialog.c:1908
 msgid "Paint Options Shared Between Tools"
 msgstr "Paint Options Shared Between Tools"
 
-#: ../app/dialogs/preferences-dialog.c:1914
+#: ../app/dialogs/preferences-dialog.c:1912
 msgid "_Brush"
 msgstr "_Brush"
 
-#: ../app/dialogs/preferences-dialog.c:1917
+#: ../app/dialogs/preferences-dialog.c:1915
 msgid "_Dynamics"
 msgstr "_Dynamics"
 
-#: ../app/dialogs/preferences-dialog.c:1920
+#: ../app/dialogs/preferences-dialog.c:1918
 msgid "_Pattern"
 msgstr "_Pattern"
 
-#: ../app/dialogs/preferences-dialog.c:1926
+#: ../app/dialogs/preferences-dialog.c:1924
 msgid "Move Tool"
 msgstr "Move Tool"
 
-#: ../app/dialogs/preferences-dialog.c:1930
+#: ../app/dialogs/preferences-dialog.c:1928
 msgid "Set layer or path as active"
 msgstr "Set layer or path as active"
 
 #. Appearance
-#: ../app/dialogs/preferences-dialog.c:1955
+#: ../app/dialogs/preferences-dialog.c:1953
 #: ../app/dialogs/preferences-dialog.c:2139
-#: ../app/widgets/gimpgrideditor.c:203
+#: ../app/widgets/gimpgrideditor.c:134
 msgid "Appearance"
 msgstr "Appearance"
 
-#: ../app/dialogs/preferences-dialog.c:1959
+#: ../app/dialogs/preferences-dialog.c:1957
 msgid "Show _foreground & background color"
 msgstr "Show _foreground & background colour"
 
-#: ../app/dialogs/preferences-dialog.c:1963
+#: ../app/dialogs/preferences-dialog.c:1961
 msgid "Show active _brush, pattern & gradient"
 msgstr "Show active _brush, pattern & gradient"
 
-#: ../app/dialogs/preferences-dialog.c:1967
+#: ../app/dialogs/preferences-dialog.c:1965
 msgid "Show active _image"
 msgstr "Show active _image"
 
 #. Tool Editor
-#: ../app/dialogs/preferences-dialog.c:1975
+#: ../app/dialogs/preferences-dialog.c:1973
 msgid "Tools configuration"
 msgstr "Tools configuration"
 
-#: ../app/dialogs/preferences-dialog.c:1990
+#: ../app/dialogs/preferences-dialog.c:1988
 msgid "Default New Image"
 msgstr "Default New Image"
 
-#: ../app/dialogs/preferences-dialog.c:1993
+#: ../app/dialogs/preferences-dialog.c:1991
 msgid "Default Image"
 msgstr "Default Image"
 
-#: ../app/dialogs/preferences-dialog.c:2030
+#: ../app/dialogs/preferences-dialog.c:2028
 msgid "Default Image Grid"
 msgstr "Default Image Grid"
 
-#: ../app/dialogs/preferences-dialog.c:2033
+#: ../app/dialogs/preferences-dialog.c:2031
 msgid "Default Grid"
 msgstr "Default Grid"
 
-#: ../app/dialogs/preferences-dialog.c:2054
+#: ../app/dialogs/preferences-dialog.c:2051
 msgid "Image Windows"
 msgstr "Image Windows"
 
-#: ../app/dialogs/preferences-dialog.c:2069
+#: ../app/dialogs/preferences-dialog.c:2066
 msgid "Use \"_Dot for dot\" by default"
 msgstr "Use \"_Dot for dot\" by default"
 
-#: ../app/dialogs/preferences-dialog.c:2075
+#: ../app/dialogs/preferences-dialog.c:2072
 msgid "Marching _ants speed:"
 msgstr "Marching _ants speed:"
 
 #. Zoom & Resize Behavior
-#: ../app/dialogs/preferences-dialog.c:2079
+#: ../app/dialogs/preferences-dialog.c:2076
 msgid "Zoom & Resize Behavior"
 msgstr "Zoom & Resize Behaviour"
 
-#: ../app/dialogs/preferences-dialog.c:2083
+#: ../app/dialogs/preferences-dialog.c:2080
 msgid "Resize window on _zoom"
 msgstr "Resize window on _zoom"
 
-#: ../app/dialogs/preferences-dialog.c:2086
+#: ../app/dialogs/preferences-dialog.c:2083
 msgid "Resize window on image _size change"
 msgstr "Resize window on image _size change"
 
-#: ../app/dialogs/preferences-dialog.c:2092
+#: ../app/dialogs/preferences-dialog.c:2089
 msgid "Fit to window"
 msgstr "Fit to window"
 
-#: ../app/dialogs/preferences-dialog.c:2094
+#: ../app/dialogs/preferences-dialog.c:2091
 msgid "Initial zoom _ratio:"
 msgstr "Initial zoom _ratio:"
 
 #. Space Bar
-#: ../app/dialogs/preferences-dialog.c:2098
+#: ../app/dialogs/preferences-dialog.c:2095
 msgid "Space Bar"
 msgstr "Space Bar"
 
-#: ../app/dialogs/preferences-dialog.c:2104
+#: ../app/dialogs/preferences-dialog.c:2101
 msgid "_While space bar is pressed:"
 msgstr "_While space bar is pressed:"
 
 #. Mouse Pointers
-#: ../app/dialogs/preferences-dialog.c:2108
+#: ../app/dialogs/preferences-dialog.c:2105
 msgid "Mouse Pointers"
 msgstr "Mouse Pointers"
 
-#: ../app/dialogs/preferences-dialog.c:2112
+#: ../app/dialogs/preferences-dialog.c:2109
 msgid "Show _brush outline"
 msgstr "Show _brush outline"
 
-#: ../app/dialogs/preferences-dialog.c:2115
+#: ../app/dialogs/preferences-dialog.c:2112
 msgid "Show pointer for paint _tools"
 msgstr "Show pointer for paint _tools"
 
-#: ../app/dialogs/preferences-dialog.c:2121
+#: ../app/dialogs/preferences-dialog.c:2118
 msgid "Pointer _mode:"
 msgstr "Pointer _mode:"
 
-#: ../app/dialogs/preferences-dialog.c:2124
+#: ../app/dialogs/preferences-dialog.c:2121
 msgid "Pointer re_ndering:"
 msgstr "Pointer re_ndering:"
 
+#: ../app/dialogs/preferences-dialog.c:2124
+msgid "Pointer _handedness:"
+msgstr "Pointer _handedness:"
+
 #: ../app/dialogs/preferences-dialog.c:2136
 msgid "Image Window Appearance"
 msgstr "Image Window Appearance"
@@ -9839,8 +9879,8 @@ msgstr "Monitor Resolution"
 
 #. Pixels
 #: ../app/dialogs/preferences-dialog.c:2312
-#: ../app/display/gimpcursorview.c:200 ../app/widgets/gimpgrideditor.c:268
-#: ../app/widgets/gimpgrideditor.c:300
+#: ../app/display/gimpcursorview.c:200 ../app/widgets/gimpgrideditor.c:199
+#: ../app/widgets/gimpgrideditor.c:231
 msgid "Pixels"
 msgstr "Pixels"
 
@@ -9853,7 +9893,7 @@ msgid "Vertical"
 msgstr "Vertical"
 
 #: ../app/dialogs/preferences-dialog.c:2334
-#: ../app/widgets/gimpimagepropview.c:475
+#: ../app/widgets/gimpimagepropview.c:467
 msgid "ppi"
 msgstr "ppi"
 
@@ -9862,273 +9902,273 @@ msgstr "ppi"
 msgid "_Detect automatically (currently %d à %d ppi)"
 msgstr "_Detect automatically (currently %d à %d ppi)"
 
-#: ../app/dialogs/preferences-dialog.c:2370
+#: ../app/dialogs/preferences-dialog.c:2368
 msgid "_Enter manually"
 msgstr "_Enter manually"
 
-#: ../app/dialogs/preferences-dialog.c:2385
+#: ../app/dialogs/preferences-dialog.c:2383
 msgid "C_alibrate..."
 msgstr "C_alibrate..."
 
-#: ../app/dialogs/preferences-dialog.c:2408
+#: ../app/dialogs/preferences-dialog.c:2411
 msgid "Color Management"
 msgstr "Colour Management"
 
-#: ../app/dialogs/preferences-dialog.c:2428
+#: ../app/dialogs/preferences-dialog.c:2431
 msgid "_RGB profile:"
 msgstr "_RGB profile:"
 
-#: ../app/dialogs/preferences-dialog.c:2429
+#: ../app/dialogs/preferences-dialog.c:2432
 msgid "Select RGB Color Profile"
 msgstr "Select RGB Colour Profile"
 
-#: ../app/dialogs/preferences-dialog.c:2430
+#: ../app/dialogs/preferences-dialog.c:2433
 msgid "_CMYK profile:"
 msgstr "_CMYK profile:"
 
-#: ../app/dialogs/preferences-dialog.c:2431
+#: ../app/dialogs/preferences-dialog.c:2434
 msgid "Select CMYK Color Profile"
 msgstr "Select CMYK Colour Profile"
 
-#: ../app/dialogs/preferences-dialog.c:2432
+#: ../app/dialogs/preferences-dialog.c:2435
 msgid "_Monitor profile:"
 msgstr "_Monitor profile:"
 
-#: ../app/dialogs/preferences-dialog.c:2433
+#: ../app/dialogs/preferences-dialog.c:2436
 msgid "Select Monitor Color Profile"
 msgstr "Select Monitor Colour Profile"
 
-#: ../app/dialogs/preferences-dialog.c:2434
+#: ../app/dialogs/preferences-dialog.c:2437
 msgid "_Print simulation profile:"
 msgstr "_Print simulation profile:"
 
-#: ../app/dialogs/preferences-dialog.c:2435
+#: ../app/dialogs/preferences-dialog.c:2438
 msgid "Select Printer Color Profile"
 msgstr "Select Printer Colour Profile"
 
-#: ../app/dialogs/preferences-dialog.c:2446
+#: ../app/dialogs/preferences-dialog.c:2449
 msgid "_Mode of operation:"
 msgstr "_Mode of operation:"
 
-#: ../app/dialogs/preferences-dialog.c:2476
+#: ../app/dialogs/preferences-dialog.c:2479
 msgid "_Try to use the system monitor profile"
 msgstr "_Try to use the system monitor profile"
 
-#: ../app/dialogs/preferences-dialog.c:2486
+#: ../app/dialogs/preferences-dialog.c:2489
 msgid "_Display rendering intent:"
 msgstr "_Display rendering intent:"
 
-#: ../app/dialogs/preferences-dialog.c:2495
+#: ../app/dialogs/preferences-dialog.c:2498
 msgid "_Softproof rendering intent:"
 msgstr "_Softproof rendering intent:"
 
-#: ../app/dialogs/preferences-dialog.c:2508
+#: ../app/dialogs/preferences-dialog.c:2511
 msgid "Mark out of gamut colors"
 msgstr "Mark out of gamut colours"
 
-#: ../app/dialogs/preferences-dialog.c:2513
+#: ../app/dialogs/preferences-dialog.c:2516
 msgid "Select Warning Color"
 msgstr "Select Warning Colour"
 
-#: ../app/dialogs/preferences-dialog.c:2526
+#: ../app/dialogs/preferences-dialog.c:2529
 msgid "File Open behaviour:"
 msgstr "File Open behaviour:"
 
-#: ../app/dialogs/preferences-dialog.c:2538
+#: ../app/dialogs/preferences-dialog.c:2541
 msgid "Input Devices"
 msgstr "Input Devices"
 
 #. Extended Input Devices
-#: ../app/dialogs/preferences-dialog.c:2548
+#: ../app/dialogs/preferences-dialog.c:2551
 msgid "Extended Input Devices"
 msgstr "Extended Input Devices"
 
-#: ../app/dialogs/preferences-dialog.c:2552
+#: ../app/dialogs/preferences-dialog.c:2555
 msgid "Configure E_xtended Input Devices..."
 msgstr "Configure E_xtended Input Devices..."
 
-#: ../app/dialogs/preferences-dialog.c:2559
+#: ../app/dialogs/preferences-dialog.c:2562
 msgid "_Save input device settings on exit"
 msgstr "_Save input device settings on exit"
 
-#: ../app/dialogs/preferences-dialog.c:2563
+#: ../app/dialogs/preferences-dialog.c:2566
 msgid "Save Input Device Settings _Now"
 msgstr "Save Input Device Settings _Now"
 
-#: ../app/dialogs/preferences-dialog.c:2570
+#: ../app/dialogs/preferences-dialog.c:2573
 msgid "_Reset Saved Input Device Settings to Default Values"
 msgstr "_Reset Saved Input Device Settings to Default Values"
 
-#: ../app/dialogs/preferences-dialog.c:2585
+#: ../app/dialogs/preferences-dialog.c:2588
 msgid "Additional Input Controllers"
 msgstr "Additional Input Controllers"
 
-#: ../app/dialogs/preferences-dialog.c:2588
+#: ../app/dialogs/preferences-dialog.c:2591
 msgid "Input Controllers"
 msgstr "Input Controllers"
 
-#: ../app/dialogs/preferences-dialog.c:2604
+#: ../app/dialogs/preferences-dialog.c:2607
 msgid "Window Management"
 msgstr "Window Management"
 
-#: ../app/dialogs/preferences-dialog.c:2613
+#: ../app/dialogs/preferences-dialog.c:2616
 msgid "Window Manager Hints"
 msgstr "Window Manager Hints"
 
-#: ../app/dialogs/preferences-dialog.c:2619
+#: ../app/dialogs/preferences-dialog.c:2622
 msgid "Hint for _docks and toolbox:"
 msgstr "Hint for _docks and toolbox:"
 
-#: ../app/dialogs/preferences-dialog.c:2622
+#: ../app/dialogs/preferences-dialog.c:2625
 msgid "Focus"
 msgstr "Focus"
 
-#: ../app/dialogs/preferences-dialog.c:2626
+#: ../app/dialogs/preferences-dialog.c:2629
 msgid "Activate the _focused image"
 msgstr "Activate the _focused image"
 
 #. Window Positions
-#: ../app/dialogs/preferences-dialog.c:2630
+#: ../app/dialogs/preferences-dialog.c:2633
 msgid "Window Positions"
 msgstr "Window Positions"
 
-#: ../app/dialogs/preferences-dialog.c:2633
+#: ../app/dialogs/preferences-dialog.c:2636
 msgid "_Save window positions on exit"
 msgstr "_Save window positions on exit"
 
-#: ../app/dialogs/preferences-dialog.c:2637
+#: ../app/dialogs/preferences-dialog.c:2640
 msgid "Save Window Positions _Now"
 msgstr "Save Window Positions _Now"
 
-#: ../app/dialogs/preferences-dialog.c:2644
+#: ../app/dialogs/preferences-dialog.c:2647
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr "_Reset Saved Window Positions to Default Values"
 
-#: ../app/dialogs/preferences-dialog.c:2659
+#: ../app/dialogs/preferences-dialog.c:2662
 msgid "Folders"
 msgstr "Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2679
+#: ../app/dialogs/preferences-dialog.c:2682
 msgid "Temporary folder:"
 msgstr "Temporary folder:"
 
-#: ../app/dialogs/preferences-dialog.c:2680
+#: ../app/dialogs/preferences-dialog.c:2683
 msgid "Select Folder for Temporary Files"
 msgstr "Select Folder for Temporary Files"
 
-#: ../app/dialogs/preferences-dialog.c:2684
+#: ../app/dialogs/preferences-dialog.c:2687
 msgid "Swap folder:"
 msgstr "Swap folder:"
 
-#: ../app/dialogs/preferences-dialog.c:2685
+#: ../app/dialogs/preferences-dialog.c:2688
 msgid "Select Swap Folder"
 msgstr "Select Swap Folder"
 
-#: ../app/dialogs/preferences-dialog.c:2720
+#: ../app/dialogs/preferences-dialog.c:2723
 msgid "Brush Folders"
 msgstr "Brush Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2722
+#: ../app/dialogs/preferences-dialog.c:2725
 msgid "Select Brush Folders"
 msgstr "Select Brush Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2724
+#: ../app/dialogs/preferences-dialog.c:2727
 msgid "Dynamics Folders"
 msgstr "Dynamics Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2726
+#: ../app/dialogs/preferences-dialog.c:2729
 msgid "Select Dynamics Folders"
 msgstr "Select Dynamics Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2728
+#: ../app/dialogs/preferences-dialog.c:2731
 msgid "Pattern Folders"
 msgstr "Pattern Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2730
+#: ../app/dialogs/preferences-dialog.c:2733
 msgid "Select Pattern Folders"
 msgstr "Select Pattern Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2732
+#: ../app/dialogs/preferences-dialog.c:2735
 msgid "Palette Folders"
 msgstr "Palette Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2734
+#: ../app/dialogs/preferences-dialog.c:2737
 msgid "Select Palette Folders"
 msgstr "Select Palette Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2736
+#: ../app/dialogs/preferences-dialog.c:2739
 msgid "Gradient Folders"
 msgstr "Gradient Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2738
+#: ../app/dialogs/preferences-dialog.c:2741
 msgid "Select Gradient Folders"
 msgstr "Select Gradient Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/dialogs/preferences-dialog.c:2743
 msgid "Font Folders"
 msgstr "Font Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2745
 msgid "Select Font Folders"
 msgstr "Select Font Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/dialogs/preferences-dialog.c:2747
 msgid "Plug-In Folders"
 msgstr "Plug-In Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2749
 msgid "Select Plug-In Folders"
 msgstr "Select Plug-In Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2751
 msgid "Scripts"
 msgstr "Scripts"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2751
 msgid "Script-Fu Folders"
 msgstr "Script-Fu Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2753
 msgid "Select Script-Fu Folders"
 msgstr "Select Script-Fu Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2752
+#: ../app/dialogs/preferences-dialog.c:2755
 msgid "Module Folders"
 msgstr "Module Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2754
+#: ../app/dialogs/preferences-dialog.c:2757
 msgid "Select Module Folders"
 msgstr "Select Module Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2759
 msgid "Interpreters"
 msgstr "Interpreters"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2759
 msgid "Interpreter Folders"
 msgstr "Interpreter Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2758
+#: ../app/dialogs/preferences-dialog.c:2761
 msgid "Select Interpreter Folders"
 msgstr "Select Interpreter Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2763
 msgid "Environment Folders"
 msgstr "Environment Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2762
+#: ../app/dialogs/preferences-dialog.c:2765
 msgid "Select Environment Folders"
 msgstr "Select Environment Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2767
 msgid "Themes"
 msgstr "Themes"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2767
 msgid "Theme Folders"
 msgstr "Theme Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2766
+#: ../app/dialogs/preferences-dialog.c:2769
 msgid "Select Theme Folders"
 msgstr "Select Theme Folders"
 
@@ -10137,29 +10177,28 @@ msgid "Print Size"
 msgstr "Print Size"
 
 #. 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 "_Width:"
 
-#: ../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 "H_eight:"
 
 #. 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 "_X resolution:"
 
-#: ../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 "_Y resolution:"
 
-#: ../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 "pixels/%a"
@@ -10220,11 +10259,11 @@ msgid "_Vertical:"
 msgstr "_Vertical:"
 
 #. 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 "Image Size"
 
-#: ../app/dialogs/scale-dialog.c:176
+#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:386
 msgid "Quality"
 msgstr "Quality"
 
@@ -10244,11 +10283,11 @@ msgstr ""
 msgid "Choose Stroke Style"
 msgstr "Choose Stroke Style"
 
-#: ../app/dialogs/stroke-dialog.c:222
+#: ../app/dialogs/stroke-dialog.c:214
 msgid "Paint tool:"
 msgstr "Paint tool:"
 
-#: ../app/dialogs/stroke-dialog.c:236
+#: ../app/dialogs/stroke-dialog.c:228
 msgid "_Emulate brush dynamics"
 msgstr "_Emulate brush dynamics"
 
@@ -10328,7 +10367,7 @@ msgid "Import Paths from SVG"
 msgstr "Import Paths from SVG"
 
 #: ../app/dialogs/vectors-import-dialog.c:92
-#: ../app/widgets/gimpprofilechooserdialog.c:131
+#: ../app/widgets/gimpprofilechooserdialog.c:122
 msgid "All files (*.*)"
 msgstr "All files (*.*)"
 
@@ -10348,6 +10387,46 @@ msgstr "_Scale imported paths to fit image"
 msgid "Path name:"
 msgstr "Path name:"
 
+#: ../app/display/display-enums.c:60
+msgctxt "guides-type"
+msgid "No guides"
+msgstr "No guides"
+
+#: ../app/display/display-enums.c:61
+msgctxt "guides-type"
+msgid "Center lines"
+msgstr "Centre lines"
+
+#: ../app/display/display-enums.c:62
+msgctxt "guides-type"
+msgid "Rule of thirds"
+msgstr "Rule of thirds"
+
+#: ../app/display/display-enums.c:63
+msgctxt "guides-type"
+msgid "Rule of fifths"
+msgstr "Rule of fifths"
+
+#: ../app/display/display-enums.c:64
+msgctxt "guides-type"
+msgid "Golden sections"
+msgstr "Golden sections"
+
+#: ../app/display/display-enums.c:65
+msgctxt "guides-type"
+msgid "Diagonal lines"
+msgstr "Diagonal lines"
+
+#: ../app/display/display-enums.c:66
+msgctxt "guides-type"
+msgid "Number of lines"
+msgstr "Number of lines"
+
+#: ../app/display/display-enums.c:67
+msgctxt "guides-type"
+msgid "Line spacing"
+msgstr "Line spacing"
+
 #: ../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
@@ -10356,19 +10435,19 @@ msgstr "Path name:"
 #: ../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/widgets/gimpcolorframe.c:633
 msgid "n/a"
 msgstr "n/a"
 
 #: ../app/display/gimpcursorview.c:213 ../app/display/gimpcursorview.c:238
 #: ../app/display/gimpcursorview.c:263
-#: ../app/widgets/gimpdeviceinfoeditor.c:140
+#: ../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/widgets/gimpdeviceinfoeditor.c:139
 msgid "Y"
 msgstr "Y"
 
@@ -10396,24 +10475,24 @@ msgstr "H"
 msgid "_Sample Merged"
 msgstr "_Sample Merged"
 
-#: ../app/display/gimpdisplayshell.c:502
+#: ../app/display/gimpdisplayshell.c:509
 msgid "Access the image menu"
 msgstr "Access the image menu"
 
-#: ../app/display/gimpdisplayshell.c:616
+#: ../app/display/gimpdisplayshell.c:623
 msgid "Zoom image when window size changes"
 msgstr "Zoom image when window size changes"
 
-#: ../app/display/gimpdisplayshell.c:645
+#: ../app/display/gimpdisplayshell.c:652
 msgid "Toggle Quick Mask"
 msgstr "Toggle Quick Mask"
 
-#: ../app/display/gimpdisplayshell.c:668
+#: ../app/display/gimpdisplayshell.c:675
 msgid "Navigate the image display"
 msgstr "Navigate the image display"
 
-#: ../app/display/gimpdisplayshell.c:736
-#: ../app/display/gimpdisplayshell.c:1328 ../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 "Drop image files here to open them"
 
@@ -10468,8 +10547,8 @@ msgstr[1] ""
 "If you don't save the image, changes from the last %d minutes will be lost."
 
 #: ../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 "Drop New Layer"
 
@@ -10478,27 +10557,27 @@ msgid "Drop New Path"
 msgstr "Drop New Path"
 
 #: ../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:135 ../app/tools/gimpimagemaptool.c:280
 msgid "Cannot modify the pixels of layer groups."
 msgstr "Cannot modify the pixels of layer groups."
 
 #: ../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:342
-#: ../app/tools/gimpimagemaptool.c:286 ../app/tools/gimppainttool.c:288
-#: ../app/tools/gimptransformtool.c:350 ../app/tools/gimptransformtool.c:1166
+#: ../app/display/gimpdisplayshell-dnd.c:457 ../app/tools/gimpblendtool.c:180
+#: ../app/tools/gimpbucketfilltool.c:142 ../app/tools/gimpcroptool.c:325
+#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266
+#: ../app/tools/gimptransformtool.c:245 ../app/tools/gimptransformtool.c:1061
 msgid "The active layer's pixels are locked."
 msgstr "The active layer's pixels are locked."
 
-#: ../app/display/gimpdisplayshell-dnd.c:512
-#: ../app/widgets/gimplayertreeview.c:734
+#: ../app/display/gimpdisplayshell-dnd.c:535
+#: ../app/widgets/gimplayertreeview.c:724
 msgid "Drop layers"
 msgstr "Drop layers"
 
-#: ../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:801 ../app/widgets/gimptoolbox-dnd.c:266
 msgid "Dropped Buffer"
 msgstr "Dropped Buffer"
 
@@ -10510,12 +10589,12 @@ msgstr "Colour Display Filters"
 msgid "Configure Color Display Filters"
 msgstr "Configure Colour Display Filters"
 
-#: ../app/display/gimpdisplayshell-handlers.c:802
+#: ../app/display/gimpdisplayshell-handlers.c:796
 #, c-format
 msgid "Image saved to '%s'"
 msgstr "Image saved to '%s'"
 
-#: ../app/display/gimpdisplayshell-handlers.c:816
+#: ../app/display/gimpdisplayshell-handlers.c:810
 #, c-format
 msgid "Image exported to '%s'"
 msgstr "Image exported to '%s'"
@@ -10550,19 +10629,19 @@ msgstr "(clean)"
 
 #: ../app/display/gimpdisplayshell-title.c:360
 #: ../app/display/gimpdisplayshell-title.c:373
-#: ../app/widgets/gimpactiongroup.c:870
+#: ../app/widgets/gimpactiongroup.c:860
 msgid "(none)"
 msgstr "(none)"
 
-#: ../app/display/gimpdisplayshell-title.c:504
+#: ../app/display/gimpdisplayshell-title.c:502
 msgid " (exported)"
 msgstr " (exported)"
 
-#: ../app/display/gimpdisplayshell-title.c:506
+#: ../app/display/gimpdisplayshell-title.c:504
 msgid " (overwritten)"
 msgstr " (overwritten)"
 
-#: ../app/display/gimpdisplayshell-title.c:512
+#: ../app/display/gimpdisplayshell-title.c:510
 msgid " (imported)"
 msgstr " (imported)"
 
@@ -10585,16 +10664,16 @@ msgstr "%s plug-in returned SUCCESS but did not return an image"
 msgid "%s plug-In could not open image"
 msgstr "%s plug-In could not open image"
 
-#: ../app/file/file-open.c:518
+#: ../app/file/file-open.c:523
 msgid "Image doesn't contain any layers"
 msgstr "Image doesn't contain any layers"
 
-#: ../app/file/file-open.c:571
+#: ../app/file/file-open.c:576
 #, c-format
 msgid "Opening '%s' failed: %s"
 msgstr "Opening '%s' failed: %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."
@@ -10606,7 +10685,7 @@ msgstr ""
 msgid "Unknown file type"
 msgstr "Unknown file type"
 
-#: ../app/file/file-save.c:189
+#: ../app/file/file-save.c:208
 #, c-format
 msgid "%s plug-in could not save image"
 msgstr "%s plug-in could not save image"
@@ -10620,20 +10699,51 @@ msgstr "'%s:' is not a valid URI scheme"
 msgid "Invalid character sequence in URI"
 msgstr "Invalid character sequence in URI"
 
-#: ../app/gegl/gimpcurvesconfig.c:384
+#: ../app/gegl/gimp-gegl-enums.c:24
+msgctxt "cage-mode"
+msgid "Create or adjust the cage"
+msgstr "Create or adjust the cage"
+
+#: ../app/gegl/gimp-gegl-enums.c:25
+msgctxt "cage-mode"
+msgid "Deform the cage to deform the image"
+msgstr "Deform the cage to deform the image"
+
+#: ../app/gegl/gimpcurvesconfig.c:385
 msgid "not a GIMP Curves file"
 msgstr "not a GIMP Curves file"
 
-#: ../app/gegl/gimpcurvesconfig.c:399 ../app/gegl/gimplevelsconfig.c:710
+#: ../app/gegl/gimpcurvesconfig.c:400 ../app/gegl/gimplevelsconfig.c:711
 msgid "parse error"
 msgstr "parse error"
 
-#: ../app/gegl/gimplevelsconfig.c:663
+#: ../app/gegl/gimplevelsconfig.c:664
 msgid "not a GIMP Levels file"
 msgstr "not a GIMP Levels file"
 
+#: ../app/gegl/gimpoperationcagecoefcalc.c:65
+msgid "Compute a set of coefficient buffer for the GIMP cage tool"
+msgstr "Compute a set of coefficient buffer for the GIMP cage tool"
+
+#: ../app/gegl/gimpoperationcagetransform.c:104
+msgid ""
+"Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage "
+"tool"
+msgstr ""
+"Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage "
+"tool"
+
+#: ../app/gegl/gimpoperationcagetransform.c:125
+msgid "Fill with plain color"
+msgstr "Fill with plain colour"
+
+#: ../app/gegl/gimpoperationcagetransform.c:126
+#: ../app/tools/gimpcageoptions.c:144
+msgid "Fill the original position of the cage with a plain color"
+msgstr "Fill the original position of the cage with a plain colour"
+
 #. initialize the document history
-#: ../app/gui/gui.c:425
+#: ../app/gui/gui.c:421
 msgid "Documents"
 msgstr "Documents"
 
@@ -10641,15 +10751,15 @@ msgstr "Documents"
 msgid "GIMP Startup"
 msgstr "GIMP Startup"
 
-#: ../app/paint/gimpairbrush.c:72 ../app/tools/gimpairbrushtool.c:53
+#: ../app/paint/gimpairbrush.c:73 ../app/tools/gimpairbrushtool.c:54
 msgid "Airbrush"
 msgstr "Airbrush"
 
-#: ../app/paint/gimpbrushcore.c:428
+#: ../app/paint/gimpbrushcore.c:387
 msgid "No brushes available for use with this tool."
 msgstr "No brushes available for use with this tool."
 
-#: ../app/paint/gimpbrushcore.c:435
+#: ../app/paint/gimpbrushcore.c:394
 msgid "No paint dynamics available for use with this tool."
 msgstr "No paint dynamics available for use with this tool."
 
@@ -10669,7 +10779,7 @@ msgstr "Convolve"
 msgid "Dodge/Burn"
 msgstr "Dodge/Burn"
 
-#: ../app/paint/gimperaser.c:65 ../app/tools/gimperasertool.c:65
+#: ../app/paint/gimperaser.c:63 ../app/tools/gimperasertool.c:65
 msgid "Eraser"
 msgstr "Eraser"
 
@@ -10697,36 +10807,72 @@ msgstr "Ink Blob Aspect Ratio"
 msgid "Ink Blob Angle"
 msgstr "Ink Blob Angle"
 
-#: ../app/paint/gimppaintbrush.c:65 ../app/tools/gimppaintbrushtool.c:50
+#: ../app/paint/gimppaintbrush.c:66 ../app/tools/gimppaintbrushtool.c:50
 msgid "Paintbrush"
 msgstr "Paintbrush"
 
-#: ../app/paint/gimppaintcore-stroke.c:335
-msgid "Not enough points to stroke"
-msgstr "Not enough points to stroke"
-
-#: ../app/paint/gimppaintcore.c:140
+#: ../app/paint/gimppaintcore.c:145
 msgid "Paint"
 msgstr "Paint"
 
-#: ../app/paint/gimppaintoptions.c:138
-msgid "Brush Scale"
-msgstr "Brush Scale"
+#: ../app/paint/gimppaintoptions.c:145
+msgid "Brush Size"
+msgstr "Brush Size"
+
+#: ../app/paint/gimppaintoptions.c:159
+msgid "Every stamp has its own opacity"
+msgstr "Every stamp has its own opacity"
+
+#: ../app/paint/gimppaintoptions.c:165
+msgid "Ignore fuzzyness of the current brush"
+msgstr "Ignore fuzziness of the current brush"
+
+#: ../app/paint/gimppaintoptions.c:170
+msgid "Scatter brush as you paint"
+msgstr "Scatter brush as you paint"
+
+#: ../app/paint/gimppaintoptions.c:174
+msgid "Distance of scattering"
+msgstr "Distance of scattering"
+
+#: ../app/paint/gimppaintoptions.c:184
+msgid "Distance over which strokes fade out"
+msgstr "Distance over which strokes fade out"
+
+#: ../app/paint/gimppaintoptions.c:192
+msgid "Reverse direction of fading"
+msgstr "Reverse direction of fading"
+
+#: ../app/paint/gimppaintoptions.c:196
+msgid "How fade is repeated as you paint"
+msgstr "How fade is repeated as you paint"
+
+#: ../app/paint/gimppaintoptions.c:255
+msgid "Paint smoother strokes"
+msgstr "Paint smoother strokes"
+
+#: ../app/paint/gimppaintoptions.c:259
+msgid "Depth of smoothing"
+msgstr "Depth of smoothing"
+
+#: ../app/paint/gimppaintoptions.c:263
+msgid "Gravity of the pen"
+msgstr "Gravity of the pen"
 
 #: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50
 msgid "Pencil"
 msgstr "Pencil"
 
-#: ../app/paint/gimpperspectiveclone.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:128
+#: ../app/paint/gimpperspectiveclone.c:95
+#: ../app/tools/gimpperspectiveclonetool.c:133
 msgid "Perspective Clone"
 msgstr "Perspective Clone"
 
-#: ../app/paint/gimpperspectiveclone.c:163
+#: ../app/paint/gimpperspectiveclone.c:160
 msgid "Perspective Clone does not operate on indexed layers."
 msgstr "Perspective Clone does not operate on indexed layers."
 
-#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:52
+#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:53
 msgid "Smudge"
 msgstr "Smudge"
 
@@ -10774,7 +10920,7 @@ msgctxt "convolve-type"
 msgid "Sharpen"
 msgstr "Sharpen"
 
-#: ../app/pdb/channel-cmds.c:182
+#: ../app/pdb/channel-cmds.c:184
 msgid "Combine Masks"
 msgstr "Combine Masks"
 
@@ -10782,33 +10928,33 @@ msgstr "Combine Masks"
 msgid "Plug-In"
 msgstr "Plug-In"
 
-#: ../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:349
+#: ../app/pdb/drawable-transform-cmds.c:447
+#: ../app/pdb/item-transform-cmds.c:262 ../app/pdb/transform-tools-cmds.c:163
+#: ../app/tools/gimpperspectivetool.c:82
 msgid "Perspective"
 msgstr "Perspective"
 
-#: ../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:967
+#: ../app/pdb/drawable-transform-cmds.c:1052
+#: ../app/pdb/item-transform-cmds.c:611 ../app/pdb/transform-tools-cmds.c:418
+#: ../app/tools/gimpsheartool.c:112
 msgid "Shearing"
 msgstr "Shearing"
 
-#: ../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:1150
+#: ../app/pdb/item-transform-cmds.c:709 ../app/pdb/transform-tools-cmds.c:507
 msgid "2D Transform"
 msgstr "2D Transform"
 
-#: ../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:1246
+#: ../app/pdb/drawable-transform-cmds.c:1352
+#: ../app/pdb/drawable-transform-cmds.c:1456
+#: ../app/pdb/item-transform-cmds.c:815
 msgid "2D Transforming"
 msgstr "2D Transforming"
 
-#: ../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 "Blending"
 
@@ -10828,8 +10974,8 @@ msgstr ""
 "Cannot convert this layer to a normal layer because it is not a floating "
 "selection."
 
-#: ../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
 #, c-format
 msgid "Procedure '%s' not found"
 msgstr "Procedure '%s' not found"
@@ -10920,7 +11066,8 @@ msgstr "Paint method '%s' does not exist"
 #: ../app/pdb/gimppdb-utils.c:318
 #, c-format
 msgid "Item '%s' (%d) cannot be used because it has not been added to an image"
-msgstr "Item '%s' (%d) cannot be used because it has not been added to an image"
+msgstr ""
+"Item '%s' (%d) cannot be used because it has not been added to an image"
 
 #: ../app/pdb/gimppdb-utils.c:328
 #, c-format
@@ -10995,7 +11142,7 @@ msgstr "Image '%s' (%d) is already of type '%s'"
 msgid "Vectors object %d does not contain stroke with ID %d"
 msgstr "Vectors object %d does not contain stroke with ID %d"
 
-#: ../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 "
@@ -11004,18 +11151,18 @@ msgstr ""
 "Procedure '%s' has been called with a wrong type for argument #%d. Expected "
 "%s, got %s."
 
-#: ../app/pdb/gimppdbcontext.c:78
+#: ../app/pdb/gimppdbcontext.c:82
 #: ../app/tools/gimpforegroundselectoptions.c:79
 #: ../app/tools/gimpselectionoptions.c:78
 msgid "Smooth edges"
 msgstr "Smooth edges"
 
-#: ../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 "Procedure '%s' returned no return values"
 
-#: ../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). "
@@ -11024,7 +11171,7 @@ msgstr ""
 "Procedure '%s' returned a wrong value type for return value '%s' (#%d). "
 "Expected %s, got %s."
 
-#: ../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' (#"
@@ -11033,7 +11180,7 @@ msgstr ""
 "Procedure '%s' has been called with a wrong value type for argument '%s' (#"
 "%d). Expected %s, got %s."
 
-#: ../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-"
@@ -11042,7 +11189,7 @@ msgstr ""
 "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."
 
-#: ../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 "
@@ -11051,7 +11198,7 @@ msgstr ""
 "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."
 
-#: ../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-"
@@ -11060,7 +11207,7 @@ msgstr ""
 "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."
 
-#: ../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 "
@@ -11069,7 +11216,7 @@ msgstr ""
 "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."
 
-#: ../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 "
@@ -11078,7 +11225,7 @@ msgstr ""
 "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value "
 "is out of range."
 
-#: ../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 "
@@ -11087,33 +11234,34 @@ msgstr ""
 "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type "
 "%s). This value is out of range."
 
-#: ../app/pdb/image-cmds.c:2650
+#: ../app/pdb/image-cmds.c:2364
 msgid ""
 "Image resolution is out of bounds, using the default resolution instead."
 msgstr ""
 "Image resolution is out of bounds, using the default resolution instead."
 
+#: ../app/pdb/image-select-cmds.c:297 ../app/pdb/selection-tools-cmds.c:219
+#: ../app/tools/gimpfreeselecttool.c:195
+msgid "Free Select"
+msgstr "Free Select"
+
 #: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516
 msgid "Move Layer"
 msgstr "Move Layer"
 
-#: ../app/pdb/selection-tools-cmds.c:217 ../app/tools/gimpfreeselecttool.c:199
-msgid "Free Select"
-msgstr "Free Select"
-
-#: ../app/pdb/text-layer-cmds.c:89
+#: ../app/pdb/text-layer-cmds.c:91
 #, c-format
 msgid "Failed to create text layer"
 msgstr "Failed to create text layer"
 
-#: ../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:1198
 msgid "Set text layer attribute"
 msgstr "Set text layer attribute"
 
@@ -11215,35 +11363,35 @@ msgstr ""
 msgid "Failed to run plug-in \"%s\""
 msgstr "Failed to run plug-in \"%s\""
 
-#: ../app/plug-in/gimppluginmanager-restore.c:230
+#: ../app/plug-in/gimppluginmanager-restore.c:229
 msgid "Searching Plug-Ins"
 msgstr "Searching Plug-Ins"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:279
+#: ../app/plug-in/gimppluginmanager-restore.c:284
 msgid "Resource configuration"
 msgstr "Resource configuration"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:315
+#: ../app/plug-in/gimppluginmanager-restore.c:320
 msgid "Querying new Plug-ins"
 msgstr "Querying new Plug-ins"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:365
+#: ../app/plug-in/gimppluginmanager-restore.c:370
 msgid "Initializing Plug-ins"
 msgstr "Initialising Plug-ins"
 
-#: ../app/plug-in/gimppluginmanager-restore.c:437
+#: ../app/plug-in/gimppluginmanager-restore.c:442
 msgid "Starting Extensions"
 msgstr "Starting Extensions"
 
-#: ../app/plug-in/gimppluginmanager.c:297
+#: ../app/plug-in/gimppluginmanager.c:296
 msgid "Plug-In Interpreters"
 msgstr "Plug-In Interpreters"
 
-#: ../app/plug-in/gimppluginmanager.c:304
+#: ../app/plug-in/gimppluginmanager.c:303
 msgid "Plug-In Environment"
 msgstr "Plug-In Environment"
 
-#: ../app/plug-in/gimppluginprocedure.c:995
+#: ../app/plug-in/gimppluginprocedure.c:980
 #, c-format
 msgid ""
 "Calling error for '%s':\n"
@@ -11252,7 +11400,7 @@ msgstr ""
 "Calling error for '%s':\n"
 "%s"
 
-#: ../app/plug-in/gimppluginprocedure.c:1007
+#: ../app/plug-in/gimppluginprocedure.c:992
 #, c-format
 msgid ""
 "Execution error for '%s':\n"
@@ -11280,12 +11428,12 @@ msgstr "Plug-in missing (%s)"
 msgid "Skipping '%s': wrong GIMP protocol version."
 msgstr "Skipping '%s': wrong GIMP protocol version."
 
-#: ../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 "invalid value '%s' for icon type"
 
-#: ../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 "invalid value '%ld' for icon type"
@@ -11300,51 +11448,51 @@ msgstr ""
 "Pack my box with\n"
 "five dozen liquor jugs."
 
-#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:1385
+#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:1367
 msgid "Add Text Layer"
 msgstr "Add Text Layer"
 
-#: ../app/text/gimptextlayer.c:141
+#: ../app/text/gimptextlayer.c:143
 msgid "Text Layer"
 msgstr "Text Layer"
 
-#: ../app/text/gimptextlayer.c:142
+#: ../app/text/gimptextlayer.c:144
 msgid "Rename Text Layer"
 msgstr "Rename Text Layer"
 
-#: ../app/text/gimptextlayer.c:143
+#: ../app/text/gimptextlayer.c:145
 msgid "Move Text Layer"
 msgstr "Move Text Layer"
 
-#: ../app/text/gimptextlayer.c:144
+#: ../app/text/gimptextlayer.c:146
 msgid "Scale Text Layer"
 msgstr "Scale Text Layer"
 
-#: ../app/text/gimptextlayer.c:145
+#: ../app/text/gimptextlayer.c:147
 msgid "Resize Text Layer"
 msgstr "Resize Text Layer"
 
-#: ../app/text/gimptextlayer.c:146
+#: ../app/text/gimptextlayer.c:148
 msgid "Flip Text Layer"
 msgstr "Flip Text Layer"
 
-#: ../app/text/gimptextlayer.c:147
+#: ../app/text/gimptextlayer.c:149
 msgid "Rotate Text Layer"
 msgstr "Rotate Text Layer"
 
-#: ../app/text/gimptextlayer.c:148
+#: ../app/text/gimptextlayer.c:150
 msgid "Transform Text Layer"
 msgstr "Transform Text Layer"
 
-#: ../app/text/gimptextlayer.c:509
+#: ../app/text/gimptextlayer.c:523
 msgid "Discard Text Information"
 msgstr "Discard Text Information"
 
-#: ../app/text/gimptextlayer.c:562
+#: ../app/text/gimptextlayer.c:581
 msgid "Due to lack of any fonts, text functionality is not available."
 msgstr "Due to lack of any fonts, text functionality is not available."
 
-#: ../app/text/gimptextlayer.c:613
+#: ../app/text/gimptextlayer.c:634
 msgid "Empty Text Layer"
 msgstr "Empty Text Layer"
 
@@ -11373,7 +11521,7 @@ msgctxt "text-box-mode"
 msgid "Fixed"
 msgstr "Fixed"
 
-#: ../app/tools/gimp-tools.c:352
+#: ../app/tools/gimp-tools.c:351
 msgid ""
 "This tool has\n"
 "no options."
@@ -11381,152 +11529,158 @@ msgstr ""
 "This tool has\n"
 "no options."
 
-#: ../app/tools/gimpairbrushtool.c:54
+#: ../app/tools/gimpairbrushtool.c:55
 msgid "Airbrush Tool: Paint using a brush, with variable pressure"
 msgstr "Airbrush Tool: Paint using a brush, with variable pressure"
 
-#: ../app/tools/gimpairbrushtool.c:55
+#: ../app/tools/gimpairbrushtool.c:56
 msgid "_Airbrush"
 msgstr "_Airbrush"
 
-#: ../app/tools/gimpairbrushtool.c:88
+#: ../app/tools/gimpairbrushtool.c:86
 msgid "Motion only"
 msgstr "Motion only"
 
-#: ../app/tools/gimpairbrushtool.c:97 ../app/tools/gimpconvolvetool.c:216
-#: ../app/tools/gimpsmudgetool.c:96
-msgid "Rate:"
-msgstr "Rate:"
-
-#: ../app/tools/gimpairbrushtool.c:103
-msgid "Flow:"
-msgstr "Flow:"
-
-#: ../app/tools/gimpaligntool.c:135 ../app/tools/gimpaligntool.c:764
-msgid "Align"
-msgstr "Align"
-
-#: ../app/tools/gimpaligntool.c:136
-msgid "Alignment Tool: Align or arrange layers and other objects"
-msgstr "Alignment Tool: Align or arrange layers and other objects"
-
-#: ../app/tools/gimpaligntool.c:137
-msgid "_Align"
-msgstr "_Align"
-
-#: ../app/tools/gimpaligntool.c:599
-msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
-msgstr "Click on a layer, path or guide, or Click-Drag to pick several layers"
+#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:222
+#: ../app/tools/gimpsmudgetool.c:91
+msgid "Rate"
+msgstr "Rate"
 
-#: ../app/tools/gimpaligntool.c:608
-msgid "Click to pick this layer as first item"
-msgstr "Click to pick this layer as first item"
+#: ../app/tools/gimpairbrushtool.c:97
+msgid "Flow"
+msgstr "Flow"
 
-#: ../app/tools/gimpaligntool.c:616
-msgid "Click to add this layer to the list"
-msgstr "Click to add this layer to the list"
+#: ../app/tools/gimpalignoptions.c:91
+msgid "Reference image object a layer will be aligned on"
+msgstr "Reference image object a layer will be aligned on"
 
-#: ../app/tools/gimpaligntool.c:620
-msgid "Click to pick this guide as first item"
-msgstr "Click to pick this guide as first item"
+#: ../app/tools/gimpalignoptions.c:98
+msgid "Horizontal offset for distribution"
+msgstr "Horizontal offset for distribution"
 
-#: ../app/tools/gimpaligntool.c:628
-msgid "Click to add this guide to the list"
-msgstr "Click to add this guide to the list"
+#: ../app/tools/gimpalignoptions.c:104
+msgid "Vertical offset for distribution"
+msgstr "Vertical offset for distribution"
 
-#: ../app/tools/gimpaligntool.c:632
-msgid "Click to pick this path as first item"
-msgstr "Click to pick this path as first item"
+#: ../app/tools/gimpalignoptions.c:247 ../app/tools/gimpalignoptions.c:298
+msgid "Align left edge of target"
+msgstr "Align left edge of target"
 
-#: ../app/tools/gimpaligntool.c:640
-msgid "Click to add this path to the list"
-msgstr "Click to add this path to the list"
+#: ../app/tools/gimpalignoptions.c:272 ../app/tools/gimpaligntool.c:124
+msgid "Align"
+msgstr "Align"
 
-#: ../app/tools/gimpaligntool.c:776
+#: ../app/tools/gimpalignoptions.c:284
 msgid "Relative to:"
 msgstr "Relative to:"
 
-#: ../app/tools/gimpaligntool.c:794
-msgid "Align left edge of target"
-msgstr "Align left edge of target"
-
-#: ../app/tools/gimpaligntool.c:800
+#: ../app/tools/gimpalignoptions.c:302
 msgid "Align center of target"
 msgstr "Align centre of target"
 
-#: ../app/tools/gimpaligntool.c:806
+#: ../app/tools/gimpalignoptions.c:306
 msgid "Align right edge of target"
 msgstr "Align right edge of target"
 
-#: ../app/tools/gimpaligntool.c:816
+#: ../app/tools/gimpalignoptions.c:314
 msgid "Align top edge of target"
 msgstr "Align top edge of target"
 
-#: ../app/tools/gimpaligntool.c:822
+#: ../app/tools/gimpalignoptions.c:318
 msgid "Align middle of target"
 msgstr "Align middle of target"
 
-#: ../app/tools/gimpaligntool.c:828
+#: ../app/tools/gimpalignoptions.c:322
 msgid "Align bottom of target"
 msgstr "Align bottom of target"
 
-#: ../app/tools/gimpaligntool.c:832
+#: ../app/tools/gimpalignoptions.c:324
 msgid "Distribute"
 msgstr "Distribute"
 
-#: ../app/tools/gimpaligntool.c:846
+#: ../app/tools/gimpalignoptions.c:338
 msgid "Distribute left edges of targets"
 msgstr "Distribute left edges of targets"
 
-#: ../app/tools/gimpaligntool.c:853
+#: ../app/tools/gimpalignoptions.c:342
 msgid "Distribute horizontal centers of targets"
 msgstr "Distribute horizontal centres of targets"
 
-#: ../app/tools/gimpaligntool.c:860
+#: ../app/tools/gimpalignoptions.c:346
 msgid "Distribute right edges of targets"
 msgstr "Distribute right edges of targets"
 
-#: ../app/tools/gimpaligntool.c:870
+#: ../app/tools/gimpalignoptions.c:354
 msgid "Distribute top edges of targets"
 msgstr "Distribute top edges of targets"
 
-#: ../app/tools/gimpaligntool.c:877
+#: ../app/tools/gimpalignoptions.c:358
 msgid "Distribute vertical centers of targets"
 msgstr "Distribute vertical centres of targets"
 
-#: ../app/tools/gimpaligntool.c:883
+#: ../app/tools/gimpalignoptions.c:362
 msgid "Distribute bottoms of targets"
 msgstr "Distribute bottoms of targets"
 
-#: ../app/tools/gimpaligntool.c:891 ../app/tools/gimpblendoptions.c:221
+#: ../app/tools/gimpalignoptions.c:368
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../app/tools/gimpblendoptions.c:215 ../app/tools/gimppaintoptions-gui.c:310
-msgid "Gradient:"
-msgstr "Gradient:"
+#: ../app/tools/gimpaligntool.c:125
+msgid "Alignment Tool: Align or arrange layers and other objects"
+msgstr "Alignment Tool: Align or arrange layers and other objects"
+
+#: ../app/tools/gimpaligntool.c:126
+msgid "_Align"
+msgstr "_Align"
+
+#: ../app/tools/gimpaligntool.c:542
+msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
+msgstr "Click on a layer, path or guide, or Click-Drag to pick several layers"
+
+#: ../app/tools/gimpaligntool.c:550
+msgid "Click to pick this layer as first item"
+msgstr "Click to pick this layer as first item"
+
+#: ../app/tools/gimpaligntool.c:557
+msgid "Click to add this layer to the list"
+msgstr "Click to add this layer to the list"
+
+#: ../app/tools/gimpaligntool.c:561
+msgid "Click to pick this guide as first item"
+msgstr "Click to pick this guide as first item"
+
+#: ../app/tools/gimpaligntool.c:568
+msgid "Click to add this guide to the list"
+msgstr "Click to add this guide to the list"
+
+#: ../app/tools/gimpaligntool.c:572
+msgid "Click to pick this path as first item"
+msgstr "Click to pick this path as first item"
+
+#: ../app/tools/gimpaligntool.c:579
+msgid "Click to add this path to the list"
+msgstr "Click to add this path to the list"
+
+#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:339
+msgid "Gradient"
+msgstr "Gradient"
 
-#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:145
+#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:139
 msgid "Shape:"
 msgstr "Shape:"
 
-#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:241
+#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:323
 msgid "Repeat:"
 msgstr "Repeat:"
 
-#: ../app/tools/gimpblendoptions.c:256
+#: ../app/tools/gimpblendoptions.c:261
 msgid "Adaptive supersampling"
 msgstr "Adaptive supersampling"
 
-#: ../app/tools/gimpblendoptions.c:264
-msgid "Max depth:"
-msgstr "Max depth:"
-
-#: ../app/tools/gimpblendoptions.c:271
-#: ../app/tools/gimpbucketfilloptions.c:287
-#: ../app/tools/gimpregionselectoptions.c:219
-msgid "Threshold:"
-msgstr "Threshold:"
+#: ../app/tools/gimpblendoptions.c:268
+msgid "Max depth"
+msgstr "Max depth"
 
 #: ../app/tools/gimpblendtool.c:109
 msgid "Blend"
@@ -11540,21 +11694,25 @@ msgstr "Blend Tool: Fill selected area with a colour gradient"
 msgid "Blen_d"
 msgstr "Blen_d"
 
-#: ../app/tools/gimpblendtool.c:167
+#: ../app/tools/gimpblendtool.c:166
 msgid "Blend does not operate on indexed layers."
 msgstr "Blend does not operate on indexed layers."
 
-#: ../app/tools/gimpblendtool.c:420 ../app/tools/gimppainttool.c:640
+#: ../app/tools/gimpblendtool.c:187
+msgid "No gradient available for use with this tool."
+msgstr "No gradient available for use with this tool."
+
+#: ../app/tools/gimpblendtool.c:441 ../app/tools/gimppainttool.c:618
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%s for constrained angles"
 
-#: ../app/tools/gimpblendtool.c:421
+#: ../app/tools/gimpblendtool.c:442
 #, c-format
 msgid "%s to move the whole line"
 msgstr "%s to move the whole line"
 
-#: ../app/tools/gimpblendtool.c:425
+#: ../app/tools/gimpblendtool.c:446
 msgid "Blend: "
 msgstr "Blend: "
 
@@ -11586,67 +11744,75 @@ msgstr "Export Brightness-Contrast settings"
 msgid "Brightness-Contrast does not operate on indexed layers."
 msgstr "Brightness-Contrast does not operate on indexed layers."
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:320
+#: ../app/tools/gimpbrightnesscontrasttool.c:314
 msgid "_Brightness:"
 msgstr "_Brightness:"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:335
+#: ../app/tools/gimpbrightnesscontrasttool.c:327
 msgid "Con_trast:"
 msgstr "Con_trast:"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:349
+#: ../app/tools/gimpbrightnesscontrasttool.c:339
 msgid "Edit these Settings as Levels"
 msgstr "Edit these Settings as Levels"
 
-#: ../app/tools/gimpbucketfilloptions.c:99
+#: ../app/tools/gimpbucketfilloptions.c:93
+msgid "Which area will be filled"
+msgstr "Which area will be filled"
+
+#: ../app/tools/gimpbucketfilloptions.c:98
 msgid "Allow completely transparent regions to be filled"
 msgstr "Allow completely transparent regions to be filled"
 
-#: ../app/tools/gimpbucketfilloptions.c:105
+#: ../app/tools/gimpbucketfilloptions.c:104
 msgid "Base filled area on all visible layers"
 msgstr "Base filled area on all visible layers"
 
-#: ../app/tools/gimpbucketfilloptions.c:111
+#: ../app/tools/gimpbucketfilloptions.c:110
 #: ../app/tools/gimpregionselectoptions.c:95
 msgid "Maximum color difference"
 msgstr "Maximum colour difference"
 
+#: ../app/tools/gimpbucketfilloptions.c:115
+msgid "Criterion used for determining color similarity"
+msgstr "Criterion used for determining colour similarity"
+
 #. fill type
-#: ../app/tools/gimpbucketfilloptions.c:225
+#: ../app/tools/gimpbucketfilloptions.c:226
 #, c-format
 msgid "Fill Type  (%s)"
 msgstr "Fill Type  (%s)"
 
 #. fill selection
-#: ../app/tools/gimpbucketfilloptions.c:239
+#: ../app/tools/gimpbucketfilloptions.c:241
 #, c-format
 msgid "Affected Area  (%s)"
 msgstr "Affected Area  (%s)"
 
-#: ../app/tools/gimpbucketfilloptions.c:243
+#: ../app/tools/gimpbucketfilloptions.c:245
 msgid "Fill whole selection"
 msgstr "Fill whole selection"
 
-#: ../app/tools/gimpbucketfilloptions.c:244
+#: ../app/tools/gimpbucketfilloptions.c:246
 msgid "Fill similar colors"
 msgstr "Fill similar colours"
 
-#: ../app/tools/gimpbucketfilloptions.c:253
+#: ../app/tools/gimpbucketfilloptions.c:255
 msgid "Finding Similar Colors"
 msgstr "Finding Similar Colours"
 
-#: ../app/tools/gimpbucketfilloptions.c:269
+#: ../app/tools/gimpbucketfilloptions.c:270
 msgid "Fill transparent areas"
 msgstr "Fill transparent areas"
 
-#: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:113
-#: ../app/tools/gimpcolorpickeroptions.c:150 ../app/tools/gimphealtool.c:98
-#: ../app/tools/gimpperspectiveclonetool.c:951
-#: ../app/tools/gimpregionselectoptions.c:207
+#: ../app/tools/gimpbucketfilloptions.c:276 ../app/tools/gimpclonetool.c:113
+#: ../app/tools/gimpcolorpickeroptions.c:155 ../app/tools/gimphealtool.c:98
+#: ../app/tools/gimpperspectiveclonetool.c:898
+#: ../app/tools/gimpregionselectoptions.c:209
 msgid "Sample merged"
 msgstr "Sample merged"
 
-#: ../app/tools/gimpbucketfilloptions.c:294
+#: ../app/tools/gimpbucketfilloptions.c:295
 msgid "Fill by:"
 msgstr "Fill by:"
 
@@ -11679,6 +11845,30 @@ msgctxt "command"
 msgid "Select by Color"
 msgstr "Select by Colour"
 
+#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1154
+msgid "Cage Transform"
+msgstr "Cage Transform"
+
+#: ../app/tools/gimpcagetool.c:153
+msgid "Cage Transform: Deform a selection with a cage"
+msgstr "Cage Transform: Deform a selection with a cage"
+
+#: ../app/tools/gimpcagetool.c:154
+msgid "_Cage Transform"
+msgstr "_Cage Transform"
+
+#: ../app/tools/gimpcagetool.c:351
+msgid "Press ENTER to commit the transform"
+msgstr "Press ENTER to commit the transform"
+
+#: ../app/tools/gimpcagetool.c:1095
+msgid "Computing Cage Coefficients"
+msgstr "Computing Cage Coefficients"
+
+#: ../app/tools/gimpcagetool.c:1272
+msgid "Cage transform"
+msgstr "Cage transform"
+
 #: ../app/tools/gimpclonetool.c:61
 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush"
 msgstr "Clone Tool: Selectively copy from an image or pattern, using a brush"
@@ -11701,12 +11891,12 @@ msgid "Click to set a new clone source"
 msgstr "Click to set a new clone source"
 
 #: ../app/tools/gimpclonetool.c:108
-#: ../app/tools/gimpperspectiveclonetool.c:946
+#: ../app/tools/gimpperspectiveclonetool.c:893
 msgid "Source"
 msgstr "Source"
 
-#: ../app/tools/gimpclonetool.c:129 ../app/tools/gimphealtool.c:110
-#: ../app/tools/gimpperspectiveclonetool.c:967
+#: ../app/tools/gimpclonetool.c:130 ../app/tools/gimphealtool.c:110
+#: ../app/tools/gimpperspectiveclonetool.c:915
 msgid "Alignment:"
 msgstr "Alignment:"
 
@@ -11738,49 +11928,49 @@ msgstr "Export Colour Balance Settings"
 msgid "Color Balance operates only on RGB color layers."
 msgstr "Colour Balance operates only on RGB colour layers."
 
-#: ../app/tools/gimpcolorbalancetool.c:267
+#: ../app/tools/gimpcolorbalancetool.c:266
 msgid "Select Range to Adjust"
 msgstr "Select Range to Adjust"
 
-#: ../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 "Adjust Colour Levels"
 
-#: ../app/tools/gimpcolorbalancetool.c:293
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/tools/gimpcolorbalancetool.c:292
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "Cyan"
 msgstr "Cyan"
 
-#: ../app/tools/gimpcolorbalancetool.c:293
-#: ../app/tools/gimphuesaturationtool.c:249
+#: ../app/tools/gimpcolorbalancetool.c:292
+#: ../app/tools/gimphuesaturationtool.c:248
 msgid "Red"
 msgstr "Red"
 
-#: ../app/tools/gimpcolorbalancetool.c:302
-#: ../app/tools/gimphuesaturationtool.c:254
+#: ../app/tools/gimpcolorbalancetool.c:301
+#: ../app/tools/gimphuesaturationtool.c:253
 msgid "Magenta"
 msgstr "Magenta"
 
-#: ../app/tools/gimpcolorbalancetool.c:302
-#: ../app/tools/gimphuesaturationtool.c:251
+#: ../app/tools/gimpcolorbalancetool.c:301
+#: ../app/tools/gimphuesaturationtool.c:250
 msgid "Green"
 msgstr "Green"
 
-#: ../app/tools/gimpcolorbalancetool.c:311
-#: ../app/tools/gimphuesaturationtool.c:250
+#: ../app/tools/gimpcolorbalancetool.c:310
+#: ../app/tools/gimphuesaturationtool.c:249
 msgid "Yellow"
 msgstr "Yellow"
 
-#: ../app/tools/gimpcolorbalancetool.c:311
-#: ../app/tools/gimphuesaturationtool.c:253
+#: ../app/tools/gimpcolorbalancetool.c:310
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "Blue"
 msgstr "Blue"
 
-#: ../app/tools/gimpcolorbalancetool.c:322
+#: ../app/tools/gimpcolorbalancetool.c:321
 msgid "R_eset Range"
 msgstr "R_eset Range"
 
-#: ../app/tools/gimpcolorbalancetool.c:331
+#: ../app/tools/gimpcolorbalancetool.c:330
 msgid "Preserve _luminosity"
 msgstr "Preserve _luminosity"
 
@@ -11812,231 +12002,258 @@ msgstr "Export Colourise Settings"
 msgid "Colorize operates only on RGB color layers."
 msgstr "Colourise operates only on RGB colour layers."
 
-#: ../app/tools/gimpcolorizetool.c:225
+#: ../app/tools/gimpcolorizetool.c:224
 msgid "Select Color"
 msgstr "Select Colour"
 
-#: ../app/tools/gimpcolorizetool.c:242
-#: ../app/tools/gimphuesaturationtool.c:385
+#: ../app/tools/gimpcolorizetool.c:241
+#: ../app/tools/gimphuesaturationtool.c:381
 msgid "_Hue:"
 msgstr "_Hue:"
 
-#: ../app/tools/gimpcolorizetool.c:257
-#: ../app/tools/gimphuesaturationtool.c:423
+#: ../app/tools/gimpcolorizetool.c:254
+#: ../app/tools/gimphuesaturationtool.c:413
 msgid "_Saturation:"
 msgstr "_Saturation:"
 
-#: ../app/tools/gimpcolorizetool.c:272
-#: ../app/tools/gimphuesaturationtool.c:404
+#: ../app/tools/gimpcolorizetool.c:267
+#: ../app/tools/gimphuesaturationtool.c:397
 msgid "_Lightness:"
 msgstr "_Lightness:"
 
-#: ../app/tools/gimpcoloroptions.c:75
+#: ../app/tools/gimpcoloroptions.c:77
 msgid "Color Picker Average Radius"
 msgstr "Colour Picker Average Radius"
 
-#: ../app/tools/gimpcoloroptions.c:161
+#: ../app/tools/gimpcoloroptions.c:157
+#: ../app/tools/gimprectangleselectoptions.c:163
+#: ../app/tools/gimpselectionoptions.c:272
+#: ../app/widgets/gimpbrusheditor.c:155
+msgid "Radius"
+msgstr "Radius"
+
+#: ../app/tools/gimpcoloroptions.c:163
 msgid "Sample average"
 msgstr "Sample average"
 
-#: ../app/tools/gimpcoloroptions.c:171
-#: ../app/tools/gimprectangleselectoptions.c:175
-#: ../app/tools/gimpselectionoptions.c:280
-#: ../app/widgets/gimpbrusheditor.c:153
-msgid "Radius:"
-msgstr "Radius:"
+#: ../app/tools/gimpcolorpickeroptions.c:68
+msgid "Use accumulated color value from all composited visible layers"
+msgstr "Use accumulated colour value from all composited visible layers"
+
+#: ../app/tools/gimpcolorpickeroptions.c:74
+msgid "Choose what color picker will do"
+msgstr "Choose what colour picker will do"
+
+#: ../app/tools/gimpcolorpickeroptions.c:80
+msgid ""
+"Open a floating dialog to view picked color values in various color models"
+msgstr ""
+"Open a floating dialogue to view picked colour values in various colour "
+"models"
 
 #. the pick FG/BG frame
-#: ../app/tools/gimpcolorpickeroptions.c:155
+#: ../app/tools/gimpcolorpickeroptions.c:160
 #, c-format
 msgid "Pick Mode  (%s)"
 msgstr "Pick Mode  (%s)"
 
 #. the use_info_window toggle button
-#: ../app/tools/gimpcolorpickeroptions.c:164
+#: ../app/tools/gimpcolorpickeroptions.c:169
 #, c-format
 msgid "Use info window  (%s)"
 msgstr "Use info window  (%s)"
 
-#: ../app/tools/gimpcolorpickertool.c:96
+#: ../app/tools/gimpcolorpickertool.c:93
 msgid "Color Picker"
 msgstr "Colour Picker"
 
-#: ../app/tools/gimpcolorpickertool.c:97
+#: ../app/tools/gimpcolorpickertool.c:94
 msgid "Color Picker Tool: Set colors from image pixels"
 msgstr "Colour Picker Tool: Set colours from image pixels"
 
-#: ../app/tools/gimpcolorpickertool.c:98
+#: ../app/tools/gimpcolorpickertool.c:95
 msgid "C_olor Picker"
 msgstr "C_olour Picker"
 
-#: ../app/tools/gimpcolorpickertool.c:242
+#: ../app/tools/gimpcolorpickertool.c:225
 msgid "Click in any image to view its color"
 msgstr "Click in any image to view its colour"
 
-#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:496
+#: ../app/tools/gimpcolorpickertool.c:232 ../app/tools/gimppainttool.c:474
 msgid "Click in any image to pick the foreground color"
 msgstr "Click in any image to pick the foreground colour"
 
-#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:502
+#: ../app/tools/gimpcolorpickertool.c:240 ../app/tools/gimppainttool.c:480
 msgid "Click in any image to pick the background color"
 msgstr "Click in any image to pick the background colour"
 
-#: ../app/tools/gimpcolorpickertool.c:265
+#: ../app/tools/gimpcolorpickertool.c:248
 msgid "Click in any image to add the color to the palette"
 msgstr "Click in any image to add the colour to the palette"
 
-#. tool->display->shell
-#: ../app/tools/gimpcolorpickertool.c:318
+#: ../app/tools/gimpcolorpickertool.c:303
 msgid "Color Picker Information"
 msgstr "Colour Picker Information"
 
-#: ../app/tools/gimpcolortool.c:228 ../app/tools/gimpcolortool.c:401
+#: ../app/tools/gimpcolortool.c:229 ../app/tools/gimpcolortool.c:402
 msgid "Move Sample Point: "
 msgstr "Move Sample Point: "
 
-#: ../app/tools/gimpcolortool.c:393
+#: ../app/tools/gimpcolortool.c:394
 msgid "Remove Sample Point"
 msgstr "Remove Sample Point"
 
-#: ../app/tools/gimpcolortool.c:394
+#: ../app/tools/gimpcolortool.c:395
 msgid "Cancel Sample Point"
 msgstr "Cancel Sample Point"
 
-#: ../app/tools/gimpcolortool.c:402
+#: ../app/tools/gimpcolortool.c:403
 msgid "Add Sample Point: "
 msgstr "Add Sample Point: "
 
-#: ../app/tools/gimpconvolvetool.c:72
+#: ../app/tools/gimpconvolvetool.c:73
 msgid "Blur / Sharpen"
 msgstr "Blur / Sharpen"
 
-#: ../app/tools/gimpconvolvetool.c:73
+#: ../app/tools/gimpconvolvetool.c:74
 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush"
 msgstr "Blur / Sharpen Tool: Selective blurring or unblurring using a brush"
 
-#: ../app/tools/gimpconvolvetool.c:74
+#: ../app/tools/gimpconvolvetool.c:75
 msgid "Bl_ur / Sharpen"
 msgstr "Bl_ur / Sharpen"
 
-#: ../app/tools/gimpconvolvetool.c:169
+#: ../app/tools/gimpconvolvetool.c:181
 msgid "Click to blur"
 msgstr "Click to blur"
 
-#: ../app/tools/gimpconvolvetool.c:170
+#: ../app/tools/gimpconvolvetool.c:182
 msgid "Click to blur the line"
 msgstr "Click to blur the line"
 
-#: ../app/tools/gimpconvolvetool.c:171
+#: ../app/tools/gimpconvolvetool.c:183
 #, c-format
 msgid "%s to sharpen"
 msgstr "%s to sharpen"
 
-#: ../app/tools/gimpconvolvetool.c:175
+#: ../app/tools/gimpconvolvetool.c:187
 msgid "Click to sharpen"
 msgstr "Click to sharpen"
 
-#: ../app/tools/gimpconvolvetool.c:176
+#: ../app/tools/gimpconvolvetool.c:188
 msgid "Click to sharpen the line"
 msgstr "Click to sharpen the line"
 
-#: ../app/tools/gimpconvolvetool.c:177
+#: ../app/tools/gimpconvolvetool.c:189
 #, c-format
 msgid "%s to blur"
 msgstr "%s to blur"
 
 #. the type radio box
-#: ../app/tools/gimpconvolvetool.c:198
+#: ../app/tools/gimpconvolvetool.c:210
 #, c-format
 msgid "Convolve Type  (%s)"
 msgstr "Convolve Type  (%s)"
 
-#: ../app/tools/gimpcropoptions.c:160
+#: ../app/tools/gimpcropoptions.c:76
+#: ../app/tools/gimprectangleselectoptions.c:77
+msgid "Dim everything outside selection"
+msgstr "Dim everything outside selection"
+
+#: ../app/tools/gimpcropoptions.c:82
+msgid "Crop only currently selected layer"
+msgstr "Crop only currently selected layer"
+
+#: ../app/tools/gimpcropoptions.c:88
+msgid "Allow resizing canvas by dragging cropping frame beyond image boundary"
+msgstr "Allow resizing canvas by dragging cropping frame beyond image boundary"
+
+#: ../app/tools/gimpcropoptions.c:164
 msgid "Current layer only"
 msgstr "Current layer only"
 
-#: ../app/tools/gimpcropoptions.c:166
+#: ../app/tools/gimpcropoptions.c:170
 msgid "Allow growing"
 msgstr "Allow growing"
 
-#: ../app/tools/gimpcroptool.c:128
+#: ../app/tools/gimpcroptool.c:117
 msgid "Crop"
 msgstr "Crop"
 
-#: ../app/tools/gimpcroptool.c:129
+#: ../app/tools/gimpcroptool.c:118
 msgid "Crop Tool: Remove edge areas from image or layer"
 msgstr "Crop Tool: Remove edge areas from image or layer"
 
-#: ../app/tools/gimpcroptool.c:130
+#: ../app/tools/gimpcroptool.c:119
 msgid "_Crop"
 msgstr "_Crop"
 
-#: ../app/tools/gimpcroptool.c:272
+#: ../app/tools/gimpcroptool.c:253
 msgid "Click or press Enter to crop"
 msgstr "Click or press Enter to crop"
 
-#: ../app/tools/gimpcroptool.c:335
+#: ../app/tools/gimpcroptool.c:318
 msgid "There is no active layer to crop."
 msgstr "There is no active layer to crop."
 
-#: ../app/tools/gimpcurvestool.c:140
+#: ../app/tools/gimpcurvestool.c:149
 msgid "Curves"
 msgstr "Curves"
 
-#: ../app/tools/gimpcurvestool.c:141
+#: ../app/tools/gimpcurvestool.c:150
 msgid "Curves Tool: Adjust color curves"
 msgstr "Curves Tool: Adjust colour curves"
 
-#: ../app/tools/gimpcurvestool.c:142
+#: ../app/tools/gimpcurvestool.c:151
 msgid "_Curves..."
 msgstr "_Curves..."
 
-#: ../app/tools/gimpcurvestool.c:168
+#: ../app/tools/gimpcurvestool.c:177
 msgid "Adjust Color Curves"
 msgstr "Adjust Colour Curves"
 
-#: ../app/tools/gimpcurvestool.c:170
+#: ../app/tools/gimpcurvestool.c:179
 msgid "Import Curves"
 msgstr "Import Curves"
 
-#: ../app/tools/gimpcurvestool.c:171
+#: ../app/tools/gimpcurvestool.c:180
 msgid "Export Curves"
 msgstr "Export Curves"
 
-#: ../app/tools/gimpcurvestool.c:222
+#: ../app/tools/gimpcurvestool.c:231
 msgid "Curves does not operate on indexed layers."
 msgstr "Curves does not operate on indexed layers."
 
-#: ../app/tools/gimpcurvestool.c:330
+#: ../app/tools/gimpcurvestool.c:339
 msgid "Click to add a control point"
 msgstr "Click to add a control point"
 
-#: ../app/tools/gimpcurvestool.c:335
+#: ../app/tools/gimpcurvestool.c:344
 msgid "Click to add control points to all channels"
 msgstr "Click to add control points to all channels"
 
-#: ../app/tools/gimpcurvestool.c:340
+#: ../app/tools/gimpcurvestool.c:349
 msgid "Click to locate on curve (try Shift, Ctrl)"
 msgstr "Click to locate on curve (try Shift, Ctrl)"
 
-#: ../app/tools/gimpcurvestool.c:453 ../app/tools/gimplevelstool.c:384
+#: ../app/tools/gimpcurvestool.c:462 ../app/tools/gimplevelstool.c:384
 msgid "Cha_nnel:"
 msgstr "Cha_nnel:"
 
-#: ../app/tools/gimpcurvestool.c:479 ../app/tools/gimplevelstool.c:408
+#: ../app/tools/gimpcurvestool.c:488 ../app/tools/gimplevelstool.c:408
 msgid "R_eset Channel"
 msgstr "R_eset Channel"
 
-#: ../app/tools/gimpcurvestool.c:571 ../app/widgets/gimpdeviceinfoeditor.c:460
+#: ../app/tools/gimpcurvestool.c:581 ../app/widgets/gimpdeviceinfoeditor.c:458
 msgid "Curve _type:"
 msgstr "Curve _type:"
 
-#: ../app/tools/gimpcurvestool.c:646 ../app/tools/gimplevelstool.c:756
+#: ../app/tools/gimpcurvestool.c:656 ../app/tools/gimplevelstool.c:756
 #, c-format
 msgid "Could not read header from '%s': %s"
 msgstr "Could not read header from '%s': %s"
 
-#: ../app/tools/gimpcurvestool.c:719
+#: ../app/tools/gimpcurvestool.c:729
 msgid "Use _old curves file format"
 msgstr "Use _old curves file format"
 
@@ -12060,82 +12277,82 @@ msgstr "Desaturate only operates on RGB layers."
 msgid "Choose shade of gray based on:"
 msgstr "Choose shade of grey based on:"
 
-#: ../app/tools/gimpdodgeburntool.c:72
+#: ../app/tools/gimpdodgeburntool.c:73
 msgid "Dodge / Burn"
 msgstr "Dodge / Burn"
 
-#: ../app/tools/gimpdodgeburntool.c:73
+#: ../app/tools/gimpdodgeburntool.c:74
 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush"
 msgstr "Dodge / Burn Tool: Selectively lighten or darken using a brush"
 
-#: ../app/tools/gimpdodgeburntool.c:74
+#: ../app/tools/gimpdodgeburntool.c:75
 msgid "Dod_ge / Burn"
 msgstr "Dod_ge / Burn"
 
-#: ../app/tools/gimpdodgeburntool.c:172
+#: ../app/tools/gimpdodgeburntool.c:184
 msgid "Click to dodge"
 msgstr "Click to dodge"
 
-#: ../app/tools/gimpdodgeburntool.c:173
+#: ../app/tools/gimpdodgeburntool.c:185
 msgid "Click to dodge the line"
 msgstr "Click to dodge the line"
 
-#: ../app/tools/gimpdodgeburntool.c:174
+#: ../app/tools/gimpdodgeburntool.c:186
 #, c-format
 msgid "%s to burn"
 msgstr "%s to burn"
 
-#: ../app/tools/gimpdodgeburntool.c:178
+#: ../app/tools/gimpdodgeburntool.c:190
 msgid "Click to burn"
 msgstr "Click to burn"
 
-#: ../app/tools/gimpdodgeburntool.c:179
+#: ../app/tools/gimpdodgeburntool.c:191
 msgid "Click to burn the line"
 msgstr "Click to burn the line"
 
-#: ../app/tools/gimpdodgeburntool.c:180
+#: ../app/tools/gimpdodgeburntool.c:192
 #, c-format
 msgid "%s to dodge"
 msgstr "%s to dodge"
 
 #. the type (dodge or burn)
-#: ../app/tools/gimpdodgeburntool.c:201
+#: ../app/tools/gimpdodgeburntool.c:213
 #, c-format
 msgid "Type  (%s)"
 msgstr "Type  (%s)"
 
 #. mode (highlights, midtones, or shadows)
-#: ../app/tools/gimpdodgeburntool.c:212
+#: ../app/tools/gimpdodgeburntool.c:224
 msgid "Range"
 msgstr "Range"
 
-#: ../app/tools/gimpdodgeburntool.c:224
-msgid "Exposure:"
-msgstr "Exposure:"
+#: ../app/tools/gimpdodgeburntool.c:230
+msgid "Exposure"
+msgstr "Exposure"
 
-#: ../app/tools/gimpeditselectiontool.c:240
+#: ../app/tools/gimpeditselectiontool.c:242
 msgid "Move Selection"
 msgstr "Move Selection"
 
-#: ../app/tools/gimpeditselectiontool.c:244
-#: ../app/tools/gimpeditselectiontool.c:1236
+#: ../app/tools/gimpeditselectiontool.c:246
+#: ../app/tools/gimpeditselectiontool.c:1240
 msgid "Move Floating Selection"
 msgstr "Move Floating Selection"
 
-#: ../app/tools/gimpeditselectiontool.c:453
-#: ../app/tools/gimpeditselectiontool.c:728
+#: ../app/tools/gimpeditselectiontool.c:455
+#: ../app/tools/gimpeditselectiontool.c:732
 msgid "Move: "
 msgstr "Move: "
 
-#: ../app/tools/gimpellipseselecttool.c:68
+#: ../app/tools/gimpellipseselecttool.c:66
 msgid "Ellipse Select"
 msgstr "Ellipse Select"
 
-#: ../app/tools/gimpellipseselecttool.c:69
+#: ../app/tools/gimpellipseselecttool.c:67
 msgid "Ellipse Select Tool: Select an elliptical region"
 msgstr "Ellipse Select Tool: Select an elliptical region"
 
-#: ../app/tools/gimpellipseselecttool.c:70
+#: ../app/tools/gimpellipseselecttool.c:68
 msgid "_Ellipse Select"
 msgstr "_Ellipse Select"
 
@@ -12166,32 +12383,49 @@ msgstr "%s to pick a background colour"
 msgid "Anti erase  (%s)"
 msgstr "Anti erase  (%s)"
 
-#: ../app/tools/gimpflipoptions.c:129
+#: ../app/tools/gimpflipoptions.c:66
+msgid "Direction of flipping"
+msgstr "Direction of flipping"
+
+#: ../app/tools/gimpflipoptions.c:130
 msgid "Affect:"
 msgstr "Affect:"
 
 #. tool toggle
-#: ../app/tools/gimpflipoptions.c:138
+#: ../app/tools/gimpflipoptions.c:139
 #, c-format
 msgid "Flip Type  (%s)"
 msgstr "Flip Type  (%s)"
 
-#: ../app/tools/gimpfliptool.c:79
+#: ../app/tools/gimpfliptool.c:83
 msgid "Flip"
 msgstr "Flip"
 
-#: ../app/tools/gimpfliptool.c:80
+#: ../app/tools/gimpfliptool.c:84
 msgid ""
 "Flip Tool: Reverse the layer, selection or path horizontally or vertically"
 msgstr ""
 "Flip Tool: Reverse the layer, selection or path horizontally or vertically"
 
-#: ../app/tools/gimpfliptool.c:82
+#: ../app/tools/gimpfliptool.c:86
 msgid "_Flip"
 msgstr "_Flip"
 
-#: ../app/tools/gimpfliptool.c:116
-msgctxt "command"
+#: ../app/tools/gimpfliptool.c:186
+msgctxt "undo-type"
+msgid "Flip horizontally"
+msgstr "Flip horizontally"
+
+#: ../app/tools/gimpfliptool.c:189
+msgctxt "undo-type"
+msgid "Flip vertically"
+msgstr "Flip vertically"
+
+#. probably this is not actually reached today, but
+#. * could be if someone defined FLIP_DIAGONAL, say...
+#.
+#: ../app/tools/gimpfliptool.c:195
+msgctxt "undo-desc"
 msgid "Flip"
 msgstr "Flip"
 
@@ -12199,11 +12433,19 @@ msgstr "Flip"
 msgid "Select a single contiguous area"
 msgstr "Select a single contiguous area"
 
-#: ../app/tools/gimpforegroundselectoptions.c:96
+#: ../app/tools/gimpforegroundselectoptions.c:91
+msgid ""
+"Paint over areas to mark color values for inclusion or exclusion from "
+"selection"
+msgstr ""
+"Paint over areas to mark colour values for inclusion or exclusion from "
+"selection"
+
+#: ../app/tools/gimpforegroundselectoptions.c:98
 msgid "Size of the brush used for refinements"
 msgstr "Size of the brush used for refinements"
 
-#: ../app/tools/gimpforegroundselectoptions.c:102
+#: ../app/tools/gimpforegroundselectoptions.c:104
 msgid ""
 "Smaller values give a more accurate selection border but may introduce holes "
 "in the selection"
@@ -12211,114 +12453,118 @@ msgstr ""
 "Smaller values give a more accurate selection border but may introduce holes "
 "in the selection"
 
-#: ../app/tools/gimpforegroundselectoptions.c:121
+#: ../app/tools/gimpforegroundselectoptions.c:112
+msgid "Color of selection preview mask"
+msgstr "Colour of selection preview mask"
+
+#: ../app/tools/gimpforegroundselectoptions.c:124
 msgid "Sensitivity for brightness component"
 msgstr "Sensitivity for brightness component"
 
-#: ../app/tools/gimpforegroundselectoptions.c:127
+#: ../app/tools/gimpforegroundselectoptions.c:130
 msgid "Sensitivity for red/green component"
 msgstr "Sensitivity for red/green component"
 
-#: ../app/tools/gimpforegroundselectoptions.c:133
+#: ../app/tools/gimpforegroundselectoptions.c:136
 msgid "Sensitivity for yellow/blue component"
 msgstr "Sensitivity for yellow/blue component"
 
 #. single / multiple objects
-#: ../app/tools/gimpforegroundselectoptions.c:276
+#: ../app/tools/gimpforegroundselectoptions.c:278
 msgid "Contiguous"
 msgstr "Contiguous"
 
 #. foreground / background
-#: ../app/tools/gimpforegroundselectoptions.c:281
+#: ../app/tools/gimpforegroundselectoptions.c:283
 #, c-format
 msgid "Interactive refinement  (%s)"
 msgstr "Interactive refinement  (%s)"
 
-#: ../app/tools/gimpforegroundselectoptions.c:285
+#: ../app/tools/gimpforegroundselectoptions.c:287
 msgid "Mark background"
 msgstr "Mark background"
 
-#: ../app/tools/gimpforegroundselectoptions.c:286
+#: ../app/tools/gimpforegroundselectoptions.c:288
 msgid "Mark foreground"
 msgstr "Mark foreground"
 
-#: ../app/tools/gimpforegroundselectoptions.c:302
+#: ../app/tools/gimpforegroundselectoptions.c:304
 msgid "Small brush"
 msgstr "Small brush"
 
-#: ../app/tools/gimpforegroundselectoptions.c:310
+#: ../app/tools/gimpforegroundselectoptions.c:312
 msgid "Large brush"
 msgstr "Large brush"
 
-#: ../app/tools/gimpforegroundselectoptions.c:334
+#: ../app/tools/gimpforegroundselectoptions.c:335
 msgid "Smoothing:"
 msgstr "Smoothing:"
 
-#: ../app/tools/gimpforegroundselectoptions.c:340
+#: ../app/tools/gimpforegroundselectoptions.c:341
 msgid "Preview color:"
 msgstr "Preview colour:"
 
 #. granularity
-#: ../app/tools/gimpforegroundselectoptions.c:343
+#: ../app/tools/gimpforegroundselectoptions.c:344
 msgid "Color Sensitivity"
 msgstr "Colour Sensitivity"
 
-#: ../app/tools/gimpforegroundselecttool.c:145
+#: ../app/tools/gimpforegroundselecttool.c:143
 msgid "Foreground Select"
 msgstr "Foreground Select"
 
-#: ../app/tools/gimpforegroundselecttool.c:146
+#: ../app/tools/gimpforegroundselecttool.c:144
 msgid "Foreground Select Tool: Select a region containing foreground objects"
 msgstr "Foreground Select Tool: Select a region containing foreground objects"
 
-#: ../app/tools/gimpforegroundselecttool.c:147
+#: ../app/tools/gimpforegroundselecttool.c:145
 msgid "F_oreground Select"
 msgstr "F_oreground Select"
 
-#: ../app/tools/gimpforegroundselecttool.c:314
+#: ../app/tools/gimpforegroundselecttool.c:301
 msgid "Add more strokes or press Enter to accept the selection"
 msgstr "Add more strokes or press Enter to accept the selection"
 
-#: ../app/tools/gimpforegroundselecttool.c:316
+#: ../app/tools/gimpforegroundselecttool.c:303
 msgid "Mark foreground by painting on the object to extract"
 msgstr "Mark foreground by painting on the object to extract"
 
-#: ../app/tools/gimpforegroundselecttool.c:327
+#: ../app/tools/gimpforegroundselecttool.c:308
 msgid "Roughly outline the object to extract"
 msgstr "Roughly outline the object to extract"
 
-#: ../app/tools/gimpforegroundselecttool.c:779
+#: ../app/tools/gimpforegroundselecttool.c:750
 msgctxt "command"
 msgid "Foreground Select"
 msgstr "Foreground Select"
 
-#: ../app/tools/gimpfreeselecttool.c:200
+#: ../app/tools/gimpfreeselecttool.c:196
 msgid ""
 "Free Select Tool: Select a hand-drawn region with free and polygonal segments"
 msgstr ""
 "Free Select Tool: Select a hand-drawn region with free and polygonal segments"
 
-#: ../app/tools/gimpfreeselecttool.c:201
+#: ../app/tools/gimpfreeselecttool.c:197
 msgid "_Free Select"
 msgstr "_Free Select"
 
-#: ../app/tools/gimpfreeselecttool.c:1120
+#: ../app/tools/gimpfreeselecttool.c:1030
 msgid "Click to complete selection"
 msgstr "Click to complete selection"
 
-#: ../app/tools/gimpfreeselecttool.c:1124
+#: ../app/tools/gimpfreeselecttool.c:1034
 msgid "Click-Drag to move segment vertex"
 msgstr "Click-Drag to move segment vertex"
 
-#: ../app/tools/gimpfreeselecttool.c:1129
+#: ../app/tools/gimpfreeselecttool.c:1039
 msgid "Return commits, Escape cancels, Backspace removes last segment"
 msgstr "Return commits, Escape cancels, Backspace removes last segment"
 
-#: ../app/tools/gimpfreeselecttool.c:1133
+#: ../app/tools/gimpfreeselecttool.c:1043
 msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
 msgstr "Click-Drag adds a free segment, Click adds a polygonal segment"
 
-#: ../app/tools/gimpfreeselecttool.c:1633
+#: ../app/tools/gimpfreeselecttool.c:1560
 msgctxt "command"
 msgid "Free Select"
 msgstr "Free Select"
@@ -12356,16 +12602,16 @@ msgstr "_GEGL Operation..."
 msgid "GEGL operations do not operate on indexed layers."
 msgstr "GEGL operations do not operate on indexed layers."
 
-#: ../app/tools/gimpgegltool.c:371
+#: ../app/tools/gimpgegltool.c:377
 msgid "_Operation:"
 msgstr "_Operation:"
 
 #. The options vbox
-#: ../app/tools/gimpgegltool.c:430
+#: ../app/tools/gimpgegltool.c:436
 msgid "Operation Settings"
 msgstr "Operation Settings"
 
-#: ../app/tools/gimpgegltool.c:435
+#: ../app/tools/gimpgegltool.c:441
 msgid "Select an operation from the list above"
 msgstr "Select an operation from the list above"
 
@@ -12418,102 +12664,100 @@ msgstr "Export Hue-Saturation Settings"
 msgid "Hue-Saturation operates only on RGB color layers."
 msgstr "Hue-Saturation operates only on RGB colour layers."
 
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/tools/gimphuesaturationtool.c:247
 msgid "M_aster"
 msgstr "M_aster"
 
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/tools/gimphuesaturationtool.c:247
 msgid "Adjust all colors"
 msgstr "Adjust all colours"
 
-#: ../app/tools/gimphuesaturationtool.c:249
+#: ../app/tools/gimphuesaturationtool.c:248
 msgid "_R"
 msgstr "_R"
 
-#: ../app/tools/gimphuesaturationtool.c:250
+#: ../app/tools/gimphuesaturationtool.c:249
 msgid "_Y"
 msgstr "_Y"
 
-#: ../app/tools/gimphuesaturationtool.c:251
+#: ../app/tools/gimphuesaturationtool.c:250
 msgid "_G"
 msgstr "_G"
 
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "_C"
 msgstr "_C"
 
-#: ../app/tools/gimphuesaturationtool.c:253
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "_B"
 msgstr "_B"
 
-#: ../app/tools/gimphuesaturationtool.c:254
+#: ../app/tools/gimphuesaturationtool.c:253
 msgid "_M"
 msgstr "_M"
 
-#: ../app/tools/gimphuesaturationtool.c:259
+#: ../app/tools/gimphuesaturationtool.c:258
 msgid "Select Primary Color to Adjust"
 msgstr "Select Primary Colour to Adjust"
 
-#: ../app/tools/gimphuesaturationtool.c:349
+#: ../app/tools/gimphuesaturationtool.c:348
 msgid "_Overlap:"
 msgstr "_Overlap:"
 
-#: ../app/tools/gimphuesaturationtool.c:368
+#: ../app/tools/gimphuesaturationtool.c:364
 msgid "Adjust Selected Color"
 msgstr "Adjust Selected Colour"
 
-#: ../app/tools/gimphuesaturationtool.c:444
+#: ../app/tools/gimphuesaturationtool.c:431
 msgid "R_eset Color"
 msgstr "R_eset Colour"
 
-#: ../app/tools/gimpimagemaptool-settings.c:80
+#: ../app/tools/gimpimagemaptool-settings.c:81
 msgid "Pre_sets:"
 msgstr "Pre_sets:"
 
-#: ../app/tools/gimpimagemaptool-settings.c:222
+#: ../app/tools/gimpimagemaptool-settings.c:223
 #, c-format
 msgid "Settings saved to '%s'"
 msgstr "Settings saved to '%s'"
 
-#: ../app/tools/gimpimagemaptool.c:367
+#: ../app/tools/gimpimagemaptool.c:366
 msgid "_Preview"
 msgstr "_Preview"
 
 #. adjust sliders
-#: ../app/tools/gimpinkoptions-gui.c:55
+#: ../app/tools/gimpinkoptions-gui.c:54
 msgid "Adjustment"
 msgstr "Adjustment"
 
-#: ../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 "Size:"
+#: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87
+#: ../app/tools/gimppaintoptions-gui.c:134
+msgid "Size"
+msgstr "Size"
 
-#: ../app/tools/gimpinkoptions-gui.c:75 ../app/tools/gimpmeasuretool.c:1047
-#: ../app/tools/gimppaintoptions-gui.c:139
-#: ../app/widgets/gimpbrusheditor.c:207
-msgid "Angle:"
-msgstr "Angle:"
+#: ../app/tools/gimpinkoptions-gui.c:71
+#: ../app/tools/gimppaintoptions-gui.c:183
+#: ../app/widgets/gimpbrusheditor.c:199
+msgid "Angle"
+msgstr "Angle"
 
 #. sens sliders
-#: ../app/tools/gimpinkoptions-gui.c:80
+#: ../app/tools/gimpinkoptions-gui.c:77
 msgid "Sensitivity"
 msgstr "Sensitivity"
 
-#: ../app/tools/gimpinkoptions-gui.c:99
-msgid "Tilt:"
-msgstr "Tilt:"
-
-#: ../app/tools/gimpinkoptions-gui.c:106
-msgid "Speed:"
-msgstr "Speed:"
+#: ../app/tools/gimpinkoptions-gui.c:94
+#: ../app/widgets/gimpdynamicseditor.c:144
+#: ../app/widgets/gimpdynamicsoutputeditor.c:71
+msgid "Tilt"
+msgstr "Tilt"
 
-#: ../app/tools/gimpinkoptions-gui.c:117
-msgid "Type"
-msgstr "Type"
+#: ../app/tools/gimpinkoptions-gui.c:101
+msgid "Speed"
+msgstr "Speed"
 
-#. Blob shape widget
-#: ../app/tools/gimpinkoptions-gui.c:148
+#. Blob shape widgets
+#: ../app/tools/gimpinkoptions-gui.c:107
 msgid "Shape"
 msgstr "Shape"
 
@@ -12525,48 +12769,52 @@ msgstr "Ink Tool: Calligraphy-style painting"
 msgid "In_k"
 msgstr "In_k"
 
-#: ../app/tools/gimpiscissorsoptions.c:125
+#: ../app/tools/gimpiscissorsoptions.c:68
+msgid "Display future selection segment as you drag a control node"
+msgstr "Display future selection segment as you drag a control node"
+
+#: ../app/tools/gimpiscissorsoptions.c:127
 msgid "Interactive boundary"
 msgstr "Interactive boundary"
 
-#: ../app/tools/gimpiscissorstool.c:279
+#: ../app/tools/gimpiscissorstool.c:275
 msgid "Scissors"
 msgstr "Scissors"
 
-#: ../app/tools/gimpiscissorstool.c:280
+#: ../app/tools/gimpiscissorstool.c:276
 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting"
 msgstr "Scissors Select Tool: Select shapes using intelligent edge-fitting"
 
-#: ../app/tools/gimpiscissorstool.c:281
+#: ../app/tools/gimpiscissorstool.c:277
 msgid "Intelligent _Scissors"
 msgstr "Intelligent _Scissors"
 
-#: ../app/tools/gimpiscissorstool.c:931 ../app/tools/gimpmeasuretool.c:608
+#: ../app/tools/gimpiscissorstool.c:900 ../app/tools/gimpmeasuretool.c:600
 msgid "Click-Drag to move this point"
 msgstr "Click-Drag to move this point"
 
-#: ../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 "%s: disable auto-snap"
 
-#: ../app/tools/gimpiscissorstool.c:949
+#: ../app/tools/gimpiscissorstool.c:919
 msgid "Click to close the curve"
 msgstr "Click to close the curve"
 
-#: ../app/tools/gimpiscissorstool.c:955
+#: ../app/tools/gimpiscissorstool.c:925
 msgid "Click to add a point on this segment"
 msgstr "Click to add a point on this segment"
 
-#: ../app/tools/gimpiscissorstool.c:969
+#: ../app/tools/gimpiscissorstool.c:939
 msgid "Click or press Enter to convert to a selection"
 msgstr "Click or press Enter to convert to a selection"
 
-#: ../app/tools/gimpiscissorstool.c:979
+#: ../app/tools/gimpiscissorstool.c:949
 msgid "Press Enter to convert to a selection"
 msgstr "Press Enter to convert to a selection"
 
-#: ../app/tools/gimpiscissorstool.c:994
+#: ../app/tools/gimpiscissorstool.c:964
 msgid "Click or Click-Drag to add a point"
 msgstr "Click or Click-Drag to add a point"
 
@@ -12637,84 +12885,103 @@ msgstr "Edit these Settings as Curves"
 msgid "Use _old levels file format"
 msgstr "Use _old levels file format"
 
-#: ../app/tools/gimpmagnifyoptions.c:166
+#: ../app/tools/gimpmagnifyoptions.c:79
+msgid "Resize image window to accomodate new zoom level"
+msgstr "Resize image window to accommodate new zoom level"
+
+#: ../app/tools/gimpmagnifyoptions.c:86
+msgid "Direction of magnification"
+msgstr "Direction of magnification"
+
+#: ../app/tools/gimpmagnifyoptions.c:169
 msgid "Auto-resize window"
 msgstr "Auto-resize window"
 
 #. tool toggle
-#: ../app/tools/gimpmagnifyoptions.c:171 ../app/tools/gimpmoveoptions.c:187
+#: ../app/tools/gimpmagnifyoptions.c:174
 #, c-format
-msgid "Tool Toggle  (%s)"
-msgstr "Tool Toggle  (%s)"
+msgid "Direction  (%s)"
+msgstr "Direction  (%s)"
 
-#: ../app/tools/gimpmagnifytool.c:87
+#: ../app/tools/gimpmagnifytool.c:90
 msgid "Zoom"
 msgstr "Zoom"
 
-#: ../app/tools/gimpmagnifytool.c:88
+#: ../app/tools/gimpmagnifytool.c:91
 msgid "Zoom Tool: Adjust the zoom level"
 msgstr "Zoom Tool: Adjust the zoom level"
 
-#: ../app/tools/gimpmagnifytool.c:89
+#: ../app/tools/gimpmagnifytool.c:92
 msgctxt "tool"
 msgid "_Zoom"
 msgstr "_Zoom"
 
-#: ../app/tools/gimpmeasureoptions.c:123
+#: ../app/tools/gimpmeasureoptions.c:67
+msgid "Open a floating dialog to view details about measurements"
+msgstr "Open a floating dialogue to view details about measurements"
+
+#: ../app/tools/gimpmeasureoptions.c:125
 msgid "Use info window"
 msgstr "Use info window"
 
-#: ../app/tools/gimpmeasuretool.c:125
+#: ../app/tools/gimpmeasuretool.c:127
 msgid "Measure"
 msgstr "Measure"
 
-#: ../app/tools/gimpmeasuretool.c:126
+#: ../app/tools/gimpmeasuretool.c:128
 msgid "Measure Tool: Measure distances and angles"
 msgstr "Measure Tool: Measure distances and angles"
 
-#: ../app/tools/gimpmeasuretool.c:127
+#: ../app/tools/gimpmeasuretool.c:129
 msgid "_Measure"
 msgstr "_Measure"
 
-#: ../app/tools/gimpmeasuretool.c:247
+#: ../app/tools/gimpmeasuretool.c:245
 msgid "Add Guides"
 msgstr "Add Guides"
 
-#: ../app/tools/gimpmeasuretool.c:559
+#: ../app/tools/gimpmeasuretool.c:311
+msgid "Drag to create a line"
+msgstr "Drag to create a line"
+
+#: ../app/tools/gimpmeasuretool.c:555
 msgid "Click to place vertical and horizontal guides"
 msgstr "Click to place vertical and horizontal guides"
 
-#: ../app/tools/gimpmeasuretool.c:568
+#: ../app/tools/gimpmeasuretool.c:563
 msgid "Click to place a horizontal guide"
 msgstr "Click to place a horizontal guide"
 
-#: ../app/tools/gimpmeasuretool.c:583
+#: ../app/tools/gimpmeasuretool.c:577
 msgid "Click to place a vertical guide"
 msgstr "Click to place a vertical guide"
 
-#: ../app/tools/gimpmeasuretool.c:597
+#: ../app/tools/gimpmeasuretool.c:590
 msgid "Click-Drag to add a new point"
 msgstr "Click-Drag to add a new point"
 
-#: ../app/tools/gimpmeasuretool.c:628
+#: ../app/tools/gimpmeasuretool.c:619
 msgid "Click-Drag to move all points"
 msgstr "Click-Drag to move all points"
 
-#: ../app/tools/gimpmeasuretool.c:885 ../app/tools/gimpmeasuretool.c:1030
-#: ../app/tools/gimpmeasuretool.c:1086 ../app/tools/gimpmeasuretool.c:1114
-#: ../app/tools/gimppainttool.c:649
+#: ../app/tools/gimpmeasuretool.c:932 ../app/tools/gimpmeasuretool.c:1077
+#: ../app/tools/gimpmeasuretool.c:1133 ../app/tools/gimpmeasuretool.c:1161
+#: ../app/tools/gimppainttool.c:627
 msgid "pixels"
 msgstr "pixels"
 
-#. tool->display->shell
-#: ../app/tools/gimpmeasuretool.c:998
+#: ../app/tools/gimpmeasuretool.c:1045
 msgid "Measure Distances and Angles"
 msgstr "Measure Distances and Angles"
 
-#: ../app/tools/gimpmeasuretool.c:1019
+#: ../app/tools/gimpmeasuretool.c:1066
 msgid "Distance:"
 msgstr "Distance:"
 
+#: ../app/tools/gimpmeasuretool.c:1094
+msgid "Angle:"
+msgstr "Angle:"
+
 #: ../app/tools/gimpmoveoptions.c:139
 msgid "Pick a layer or guide"
 msgstr "Pick a layer or guide"
@@ -12739,32 +13006,38 @@ msgstr "Move the active path"
 msgid "Move:"
 msgstr "Move:"
 
-#: ../app/tools/gimpmovetool.c:128
+#. tool toggle
+#: ../app/tools/gimpmoveoptions.c:187
+#, c-format
+msgid "Tool Toggle  (%s)"
+msgstr "Tool Toggle  (%s)"
+
+#: ../app/tools/gimpmovetool.c:126
 msgctxt "tool"
 msgid "Move"
 msgstr "Move"
 
-#: ../app/tools/gimpmovetool.c:129
+#: ../app/tools/gimpmovetool.c:127
 msgid "Move Tool: Move layers, selections, and other objects"
 msgstr "Move Tool: Move layers, selections and other objects"
 
-#: ../app/tools/gimpmovetool.c:130
+#: ../app/tools/gimpmovetool.c:128
 msgid "_Move"
 msgstr "_Move"
 
-#: ../app/tools/gimpmovetool.c:247 ../app/tools/gimpmovetool.c:538
+#: ../app/tools/gimpmovetool.c:246 ../app/tools/gimpmovetool.c:551
 msgid "Move Guide: "
 msgstr "Move Guide: "
 
-#: ../app/tools/gimpmovetool.c:532
+#: ../app/tools/gimpmovetool.c:545
 msgid "Remove Guide"
 msgstr "Remove Guide"
 
-#: ../app/tools/gimpmovetool.c:532
+#: ../app/tools/gimpmovetool.c:545
 msgid "Cancel Guide"
 msgstr "Cancel Guide"
 
-#: ../app/tools/gimpmovetool.c:538
+#: ../app/tools/gimpmovetool.c:551
 msgid "Add Guide: "
 msgstr "Add Guide: "
 
@@ -12776,83 +13049,95 @@ msgstr "Paintbrush Tool: Paint smooth strokes using a brush"
 msgid "_Paintbrush"
 msgstr "_Paintbrush"
 
-#: ../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:212
+#: ../app/widgets/gimpbrushselect.c:185 ../app/widgets/gimplayertreeview.c:267
 msgid "Mode:"
 msgstr "Mode:"
 
-#: ../app/tools/gimppaintoptions-gui.c:105
-#: ../app/tools/gimptransformoptions.c:347
-#: ../app/widgets/gimpbrushselect.c:180 ../app/widgets/gimplayertreeview.c:289
-msgid "Opacity:"
-msgstr "Opacity:"
+#: ../app/tools/gimppaintoptions-gui.c:123
+msgid "Brush"
+msgstr "Brush"
 
-#: ../app/tools/gimppaintoptions-gui.c:118
-msgid "Brush:"
-msgstr "Brush:"
+#: ../app/tools/gimppaintoptions-gui.c:152
+msgid "Reset size to brush's native size"
+msgstr "Reset size to brush's native size"
 
-#: ../app/tools/gimppaintoptions-gui.c:123
-msgid "Scale:"
-msgstr "Scale:"
+#: ../app/tools/gimppaintoptions-gui.c:159
+msgid "Aspect Ratio"
+msgstr "Aspect Ratio"
 
-#. Label for a slider that affects
-#. aspect ratio for brushes
-#: ../app/tools/gimppaintoptions-gui.c:132
-msgid "Aspect:"
-msgstr "Aspect:"
+#: ../app/tools/gimppaintoptions-gui.c:176
+msgid "Reset aspect ratio to brush's native"
+msgstr "Reset aspect ratio to brush's native"
 
-#: ../app/tools/gimppaintoptions-gui.c:164
+#: ../app/tools/gimppaintoptions-gui.c:200
+msgid "Reset angle to zero"
+msgstr "Reset angle to zero"
+
+#: ../app/tools/gimppaintoptions-gui.c:235
 msgid "Incremental"
 msgstr "Incremental"
 
-#: ../app/tools/gimppaintoptions-gui.c:180
+#: ../app/tools/gimppaintoptions-gui.c:251
 msgid "Hard edge"
 msgstr "Hard edge"
 
-#: ../app/tools/gimppaintoptions-gui.c:214
-msgid "Fade out"
-msgstr "Fade out"
+#: ../app/tools/gimppaintoptions-gui.c:280
+msgid "Dynamics Options"
+msgstr "Dynamics Options"
+
+#: ../app/tools/gimppaintoptions-gui.c:286
+msgid "Fade Options"
+msgstr "Fade Options"
 
-#: ../app/tools/gimppaintoptions-gui.c:223
-msgid "Length:"
-msgstr "Length:"
+#: ../app/tools/gimppaintoptions-gui.c:300
+msgid "Fade length"
+msgstr "Fade length"
 
-#: ../app/tools/gimppaintoptions-gui.c:246
-#: ../app/widgets/gimpviewablebox.c:223
+#: ../app/tools/gimppaintoptions-gui.c:327
+#: ../app/widgets/gimpviewablebox.c:310
 msgid "Reverse"
 msgstr "Reverse"
 
-#: ../app/tools/gimppaintoptions-gui.c:266
+#: ../app/tools/gimppaintoptions-gui.c:334
+msgid "Color Options"
+msgstr "Colour Options"
+
+#: ../app/tools/gimppaintoptions-gui.c:360
+msgid "Amount"
+msgstr "Amount"
+
+#: ../app/tools/gimppaintoptions-gui.c:364
 msgid "Apply Jitter"
 msgstr "Apply Jitter"
 
-#: ../app/tools/gimppaintoptions-gui.c:271
-msgid "Amount:"
-msgstr "Amount:"
+#: ../app/tools/gimppaintoptions-gui.c:382
+msgid "Smooth stroke"
+msgstr "Smooth stroke"
 
-#: ../app/tools/gimppaintoptions-gui.c:293
-msgid "Use color from gradient"
-msgstr "Use colour from gradient"
+#: ../app/tools/gimppaintoptions-gui.c:392
+msgid "Weight"
+msgstr "Weight"
 
-#: ../app/tools/gimppainttool.c:143
+#: ../app/tools/gimppainttool.c:138
 msgid "Click to paint"
 msgstr "Click to paint"
 
-#: ../app/tools/gimppainttool.c:144
+#: ../app/tools/gimppainttool.c:139
 msgid "Click to draw the line"
 msgstr "Click to draw the line"
 
-#: ../app/tools/gimppainttool.c:145
+#: ../app/tools/gimppainttool.c:140
 #, c-format
 msgid "%s to pick a color"
 msgstr "%s to pick a colour"
 
-#: ../app/tools/gimppainttool.c:281
+#: ../app/tools/gimppainttool.c:259
 msgid "Cannot paint on layer groups."
 msgstr "Cannot paint on layer groups."
 
-#: ../app/tools/gimppainttool.c:695
+#: ../app/tools/gimppainttool.c:673
 #, c-format
 msgid "%s for a straight line"
 msgstr "%s for a straight line"
@@ -12865,7 +13150,7 @@ msgstr "Pencil Tool: Hard edge painting using a brush"
 msgid "Pe_ncil"
 msgstr "Pe_ncil"
 
-#: ../app/tools/gimpperspectiveclonetool.c:129
+#: ../app/tools/gimpperspectiveclonetool.c:134
 msgid ""
 "Perspective Clone Tool: Clone from an image source after applying a "
 "perspective transformation"
@@ -12873,35 +13158,35 @@ msgstr ""
 "Perspective Clone Tool: Clone from an image source after applying a "
 "perspective transformation"
 
-#: ../app/tools/gimpperspectiveclonetool.c:131
+#: ../app/tools/gimpperspectiveclonetool.c:136
 msgid "_Perspective Clone"
 msgstr "_Perspective Clone"
 
-#: ../app/tools/gimpperspectiveclonetool.c:704
+#: ../app/tools/gimpperspectiveclonetool.c:672
 msgid "Ctrl-Click to set a clone source"
 msgstr "Ctrl-Click to set a clone source"
 
-#: ../app/tools/gimpperspectivetool.c:70
+#: ../app/tools/gimpperspectivetool.c:83
 msgid "Perspective Tool: Change perspective of the layer, selection or path"
 msgstr "Perspective Tool: Change perspective of the layer, selection or path"
 
-#: ../app/tools/gimpperspectivetool.c:72
+#: ../app/tools/gimpperspectivetool.c:85
 msgid "_Perspective"
 msgstr "_Perspective"
 
-#: ../app/tools/gimpperspectivetool.c:99
-msgctxt "command"
-msgid "Perspective"
-msgstr "Perspective"
-
-#: ../app/tools/gimpperspectivetool.c:100
+#: ../app/tools/gimpperspectivetool.c:113
 msgid "Perspective transformation"
 msgstr "Perspective transformation"
 
-#: ../app/tools/gimpperspectivetool.c:115
+#: ../app/tools/gimpperspectivetool.c:131
 msgid "Transformation Matrix"
 msgstr "Transformation Matrix"
 
+#: ../app/tools/gimpperspectivetool.c:256
+msgctxt "undo-type"
+msgid "Perspective"
+msgstr "Perspective"
+
 #: ../app/tools/gimpposterizetool.c:85
 msgid "Posterize Tool: Reduce to a limited set of colors"
 msgstr "Posterise Tool: Reduce to a limited set of colours"
@@ -12918,61 +13203,130 @@ msgstr "Posterise (Reduce Number of Colours)"
 msgid "Posterize does not operate on indexed layers."
 msgstr "Posterise does not operate on indexed layers."
 
-#: ../app/tools/gimpposterizetool.c:230
-msgid "Posterize _levels:"
-msgstr "Posterise _levels:"
+#: ../app/tools/gimpposterizetool.c:229
+msgid "Posterize _levels:"
+msgstr "Posterise _levels:"
+
+#: ../app/tools/gimprectangleoptions.c:104
+msgid "Automatically shrink to the nearest rectangular shape in a layer"
+msgstr "Automatically shrink to the nearest rectangular shape in a layer"
+
+#: ../app/tools/gimprectangleoptions.c:113
+msgid "Use all visible layers when shrinking the selection"
+msgstr "Use all visible layers when shrinking the selection"
+
+#: ../app/tools/gimprectangleoptions.c:122
+#: ../app/tools/gimptransformoptions.c:127
+msgid "Composition guides such as rule of thirds"
+msgstr "Composition guides such as rule of thirds"
+
+#: ../app/tools/gimprectangleoptions.c:131
+msgid "X coordinate of top left corner"
+msgstr "X coordinate of top left corner"
+
+#: ../app/tools/gimprectangleoptions.c:141
+msgid "Y coordinate of top left corner"
+msgstr "Y coordinate of top left corner"
+
+#: ../app/tools/gimprectangleoptions.c:151
+msgid "Width of selection"
+msgstr "Width of selection"
+
+#: ../app/tools/gimprectangleoptions.c:160
+msgid "Height of selection"
+msgstr "Height of selection"
+
+#: ../app/tools/gimprectangleoptions.c:169
+msgid "Unit of top left corner coordinate"
+msgstr "Unit of top left corner coordinate"
+
+#: ../app/tools/gimprectangleoptions.c:178
+msgid "Unit of selection size"
+msgstr "Unit of selection size"
+
+#: ../app/tools/gimprectangleoptions.c:187
+msgid "Enable lock of aspect ratio, width, height or size"
+msgstr "Enable lock of aspect ratio, width, height or size"
+
+#: ../app/tools/gimprectangleoptions.c:196
+msgid "Choose what has to be locked"
+msgstr "Choose what has to be locked"
+
+#: ../app/tools/gimprectangleoptions.c:205
+msgid "Custom fixed width"
+msgstr "Custom fixed width"
+
+#: ../app/tools/gimprectangleoptions.c:214
+msgid "Custom fixed height"
+msgstr "Custom fixed height"
+
+#: ../app/tools/gimprectangleoptions.c:308
+msgid "Unit of fixed width, height or size"
+msgstr "Unit of fixed width, height or size"
 
-#: ../app/tools/gimprectangleoptions.c:111
-msgid "Use all visible layers when shrinking the selection"
-msgstr "Use all visible layers when shrinking the selection"
+#: ../app/tools/gimprectangleoptions.c:317
+msgid "Expand selection from center outwards"
+msgstr "Expand selection from centre outwards"
 
 #. Current, as in what is currently in use.
-#: ../app/tools/gimprectangleoptions.c:728
+#: ../app/tools/gimprectangleoptions.c:761
 msgid "Current"
 msgstr "Current"
 
-#: ../app/tools/gimprectangleoptions.c:806
+#: ../app/tools/gimprectangleoptions.c:839
 msgid "Expand from center"
 msgstr "Expand from centre"
 
-#: ../app/tools/gimprectangleoptions.c:829
+#: ../app/tools/gimprectangleoptions.c:862
 msgid "Fixed:"
 msgstr "Fixed:"
 
-#: ../app/tools/gimprectangleoptions.c:962
+#: ../app/tools/gimprectangleoptions.c:1010
 msgid "Position:"
 msgstr "Position:"
 
-#: ../app/tools/gimprectangleoptions.c:980
+#: ../app/tools/gimprectangleoptions.c:1020 ../app/tools/gimptextoptions.c:526
+msgid "Size:"
+msgstr "Size:"
+
+#: ../app/tools/gimprectangleoptions.c:1028
 msgid "Highlight"
 msgstr "Highlight"
 
 #. Auto Shrink
-#: ../app/tools/gimprectangleoptions.c:990
+#: ../app/tools/gimprectangleoptions.c:1040
 msgid "Auto Shrink"
 msgstr "Auto Shrink"
 
-#: ../app/tools/gimprectangleoptions.c:997
+#: ../app/tools/gimprectangleoptions.c:1050
 msgid "Shrink merged"
 msgstr "Shrink merged"
 
-#: ../app/tools/gimprectangleselectoptions.c:163
+#: ../app/tools/gimprectangleselectoptions.c:83
+msgid "Round corners of selection"
+msgstr "Round corners of selection"
+
+#: ../app/tools/gimprectangleselectoptions.c:89
+msgid "Radius of rounding in pixels"
+msgstr "Radius of rounding in pixels"
+
+#: ../app/tools/gimprectangleselectoptions.c:167
 msgid "Rounded corners"
 msgstr "Rounded corners"
 
-#: ../app/tools/gimprectangleselecttool.c:169
+#: ../app/tools/gimprectangleselecttool.c:168
 msgid "Rectangle Select"
 msgstr "Rectangle Select"
 
-#: ../app/tools/gimprectangleselecttool.c:170
+#: ../app/tools/gimprectangleselecttool.c:169
 msgid "Rectangle Select Tool: Select a rectangular region"
 msgstr "Rectangle Select Tool: Select a rectangular region"
 
-#: ../app/tools/gimprectangleselecttool.c:171
+#: ../app/tools/gimprectangleselecttool.c:170
 msgid "_Rectangle Select"
 msgstr "_Rectangle Select"
 
-#: ../app/tools/gimprectangletool.c:1157 ../app/tools/gimprectangletool.c:2153
+#: ../app/tools/gimprectangletool.c:1144 ../app/tools/gimprectangletool.c:2013
 msgid "Rectangle: "
 msgstr "Rectangle: "
 
@@ -12984,240 +13338,280 @@ msgstr "Allow completely transparent regions to be selected"
 msgid "Base selection on all visible layers"
 msgstr "Base selection on all visible layers"
 
-#: ../app/tools/gimpregionselectoptions.c:201
+#: ../app/tools/gimpregionselectoptions.c:101
+msgid "Selection criterion"
+msgstr "Selection criterion"
+
+#: ../app/tools/gimpregionselectoptions.c:203
 msgid "Select transparent areas"
 msgstr "Select transparent areas"
 
-#: ../app/tools/gimpregionselectoptions.c:226
+#: ../app/tools/gimpregionselectoptions.c:229
 msgid "Select by:"
 msgstr "Select by:"
 
-#: ../app/tools/gimpregionselecttool.c:162
+#: ../app/tools/gimpregionselecttool.c:165
 msgid "Move the mouse to change threshold"
 msgstr "Move the mouse to change threshold"
 
-#: ../app/tools/gimprotatetool.c:90
+#: ../app/tools/gimprotatetool.c:93
 msgid "Rotate"
 msgstr "Rotate"
 
-#: ../app/tools/gimprotatetool.c:91
+#: ../app/tools/gimprotatetool.c:94
 msgid "Rotate Tool: Rotate the layer, selection or path"
 msgstr "Rotate Tool: Rotate the layer, selection or path"
 
-#: ../app/tools/gimprotatetool.c:92
+#: ../app/tools/gimprotatetool.c:95
 msgid "_Rotate"
 msgstr "_Rotate"
 
-#: ../app/tools/gimprotatetool.c:121
-msgctxt "command"
-msgid "Rotate"
-msgstr "Rotate"
-
-#: ../app/tools/gimprotatetool.c:188
+#: ../app/tools/gimprotatetool.c:191
 msgid "_Angle:"
 msgstr "_Angle:"
 
-#: ../app/tools/gimprotatetool.c:204
+#: ../app/tools/gimprotatetool.c:207
 msgid "Center _X:"
 msgstr "Centre _X:"
 
-#: ../app/tools/gimprotatetool.c:213
+#: ../app/tools/gimprotatetool.c:216
 msgid "Center _Y:"
 msgstr "Centre _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 "Rotate by %-3.3g around (%g, %g)"
+
+#: ../app/tools/gimpscaletool.c:89
 msgid "Scale"
 msgstr "Scale"
 
-#: ../app/tools/gimpscaletool.c:78
+#: ../app/tools/gimpscaletool.c:90
 msgid "Scale Tool: Scale the layer, selection or path"
 msgstr "Scale Tool: Scale the layer, selection or path"
 
-#: ../app/tools/gimpscaletool.c:79
+#: ../app/tools/gimpscaletool.c:91
 msgid "_Scale"
 msgstr "_Scale"
 
-#: ../app/tools/gimpscaletool.c:105
-msgctxt "command"
-msgid "Scale"
-msgstr "Scale"
+#: ../app/tools/gimpscaletool.c:338
+#, c-format
+msgctxt "undo-type"
+msgid "Scale to %d x %d"
+msgstr "Scale to %d x %d"
+
+#: ../app/tools/gimpselectionoptions.c:84
+msgid "Enable feathering of selection edges"
+msgstr "Enable feathering of selection edges"
 
-#: ../app/tools/gimpselectionoptions.c:257 ../app/tools/gimptextoptions.c:502
+#: ../app/tools/gimpselectionoptions.c:90
+msgid "Radius of feathering"
+msgstr "Radius of feathering"
+
+#: ../app/tools/gimpselectionoptions.c:259 ../app/tools/gimptextoptions.c:539
 msgid "Antialiasing"
 msgstr "Antialiasing"
 
-#: ../app/tools/gimpselectionoptions.c:272
+#: ../app/tools/gimpselectionoptions.c:276
 msgid "Feather edges"
 msgstr "Feather edges"
 
-#: ../app/tools/gimpselectiontool.c:253
+#: ../app/tools/gimpselectiontool.c:252
 msgid "Click-Drag to replace the current selection"
 msgstr "Click-Drag to replace the current selection"
 
-#: ../app/tools/gimpselectiontool.c:261
+#: ../app/tools/gimpselectiontool.c:260
 msgid "Click-Drag to create a new selection"
 msgstr "Click-Drag to create a new selection"
 
-#: ../app/tools/gimpselectiontool.c:266
+#: ../app/tools/gimpselectiontool.c:265
 msgid "Click-Drag to add to the current selection"
 msgstr "Click-Drag to add to the current selection"
 
-#: ../app/tools/gimpselectiontool.c:275
+#: ../app/tools/gimpselectiontool.c:274
 msgid "Click-Drag to subtract from the current selection"
 msgstr "Click-Drag to subtract from the current selection"
 
-#: ../app/tools/gimpselectiontool.c:284
+#: ../app/tools/gimpselectiontool.c:283
 msgid "Click-Drag to intersect with the current selection"
 msgstr "Click-Drag to intersect with the current selection"
 
-#: ../app/tools/gimpselectiontool.c:294
+#: ../app/tools/gimpselectiontool.c:293
 msgid "Click-Drag to move the selection mask"
 msgstr "Click-Drag to move the selection mask"
 
-#: ../app/tools/gimpselectiontool.c:302
+#: ../app/tools/gimpselectiontool.c:301
 msgid "Click-Drag to move the selected pixels"
 msgstr "Click-Drag to move the selected pixels"
 
-#: ../app/tools/gimpselectiontool.c:306
+#: ../app/tools/gimpselectiontool.c:305
 msgid "Click-Drag to move a copy of the selected pixels"
 msgstr "Click-Drag to move a copy of the selected pixels"
 
-#: ../app/tools/gimpselectiontool.c:310
+#: ../app/tools/gimpselectiontool.c:309
 msgid "Click to anchor the floating selection"
 msgstr "Click to anchor the floating selection"
 
-#: ../app/tools/gimpsheartool.c:81
+#: ../app/tools/gimpsheartool.c:83
 msgid "Shear"
 msgstr "Shear"
 
-#: ../app/tools/gimpsheartool.c:82
+#: ../app/tools/gimpsheartool.c:84
 msgid "Shear Tool: Shear the layer, selection or path"
 msgstr "Shear Tool: Shear the layer, selection or path"
 
-#: ../app/tools/gimpsheartool.c:83
+#: ../app/tools/gimpsheartool.c:85
 msgid "S_hear"
 msgstr "S_hear"
 
-#: ../app/tools/gimpsheartool.c:109
-msgctxt "command"
-msgid "Shear"
-msgstr "Shear"
-
-#: ../app/tools/gimpsheartool.c:133
+#: ../app/tools/gimpsheartool.c:135
 msgid "Shear magnitude _X:"
 msgstr "Shear magnitude _X:"
 
-#: ../app/tools/gimpsheartool.c:143
+#: ../app/tools/gimpsheartool.c:145
 msgid "Shear magnitude _Y:"
 msgstr "Shear magnitude _Y:"
 
-#: ../app/tools/gimpsmudgetool.c:53
+#: ../app/tools/gimpsheartool.c:255
+#, c-format
+msgctxt "undo-type"
+msgid "Shear horizontally by %-3.3g"
+msgstr "Shear horizontally by %-3.3g"
+
+#: ../app/tools/gimpsheartool.c:259
+#, c-format
+msgctxt "undo-type"
+msgid "Shear vertically by %-3.3g"
+msgstr "Shear vertically by %-3.3g"
+
+#. 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 "Shear horizontally by %-3.3g, vertically by %-3.3g"
+
+#: ../app/tools/gimpsmudgetool.c:54
 msgid "Smudge Tool: Smudge selectively using a brush"
 msgstr "Smudge Tool: Smudge selectively using a brush"
 
-#: ../app/tools/gimpsmudgetool.c:54
+#: ../app/tools/gimpsmudgetool.c:55
 msgid "_Smudge"
 msgstr "_Smudge"
 
-#: ../app/tools/gimpsmudgetool.c:73
+#: ../app/tools/gimpsmudgetool.c:74
 msgid "Click to smudge"
 msgstr "Click to smudge"
 
-#: ../app/tools/gimpsmudgetool.c:74
+#: ../app/tools/gimpsmudgetool.c:75
 msgid "Click to smudge the line"
 msgstr "Click to smudge the line"
 
-#: ../app/tools/gimptextoptions.c:137
+#: ../app/tools/gimptextoptions.c:131
+msgid "Font size unit"
+msgstr "Font size unit"
+
+#: ../app/tools/gimptextoptions.c:136
+msgid "Font size"
+msgstr "Font size"
+
+#: ../app/tools/gimptextoptions.c:145
 msgid ""
 "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr ""
 "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 
-#: ../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 "The text language may have an effect on the way the text is rendered."
 
-#: ../app/tools/gimptextoptions.c:161
+#: ../app/tools/gimptextoptions.c:164
+msgid "Text alignment"
+msgstr "Text alignment"
+
+#: ../app/tools/gimptextoptions.c:170
 msgid "Indentation of the first line"
 msgstr "Indentation of the first line"
 
-#: ../app/tools/gimptextoptions.c:167
+#: ../app/tools/gimptextoptions.c:176
 msgid "Adjust line spacing"
 msgstr "Adjust line spacing"
 
-#: ../app/tools/gimptextoptions.c:173
+#: ../app/tools/gimptextoptions.c:182
 msgid "Adjust letter spacing"
 msgstr "Adjust letter spacing"
 
-#: ../app/tools/gimptextoptions.c:179
-msgid "Text box resize mode"
-msgstr "Text box resize mode"
-
-#: ../app/tools/gimptextoptions.c:186
+#: ../app/tools/gimptextoptions.c:188
 msgid ""
-"Use an external editor window for text entry, instead of direct-on-canvas "
-"editing"
+"Whether text flows into rectangular shape or moves into a new line when you "
+"press Enter"
 msgstr ""
-"Use an external editor window for text entry, instead of direct-on-canvas "
-"editing"
+"Whether text flows into rectangular shape or moves into a new line when you "
+"press Enter"
+
+#: ../app/tools/gimptextoptions.c:196
+msgid "Use an external editor window for text entry"
+msgstr "Use an external editor window for text entry"
 
-#: ../app/tools/gimptextoptions.c:482
-msgid "Font:"
-msgstr "Font:"
+#: ../app/tools/gimptextoptions.c:511
+msgid "Font"
+msgstr "Font"
 
-#: ../app/tools/gimptextoptions.c:498
+#: ../app/tools/gimptextoptions.c:535
 msgid "Use editor"
 msgstr "Use editor"
 
-#: ../app/tools/gimptextoptions.c:518
+#: ../app/tools/gimptextoptions.c:555
 msgid "Hinting:"
 msgstr "Hinting:"
 
-#: ../app/tools/gimptextoptions.c:522
+#: ../app/tools/gimptextoptions.c:559
 msgid "Text Color"
 msgstr "Text Colour"
 
-#: ../app/tools/gimptextoptions.c:527
+#: ../app/tools/gimptextoptions.c:564
 msgid "Color:"
 msgstr "Colour:"
 
-#: ../app/tools/gimptextoptions.c:533
+#: ../app/tools/gimptextoptions.c:570
 msgid "Justify:"
 msgstr "Justify:"
 
-#: ../app/tools/gimptextoptions.c:556
+#: ../app/tools/gimptextoptions.c:593
 msgid "Box:"
 msgstr "Box:"
 
-#: ../app/tools/gimptextoptions.c:570
+#: ../app/tools/gimptextoptions.c:607
 msgid "Language:"
 msgstr "Language:"
 
-#: ../app/tools/gimptexttool.c:194
+#: ../app/tools/gimptexttool.c:189
 msgid "Text"
 msgstr "Text"
 
-#: ../app/tools/gimptexttool.c:195
+#: ../app/tools/gimptexttool.c:190
 msgid "Text Tool: Create or edit text layers"
 msgstr "Text Tool: Create or edit text layers"
 
-#: ../app/tools/gimptexttool.c:196
+#: ../app/tools/gimptexttool.c:191
 msgid "Te_xt"
 msgstr "Te_xt"
 
-#: ../app/tools/gimptexttool.c:958
+#: ../app/tools/gimptexttool.c:943
 msgid "Reshape Text Layer"
 msgstr "Reshape Text Layer"
 
-#: ../app/tools/gimptexttool.c:1496 ../app/tools/gimptexttool.c:1499
+#: ../app/tools/gimptexttool.c:1478 ../app/tools/gimptexttool.c:1481
 msgid "Confirm Text Editing"
 msgstr "Confirm Text Editing"
 
-#: ../app/tools/gimptexttool.c:1503
+#: ../app/tools/gimptexttool.c:1485
 msgid "Create _New Layer"
 msgstr "Create _New Layer"
 
-#: ../app/tools/gimptexttool.c:1527
+#: ../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 "
@@ -13231,7 +13625,7 @@ msgstr ""
 "\n"
 "You can edit the layer or create a new text layer from its text attributes."
 
-#: ../app/tools/gimptexttool-editor.c:1158
+#: ../app/tools/gimptexttool-editor.c:1159
 msgid "GIMP Text Editor"
 msgstr "GIMP Text Editor"
 
@@ -13263,56 +13657,94 @@ msgstr "Threshold does not operate on indexed layers."
 msgid "Automatically adjust to optimal binarization threshold"
 msgstr "Automatically adjust to optimal binarisation threshold"
 
-#: ../app/tools/gimptool.c:886
+#: ../app/tools/gimptool.c:949
 msgid "Can't work on an empty image, add a layer first"
 msgstr "Can't work on an empty image, add a layer first"
 
-#: ../app/tools/gimptransformoptions.c:272
+#: ../app/tools/gimptransformoptions.c:99
+msgid "Direction of transformation"
+msgstr "Direction of transformation"
+
+#: ../app/tools/gimptransformoptions.c:105
+msgid "Interpolation method"
+msgstr "Interpolation method"
+
+#: ../app/tools/gimptransformoptions.c:111
+msgid "How to clip"
+msgstr "How to clip"
+
+#: ../app/tools/gimptransformoptions.c:117
+msgid "Show a preview of the transformed image"
+msgstr "Show a preview of the transformed image"
+
+#: ../app/tools/gimptransformoptions.c:122
+msgid "Opacity of the preview image"
+msgstr "Opacity of the preview image"
+
+#: ../app/tools/gimptransformoptions.c:133
+msgid "Size of a grid cell for variable number of composition guides"
+msgstr "Size of a grid cell for variable number of composition guides"
+
+#: ../app/tools/gimptransformoptions.c:138
+msgid "Limit rotation steps to 15 degrees"
+msgstr "Limit rotation steps to 15 degrees"
+
+#: ../app/tools/gimptransformoptions.c:276
 msgid "Transform:"
 msgstr "Transform:"
 
-#: ../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
 msgid "Direction"
 msgstr "Direction"
 
 #. the interpolation menu
-#: ../app/tools/gimptransformoptions.c:286
+#: ../app/tools/gimptransformoptions.c:290
 msgid "Interpolation:"
 msgstr "Interpolation:"
 
+#. the clipping menu
 #: ../app/tools/gimptransformoptions.c:299
 msgid "Clipping:"
 msgstr "Clipping:"
 
+#: ../app/tools/gimptransformoptions.c:309
+msgid "Image opacity"
+msgstr "Image opacity"
+
+#: ../app/tools/gimptransformoptions.c:311
+msgid "Show image preview"
+msgstr "Show image preview"
+
+#. the guides frame
 #: ../app/tools/gimptransformoptions.c:317
-msgid "Preview:"
-msgstr "Preview:"
+msgid "Guides"
+msgstr "Guides"
 
-#: ../app/tools/gimptransformoptions.c:388
+#: ../app/tools/gimptransformoptions.c:345
 #, c-format
 msgid "15 degrees  (%s)"
 msgstr "15 degrees  (%s)"
 
-#: ../app/tools/gimptransformoptions.c:392
+#: ../app/tools/gimptransformoptions.c:349
 #, c-format
 msgid "Keep aspect  (%s)"
 msgstr "Keep aspect  (%s)"
 
-#: ../app/tools/gimptransformtool.c:240
+#: ../app/tools/gimptransformtool.c:211
 msgid "Transforming"
 msgstr "Transforming"
 
-#: ../app/tools/gimptransformtool.c:1165
+#: ../app/tools/gimptransformtool.c:1060
 msgid "There is no layer to transform."
 msgstr "There is no layer to transform."
 
-#: ../app/tools/gimptransformtool.c:1178
+#: ../app/tools/gimptransformtool.c:1073
 msgid "There is no path to transform."
 msgstr "There is no path to transform."
 
-#: ../app/tools/gimptransformtool.c:1179
+#: ../app/tools/gimptransformtool.c:1074
 msgid "The active path's strokes are locked."
 msgstr "The active path's strokes are locked."
 
@@ -13346,347 +13778,287 @@ msgstr ""
 msgid "Selection from Path"
 msgstr "Selection from Path"
 
-#: ../app/tools/gimpvectortool.c:163
+#: ../app/tools/gimpvectortool.c:160
 msgid "Paths Tool: Create and edit paths"
 msgstr "Paths Tool: Create and edit paths"
 
-#: ../app/tools/gimpvectortool.c:164
+#: ../app/tools/gimpvectortool.c:161
 msgid "Pat_hs"
 msgstr "Pat_hs"
 
-#: ../app/tools/gimpvectortool.c:254
+#: ../app/tools/gimpvectortool.c:250
 msgid "The active path is locked."
 msgstr "The active path is locked."
 
-#: ../app/tools/gimpvectortool.c:342
+#: ../app/tools/gimpvectortool.c:340
 msgid "Add Stroke"
 msgstr "Add Stroke"
 
-#: ../app/tools/gimpvectortool.c:366
+#: ../app/tools/gimpvectortool.c:364
 msgid "Add Anchor"
 msgstr "Add Anchor"
 
-#: ../app/tools/gimpvectortool.c:392
+#: ../app/tools/gimpvectortool.c:390
 msgid "Insert Anchor"
 msgstr "Insert Anchor"
 
-#: ../app/tools/gimpvectortool.c:423
+#: ../app/tools/gimpvectortool.c:421
 msgid "Drag Handle"
 msgstr "Drag Handle"
 
-#: ../app/tools/gimpvectortool.c:453
+#: ../app/tools/gimpvectortool.c:452
 msgid "Drag Anchor"
 msgstr "Drag Anchor"
 
-#: ../app/tools/gimpvectortool.c:471
+#: ../app/tools/gimpvectortool.c:470
 msgid "Drag Anchors"
 msgstr "Drag Anchors"
 
-#: ../app/tools/gimpvectortool.c:494
+#: ../app/tools/gimpvectortool.c:493
 msgid "Drag Curve"
 msgstr "Drag Curve"
 
-#: ../app/tools/gimpvectortool.c:523
+#: ../app/tools/gimpvectortool.c:522
 msgid "Connect Strokes"
 msgstr "Connect Strokes"
 
-#: ../app/tools/gimpvectortool.c:555
+#: ../app/tools/gimpvectortool.c:554
 msgid "Drag Path"
 msgstr "Drag Path"
 
-#: ../app/tools/gimpvectortool.c:566
+#: ../app/tools/gimpvectortool.c:565
 msgid "Convert Edge"
 msgstr "Convert Edge"
 
-#: ../app/tools/gimpvectortool.c:597
+#: ../app/tools/gimpvectortool.c:596
 msgid "Delete Anchor"
 msgstr "Delete Anchor"
 
-#: ../app/tools/gimpvectortool.c:620
+#: ../app/tools/gimpvectortool.c:619
 msgid "Delete Segment"
 msgstr "Delete Segment"
 
-#: ../app/tools/gimpvectortool.c:839
+#: ../app/tools/gimpvectortool.c:838
 msgid "Move Anchors"
 msgstr "Move Anchors"
 
-#: ../app/tools/gimpvectortool.c:1199
+#: ../app/tools/gimpvectortool.c:1201
 msgid "Click to pick path to edit"
 msgstr "Click to pick path to edit"
 
-#: ../app/tools/gimpvectortool.c:1203
+#: ../app/tools/gimpvectortool.c:1205
 msgid "Click to create a new path"
 msgstr "Click to create a new path"
 
-#: ../app/tools/gimpvectortool.c:1207
+#: ../app/tools/gimpvectortool.c:1209
 msgid "Click to create a new component of the path"
 msgstr "Click to create a new component of the path"
 
-#: ../app/tools/gimpvectortool.c:1211
+#: ../app/tools/gimpvectortool.c:1213
 msgid "Click or Click-Drag to create a new anchor"
 msgstr "Click or Click-Drag to create a new anchor"
 
-#: ../app/tools/gimpvectortool.c:1221 ../app/tools/gimpvectortool.c:1228
+#: ../app/tools/gimpvectortool.c:1223 ../app/tools/gimpvectortool.c:1230
 msgid "Click-Drag to move the anchor around"
 msgstr "Click-Drag to move the anchor around"
 
-#: ../app/tools/gimpvectortool.c:1232 ../app/tools/gimpvectortool.c:1255
+#: ../app/tools/gimpvectortool.c:1234 ../app/tools/gimpvectortool.c:1257
 msgid "Click-Drag to move the anchors around"
 msgstr "Click-Drag to move the anchors around"
 
-#: ../app/tools/gimpvectortool.c:1238
+#: ../app/tools/gimpvectortool.c:1240
 msgid "Click-Drag to move the handle around"
 msgstr "Click-Drag to move the handle around"
 
-#: ../app/tools/gimpvectortool.c:1245
+#: ../app/tools/gimpvectortool.c:1247
 msgid "Click-Drag to move the handles around symmetrically"
 msgstr "Click-Drag to move the handles around symmetrically"
 
-#: ../app/tools/gimpvectortool.c:1260
+#: ../app/tools/gimpvectortool.c:1262
 msgid "Click-Drag to change the shape of the curve"
 msgstr "Click-Drag to change the shape of the curve"
 
-#: ../app/tools/gimpvectortool.c:1263
+#: ../app/tools/gimpvectortool.c:1265
 #, c-format
 msgid "%s: symmetrical"
 msgstr "%s: symmetrical"
 
-#: ../app/tools/gimpvectortool.c:1268
+#: ../app/tools/gimpvectortool.c:1270
 msgid "Click-Drag to move the component around"
 msgstr "Click-Drag to move the component around"
 
-#: ../app/tools/gimpvectortool.c:1276
+#: ../app/tools/gimpvectortool.c:1278
 msgid "Click-Drag to move the path around"
 msgstr "Click-Drag to move the path around"
 
-#: ../app/tools/gimpvectortool.c:1280
+#: ../app/tools/gimpvectortool.c:1282
 msgid "Click-Drag to insert an anchor on the path"
 msgstr "Click-Drag to insert an anchor on the path"
 
-#: ../app/tools/gimpvectortool.c:1288
+#: ../app/tools/gimpvectortool.c:1290
 msgid "Click to delete this anchor"
 msgstr "Click to delete this anchor"
 
-#: ../app/tools/gimpvectortool.c:1292
+#: ../app/tools/gimpvectortool.c:1294
 msgid "Click to connect this anchor with the selected endpoint"
 msgstr "Click to connect this anchor with the selected endpoint"
 
-#: ../app/tools/gimpvectortool.c:1297
+#: ../app/tools/gimpvectortool.c:1299
 msgid "Click to open up the path"
 msgstr "Click to open up the path"
 
-#: ../app/tools/gimpvectortool.c:1301
+#: ../app/tools/gimpvectortool.c:1303
 msgid "Click to make this node angular"
 msgstr "Click to make this node angular"
 
-#: ../app/tools/gimpvectortool.c:1801
+#: ../app/tools/gimpvectortool.c:1803
 msgid "Delete Anchors"
 msgstr "Delete Anchors"
 
-#: ../app/tools/gimpvectortool.c:1972
+#: ../app/tools/gimpvectortool.c:1974
 msgid "There is no active layer or channel to stroke to"
 msgstr "There is no active layer or channel to stroke to"
 
-#: ../app/tools/tools-enums.c:92
-msgctxt "rectangle-guide"
-msgid "No guides"
-msgstr "No guides"
-
-#: ../app/tools/tools-enums.c:93
-msgctxt "rectangle-guide"
-msgid "Center lines"
-msgstr "Centre lines"
-
-#: ../app/tools/tools-enums.c:94
-msgctxt "rectangle-guide"
-msgid "Rule of thirds"
-msgstr "Rule of thirds"
-
-#: ../app/tools/tools-enums.c:95
-msgctxt "rectangle-guide"
-msgid "Rule of fifths"
-msgstr "Rule of fifths"
-
-#: ../app/tools/tools-enums.c:96
-msgctxt "rectangle-guide"
-msgid "Golden sections"
-msgstr "Golden sections"
-
-#: ../app/tools/tools-enums.c:97
-msgctxt "rectangle-guide"
-msgid "Diagonal lines"
-msgstr "Diagonal lines"
-
-#: ../app/tools/tools-enums.c:187
+#: ../app/tools/tools-enums.c:150
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Aspect ratio"
 msgstr "Aspect ratio"
 
-#: ../app/tools/tools-enums.c:188
+#: ../app/tools/tools-enums.c:151
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Width"
 msgstr "Width"
 
-#: ../app/tools/tools-enums.c:189
+#: ../app/tools/tools-enums.c:152
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Height"
 msgstr "Height"
 
-#: ../app/tools/tools-enums.c:190
+#: ../app/tools/tools-enums.c:153
 msgctxt "rectangle-tool-fixed-rule"
 msgid "Size"
 msgstr "Size"
 
-#: ../app/tools/tools-enums.c:219
+#: ../app/tools/tools-enums.c:182
 msgctxt "rect-select-mode"
 msgid "Free select"
 msgstr "Free select"
 
-#: ../app/tools/tools-enums.c:220
+#: ../app/tools/tools-enums.c:183
 msgctxt "rect-select-mode"
 msgid "Fixed size"
 msgstr "Fixed size"
 
-#: ../app/tools/tools-enums.c:221
+#: ../app/tools/tools-enums.c:184
 msgctxt "rect-select-mode"
 msgid "Fixed aspect ratio"
 msgstr "Fixed aspect ratio"
 
-#: ../app/tools/tools-enums.c:250
+#: ../app/tools/tools-enums.c:213
 msgctxt "transform-type"
 msgid "Layer"
 msgstr "Layer"
 
-#: ../app/tools/tools-enums.c:251
+#: ../app/tools/tools-enums.c:214
 msgctxt "transform-type"
 msgid "Selection"
 msgstr "Selection"
 
-#: ../app/tools/tools-enums.c:252
+#: ../app/tools/tools-enums.c:215
 msgctxt "transform-type"
 msgid "Path"
 msgstr "Path"
 
-#: ../app/tools/tools-enums.c:282
-msgctxt "transform-preview-type"
-msgid "Outline"
-msgstr "Outline"
-
-#: ../app/tools/tools-enums.c:283
-msgctxt "transform-preview-type"
-msgid "Grid"
-msgstr "Grid"
-
-#: ../app/tools/tools-enums.c:284
-msgctxt "transform-preview-type"
-msgid "Image"
-msgstr "Image"
-
-#: ../app/tools/tools-enums.c:285
-msgctxt "transform-preview-type"
-msgid "Image + Grid"
-msgstr "Image + Grid"
-
-#: ../app/tools/tools-enums.c:313
-msgctxt "transform-grid-type"
-msgid "Number of grid lines"
-msgstr "Number of grid lines"
-
-#: ../app/tools/tools-enums.c:314
-msgctxt "transform-grid-type"
-msgid "Grid line spacing"
-msgstr "Grid line spacing"
-
-#: ../app/tools/tools-enums.c:343
+#: ../app/tools/tools-enums.c:244
 msgctxt "vector-mode"
 msgid "Design"
 msgstr "Design"
 
-#: ../app/tools/tools-enums.c:344
+#: ../app/tools/tools-enums.c:245
 msgctxt "vector-mode"
 msgid "Edit"
 msgstr "Edit"
 
-#: ../app/tools/tools-enums.c:345
+#: ../app/tools/tools-enums.c:246
 msgctxt "vector-mode"
 msgid "Move"
 msgstr "Move"
 
-#: ../app/vectors/gimpvectors.c:207
+#: ../app/vectors/gimpvectors.c:208
 msgctxt "undo-type"
 msgid "Rename Path"
 msgstr "Rename Path"
 
-#: ../app/vectors/gimpvectors.c:208
+#: ../app/vectors/gimpvectors.c:209
 msgctxt "undo-type"
 msgid "Move Path"
 msgstr "Move Path"
 
-#: ../app/vectors/gimpvectors.c:209
+#: ../app/vectors/gimpvectors.c:210
 msgctxt "undo-type"
 msgid "Scale Path"
 msgstr "Scale Path"
 
-#: ../app/vectors/gimpvectors.c:210
+#: ../app/vectors/gimpvectors.c:211
 msgctxt "undo-type"
 msgid "Resize Path"
 msgstr "Resize Path"
 
-#: ../app/vectors/gimpvectors.c:211
+#: ../app/vectors/gimpvectors.c:212
 msgctxt "undo-type"
 msgid "Flip Path"
 msgstr "Flip Path"
 
-#: ../app/vectors/gimpvectors.c:212
+#: ../app/vectors/gimpvectors.c:213
 msgctxt "undo-type"
 msgid "Rotate Path"
 msgstr "Rotate Path"
 
-#: ../app/vectors/gimpvectors.c:213
+#: ../app/vectors/gimpvectors.c:214
 msgctxt "undo-type"
 msgid "Transform Path"
 msgstr "Transform Path"
 
-#: ../app/vectors/gimpvectors.c:214
+#: ../app/vectors/gimpvectors.c:215
 msgctxt "undo-type"
 msgid "Stroke Path"
 msgstr "Stroke Path"
 
-#: ../app/vectors/gimpvectors.c:215
+#: ../app/vectors/gimpvectors.c:216
 msgctxt "undo-type"
 msgid "Path to Selection"
 msgstr "Path to Selection"
 
-#: ../app/vectors/gimpvectors.c:216
+#: ../app/vectors/gimpvectors.c:217
 msgctxt "undo-type"
 msgid "Reorder Path"
 msgstr "Reorder Path"
 
-#: ../app/vectors/gimpvectors.c:217
+#: ../app/vectors/gimpvectors.c:218
 msgctxt "undo-type"
 msgid "Raise Path"
 msgstr "Raise Path"
 
-#: ../app/vectors/gimpvectors.c:218
+#: ../app/vectors/gimpvectors.c:219
 msgctxt "undo-type"
 msgid "Raise Path to Top"
 msgstr "Raise Path to Top"
 
-#: ../app/vectors/gimpvectors.c:219
+#: ../app/vectors/gimpvectors.c:220
 msgctxt "undo-type"
 msgid "Lower Path"
 msgstr "Lower Path"
 
-#: ../app/vectors/gimpvectors.c:220
+#: ../app/vectors/gimpvectors.c:221
 msgctxt "undo-type"
 msgid "Lower Path to Bottom"
 msgstr "Lower Path to Bottom"
 
-#: ../app/vectors/gimpvectors.c:221
+#: ../app/vectors/gimpvectors.c:222
 msgid "Path cannot be raised higher."
 msgstr "Path cannot be raised higher."
 
-#: ../app/vectors/gimpvectors.c:222
+#: ../app/vectors/gimpvectors.c:223
 msgid "Path cannot be lowered more."
 msgstr "Path cannot be lowered more."
 
@@ -13733,17 +14105,17 @@ msgstr "No paths found in the buffer"
 msgid "Failed to import paths from '%s': %s"
 msgstr "Failed to import paths from '%s': %s"
 
-#: ../app/widgets/gimpactioneditor.c:66
+#: ../app/widgets/gimpactioneditor.c:69
 msgid "_Search:"
 msgstr "_Search:"
 
-#: ../app/widgets/gimpactiongroup.c:867
+#: ../app/widgets/gimpactiongroup.c:857
 #, 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 "Action"
 
@@ -13785,30 +14157,35 @@ msgstr "Invalid shortcut."
 msgid "Removing shortcut failed."
 msgstr "Removing shortcut failed."
 
-#: ../app/widgets/gimpbrusheditor.c:168
-msgid "Spikes:"
-msgstr "Spikes:"
+#: ../app/widgets/gimpbrusheditor.c:166
+msgid "Spikes"
+msgstr "Spikes"
 
-#: ../app/widgets/gimpbrusheditor.c:181
-msgid "Hardness:"
-msgstr "Hardness:"
+#: ../app/widgets/gimpbrusheditor.c:177
+msgid "Hardness"
+msgstr "Hardness"
 
-#: ../app/widgets/gimpbrusheditor.c:194
-msgid "Aspect ratio:"
-msgstr "Aspect ratio:"
+#: ../app/widgets/gimpbrusheditor.c:188
+msgid "Aspect ratio"
+msgstr "Aspect ratio"
 
-#: ../app/widgets/gimpbrusheditor.c:220
-#: ../app/widgets/gimpbrushfactoryview.c:81
-msgid "Spacing:"
-msgstr "Spacing:"
+#: ../app/widgets/gimpbrusheditor.c:210
+#: ../app/widgets/gimpbrushfactoryview.c:79
+#: ../app/widgets/gimpgrideditor.c:174
+msgid "Spacing"
+msgstr "Spacing"
 
-#: ../app/widgets/gimpbrusheditor.c:223
-#: ../app/widgets/gimpbrushfactoryview.c:84
+#: ../app/widgets/gimpbrusheditor.c:215
+#: ../app/widgets/gimpbrushfactoryview.c:83
 msgid "Percentage of width of brush"
 msgstr "Percentage of width of brush"
 
-#: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257
-#: ../app/widgets/gimpeditor.c:735
+#: ../app/widgets/gimpbrushselect.c:172
+msgid "Opacity:"
+msgstr "Opacity:"
+
+#: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:258
+#: ../app/widgets/gimpeditor.c:748
 msgid "(None)"
 msgstr "(None)"
 
@@ -13816,41 +14193,41 @@ msgstr "(None)"
 msgid "Add the current color to the color history"
 msgstr "Add the current colour to the colour history"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:151
+#: ../app/widgets/gimpcolordisplayeditor.c:154
 msgid "Available Filters"
 msgstr "Available Filters"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:212
+#: ../app/widgets/gimpcolordisplayeditor.c:215
 msgid "Move the selected filter up"
 msgstr "Move the selected filter up"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:221
+#: ../app/widgets/gimpcolordisplayeditor.c:224
 msgid "Move the selected filter down"
 msgstr "Move the selected filter down"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:267
+#: ../app/widgets/gimpcolordisplayeditor.c:270
 msgid "Active Filters"
 msgstr "Active Filters"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:318
+#: ../app/widgets/gimpcolordisplayeditor.c:321
 msgid "Reset the selected filter to default values"
 msgstr "Reset the selected filter to default values"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:492
+#: ../app/widgets/gimpcolordisplayeditor.c:495
 #, c-format
 msgid "Add '%s' to the list of active filters"
 msgstr "Add '%s' to the list of active filters"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:529
+#: ../app/widgets/gimpcolordisplayeditor.c:532
 #, c-format
 msgid "Remove '%s' from the list of active filters"
 msgstr "Remove '%s' from the list of active filters"
 
-#: ../app/widgets/gimpcolordisplayeditor.c:560
+#: ../app/widgets/gimpcolordisplayeditor.c:563
 msgid "No filter selected"
 msgstr "No filter selected"
 
-#: ../app/widgets/gimpcoloreditor.c:259
+#: ../app/widgets/gimpcoloreditor.c:258
 msgid ""
 "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
 "CSS color names."
@@ -13858,67 +14235,67 @@ msgstr ""
 "Hexadecimal colour notation as used in HTML and CSS.  This entry also "
 "accepts CSS colour names."
 
-#: ../app/widgets/gimpcolorframe.c:508
+#: ../app/widgets/gimpcolorframe.c:511
 msgid "Index:"
 msgstr "Index:"
 
-#: ../app/widgets/gimpcolorframe.c:521 ../app/widgets/gimpcolorframe.c:547
+#: ../app/widgets/gimpcolorframe.c:524 ../app/widgets/gimpcolorframe.c:550
 msgid "Red:"
 msgstr "Red:"
 
-#: ../app/widgets/gimpcolorframe.c:522 ../app/widgets/gimpcolorframe.c:548
+#: ../app/widgets/gimpcolorframe.c:525 ../app/widgets/gimpcolorframe.c:551
 msgid "Green:"
 msgstr "Green:"
 
-#: ../app/widgets/gimpcolorframe.c:523 ../app/widgets/gimpcolorframe.c:549
+#: ../app/widgets/gimpcolorframe.c:526 ../app/widgets/gimpcolorframe.c:552
 msgid "Blue:"
 msgstr "Blue:"
 
-#: ../app/widgets/gimpcolorframe.c:536 ../app/widgets/gimpcolorframe.c:569
+#: ../app/widgets/gimpcolorframe.c:539 ../app/widgets/gimpcolorframe.c:572
 msgid "Value:"
 msgstr "Value:"
 
-#: ../app/widgets/gimpcolorframe.c:560
+#: ../app/widgets/gimpcolorframe.c:563
 msgid "Hex:"
 msgstr "Hex:"
 
-#: ../app/widgets/gimpcolorframe.c:567
+#: ../app/widgets/gimpcolorframe.c:570
 msgid "Hue:"
 msgstr "Hue:"
 
-#: ../app/widgets/gimpcolorframe.c:568
+#: ../app/widgets/gimpcolorframe.c:571
 msgid "Sat.:"
 msgstr "Sat.:"
 
-#: ../app/widgets/gimpcolorframe.c:586
+#: ../app/widgets/gimpcolorframe.c:589
 msgid "Cyan:"
 msgstr "Cyan:"
 
-#: ../app/widgets/gimpcolorframe.c:587
+#: ../app/widgets/gimpcolorframe.c:590
 msgid "Magenta:"
 msgstr "Magenta:"
 
-#: ../app/widgets/gimpcolorframe.c:588
+#: ../app/widgets/gimpcolorframe.c:591
 msgid "Yellow:"
 msgstr "Yellow:"
 
-#: ../app/widgets/gimpcolorframe.c:589
+#: ../app/widgets/gimpcolorframe.c:592
 msgid "Black:"
 msgstr "Black:"
 
-#: ../app/widgets/gimpcolorframe.c:609
+#: ../app/widgets/gimpcolorframe.c:612
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: ../app/widgets/gimpcolormapeditor.c:208
+#: ../app/widgets/gimpcolormapeditor.c:199
 msgid "Color index:"
 msgstr "Colour index:"
 
-#: ../app/widgets/gimpcolormapeditor.c:218
+#: ../app/widgets/gimpcolormapeditor.c:209
 msgid "HTML notation:"
 msgstr "HTML notation:"
 
-#: ../app/widgets/gimpcolormapeditor.c:472
+#: ../app/widgets/gimpcolormapeditor.c:465
 msgid "Only indexed images have a colormap."
 msgstr "Only indexed images have a colourmap."
 
@@ -13934,141 +14311,142 @@ msgstr "Smaller Previews"
 msgid "Larger Previews"
 msgstr "Larger Previews"
 
-#: ../app/widgets/gimpcontrollereditor.c:201
+#: ../app/widgets/gimpcontrollereditor.c:198
 msgid "_Dump events from this controller"
 msgstr "_Dump events from this controller"
 
-#: ../app/widgets/gimpcontrollereditor.c:206
+#: ../app/widgets/gimpcontrollereditor.c:203
 msgid "_Enable this controller"
 msgstr "_Enable this controller"
 
-#: ../app/widgets/gimpcontrollereditor.c:227
+#: ../app/widgets/gimpcontrollereditor.c:224
 msgid "Name:"
 msgstr "Name:"
 
-#: ../app/widgets/gimpcontrollereditor.c:233
+#: ../app/widgets/gimpcontrollereditor.c:230
 msgid "State:"
 msgstr "State:"
 
-#: ../app/widgets/gimpcontrollereditor.c:338
+#: ../app/widgets/gimpcontrollereditor.c:335
 msgid "Event"
 msgstr "Event"
 
-#: ../app/widgets/gimpcontrollereditor.c:363
+#: ../app/widgets/gimpcontrollereditor.c:360
 msgid "_Grab event"
 msgstr "_Grab event"
 
-#: ../app/widgets/gimpcontrollereditor.c:372
+#: ../app/widgets/gimpcontrollereditor.c:369
 msgid "Select the next event arriving from the controller"
 msgstr "Select the next event arriving from the controller"
 
-#: ../app/widgets/gimpcontrollereditor.c:530
+#: ../app/widgets/gimpcontrollereditor.c:525
 #, c-format
 msgid "Remove the action assigned to '%s'"
 msgstr "Remove the action assigned to '%s'"
 
-#: ../app/widgets/gimpcontrollereditor.c:535
+#: ../app/widgets/gimpcontrollereditor.c:530
 #, c-format
 msgid "Assign an action to '%s'"
 msgstr "Assign an action to '%s'"
 
-#: ../app/widgets/gimpcontrollereditor.c:656
+#: ../app/widgets/gimpcontrollereditor.c:651
 #, c-format
 msgid "Select Action for Event '%s'"
 msgstr "Select Action for Event '%s'"
 
-#: ../app/widgets/gimpcontrollereditor.c:661
+#: ../app/widgets/gimpcontrollereditor.c:656
 msgid "Select Controller Event Action"
 msgstr "Select Controller Event Action"
 
-#: ../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 "Cursor Up"
 
-#: ../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 "Cursor Down"
 
-#: ../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 "Cursor Left"
 
-#: ../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 "Cursor Right"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:177
+#: ../app/widgets/gimpcontrollerkeyboard.c:175
 msgid "Keyboard"
 msgstr "Keyboard"
 
-#: ../app/widgets/gimpcontrollerkeyboard.c:221
+#: ../app/widgets/gimpcontrollerkeyboard.c:216
 msgid "Keyboard Events"
 msgstr "Keyboard Events"
 
-#: ../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 "Ready"
 
-#: ../app/widgets/gimpcontrollerlist.c:181
+#: ../app/widgets/gimpcontrollerlist.c:182
 msgid "Available Controllers"
 msgstr "Available Controllers"
 
-#: ../app/widgets/gimpcontrollerlist.c:273
+#: ../app/widgets/gimpcontrollerlist.c:274
 msgid "Active Controllers"
 msgstr "Active Controllers"
 
-#: ../app/widgets/gimpcontrollerlist.c:289
+#: ../app/widgets/gimpcontrollerlist.c:290
 msgid "Configure the selected controller"
 msgstr "Configure the selected controller"
 
-#: ../app/widgets/gimpcontrollerlist.c:297
+#: ../app/widgets/gimpcontrollerlist.c:298
 msgid "Move the selected controller up"
 msgstr "Move the selected controller up"
 
-#: ../app/widgets/gimpcontrollerlist.c:305
+#: ../app/widgets/gimpcontrollerlist.c:306
 msgid "Move the selected controller down"
 msgstr "Move the selected controller down"
 
-#: ../app/widgets/gimpcontrollerlist.c:429
+#: ../app/widgets/gimpcontrollerlist.c:424
 #, c-format
 msgid "Add '%s' to the list of active controllers"
 msgstr "Add '%s' to the list of active controllers"
 
-#: ../app/widgets/gimpcontrollerlist.c:480
+#: ../app/widgets/gimpcontrollerlist.c:475
 #, c-format
 msgid "Remove '%s' from the list of active controllers"
 msgstr "Remove '%s' from the list of active controllers"
 
-#: ../app/widgets/gimpcontrollerlist.c:514
+#: ../app/widgets/gimpcontrollerlist.c:509
 msgid ""
 "There can only be one active keyboard controller.\n"
 "\n"
@@ -14078,7 +14456,7 @@ msgstr ""
 "\n"
 "You already have a keyboard controller in your list of active controllers."
 
-#: ../app/widgets/gimpcontrollerlist.c:525
+#: ../app/widgets/gimpcontrollerlist.c:520
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
@@ -14088,24 +14466,34 @@ msgstr ""
 "\n"
 "You already have a wheel controller in your list of active controllers."
 
-#: ../app/widgets/gimpcontrollerlist.c:551
+#: ../app/widgets/gimpcontrollerlist.c:531
+msgid ""
+"There can only be one active mouse controller.\n"
+"\n"
+"You already have a mouse controller in your list of active controllers."
+msgstr ""
+"There can only be one active mouse controller.\n"
+"\n"
+"You already have a mouse controller in your list of active controllers."
+
+#: ../app/widgets/gimpcontrollerlist.c:557
 msgid "Remove Controller?"
 msgstr "Remove Controller?"
 
-#: ../app/widgets/gimpcontrollerlist.c:556
+#: ../app/widgets/gimpcontrollerlist.c:562
 msgid "Disable Controller"
 msgstr "Disable Controller"
 
-#: ../app/widgets/gimpcontrollerlist.c:558
+#: ../app/widgets/gimpcontrollerlist.c:564
 msgid "Remove Controller"
 msgstr "Remove Controller"
 
-#: ../app/widgets/gimpcontrollerlist.c:570
+#: ../app/widgets/gimpcontrollerlist.c:576
 #, c-format
 msgid "Remove Controller '%s'?"
 msgstr "Remove Controller '%s'?"
 
-#: ../app/widgets/gimpcontrollerlist.c:574
+#: ../app/widgets/gimpcontrollerlist.c:580
 msgid ""
 "Removing this controller from the list of active controllers will "
 "permanently delete all event mappings you have configured.\n"
@@ -14119,89 +14507,152 @@ msgstr ""
 "Selecting \"Disable Controller\" will disable the controller without "
 "removing it."
 
-#: ../app/widgets/gimpcontrollerlist.c:626
+#: ../app/widgets/gimpcontrollerlist.c:632
 msgid "Configure Input Controller"
 msgstr "Configure Input Controller"
 
-#: ../app/widgets/gimpcontrollerwheel.c:71
-#: ../app/widgets/gimpcontrollerwheel.c:74
-#: ../app/widgets/gimpcontrollerwheel.c:77
-#: ../app/widgets/gimpcontrollerwheel.c:80
-#: ../app/widgets/gimpcontrollerwheel.c:83
-#: ../app/widgets/gimpcontrollerwheel.c:86
-#: ../app/widgets/gimpcontrollerwheel.c:89
-#: ../app/widgets/gimpcontrollerwheel.c:92
+#: ../app/widgets/gimpcontrollermouse.c:70
+#: ../app/widgets/gimpcontrollermouse.c:73
+#: ../app/widgets/gimpcontrollermouse.c:76
+#: ../app/widgets/gimpcontrollermouse.c:79
+#: ../app/widgets/gimpcontrollermouse.c:82
+#: ../app/widgets/gimpcontrollermouse.c:85
+#: ../app/widgets/gimpcontrollermouse.c:88
+#: ../app/widgets/gimpcontrollermouse.c:91
+msgid "Button 8"
+msgstr "Button 8"
+
+#: ../app/widgets/gimpcontrollermouse.c:95
+#: ../app/widgets/gimpcontrollermouse.c:98
+#: ../app/widgets/gimpcontrollermouse.c:101
+#: ../app/widgets/gimpcontrollermouse.c:104
+#: ../app/widgets/gimpcontrollermouse.c:107
+#: ../app/widgets/gimpcontrollermouse.c:110
+#: ../app/widgets/gimpcontrollermouse.c:113
+#: ../app/widgets/gimpcontrollermouse.c:116
+msgid "Button 9"
+msgstr "Button 9"
+
+#: ../app/widgets/gimpcontrollermouse.c:120
+#: ../app/widgets/gimpcontrollermouse.c:123
+#: ../app/widgets/gimpcontrollermouse.c:126
+#: ../app/widgets/gimpcontrollermouse.c:129
+#: ../app/widgets/gimpcontrollermouse.c:132
+#: ../app/widgets/gimpcontrollermouse.c:135
+#: ../app/widgets/gimpcontrollermouse.c:138
+#: ../app/widgets/gimpcontrollermouse.c:141
+msgid "Button 10"
+msgstr "Button 10"
+
+#: ../app/widgets/gimpcontrollermouse.c:145
+#: ../app/widgets/gimpcontrollermouse.c:148
+#: ../app/widgets/gimpcontrollermouse.c:151
+#: ../app/widgets/gimpcontrollermouse.c:154
+#: ../app/widgets/gimpcontrollermouse.c:157
+#: ../app/widgets/gimpcontrollermouse.c:160
+#: ../app/widgets/gimpcontrollermouse.c:163
+#: ../app/widgets/gimpcontrollermouse.c:166
+msgid "Button 11"
+msgstr "Button 11"
+
+#: ../app/widgets/gimpcontrollermouse.c:170
+#: ../app/widgets/gimpcontrollermouse.c:173
+#: ../app/widgets/gimpcontrollermouse.c:176
+#: ../app/widgets/gimpcontrollermouse.c:179
+#: ../app/widgets/gimpcontrollermouse.c:182
+#: ../app/widgets/gimpcontrollermouse.c:185
+#: ../app/widgets/gimpcontrollermouse.c:188
+#: ../app/widgets/gimpcontrollermouse.c:191
+msgid "Button 12"
+msgstr "Button 12"
+
+#: ../app/widgets/gimpcontrollermouse.c:203
+msgid "Mouse Buttons"
+msgstr "Mouse Buttons"
+
+#: ../app/widgets/gimpcontrollermouse.c:244
+msgid "Mouse Button Events"
+msgstr "Mouse Button Events"
+
+#: ../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 "Scroll Up"
 
-#: ../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 "Scroll Down"
 
-#: ../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 "Scroll Left"
 
-#: ../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 "Scroll Right"
 
-#: ../app/widgets/gimpcontrollerwheel.c:179
+#: ../app/widgets/gimpcontrollerwheel.c:177
 msgid "Mouse Wheel"
 msgstr "Mouse Wheel"
 
-#: ../app/widgets/gimpcontrollerwheel.c:223
+#: ../app/widgets/gimpcontrollerwheel.c:218
 msgid "Mouse Wheel Events"
 msgstr "Mouse Wheel Events"
 
-#: ../app/widgets/gimpdataeditor.c:221
+#: ../app/widgets/gimpdataeditor.c:215
 msgid "Save"
 msgstr "Save"
 
-#: ../app/widgets/gimpdataeditor.c:229
+#: ../app/widgets/gimpdataeditor.c:223
 msgid "Revert"
 msgstr "Revert"
 
-#: ../app/widgets/gimpdataeditor.c:445
+#: ../app/widgets/gimpdataeditor.c:435
 #, c-format
 msgid "%s (read only)"
 msgstr "%s (read only)"
 
-#: ../app/widgets/gimpdeviceeditor.c:161
+#: ../app/widgets/gimpdeviceeditor.c:165
 msgid "Delete the selected device"
 msgstr "Delete the selected device"
 
-#: ../app/widgets/gimpdeviceeditor.c:469
+#: ../app/widgets/gimpdeviceeditor.c:502
 msgid "Delete Device Settings"
 msgstr "Delete Device Settings"
 
-#: ../app/widgets/gimpdeviceeditor.c:490
+#: ../app/widgets/gimpdeviceeditor.c:523
 #, c-format
 msgid "Delete \"%s\"?"
 msgstr "Delete \"%s\"?"
 
-#: ../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."
@@ -14209,67 +14660,67 @@ msgstr ""
 "You are about to delete this device's stored settings.\n"
 "The next time this device is plugged, default settings will be used."
 
-#: ../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
 msgid "Pressure"
 msgstr "Pressure"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:143
+#: ../app/widgets/gimpdeviceinfoeditor.c:141
 msgid "X tilt"
 msgstr "X tilt"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:144
+#: ../app/widgets/gimpdeviceinfoeditor.c:142
 msgid "Y tilt"
 msgstr "Y tilt"
 
-#: ../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
 msgid "Wheel"
 msgstr "Wheel"
 
 #. the axes
-#: ../app/widgets/gimpdeviceinfoeditor.c:192
+#: ../app/widgets/gimpdeviceinfoeditor.c:193
 msgid "Axes"
 msgstr "Axes"
 
 #. the keys
-#: ../app/widgets/gimpdeviceinfoeditor.c:266
+#: ../app/widgets/gimpdeviceinfoeditor.c:267
 msgid "Keys"
 msgstr "Keys"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:366
-#: ../app/widgets/gimpdeviceinfoeditor.c:584
+#: ../app/widgets/gimpdeviceinfoeditor.c:364
+#: ../app/widgets/gimpdeviceinfoeditor.c:580
 #, c-format
 msgid "none"
 msgstr "none"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:414
+#: ../app/widgets/gimpdeviceinfoeditor.c:412
 #, c-format
 msgid "%s Curve"
 msgstr "%s Curve"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:473
-#: ../app/widgets/gimpdynamicsoutputeditor.c:196
+#: ../app/widgets/gimpdeviceinfoeditor.c:471
+#: ../app/widgets/gimpdynamicsoutputeditor.c:195
 msgid "_Reset Curve"
 msgstr "_Reset Curve"
 
-#: ../app/widgets/gimpdeviceinfoeditor.c:486
+#: ../app/widgets/gimpdeviceinfoeditor.c:484
 #, c-format
 msgid "The axis '%s' has no curve"
 msgstr "The axis '%s' has no curve"
 
-#: ../app/widgets/gimpdevicestatus.c:139
+#: ../app/widgets/gimpdevicestatus.c:136
 msgid "Save device status"
 msgstr "Save device status"
 
-#: ../app/widgets/gimpdevicestatus.c:448
+#: ../app/widgets/gimpdevicestatus.c:432
 #, c-format
 msgid "Foreground: %d, %d, %d"
 msgstr "Foreground: %d, %d, %d"
 
-#: ../app/widgets/gimpdevicestatus.c:453
+#: ../app/widgets/gimpdevicestatus.c:437
 #, c-format
 msgid "Background: %d, %d, %d"
 msgstr "Background: %d, %d, %d"
@@ -14317,47 +14768,41 @@ msgctxt "dock"
 msgid " | "
 msgstr " | "
 
-#: ../app/widgets/gimpdockbook.c:290
+#: ../app/widgets/gimpdockbook.c:292
 msgid "Configure this tab"
 msgstr "Configure this tab"
 
 #. Auto button
-#: ../app/widgets/gimpdockwindow.c:353
+#: ../app/widgets/gimpdockwindow.c:382
 msgid "Auto"
 msgstr "Auto"
 
-#: ../app/widgets/gimpdockwindow.c:364
+#: ../app/widgets/gimpdockwindow.c:393
 msgid ""
 "When enabled the dialog automatically follows the image you are working on."
 msgstr ""
 "When enabled the dialogue automatically follows the image you are working on."
 
-#: ../app/widgets/gimpdrawabletreeview.c:124
+#: ../app/widgets/gimpdrawabletreeview.c:122
 msgid "Lock pixels"
 msgstr "Lock pixels"
 
-#: ../app/widgets/gimpdynamicseditor.c:133
-#: ../app/widgets/gimpdynamicseditor.c:139
+#: ../app/widgets/gimpdynamicseditor.c:135
 msgid "Mapping matrix"
 msgstr "Mapping matrix"
 
-#: ../app/widgets/gimpdynamicseditor.c:149
-#: ../app/widgets/gimpdynamicsoutputeditor.c:220
+#: ../app/widgets/gimpdynamicseditor.c:142
+#: ../app/widgets/gimpdynamicsoutputeditor.c:69
 msgid "Velocity"
 msgstr "Velocity"
 
-#: ../app/widgets/gimpdynamicseditor.c:151
-#: ../app/widgets/gimpdynamicsoutputeditor.c:234
-msgid "Tilt"
-msgstr "Tilt"
-
-#: ../app/widgets/gimpdynamicseditor.c:153
-#: ../app/widgets/gimpdynamicsoutputeditor.c:248
+#: ../app/widgets/gimpdynamicseditor.c:146
+#: ../app/widgets/gimpdynamicsoutputeditor.c:73
 msgid "Random"
 msgstr "Random"
 
-#: ../app/widgets/gimpdynamicseditor.c:154
-#: ../app/widgets/gimpdynamicsoutputeditor.c:255
+#: ../app/widgets/gimpdynamicseditor.c:147
+#: ../app/widgets/gimpdynamicsoutputeditor.c:74
 msgid "Fade"
 msgstr "Fade"
 
@@ -14374,159 +14819,150 @@ msgstr "Messages are redirected to stderr."
 msgid "%s Message"
 msgstr "%s Message"
 
-#: ../app/widgets/gimpfiledialog.c:326
+#: ../app/widgets/gimpfiledialog.c:327
 msgid "Automatically Detected"
 msgstr "Automatically Detected"
 
-#: ../app/widgets/gimpfiledialog.c:343
+#: ../app/widgets/gimpfiledialog.c:344
 msgid "By Extension"
 msgstr "By Extension"
 
-#: ../app/widgets/gimpfiledialog.c:799
+#: ../app/widgets/gimpfiledialog.c:790
 msgid "All files"
 msgstr "All files"
 
-#: ../app/widgets/gimpfiledialog.c:804
+#: ../app/widgets/gimpfiledialog.c:795
 msgid "All images"
 msgstr "All images"
 
-#: ../app/widgets/gimpfiledialog.c:980
+#: ../app/widgets/gimpfiledialog.c:971
 #, c-format
 msgid "Select File _Type (%s)"
 msgstr "Select File _Type (%s)"
 
-#: ../app/widgets/gimpfileprocview.c:186
+#: ../app/widgets/gimpfileprocview.c:185
 msgid "File Type"
 msgstr "File Type"
 
-#: ../app/widgets/gimpfileprocview.c:198
+#: ../app/widgets/gimpfileprocview.c:197
 msgid "Extensions"
 msgstr "Extensions"
 
-#: ../app/widgets/gimpfilleditor.c:127
+#: ../app/widgets/gimpfilleditor.c:124
 msgid "Fill Color"
 msgstr "Fill Colour"
 
-#: ../app/widgets/gimpfilleditor.c:145
+#: ../app/widgets/gimpfilleditor.c:143
 msgid "_Antialiasing"
 msgstr "_Antialiasing"
 
-#. Instant update toggle
-#: ../app/widgets/gimpgradienteditor.c:413
-msgid "Instant update"
-msgstr "Instant update"
-
-#: ../app/widgets/gimpgradienteditor.c:775
+#: ../app/widgets/gimpgradienteditor.c:752
 #, c-format
 msgid "Zoom factor: %d:1"
 msgstr "Zoom factor: %d:1"
 
-#: ../app/widgets/gimpgradienteditor.c:778
+#: ../app/widgets/gimpgradienteditor.c:755
 #, c-format
 msgid "Displaying [%0.4f, %0.4f]"
 msgstr "Displaying [%0.4f, %0.4f]"
 
-#: ../app/widgets/gimpgradienteditor.c:997
+#: ../app/widgets/gimpgradienteditor.c:957
 #, c-format
 msgid "Position: %0.4f"
 msgstr "Position: %0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:998
+#: ../app/widgets/gimpgradienteditor.c:958
 #, 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:960
 #, c-format
 msgid "HSV (%0.1f, %0.1f, %0.1f)"
 msgstr "HSV (%0.1f, %0.1f, %0.1f)"
 
-#: ../app/widgets/gimpgradienteditor.c:1002
+#: ../app/widgets/gimpgradienteditor.c:962
 #, c-format
 msgid "Luminance: %0.1f    Opacity: %0.1f"
 msgstr "Luminance: %0.1f    Opacity: %0.1f"
 
-#: ../app/widgets/gimpgradienteditor.c:1033
+#: ../app/widgets/gimpgradienteditor.c:993
 #, c-format
 msgid "RGB (%d, %d, %d)"
 msgstr "RGB (%d, %d, %d)"
 
-#: ../app/widgets/gimpgradienteditor.c:1044
+#: ../app/widgets/gimpgradienteditor.c:1004
 msgid "Foreground color set to:"
 msgstr "Foreground colour set to:"
 
-#: ../app/widgets/gimpgradienteditor.c:1051
+#: ../app/widgets/gimpgradienteditor.c:1011
 msgid "Background color set to:"
 msgstr "Background colour set to:"
 
-#: ../app/widgets/gimpgradienteditor.c:1285
-#: ../app/widgets/gimpgradienteditor.c:1351
+#: ../app/widgets/gimpgradienteditor.c:1239
+#: ../app/widgets/gimpgradienteditor.c:1305
 #, c-format
 msgid "%s%sDrag: move & compress"
 msgstr "%s%sDrag: move & compress"
 
-#: ../app/widgets/gimpgradienteditor.c:1291
+#: ../app/widgets/gimpgradienteditor.c:1245
 msgid "Drag: move"
 msgstr "Drag: move"
 
-#: ../app/widgets/gimpgradienteditor.c:1298
-#: ../app/widgets/gimpgradienteditor.c:1312
-#: ../app/widgets/gimpgradienteditor.c:1326
-#: ../app/widgets/gimpgradienteditor.c:1348
+#: ../app/widgets/gimpgradienteditor.c:1252
+#: ../app/widgets/gimpgradienteditor.c:1266
+#: ../app/widgets/gimpgradienteditor.c:1280
+#: ../app/widgets/gimpgradienteditor.c:1302
 #, c-format
 msgid "%s%sClick: extend selection"
 msgstr "%s%sClick: extend selection"
 
-#: ../app/widgets/gimpgradienteditor.c:1304
-#: ../app/widgets/gimpgradienteditor.c:1318
+#: ../app/widgets/gimpgradienteditor.c:1258
+#: ../app/widgets/gimpgradienteditor.c:1272
 msgid "Click: select"
 msgstr "Click: select"
 
-#: ../app/widgets/gimpgradienteditor.c:1332
-#: ../app/widgets/gimpgradienteditor.c:1356
+#: ../app/widgets/gimpgradienteditor.c:1286
+#: ../app/widgets/gimpgradienteditor.c:1310
 msgid "Click: select    Drag: move"
 msgstr "Click: select    Drag: move"
 
-#: ../app/widgets/gimpgradienteditor.c:1571
-#: ../app/widgets/gimpgradienteditor.c:1579
+#: ../app/widgets/gimpgradienteditor.c:1525
+#: ../app/widgets/gimpgradienteditor.c:1533
 #, c-format
 msgid "Handle position: %0.4f"
 msgstr "Handle position: %0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:1596
+#: ../app/widgets/gimpgradienteditor.c:1550
 #, c-format
 msgid "Distance: %0.4f"
 msgstr "Distance: %0.4f"
 
-#: ../app/widgets/gimpgrideditor.c:216
+#: ../app/widgets/gimpgrideditor.c:147
 msgid "Line _style:"
 msgstr "Line _style:"
 
-#: ../app/widgets/gimpgrideditor.c:220
+#: ../app/widgets/gimpgrideditor.c:151
 msgid "Change grid foreground color"
 msgstr "Change grid foreground colour"
 
-#: ../app/widgets/gimpgrideditor.c:227
+#: ../app/widgets/gimpgrideditor.c:158
 msgid "_Foreground color:"
 msgstr "_Foreground colour:"
 
-#: ../app/widgets/gimpgrideditor.c:231
+#: ../app/widgets/gimpgrideditor.c:162
 msgid "Change grid background color"
 msgstr "Change grid background colour"
 
-#: ../app/widgets/gimpgrideditor.c:238
+#: ../app/widgets/gimpgrideditor.c:169
 msgid "_Background color:"
 msgstr "_Background colour:"
 
-#: ../app/widgets/gimpgrideditor.c:243
-msgid "Spacing"
-msgstr "Spacing"
-
-#: ../app/widgets/gimpgrideditor.c:264 ../app/widgets/gimpgrideditor.c:296
+#: ../app/widgets/gimpgrideditor.c:195 ../app/widgets/gimpgrideditor.c:227
 msgid "Width"
 msgstr "Width"
 
-#: ../app/widgets/gimpgrideditor.c:266 ../app/widgets/gimpgrideditor.c:298
+#: ../app/widgets/gimpgrideditor.c:197 ../app/widgets/gimpgrideditor.c:229
 msgid "Height"
 msgstr "Height"
 
@@ -14623,116 +15059,117 @@ msgstr ""
 msgid "Querying..."
 msgstr "Querying..."
 
-#: ../app/widgets/gimpimagepropview.c:122
+#: ../app/widgets/gimpimagepropview.c:120
 msgid "Size in pixels:"
 msgstr "Size in pixels:"
 
-#: ../app/widgets/gimpimagepropview.c:125
+#: ../app/widgets/gimpimagepropview.c:123
 msgid "Print size:"
 msgstr "Print size:"
 
-#: ../app/widgets/gimpimagepropview.c:128
+#: ../app/widgets/gimpimagepropview.c:126
 msgid "Resolution:"
 msgstr "Resolution:"
 
-#: ../app/widgets/gimpimagepropview.c:131
+#: ../app/widgets/gimpimagepropview.c:129
 msgid "Color space:"
 msgstr "Colour space:"
 
-#: ../app/widgets/gimpimagepropview.c:136
+#: ../app/widgets/gimpimagepropview.c:134
 msgid "File Name:"
 msgstr "File Name:"
 
-#: ../app/widgets/gimpimagepropview.c:142
+#: ../app/widgets/gimpimagepropview.c:140
 msgid "File Size:"
 msgstr "File Size:"
 
-#: ../app/widgets/gimpimagepropview.c:145
+#: ../app/widgets/gimpimagepropview.c:143
 msgid "File Type:"
 msgstr "File Type:"
 
-#: ../app/widgets/gimpimagepropview.c:150
+#: ../app/widgets/gimpimagepropview.c:148
 msgid "Size in memory:"
 msgstr "Size in memory:"
 
-#: ../app/widgets/gimpimagepropview.c:153
+#: ../app/widgets/gimpimagepropview.c:151
 msgid "Undo steps:"
 msgstr "Undo steps:"
 
-#: ../app/widgets/gimpimagepropview.c:156
+#: ../app/widgets/gimpimagepropview.c:154
 msgid "Redo steps:"
 msgstr "Redo steps:"
 
-#: ../app/widgets/gimpimagepropview.c:161
+#: ../app/widgets/gimpimagepropview.c:159
 msgid "Number of pixels:"
 msgstr "Number of pixels:"
 
-#: ../app/widgets/gimpimagepropview.c:164
+#: ../app/widgets/gimpimagepropview.c:162
 msgid "Number of layers:"
 msgstr "Number of layers:"
 
-#: ../app/widgets/gimpimagepropview.c:167
+#: ../app/widgets/gimpimagepropview.c:165
 msgid "Number of channels:"
 msgstr "Number of channels:"
 
-#: ../app/widgets/gimpimagepropview.c:170
+#: ../app/widgets/gimpimagepropview.c:168
 msgid "Number of paths:"
 msgstr "Number of paths:"
 
 #. no undo (or redo) steps available
-#: ../app/widgets/gimpimagepropview.c:416
+#: ../app/widgets/gimpimagepropview.c:408
 msgid "None"
 msgstr "None"
 
-#: ../app/widgets/gimpimagepropview.c:470
+#: ../app/widgets/gimpimagepropview.c:462
+#: ../app/widgets/gimptemplateeditor.c:331
 #, c-format
 msgid "pixels/%s"
 msgstr "pixels/%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 "colours"
 
-#: ../app/widgets/gimpitemtreeview.c:708
+#: ../app/widgets/gimpitemtreeview.c:707
 msgid "Lock:"
 msgstr "Lock:"
 
-#: ../app/widgets/gimpitemtreeview.c:1481
+#: ../app/widgets/gimpitemtreeview.c:1484
 msgid "Set Item Exclusive Visible"
 msgstr "Set Item Exclusive Visible"
 
-#: ../app/widgets/gimpitemtreeview.c:1489
+#: ../app/widgets/gimpitemtreeview.c:1492
 msgid "Set Item Exclusive Linked"
 msgstr "Set Item Exclusive Linked"
 
-#: ../app/widgets/gimplayertreeview.c:309
+#: ../app/widgets/gimplayertreeview.c:306
 msgid "Lock alpha channel"
 msgstr "Lock alpha channel"
 
-#: ../app/widgets/gimpmessagebox.c:439
+#: ../app/widgets/gimpmessagebox.c:434
 #, c-format
 msgid "Message repeated %d times."
 msgstr "Message repeated %d times."
 
-#: ../app/widgets/gimpmessagebox.c:441
+#: ../app/widgets/gimpmessagebox.c:436
 msgid "Message repeated once."
 msgstr "Message repeated once."
 
-#: ../app/widgets/gimppaletteeditor.c:252
-#: ../app/widgets/gimppaletteeditor.c:743
+#: ../app/widgets/gimppaletteeditor.c:226
+#: ../app/widgets/gimppaletteeditor.c:682
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../app/widgets/gimppaletteeditor.c:260
+#: ../app/widgets/gimppaletteeditor.c:234
 msgid "Columns:"
 msgstr "Columns:"
 
-#: ../app/widgets/gimpprofilechooserdialog.c:136
+#: ../app/widgets/gimpprofilechooserdialog.c:127
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC colour profile (*.icc, *.icm)"
 
@@ -14755,89 +15192,89 @@ msgstr ""
 msgid "Invalid UTF-8"
 msgstr "Invalid UTF-8"
 
-#: ../app/widgets/gimpsettingsbox.c:241
+#: ../app/widgets/gimpsettingsbox.c:269
 msgid "Pick a setting from the list"
 msgstr "Pick a setting from the list"
 
-#: ../app/widgets/gimpsettingsbox.c:262
+#: ../app/widgets/gimpsettingsbox.c:290
 msgid "Add settings to favorites"
 msgstr "Add settings to favourites"
 
-#: ../app/widgets/gimpsettingsbox.c:290
+#: ../app/widgets/gimpsettingsbox.c:318
 msgid "_Import Settings from File..."
 msgstr "_Import Settings from File..."
 
-#: ../app/widgets/gimpsettingsbox.c:296
+#: ../app/widgets/gimpsettingsbox.c:324
 msgid "_Export Settings to File..."
 msgstr "_Export Settings to File..."
 
-#: ../app/widgets/gimpsettingsbox.c:303
+#: ../app/widgets/gimpsettingsbox.c:331
 msgid "_Manage Settings..."
 msgstr "_Manage Settings..."
 
-#: ../app/widgets/gimpsettingsbox.c:590
+#: ../app/widgets/gimpsettingsbox.c:624
 msgid "Add Settings to Favorites"
 msgstr "Add Settings to Favourites"
 
-#: ../app/widgets/gimpsettingsbox.c:593
+#: ../app/widgets/gimpsettingsbox.c:627
 msgid "Enter a name for the settings"
 msgstr "Enter a name for the settings"
 
-#: ../app/widgets/gimpsettingsbox.c:594
+#: ../app/widgets/gimpsettingsbox.c:628
 msgid "Saved Settings"
 msgstr "Saved Settings"
 
-#: ../app/widgets/gimpsettingsbox.c:630
+#: ../app/widgets/gimpsettingsbox.c:669
 msgid "Manage Saved Settings"
 msgstr "Manage Saved Settings"
 
-#: ../app/widgets/gimpsettingseditor.c:174
+#: ../app/widgets/gimpsettingseditor.c:194
 msgid "Import settings from a file"
 msgstr "Import settings from a file"
 
-#: ../app/widgets/gimpsettingseditor.c:183
+#: ../app/widgets/gimpsettingseditor.c:203
 msgid "Export the selected settings to a file"
 msgstr "Export the selected settings to a file"
 
-#: ../app/widgets/gimpsettingseditor.c:192
+#: ../app/widgets/gimpsettingseditor.c:212
 msgid "Delete the selected settings"
 msgstr "Delete the selected settings"
 
-#: ../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 "Line width:"
 
-#: ../app/widgets/gimpstrokeeditor.c:199
+#: ../app/widgets/gimpstrokeeditor.c:141
 msgid "_Line Style"
 msgstr "_Line Style"
 
-#: ../app/widgets/gimpstrokeeditor.c:218
+#: ../app/widgets/gimpstrokeeditor.c:160
 msgid "_Cap style:"
 msgstr "_Cap style:"
 
-#: ../app/widgets/gimpstrokeeditor.c:224
+#: ../app/widgets/gimpstrokeeditor.c:166
 msgid "_Join style:"
 msgstr "_Join style:"
 
-#: ../app/widgets/gimpstrokeeditor.c:229
+#: ../app/widgets/gimpstrokeeditor.c:171
 msgid "_Miter limit:"
 msgstr "_Mitre limit:"
 
-#: ../app/widgets/gimpstrokeeditor.c:236
+#: ../app/widgets/gimpstrokeeditor.c:178
 msgid "Dash pattern:"
 msgstr "Dash pattern:"
 
-#: ../app/widgets/gimpstrokeeditor.c:299
+#: ../app/widgets/gimpstrokeeditor.c:241
 msgid "Dash _preset:"
 msgstr "Dash _preset:"
 
@@ -14853,45 +15290,45 @@ msgstr "enter tags"
 #. * IMPORTANT: use only one of Unicode terminal punctuation chars.
 #. * http://unicode.org/review/pr-23.html
 #.
-#: ../app/widgets/gimptagentry.c:1716
+#: ../app/widgets/gimptagentry.c:1707
 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 "_Advanced Options"
 
-#: ../app/widgets/gimptemplateeditor.c:361
+#: ../app/widgets/gimptemplateeditor.c:387
 msgid "Color _space:"
 msgstr "Colour _space:"
 
-#: ../app/widgets/gimptemplateeditor.c:369
+#: ../app/widgets/gimptemplateeditor.c:395
 msgid "_Fill with:"
 msgstr "_Fill with:"
 
-#: ../app/widgets/gimptemplateeditor.c:379
+#: ../app/widgets/gimptemplateeditor.c:405
 msgid "Comme_nt:"
 msgstr "Comme_nt:"
 
-#: ../app/widgets/gimptemplateeditor.c:529
+#: ../app/widgets/gimptemplateeditor.c:512
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../app/widgets/gimptemplateeditor.c:542
+#: ../app/widgets/gimptemplateeditor.c:519
 msgid "_Icon:"
 msgstr "_Icon:"
 
-#: ../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"
@@ -14906,35 +15343,56 @@ msgstr "Attribute \"%s\" is invalid on <%s> element in this context"
 msgid "Outermost element in text must be <markup> not <%s>"
 msgstr "Outermost element in text must be <markup> not <%s>"
 
-#: ../app/widgets/gimptextbuffer.c:1462
+#: ../app/widgets/gimptextbuffer.c:1454
 #, c-format
 msgid "Invalid UTF-8 data in file '%s'."
 msgstr "Invalid UTF-8 data in file '%s'."
 
-#: ../app/widgets/gimptexteditor.c:205
+#: ../app/widgets/gimptexteditor.c:222
 msgid "_Use selected font"
 msgstr "_Use selected font"
 
-#: ../app/widgets/gimptextstyleeditor.c:200
+#: ../app/widgets/gimptextstyleeditor.c:206
+msgid "Change font of selected text"
+msgstr "Change font of selected text"
+
+#: ../app/widgets/gimptextstyleeditor.c:217
 msgid "Change size of selected text"
 msgstr "Change size of selected text"
 
-#: ../app/widgets/gimptextstyleeditor.c:207
-msgid "Change color of selected text"
-msgstr "Change colour of selected text"
-
-#: ../app/widgets/gimptextstyleeditor.c:232
+#: ../app/widgets/gimptextstyleeditor.c:236
 msgid "Clear style of selected text"
 msgstr "Clear style of selected text"
 
-#: ../app/widgets/gimptextstyleeditor.c:252
+#: ../app/widgets/gimptextstyleeditor.c:247
+#: ../app/widgets/gimptextstyleeditor.c:256
+msgid "Change color of selected text"
+msgstr "Change colour of selected text"
+
+#: ../app/widgets/gimptextstyleeditor.c:272
 msgid "Change kerning of selected text"
 msgstr "Change kerning of selected text"
 
-#: ../app/widgets/gimptextstyleeditor.c:268
+#: ../app/widgets/gimptextstyleeditor.c:288
 msgid "Change baseline of selected text"
 msgstr "Change baseline of selected text"
 
+#: ../app/widgets/gimptextstyleeditor.c:325
+msgid "Bold"
+msgstr "Bold"
+
+#: ../app/widgets/gimptextstyleeditor.c:328
+msgid "Italic"
+msgstr "Italic"
+
+#: ../app/widgets/gimptextstyleeditor.c:331
+msgid "Underline"
+msgstr "Underline"
+
+#: ../app/widgets/gimptextstyleeditor.c:334
+msgid "Strikethrough"
+msgstr "Strikethrough"
+
 #: ../app/widgets/gimpthumbbox.c:330
 #, c-format
 msgid ""
@@ -14948,7 +15406,7 @@ msgstr ""
 msgid "Pr_eview"
 msgstr "Pr_eview"
 
-#: ../app/widgets/gimpthumbbox.c:403 ../app/widgets/gimpthumbbox.c:467
+#: ../app/widgets/gimpthumbbox.c:404 ../app/widgets/gimpthumbbox.c:468
 msgid "No selection"
 msgstr "No selection"
 
@@ -15038,116 +15496,124 @@ msgstr "Lower this tool to the bottom"
 msgid "Reset tool order and visibility"
 msgstr "Reset tool order and visibility"
 
-#: ../app/widgets/gimptooloptionseditor.c:218
-msgid "Save options to..."
-msgstr "Save options to..."
+#: ../app/widgets/gimptooloptionseditor.c:202
+msgid "Save Tool Preset..."
+msgstr "Save Tool Preset..."
 
-#: ../app/widgets/gimptooloptionseditor.c:226
-msgid "Restore options from..."
-msgstr "Restore options from..."
+#: ../app/widgets/gimptooloptionseditor.c:210
+msgid "Restore Tool Preset..."
+msgstr "Restore Tool Preset..."
 
-#: ../app/widgets/gimptooloptionseditor.c:234
-msgid "Delete saved options..."
-msgstr "Delete saved options..."
+#: ../app/widgets/gimptooloptionseditor.c:218
+msgid "Delete Tool Preset..."
+msgstr "Delete Tool Preset..."
 
-#: ../app/widgets/gimptooloptionseditor.c:592
-#, c-format
-msgid "Error saving tool options presets: %s"
-msgstr "Error saving tool options presets: %s"
+#: ../app/widgets/gimptoolpreseteditor.c:126
+msgid "Icon:"
+msgstr "Icon:"
 
-#: ../app/widgets/gimptoolpreseteditor.c:109
+#: ../app/widgets/gimptoolpreseteditor.c:136
 msgid "Apply stored FG/BG"
 msgstr "Apply stored FG/BG"
 
-#: ../app/widgets/gimptoolpreseteditor.c:115
+#: ../app/widgets/gimptoolpreseteditor.c:141
 msgid "Apply stored brush"
 msgstr "Apply stored brush"
 
-#: ../app/widgets/gimptoolpreseteditor.c:121
+#: ../app/widgets/gimptoolpreseteditor.c:146
 msgid "Apply stored dynamics"
 msgstr "Apply stored dynamics"
 
-#: ../app/widgets/gimptoolpreseteditor.c:127
+#: ../app/widgets/gimptoolpreseteditor.c:151
 msgid "Apply stored gradient"
 msgstr "Apply stored gradient"
 
-#: ../app/widgets/gimptoolpreseteditor.c:133
+#: ../app/widgets/gimptoolpreseteditor.c:156
 msgid "Apply stored pattern"
 msgstr "Apply stored pattern"
 
-#: ../app/widgets/gimptoolpreseteditor.c:139
-msgid "Apply stored pallete"
+#: ../app/widgets/gimptoolpreseteditor.c:161
+msgid "Apply stored palette"
 msgstr "Apply stored palette"
 
-#: ../app/widgets/gimptoolpreseteditor.c:145
+#: ../app/widgets/gimptoolpreseteditor.c:166
 msgid "Apply stored font"
 msgstr "Apply stored font"
 
-#: ../app/widgets/gimptranslationstore.c:105
+#: ../app/widgets/gimptoolpreseteditor.c:258
+#, c-format
+msgid "%s Preset"
+msgstr "%s Preset"
+
+#: ../app/widgets/gimptranslationstore.c:100
 msgid "System Language"
 msgstr "System Language"
 
-#: ../app/widgets/gimptranslationstore.c:107
+#: ../app/widgets/gimptranslationstore.c:102
 msgid "English"
 msgstr "English"
 
-#: ../app/widgets/gimpuimanager.c:750
+#: ../app/widgets/gimpuimanager.c:742
 msgid "Your GIMP installation is incomplete:"
 msgstr "Your GIMP installation is incomplete:"
 
-#: ../app/widgets/gimpuimanager.c:752
+#: ../app/widgets/gimpuimanager.c:744
 msgid "Please make sure the menu XML files are correctly installed."
 msgstr "Please make sure the menu XML files are correctly installed."
 
-#: ../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 "There was an error parsing the menu definition from %s: %s"
 
-#: ../app/widgets/gimpundoeditor.c:270
+#: ../app/widgets/gimpundoeditor.c:262
 msgid "[ Base Image ]"
 msgstr "[ Base Image ]"
 
-#: ../app/widgets/gimpvectorstreeview.c:112
+#: ../app/widgets/gimpvectorstreeview.c:111
 msgid "Lock path strokes"
 msgstr "Lock path strokes"
 
-#: ../app/widgets/gimpviewablebox.c:80
+#: ../app/widgets/gimpviewablebox.c:86
 msgid "Open the brush selection dialog"
 msgstr "Open the brush selection dialogue"
 
-#: ../app/widgets/gimpviewablebox.c:137
+#: ../app/widgets/gimpviewablebox.c:150
+msgid "Open the dynamics selection dialog"
+msgstr "Open the dynamics selection dialogue"
+
+#: ../app/widgets/gimpviewablebox.c:215
 msgid "Open the pattern selection dialog"
 msgstr "Open the pattern selection dialogue"
 
-#: ../app/widgets/gimpviewablebox.c:203
+#: ../app/widgets/gimpviewablebox.c:283
 msgid "Open the gradient selection dialog"
 msgstr "Open the gradient selection dialogue"
 
-#: ../app/widgets/gimpviewablebox.c:305
+#: ../app/widgets/gimpviewablebox.c:400
 msgid "Open the palette selection dialog"
 msgstr "Open the palette selection dialogue"
 
-#: ../app/widgets/gimpviewablebox.c:363
+#: ../app/widgets/gimpviewablebox.c:465
 msgid "Open the font selection dialog"
 msgstr "Open the font selection dialogue"
 
-#: ../app/widgets/gimpwidgets-utils.c:670
+#: ../app/widgets/gimpwidgets-utils.c:672
 #, c-format
 msgid "%s (try %s)"
 msgstr "%s (try %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:670
+#: ../app/widgets/gimpwidgets-utils.c:672
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:674
+#: ../app/widgets/gimpwidgets-utils.c:676
 #, c-format
 msgid "%s (try %s, %s)"
 msgstr "%s (try %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:678
+#: ../app/widgets/gimpwidgets-utils.c:680
 #, c-format
 msgid "%s (try %s, %s, %s)"
 msgstr "%s (try %s, %s, %s)"
@@ -15257,7 +15723,7 @@ msgctxt "tab-style"
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../app/xcf/xcf-load.c:332
+#: ../app/xcf/xcf-load.c:333
 msgid ""
 "This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
 "incomplete."
@@ -15265,7 +15731,7 @@ msgstr ""
 "This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
 "incomplete."
 
-#: ../app/xcf/xcf-load.c:343
+#: ../app/xcf/xcf-load.c:344
 msgid ""
 "This XCF file is corrupt!  I could not even salvage any partial image data "
 "from it."
@@ -15273,7 +15739,7 @@ msgstr ""
 "This XCF file is corrupt!  I could not even salvage any partial image data "
 "from it."
 
-#: ../app/xcf/xcf-load.c:407
+#: ../app/xcf/xcf-load.c:417
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -15283,7 +15749,7 @@ msgstr ""
 "did not save indexed colourmaps correctly.\n"
 "Substituting greyscale map."
 
-#: ../app/xcf/xcf-read.c:108
+#: ../app/xcf/xcf-read.c:115
 msgid "Invalid UTF-8 string in XCF file"
 msgstr "Invalid UTF-8 string in XCF file"
 
@@ -15337,38 +15803,181 @@ msgstr "Create images and edit photographs"
 msgid "Image Editor"
 msgstr "Image Editor"
 
-#: ../tools/gimp-remote.c:64
-msgid "Use a running GIMP only, never start a new one"
-msgstr "Use a running GIMP only, never start a new one"
+#~ msgctxt "tool-options-action"
+#~ msgid "_Save Options To"
+#~ msgstr "_Save Options To"
 
-#: ../tools/gimp-remote.c:69
-msgid "Only check if GIMP is running, then quit"
-msgstr "Only check if GIMP is running, then quit"
+#~ msgctxt "tool-options-action"
+#~ msgid "_Restore Options From"
+#~ msgstr "_Restore Options From"
 
-#: ../tools/gimp-remote.c:75
-msgid "Print X window ID of GIMP toolbox window, then quit"
-msgstr "Print X window ID of GIMP toolbox window, then quit"
+#~ msgctxt "tool-options-action"
+#~ msgid "Re_name Saved Options"
+#~ msgstr "Re_name Saved Options"
 
-#: ../tools/gimp-remote.c:81
-msgid "Start GIMP without showing the startup window"
-msgstr "Start GIMP without showing the startup window"
+#~ msgctxt "tool-options-action"
+#~ msgid "_Delete Saved Options"
+#~ msgstr "_Delete Saved Options"
 
-#: ../tools/gimp-remote-x11.c:66
-msgid "Could not connect to GIMP."
-msgstr "Could not connect to GIMP."
+#~ msgctxt "tool-options-action"
+#~ msgid "_New Entry..."
+#~ msgstr "_New Entry..."
 
-#: ../tools/gimp-remote-x11.c:67
-msgid "Make sure that the Toolbox is visible!"
-msgstr "Make sure that the Toolbox is visible!"
+#~ msgid "Save Tool Options"
+#~ msgstr "Save Tool Options"
 
-#. if execv and execvp return, there was an error
-#: ../tools/gimp-remote-x11.c:247
-#, c-format
-msgid "Couldn't start '%s': %s"
-msgstr "Couldn't start '%s': %s"
+#~ msgid "Enter a name for the saved options"
+#~ msgstr "Enter a name for the saved options"
+
+#~ msgid "Rename Saved Tool Options"
+#~ msgstr "Rename Saved Tool Options"
+
+#~ msgid "Enter a new name for the saved options"
+#~ msgstr "Enter a new name for the saved options"
+
+#~ msgid ""
+#~ "Install a private colormap; might be useful on 8-bit (256 colors) "
+#~ "displays."
+#~ msgstr ""
+#~ "Install a private colourmap; might be useful on 8-bit (256 colours) "
+#~ "displays."
+
+#~ msgid ""
+#~ "Generally only a concern for 8-bit displays, this sets the minimum number "
+#~ "of system colors allocated for GIMP."
+#~ msgstr ""
+#~ "Generally only a concern for 8-bit displays, this sets the minimum number "
+#~ "of system colours allocated for GIMP."
+
+#~ msgid "Brush Scale"
+#~ msgstr "Brush Scale"
+
+#~ msgid "Rate:"
+#~ msgstr "Rate:"
+
+#~ msgid "Flow:"
+#~ msgstr "Flow:"
 
-#~ msgid "Aspect Ratio:"
-#~ msgstr "Aspect Ratio:"
+#~ msgid "Gradient:"
+#~ msgstr "Gradient:"
+
+#~ msgid "Threshold:"
+#~ msgstr "Threshold:"
+
+#~ msgctxt "command"
+#~ msgid "Flip"
+#~ msgstr "Flip"
+
+#~ msgid "Tilt:"
+#~ msgstr "Tilt:"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "Brush:"
+#~ msgstr "Brush:"
+
+#~ msgid "Scale:"
+#~ msgstr "Scale:"
+
+#~ msgid "Aspect:"
+#~ msgstr "Aspect:"
+
+#~ msgid "Length:"
+#~ msgstr "Length:"
+
+#~ msgid "Use color from gradient"
+#~ msgstr "Use colour from gradient"
+
+#~ msgctxt "command"
+#~ msgid "Perspective"
+#~ msgstr "Perspective"
+
+#~ msgctxt "command"
+#~ msgid "Rotate"
+#~ msgstr "Rotate"
+
+#~ msgctxt "command"
+#~ msgid "Scale"
+#~ msgstr "Scale"
+
+#~ msgctxt "command"
+#~ msgid "Shear"
+#~ msgstr "Shear"
+
+#~ msgid "Text box resize mode"
+#~ msgstr "Text box resize mode"
+
+#~ msgid "Font:"
+#~ msgstr "Font:"
+
+#~ msgid "Preview:"
+#~ msgstr "Preview:"
+
+#~ msgctxt "transform-preview-type"
+#~ msgid "Outline"
+#~ msgstr "Outline"
+
+#~ msgctxt "transform-preview-type"
+#~ msgid "Grid"
+#~ msgstr "Grid"
+
+#~ msgctxt "transform-preview-type"
+#~ msgid "Image"
+#~ msgstr "Image"
+
+#~ msgctxt "transform-preview-type"
+#~ msgid "Image + Grid"
+#~ msgstr "Image + Grid"
+
+#~ msgctxt "transform-grid-type"
+#~ msgid "Grid line spacing"
+#~ msgstr "Grid line spacing"
+
+#~ msgid "Hardness:"
+#~ msgstr "Hardness:"
+
+#~ msgid "Aspect ratio:"
+#~ msgstr "Aspect ratio:"
+
+#~ msgid "Spacing:"
+#~ msgstr "Spacing:"
+
+#~ msgid "Instant update"
+#~ msgstr "Instant update"
+
+#~ msgid "Save options to..."
+#~ msgstr "Save options to..."
+
+#~ msgid "Restore options from..."
+#~ msgstr "Restore options from..."
+
+#~ msgid "Delete saved options..."
+#~ msgstr "Delete saved options..."
+
+#~ msgid "Error saving tool options presets: %s"
+#~ msgstr "Error saving tool options presets: %s"
+
+#~ msgid "Use a running GIMP only, never start a new one"
+#~ msgstr "Use a running GIMP only, never start a new one"
+
+#~ msgid "Only check if GIMP is running, then quit"
+#~ msgstr "Only check if GIMP is running, then quit"
+
+#~ msgid "Print X window ID of GIMP toolbox window, then quit"
+#~ msgstr "Print X window ID of GIMP toolbox window, then quit"
+
+#~ msgid "Start GIMP without showing the startup window"
+#~ msgstr "Start GIMP without showing the startup window"
+
+#~ msgid "Could not connect to GIMP."
+#~ msgstr "Could not connect to GIMP."
+
+#~ msgid "Make sure that the Toolbox is visible!"
+#~ msgstr "Make sure that the Toolbox is visible!"
+
+#~ msgid "Couldn't start '%s': %s"
+#~ msgstr "Couldn't start '%s': %s"
 
 #~ msgid "New brush"
 #~ msgstr "New brush"
@@ -16164,9 +16773,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Move layers & selections"
 #~ msgstr "Move layers & selections"
 
-#~ msgid "Paint fuzzy brush strokes"
-#~ msgstr "Paint fuzzy brush strokes"
-
 #~ msgid "Paint hard edged pixels"
 #~ msgstr "Paint hard edged pixels"
 
@@ -16191,9 +16797,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Smudge image"
 #~ msgstr "Smudge image"
 
-#~ msgid "Add text to the image"
-#~ msgstr "Add text to the image"
-
 #~ msgid "Ma_p"
 #~ msgstr "Ma_p"
 
@@ -16261,9 +16864,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Lower channel"
 #~ msgstr "Lower channel"
 
-#~ msgid "Channel to selection"
-#~ msgstr "Channel to selection"
-
 #~ msgid "Add color from FG"
 #~ msgstr "_Add Colour from FG"
 
@@ -16543,9 +17143,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "FS to layer"
 #~ msgstr "FS to layer"
 
-#~ msgid "Fill with FG Color"
-#~ msgstr "Fill with FG Colour"
-
 #~ msgid "Fill with BG Color"
 #~ msgstr "Fill with BG Colour"
 
@@ -16676,9 +17273,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Change current layer or path"
 #~ msgstr "Change current layer or path"
 
-#~ msgid "Mouse Cursors"
-#~ msgstr "Mouse Cursors"
-
 #~ msgid "Show paint _tool cursor"
 #~ msgstr "Show paint _tool cursor"
 
@@ -17108,9 +17702,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Blending..."
 #~ msgstr "Blending..."
 
-#~ msgid "Brush"
-#~ msgstr "Brush"
-
 #~ msgid "Brush UI"
 #~ msgstr "Brush UI"
 
@@ -17138,9 +17729,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Gimprc procedures"
 #~ msgstr "Gimprc procedures"
 
-#~ msgid "Gradient"
-#~ msgstr "Gradient"
-
 #~ msgid "Gradient UI"
 #~ msgstr "Gradient UI"
 
@@ -17237,9 +17825,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Tool Toggle  %s"
 #~ msgstr "Tool Toggle  %s"
 
-#~ msgid "Keep aspect ratio  %s"
-#~ msgstr "Keep aspect ratio  %s"
-
 #~ msgid "Crop: "
 #~ msgstr "Crop: "
 
@@ -17294,12 +17879,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Highlight rectangle"
 #~ msgstr "Highlight rectangle"
 
-#~ msgid "Fixed width"
-#~ msgstr "Fixed width"
-
-#~ msgid "Fixed height"
-#~ msgstr "Fixed height"
-
 #~ msgid "Fixed aspect"
 #~ msgstr "Fixed aspect"
 
@@ -17330,9 +17909,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Current height:"
 #~ msgstr "Current height:"
 
-#~ msgid "Scale ratio X:"
-#~ msgstr "Scale ratio X:"
-
 #~ msgid "Scale ratio Y:"
 #~ msgstr "Scale ratio Y:"
 
@@ -17346,13 +17922,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgstr "Indent:"
 
 #~ msgid ""
-#~ "Line\n"
-#~ "spacing:"
-#~ msgstr ""
-#~ "Line\n"
-#~ "spacing:"
-
-#~ msgid ""
 #~ "Letter\n"
 #~ "spacing:"
 #~ msgstr ""
@@ -17392,9 +17961,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Configure selected filter: %s"
 #~ msgstr "Configure selected filter: %s"
 
-#~ msgid "Configure selected filter"
-#~ msgstr "Configure selected filter"
-
 #~ msgid "Cursor Up (Shift + Control + Alt)"
 #~ msgstr "Cursor Up (Shift + Control + Alt)"
 
@@ -17837,9 +18403,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Visual depth:"
 #~ msgstr "Visual depth:"
 
-#~ msgid "New Image"
-#~ msgstr "New Image"
-
 #~ msgid "Standard"
 #~ msgstr "Standard"
 



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