tdf#105000, related tdf#87538: Make new color names translatable
Make the new color names of the Standard palette translatable
These were added in 78869ad9d4c904e665529befe5181ea5121fba1d
Change-Id: Iccc43cc4ef44c8ca587b6df2b08c6e1b45e4b118
Reviewed-on: https://gerrit.libreoffice.org/41330
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index f0ded9d..a8960d6 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -546,19 +546,6 @@
#define RID_SVXSTR_COLOR NC_("RID_SVXSTR_COLOR", "Color")
#define RID_SVXSTR_HATCH NC_("RID_SVXSTR_HATCH", "Hatching")
#define RID_SVXSTR_LINEEND NC_("RID_SVXSTR_LINEEND", "Arrowheads")
#define RID_SVXSTR_COLOR_BLACK NC_("RID_SVXSTR_COLOR_BLACK", "Black")
#define RID_SVXSTR_COLOR_BLUE NC_("RID_SVXSTR_COLOR_BLUE", "Blue")
#define RID_SVXSTR_COLOR_GREEN NC_("RID_SVXSTR_COLOR_GREEN", "Green")
#define RID_SVXSTR_COLOR_CYAN NC_("RID_SVXSTR_COLOR_CYAN", "Cyan")
#define RID_SVXSTR_COLOR_RED NC_("RID_SVXSTR_COLOR_RED", "Red")
#define RID_SVXSTR_COLOR_MAGENTA NC_("RID_SVXSTR_COLOR_MAGENTA", "Magenta")
#define RID_SVXSTR_COLOR_GREY NC_("RID_SVXSTR_COLOR_GREY", "Gray")
#define RID_SVXSTR_COLOR_YELLOW NC_("RID_SVXSTR_COLOR_YELLOW", "Yellow")
#define RID_SVXSTR_COLOR_WHITE NC_("RID_SVXSTR_COLOR_WHITE", "White")
#define RID_SVXSTR_COLOR_BLUEGREY NC_("RID_SVXSTR_COLOR_BLUEGREY", "Blue gray")
/* Old default color Blue9, probably often u sed in saved files */
#define RID_SVXSTR_COLOR_BLUE_CLASSIC NC_("RID_SVXSTR_COLOR_BLUE_CLASSIC", "Blue classic")
#define RID_SVXSTR_COLOR_ORANGE NC_("RID_SVXSTR_COLOR_ORANGE", "Orange")
#define RID_SVXSTR_ARROW NC_("RID_SVXSTR_ARROW", "Arrow")
#define RID_SVXSTR_SQUARE NC_("RID_SVXSTR_SQUARE", "Square")
#define RID_SVXSTR_CIRCLE NC_("RID_SVXSTR_CIRCLE", "Circle")
@@ -570,8 +557,55 @@
#define RID_SVXSTR_GRAFMODE_GREYS NC_("RID_SVXSTR_GRAFMODE_GREYS", "Grayscale")
#define RID_SVXSTR_GRAFMODE_MONO NC_("RID_SVXSTR_GRAFMODE_MONO", "Black/White")
#define RID_SVXSTR_GRAFMODE_WATERMARK NC_("RID_SVXSTR_GRAFMODE_WATERMARK", "Watermark")
// BM: some additional standard colors
// Elements of the standard color palette
#define RID_SVXSTR_COLOR_BLACK NC_("RID_SVXSTR_COLOR_BLACK", "Black")
#define RID_SVXSTR_COLOR_GREY NC_("RID_SVXSTR_COLOR_GREY", "Gray")
#define RID_SVXSTR_COLOR_WHITE NC_("RID_SVXSTR_COLOR_WHITE", "White")
#define RID_SVXSTR_COLOR_YELLOW NC_("RID_SVXSTR_COLOR_YELLOW", "Yellow")
#define RID_SVXSTR_COLOR_GOLD NC_("RID_SVXSTR_COLOR_GOLD", "Gold")
#define RID_SVXSTR_COLOR_ORANGE NC_("RID_SVXSTR_COLOR_ORANGE", "Orange")
#define RID_SVXSTR_COLOR_BRICK NC_("RID_SVXSTR_COLOR_BRICK", "Brick")
#define RID_SVXSTR_COLOR_RED NC_("RID_SVXSTR_COLOR_RED", "Red")
#define RID_SVXSTR_COLOR_VIOLET NC_("RID_SVXSTR_COLOR_VIOLET", "Violet")
#define RID_SVXSTR_COLOR_PURPLE NC_("RID_SVXSTR_COLOR_PURPLE", "Purple")
#define RID_SVXSTR_COLOR_INDIGO NC_("RID_SVXSTR_COLOR_INDIGO", "Indigo")
#define RID_SVXSTR_COLOR_BLUE NC_("RID_SVXSTR_COLOR_BLUE", "Blue")
#define RID_SVXSTR_COLOR_TEAL NC_("RID_SVXSTR_COLOR_TEAL", "Teal")
#define RID_SVXSTR_COLOR_GREEN NC_("RID_SVXSTR_COLOR_GREEN", "Green")
#define RID_SVXSTR_COLOR_LIME NC_("RID_SVXSTR_COLOR_LIME", "Lime")
// Light variants of the standard color palette
#define RID_SVXSTR_COLOR_LIGHTGRAY NC_("RID_SVXSTR_COLOR_LIGHTGRAY", "Light Gray")
#define RID_SVXSTR_COLOR_LIGHTYELLOW NC_("RID_SVXSTR_COLOR_LIGHTYELLOW", "Light Yellow")
#define RID_SVXSTR_COLOR_LIGHTGOLD NC_("RID_SVXSTR_COLOR_LIGHTGOLD", "Light Gold")
#define RID_SVXSTR_COLOR_LIGHTORANGE NC_("RID_SVXSTR_COLOR_LIGHTORANGE", "Light Orange")
#define RID_SVXSTR_COLOR_LIGHTBRICK NC_("RID_SVXSTR_COLOR_LIGHTBRICK", "Light Brick")
#define RID_SVXSTR_COLOR_LIGHTRED NC_("RID_SVXSTR_COLOR_LIGHTRED", "Light Red")
#define RID_SVXSTR_COLOR_LIGHTVIOLET NC_("RID_SVXSTR_COLOR_LIGHTVIOLET", "Light Violet")
#define RID_SVXSTR_COLOR_LIGHTPURPLE NC_("RID_SVXSTR_COLOR_LIGHTPURPLE", "Light Purple")
#define RID_SVXSTR_COLOR_LIGHTINDIGO NC_("RID_SVXSTR_COLOR_LIGHTINDIGO", "Light Indigo")
#define RID_SVXSTR_COLOR_LIGHTBLUE NC_("RID_SVXSTR_COLOR_LIGHTBLUE", "Light Blue")
#define RID_SVXSTR_COLOR_LIGHTTEAL NC_("RID_SVXSTR_COLOR_LIGHTTEAL", "Light Teal")
#define RID_SVXSTR_COLOR_LIGHTGREEN NC_("RID_SVXSTR_COLOR_LIGHTGREEN", "Light Green")
#define RID_SVXSTR_COLOR_LIGHTLIME NC_("RID_SVXSTR_COLOR_LIGHTLIME", "Light Lime")
// Dark variants of the standard color palette
#define RID_SVXSTR_COLOR_DARKGRAY NC_("RID_SVXSTR_COLOR_DARKGRAY", "Dark Gray")
#define RID_SVXSTR_COLOR_DARKYELLOW NC_("RID_SVXSTR_COLOR_DARKYELLOW", "Dark Yellow")
#define RID_SVXSTR_COLOR_DARKGOLD NC_("RID_SVXSTR_COLOR_DARKGOLD", "Dark Gold")
#define RID_SVXSTR_COLOR_DARKORANGE NC_("RID_SVXSTR_COLOR_DARKORANGE", "Dark Orange")
#define RID_SVXSTR_COLOR_DARKBRICK NC_("RID_SVXSTR_COLOR_DARKBRICK", "Dark Brick")
#define RID_SVXSTR_COLOR_DARKRED NC_("RID_SVXSTR_COLOR_DARKRED", "Dark Red")
#define RID_SVXSTR_COLOR_DARKVIOLET1 NC_("RID_SVXSTR_COLOR_DARKVIOLET1", "Dark Violet")
#define RID_SVXSTR_COLOR_DARKPURPLE NC_("RID_SVXSTR_COLOR_DARKPURPLE", "Dark Purple")
#define RID_SVXSTR_COLOR_DARKINDIGO NC_("RID_SVXSTR_COLOR_DARKINDIGO", "Dark Indigo")
#define RID_SVXSTR_COLOR_DARKBLUE NC_("RID_SVXSTR_COLOR_DARKBLUE", "Dark Blue")
#define RID_SVXSTR_COLOR_DARKTEAL NC_("RID_SVXSTR_COLOR_DARKTEAL", "Dark Teal")
#define RID_SVXSTR_COLOR_DARKGREEN NC_("RID_SVXSTR_COLOR_DARKGREEN", "Dark Green")
#define RID_SVXSTR_COLOR_DARKLIME NC_("RID_SVXSTR_COLOR_DARKLIME", "Dark Lime")
/* Old default color names, probably often used in saved files */
#define RID_SVXSTR_COLOR_BLUE_CLASSIC NC_("RID_SVXSTR_COLOR_BLUE_CLASSIC", "Blue classic")
#define RID_SVXSTR_COLOR_CYAN NC_("RID_SVXSTR_COLOR_CYAN", "Cyan")
#define RID_SVXSTR_COLOR_MAGENTA NC_("RID_SVXSTR_COLOR_MAGENTA", "Magenta")
#define RID_SVXSTR_COLOR_BLUEGREY NC_("RID_SVXSTR_COLOR_BLUEGREY", "Blue gray")
#define RID_SVXSTR_COLOR_BORDEAUX NC_("RID_SVXSTR_COLOR_BORDEAUX", "Bordeaux")
#define RID_SVXSTR_COLOR_PALE_YELLOW NC_("RID_SVXSTR_COLOR_PALE_YELLOW", "Pale yellow")
#define RID_SVXSTR_COLOR_PALE_GREEN NC_("RID_SVXSTR_COLOR_PALE_GREEN", "Pale green")
@@ -579,7 +613,6 @@
#define RID_SVXSTR_COLOR_SALMON NC_("RID_SVXSTR_COLOR_SALMON", "Salmon")
#define RID_SVXSTR_COLOR_SEABLUE NC_("RID_SVXSTR_COLOR_SEABLUE", "Sea blue")
#define RID_SVXSTR_COLOR_CHART NC_("RID_SVXSTR_COLOR_CHART", "Chart")
#define RID_SVXSTR_COLOR_PURPLE NC_("RID_SVXSTR_COLOR_PURPLE", "Purple")
#define RID_SVXSTR_COLOR_SKYBLUE NC_("RID_SVXSTR_COLOR_SKYBLUE", "Sky blue")
#define RID_SVXSTR_COLOR_YELLOWGREEN NC_("RID_SVXSTR_COLOR_YELLOWGREEN", "Yellow green")
#define RID_SVXSTR_COLOR_PINK NC_("RID_SVXSTR_COLOR_PINK", "Pink")
@@ -833,6 +866,7 @@
#define RID_SVXSTR_COLOR_LIBRE_PURPLE NC_("RID_SVXSTR_COLOR_LIBRE_PURPLE", "Purple")
#define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT NC_("RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT", "Purple Accent")
#define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT NC_("RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT", "Yellow Accent")
// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
#define RID_SVXSTR_COLOR_TANGO_BUTTER NC_("RID_SVXSTR_COLOR_TANGO_BUTTER", "Tango: Butter")
// Tango colors, see: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 0ca35e0..20a2fb6 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -44,6 +44,40 @@
#define RID_SVXSTR_COLOR_PINK_DEF "Pink"
#define RID_SVXSTR_COLOR_TURQUOISE_DEF "Turquoise"
#define RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF "Blue classic"
#define RID_SVXSTR_COLOR_GOLD_DEF "Gold"
#define RID_SVXSTR_COLOR_BRICK_DEF "Brick"
#define RID_SVXSTR_COLOR_INDIGO_DEF "Indigo"
#define RID_SVXSTR_COLOR_TEAL_DEF "Teal"
#define RID_SVXSTR_COLOR_LIME_DEF "Lime"
// Reference strings: Light variants of the standard color palette
#define RID_SVXSTR_COLOR_LIGHTGRAY_DEF "Light Gray"
#define RID_SVXSTR_COLOR_LIGHTYELLOW_DEF "Light Yellow"
#define RID_SVXSTR_COLOR_LIGHTGOLD_DEF "Light Gold"
#define RID_SVXSTR_COLOR_LIGHTORANGE_DEF "Light Orange"
#define RID_SVXSTR_COLOR_LIGHTBRICK_DEF "Light Brick"
#define RID_SVXSTR_COLOR_LIGHTRED_DEF "Light Red"
#define RID_SVXSTR_COLOR_LIGHTVIOLET_DEF "Light Violet"
#define RID_SVXSTR_COLOR_LIGHTPURPLE_DEF "Light Purple"
#define RID_SVXSTR_COLOR_LIGHTINDIGO_DEF "Light Indigo"
#define RID_SVXSTR_COLOR_LIGHTBLUE_DEF "Light Blue"
#define RID_SVXSTR_COLOR_LIGHTTEAL_DEF "Light Teal"
#define RID_SVXSTR_COLOR_LIGHTGREEN_DEF "Light Green"
#define RID_SVXSTR_COLOR_LIGHTLIME_DEF "Light Lime"
// Reference strings: Dark variants of the standard color palette
#define RID_SVXSTR_COLOR_DARKGRAY_DEF "Dark Gray"
#define RID_SVXSTR_COLOR_DARKYELLOW_DEF "Dark Yellow"
#define RID_SVXSTR_COLOR_DARKGOLD_DEF "Dark Gold"
#define RID_SVXSTR_COLOR_DARKORANGE_DEF "Dark Orange"
#define RID_SVXSTR_COLOR_DARKBRICK_DEF "Dark Brick"
#define RID_SVXSTR_COLOR_DARKRED_DEF "Dark Red"
#define RID_SVXSTR_COLOR_DARKVIOLET1_DEF "Dark Violet"
#define RID_SVXSTR_COLOR_DARKPURPLE_DEF "Dark Purple"
#define RID_SVXSTR_COLOR_DARKINDIGO_DEF "Dark Indigo"
#define RID_SVXSTR_COLOR_DARKBLUE_DEF "Dark Blue"
#define RID_SVXSTR_COLOR_DARKTEAL_DEF "Dark Teal"
#define RID_SVXSTR_COLOR_DARKGREEN_DEF "Dark Green"
#define RID_SVXSTR_COLOR_DARKLIME_DEF "Dark Lime"
// Reference-strings for standard-gradient-table
#define RID_SVXSTR_GRDT0_DEF "Gradient"
#define RID_SVXSTR_GRDT1_DEF "Linear blue/white"
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index ff8a6f4..55083b0 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1629,6 +1629,37 @@ static const char* SvxUnoColorNameDefResId[] =
RID_SVXSTR_COLOR_SKYBLUE_DEF,
RID_SVXSTR_COLOR_PINK_DEF,
RID_SVXSTR_COLOR_TURQUOISE_DEF,
RID_SVXSTR_COLOR_GOLD_DEF,
RID_SVXSTR_COLOR_BRICK_DEF,
RID_SVXSTR_COLOR_INDIGO_DEF,
RID_SVXSTR_COLOR_TEAL_DEF,
RID_SVXSTR_COLOR_LIME_DEF,
RID_SVXSTR_COLOR_LIGHTGRAY_DEF,
RID_SVXSTR_COLOR_LIGHTYELLOW_DEF,
RID_SVXSTR_COLOR_LIGHTGOLD_DEF,
RID_SVXSTR_COLOR_LIGHTORANGE_DEF,
RID_SVXSTR_COLOR_LIGHTBRICK_DEF,
RID_SVXSTR_COLOR_LIGHTRED_DEF,
RID_SVXSTR_COLOR_LIGHTVIOLET_DEF,
RID_SVXSTR_COLOR_LIGHTPURPLE_DEF,
RID_SVXSTR_COLOR_LIGHTINDIGO_DEF,
RID_SVXSTR_COLOR_LIGHTBLUE_DEF,
RID_SVXSTR_COLOR_LIGHTTEAL_DEF,
RID_SVXSTR_COLOR_LIGHTGREEN_DEF,
RID_SVXSTR_COLOR_LIGHTLIME_DEF,
RID_SVXSTR_COLOR_DARKGRAY_DEF,
RID_SVXSTR_COLOR_DARKYELLOW_DEF,
RID_SVXSTR_COLOR_DARKGOLD_DEF,
RID_SVXSTR_COLOR_DARKORANGE_DEF,
RID_SVXSTR_COLOR_DARKBRICK_DEF,
RID_SVXSTR_COLOR_DARKRED_DEF,
RID_SVXSTR_COLOR_DARKVIOLET1_DEF,
RID_SVXSTR_COLOR_DARKPURPLE_DEF,
RID_SVXSTR_COLOR_DARKINDIGO_DEF,
RID_SVXSTR_COLOR_DARKBLUE_DEF,
RID_SVXSTR_COLOR_DARKTEAL_DEF,
RID_SVXSTR_COLOR_DARKGREEN_DEF,
RID_SVXSTR_COLOR_DARKLIME_DEF,
RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF,
RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF,
RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF,
@@ -1673,6 +1704,37 @@ static const char* SvxUnoColorNameResId[] =
RID_SVXSTR_COLOR_SKYBLUE,
RID_SVXSTR_COLOR_PINK,
RID_SVXSTR_COLOR_TURQUOISE,
RID_SVXSTR_COLOR_GOLD,
RID_SVXSTR_COLOR_BRICK,
RID_SVXSTR_COLOR_INDIGO,
RID_SVXSTR_COLOR_TEAL,
RID_SVXSTR_COLOR_LIME,
RID_SVXSTR_COLOR_LIGHTGRAY,
RID_SVXSTR_COLOR_LIGHTYELLOW,
RID_SVXSTR_COLOR_LIGHTGOLD,
RID_SVXSTR_COLOR_LIGHTORANGE,
RID_SVXSTR_COLOR_LIGHTBRICK,
RID_SVXSTR_COLOR_LIGHTRED,
RID_SVXSTR_COLOR_LIGHTVIOLET,
RID_SVXSTR_COLOR_LIGHTPURPLE,
RID_SVXSTR_COLOR_LIGHTINDIGO,
RID_SVXSTR_COLOR_LIGHTBLUE,
RID_SVXSTR_COLOR_LIGHTTEAL,
RID_SVXSTR_COLOR_LIGHTGREEN,
RID_SVXSTR_COLOR_LIGHTLIME,
RID_SVXSTR_COLOR_DARKGRAY,
RID_SVXSTR_COLOR_DARKYELLOW,
RID_SVXSTR_COLOR_DARKGOLD,
RID_SVXSTR_COLOR_DARKORANGE,
RID_SVXSTR_COLOR_DARKBRICK,
RID_SVXSTR_COLOR_DARKRED,
RID_SVXSTR_COLOR_DARKVIOLET1,
RID_SVXSTR_COLOR_DARKPURPLE,
RID_SVXSTR_COLOR_DARKINDIGO,
RID_SVXSTR_COLOR_DARKBLUE,
RID_SVXSTR_COLOR_DARKTEAL,
RID_SVXSTR_COLOR_DARKGREEN,
RID_SVXSTR_COLOR_DARKLIME,
RID_SVXSTR_COLOR_LIBRE_GREEN_1,
RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT,
RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT,
