[gimp] Bug 776417 - improve Sample Average and Sample Merged description.

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

commit 8111ad62da364a7ed10d98a347ee9541a3d096cd
Author: Jehan <jehan girinstud io>
Date:   Mon Jan 2 22:35:38 2017 +0100

    Bug 776417 - improve Sample Average and Sample Merged description.
    
    The "accumulated" (color value) adjective does not look like the best
    word in both descriptions. Respectively, the first is an averaged
    value whereas the second would be a "merged" or "composited" value.
    If native speakers have comments or better propositions, they are
    welcome to speak up.

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