diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2017-12-05 07:42:28 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-02-15 17:44:22 +0100 |
| commit | 11d0e4d946950204fd9f1d23f206b91e8326388e (patch) | |
| tree | 8cc516925b10ee131f31e9bdca6b4834babb9a0a /svx | |
| parent | a8a0e22edc53a58b293771ef793e9d6a0ac2f712 (diff) | |
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@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
(cherry picked from commit 8901c7c7bc4db5076a615ef942af6fb65e943ee3)
Reviewed-on: https://gerrit.libreoffice.org/49704
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/strings.hxx | 18 | ||||
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 34 |
2 files changed, 46 insertions, 6 deletions
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, |