Minor GUI sring change

* "Sample all layers" is accurate for the colour selector tool,
  but doesn't feel quite right for the clone tool.
  "Include all layers" is simpler and fits more situations.

* Changed "Width" to the more general and accurate "Size".

* Updated en.cakeys

Author: humdingerb

artpaint/tools/CloneTool.cpp

@@ -365,7 +365,7 @@ CloneToolConfigView::CloneToolConfigView(DrawingTool* tool)
 		message->AddInt32("option", SIZE_OPTION);
 		message->AddInt32("value", tool->GetCurrentValue(SIZE_OPTION));
 
-		fLineSize = new NumberSliderControl(B_TRANSLATE("Width:"), "1", message, 1, 100, false);
+		fLineSize = new NumberSliderControl(B_TRANSLATE("Size:"), "1", message, 1, 100, false);
 
 		BGridLayout* lineSizeLayout = LayoutSliderGrid(fLineSize);
 
@@ -392,7 +392,7 @@ CloneToolConfigView::CloneToolConfigView(DrawingTool* tool)
 		message->AddInt32("option", PREVIEW_ENABLED_OPTION);
 		message->AddInt32("value", 0x00000000);
 
-		fAllLayersCheckbox = new BCheckBox(B_TRANSLATE("Sample all layers"), message);
+		fAllLayersCheckbox = new BCheckBox(B_TRANSLATE("Include all layers"), message);
 
 		layout->AddView(BGroupLayoutBuilder(B_VERTICAL, kWidgetSpacing)
 			.Add(lineSizeLayout)

artpaint/tools/ColorSelectorTool.cpp

@@ -448,7 +448,7 @@ ColorSelectorToolConfigView::ColorSelectorToolConfigView(DrawingTool* tool)
 		BMessage* all_layers_message = new BMessage(OPTION_CHANGED);
 		all_layers_message->AddInt32("option", MODE_OPTION);
 		all_layers_message->AddInt32("value", tool->GetCurrentValue(MODE_OPTION));
-		fAllLayersCheckbox = new BCheckBox(B_TRANSLATE("Sample all layers"), all_layers_message);
+		fAllLayersCheckbox = new BCheckBox(B_TRANSLATE("Include all layers"), all_layers_message);
 
 		BGridLayout* sizeLayout = LayoutSliderGrid(fSizeSlider);
 

locales/en.catkeys

@@ -1,4 +1,4 @@
-1	English	application/x-vnd.artpaint	3020182180
+1	English	application/x-vnd.artpaint	3460213630
 Angle:	Manipulators		Angle:
 Lighten	PixelOperations		Lighten
 Enable antialiasing	Manipulators		Enable antialiasing
@@ -50,6 +50,7 @@ Fill rectangle	Tools		Fill rectangle
 Text tool	Manipulators		Text tool
 Bicubic (B-spline)	ScaleUtilities		Bicubic (B-spline)
 Spray	Tools		Spray
+Include all layers	Tools		Include all layers
 Colors:	Windows		Colors:
 Fill tool: SHIFT locks 22.5° angles	Tools		Fill tool: SHIFT locks 22.5° angles
 Zoom in	PaintWindow		Zoom in
@@ -404,7 +405,6 @@ Transparency	Windows		Transparency
 Add layer	Image		Add layer
 Opens the colors window.	PaintWindow		Opens the colors window.
 Quits ArtPaint.	PaintWindow		Quits ArtPaint.
-Sample all layers	Tools		Sample all layers
 Transparency	Tools		Transparency
 Layer transparency	ImageView		Layer transparency
 Delete	PaintWindow		Delete