include/svx/strings.hrc | 16 +++++++++++++--- svx/inc/strings.hxx | 16 +++++++++++++--- svx/source/unodraw/unoprov.cxx | 23 +++++++++++++++++++++-- 3 files changed, 47 insertions(+), 8 deletions(-)
New commits: commit 6cc32198fa9204cd31df206c1a65f388cf79dd1f Author: Gabor Kelemen <kelemen.gab...@nisz.hu> AuthorDate: Thu Jun 10 23:10:34 2021 +0200 Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com> CommitDate: Wed Jul 7 11:39:40 2021 +0200 tdf#139301 tdf#141933 (related) Translate new preset dash names Change-Id: I9cd7ad0eca1a6fb471a284fb2828a7ad12816337 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117024 Tested-by: Jenkins Tested-by: László Németh <nem...@numbertext.org> Reviewed-by: László Németh <nem...@numbertext.org> (cherry picked from commit 8b3ff370ab0fe2e7593a69513c8ff3df35810c4e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118107 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 4ac04ffb2fea..c1bbf42205f8 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -910,7 +910,7 @@ #define RID_SVXSTR_BMP78 NC_("RID_SVXSTR_BMP78", "Solid Dotted") #define RID_SVXSTR_DASH0 NC_("RID_SVXSTR_DASH0", "Dot") #define RID_SVXSTR_DASH1 NC_("RID_SVXSTR_DASH1", "Long Dot") -#define RID_SVXSTR_DASH2 NC_("RID_SVXSTR_DASH2", "Double Dot") +#define RID_SVXSTR_DASH2 NC_("RID_SVXSTR_DASH2", "Dot (Rounded)") #define RID_SVXSTR_DASH3 NC_("RID_SVXSTR_DASH3", "Dash") #define RID_SVXSTR_DASH4 NC_("RID_SVXSTR_DASH4", "Long Dash") #define RID_SVXSTR_DASH5 NC_("RID_SVXSTR_DASH5", "Double Dash") @@ -928,8 +928,18 @@ #define RID_SVXSTR_DASH17 NC_("RID_SVXSTR_DASH17", "Ultrafine 2 Dots 3 Dashes") #define RID_SVXSTR_DASH18 NC_("RID_SVXSTR_DASH18", "2 Dots 1 Dash") #define RID_SVXSTR_DASH19 NC_("RID_SVXSTR_DASH19", "Line with Fine Dots") -#define RID_SVXSTR_DASH20 NC_("RID_SVXSTR_DASH20", "Dashed") -#define RID_SVXSTR_DASH21 NC_("RID_SVXSTR_DASH21", "Line Style") +#define RID_SVXSTR_DASH20 NC_("RID_SVXSTR_DASH20", "Dash Dot") +#define RID_SVXSTR_DASH21 NC_("RID_SVXSTR_DASH21", "Long Dot (Rounded)") +#define RID_SVXSTR_DASH22 NC_("RID_SVXSTR_DASH22", "Dash Dot Dot") +#define RID_SVXSTR_DASH23 NC_("RID_SVXSTR_DASH23", "Dash (Rounded)") +#define RID_SVXSTR_DASH24 NC_("RID_SVXSTR_DASH24", "Long Dash (Rounded)") +#define RID_SVXSTR_DASH25 NC_("RID_SVXSTR_DASH25", "Double Dash (Rounded)") +#define RID_SVXSTR_DASH26 NC_("RID_SVXSTR_DASH26", "Dash Dot (Rounded)") +#define RID_SVXSTR_DASH27 NC_("RID_SVXSTR_DASH27", "Long Dash Dot (Rounded)") +#define RID_SVXSTR_DASH28 NC_("RID_SVXSTR_DASH28", "Double Dash Dot (Rounded)") +#define RID_SVXSTR_DASH29 NC_("RID_SVXSTR_DASH29", "Dash Dot Dot (Rounded)") +#define RID_SVXSTR_DASH30 NC_("RID_SVXSTR_DASH30", "Double Dash Dot Dot (Rounded)") + #define RID_SVXSTR_IMAP_ALL_FILTER NC_("RID_SVXSTR_IMAP_ALL_FILTER", "All formats") // To translators: this is an arrow head style #define RID_SVXSTR_LEND0 NC_("RID_SVXSTR_LEND0", "Concave short") diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx index dddaf3126ae0..876ee86314d5 100644 --- a/svx/inc/strings.hxx +++ b/svx/inc/strings.hxx @@ -318,7 +318,7 @@ // Reference-strings for standard-dash-table #define RID_SVXSTR_DASH0_DEF "Dot" #define RID_SVXSTR_DASH1_DEF "Long Dot" -#define RID_SVXSTR_DASH2_DEF "Double Dot" +#define RID_SVXSTR_DASH2_DEF "Dot (Rounded)" #define RID_SVXSTR_DASH3_DEF "Dash" #define RID_SVXSTR_DASH4_DEF "Long Dash" #define RID_SVXSTR_DASH5_DEF "Double Dash" @@ -336,8 +336,18 @@ #define RID_SVXSTR_DASH17_DEF "Ultrafine 2 Dots 3 Dashes" #define RID_SVXSTR_DASH18_DEF "2 Dots 1 Dash" #define RID_SVXSTR_DASH19_DEF "Line with Fine Dots" -#define RID_SVXSTR_DASH20_DEF "Dash" -#define RID_SVXSTR_DASH21_DEF "Line Style" +#define RID_SVXSTR_DASH20_DEF "Dash Dot" +#define RID_SVXSTR_DASH21_DEF "Long Dot (Rounded)" +#define RID_SVXSTR_DASH22_DEF "Dash Dot Dot" +#define RID_SVXSTR_DASH23_DEF "Dash (Rounded)" +#define RID_SVXSTR_DASH24_DEF "Long Dash (Rounded)" +#define RID_SVXSTR_DASH25_DEF "Double Dash (Rounded)" +#define RID_SVXSTR_DASH26_DEF "Dash Dot (Rounded)" +#define RID_SVXSTR_DASH27_DEF "Long Dash Dot (Rounded)" +#define RID_SVXSTR_DASH28_DEF "Double Dash Dot (Rounded)" +#define RID_SVXSTR_DASH29_DEF "Dash Dot Dot (Rounded)" +#define RID_SVXSTR_DASH30_DEF "Double Dash Dot Dot (Rounded)" + // Reference-strings for standard-line-end-table #define RID_SVXSTR_LEND0_DEF "Concave short" #define RID_SVXSTR_LEND1_DEF "Square 45" diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 07a0aeffaa17..e90d980ebd89 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1246,7 +1246,17 @@ static const char* RID_SVXSTR_DASH_DEF[] = RID_SVXSTR_DASH18_DEF, RID_SVXSTR_DASH19_DEF, RID_SVXSTR_DASH20_DEF, - RID_SVXSTR_DASH21_DEF + RID_SVXSTR_DASH21_DEF, + RID_SVXSTR_DASH22_DEF, + RID_SVXSTR_DASH23_DEF, + RID_SVXSTR_DASH24_DEF, + RID_SVXSTR_DASH25_DEF, + RID_SVXSTR_DASH26_DEF, + RID_SVXSTR_DASH27_DEF, + RID_SVXSTR_DASH28_DEF, + RID_SVXSTR_DASH29_DEF, + RID_SVXSTR_DASH30_DEF + }; static const char* RID_SVXSTR_DASH[] = @@ -1272,7 +1282,16 @@ static const char* RID_SVXSTR_DASH[] = RID_SVXSTR_DASH18, RID_SVXSTR_DASH19, RID_SVXSTR_DASH20, - RID_SVXSTR_DASH21 + RID_SVXSTR_DASH21, + RID_SVXSTR_DASH22, + RID_SVXSTR_DASH23, + RID_SVXSTR_DASH24, + RID_SVXSTR_DASH25, + RID_SVXSTR_DASH26, + RID_SVXSTR_DASH27, + RID_SVXSTR_DASH28, + RID_SVXSTR_DASH29, + RID_SVXSTR_DASH30 }; static const char* RID_SVXSTR_LEND_DEF[] = _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits