[gimp] app: copy *-color-tag-* tooltips into labels.

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

commit 189a474502d59369788a8b7ddcb1cd04bbd0cefd
Author: Jehan <jehan girinstud io>
Date:   Thu Nov 16 03:20:42 2017 +0100

    app: copy *-color-tag-* tooltips into labels.
    
    Current labels were very uninformative while tooltips contained what
    should have been the labels. Just switch these.
    Also replace GIMP_ICON_CLOSE by GIMP_ICON_EDIT_CLEAR for the various
    *-color-tag-none actions. As a comment was reminding next to these
    icons, the close icon was abused. The edit-clear icon on the other hand
    is quite relevant.

 app/actions/channels-actions.c |   20 ++++++++++----------
 app/actions/layers-actions.c   |   20 ++++++++++----------
 app/actions/vectors-actions.c  |   20 ++++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/app/actions/channels-actions.c b/app/actions/channels-actions.c
index ee92f8d..c7b5cff 100644
--- a/app/actions/channels-actions.c
+++ b/app/actions/channels-actions.c
@@ -136,57 +136,57 @@ static const GimpToggleActionEntry channels_toggle_actions[] =
 
 static const GimpEnumActionEntry channels_color_tag_actions[] =
 {
-  { "channels-color-tag-none", GIMP_ICON_CLOSE /* abused */,
-    NC_("channels-action", "None"), NULL,
+  { "channels-color-tag-none", GIMP_ICON_EDIT_CLEAR,
     NC_("channels-action", "Channel Color Tag: Clear"),
+    NULL, NULL,
     GIMP_COLOR_TAG_NONE, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-blue", NULL,
-    NC_("channels-action", "Blue"), NULL,
     NC_("channels-action", "Channel Color Tag: Set to Blue"),
+    NULL, NULL,
     GIMP_COLOR_TAG_BLUE, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-green", NULL,
-    NC_("channels-action", "Green"), NULL,
     NC_("channels-action", "Channel Color Tag: Set to Green"),
+    NULL, NULL,
     GIMP_COLOR_TAG_GREEN, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-yellow", NULL,
-    NC_("channels-action", "Yellow"), NULL,
     NC_("channels-action", "Channel Color Tag: Set to Yellow"),
+    NULL, NULL,
     GIMP_COLOR_TAG_YELLOW, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-orange", NULL,
-    NC_("channels-action", "Orange"), NULL,
     NC_("channels-action", "Channel Color Tag: Set to Orange"),
+    NULL, NULL,
     GIMP_COLOR_TAG_ORANGE, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-brown", NULL,
-    NC_("channels-action", "Brown"), NULL,
     NC_("channels-action", "Channel Color Tag: Set to Brown"),
+    NULL, NULL,
     GIMP_COLOR_TAG_BROWN, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-red", NULL,
-    NC_("channels-action", "Red"), NULL,
     NC_("channels-action", "Channel Color Tag: Set to Red"),
+    NULL, NULL,
     GIMP_COLOR_TAG_RED, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-violet", NULL,
-    NC_("channels-action", "Violet"), NULL,
     NC_("channels-action", "Channel Color Tag: Set to Violet"),
+    NULL, NULL,
     GIMP_COLOR_TAG_VIOLET, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-gray", NULL,
-    NC_("channels-action", "Gray"), NULL,
     NC_("channels-action", "Channel Color Tag: Set to Gray"),
+    NULL, NULL,
     GIMP_COLOR_TAG_GRAY, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG }
 };
diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c
index 91815d2..673dcb8 100644
--- a/app/actions/layers-actions.c
+++ b/app/actions/layers-actions.c
@@ -401,57 +401,57 @@ static const GimpRadioActionEntry layers_composite_mode_actions[] =
 
 static const GimpEnumActionEntry layers_color_tag_actions[] =
 {
-  { "layers-color-tag-none", GIMP_ICON_CLOSE /* abused */,
-    NC_("layers-action", "None"), NULL,
+  { "layers-color-tag-none", GIMP_ICON_EDIT_CLEAR,
     NC_("layers-action", "Layer Color Tag: Clear"),
+    NULL, NULL,
     GIMP_COLOR_TAG_NONE, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-blue", NULL,
-    NC_("layers-action", "Blue"), NULL,
     NC_("layers-action", "Layer Color Tag: Set to Blue"),
+    NULL, NULL,
     GIMP_COLOR_TAG_BLUE, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-green", NULL,
-    NC_("layers-action", "Green"), NULL,
     NC_("layers-action", "Layer Color Tag: Set to Green"),
+    NULL, NULL,
     GIMP_COLOR_TAG_GREEN, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-yellow", NULL,
-    NC_("layers-action", "Yellow"), NULL,
     NC_("layers-action", "Layer Color Tag: Set to Yellow"),
+    NULL, NULL,
     GIMP_COLOR_TAG_YELLOW, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-orange", NULL,
-    NC_("layers-action", "Orange"), NULL,
     NC_("layers-action", "Layer Color Tag: Set to Orange"),
+    NULL, NULL,
     GIMP_COLOR_TAG_ORANGE, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-brown", NULL,
-    NC_("layers-action", "Brown"), NULL,
     NC_("layers-action", "Layer Color Tag: Set to Brown"),
+    NULL, NULL,
     GIMP_COLOR_TAG_BROWN, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-red", NULL,
-    NC_("layers-action", "Red"), NULL,
     NC_("layers-action", "Layer Color Tag: Set to Red"),
+    NULL, NULL,
     GIMP_COLOR_TAG_RED, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-violet", NULL,
-    NC_("layers-action", "Violet"), NULL,
     NC_("layers-action", "Layer Color Tag: Set to Violet"),
+    NULL, NULL,
     GIMP_COLOR_TAG_VIOLET, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-gray", NULL,
-    NC_("layers-action", "Gray"), NULL,
     NC_("layers-action", "Layer Color Tag: Set to Gray"),
+    NULL, NULL,
     GIMP_COLOR_TAG_GRAY, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG }
 };
diff --git a/app/actions/vectors-actions.c b/app/actions/vectors-actions.c
index 6aad326..4271ce5 100644
--- a/app/actions/vectors-actions.c
+++ b/app/actions/vectors-actions.c
@@ -189,57 +189,57 @@ static const GimpToggleActionEntry vectors_toggle_actions[] =
 
 static const GimpEnumActionEntry vectors_color_tag_actions[] =
 {
-  { "vectors-color-tag-none", GIMP_ICON_CLOSE /* abused */,
-    NC_("vectors-action", "None"), NULL,
+  { "vectors-color-tag-none", GIMP_ICON_EDIT_CLEAR,
     NC_("vectors-action", "Path Color Tag: Clear"),
+    NULL, NULL,
     GIMP_COLOR_TAG_NONE, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-blue", NULL,
-    NC_("vectors-action", "Blue"), NULL,
     NC_("vectors-action", "Path Color Tag: Set to Blue"),
+    NULL, NULL,
     GIMP_COLOR_TAG_BLUE, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-green", NULL,
-    NC_("vectors-action", "Green"), NULL,
     NC_("vectors-action", "Path Color Tag: Set to Green"),
+    NULL, NULL,
     GIMP_COLOR_TAG_GREEN, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-yellow", NULL,
-    NC_("vectors-action", "Yellow"), NULL,
     NC_("vectors-action", "Path Color Tag: Set to Yellow"),
+    NULL, NULL,
     GIMP_COLOR_TAG_YELLOW, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-orange", NULL,
-    NC_("vectors-action", "Orange"), NULL,
     NC_("vectors-action", "Path Color Tag: Set to Orange"),
+    NULL, NULL,
     GIMP_COLOR_TAG_ORANGE, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-brown", NULL,
-    NC_("vectors-action", "Brown"), NULL,
     NC_("vectors-action", "Path Color Tag: Set to Brown"),
+    NULL, NULL,
     GIMP_COLOR_TAG_BROWN, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-red", NULL,
-    NC_("vectors-action", "Red"), NULL,
     NC_("vectors-action", "Path Color Tag: Set to Red"),
+    NULL, NULL,
     GIMP_COLOR_TAG_RED, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-violet", NULL,
-    NC_("vectors-action", "Violet"), NULL,
     NC_("vectors-action", "Path Color Tag: Set to Violet"),
+    NULL, NULL,
     GIMP_COLOR_TAG_VIOLET, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-gray", NULL,
-    NC_("vectors-action", "Gray"), NULL,
     NC_("vectors-action", "Path Color Tag: Set to Gray"),
+    NULL, NULL,
     GIMP_COLOR_TAG_GRAY, FALSE,
     GIMP_HELP_PATH_COLOR_TAG }
 };