[gimp] app: tooltip of Color Picker's "Sample average" option mixed up.

[Jehan Pagès <jehanp src gnome org>]

commit c2665a2e43e8c62376b6ef02d603b9f94d5394ad
Author: Jehan <jehan girinstud io>
Date:   Fri Dec 23 00:49:53 2016 +0100

    app: tooltip of Color Picker's "Sample average" option mixed up.
    
    This should be "Sample merge"'s tooltip.

 app/tools/gimpcoloroptions.c       |    6 ++++--
 app/tools/gimpcolorpickeroptions.c |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/app/tools/gimpcoloroptions.c b/app/tools/gimpcoloroptions.c
index 9a70daa..fa849d5 100644
--- a/app/tools/gimpcoloroptions.c
+++ b/app/tools/gimpcoloroptions.c
@@ -67,14 +67,16 @@ gimp_color_options_class_init (GimpColorOptionsClass *klass)
   GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_MERGED,
                             "sample-merged",
                             _("Sample merged"),
-                            NULL,
+                            _("Use accumulated color value from "
+                              "all composited visible layers"),
                             FALSE,
                             GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_SAMPLE_AVERAGE,
                             "sample-average",
                             _("Sample average"),
-                            NULL,
+                            _("Use accumulated color value from "
+                              "nearby pixels"),
                             TRUE,
                             GIMP_PARAM_STATIC_STRINGS);
 
diff --git a/app/tools/gimpcolorpickeroptions.c b/app/tools/gimpcolorpickeroptions.c
index 48c104a..1956204 100644
--- a/app/tools/gimpcolorpickeroptions.c
+++ b/app/tools/gimpcolorpickeroptions.c
@@ -68,7 +68,7 @@ gimp_color_picker_options_class_init (GimpColorPickerOptionsClass *klass)
                             "sample-average",
                             _("Sample average"),
                             _("Use accumulated color value from "
-                              "all composited visible layers"),
+                              "nearby pixels"),
                             FALSE,
                             GIMP_PARAM_STATIC_STRINGS);