[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/svx svx/inc svx/source
Gabor Kelemen
kelemeng at ubuntu.com
Thu Feb 15 16:44:46 UTC 2018
include/svx/strings.hrc | 18 ++++++++++++++++--
svx/inc/strings.hxx | 18 ++++++++++++++++--
svx/source/unodraw/unoprov.cxx | 34 ++++++++++++++++++++++++++++++----
3 files changed, 62 insertions(+), 8 deletions(-)
New commits:
commit 11d0e4d946950204fd9f1d23f206b91e8326388e
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date: Tue Dec 5 07:42:28 2017 +0100
tdf#105000, related tdf#80196: Make new color names translatable
Make the new color names of the Tonal palette translatable
These were added in 98419425080f58880f2d0d85749a4a55e8abb40b
Change-Id: I9a55fbd50bbb97d294f7e6cfdfbe56c2605d5ae7
Reviewed-on: https://gerrit.libreoffice.org/45838
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>
(cherry picked from commit 8901c7c7bc4db5076a615ef942af6fb65e943ee3)
Reviewed-on: https://gerrit.libreoffice.org/49704
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 2f09ea00f289..6d3cd2fdcabe 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -601,10 +601,24 @@
#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")
+// Elements of the Tonal color palette
+#define RID_SVXSTR_COLOR_VIOLET_OUG NC_("RID_SVXSTR_COLOR_VIOLET_OUG", "Violet (Out of Gamut)")
+#define RID_SVXSTR_COLOR_BLUE_OUG NC_("RID_SVXSTR_COLOR_BLUE_OUG", "Blue (Out of Gamut)")
+#define RID_SVXSTR_COLOR_AZURE_OUG NC_("RID_SVXSTR_COLOR_AZURE_OUG", "Azure (Out of Gamut)")
+#define RID_SVXSTR_COLOR_SPRINGGREEN_OUG NC_("RID_SVXSTR_COLOR_SPRINGGREEN_OUG", "Spring Green (Out of Gamut)")
+#define RID_SVXSTR_COLOR_GREEN_OUG NC_("RID_SVXSTR_COLOR_GREEN_OUG", "Green (Out of Gamut)")
+#define RID_SVXSTR_COLOR_CHARTREUSEGREEN_OUG NC_("RID_SVXSTR_COLOR_CHARTREUSEGREEN_OUG", "Chartreuse Green (Out of Gamut)")
+#define RID_SVXSTR_COLOR_ORANGE_OUG NC_("RID_SVXSTR_COLOR_ORANGE_OUG", "Orange (Out of Gamut)")
+#define RID_SVXSTR_COLOR_RED_OUG NC_("RID_SVXSTR_COLOR_RED_OUG", "Red (Out of Gamut)")
+#define RID_SVXSTR_COLOR_ROSE_OUG NC_("RID_SVXSTR_COLOR_ROSE_OUG", "Rose (Out of Gamut)")
+#define RID_SVXSTR_COLOR_MAGENTA NC_("RID_SVXSTR_COLOR_MAGENTA", "Magenta")
+#define RID_SVXSTR_COLOR_AZURE NC_("RID_SVXSTR_COLOR_AZURE", "Azure")
+#define RID_SVXSTR_COLOR_CYAN NC_("RID_SVXSTR_COLOR_CYAN", "Cyan")
+#define RID_SVXSTR_COLOR_SPRINGGREEN NC_("RID_SVXSTR_COLOR_SPRINGGREEN", "Spring Green")
+#define RID_SVXSTR_COLOR_CHARTREUSEGREEN NC_("RID_SVXSTR_COLOR_CHARTREUSEGREEN", "Chartreuse Green")
+#define RID_SVXSTR_COLOR_ROSE NC_("RID_SVXSTR_COLOR_ROSE", "Rose")
/* 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")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 20a2fb6046d0..99b1d06f1494 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -22,9 +22,7 @@
#define RID_SVXSTR_COLOR_BLACK_DEF "Black"
#define RID_SVXSTR_COLOR_BLUE_DEF "Blue"
#define RID_SVXSTR_COLOR_GREEN_DEF "Green"
-#define RID_SVXSTR_COLOR_CYAN_DEF "Cyan"
#define RID_SVXSTR_COLOR_RED_DEF "Red"
-#define RID_SVXSTR_COLOR_MAGENTA_DEF "Magenta"
#define RID_SVXSTR_COLOR_GREY_DEF "Gray"
#define RID_SVXSTR_COLOR_YELLOW_DEF "Yellow"
#define RID_SVXSTR_COLOR_WHITE_DEF "White"
@@ -77,6 +75,22 @@
#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 the Tonal palette
+#define RID_SVXSTR_COLOR_VIOLET_OUG_DEF "Violet (Out of Gamut)"
+#define RID_SVXSTR_COLOR_BLUE_OUG_DEF "Blue (Out of Gamut)"
+#define RID_SVXSTR_COLOR_AZURE_OUG_DEF "Azure (Out of Gamut)"
+#define RID_SVXSTR_COLOR_SPRINGGREEN_OUG_DEF "Spring Green (Out of Gamut)"
+#define RID_SVXSTR_COLOR_GREEN_OUG_DEF "Green (Out of Gamut)"
+#define RID_SVXSTR_COLOR_CHARTREUSEGREEN_OUG_DEF "Chartreuse Green (Out of Gamut)"
+#define RID_SVXSTR_COLOR_ORANGE_OUG_DEF "Orange (Out of Gamut)"
+#define RID_SVXSTR_COLOR_RED_OUG_DEF "Red (Out of Gamut)"
+#define RID_SVXSTR_COLOR_ROSE_OUG_DEF "Rose (Out of Gamut)"
+#define RID_SVXSTR_COLOR_MAGENTA_DEF "Magenta"
+#define RID_SVXSTR_COLOR_AZURE_DEF "Azure"
+#define RID_SVXSTR_COLOR_CYAN_DEF "Cyan"
+#define RID_SVXSTR_COLOR_SPRINGGREEN_DEF "Spring Green"
+#define RID_SVXSTR_COLOR_CHARTREUSEGREEN_DEF "Chartreuse Green"
+#define RID_SVXSTR_COLOR_ROSE_DEF "Rose"
// Reference-strings for standard-gradient-table
#define RID_SVXSTR_GRDT0_DEF "Gradient"
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 06464d132a88..1e8a9ea6e271 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1610,9 +1610,7 @@ static const char* SvxUnoColorNameDefResId[] =
RID_SVXSTR_COLOR_BLUE_CLASSIC_DEF,
RID_SVXSTR_COLOR_BLUE_DEF,
RID_SVXSTR_COLOR_GREEN_DEF,
- RID_SVXSTR_COLOR_CYAN_DEF,
RID_SVXSTR_COLOR_RED_DEF,
- RID_SVXSTR_COLOR_MAGENTA_DEF,
RID_SVXSTR_COLOR_GREY_DEF,
RID_SVXSTR_COLOR_YELLOWGREEN_DEF,
RID_SVXSTR_COLOR_YELLOW_DEF,
@@ -1661,6 +1659,21 @@ static const char* SvxUnoColorNameDefResId[] =
RID_SVXSTR_COLOR_DARKTEAL_DEF,
RID_SVXSTR_COLOR_DARKGREEN_DEF,
RID_SVXSTR_COLOR_DARKLIME_DEF,
+ RID_SVXSTR_COLOR_VIOLET_OUG_DEF,
+ RID_SVXSTR_COLOR_BLUE_OUG_DEF,
+ RID_SVXSTR_COLOR_AZURE_OUG_DEF,
+ RID_SVXSTR_COLOR_SPRINGGREEN_OUG_DEF,
+ RID_SVXSTR_COLOR_GREEN_OUG_DEF,
+ RID_SVXSTR_COLOR_CHARTREUSEGREEN_OUG_DEF,
+ RID_SVXSTR_COLOR_ORANGE_OUG_DEF,
+ RID_SVXSTR_COLOR_RED_OUG_DEF,
+ RID_SVXSTR_COLOR_ROSE_OUG_DEF,
+ RID_SVXSTR_COLOR_MAGENTA_DEF,
+ RID_SVXSTR_COLOR_AZURE_DEF,
+ RID_SVXSTR_COLOR_CYAN_DEF,
+ RID_SVXSTR_COLOR_SPRINGGREEN_DEF,
+ RID_SVXSTR_COLOR_CHARTREUSEGREEN_DEF,
+ RID_SVXSTR_COLOR_ROSE_DEF,
RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF,
RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF,
RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF,
@@ -1685,9 +1698,7 @@ static const char* SvxUnoColorNameResId[] =
RID_SVXSTR_COLOR_BLUE_CLASSIC,
RID_SVXSTR_COLOR_BLUE,
RID_SVXSTR_COLOR_GREEN,
- RID_SVXSTR_COLOR_CYAN,
RID_SVXSTR_COLOR_RED,
- RID_SVXSTR_COLOR_MAGENTA,
RID_SVXSTR_COLOR_GREY,
RID_SVXSTR_COLOR_YELLOWGREEN,
RID_SVXSTR_COLOR_YELLOW,
@@ -1736,6 +1747,21 @@ static const char* SvxUnoColorNameResId[] =
RID_SVXSTR_COLOR_DARKTEAL,
RID_SVXSTR_COLOR_DARKGREEN,
RID_SVXSTR_COLOR_DARKLIME,
+ RID_SVXSTR_COLOR_VIOLET_OUG,
+ RID_SVXSTR_COLOR_BLUE_OUG,
+ RID_SVXSTR_COLOR_AZURE_OUG,
+ RID_SVXSTR_COLOR_SPRINGGREEN_OUG,
+ RID_SVXSTR_COLOR_GREEN_OUG,
+ RID_SVXSTR_COLOR_CHARTREUSEGREEN_OUG,
+ RID_SVXSTR_COLOR_ORANGE_OUG,
+ RID_SVXSTR_COLOR_RED_OUG,
+ RID_SVXSTR_COLOR_ROSE_OUG,
+ RID_SVXSTR_COLOR_MAGENTA,
+ RID_SVXSTR_COLOR_AZURE,
+ RID_SVXSTR_COLOR_CYAN,
+ RID_SVXSTR_COLOR_SPRINGGREEN,
+ RID_SVXSTR_COLOR_CHARTREUSEGREEN,
+ RID_SVXSTR_COLOR_ROSE,
RID_SVXSTR_COLOR_LIBRE_GREEN_1,
RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT,
RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT,
More information about the Libreoffice-commits
mailing list