[gimp/gimp-2-10] app, libgimp*: make user visible color model labels consistent
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] app, libgimp*: make user visible color model labels consistent
- Date: Sun, 8 Jul 2018 14:36:48 +0000 (UTC)
commit cc20410e8058d55b45f40d83918c4a36a4acc1f9
Author: Michael Natterer <mitch gimp org>
Date: Sun Jul 8 16:15:13 2018 +0200
app, libgimp*: make user visible color model labels consistent
- "LCh" intead of "LCH"
- "CIE LCh" instead of "CIELCh"
- "HSV Hue" instead of "Hue (HSV)" for all models/components
(cherry picked from commit 926dc070ef66e002a662d3b699f3ab89a321e798)
app/operations/operations-enums.c | 40 ++++++------
app/operations/operations-enums.h | 130 +++++++++++++++++++-------------------
app/widgets/widgets-enums.c | 2 +-
app/widgets/widgets-enums.h | 2 +-
libgimpbase/gimpbaseenums.c | 12 ++--
libgimpbase/gimpbaseenums.h | 34 +++++-----
libgimpwidgets/gimpcolorscales.c | 2 +-
libgimpwidgets/gimpwidgetsenums.c | 8 +--
libgimpwidgets/gimpwidgetsenums.h | 14 ++--
9 files changed, 122 insertions(+), 122 deletions(-)
---
diff --git a/app/operations/operations-enums.c b/app/operations/operations-enums.c
index 4825ea3d92..a0d67b88e0 100644
--- a/app/operations/operations-enums.c
+++ b/app/operations/operations-enums.c
@@ -191,22 +191,22 @@ gimp_layer_mode_get_type (void)
/* Translators: this is an abbreviated version of "Lighten only (legacy)".
Keep it short. */
{ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, NC_("layer-mode", "Lighten only (l)"), NULL },
- { GIMP_LAYER_MODE_HSV_HUE_LEGACY, NC_("layer-mode", "Hue (HSV) (legacy)"), NULL },
- /* Translators: this is an abbreviated version of "Hue (HSV) (legacy)".
+ { GIMP_LAYER_MODE_HSV_HUE_LEGACY, NC_("layer-mode", "HSV Hue (legacy)"), NULL },
+ /* Translators: this is an abbreviated version of "HSV Hue (legacy)".
Keep it short. */
- { GIMP_LAYER_MODE_HSV_HUE_LEGACY, NC_("layer-mode", "Hue (HSV) (l)"), NULL },
- { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, NC_("layer-mode", "Saturation (HSV) (legacy)"), NULL },
- /* Translators: this is an abbreviated version of "Saturation (HSV) (legacy)".
+ { GIMP_LAYER_MODE_HSV_HUE_LEGACY, NC_("layer-mode", "HSV Hue (l)"), NULL },
+ { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, NC_("layer-mode", "HSV Saturation (legacy)"), NULL },
+ /* Translators: this is an abbreviated version of "HSV Saturation (legacy)".
Keep it short. */
- { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, NC_("layer-mode", "Saturation (HSV) (l)"), NULL },
- { GIMP_LAYER_MODE_HSL_COLOR_LEGACY, NC_("layer-mode", "Color (HSL) (legacy)"), NULL },
- /* Translators: this is an abbreviated version of "Color (HSL) (legacy)".
+ { GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, NC_("layer-mode", "HSV Saturation (l)"), NULL },
+ { GIMP_LAYER_MODE_HSL_COLOR_LEGACY, NC_("layer-mode", "HSL Color (legacy)"), NULL },
+ /* Translators: this is an abbreviated version of "HSL Color (legacy)".
Keep it short. */
- { GIMP_LAYER_MODE_HSL_COLOR_LEGACY, NC_("layer-mode", "Color (HSL) (l)"), NULL },
- { GIMP_LAYER_MODE_HSV_VALUE_LEGACY, NC_("layer-mode", "Value (HSV) (legacy)"), NULL },
- /* Translators: this is an abbreviated version of "Value (HSV) (legacy)".
+ { GIMP_LAYER_MODE_HSL_COLOR_LEGACY, NC_("layer-mode", "HSL Color (l)"), NULL },
+ { GIMP_LAYER_MODE_HSV_VALUE_LEGACY, NC_("layer-mode", "HSV Value (legacy)"), NULL },
+ /* Translators: this is an abbreviated version of "HSV Value (legacy)".
Keep it short. */
- { GIMP_LAYER_MODE_HSV_VALUE_LEGACY, NC_("layer-mode", "Value (HSV) (l)"), NULL },
+ { GIMP_LAYER_MODE_HSV_VALUE_LEGACY, NC_("layer-mode", "HSV Value (l)"), NULL },
{ GIMP_LAYER_MODE_DIVIDE_LEGACY, NC_("layer-mode", "Divide (legacy)"), NULL },
/* Translators: this is an abbreviated version of "Divide (legacy)".
Keep it short. */
@@ -240,10 +240,10 @@ gimp_layer_mode_get_type (void)
Keep it short. */
{ GIMP_LAYER_MODE_COLOR_ERASE_LEGACY, NC_("layer-mode", "Color erase (l)"), NULL },
{ GIMP_LAYER_MODE_OVERLAY, NC_("layer-mode", "Overlay"), NULL },
- { GIMP_LAYER_MODE_LCH_HUE, NC_("layer-mode", "Hue (LCH)"), NULL },
- { GIMP_LAYER_MODE_LCH_CHROMA, NC_("layer-mode", "Chroma (LCH)"), NULL },
- { GIMP_LAYER_MODE_LCH_COLOR, NC_("layer-mode", "Color (LCH)"), NULL },
- { GIMP_LAYER_MODE_LCH_LIGHTNESS, NC_("layer-mode", "Lightness (LCH)"), NULL },
+ { GIMP_LAYER_MODE_LCH_HUE, NC_("layer-mode", "LCh Hue"), NULL },
+ { GIMP_LAYER_MODE_LCH_CHROMA, NC_("layer-mode", "LCh Chroma"), NULL },
+ { GIMP_LAYER_MODE_LCH_COLOR, NC_("layer-mode", "LCh Color"), NULL },
+ { GIMP_LAYER_MODE_LCH_LIGHTNESS, NC_("layer-mode", "LCh Lightness"), NULL },
{ GIMP_LAYER_MODE_NORMAL, NC_("layer-mode", "Normal"), NULL },
{ GIMP_LAYER_MODE_BEHIND, NC_("layer-mode", "Behind"), NULL },
{ GIMP_LAYER_MODE_MULTIPLY, NC_("layer-mode", "Multiply"), NULL },
@@ -253,10 +253,10 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_SUBTRACT, NC_("layer-mode", "Subtract"), NULL },
{ GIMP_LAYER_MODE_DARKEN_ONLY, NC_("layer-mode", "Darken only"), NULL },
{ GIMP_LAYER_MODE_LIGHTEN_ONLY, NC_("layer-mode", "Lighten only"), NULL },
- { GIMP_LAYER_MODE_HSV_HUE, NC_("layer-mode", "Hue (HSV)"), NULL },
- { GIMP_LAYER_MODE_HSV_SATURATION, NC_("layer-mode", "Saturation (HSV)"), NULL },
- { GIMP_LAYER_MODE_HSL_COLOR, NC_("layer-mode", "Color (HSL)"), NULL },
- { GIMP_LAYER_MODE_HSV_VALUE, NC_("layer-mode", "Value (HSV)"), NULL },
+ { GIMP_LAYER_MODE_HSV_HUE, NC_("layer-mode", "HSV Hue"), NULL },
+ { GIMP_LAYER_MODE_HSV_SATURATION, NC_("layer-mode", "HSV Saturation"), NULL },
+ { GIMP_LAYER_MODE_HSL_COLOR, NC_("layer-mode", "HSL Color"), NULL },
+ { GIMP_LAYER_MODE_HSV_VALUE, NC_("layer-mode", "HSV Value"), NULL },
{ GIMP_LAYER_MODE_DIVIDE, NC_("layer-mode", "Divide"), NULL },
{ GIMP_LAYER_MODE_DODGE, NC_("layer-mode", "Dodge"), NULL },
{ GIMP_LAYER_MODE_BURN, NC_("layer-mode", "Burn"), NULL },
diff --git a/app/operations/operations-enums.h b/app/operations/operations-enums.h
index 1b44f8af0c..cd892484e2 100644
--- a/app/operations/operations-enums.h
+++ b/app/operations/operations-enums.h
@@ -55,81 +55,81 @@ GType gimp_layer_mode_get_type (void) G_GNUC_CONST;
typedef enum
{
/* Modes that exist since ancient times */
- GIMP_LAYER_MODE_NORMAL_LEGACY, /*< desc="Normal (legacy)", abbrev="Normal (l)"
>*/
- GIMP_LAYER_MODE_DISSOLVE, /*< desc="Dissolve"
>*/
- GIMP_LAYER_MODE_BEHIND_LEGACY, /*< desc="Behind (legacy)", abbrev="Behind (l)"
>*/
- GIMP_LAYER_MODE_MULTIPLY_LEGACY, /*< desc="Multiply (legacy)", abbrev="Multiply (l)"
>*/
- GIMP_LAYER_MODE_SCREEN_LEGACY, /*< desc="Screen (legacy)", abbrev="Screen (l)"
>*/
- GIMP_LAYER_MODE_OVERLAY_LEGACY, /*< desc="Old broken Overlay", abbrev="Old Overlay"
>*/
- GIMP_LAYER_MODE_DIFFERENCE_LEGACY, /*< desc="Difference (legacy)", abbrev="Difference (l)"
>*/
- GIMP_LAYER_MODE_ADDITION_LEGACY, /*< desc="Addition (legacy)", abbrev="Addition (l)"
>*/
- GIMP_LAYER_MODE_SUBTRACT_LEGACY, /*< desc="Subtract (legacy)", abbrev="Subtract (l)"
>*/
- GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, /*< desc="Darken only (legacy)", abbrev="Darken only (l)"
>*/
- GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, /*< desc="Lighten only (legacy)", abbrev="Lighten only (l)"
>*/
- GIMP_LAYER_MODE_HSV_HUE_LEGACY, /*< desc="Hue (HSV) (legacy)", abbrev="Hue (HSV) (l)"
>*/
- GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, /*< desc="Saturation (HSV) (legacy)", abbrev="Saturation (HSV)
(l)" >*/
- GIMP_LAYER_MODE_HSL_COLOR_LEGACY, /*< desc="Color (HSL) (legacy)", abbrev="Color (HSL) (l)"
>*/
- GIMP_LAYER_MODE_HSV_VALUE_LEGACY, /*< desc="Value (HSV) (legacy)", abbrev="Value (HSV) (l)"
>*/
- GIMP_LAYER_MODE_DIVIDE_LEGACY, /*< desc="Divide (legacy)", abbrev="Divide (l)"
>*/
- GIMP_LAYER_MODE_DODGE_LEGACY, /*< desc="Dodge (legacy)", abbrev="Dodge (l)"
>*/
- GIMP_LAYER_MODE_BURN_LEGACY, /*< desc="Burn (legacy)", abbrev="Burn (l)"
>*/
- GIMP_LAYER_MODE_HARDLIGHT_LEGACY, /*< desc="Hard light (legacy)", abbrev="Hard light (l)"
>*/
+ GIMP_LAYER_MODE_NORMAL_LEGACY, /*< desc="Normal (legacy)", abbrev="Normal (l)"
*/
+ GIMP_LAYER_MODE_DISSOLVE, /*< desc="Dissolve"
*/
+ GIMP_LAYER_MODE_BEHIND_LEGACY, /*< desc="Behind (legacy)", abbrev="Behind (l)"
*/
+ GIMP_LAYER_MODE_MULTIPLY_LEGACY, /*< desc="Multiply (legacy)", abbrev="Multiply (l)"
*/
+ GIMP_LAYER_MODE_SCREEN_LEGACY, /*< desc="Screen (legacy)", abbrev="Screen (l)"
*/
+ GIMP_LAYER_MODE_OVERLAY_LEGACY, /*< desc="Old broken Overlay", abbrev="Old Overlay"
*/
+ GIMP_LAYER_MODE_DIFFERENCE_LEGACY, /*< desc="Difference (legacy)", abbrev="Difference (l)"
*/
+ GIMP_LAYER_MODE_ADDITION_LEGACY, /*< desc="Addition (legacy)", abbrev="Addition (l)"
*/
+ GIMP_LAYER_MODE_SUBTRACT_LEGACY, /*< desc="Subtract (legacy)", abbrev="Subtract (l)"
*/
+ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, /*< desc="Darken only (legacy)", abbrev="Darken only (l)"
*/
+ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, /*< desc="Lighten only (legacy)", abbrev="Lighten only (l)"
*/
+ GIMP_LAYER_MODE_HSV_HUE_LEGACY, /*< desc="HSV Hue (legacy)", abbrev="HSV Hue (l)"
*/
+ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, /*< desc="HSV Saturation (legacy)", abbrev="HSV Saturation (l)"
*/
+ GIMP_LAYER_MODE_HSL_COLOR_LEGACY, /*< desc="HSL Color (legacy)", abbrev="HSL Color (l)"
*/
+ GIMP_LAYER_MODE_HSV_VALUE_LEGACY, /*< desc="HSV Value (legacy)", abbrev="HSV Value (l)"
*/
+ GIMP_LAYER_MODE_DIVIDE_LEGACY, /*< desc="Divide (legacy)", abbrev="Divide (l)"
*/
+ GIMP_LAYER_MODE_DODGE_LEGACY, /*< desc="Dodge (legacy)", abbrev="Dodge (l)"
*/
+ GIMP_LAYER_MODE_BURN_LEGACY, /*< desc="Burn (legacy)", abbrev="Burn (l)"
*/
+ GIMP_LAYER_MODE_HARDLIGHT_LEGACY, /*< desc="Hard light (legacy)", abbrev="Hard light (l)"
*/
/* Since 2.8 (XCF version 2) */
- GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, /*< desc="Soft light (legacy)", abbrev="Soft light (l)"
>*/
- GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, /*< desc="Grain extract (legacy)", abbrev="Grain extract (l)"
>*/
- GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, /*< desc="Grain merge (legacy)", abbrev="Grain merge (l)"
>*/
- GIMP_LAYER_MODE_COLOR_ERASE_LEGACY, /*< desc="Color erase (legacy)", abbrev="Color erase (l)"
>*/
+ GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, /*< desc="Soft light (legacy)", abbrev="Soft light (l)"
*/
+ GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, /*< desc="Grain extract (legacy)", abbrev="Grain extract (l)"
*/
+ GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, /*< desc="Grain merge (legacy)", abbrev="Grain merge (l)"
*/
+ GIMP_LAYER_MODE_COLOR_ERASE_LEGACY, /*< desc="Color erase (legacy)", abbrev="Color erase (l)"
*/
/* Since 2.10 (XCF version 9) */
- GIMP_LAYER_MODE_OVERLAY, /*< desc="Overlay"
>*/
- GIMP_LAYER_MODE_LCH_HUE, /*< desc="Hue (LCH)"
>*/
- GIMP_LAYER_MODE_LCH_CHROMA, /*< desc="Chroma (LCH)"
>*/
- GIMP_LAYER_MODE_LCH_COLOR, /*< desc="Color (LCH)"
>*/
- GIMP_LAYER_MODE_LCH_LIGHTNESS, /*< desc="Lightness (LCH)"
>*/
+ GIMP_LAYER_MODE_OVERLAY, /*< desc="Overlay"
*/
+ GIMP_LAYER_MODE_LCH_HUE, /*< desc="LCh Hue"
*/
+ GIMP_LAYER_MODE_LCH_CHROMA, /*< desc="LCh Chroma"
*/
+ GIMP_LAYER_MODE_LCH_COLOR, /*< desc="LCh Color"
*/
+ GIMP_LAYER_MODE_LCH_LIGHTNESS, /*< desc="LCh Lightness"
*/
/* Since 2.10 (XCF version 10) */
- GIMP_LAYER_MODE_NORMAL, /*< desc="Normal"
>*/
- GIMP_LAYER_MODE_BEHIND, /*< desc="Behind"
>*/
- GIMP_LAYER_MODE_MULTIPLY, /*< desc="Multiply"
>*/
- GIMP_LAYER_MODE_SCREEN, /*< desc="Screen"
>*/
- GIMP_LAYER_MODE_DIFFERENCE, /*< desc="Difference"
>*/
- GIMP_LAYER_MODE_ADDITION, /*< desc="Addition"
>*/
- GIMP_LAYER_MODE_SUBTRACT, /*< desc="Subtract"
>*/
- GIMP_LAYER_MODE_DARKEN_ONLY, /*< desc="Darken only"
>*/
- GIMP_LAYER_MODE_LIGHTEN_ONLY, /*< desc="Lighten only"
>*/
- GIMP_LAYER_MODE_HSV_HUE, /*< desc="Hue (HSV)"
>*/
- GIMP_LAYER_MODE_HSV_SATURATION, /*< desc="Saturation (HSV)"
>*/
- GIMP_LAYER_MODE_HSL_COLOR, /*< desc="Color (HSL)"
>*/
- GIMP_LAYER_MODE_HSV_VALUE, /*< desc="Value (HSV)"
>*/
- GIMP_LAYER_MODE_DIVIDE, /*< desc="Divide"
>*/
- GIMP_LAYER_MODE_DODGE, /*< desc="Dodge"
>*/
- GIMP_LAYER_MODE_BURN, /*< desc="Burn"
>*/
- GIMP_LAYER_MODE_HARDLIGHT, /*< desc="Hard light"
>*/
- GIMP_LAYER_MODE_SOFTLIGHT, /*< desc="Soft light"
>*/
- GIMP_LAYER_MODE_GRAIN_EXTRACT, /*< desc="Grain extract"
>*/
- GIMP_LAYER_MODE_GRAIN_MERGE, /*< desc="Grain merge"
>*/
- GIMP_LAYER_MODE_VIVID_LIGHT, /*< desc="Vivid light"
>*/
- GIMP_LAYER_MODE_PIN_LIGHT, /*< desc="Pin light"
>*/
- GIMP_LAYER_MODE_LINEAR_LIGHT, /*< desc="Linear light"
>*/
- GIMP_LAYER_MODE_HARD_MIX, /*< desc="Hard mix"
>*/
- GIMP_LAYER_MODE_EXCLUSION, /*< desc="Exclusion"
>*/
- GIMP_LAYER_MODE_LINEAR_BURN, /*< desc="Linear burn"
>*/
- GIMP_LAYER_MODE_LUMA_DARKEN_ONLY, /*< desc="Luma/Luminance darken only", abbrev="Luma darken only"
>*/
- GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY, /*< desc="Luma/Luminance lighten only", abbrev="Luma lighten only"
>*/
- GIMP_LAYER_MODE_LUMINANCE, /*< desc="Luminance"
>*/
- GIMP_LAYER_MODE_COLOR_ERASE, /*< desc="Color erase"
>*/
- GIMP_LAYER_MODE_ERASE, /*< desc="Erase"
>*/
- GIMP_LAYER_MODE_MERGE, /*< desc="Merge"
>*/
- GIMP_LAYER_MODE_SPLIT, /*< desc="Split"
>*/
- GIMP_LAYER_MODE_PASS_THROUGH, /*< desc="Pass through"
>*/
+ GIMP_LAYER_MODE_NORMAL, /*< desc="Normal"
*/
+ GIMP_LAYER_MODE_BEHIND, /*< desc="Behind"
*/
+ GIMP_LAYER_MODE_MULTIPLY, /*< desc="Multiply"
*/
+ GIMP_LAYER_MODE_SCREEN, /*< desc="Screen"
*/
+ GIMP_LAYER_MODE_DIFFERENCE, /*< desc="Difference"
*/
+ GIMP_LAYER_MODE_ADDITION, /*< desc="Addition"
*/
+ GIMP_LAYER_MODE_SUBTRACT, /*< desc="Subtract"
*/
+ GIMP_LAYER_MODE_DARKEN_ONLY, /*< desc="Darken only"
*/
+ GIMP_LAYER_MODE_LIGHTEN_ONLY, /*< desc="Lighten only"
*/
+ GIMP_LAYER_MODE_HSV_HUE, /*< desc="HSV Hue"
*/
+ GIMP_LAYER_MODE_HSV_SATURATION, /*< desc="HSV Saturation"
*/
+ GIMP_LAYER_MODE_HSL_COLOR, /*< desc="HSL Color"
*/
+ GIMP_LAYER_MODE_HSV_VALUE, /*< desc="HSV Value"
*/
+ GIMP_LAYER_MODE_DIVIDE, /*< desc="Divide"
*/
+ GIMP_LAYER_MODE_DODGE, /*< desc="Dodge"
*/
+ GIMP_LAYER_MODE_BURN, /*< desc="Burn"
*/
+ GIMP_LAYER_MODE_HARDLIGHT, /*< desc="Hard light"
*/
+ GIMP_LAYER_MODE_SOFTLIGHT, /*< desc="Soft light"
*/
+ GIMP_LAYER_MODE_GRAIN_EXTRACT, /*< desc="Grain extract"
*/
+ GIMP_LAYER_MODE_GRAIN_MERGE, /*< desc="Grain merge"
*/
+ GIMP_LAYER_MODE_VIVID_LIGHT, /*< desc="Vivid light"
*/
+ GIMP_LAYER_MODE_PIN_LIGHT, /*< desc="Pin light"
*/
+ GIMP_LAYER_MODE_LINEAR_LIGHT, /*< desc="Linear light"
*/
+ GIMP_LAYER_MODE_HARD_MIX, /*< desc="Hard mix"
*/
+ GIMP_LAYER_MODE_EXCLUSION, /*< desc="Exclusion"
*/
+ GIMP_LAYER_MODE_LINEAR_BURN, /*< desc="Linear burn"
*/
+ GIMP_LAYER_MODE_LUMA_DARKEN_ONLY, /*< desc="Luma/Luminance darken only", abbrev="Luma darken only"
*/
+ GIMP_LAYER_MODE_LUMA_LIGHTEN_ONLY, /*< desc="Luma/Luminance lighten only", abbrev="Luma lighten only"
*/
+ GIMP_LAYER_MODE_LUMINANCE, /*< desc="Luminance"
*/
+ GIMP_LAYER_MODE_COLOR_ERASE, /*< desc="Color erase"
*/
+ GIMP_LAYER_MODE_ERASE, /*< desc="Erase"
*/
+ GIMP_LAYER_MODE_MERGE, /*< desc="Merge"
*/
+ GIMP_LAYER_MODE_SPLIT, /*< desc="Split"
*/
+ GIMP_LAYER_MODE_PASS_THROUGH, /*< desc="Pass through"
*/
/* Internal modes, not available to the PDB, must be kept at the end */
- GIMP_LAYER_MODE_REPLACE, /*< pdb-skip, desc="Replace"
>*/
- GIMP_LAYER_MODE_ANTI_ERASE, /*< pdb-skip, desc="Anti erase"
>*/
+ GIMP_LAYER_MODE_REPLACE, /*< pdb-skip, desc="Replace"
*/
+ GIMP_LAYER_MODE_ANTI_ERASE, /*< pdb-skip, desc="Anti erase"
*/
/* Layer mode menu separator */
- GIMP_LAYER_MODE_SEPARATOR = -1 /*< pdb-skip, skip
>*/
+ GIMP_LAYER_MODE_SEPARATOR = -1 /*< pdb-skip, skip
*/
} GimpLayerMode;
diff --git a/app/widgets/widgets-enums.c b/app/widgets/widgets-enums.c
index 87cb281a66..4fe0f7f354 100644
--- a/app/widgets/widgets-enums.c
+++ b/app/widgets/widgets-enums.c
@@ -118,7 +118,7 @@ gimp_color_frame_mode_get_type (void)
{ GIMP_COLOR_FRAME_MODE_RGB_PERCENT, NC_("color-frame-mode", "RGB (%)"), NULL },
{ GIMP_COLOR_FRAME_MODE_RGB_U8, NC_("color-frame-mode", "RGB (0..255)"), NULL },
{ GIMP_COLOR_FRAME_MODE_HSV, NC_("color-frame-mode", "HSV"), NULL },
- { GIMP_COLOR_FRAME_MODE_LCH, NC_("color-frame-mode", "CIE LCH"), NULL },
+ { GIMP_COLOR_FRAME_MODE_LCH, NC_("color-frame-mode", "CIE LCh"), NULL },
{ GIMP_COLOR_FRAME_MODE_LAB, NC_("color-frame-mode", "CIE LAB"), NULL },
{ GIMP_COLOR_FRAME_MODE_CMYK, NC_("color-frame-mode", "CMYK"), NULL },
{ 0, NULL, NULL }
diff --git a/app/widgets/widgets-enums.h b/app/widgets/widgets-enums.h
index f0187b7a86..a0da81e749 100644
--- a/app/widgets/widgets-enums.h
+++ b/app/widgets/widgets-enums.h
@@ -67,7 +67,7 @@ typedef enum
GIMP_COLOR_FRAME_MODE_RGB_PERCENT, /*< desc="RGB (%)" >*/
GIMP_COLOR_FRAME_MODE_RGB_U8, /*< desc="RGB (0..255)" >*/
GIMP_COLOR_FRAME_MODE_HSV, /*< desc="HSV" >*/
- GIMP_COLOR_FRAME_MODE_LCH, /*< desc="CIE LCH" >*/
+ GIMP_COLOR_FRAME_MODE_LCH, /*< desc="CIE LCh" >*/
GIMP_COLOR_FRAME_MODE_LAB, /*< desc="CIE LAB" >*/
GIMP_COLOR_FRAME_MODE_CMYK /*< desc="CMYK" >*/
} GimpColorFrameMode;
diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c
index 4e4fa63cb7..cf402359d8 100644
--- a/libgimpbase/gimpbaseenums.c
+++ b/libgimpbase/gimpbaseenums.c
@@ -1649,13 +1649,13 @@ gimp_select_criterion_get_type (void)
{ GIMP_SELECT_CRITERION_R, NC_("select-criterion", "Red"), NULL },
{ GIMP_SELECT_CRITERION_G, NC_("select-criterion", "Green"), NULL },
{ GIMP_SELECT_CRITERION_B, NC_("select-criterion", "Blue"), NULL },
- { GIMP_SELECT_CRITERION_H, NC_("select-criterion", "Hue (HSV)"), NULL },
- { GIMP_SELECT_CRITERION_S, NC_("select-criterion", "Saturation (HSV)"), NULL },
- { GIMP_SELECT_CRITERION_V, NC_("select-criterion", "Value (HSV)"), NULL },
+ { GIMP_SELECT_CRITERION_H, NC_("select-criterion", "HSV Hue"), NULL },
+ { GIMP_SELECT_CRITERION_S, NC_("select-criterion", "HSV Saturation"), NULL },
+ { GIMP_SELECT_CRITERION_V, NC_("select-criterion", "HSV Value"), NULL },
{ GIMP_SELECT_CRITERION_A, NC_("select-criterion", "Alpha"), NULL },
- { GIMP_SELECT_CRITERION_LCH_L, NC_("select-criterion", "Lightness (LCH)"), NULL },
- { GIMP_SELECT_CRITERION_LCH_C, NC_("select-criterion", "Chroma (LCH)"), NULL },
- { GIMP_SELECT_CRITERION_LCH_H, NC_("select-criterion", "Hue (LCH)"), NULL },
+ { GIMP_SELECT_CRITERION_LCH_L, NC_("select-criterion", "LCh Lightness"), NULL },
+ { GIMP_SELECT_CRITERION_LCH_C, NC_("select-criterion", "LCh Chroma"), NULL },
+ { GIMP_SELECT_CRITERION_LCH_H, NC_("select-criterion", "LCh Hue"), NULL },
{ 0, NULL, NULL }
};
diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h
index 655e3aeba3..57ed78166b 100644
--- a/libgimpbase/gimpbaseenums.h
+++ b/libgimpbase/gimpbaseenums.h
@@ -1250,13 +1250,13 @@ typedef enum
* @GIMP_SELECT_CRITERION_R: Red
* @GIMP_SELECT_CRITERION_G: Green
* @GIMP_SELECT_CRITERION_B: Blue
- * @GIMP_SELECT_CRITERION_H: Hue (HSV)
- * @GIMP_SELECT_CRITERION_S: Saturation (HSV)
- * @GIMP_SELECT_CRITERION_V: Value (HSV)
+ * @GIMP_SELECT_CRITERION_H: HSV Hue
+ * @GIMP_SELECT_CRITERION_S: HSV Saturation
+ * @GIMP_SELECT_CRITERION_V: HSV Value
* @GIMP_SELECT_CRITERION_A: Alpha
- * @GIMP_SELECT_CRITERION_LCH_L: Lightness (LCH)
- * @GIMP_SELECT_CRITERION_LCH_C: Chroma (LCH)
- * @GIMP_SELECT_CRITERION_LCH_H: Hue (LCH)
+ * @GIMP_SELECT_CRITERION_LCH_L: LCh Lightness
+ * @GIMP_SELECT_CRITERION_LCH_C: LCh Chroma
+ * @GIMP_SELECT_CRITERION_LCH_H: LCh Hue)
*
* Criterions for color similarity.
**/
@@ -1266,17 +1266,17 @@ GType gimp_select_criterion_get_type (void) G_GNUC_CONST;
typedef enum
{
- GIMP_SELECT_CRITERION_COMPOSITE, /*< desc="Composite" >*/
- GIMP_SELECT_CRITERION_R, /*< desc="Red" >*/
- GIMP_SELECT_CRITERION_G, /*< desc="Green" >*/
- GIMP_SELECT_CRITERION_B, /*< desc="Blue" >*/
- GIMP_SELECT_CRITERION_H, /*< desc="Hue (HSV)" >*/
- GIMP_SELECT_CRITERION_S, /*< desc="Saturation (HSV)" >*/
- GIMP_SELECT_CRITERION_V, /*< desc="Value (HSV)" >*/
- GIMP_SELECT_CRITERION_A, /*< desc="Alpha" >*/
- GIMP_SELECT_CRITERION_LCH_L, /*< desc="Lightness (LCH)" >*/
- GIMP_SELECT_CRITERION_LCH_C, /*< desc="Chroma (LCH)" >*/
- GIMP_SELECT_CRITERION_LCH_H, /*< desc="Hue (LCH)" >*/
+ GIMP_SELECT_CRITERION_COMPOSITE, /*< desc="Composite" >*/
+ GIMP_SELECT_CRITERION_R, /*< desc="Red" >*/
+ GIMP_SELECT_CRITERION_G, /*< desc="Green" >*/
+ GIMP_SELECT_CRITERION_B, /*< desc="Blue" >*/
+ GIMP_SELECT_CRITERION_H, /*< desc="HSV Hue" >*/
+ GIMP_SELECT_CRITERION_S, /*< desc="HSV Saturation" >*/
+ GIMP_SELECT_CRITERION_V, /*< desc="HSV Value" >*/
+ GIMP_SELECT_CRITERION_A, /*< desc="Alpha" >*/
+ GIMP_SELECT_CRITERION_LCH_L, /*< desc="LCh Lightness" >*/
+ GIMP_SELECT_CRITERION_LCH_C, /*< desc="LCh Chroma" >*/
+ GIMP_SELECT_CRITERION_LCH_H, /*< desc="LCh Hue" >*/
} GimpSelectCriterion;
diff --git a/libgimpwidgets/gimpcolorscales.c b/libgimpwidgets/gimpcolorscales.c
index 0d087925a4..0ed91dc31a 100644
--- a/libgimpwidgets/gimpcolorscales.c
+++ b/libgimpwidgets/gimpcolorscales.c
@@ -457,7 +457,7 @@ gimp_color_scales_init (GimpColorScales *scales)
radio_group = NULL;
- radio1 = gtk_radio_button_new_with_label (NULL, _("LCH"));
+ radio1 = gtk_radio_button_new_with_label (NULL, _("LCh"));
radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radio1));
radio2 = gtk_radio_button_new_with_label (radio_group, _("HSV"));
diff --git a/libgimpwidgets/gimpwidgetsenums.c b/libgimpwidgets/gimpwidgetsenums.c
index d726105198..89e1328da7 100644
--- a/libgimpwidgets/gimpwidgetsenums.c
+++ b/libgimpwidgets/gimpwidgetsenums.c
@@ -133,9 +133,9 @@ gimp_color_selector_channel_get_type (void)
{ GIMP_COLOR_SELECTOR_GREEN, NC_("color-selector-channel", "_G"), N_("Green") },
{ GIMP_COLOR_SELECTOR_BLUE, NC_("color-selector-channel", "_B"), N_("Blue") },
{ GIMP_COLOR_SELECTOR_ALPHA, NC_("color-selector-channel", "_A"), N_("Alpha") },
- { GIMP_COLOR_SELECTOR_LCH_LIGHTNESS, NC_("color-selector-channel", "_L"), N_("LCH Lightness") },
- { GIMP_COLOR_SELECTOR_LCH_CHROMA, NC_("color-selector-channel", "_C"), N_("LCH Chroma") },
- { GIMP_COLOR_SELECTOR_LCH_HUE, NC_("color-selector-channel", "_H"), N_("LCH Hue") },
+ { GIMP_COLOR_SELECTOR_LCH_LIGHTNESS, NC_("color-selector-channel", "_L"), N_("LCh Lightness") },
+ { GIMP_COLOR_SELECTOR_LCH_CHROMA, NC_("color-selector-channel", "_C"), N_("LCh Chroma") },
+ { GIMP_COLOR_SELECTOR_LCH_HUE, NC_("color-selector-channel", "_H"), N_("LCh Hue") },
{ 0, NULL, NULL }
};
@@ -166,7 +166,7 @@ gimp_color_selector_model_get_type (void)
static const GimpEnumDesc descs[] =
{
{ GIMP_COLOR_SELECTOR_MODEL_RGB, NC_("color-selector-model", "RGB"), N_("RGB color model") },
- { GIMP_COLOR_SELECTOR_MODEL_LCH, NC_("color-selector-model", "LCH"), N_("CIELCh color model") },
+ { GIMP_COLOR_SELECTOR_MODEL_LCH, NC_("color-selector-model", "LCH"), N_("CIE LCh color model") },
{ GIMP_COLOR_SELECTOR_MODEL_HSV, NC_("color-selector-model", "HSV"), N_("HSV color model") },
{ 0, NULL, NULL }
};
diff --git a/libgimpwidgets/gimpwidgetsenums.h b/libgimpwidgets/gimpwidgetsenums.h
index 676d11f822..88ad7c752d 100644
--- a/libgimpwidgets/gimpwidgetsenums.h
+++ b/libgimpwidgets/gimpwidgetsenums.h
@@ -116,16 +116,16 @@ typedef enum
GIMP_COLOR_SELECTOR_GREEN, /*< desc="_G", help="Green" >*/
GIMP_COLOR_SELECTOR_BLUE, /*< desc="_B", help="Blue" >*/
GIMP_COLOR_SELECTOR_ALPHA, /*< desc="_A", help="Alpha" >*/
- GIMP_COLOR_SELECTOR_LCH_LIGHTNESS, /*< desc="_L", help="LCH Lightness" >*/
- GIMP_COLOR_SELECTOR_LCH_CHROMA, /*< desc="_C", help="LCH Chroma" >*/
- GIMP_COLOR_SELECTOR_LCH_HUE /*< desc="_H", help="LCH Hue" >*/
+ GIMP_COLOR_SELECTOR_LCH_LIGHTNESS, /*< desc="_L", help="LCh Lightness" >*/
+ GIMP_COLOR_SELECTOR_LCH_CHROMA, /*< desc="_C", help="LCh Chroma" >*/
+ GIMP_COLOR_SELECTOR_LCH_HUE /*< desc="_H", help="LCh Hue" >*/
} GimpColorSelectorChannel;
/**
* GimpColorSelectorModel:
* @GIMP_COLOR_SELECTOR_MODEL_RGB: RGB color model
- * @GIMP_COLOR_SELECTOR_MODEL_LCH: CIELCh color model
+ * @GIMP_COLOR_SELECTOR_MODEL_LCH: CIE LCh color model
* @GIMP_COLOR_SELECTOR_MODEL_HSV: HSV color model
*
* An enum to specify the types of color spaces edited in
@@ -139,9 +139,9 @@ GType gimp_color_selector_model_get_type (void) G_GNUC_CONST;
typedef enum
{
- GIMP_COLOR_SELECTOR_MODEL_RGB, /*< desc="RGB", help="RGB color model" >*/
- GIMP_COLOR_SELECTOR_MODEL_LCH, /*< desc="LCH", help="CIELCh color model" >*/
- GIMP_COLOR_SELECTOR_MODEL_HSV /*< desc="HSV", help="HSV color model" >*/
+ GIMP_COLOR_SELECTOR_MODEL_RGB, /*< desc="RGB", help="RGB color model" >*/
+ GIMP_COLOR_SELECTOR_MODEL_LCH, /*< desc="LCH", help="CIE LCh color model" >*/
+ GIMP_COLOR_SELECTOR_MODEL_HSV /*< desc="HSV", help="HSV color model" >*/
} GimpColorSelectorModel;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
