diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-06-25 10:52:43 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2020-06-25 12:08:06 +0200 |
| commit | 52d70047c694d4e0c8bbf843c895d86492735f3f (patch) | |
| tree | d779ba19ebfd27613e021f17dcf1717c3bd0d5ee | |
| parent | acbe57481e0a10be287aad59201873a0799a94f0 (diff) | |
tdf#134291: make all hatch patterns translatable
Regression from https://cgit.freedesktop.org/libreoffice/core/commit/?id=30a6e9e991fd1b62ead2d393331a0364372c52fb
tdf#130928 Area Fill update hatcch section
Change-Id: I75377f86bb8eafc24d739073e0341168637f7d62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97093
Reviewed-by: Sophie Gautier <sophi@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins
| -rw-r--r-- | include/svx/strings.hrc | 27 | ||||
| -rw-r--r-- | svx/inc/strings.hxx | 27 | ||||
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 14 |
3 files changed, 44 insertions, 24 deletions
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index a13b510b60e0..114cbd17bd6e 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -794,17 +794,22 @@ #define RID_SVXSTR_GRDT83 NC_("RID_SVXSTR_GRDT83", "Present") #define RID_SVXSTR_GRDT84 NC_("RID_SVXSTR_GRDT84", "Mahogany") // /gradients -#define RID_SVXSTR_HATCH0 NC_("RID_SVXSTR_HATCH0", "Black 45 Degrees Wide") -#define RID_SVXSTR_HATCH1 NC_("RID_SVXSTR_HATCH1", "Black 45 Degrees") -#define RID_SVXSTR_HATCH2 NC_("RID_SVXSTR_HATCH2", "Black -45 Degrees") -#define RID_SVXSTR_HATCH3 NC_("RID_SVXSTR_HATCH3", "Black 90 Degrees") -#define RID_SVXSTR_HATCH4 NC_("RID_SVXSTR_HATCH4", "Red Crossed 45 Degrees") -#define RID_SVXSTR_HATCH5 NC_("RID_SVXSTR_HATCH5", "Red Crossed 0 Degrees") -#define RID_SVXSTR_HATCH6 NC_("RID_SVXSTR_HATCH6", "Blue Crossed 45 Degrees") -#define RID_SVXSTR_HATCH7 NC_("RID_SVXSTR_HATCH7", "Blue Crossed 0 Degrees") -#define RID_SVXSTR_HATCH8 NC_("RID_SVXSTR_HATCH8", "Blue Triple 90 Degrees") -#define RID_SVXSTR_HATCH9 NC_("RID_SVXSTR_HATCH9", "Black 0 Degrees") -#define RID_SVXSTR_HATCH10 NC_("RID_SVXSTR_HATCH10", "Hatching" ) +#define RID_SVXSTR_HATCH0 NC_("RID_SVXSTR_HATCH0", "Black 0 Degrees") +#define RID_SVXSTR_HATCH1 NC_("RID_SVXSTR_HATCH1", "Black 90 Degrees") +#define RID_SVXSTR_HATCH2 NC_("RID_SVXSTR_HATCH2", "Black 180 Degrees Crossed") +#define RID_SVXSTR_HATCH3 NC_("RID_SVXSTR_HATCH3", "Blue 45 Degrees") +#define RID_SVXSTR_HATCH4 NC_("RID_SVXSTR_HATCH4", "Blue -45 Degrees") +#define RID_SVXSTR_HATCH5 NC_("RID_SVXSTR_HATCH5", "Blue 45 Degrees Crossed") +#define RID_SVXSTR_HATCH6 NC_("RID_SVXSTR_HATCH6", "Green 30 Degrees") +#define RID_SVXSTR_HATCH7 NC_("RID_SVXSTR_HATCH7", "Green 60 Degrees") +#define RID_SVXSTR_HATCH8 NC_("RID_SVXSTR_HATCH8", "Green 90 Degrees Triple") +#define RID_SVXSTR_HATCH9 NC_("RID_SVXSTR_HATCH9", "Red 45 Degrees") +#define RID_SVXSTR_HATCH10 NC_("RID_SVXSTR_HATCH10", "Red 90 Degrees Crossed") +#define RID_SVXSTR_HATCH11 NC_("RID_SVXSTR_HATCH11", "Red -45 Degrees Triple") +#define RID_SVXSTR_HATCH12 NC_("RID_SVXSTR_HATCH12", "Yellow 45 Degrees") +#define RID_SVXSTR_HATCH13 NC_("RID_SVXSTR_HATCH13", "Yellow 45 Degrees Crossed") +#define RID_SVXSTR_HATCH14 NC_("RID_SVXSTR_HATCH14", "Yellow 45 Degrees Triple") +#define RID_SVXSTR_HATCH15 NC_("RID_SVXSTR_HATCH15", "Hatching") #define RID_SVXSTR_BMP0 NC_("RID_SVXSTR_BMP0", "Empty") #define RID_SVXSTR_BMP1 NC_("RID_SVXSTR_BMP1", "Painted White") #define RID_SVXSTR_BMP2 NC_("RID_SVXSTR_BMP2", "Paper Texture") diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx index 4098daebe26d..dddaf3126ae0 100644 --- a/svx/inc/strings.hxx +++ b/svx/inc/strings.hxx @@ -204,17 +204,22 @@ #define RID_SVXSTR_GRDT83_DEF "Present" #define RID_SVXSTR_GRDT84_DEF "Mahogany" // Reference-strings for standard-hatch-table -#define RID_SVXSTR_HATCH0_DEF "Black 45 Degrees Wide" -#define RID_SVXSTR_HATCH1_DEF "Black 45 Degrees" -#define RID_SVXSTR_HATCH2_DEF "Black -45 Degrees" -#define RID_SVXSTR_HATCH3_DEF "Black 90 Degrees" -#define RID_SVXSTR_HATCH4_DEF "Red Crossed 45 Degrees" -#define RID_SVXSTR_HATCH5_DEF "Red Crossed 0 Degrees" -#define RID_SVXSTR_HATCH6_DEF "Blue Crossed 45 Degrees" -#define RID_SVXSTR_HATCH7_DEF "Blue Crossed 0 Degrees" -#define RID_SVXSTR_HATCH8_DEF "Blue Triple 90 Degrees" -#define RID_SVXSTR_HATCH9_DEF "Black 0 Degrees" -#define RID_SVXSTR_HATCH10_DEF "Hatching" +#define RID_SVXSTR_HATCH0_DEF "Black 0 Degrees" +#define RID_SVXSTR_HATCH1_DEF "Black 90 Degrees" +#define RID_SVXSTR_HATCH2_DEF "Black 180 Degrees Crossed" +#define RID_SVXSTR_HATCH3_DEF "Blue 45 Degrees" +#define RID_SVXSTR_HATCH4_DEF "Blue -45 Degrees" +#define RID_SVXSTR_HATCH5_DEF "Blue 45 Degrees Crossed" +#define RID_SVXSTR_HATCH6_DEF "Green 30 Degrees" +#define RID_SVXSTR_HATCH7_DEF "Green 60 Degrees" +#define RID_SVXSTR_HATCH8_DEF "Green 90 Degrees Triple" +#define RID_SVXSTR_HATCH9_DEF "Red 45 Degrees" +#define RID_SVXSTR_HATCH10_DEF "Red 90 Degrees Crossed" +#define RID_SVXSTR_HATCH11_DEF "Red -45 Degrees Triple" +#define RID_SVXSTR_HATCH12_DEF "Yellow 45 Degrees" +#define RID_SVXSTR_HATCH13_DEF "Yellow 45 Degrees Crossed" +#define RID_SVXSTR_HATCH14_DEF "Yellow 45 Degrees Triple" +#define RID_SVXSTR_HATCH15_DEF "Hatching" // Reference-strings for standard-bitmap-table #define RID_SVXSTR_BMP0_DEF "Empty" #define RID_SVXSTR_BMP1_DEF "Painted White" diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 8d2849512856..037c5898b1f3 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1536,7 +1536,12 @@ static const char* RID_SVXSTR_HATCHS_DEF[] = RID_SVXSTR_HATCH7_DEF, RID_SVXSTR_HATCH8_DEF, RID_SVXSTR_HATCH9_DEF, - RID_SVXSTR_HATCH10_DEF + RID_SVXSTR_HATCH10_DEF, + RID_SVXSTR_HATCH11_DEF, + RID_SVXSTR_HATCH12_DEF, + RID_SVXSTR_HATCH13_DEF, + RID_SVXSTR_HATCH14_DEF, + RID_SVXSTR_HATCH15_DEF }; static const char* RID_SVXSTR_HATCHS[] = @@ -1551,7 +1556,12 @@ static const char* RID_SVXSTR_HATCHS[] = RID_SVXSTR_HATCH7, RID_SVXSTR_HATCH8, RID_SVXSTR_HATCH9, - RID_SVXSTR_HATCH10 + RID_SVXSTR_HATCH10, + RID_SVXSTR_HATCH11, + RID_SVXSTR_HATCH12, + RID_SVXSTR_HATCH13, + RID_SVXSTR_HATCH14, + RID_SVXSTR_HATCH15 }; static const char* RID_SVXSTR_TRASNGR_DEF[] = |