diff --git a/po-plug-ins/ChangeLog b/po-plug-ins/ChangeLog
index 36f4fb6514..f3012a8547 100644
--- a/po-plug-ins/ChangeLog
+++ b/po-plug-ins/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-18  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-07-17  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
diff --git a/po-plug-ins/en_CA.po b/po-plug-ins/en_CA.po
index fdd48d97d8..d165558120 100644
--- a/po-plug-ins/en_CA.po
+++ b/po-plug-ins/en_CA.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp plug-ins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-09 02:15-0400\n"
-"PO-Revision-Date: 2005-07-09 14:31-0400\n"
+"POT-Creation-Date: 2005-07-18 04:31-0400\n"
+"PO-Revision-Date: 2005-07-18 14:31-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plug-ins/FractalExplorer/Dialogs.c:529 plug-ins/gfig/gfig-dialog.c:275
+#: plug-ins/FractalExplorer/Dialogs.c:529 plug-ins/gfig/gfig-dialog.c:282
 #: plug-ins/gflare/gflare.c:886 plug-ins/gimpressionist/utils.c:124
 #, c-format
 msgid ""
@@ -372,13 +372,13 @@ msgstr "_Fractals"
 #: plug-ins/common/dicom.c:648 plug-ins/common/gbr.c:600
 #: plug-ins/common/gif.c:994 plug-ins/common/gih.c:1257
 #: plug-ins/common/gtm.c:222 plug-ins/common/mng.c:559
-#: plug-ins/common/mng.c:947 plug-ins/common/pat.c:447
+#: plug-ins/common/mng.c:947 plug-ins/common/pat.c:449
 #: plug-ins/common/pcx.c:585 plug-ins/common/pix.c:505
 #: plug-ins/common/png.c:1174 plug-ins/common/pnm.c:810
 #: plug-ins/common/postscript.c:1125 plug-ins/common/psd_save.c:1304
-#: plug-ins/common/raw.c:522 plug-ins/common/raw.c:549
+#: plug-ins/common/raw.c:526 plug-ins/common/raw.c:553
 #: plug-ins/common/spheredesigner.c:2107 plug-ins/common/sunras.c:504
-#: plug-ins/common/tga.c:1022 plug-ins/common/tiff.c:1929
+#: plug-ins/common/tga.c:1022 plug-ins/common/tiff.c:1915
 #: plug-ins/common/xbm.c:991 plug-ins/common/xwd.c:562
 #: plug-ins/fits/fits.c:445 plug-ins/flame/flame.c:443
 #: plug-ins/gfig/gfig.c:789 plug-ins/gfli/gfli.c:710
@@ -411,15 +411,15 @@ msgstr "Save Fractal Parameters"
 #: plug-ins/common/channel_mixer.c:980 plug-ins/common/curve_bend.c:912
 #: plug-ins/common/dicom.c:291 plug-ins/common/gbr.c:343
 #: plug-ins/common/gifload.c:294 plug-ins/common/gih.c:647
-#: plug-ins/common/mng.c:1118 plug-ins/common/pat.c:316
+#: plug-ins/common/mng.c:1118 plug-ins/common/pat.c:318
 #: plug-ins/common/pcx.c:305 plug-ins/common/pix.c:325
 #: plug-ins/common/png.c:672 plug-ins/common/pnm.c:434
 #: plug-ins/common/postscript.c:994 plug-ins/common/psd.c:1801
-#: plug-ins/common/psp.c:1454 plug-ins/common/raw.c:235
-#: plug-ins/common/raw.c:639 plug-ins/common/spheredesigner.c:1997
+#: plug-ins/common/psp.c:1454 plug-ins/common/raw.c:239
+#: plug-ins/common/raw.c:643 plug-ins/common/spheredesigner.c:1997
 #: plug-ins/common/sunras.c:375 plug-ins/common/svg.c:309
-#: plug-ins/common/svg.c:692 plug-ins/common/tga.c:409
-#: plug-ins/common/tiff.c:526 plug-ins/common/xbm.c:715
+#: plug-ins/common/svg.c:694 plug-ins/common/tga.c:409
+#: plug-ins/common/tiff.c:524 plug-ins/common/xbm.c:715
 #: plug-ins/common/xwd.c:415 plug-ins/faxg3/faxg3.c:219
 #: plug-ins/fits/fits.c:333 plug-ins/flame/flame.c:412
 #: plug-ins/gfig/gfig.c:429 plug-ins/gfli/gfli.c:422 plug-ins/gfli/gfli.c:457
@@ -1154,12 +1154,12 @@ msgstr "Bad colourmap"
 #: plug-ins/bmp/bmpread.c:158 plug-ins/common/CEL.c:302
 #: plug-ins/common/dicom.c:296 plug-ins/common/gbr.c:349
 #: plug-ins/common/gifload.c:299 plug-ins/common/gih.c:653
-#: plug-ins/common/pat.c:322 plug-ins/common/pcx.c:311
+#: plug-ins/common/pat.c:324 plug-ins/common/pcx.c:311
 #: plug-ins/common/pix.c:331 plug-ins/common/png.c:680
 #: plug-ins/common/pnm.c:440 plug-ins/common/postscript.c:1001
-#: plug-ins/common/psd.c:1807 plug-ins/common/raw.c:645
+#: plug-ins/common/psd.c:1807 plug-ins/common/raw.c:649
 #: plug-ins/common/sunras.c:430 plug-ins/common/tga.c:415
-#: plug-ins/common/tiff.c:532 plug-ins/common/wmf.c:951
+#: plug-ins/common/tiff.c:530 plug-ins/common/wmf.c:951
 #: plug-ins/common/xbm.c:721 plug-ins/common/xpm.c:341
 #: plug-ins/common/xwd.c:469 plug-ins/faxg3/faxg3.c:204
 #: plug-ins/gfli/gfli.c:463 plug-ins/jpeg/jpeg-load.c:93
@@ -1203,12 +1203,12 @@ msgstr "Unsupported or invalid bitdepth."
 #: plug-ins/common/gifload.c:866 plug-ins/common/pcx.c:336
 #: plug-ins/common/pcx.c:342 plug-ins/common/pix.c:365
 #: plug-ins/common/png.c:805 plug-ins/common/pnm.c:518
-#: plug-ins/common/psd.c:2215 plug-ins/common/raw.c:680
+#: plug-ins/common/psd.c:2215 plug-ins/common/raw.c:684
 #: plug-ins/common/smooth_palette.c:253 plug-ins/common/sunras.c:915
-#: plug-ins/common/tga.c:922 plug-ins/common/tiff.c:895
+#: plug-ins/common/tga.c:922 plug-ins/common/tiff.c:881
 #: plug-ins/common/tile.c:262 plug-ins/common/xbm.c:862
 #: plug-ins/faxg3/faxg3.c:464 plug-ins/fits/fits.c:500
-#: plug-ins/gfig/gfig-dialog.c:1283 plug-ins/gimpressionist/general.c:121
+#: plug-ins/gfig/gfig-dialog.c:1290 plug-ins/gimpressionist/general.c:121
 #: plug-ins/jpeg/jpeg-load.c:239 plug-ins/jpeg/jpeg-load.c:735
 #: plug-ins/sgi/sgi.c:368 plug-ins/twain/twain.c:571
 #: plug-ins/winsnap/winsnap.c:1156
@@ -1233,11 +1233,11 @@ msgstr "Cannot operate on indexed images with alpha channel."
 #: plug-ins/bmp/bmpwrite.c:212 plug-ins/common/CEL.c:574
 #: plug-ins/common/gbr.c:606 plug-ins/common/gif.c:1001
 #: plug-ins/common/gih.c:1262 plug-ins/common/gtm.c:243
-#: plug-ins/common/pat.c:453 plug-ins/common/pcx.c:547
+#: plug-ins/common/pat.c:455 plug-ins/common/pcx.c:547
 #: plug-ins/common/pix.c:511 plug-ins/common/png.c:1182
 #: plug-ins/common/pnm.c:815 plug-ins/common/postscript.c:1131
 #: plug-ins/common/psd_save.c:1310 plug-ins/common/sunras.c:510
-#: plug-ins/common/tga.c:1028 plug-ins/common/tiff.c:1935
+#: plug-ins/common/tga.c:1028 plug-ins/common/tiff.c:1921
 #: plug-ins/common/xbm.c:996 plug-ins/common/xpm.c:622
 #: plug-ins/common/xwd.c:567 plug-ins/fits/fits.c:451 plug-ins/gfli/gfli.c:679
 #: plug-ins/jpeg/jpeg-save.c:216 plug-ins/sgi/sgi.c:537
@@ -1861,7 +1861,7 @@ msgstr "Fill (right to left)"
 
 #. "snap to grid" checkbutton at bottom of style frame
 #: plug-ins/common/align_layers.c:423 plug-ins/common/align_layers.c:454
-#: plug-ins/gfig/gfig-dialog.c:494
+#: plug-ins/gfig/gfig-dialog.c:501
 msgid "Snap to grid"
 msgstr "Snap to grid"
 
@@ -2398,12 +2398,12 @@ msgid "to alpha"
 msgstr "to alpha"
 
 #: plug-ins/common/compose.c:133 plug-ins/common/decompose.c:129
-#: plug-ins/common/raw.c:961
+#: plug-ins/common/raw.c:965
 msgid "RGB"
 msgstr "RGB"
 
 #: plug-ins/common/compose.c:143 plug-ins/common/decompose.c:134
-#: plug-ins/common/raw.c:962
+#: plug-ins/common/raw.c:966
 msgid "RGBA"
 msgstr "RGBA"
 
@@ -2655,7 +2655,7 @@ msgid "D_ivisor:"
 msgstr "D_ivisor:"
 
 #: plug-ins/common/convmatrix.c:967 plug-ins/common/depthmerge.c:748
-#: plug-ins/common/raw.c:980
+#: plug-ins/common/raw.c:984
 msgid "O_ffset:"
 msgstr "O_ffset:"
 
@@ -2791,7 +2791,7 @@ msgstr "Automatic pre_view"
 #. the vertical box and its toggle buttons
 #. Options section
 #: plug-ins/common/curve_bend.c:1320 plug-ins/common/mosaic.c:619
-#: plug-ins/common/ripple.c:502 plug-ins/gfig/gfig-dialog.c:1206
+#: plug-ins/common/ripple.c:502 plug-ins/gfig/gfig-dialog.c:1213
 msgid "Options"
 msgstr "Options"
 
@@ -3129,7 +3129,7 @@ msgid "R_ecursive"
 msgstr "R_ecursive"
 
 #: plug-ins/common/despeckle.c:459 plug-ins/common/neon.c:733
-#: plug-ins/common/nlfilt.c:1083 plug-ins/common/nova.c:362
+#: plug-ins/common/nlfilt.c:1084 plug-ins/common/nova.c:362
 #: plug-ins/common/unsharp.c:666 plug-ins/common/whirlpinch.c:589
 #: plug-ins/gflare/gflare.c:2687 plug-ins/imagemap/imap_circle.c:278
 msgid "_Radius:"
@@ -3157,7 +3157,7 @@ msgstr "Destripe"
 
 #: plug-ins/common/destripe.c:470 plug-ins/common/gtm.c:579
 #: plug-ins/common/postscript.c:2974 plug-ins/common/postscript.c:3135
-#: plug-ins/common/raw.c:993 plug-ins/common/smooth_palette.c:430
+#: plug-ins/common/raw.c:997 plug-ins/common/smooth_palette.c:430
 #: plug-ins/common/tile.c:418 plug-ins/imagemap/imap_cmd_guides.c:167
 #: plug-ins/imagemap/imap_rectangle.c:403
 msgid "_Width:"
@@ -3405,7 +3405,7 @@ msgstr "Engrave"
 
 #: plug-ins/common/engrave.c:241 plug-ins/common/film.c:1198
 #: plug-ins/common/gtm.c:595 plug-ins/common/postscript.c:2983
-#: plug-ins/common/postscript.c:3144 plug-ins/common/raw.c:1006
+#: plug-ins/common/postscript.c:3144 plug-ins/common/raw.c:1010
 #: plug-ins/common/smooth_palette.c:435 plug-ins/common/tile.c:422
 #: plug-ins/imagemap/imap_cmd_guides.c:177
 #: plug-ins/imagemap/imap_rectangle.c:410
@@ -3801,34 +3801,34 @@ msgstr "_Gaussian Blur..."
 msgid "Gaussian Blur..."
 msgstr "Gaussian Blur..."
 
-#: plug-ins/common/gauss.c:457
+#: plug-ins/common/gauss.c:458
 msgid "Gaussian Blur"
 msgstr "Gaussian Blur"
 
 #. parameter settings
-#: plug-ins/common/gauss.c:485
+#: plug-ins/common/gauss.c:486
 msgid "Blur Radius"
 msgstr "Blur Radius"
 
-#: plug-ins/common/gauss.c:499 plug-ins/common/jigsaw.c:2458
+#: plug-ins/common/gauss.c:500 plug-ins/common/jigsaw.c:2458
 #: plug-ins/common/spread.c:383
 msgid "_Horizontal:"
 msgstr "_Horizontal:"
 
-#: plug-ins/common/gauss.c:503 plug-ins/common/jigsaw.c:2475
+#: plug-ins/common/gauss.c:504 plug-ins/common/jigsaw.c:2475
 #: plug-ins/common/spread.c:387
 msgid "_Vertical:"
 msgstr "_Vertical:"
 
-#: plug-ins/common/gauss.c:526
+#: plug-ins/common/gauss.c:527
 msgid "Blur Method"
 msgstr "Blur Method"
 
-#: plug-ins/common/gauss.c:530
+#: plug-ins/common/gauss.c:531
 msgid "_IIR"
 msgstr "_IIR"
 
-#: plug-ins/common/gauss.c:531
+#: plug-ins/common/gauss.c:532
 msgid "_RLE"
 msgstr "_RLE"
 
@@ -3869,7 +3869,7 @@ msgid "Spacing:"
 msgstr "Spacing:"
 
 #: plug-ins/common/gbr.c:712 plug-ins/common/gih.c:907
-#: plug-ins/common/pat.c:539 plug-ins/gimpressionist/presets.c:651
+#: plug-ins/common/pat.c:541 plug-ins/gimpressionist/presets.c:651
 msgid "Description:"
 msgstr "Description:"
 
@@ -4178,7 +4178,7 @@ msgstr "_Grid..."
 msgid "Drawing Grid..."
 msgstr "Drawing Grid..."
 
-#: plug-ins/common/grid.c:631 plug-ins/gfig/gfig-dialog.c:1352
+#: plug-ins/common/grid.c:631 plug-ins/gfig/gfig-dialog.c:1361
 msgid "Grid"
 msgstr "Grid"
 
@@ -4196,7 +4196,7 @@ msgid "Intersection"
 msgstr "Intersection"
 
 #. Width and Height
-#: plug-ins/common/grid.c:718 plug-ins/common/svg.c:764
+#: plug-ins/common/grid.c:718 plug-ins/common/svg.c:766
 #: plug-ins/common/wmf.c:547 plug-ins/print/gimp_main_window.c:1006
 #: plug-ins/print/gimp_main_window.c:1213
 msgid "Width:"
@@ -5142,7 +5142,7 @@ msgid "_Factory defaults"
 msgstr "_Factory defaults"
 
 #. anti-alias control
-#: plug-ins/common/newsprint.c:1439 plug-ins/gfig/gfig-dialog.c:1255
+#: plug-ins/common/newsprint.c:1439 plug-ins/gfig/gfig-dialog.c:1262
 msgid "Antialiasing"
 msgstr "Antialiasing"
 
@@ -5154,31 +5154,31 @@ msgstr "O_versample:"
 msgid "_NL Filter..."
 msgstr "_NL Filter..."
 
-#: plug-ins/common/nlfilt.c:949
+#: plug-ins/common/nlfilt.c:950
 msgid "NL Filter..."
 msgstr "NL Filter..."
 
-#: plug-ins/common/nlfilt.c:1012
+#: plug-ins/common/nlfilt.c:1013
 msgid "NL Filter"
 msgstr "NL Filter"
 
-#: plug-ins/common/nlfilt.c:1038
+#: plug-ins/common/nlfilt.c:1039
 msgid "Filter"
 msgstr "Filter"
 
-#: plug-ins/common/nlfilt.c:1042
+#: plug-ins/common/nlfilt.c:1043
 msgid "_Alpha trimmed mean"
 msgstr "_Alpha trimmed mean"
 
-#: plug-ins/common/nlfilt.c:1044
+#: plug-ins/common/nlfilt.c:1045
 msgid "Op_timal estimation"
 msgstr "Op_timal estimation"
 
-#: plug-ins/common/nlfilt.c:1046
+#: plug-ins/common/nlfilt.c:1047
 msgid "_Edge enhancement"
 msgstr "_Edge enhancement"
 
-#: plug-ins/common/nlfilt.c:1071
+#: plug-ins/common/nlfilt.c:1072
 msgid "A_lpha:"
 msgstr "A_lpha:"
 
@@ -5351,16 +5351,16 @@ msgstr "September 31, 1999"
 msgid "_Paper Tile..."
 msgstr "_Paper Tile..."
 
-#: plug-ins/common/pat.c:120 plug-ins/common/pat.c:142
+#: plug-ins/common/pat.c:120 plug-ins/common/pat.c:143
 msgid "GIMP pattern"
 msgstr "GIMP pattern"
 
-#: plug-ins/common/pat.c:358
+#: plug-ins/common/pat.c:360
 #, c-format
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "Invalid UTF-8 string in pattern file '%s'."
 
-#: plug-ins/common/pat.c:514
+#: plug-ins/common/pat.c:516
 msgid "Save as Pattern"
 msgstr "Save as Pattern"
 
@@ -5699,7 +5699,7 @@ msgid "Rendering"
 msgstr "Rendering"
 
 #. Resolution
-#: plug-ins/common/postscript.c:2965 plug-ins/common/svg.c:885
+#: plug-ins/common/postscript.c:2965 plug-ins/common/svg.c:887
 #: plug-ins/common/wmf.c:668 plug-ins/print/gimp_main_window.c:1101
 msgid "Resolution:"
 msgstr "Resolution:"
@@ -5901,75 +5901,75 @@ msgstr "R_epeat:"
 msgid "Number of times to apply filter"
 msgstr "Number of times to apply filter"
 
-#: plug-ins/common/raw.c:171 plug-ins/common/raw.c:186
+#: plug-ins/common/raw.c:175 plug-ins/common/raw.c:190
 msgid "Raw Image Data"
 msgstr "Raw Image Data"
 
-#: plug-ins/common/raw.c:918
+#: plug-ins/common/raw.c:922
 msgid "Raw Image Loader"
 msgstr "Raw Image Loader"
 
-#: plug-ins/common/raw.c:951
+#: plug-ins/common/raw.c:955
 msgid "Image"
 msgstr "Image"
 
-#: plug-ins/common/raw.c:963
+#: plug-ins/common/raw.c:967
 msgid "Planar RGB"
 msgstr "Planar RGB"
 
-#: plug-ins/common/raw.c:964
+#: plug-ins/common/raw.c:968
 msgid "Indexed"
 msgstr "Indexed"
 
-#: plug-ins/common/raw.c:969
+#: plug-ins/common/raw.c:973
 msgid "Image _Type:"
 msgstr "Image _Type:"
 
-#: plug-ins/common/raw.c:1019
+#: plug-ins/common/raw.c:1023
 msgid "Palette"
 msgstr "Palette"
 
-#: plug-ins/common/raw.c:1029 plug-ins/common/raw.c:1117
+#: plug-ins/common/raw.c:1033 plug-ins/common/raw.c:1121
 msgid "R, G, B (normal)"
 msgstr "R, G, B (normal)"
 
-#: plug-ins/common/raw.c:1030 plug-ins/common/raw.c:1119
+#: plug-ins/common/raw.c:1034 plug-ins/common/raw.c:1123
 msgid "B, G, R, X (bmp style)"
 msgstr "B, G, R, X (BMP style)"
 
-#: plug-ins/common/raw.c:1035
+#: plug-ins/common/raw.c:1039
 msgid "_Palette Type:"
 msgstr "_Palette Type:"
 
-#: plug-ins/common/raw.c:1046
+#: plug-ins/common/raw.c:1050
 msgid "Off_set:"
 msgstr "Off_set:"
 
-#: plug-ins/common/raw.c:1058
+#: plug-ins/common/raw.c:1062
 msgid "Select Palette File to Load"
 msgstr "Select Palette File to Load"
 
-#: plug-ins/common/raw.c:1061
+#: plug-ins/common/raw.c:1065
 msgid "Pal_ette File:"
 msgstr "Pal_ette File:"
 
-#: plug-ins/common/raw.c:1089
+#: plug-ins/common/raw.c:1093
 msgid "Raw Image Save"
 msgstr "Raw Image Save"
 
-#: plug-ins/common/raw.c:1103
+#: plug-ins/common/raw.c:1107
 msgid "RGB Save Type"
 msgstr "RGB Save Type"
 
-#: plug-ins/common/raw.c:1107
+#: plug-ins/common/raw.c:1111
 msgid "Standard (R,G,B)"
 msgstr "Standard (R,G,B)"
 
-#: plug-ins/common/raw.c:1108
+#: plug-ins/common/raw.c:1112
 msgid "Planar (RRR,GGG,BBB)"
 msgstr "Planar (RRR,GGG,BBB)"
 
-#: plug-ins/common/raw.c:1113
+#: plug-ins/common/raw.c:1117
 msgid "Indexed Palette Type"
 msgstr "Indexed Palette Type"
 
@@ -6925,7 +6925,7 @@ msgstr "RunLength Encoded"
 msgid "Scalable SVG image"
 msgstr "Scalable SVG image"
 
-#: plug-ins/common/svg.c:311 plug-ins/common/svg.c:694
+#: plug-ins/common/svg.c:311 plug-ins/common/svg.c:696
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
@@ -6937,7 +6937,7 @@ msgstr "Rendering SVG..."
 msgid "Rendered SVG"
 msgstr "Rendered SVG"
 
-#: plug-ins/common/svg.c:490
+#: plug-ins/common/svg.c:491
 msgid ""
 "SVG file does not\n"
 "specify a size!"
@@ -6945,51 +6945,51 @@ msgstr ""
 "SVG file does not\n"
 "specify a size!"
 
-#: plug-ins/common/svg.c:496 plug-ins/common/wmf.c:336
+#: plug-ins/common/svg.c:497 plug-ins/common/wmf.c:336
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
 #. Scalable Vector Graphics is SVG, should perhaps not be translated
-#: plug-ins/common/svg.c:701
+#: plug-ins/common/svg.c:703
 msgid "Render Scalable Vector Graphics"
 msgstr "Render Scalable Vector Graphics"
 
-#: plug-ins/common/svg.c:770 plug-ins/common/wmf.c:553
+#: plug-ins/common/svg.c:772 plug-ins/common/wmf.c:553
 #: plug-ins/print/gimp_main_window.c:1023
 #: plug-ins/print/gimp_main_window.c:1226
 msgid "Height:"
 msgstr "Height:"
 
-#: plug-ins/common/svg.c:844 plug-ins/common/wmf.c:627
+#: plug-ins/common/svg.c:846 plug-ins/common/wmf.c:627
 msgid "_X ratio:"
 msgstr "_X ratio:"
 
-#: plug-ins/common/svg.c:866 plug-ins/common/wmf.c:649
+#: plug-ins/common/svg.c:868 plug-ins/common/wmf.c:649
 msgid "_Y ratio:"
 msgstr "_Y ratio:"
 
-#: plug-ins/common/svg.c:880 plug-ins/common/wmf.c:663
+#: plug-ins/common/svg.c:882 plug-ins/common/wmf.c:663
 msgid "Constrain aspect ratio"
 msgstr "Constrain aspect ratio"
 
-#: plug-ins/common/svg.c:891 plug-ins/common/wmf.c:674
+#: plug-ins/common/svg.c:893 plug-ins/common/wmf.c:674
 #, c-format
 msgid "pixels/%a"
 msgstr "pixels/%a"
 
 #. Path Import
-#: plug-ins/common/svg.c:911
+#: plug-ins/common/svg.c:913
 msgid "Import _paths"
 msgstr "Import _paths"
 
-#: plug-ins/common/svg.c:917
+#: plug-ins/common/svg.c:919
 msgid ""
 "Import path elements of the SVG so they can be used with the GIMP path tool"
 msgstr ""
 "Import path elements of the SVG so they can be used with the GIMP path tool"
 
-#: plug-ins/common/svg.c:930
+#: plug-ins/common/svg.c:932
 msgid "Merge imported paths"
 msgstr "Merge imported paths"
 
@@ -7026,8 +7026,8 @@ msgid "_Threshold Alpha..."
 msgstr "_Threshold Alpha..."
 
 #: plug-ins/common/threshold_alpha.c:129
-msgid "The layer preserves transparency."
-msgstr "The layer preserves transparency."
+msgid "The layer has its alpha channel locked."
+msgstr "The layer has its alpha channel locked."
 
 #: plug-ins/common/threshold_alpha.c:135
 msgid "RGBA/GRAYA drawable is not selected."
@@ -7050,16 +7050,16 @@ msgstr "Threshold:"
 msgid "TIFF image"
 msgstr "TIFF image"
 
-#: plug-ins/common/tiff.c:897
+#: plug-ins/common/tiff.c:883
 #, c-format
 msgid "Page %d"
 msgstr "Page %d"
 
-#: plug-ins/common/tiff.c:913
+#: plug-ins/common/tiff.c:899
 msgid "TIFF Channel"
 msgstr "TIFF Channel"
 
-#: plug-ins/common/tiff.c:922
+#: plug-ins/common/tiff.c:908
 msgid ""
 "Warning:\n"
 "The image you are loading has 16 bits per channel. GIMP can only handle 8 "
@@ -7071,7 +7071,7 @@ msgstr ""
 "bit, so it will be converted for you. Information will be lost because of "
 "this conversion."
 
-#: plug-ins/common/tiff.c:2095
+#: plug-ins/common/tiff.c:2081
 msgid ""
 "The TIFF format only supports comments in\n"
 "7bit ASCII encoding. No comment is saved."
@@ -7079,40 +7079,40 @@ msgstr ""
 "The TIFF format only supports comments in\n"
 "7bit ASCII encoding. No comment is saved."
 
-#: plug-ins/common/tiff.c:2258
+#: plug-ins/common/tiff.c:2244
 msgid "Save as TIFF"
 msgstr "Save as TIFF"
 
 #. compression
-#: plug-ins/common/tiff.c:2277
+#: plug-ins/common/tiff.c:2263
 msgid "Compression"
 msgstr "Compression"
 
-#: plug-ins/common/tiff.c:2281
+#: plug-ins/common/tiff.c:2267
 msgid "_None"
 msgstr "_None"
 
-#: plug-ins/common/tiff.c:2282
+#: plug-ins/common/tiff.c:2268
 msgid "_LZW"
 msgstr "_LZW"
 
-#: plug-ins/common/tiff.c:2283
+#: plug-ins/common/tiff.c:2269
 msgid "_Pack Bits"
 msgstr "_Pack Bits"
 
-#: plug-ins/common/tiff.c:2284
+#: plug-ins/common/tiff.c:2270
 msgid "_Deflate"
 msgstr "_Deflate"
 
-#: plug-ins/common/tiff.c:2285
+#: plug-ins/common/tiff.c:2271
 msgid "_JPEG"
 msgstr "_JPEG"
 
-#: plug-ins/common/tiff.c:2294
+#: plug-ins/common/tiff.c:2280
 msgid "Save _color values from transparent pixels"
 msgstr "Save _colour values from transparent pixels"
 
-#: plug-ins/common/tiff.c:2310 plug-ins/common/xbm.c:1201
+#: plug-ins/common/tiff.c:2296 plug-ins/common/xbm.c:1201
 msgid "Comment:"
 msgstr "Comment:"
 
@@ -7285,47 +7285,47 @@ msgstr "Create a new unit with the currently selected unit as template."
 msgid "_Unit Editor"
 msgstr "_Unit Editor"
 
-#: plug-ins/common/uniteditor.c:208
+#: plug-ins/common/uniteditor.c:209
 msgid "New Unit"
 msgstr "New Unit"
 
-#: plug-ins/common/uniteditor.c:237
+#: plug-ins/common/uniteditor.c:238
 msgid "_ID:"
 msgstr "_ID:"
 
-#: plug-ins/common/uniteditor.c:248
+#: plug-ins/common/uniteditor.c:249
 msgid "_Factor:"
 msgstr "_Factor:"
 
-#: plug-ins/common/uniteditor.c:258
+#: plug-ins/common/uniteditor.c:259
 msgid "_Digits:"
 msgstr "_Digits:"
 
-#: plug-ins/common/uniteditor.c:270
+#: plug-ins/common/uniteditor.c:271
 msgid "_Symbol:"
 msgstr "_Symbol:"
 
-#: plug-ins/common/uniteditor.c:282
+#: plug-ins/common/uniteditor.c:283
 msgid "_Abbreviation:"
 msgstr "_Abbreviation:"
 
-#: plug-ins/common/uniteditor.c:294
+#: plug-ins/common/uniteditor.c:295
 msgid "Si_ngular:"
 msgstr "Si_ngular:"
 
-#: plug-ins/common/uniteditor.c:306
+#: plug-ins/common/uniteditor.c:307
 msgid "_Plural:"
 msgstr "_Plural:"
 
-#: plug-ins/common/uniteditor.c:342
+#: plug-ins/common/uniteditor.c:343
 msgid "Unit factor must not be 0."
 msgstr "Unit factor must not be 0."
 
-#: plug-ins/common/uniteditor.c:352
+#: plug-ins/common/uniteditor.c:353
 msgid "All text fields must contain a value."
 msgstr "All text fields must contain a value."
 
-#: plug-ins/common/uniteditor.c:406
+#: plug-ins/common/uniteditor.c:407
 msgid "Unit Editor"
 msgstr "Unit Editor"
 
@@ -7543,7 +7543,7 @@ msgid "Smear"
 msgstr "Smear"
 
 #: plug-ins/common/warp.c:513 plug-ins/fits/fits.c:987
-#: plug-ins/flame/flame.c:1146 plug-ins/gfig/gfig-dialog.c:1418
+#: plug-ins/flame/flame.c:1146 plug-ins/gfig/gfig-dialog.c:1466
 msgid "Black"
 msgstr "Black"
 
@@ -8234,8 +8234,8 @@ msgstr "Load FITS File"
 msgid "Replacement for undefined pixels"
 msgstr "Replacement for undefined pixels"
 
-#: plug-ins/fits/fits.c:988 plug-ins/gfig/gfig-dialog.c:1285
-#: plug-ins/gfig/gfig-dialog.c:1419
+#: plug-ins/fits/fits.c:988 plug-ins/gfig/gfig-dialog.c:1292
+#: plug-ins/gfig/gfig-dialog.c:1467
 msgid "White"
 msgstr "White"
 
@@ -8305,7 +8305,7 @@ msgstr "Swirl"
 msgid "Horseshoe"
 msgstr "Horseshoe"
 
-#: plug-ins/flame/flame.c:748 plug-ins/gfig/gfig-dialog.c:1400
+#: plug-ins/flame/flame.c:748 plug-ins/gfig/gfig-dialog.c:1448
 msgid "Polar"
 msgstr "Polar"
 
@@ -8386,197 +8386,197 @@ msgid "Draws lines between the control points. Only during curve creation"
 msgstr "Draws lines between the control points. Only during curve creation"
 
 #. Start building the dialog up
-#: plug-ins/gfig/gfig-dialog.c:287
+#: plug-ins/gfig/gfig-dialog.c:294
 msgid "Gfig"
 msgstr "Gfig"
 
 #. Tool options notebook
-#: plug-ins/gfig/gfig-dialog.c:338
+#: plug-ins/gfig/gfig-dialog.c:345
 msgid "Tool options"
 msgstr "Tool options"
 
-#: plug-ins/gfig/gfig-dialog.c:355
+#: plug-ins/gfig/gfig-dialog.c:362
 msgid "_Stroke"
 msgstr "_Stroke"
 
 #. Fill frame on right side
-#: plug-ins/gfig/gfig-dialog.c:402
+#: plug-ins/gfig/gfig-dialog.c:409
 msgid "Fill"
 msgstr "Fill"
 
-#: plug-ins/gfig/gfig-dialog.c:416
+#: plug-ins/gfig/gfig-dialog.c:423
 msgid "No fill"
 msgstr "No fill"
 
-#: plug-ins/gfig/gfig-dialog.c:417
+#: plug-ins/gfig/gfig-dialog.c:424
 msgid "Color fill"
 msgstr "Colour fill"
 
-#: plug-ins/gfig/gfig-dialog.c:418
+#: plug-ins/gfig/gfig-dialog.c:425
 msgid "Pattern fill"
 msgstr "Pattern fill"
 
-#: plug-ins/gfig/gfig-dialog.c:419
+#: plug-ins/gfig/gfig-dialog.c:426
 msgid "Shape Gradient"
 msgstr "Shape Gradient"
 
-#: plug-ins/gfig/gfig-dialog.c:420
+#: plug-ins/gfig/gfig-dialog.c:427
 msgid "Vertical Gradient"
 msgstr "Vertical Gradient"
 
-#: plug-ins/gfig/gfig-dialog.c:421
+#: plug-ins/gfig/gfig-dialog.c:428
 msgid "Horizontal Gradient"
 msgstr "Horizontal Gradient"
 
 #. "show image" checkbutton at bottom of style frame
-#: plug-ins/gfig/gfig-dialog.c:481
+#: plug-ins/gfig/gfig-dialog.c:488
 msgid "Show image"
 msgstr "Show image"
 
 #. "show grid" checkbutton at bottom of style frame
-#: plug-ins/gfig/gfig-dialog.c:503
+#: plug-ins/gfig/gfig-dialog.c:510
 msgid "Show grid"
 msgstr "Show grid"
 
-#: plug-ins/gfig/gfig-dialog.c:638
+#: plug-ins/gfig/gfig-dialog.c:645
 msgid "Load Gfig object collection"
 msgstr "Load Gfig object collection"
 
-#: plug-ins/gfig/gfig-dialog.c:687
+#: plug-ins/gfig/gfig-dialog.c:694
 msgid "Save Gfig Drawing"
 msgstr "Save Gfig Drawing"
 
-#: plug-ins/gfig/gfig-dialog.c:830
+#: plug-ins/gfig/gfig-dialog.c:837
 msgid "First Gfig"
 msgstr "First Gfig"
 
-#: plug-ins/gfig/gfig-dialog.c:869
+#: plug-ins/gfig/gfig-dialog.c:876
 msgid "_Undo"
 msgstr "_Undo"
 
-#: plug-ins/gfig/gfig-dialog.c:873
+#: plug-ins/gfig/gfig-dialog.c:880
 msgid "_Clear"
 msgstr "_Clear"
 
-#: plug-ins/gfig/gfig-dialog.c:877
+#: plug-ins/gfig/gfig-dialog.c:884
 msgid "_Grid"
 msgstr "_Grid"
 
-#: plug-ins/gfig/gfig-dialog.c:885
+#: plug-ins/gfig/gfig-dialog.c:892
 msgid "Raise selected object"
 msgstr "Raise selected object"
 
-#: plug-ins/gfig/gfig-dialog.c:889
+#: plug-ins/gfig/gfig-dialog.c:896
 msgid "Lower selected object"
 msgstr "Lower selected object"
 
-#: plug-ins/gfig/gfig-dialog.c:893
+#: plug-ins/gfig/gfig-dialog.c:900
 msgid "Raise selected object to top"
 msgstr "Raise selected object to top"
 
-#: plug-ins/gfig/gfig-dialog.c:897
+#: plug-ins/gfig/gfig-dialog.c:904
 msgid "Lower selected object to bottom"
 msgstr "Lower selected object to bottom"
 
-#: plug-ins/gfig/gfig-dialog.c:901
+#: plug-ins/gfig/gfig-dialog.c:908
 msgid "Show previous object"
 msgstr "Show previous object"
 
-#: plug-ins/gfig/gfig-dialog.c:905
+#: plug-ins/gfig/gfig-dialog.c:912
 msgid "Show next object"
 msgstr "Show next object"
 
-#: plug-ins/gfig/gfig-dialog.c:909 plug-ins/gfig/gfig-stock.c:53
+#: plug-ins/gfig/gfig-dialog.c:916 plug-ins/gfig/gfig-stock.c:53
 msgid "Show all objects"
 msgstr "Show all objects"
 
-#: plug-ins/gfig/gfig-dialog.c:915 plug-ins/gfig/gfig-stock.c:47
+#: plug-ins/gfig/gfig-dialog.c:922 plug-ins/gfig/gfig-stock.c:47
 msgid "Create line"
 msgstr "Create line"
 
-#: plug-ins/gfig/gfig-dialog.c:918 plug-ins/gfig/gfig-stock.c:51
+#: plug-ins/gfig/gfig-dialog.c:925 plug-ins/gfig/gfig-stock.c:51
 msgid "Create rectangle"
 msgstr "Create rectangle"
 
-#: plug-ins/gfig/gfig-dialog.c:921 plug-ins/gfig/gfig-stock.c:42
+#: plug-ins/gfig/gfig-dialog.c:928 plug-ins/gfig/gfig-stock.c:42
 msgid "Create circle"
 msgstr "Create circle"
 
-#: plug-ins/gfig/gfig-dialog.c:924 plug-ins/gfig/gfig-stock.c:46
+#: plug-ins/gfig/gfig-dialog.c:931 plug-ins/gfig/gfig-stock.c:46
 msgid "Create ellipse"
 msgstr "Create ellipse"
 
-#: plug-ins/gfig/gfig-dialog.c:927 plug-ins/gfig/gfig-stock.c:44
+#: plug-ins/gfig/gfig-dialog.c:934 plug-ins/gfig/gfig-stock.c:44
 msgid "Create arc"
 msgstr "Create arc"
 
-#: plug-ins/gfig/gfig-dialog.c:930 plug-ins/gfig/gfig-stock.c:50
+#: plug-ins/gfig/gfig-dialog.c:937 plug-ins/gfig/gfig-stock.c:50
 msgid "Create reg polygon"
 msgstr "Create reg polygon"
 
-#: plug-ins/gfig/gfig-dialog.c:933 plug-ins/gfig/gfig-stock.c:55
+#: plug-ins/gfig/gfig-dialog.c:940 plug-ins/gfig/gfig-stock.c:55
 msgid "Create star"
 msgstr "Create star"
 
-#: plug-ins/gfig/gfig-dialog.c:936 plug-ins/gfig/gfig-stock.c:54
+#: plug-ins/gfig/gfig-dialog.c:943 plug-ins/gfig/gfig-stock.c:54
 msgid "Create spiral"
 msgstr "Create spiral"
 
-#: plug-ins/gfig/gfig-dialog.c:939
+#: plug-ins/gfig/gfig-dialog.c:946
 msgid "Create bezier curve. Shift + Button ends object creation."
 msgstr "Create bezier curve. Shift + Button ends object creation."
 
-#: plug-ins/gfig/gfig-dialog.c:943 plug-ins/gfig/gfig-stock.c:48
+#: plug-ins/gfig/gfig-dialog.c:950 plug-ins/gfig/gfig-stock.c:48
 msgid "Move an object"
 msgstr "Move an object"
 
-#: plug-ins/gfig/gfig-dialog.c:946 plug-ins/gfig/gfig-stock.c:49
+#: plug-ins/gfig/gfig-dialog.c:953 plug-ins/gfig/gfig-stock.c:49
 msgid "Move a single point"
 msgstr "Move a single point"
 
-#: plug-ins/gfig/gfig-dialog.c:949 plug-ins/gfig/gfig-stock.c:43
+#: plug-ins/gfig/gfig-dialog.c:956 plug-ins/gfig/gfig-stock.c:43
 msgid "Copy an object"
 msgstr "Copy an object"
 
-#: plug-ins/gfig/gfig-dialog.c:952 plug-ins/gfig/gfig-stock.c:45
+#: plug-ins/gfig/gfig-dialog.c:959 plug-ins/gfig/gfig-stock.c:45
 msgid "Delete an object"
 msgstr "Delete an object"
 
-#: plug-ins/gfig/gfig-dialog.c:955 plug-ins/gfig/gfig-stock.c:52
+#: plug-ins/gfig/gfig-dialog.c:962 plug-ins/gfig/gfig-stock.c:52
 msgid "Select an object"
 msgstr "Select an object"
 
-#: plug-ins/gfig/gfig-dialog.c:1037
+#: plug-ins/gfig/gfig-dialog.c:1044
 msgid "This tool has no options"
 msgstr "This tool has no options"
 
 #. Put buttons in
-#: plug-ins/gfig/gfig-dialog.c:1227
+#: plug-ins/gfig/gfig-dialog.c:1234
 msgid "Show position"
 msgstr "Show position"
 
-#: plug-ins/gfig/gfig-dialog.c:1239
+#: plug-ins/gfig/gfig-dialog.c:1246
 msgid "Show control points"
 msgstr "Show control points"
 
-#: plug-ins/gfig/gfig-dialog.c:1273
+#: plug-ins/gfig/gfig-dialog.c:1280
 msgid "Max undo:"
 msgstr "Max undo:"
 
-#: plug-ins/gfig/gfig-dialog.c:1282 plug-ins/gimpressionist/general.c:166
+#: plug-ins/gfig/gfig-dialog.c:1289 plug-ins/gimpressionist/general.c:166
 msgid "Transparent"
 msgstr "Transparent"
 
-#: plug-ins/gfig/gfig-dialog.c:1284
+#: plug-ins/gfig/gfig-dialog.c:1291
 msgid "Foreground"
 msgstr "Foreground"
 
-#: plug-ins/gfig/gfig-dialog.c:1286 plug-ins/imagemap/imap_cmd_copy.c:54
+#: plug-ins/gfig/gfig-dialog.c:1293 plug-ins/imagemap/imap_cmd_copy.c:54
 #: plug-ins/imagemap/imap_cmd_copy_object.c:55
 msgid "Copy"
 msgstr "Copy"
 
-#: plug-ins/gfig/gfig-dialog.c:1295
+#: plug-ins/gfig/gfig-dialog.c:1302
 msgid ""
 "Layer background type. Copy causes the previous layer to be copied before "
 "the draw is performed."
@@ -8584,71 +8584,79 @@ msgstr ""
 "Layer background type. Copy causes the previous layer to be copied before "
 "the draw is performed."
 
-#: plug-ins/gfig/gfig-dialog.c:1301
+#: plug-ins/gfig/gfig-dialog.c:1308
 msgid "Background:"
 msgstr "Background:"
 
-#: plug-ins/gfig/gfig-dialog.c:1304
+#: plug-ins/gfig/gfig-dialog.c:1311
 msgid "Feather"
 msgstr "Feather"
 
-#: plug-ins/gfig/gfig-dialog.c:1328
+#: plug-ins/gfig/gfig-dialog.c:1335
 msgid "Radius:"
 msgstr "Radius:"
 
-#: plug-ins/gfig/gfig-dialog.c:1383
+#: plug-ins/gfig/gfig-dialog.c:1392
 msgid "Grid spacing:"
 msgstr "Grid spacing:"
 
-#: plug-ins/gfig/gfig-dialog.c:1399
+#: plug-ins/gfig/gfig-dialog.c:1409
+msgid "Polar grid sectors desired:"
+msgstr "Polar grid sectors desired:"
+
+#: plug-ins/gfig/gfig-dialog.c:1431
+msgid "Polar grid radius interval:"
+msgstr "Polar grid radius interval:"
+
+#: plug-ins/gfig/gfig-dialog.c:1447
 msgid "Rectangle"
 msgstr "Rectangle"
 
-#: plug-ins/gfig/gfig-dialog.c:1401
+#: plug-ins/gfig/gfig-dialog.c:1449
 msgid "Isometric"
 msgstr "Isometric"
 
-#: plug-ins/gfig/gfig-dialog.c:1410
+#: plug-ins/gfig/gfig-dialog.c:1458
 msgid "Grid type:"
 msgstr "Grid type:"
 
-#: plug-ins/gfig/gfig-dialog.c:1417 plug-ins/gflare/gflare.c:555
+#: plug-ins/gfig/gfig-dialog.c:1465 plug-ins/gflare/gflare.c:555
 msgid "Normal"
 msgstr "Normal"
 
-#: plug-ins/gfig/gfig-dialog.c:1420
+#: plug-ins/gfig/gfig-dialog.c:1468
 msgid "Grey"
 msgstr "Grey"
 
-#: plug-ins/gfig/gfig-dialog.c:1421
+#: plug-ins/gfig/gfig-dialog.c:1469
 msgid "Darker"
 msgstr "Darker"
 
-#: plug-ins/gfig/gfig-dialog.c:1422
+#: plug-ins/gfig/gfig-dialog.c:1470
 msgid "Lighter"
 msgstr "Lighter"
 
-#: plug-ins/gfig/gfig-dialog.c:1423
+#: plug-ins/gfig/gfig-dialog.c:1471
 msgid "Very dark"
 msgstr "Very dark"
 
-#: plug-ins/gfig/gfig-dialog.c:1432
+#: plug-ins/gfig/gfig-dialog.c:1480
 msgid "Grid color:"
 msgstr "Grid colour:"
 
-#: plug-ins/gfig/gfig-dialog.c:1635
+#: plug-ins/gfig/gfig-dialog.c:1703
 msgid "Sides:"
 msgstr "Sides:"
 
-#: plug-ins/gfig/gfig-dialog.c:1645
+#: plug-ins/gfig/gfig-dialog.c:1713
 msgid "Right"
 msgstr "Right"
 
-#: plug-ins/gfig/gfig-dialog.c:1646
+#: plug-ins/gfig/gfig-dialog.c:1714
 msgid "Left"
 msgstr "Left"
 
-#: plug-ins/gfig/gfig-dialog.c:1656 plug-ins/gimpressionist/orientation.c:130
+#: plug-ins/gfig/gfig-dialog.c:1724 plug-ins/gimpressionist/orientation.c:130
 #: plug-ins/print/gimp_main_window.c:508
 msgid "Orientation:"
 msgstr "Orientation:"
diff --git a/po/ChangeLog b/po/ChangeLog
index 16f2ef95c2..dfd97b1825 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-18  Adam Weinberger  <adamw@gnome.org>
+
+	* en_CA.po: Updated Canadian English translation.
+
 2005-07-14  Sven Neumann  <sven@gimp.org>
 
 	* POTFILES.skip
diff --git a/po/en_CA.po b/po/en_CA.po
index 674f11058b..73ae218500 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-10 01:06-0400\n"
-"PO-Revision-Date: 2005-07-10 14:29-0400\n"
+"POT-Creation-Date: 2005-07-18 04:31-0400\n"
+"PO-Revision-Date: 2005-07-18 14:29-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -48,12 +48,7 @@ msgstr ""
 msgid "Opening '%s' failed: %s"
 msgstr "Opening '%s' failed: %s"
 
-#: app/batch.c:84
-#, c-format
-msgid "The batch interpreter '%s' is not available, batch mode disabled."
-msgstr "The batch interpreter '%s' is not available; batch mode disabled."
-
-#: app/batch.c:101
+#: app/batch.c:84 app/batch.c:101
 #, c-format
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
 msgstr "The batch interpreter '%s' is not available. Batch mode disabled."
@@ -281,7 +276,7 @@ msgid "Layers"
 msgstr "Layers"
 
 #: app/actions/actions.c:163 app/dialogs/dialogs.c:220
-#: app/widgets/gimppaletteeditor.c:194
+#: app/widgets/gimppaletteeditor.c:189
 msgid "Palette Editor"
 msgstr "Palette Editor"
 
@@ -578,8 +573,8 @@ msgstr "New Channel Colour"
 msgid "%s Channel Copy"
 msgstr "%s Channel Copy"
 
-#: app/actions/channels-commands.c:310 app/core/gimpselection.c:595
-#: app/pdb/selection_cmds.c:921 app/pdb/selection_cmds.c:1045
+#: app/actions/channels-commands.c:310 app/core/gimpselection.c:580
+#: app/pdb/selection_cmds.c:922 app/pdb/selection_cmds.c:1046
 msgid "Channel to Selection"
 msgstr "Channel to Selection"
 
@@ -728,7 +723,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: app/actions/data-commands.c:126 app/core/gimpimage.c:1348
+#: app/actions/data-commands.c:126 app/core/gimpimage.c:1349
 #: app/core/gimppalette-import.c:221 app/core/gimppalette.c:517
 #: app/core/gimppalette.c:627 app/dialogs/palette-import-dialog.c:692
 #: app/pdb/image_cmds.c:3838 app/widgets/gimpdnd-xds.c:83
@@ -1372,7 +1367,7 @@ msgid "_Quit"
 msgstr "_Quit"
 
 #: app/actions/file-commands.c:231 app/dialogs/file-save-dialog.c:464
-#: app/widgets/gimpdnd-xds.c:155
+#: app/widgets/gimpdnd-xds.c:158
 #, c-format
 msgid ""
 "Saving '%s' failed:\n"
@@ -2112,8 +2107,8 @@ msgid "Add Alpha C_hannel"
 msgstr "Add Alpha C_hannel"
 
 #: app/actions/layers-actions.c:181
-msgid "Kee_p Transparency"
-msgstr "Kee_p Transparency"
+msgid "Lock Alph_a Channel"
+msgstr "Lock Alph_a Channel"
 
 #: app/actions/layers-actions.c:187
 msgid "_Edit Layer Mask"
@@ -2189,7 +2184,7 @@ msgstr "Create a New Layer"
 msgid "Set Layer Boundary Size"
 msgstr "Set Layer Boundary Size"
 
-#: app/actions/layers-commands.c:514 app/core/gimplayer.c:253
+#: app/actions/layers-commands.c:514 app/core/gimplayer.c:286
 msgid "Scale Layer"
 msgstr "Scale Layer"
 
@@ -2201,7 +2196,7 @@ msgstr "Crop Layer"
 msgid "Layer Mask to Selection"
 msgstr "Layer Mask to Selection"
 
-#: app/actions/layers-commands.c:906 app/core/gimplayer.c:1139
+#: app/actions/layers-commands.c:906 app/core/gimplayer.c:1287
 #: app/dialogs/layer-add-mask-dialog.c:61
 msgid "Add Layer Mask"
 msgstr "Add Layer Mask"
@@ -2608,7 +2603,7 @@ msgstr "_Stroke Selection"
 msgid "Stroke selection with last values"
 msgstr "Stroke selection with last values"
 
-#: app/actions/select-commands.c:136 app/core/gimpselection.c:201
+#: app/actions/select-commands.c:136 app/core/gimpselection.c:196
 msgid "Feather Selection"
 msgstr "Feather Selection"
 
@@ -2616,7 +2611,7 @@ msgstr "Feather Selection"
 msgid "Feather selection by"
 msgstr "Feather selection by"
 
-#: app/actions/select-commands.c:171 app/core/gimpselection.c:208
+#: app/actions/select-commands.c:171 app/core/gimpselection.c:203
 msgid "Shrink Selection"
 msgstr "Shrink Selection"
 
@@ -2628,7 +2623,7 @@ msgstr "Shrink selection by"
 msgid "Shrink from image border"
 msgstr "Shrink from image border"
 
-#: app/actions/select-commands.c:205 app/core/gimpselection.c:207
+#: app/actions/select-commands.c:205 app/core/gimpselection.c:202
 msgid "Grow Selection"
 msgstr "Grow Selection"
 
@@ -2636,7 +2631,7 @@ msgstr "Grow Selection"
 msgid "Grow selection by"
 msgstr "Grow selection by"
 
-#: app/actions/select-commands.c:228 app/core/gimpselection.c:206
+#: app/actions/select-commands.c:228 app/core/gimpselection.c:201
 msgid "Border Selection"
 msgstr "Border Selection"
 
@@ -2650,7 +2645,7 @@ msgstr "Border selection by"
 msgid "There is no active layer or channel to stroke to."
 msgstr "There is no active layer or channel to stroke to."
 
-#: app/actions/select-commands.c:280 app/core/gimpselection.c:184
+#: app/actions/select-commands.c:280 app/core/gimpselection.c:180
 msgid "Stroke Selection"
 msgstr "Stroke Selection"
 
@@ -2729,7 +2724,7 @@ msgstr "Open"
 msgid "Load text from file"
 msgstr "Load text from file"
 
-#: app/actions/text-editor-actions.c:50 app/core/gimp-edit.c:339
+#: app/actions/text-editor-actions.c:50 app/core/gimp-edit.c:342
 msgid "Clear"
 msgstr "Clear"
 
@@ -3083,7 +3078,7 @@ msgid "Path to Selection"
 msgstr "Path to Selection"
 
 #: app/actions/vectors-commands.c:370 app/tools/gimpvectortool.c:1912
-#: app/vectors/gimpvectors.c:238
+#: app/vectors/gimpvectors.c:237
 msgid "Stroke Path"
 msgstr "Stroke Path"
 
@@ -4262,7 +4257,7 @@ msgstr "Merge layers"
 msgid "Merge vectors"
 msgstr "Merge vectors"
 
-#: app/core/core-enums.c:814 app/core/gimpchannel.c:387
+#: app/core/core-enums.c:814 app/core/gimpchannel.c:404
 msgid "Quick Mask"
 msgstr "Quick Mask"
 
@@ -4336,11 +4331,11 @@ msgstr "Anchor floating selection"
 msgid "Remove floating selection"
 msgstr "Remove floating selection"
 
-#: app/core/core-enums.c:833 app/core/gimp-edit.c:246
+#: app/core/core-enums.c:833 app/core/gimp-edit.c:248
 msgid "Paste"
 msgstr "Paste"
 
-#: app/core/core-enums.c:834 app/core/gimp-edit.c:407
+#: app/core/core-enums.c:834 app/core/gimp-edit.c:412
 msgid "Cut"
 msgstr "Cut"
 
@@ -4416,8 +4411,8 @@ msgid "Set layer opacity"
 msgstr "Set layer opacity"
 
 #: app/core/core-enums.c:861
-msgid "Set preserve trans"
-msgstr "Set preserve trans"
+msgid "Lock/Unlock alpha channel"
+msgstr "Lock/Unlock alpha channel"
 
 #: app/core/core-enums.c:863
 msgid "Text modified"
@@ -4480,31 +4475,31 @@ msgstr "Ink"
 msgid "EEK: can't undo"
 msgstr "EEK: cannot undo"
 
-#: app/core/gimp-edit.c:112 app/core/gimpselection.c:668
+#: app/core/gimp-edit.c:114 app/core/gimpselection.c:653
 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/gimp-edit.c:174 app/core/gimp-edit.c:308
+#: app/core/gimp-edit.c:176 app/core/gimp-edit.c:310
 msgid "Pasted Layer"
 msgstr "Pasted Layer"
 
-#: app/core/gimp-edit.c:358
+#: app/core/gimp-edit.c:361
 msgid "Fill with FG Color"
 msgstr "Fill with FG Colour"
 
-#: app/core/gimp-edit.c:362 app/core/gimp-edit.c:383
+#: app/core/gimp-edit.c:365 app/core/gimp-edit.c:386
 msgid "Fill with BG Color"
 msgstr "Fill with BG Colour"
 
-#: app/core/gimp-edit.c:366
+#: app/core/gimp-edit.c:369
 msgid "Fill with White"
 msgstr "Fill with White"
 
-#: app/core/gimp-edit.c:370
+#: app/core/gimp-edit.c:373
 msgid "Fill with Transparency"
 msgstr "Fill with Transparency"
 
-#: app/core/gimp-edit.c:374
+#: app/core/gimp-edit.c:377
 msgid "Fill with Pattern"
 msgstr "Fill with Pattern"
 
@@ -4658,87 +4653,87 @@ msgstr "File is truncated"
 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.c:284 app/pdb/internal_procs.c:96
+#: app/core/gimpchannel.c:296 app/pdb/internal_procs.c:96
 msgid "Channel"
 msgstr "Channel"
 
-#: app/core/gimpchannel.c:285
+#: app/core/gimpchannel.c:297
 msgid "Rename Channel"
 msgstr "Rename Channel"
 
-#: app/core/gimpchannel.c:286
+#: app/core/gimpchannel.c:298
 msgid "Move Channel"
 msgstr "Move Channel"
 
-#: app/core/gimpchannel.c:287
+#: app/core/gimpchannel.c:299
 msgid "Scale Channel"
 msgstr "Scale Channel"
 
-#: app/core/gimpchannel.c:288
+#: app/core/gimpchannel.c:300
 msgid "Resize Channel"
 msgstr "Resize Channel"
 
-#: app/core/gimpchannel.c:289
+#: app/core/gimpchannel.c:301
 msgid "Flip Channel"
 msgstr "Flip Channel"
 
-#: app/core/gimpchannel.c:290
+#: app/core/gimpchannel.c:302
 msgid "Rotate Channel"
 msgstr "Rotate Channel"
 
-#: app/core/gimpchannel.c:291 app/core/gimpdrawable-transform.c:1178
+#: app/core/gimpchannel.c:303 app/core/gimpdrawable-transform.c:1178
 msgid "Transform Channel"
 msgstr "Transform Channel"
 
-#: app/core/gimpchannel.c:292
+#: app/core/gimpchannel.c:304
 msgid "Stroke Channel"
 msgstr "Stroke Channel"
 
-#: app/core/gimpchannel.c:314
+#: app/core/gimpchannel.c:325
 msgid "Feather Channel"
 msgstr "Feather Channel"
 
-#: app/core/gimpchannel.c:315
+#: app/core/gimpchannel.c:326
 msgid "Sharpen Channel"
 msgstr "Sharpen Channel"
 
-#: app/core/gimpchannel.c:316
+#: app/core/gimpchannel.c:327
 msgid "Clear Channel"
 msgstr "Clear Channel"
 
-#: app/core/gimpchannel.c:317
+#: app/core/gimpchannel.c:328
 msgid "Fill Channel"
 msgstr "Fill Channel"
 
-#: app/core/gimpchannel.c:318
+#: app/core/gimpchannel.c:329
 msgid "Invert Channel"
 msgstr "Invert Channel"
 
-#: app/core/gimpchannel.c:319
+#: app/core/gimpchannel.c:330
 msgid "Border Channel"
 msgstr "Border Channel"
 
-#: app/core/gimpchannel.c:320
+#: app/core/gimpchannel.c:331
 msgid "Grow Channel"
 msgstr "Grow Channel"
 
-#: app/core/gimpchannel.c:321
+#: app/core/gimpchannel.c:332
 msgid "Shrink Channel"
 msgstr "Shrink Channel"
 
-#: app/core/gimpchannel.c:716
+#: app/core/gimpchannel.c:732
 msgid "Cannot stroke empty channel."
 msgstr "Cannot stroke empty channel."
 
-#: app/core/gimpchannel.c:1612
+#: app/core/gimpchannel.c:1629
 msgid "Set Channel Color"
 msgstr "Set Channel Colour"
 
-#: app/core/gimpchannel.c:1660
+#: app/core/gimpchannel.c:1677
 msgid "Set Channel Opacity"
 msgstr "Set Channel Opacity"
 
-#: app/core/gimpchannel.c:1728 app/core/gimpselection.c:563
+#: app/core/gimpchannel.c:1745 app/core/gimpselection.c:548
 msgid "Selection Mask"
 msgstr "Selection Mask"
 
@@ -4812,7 +4807,7 @@ msgstr "Blend"
 msgid "No patterns available for this operation."
 msgstr "No patterns available for this operation."
 
-#: app/core/gimpdrawable-bucket-fill.c:272 app/tools/gimpbucketfilltool.c:91
+#: app/core/gimpdrawable-bucket-fill.c:272 app/tools/gimpbucketfilltool.c:92
 msgid "Bucket Fill"
 msgstr "Bucket Fill"
 
@@ -4843,7 +4838,7 @@ msgid "Render Stroke"
 msgstr "Render Stroke"
 
 #. Start a transform undo group
-#: app/core/gimpdrawable-transform.c:972 app/tools/gimpfliptool.c:80
+#: app/core/gimpdrawable-transform.c:972 app/tools/gimpfliptool.c:81
 msgid "Flip"
 msgstr "Flip"
 
@@ -4852,7 +4847,7 @@ msgstr "Flip"
 msgid "Rotate"
 msgstr "Rotate"
 
-#: app/core/gimpdrawable-transform.c:1176 app/core/gimplayer.c:257
+#: app/core/gimpdrawable-transform.c:1176 app/core/gimplayer.c:290
 msgid "Transform Layer"
 msgstr "Transform Layer"
 
@@ -5050,139 +5045,139 @@ msgstr "Move Sample Point"
 msgid "Can't undo %s"
 msgstr "Cannot undo %s"
 
-#: app/core/gimpimage.c:1422
+#: app/core/gimpimage.c:1423
 msgid "Change Image Resolution"
 msgstr "Change Image Resolution"
 
-#: app/core/gimpimage.c:1462
+#: app/core/gimpimage.c:1463
 msgid "Change Image Unit"
 msgstr "Change Image Unit"
 
-#: app/core/gimpimage.c:2275
+#: app/core/gimpimage.c:2276
 msgid "Attach Parasite to Image"
 msgstr "Attach Parasite to Image"
 
-#: app/core/gimpimage.c:2308
+#: app/core/gimpimage.c:2309
 msgid "Remove Parasite from Image"
 msgstr "Remove Parasite from Image"
 
-#: app/core/gimpimage.c:2776
+#: app/core/gimpimage.c:2777
 msgid "Add Layer"
 msgstr "Add Layer"
 
-#: app/core/gimpimage.c:2840 app/core/gimpimage.c:2853
+#: app/core/gimpimage.c:2841 app/core/gimpimage.c:2854
 msgid "Remove Layer"
 msgstr "Remove Layer"
 
-#: app/core/gimpimage.c:2927
+#: app/core/gimpimage.c:2928
 msgid "Layer cannot be raised higher."
 msgstr "Layer cannot be raised higher."
 
-#: app/core/gimpimage.c:2932
+#: app/core/gimpimage.c:2933
 msgid "Raise Layer"
 msgstr "Raise Layer"
 
-#: app/core/gimpimage.c:2949
+#: app/core/gimpimage.c:2950
 msgid "Layer cannot be lowered more."
 msgstr "Layer cannot be lowered more."
 
-#: app/core/gimpimage.c:2954
+#: app/core/gimpimage.c:2955
 msgid "Lower Layer"
 msgstr "Lower Layer"
 
-#: app/core/gimpimage.c:2971
+#: app/core/gimpimage.c:2972
 msgid "Layer is already on top."
 msgstr "Layer is already on top."
 
-#: app/core/gimpimage.c:2976
+#: app/core/gimpimage.c:2977
 msgid "Raise Layer to Top"
 msgstr "Raise Layer to Top"
 
-#: app/core/gimpimage.c:2996
+#: app/core/gimpimage.c:2997
 msgid "Layer is already on the bottom."
 msgstr "Layer is already on the bottom."
 
-#: app/core/gimpimage.c:3001
+#: app/core/gimpimage.c:3002
 msgid "Lower Layer to Bottom"
 msgstr "Lower Layer to Bottom"
 
-#: app/core/gimpimage.c:3074
+#: app/core/gimpimage.c:3075
 msgid "Add Channel"
 msgstr "Add Channel"
 
-#: app/core/gimpimage.c:3118 app/core/gimpimage.c:3129
+#: app/core/gimpimage.c:3119 app/core/gimpimage.c:3130
 msgid "Remove Channel"
 msgstr "Remove Channel"
 
-#: app/core/gimpimage.c:3176
+#: app/core/gimpimage.c:3177
 msgid "Channel cannot be raised higher."
 msgstr "Channel cannot be raised higher."
 
-#: app/core/gimpimage.c:3181
+#: app/core/gimpimage.c:3182
 msgid "Raise Channel"
 msgstr "Raise Channel"
 
-#: app/core/gimpimage.c:3198
+#: app/core/gimpimage.c:3199
 msgid "Channel is already on top."
 msgstr "Channel is already on top."
 
-#: app/core/gimpimage.c:3203
+#: app/core/gimpimage.c:3204
 msgid "Raise Channel to Top"
 msgstr "Raise Channel to Top"
 
-#: app/core/gimpimage.c:3220
+#: app/core/gimpimage.c:3221
 msgid "Channel cannot be lowered more."
 msgstr "Channel cannot be lowered more."
 
-#: app/core/gimpimage.c:3225
+#: app/core/gimpimage.c:3226
 msgid "Lower Channel"
 msgstr "Lower Channel"
 
-#: app/core/gimpimage.c:3245
+#: app/core/gimpimage.c:3246
 msgid "Channel is already on the bottom."
 msgstr "Channel is already on the bottom."
 
-#: app/core/gimpimage.c:3250
+#: app/core/gimpimage.c:3251
 msgid "Lower Channel to Bottom"
 msgstr "Lower Channel to Bottom"
 
-#: app/core/gimpimage.c:3325
+#: app/core/gimpimage.c:3326
 msgid "Add Path"
 msgstr "Add Path"
 
-#: app/core/gimpimage.c:3370
+#: app/core/gimpimage.c:3371
 msgid "Remove Path"
 msgstr "Remove Path"
 
-#: app/core/gimpimage.c:3414
+#: app/core/gimpimage.c:3415
 msgid "Path cannot be raised higher."
 msgstr "Path cannot be raised higher."
 
-#: app/core/gimpimage.c:3419
+#: app/core/gimpimage.c:3420
 msgid "Raise Path"
 msgstr "Raise Path"
 
-#: app/core/gimpimage.c:3436
+#: app/core/gimpimage.c:3437
 msgid "Path is already on top."
 msgstr "Path is already on top."
 
-#: app/core/gimpimage.c:3441
+#: app/core/gimpimage.c:3442
 msgid "Raise Path to Top"
 msgstr "Raise Path to Top"
 
-#: app/core/gimpimage.c:3458
+#: app/core/gimpimage.c:3459
 msgid "Path cannot be lowered more."
 msgstr "Path cannot be lowered more."
 
-#: app/core/gimpimage.c:3463
+#: app/core/gimpimage.c:3464
 msgid "Lower Path"
 msgstr "Lower Path"
 
-#: app/core/gimpimage.c:3483
+#: app/core/gimpimage.c:3484
 msgid "Path is already on the bottom."
 msgstr "Path is already on the bottom."
 
-#: app/core/gimpimage.c:3488
+#: app/core/gimpimage.c:3489
 msgid "Lower Path to Bottom"
 msgstr "Lower Path to Bottom"
 
@@ -5219,7 +5214,7 @@ msgid "(Preview may be out of date)"
 msgstr "(Preview may be out of date)"
 
 #. pixel size
-#: app/core/gimpimagefile.c:638 app/widgets/gimpimagepropview.c:286
+#: app/core/gimpimagefile.c:638 app/widgets/gimpimagepropview.c:289
 #: app/widgets/gimpsizebox.c:430 app/widgets/gimptemplateeditor.c:633
 #: app/widgets/gimptemplateeditor.c:671
 #, c-format
@@ -5286,37 +5281,37 @@ msgstr ""
 msgid "Floating Selection to Layer"
 msgstr "Floating Selection to Layer"
 
-#: app/core/gimplayer.c:250 app/pdb/internal_procs.c:153
+#: app/core/gimplayer.c:283 app/pdb/internal_procs.c:153
 msgid "Layer"
 msgstr "Layer"
 
-#: app/core/gimplayer.c:251
+#: app/core/gimplayer.c:284
 msgid "Rename Layer"
 msgstr "Rename Layer"
 
-#: app/core/gimplayer.c:252 app/pdb/layer_cmds.c:669 app/pdb/layer_cmds.c:742
+#: app/core/gimplayer.c:285 app/pdb/layer_cmds.c:669 app/pdb/layer_cmds.c:742
 msgid "Move Layer"
 msgstr "Move Layer"
 
-#: app/core/gimplayer.c:254
+#: app/core/gimplayer.c:287
 msgid "Resize Layer"
 msgstr "Resize Layer"
 
-#: app/core/gimplayer.c:255
+#: app/core/gimplayer.c:288
 msgid "Flip Layer"
 msgstr "Flip Layer"
 
-#: app/core/gimplayer.c:256
+#: app/core/gimplayer.c:289
 msgid "Rotate Layer"
 msgstr "Rotate Layer"
 
-#: app/core/gimplayer.c:339 app/core/gimplayer.c:1183
+#: app/core/gimplayer.c:441 app/core/gimplayer.c:1331
 #: app/core/gimplayermask.c:237
 #, c-format
 msgid "%s mask"
 msgstr "%s mask"
 
-#: app/core/gimplayer.c:385
+#: app/core/gimplayer.c:487
 #, c-format
 msgid ""
 "Floating Selection\n"
@@ -5325,39 +5320,39 @@ msgstr ""
 "Floating Selection\n"
 "(%s)"
 
-#: app/core/gimplayer.c:1109
+#: app/core/gimplayer.c:1257
 msgid "Cannot add layer mask to layer which is not part of an image."
 msgstr "Cannot add layer mask to layer which is not part of an image."
 
-#: app/core/gimplayer.c:1116
+#: app/core/gimplayer.c:1264
 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:1123
+#: app/core/gimplayer.c:1271
 msgid "Cannot add layer mask to a layer with no alpha channel."
 msgstr "Cannot add layer mask to a layer with no alpha channel."
 
-#: app/core/gimplayer.c:1133
+#: app/core/gimplayer.c:1281
 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:1237
+#: app/core/gimplayer.c:1385
 msgid "Transfer Alpha to Mask"
 msgstr "Transfer Alpha to Mask"
 
-#: app/core/gimplayer.c:1397 app/core/gimplayermask.c:264
+#: app/core/gimplayer.c:1545 app/core/gimplayermask.c:264
 msgid "Apply Layer Mask"
 msgstr "Apply Layer Mask"
 
-#: app/core/gimplayer.c:1398
+#: app/core/gimplayer.c:1546
 msgid "Delete Layer Mask"
 msgstr "Delete Layer Mask"
 
-#: app/core/gimplayer.c:1499
+#: app/core/gimplayer.c:1647
 msgid "Add Alpha Channel"
 msgstr "Add Alpha Channel"
 
-#: app/core/gimplayer.c:1521
+#: app/core/gimplayer.c:1669
 msgid "Layer to Image Size"
 msgstr "Layer to Image Size"
 
@@ -5465,39 +5460,39 @@ msgstr "Unable to run %s callback. The corresponding plug-in may have crashed."
 msgid "Please wait..."
 msgstr "Please wait..."
 
-#: app/core/gimpselection.c:183 app/tools/gimpeditselectiontool.c:258
+#: app/core/gimpselection.c:179 app/tools/gimpeditselectiontool.c:258
 msgid "Move Selection"
 msgstr "Move Selection"
 
-#: app/core/gimpselection.c:202
+#: app/core/gimpselection.c:197
 msgid "Sharpen Selection"
 msgstr "Sharpen Selection"
 
-#: app/core/gimpselection.c:203
+#: app/core/gimpselection.c:198
 msgid "Select None"
 msgstr "Select None"
 
-#: app/core/gimpselection.c:204
+#: app/core/gimpselection.c:199
 msgid "Select All"
 msgstr "Select All"
 
-#: app/core/gimpselection.c:205
+#: app/core/gimpselection.c:200
 msgid "Invert Selection"
 msgstr "Invert Selection"
 
-#: app/core/gimpselection.c:307
+#: app/core/gimpselection.c:301
 msgid "No selection to stroke."
 msgstr "No selection to stroke."
 
-#: app/core/gimpselection.c:822
+#: app/core/gimpselection.c:807
 msgid "Cannot float selection because the selected region is empty."
 msgstr "Cannot float selection because the selected region is empty."
 
-#: app/core/gimpselection.c:829
+#: app/core/gimpselection.c:814
 msgid "Float Selection"
 msgstr "Float Selection"
 
-#: app/core/gimpselection.c:846
+#: app/core/gimpselection.c:831
 msgid "Floated Layer"
 msgstr "Floated Layer"
 
@@ -6527,7 +6522,7 @@ msgstr "Get Monitor Resolution"
 msgid "Pixels"
 msgstr "Pixels"
 
-#: app/dialogs/preferences-dialog.c:2076 app/widgets/gimpimagepropview.c:318
+#: app/dialogs/preferences-dialog.c:2076 app/widgets/gimpimagepropview.c:321
 msgid "dpi"
 msgstr "dpi"
 
@@ -7594,7 +7589,7 @@ msgstr "Airbrush"
 msgid "No brushes available for use with this tool."
 msgstr "No brushes available for use with this tool."
 
-#: app/paint/gimpclone.c:89 app/tools/gimpclonetool.c:92
+#: app/paint/gimpclone.c:89 app/tools/gimpclonetool.c:93
 msgid "Clone"
 msgstr "Clone"
 
@@ -7827,7 +7822,7 @@ msgstr "Transform Tool procedures"
 msgid "Units"
 msgstr "Units"
 
-#: app/pdb/procedural_db.c:261
+#: app/pdb/procedural_db.c:267
 #, c-format
 msgid ""
 "PDB calling error:\n"
@@ -7836,7 +7831,7 @@ msgstr ""
 "PDB calling error:\n"
 "procedure '%s' not found"
 
-#: app/pdb/procedural_db.c:288 app/pdb/procedural_db.c:414
+#: app/pdb/procedural_db.c:294 app/pdb/procedural_db.c:420
 #, c-format
 msgid ""
 "PDB calling error for procedure '%s':\n"
@@ -8221,11 +8216,11 @@ msgstr "Fill transparent areas"
 msgid "Sample merged"
 msgstr "Sample merged"
 
-#: app/tools/gimpbucketfilltool.c:92
+#: app/tools/gimpbucketfilltool.c:93
 msgid "Fill with a color or pattern"
 msgstr "Fill with a colour or pattern"
 
-#: app/tools/gimpbucketfilltool.c:93
+#: app/tools/gimpbucketfilltool.c:94
 msgid "_Bucket Fill"
 msgstr "_Bucket Fill"
 
@@ -8241,23 +8236,23 @@ msgstr "Select regions by colour"
 msgid "_By Color Select"
 msgstr "_By Colour Select"
 
-#: app/tools/gimpclonetool.c:93
+#: app/tools/gimpclonetool.c:94
 msgid "Paint using Patterns or Image Regions"
 msgstr "Paint using Patterns or Image Regions"
 
-#: app/tools/gimpclonetool.c:94
+#: app/tools/gimpclonetool.c:95
 msgid "_Clone"
 msgstr "_Clone"
 
-#: app/tools/gimpclonetool.c:257
+#: app/tools/gimpclonetool.c:258
 msgid "Ctrl-Click to set a clone source."
 msgstr "Ctrl-Click to set a clone source."
 
-#: app/tools/gimpclonetool.c:315
+#: app/tools/gimpclonetool.c:316
 msgid "Source"
 msgstr "Source"
 
-#: app/tools/gimpclonetool.c:324
+#: app/tools/gimpclonetool.c:325
 msgid "Alignment"
 msgstr "Alignment"
 
@@ -8358,20 +8353,20 @@ msgstr "Pick Mode  %s"
 msgid "Add to palette  %s"
 msgstr "Add to palette  %s"
 
-#: app/tools/gimpcolorpickertool.c:100
+#: app/tools/gimpcolorpickertool.c:101
 msgid "Color Picker"
 msgstr "Colour Picker"
 
-#: app/tools/gimpcolorpickertool.c:101
+#: app/tools/gimpcolorpickertool.c:102
 msgid "Pick colors from the image"
 msgstr "Pick colours from the image"
 
-#: app/tools/gimpcolorpickertool.c:102
+#: app/tools/gimpcolorpickertool.c:103
 msgid "C_olor Picker"
 msgstr "C_olour Picker"
 
 #. tool->gdisp->shell
-#: app/tools/gimpcolorpickertool.c:346
+#: app/tools/gimpcolorpickertool.c:351
 msgid "Color Picker Information"
 msgstr "Colour Picker Information"
 
@@ -8579,11 +8574,11 @@ msgstr "Affect:"
 msgid "Flip Type  %s"
 msgstr "Flip Type  %s"
 
-#: app/tools/gimpfliptool.c:81
+#: app/tools/gimpfliptool.c:82
 msgid "Flip the layer or selection"
 msgstr "Flip the layer or selection"
 
-#: app/tools/gimpfliptool.c:82
+#: app/tools/gimpfliptool.c:83
 msgid "_Flip"
 msgstr "_Flip"
 
@@ -8732,15 +8727,15 @@ msgstr "Draw in ink"
 msgid "In_k"
 msgstr "In_k"
 
-#: app/tools/gimpiscissorstool.c:277
+#: app/tools/gimpiscissorstool.c:278
 msgid "Scissors"
 msgstr "Scissors"
 
-#: app/tools/gimpiscissorstool.c:278
+#: app/tools/gimpiscissorstool.c:279
 msgid "Select shapes from image"
 msgstr "Select shapes from image"
 
-#: app/tools/gimpiscissorstool.c:279
+#: app/tools/gimpiscissorstool.c:280
 msgid "Intelligent _Scissors"
 msgstr "Intelligent _Scissors"
 
@@ -8903,16 +8898,16 @@ msgstr "Paint fuzzy brush strokes"
 msgid "_Paintbrush"
 msgstr "_Paintbrush"
 
-#: app/tools/gimppaintoptions-gui.c:102 app/widgets/gimpbrushselect.c:201
-#: app/widgets/gimplayertreeview.c:337
-msgid "Opacity:"
-msgstr "Opacity:"
-
-#: app/tools/gimppaintoptions-gui.c:107 app/tools/gimpselectionoptions.c:429
-#: app/widgets/gimpbrushselect.c:214 app/widgets/gimplayertreeview.c:330
+#: app/tools/gimppaintoptions-gui.c:102 app/tools/gimpselectionoptions.c:429
+#: app/widgets/gimpbrushselect.c:214 app/widgets/gimplayertreeview.c:295
 msgid "Mode:"
 msgstr "Mode:"
 
+#: app/tools/gimppaintoptions-gui.c:108 app/widgets/gimpbrushselect.c:201
+#: app/widgets/gimplayertreeview.c:310
+msgid "Opacity:"
+msgstr "Opacity:"
+
 #: app/tools/gimppaintoptions-gui.c:125
 msgid "Brush:"
 msgstr "Brush:"
@@ -9067,24 +9062,24 @@ msgstr "Fix"
 msgid "Center"
 msgstr "Centre"
 
-#: app/tools/gimprectangletool.c:804 app/tools/gimprectangletool.c:1177
+#: app/tools/gimprectangletool.c:805 app/tools/gimprectangletool.c:1178
 msgid "Rectangle: "
 msgstr "Rectangle: "
 
-#: app/tools/gimprectangletool.c:1576
+#: app/tools/gimprectangletool.c:1577
 msgid "1 "
 msgstr "1 "
 
-#: app/tools/gimprectangletool.c:1577
+#: app/tools/gimprectangletool.c:1578
 msgid "2 "
 msgstr "2 "
 
-#: app/tools/gimprectangletool.c:1578 app/widgets/gimpcursorview.c:170
+#: app/tools/gimprectangletool.c:1579 app/widgets/gimpcursorview.c:170
 #: app/widgets/gimpcursorview.c:192
 msgid "X"
 msgstr "X"
 
-#: app/tools/gimprectangletool.c:1579 app/widgets/gimpcursorview.c:176
+#: app/tools/gimprectangletool.c:1580 app/widgets/gimpcursorview.c:176
 #: app/widgets/gimpcursorview.c:198
 msgid "Y"
 msgstr "Y"
@@ -9197,19 +9192,19 @@ msgstr "Select transparent areas"
 msgid "Auto shrink selection"
 msgstr "Auto shrink selection"
 
-#: app/tools/gimpselectiontool.c:257
+#: app/tools/gimpselectiontool.c:259
 msgid "Move the selection mask"
 msgstr "Move the selection mask"
 
-#: app/tools/gimpselectiontool.c:261
+#: app/tools/gimpselectiontool.c:263
 msgid "Move the selected pixels"
 msgstr "Move the selected pixels"
 
-#: app/tools/gimpselectiontool.c:265
+#: app/tools/gimpselectiontool.c:267
 msgid "Move a copy of the selected pixels"
 msgstr "Move a copy of the selected pixels"
 
-#: app/tools/gimpselectiontool.c:269
+#: app/tools/gimpselectiontool.c:271
 msgid "Anchor the floating selection"
 msgstr "Anchor the floating selection"
 
@@ -9415,7 +9410,7 @@ msgstr "Keep width  %s"
 msgid "Keep aspect  %s"
 msgstr "Keep aspect  %s"
 
-#: app/tools/gimptransformtool.c:254
+#: app/tools/gimptransformtool.c:255
 msgid "Transforming..."
 msgstr "Transforming..."
 
@@ -9576,39 +9571,39 @@ msgstr "Delete Anchors"
 msgid "There is no active layer or channel to stroke to"
 msgstr "There is no active layer or channel to stroke to"
 
-#: app/vectors/gimpvectors.c:230
+#: app/vectors/gimpvectors.c:229
 msgid "Path"
 msgstr "Path"
 
-#: app/vectors/gimpvectors.c:231
+#: app/vectors/gimpvectors.c:230
 msgid "Rename Path"
 msgstr "Rename Path"
 
-#: app/vectors/gimpvectors.c:232 app/vectors/gimpvectors.c:359
+#: app/vectors/gimpvectors.c:231 app/vectors/gimpvectors.c:358
 msgid "Move Path"
 msgstr "Move Path"
 
-#: app/vectors/gimpvectors.c:233
+#: app/vectors/gimpvectors.c:232
 msgid "Scale Path"
 msgstr "Scale Path"
 
-#: app/vectors/gimpvectors.c:234
+#: app/vectors/gimpvectors.c:233
 msgid "Resize Path"
 msgstr "Resize Path"
 
-#: app/vectors/gimpvectors.c:235 app/vectors/gimpvectors.c:453
+#: app/vectors/gimpvectors.c:234 app/vectors/gimpvectors.c:452
 msgid "Flip Path"
 msgstr "Flip Path"
 
-#: app/vectors/gimpvectors.c:236 app/vectors/gimpvectors.c:484
+#: app/vectors/gimpvectors.c:235 app/vectors/gimpvectors.c:483
 msgid "Rotate Path"
 msgstr "Rotate Path"
 
-#: app/vectors/gimpvectors.c:237 app/vectors/gimpvectors.c:515
+#: app/vectors/gimpvectors.c:236 app/vectors/gimpvectors.c:514
 msgid "Transform Path"
 msgstr "Transform Path"
 
-#: app/vectors/gimpvectors.c:544
+#: app/vectors/gimpvectors.c:542
 msgid "Cannot stroke empty path."
 msgstr "Cannot stroke empty path."
 
@@ -9736,7 +9731,7 @@ msgid "Add the selected filter to the list of active filters."
 msgstr "Add the selected filter to the list of active filters."
 
 #: app/widgets/gimpcolordisplayeditor.c:224
-#: app/widgets/gimpcontrollerlist.c:297
+#: app/widgets/gimpcontrollerlist.c:298
 msgid "Remove the selected filter from the list of active filters."
 msgstr "Remove the selected filter from the list of active filters."
 
@@ -10018,31 +10013,31 @@ msgstr "Keyboard Events"
 msgid "Ready"
 msgstr "Ready"
 
-#: app/widgets/gimpcontrollerlist.c:212
+#: app/widgets/gimpcontrollerlist.c:213
 msgid "Available Controllers"
 msgstr "Available Controllers"
 
-#: app/widgets/gimpcontrollerlist.c:277
+#: app/widgets/gimpcontrollerlist.c:278
 msgid "Create a controller of the selected type."
 msgstr "Create a controller of the selected type."
 
-#: app/widgets/gimpcontrollerlist.c:312
+#: app/widgets/gimpcontrollerlist.c:313
 msgid "Active Controllers"
 msgstr "Active Controllers"
 
-#: app/widgets/gimpcontrollerlist.c:328
+#: app/widgets/gimpcontrollerlist.c:329
 msgid "Configure the selected controller"
 msgstr "Configure the selected controller"
 
-#: app/widgets/gimpcontrollerlist.c:336
+#: app/widgets/gimpcontrollerlist.c:337
 msgid "Move the selected controller up"
 msgstr "Move the selected controller up"
 
-#: app/widgets/gimpcontrollerlist.c:344
+#: app/widgets/gimpcontrollerlist.c:345
 msgid "Move the selected controller down"
 msgstr "Move the selected controller down"
 
-#: app/widgets/gimpcontrollerlist.c:516
+#: app/widgets/gimpcontrollerlist.c:517
 msgid ""
 "There can only be one active keyboard controller.\n"
 "\n"
@@ -10052,7 +10047,7 @@ msgstr ""
 "\n"
 "You already have a keyboard controller in your list of active controllers."
 
-#: app/widgets/gimpcontrollerlist.c:524
+#: app/widgets/gimpcontrollerlist.c:525
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
@@ -10062,24 +10057,24 @@ msgstr ""
 "\n"
 "You already have a wheel controller in your list of active controllers."
 
-#: app/widgets/gimpcontrollerlist.c:550
+#: app/widgets/gimpcontrollerlist.c:551
 msgid "Remove Controller?"
 msgstr "Remove Controller?"
 
-#: app/widgets/gimpcontrollerlist.c:555
+#: app/widgets/gimpcontrollerlist.c:556
 msgid "Disable Controller"
 msgstr "Disable Controller"
 
-#: app/widgets/gimpcontrollerlist.c:557
+#: app/widgets/gimpcontrollerlist.c:558
 msgid "Remove Controller"
 msgstr "Remove Controller"
 
-#: app/widgets/gimpcontrollerlist.c:568
+#: app/widgets/gimpcontrollerlist.c:569
 #, c-format
 msgid "Remove Controller '%s'?"
 msgstr "Remove Controller '%s'?"
 
-#: app/widgets/gimpcontrollerlist.c:572
+#: app/widgets/gimpcontrollerlist.c:573
 msgid ""
 "Removing this controller from the list of active controllers will "
 "permanently delete all event mappings you have configured.\n"
@@ -10093,11 +10088,11 @@ msgstr ""
 "Selecting \"Disable Controller\" will disable the controller without "
 "removing it."
 
-#: app/widgets/gimpcontrollerlist.c:633
+#: app/widgets/gimpcontrollerlist.c:634
 msgid "Configure Controller"
 msgstr "Configure Controller"
 
-#: app/widgets/gimpcontrollerlist.c:636
+#: app/widgets/gimpcontrollerlist.c:637
 msgid "Configure Input Controller"
 msgstr "Configure Input Controller"
 
@@ -10264,7 +10259,7 @@ msgstr "Foreground: %d, %d, %d"
 msgid "Background: %d, %d, %d"
 msgstr "Background: %d, %d, %d"
 
-#: app/widgets/gimpdnd-xds.c:170
+#: app/widgets/gimpdnd-xds.c:174
 msgid "The given filename does not have any known file extension."
 msgstr "The given filename does not have any known file extension."
 
@@ -10536,28 +10531,32 @@ msgid "Size in memory:"
 msgstr "Size in memory:"
 
 #: app/widgets/gimpimagepropview.c:196
+msgid "Number of pixels:"
+msgstr "Number of pixels:"
+
+#: app/widgets/gimpimagepropview.c:199
 msgid "Number of layers:"
 msgstr "Number of layers:"
 
-#: app/widgets/gimpimagepropview.c:199
+#: app/widgets/gimpimagepropview.c:202
 msgid "Number of channels:"
 msgstr "Number of channels:"
 
-#: app/widgets/gimpimagepropview.c:202
+#: app/widgets/gimpimagepropview.c:205
 msgid "Number of paths:"
 msgstr "Number of paths:"
 
-#: app/widgets/gimpimagepropview.c:313
+#: app/widgets/gimpimagepropview.c:316
 #, c-format
 msgid "pixels/%s"
 msgstr "pixels/%s"
 
-#: app/widgets/gimpimagepropview.c:315
+#: app/widgets/gimpimagepropview.c:318
 #, c-format
 msgid "%g x %g %s"
 msgstr "%g x %g %s"
 
-#: app/widgets/gimpimagepropview.c:335
+#: app/widgets/gimpimagepropview.c:338
 msgid "colors"
 msgstr "colours"
 
@@ -10573,9 +10572,13 @@ msgstr "Set Item Exclusive Linked"
 msgid "Reorder Layer"
 msgstr "Reorder Layer"
 
-#: app/widgets/gimplayertreeview.c:318
-msgid "Keep transparency"
-msgstr "Keep transparency"
+#: app/widgets/gimplayertreeview.c:332
+msgid "Lock alpha channel"
+msgstr "Lock alpha channel"
+
+#: app/widgets/gimplayertreeview.c:344
+msgid "Lock:"
+msgstr "Lock:"
 
 #: app/widgets/gimplayertreeview.c:877
 msgid "Empty Layer"
@@ -10601,11 +10604,11 @@ msgstr "Message repeated %d times."
 msgid "Message repeated once."
 msgstr "Message repeated once."
 
-#: app/widgets/gimppaletteeditor.c:269 app/widgets/gimppaletteeditor.c:1006
+#: app/widgets/gimppaletteeditor.c:270 app/widgets/gimppaletteeditor.c:692
 msgid "Undefined"
 msgstr "Undefined"
 
-#: app/widgets/gimppaletteeditor.c:277
+#: app/widgets/gimppaletteeditor.c:278
 msgid "Columns:"
 msgstr "Columns:"