From b680547a48937ea0aeb8a840d5d7325f0046c153 Mon Sep 17 00:00:00 2001 From: andreas kainz Date: Tue, 12 May 2020 09:07:35 +0200 Subject: Area fill bitmap presets invoice paper language fix Change-Id: I57c6df6de2b27b342547b48370e0b19ad132859d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94036 Tested-by: Jenkins Reviewed-by: andreas_kainz --- extras/Gallery_backgrounds.mk | 2 +- .../source/gallery/backgrounds/invoice-paper.jpg | Bin 0 -> 49265 bytes .../source/gallery/backgrounds/invoiced-paper.jpg | Bin 49265 -> 0 bytes extras/source/palettes/standard.sob | Bin 1076410 -> 1076407 bytes include/svx/strings.hrc | 2 +- svx/inc/strings.hxx | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 extras/source/gallery/backgrounds/invoice-paper.jpg delete mode 100644 extras/source/gallery/backgrounds/invoiced-paper.jpg diff --git a/extras/Gallery_backgrounds.mk b/extras/Gallery_backgrounds.mk index 103f484f4167..a2fe34483179 100644 --- a/extras/Gallery_backgrounds.mk +++ b/extras/Gallery_backgrounds.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Gallery_add_files,backgrounds,$(LIBO_SHARE_FOLDER)/gallery/back extras/source/gallery/backgrounds/sand.jpg \ extras/source/gallery/backgrounds/surface.jpg \ extras/source/gallery/backgrounds/studio.jpg \ - extras/source/gallery/backgrounds/invoiced-paper.jpg \ + extras/source/gallery/backgrounds/invoice-paper.jpg \ extras/source/gallery/backgrounds/parchment-paper.jpg \ extras/source/gallery/backgrounds/cardboard.jpg \ extras/source/gallery/backgrounds/fence.jpg \ diff --git a/extras/source/gallery/backgrounds/invoice-paper.jpg b/extras/source/gallery/backgrounds/invoice-paper.jpg new file mode 100644 index 000000000000..048c44420df6 Binary files /dev/null and b/extras/source/gallery/backgrounds/invoice-paper.jpg differ diff --git a/extras/source/gallery/backgrounds/invoiced-paper.jpg b/extras/source/gallery/backgrounds/invoiced-paper.jpg deleted file mode 100644 index 048c44420df6..000000000000 Binary files a/extras/source/gallery/backgrounds/invoiced-paper.jpg and /dev/null differ diff --git a/extras/source/palettes/standard.sob b/extras/source/palettes/standard.sob index 1acb3fec453f..47a7821c2635 100644 Binary files a/extras/source/palettes/standard.sob and b/extras/source/palettes/standard.sob differ diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 33d90b6180f1..04dbc407bf42 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -828,7 +828,7 @@ #define RID_SVXSTR_BMP19 NC_("RID_SVXSTR_BMP19", "Night Sky") #define RID_SVXSTR_BMP20 NC_("RID_SVXSTR_BMP20", "Pool") #define RID_SVXSTR_BMP21 NC_("RID_SVXSTR_BMP21", "Bitmap") -#define RID_SVXSTR_BMP79 NC_("RID_SVXSTR_BMP79", "Invoiced Paper") +#define RID_SVXSTR_BMP79 NC_("RID_SVXSTR_BMP79", "Invoice Paper") #define RID_SVXSTR_BMP80 NC_("RID_SVXSTR_BMP80", "Concrete") #define RID_SVXSTR_BMP81 NC_("RID_SVXSTR_BMP81", "Brick Wall") #define RID_SVXSTR_BMP82 NC_("RID_SVXSTR_BMP82", "Stone Wall") diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx index c37c9a110659..4098daebe26d 100644 --- a/svx/inc/strings.hxx +++ b/svx/inc/strings.hxx @@ -238,7 +238,7 @@ #define RID_SVXSTR_BMP19_DEF "Night Sky" #define RID_SVXSTR_BMP20_DEF "Pool" #define RID_SVXSTR_BMP21_DEF "Bitmap" -#define RID_SVXSTR_BMP79_DEF "Invoiced Paper" +#define RID_SVXSTR_BMP79_DEF "Invoice Paper" #define RID_SVXSTR_BMP80_DEF "Concrete" #define RID_SVXSTR_BMP81_DEF "Brick Wall" #define RID_SVXSTR_BMP82_DEF "Stone Wall" -- cgit v1.2.3