[Libreoffice-commits] core.git: extras/source include/svx svx/inc

Heiko Tietze (via logerrit) logerrit at kemper.freedesktop.org
Wed Nov 27 10:03:33 UTC 2019


 extras/source/palettes/standard.sog |    2 +-
 include/svx/strings.hrc             |    2 +-
 svx/inc/strings.hxx                 |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 464f19536c2864a911f089d2988be2c3c3ce79b6
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Wed Nov 27 08:32:21 2019 +0100
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Wed Nov 27 11:02:03 2019 +0100

    Resolves tdf# 129052 - Misspelled gradient
    
    “Mahagoni” => “Mahogany”
    
    Change-Id: I7bc63a7353f850366b153802ec8d7272340e3095
    Reviewed-on: https://gerrit.libreoffice.org/83856
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>

diff --git a/extras/source/palettes/standard.sog b/extras/source/palettes/standard.sog
index 665ec064a4ce..036faa856de4 100644
--- a/extras/source/palettes/standard.sog
+++ b/extras/source/palettes/standard.sog
@@ -1 +1 @@
-<!-- <?xml version="1.0" encoding="UTF-8"?> --><ooo:gradient-table xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ooo="http://openoffice.org/2004/office"><draw:gradient draw:name="Pastel_20_Bouquet" draw:display-name="Pastel Bouquet" draw:style="linear" draw:start-color="#dde8cb" draw:end-color="#ffd7d7" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Pastel_20_Dream" draw:display-name="Pastel Dream" draw:style="rectangular" draw:cx="50%" draw:cy="50%" draw:start-color="#ffd7d7" draw:end-color="#b4c7dc" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="0%"/><draw:gradient draw:name="Blue_20_Touch" draw:display-name="Blue Touch" draw:style="linear" draw:start-color="#b4c7dc" draw:end-color="#dee6ef" draw:start-intensity
 ="100%" draw:end-intensity="100%" draw:angle="10" draw:border="0%"/><draw:gradient draw:name="Blank_20_with_20_Gray" draw:display-name="Blank with Gray" draw:style="linear" draw:start-color="#ffffff" draw:end-color="#dddddd" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="900" draw:border="75%"/><draw:gradient draw:name="Spotted_20_Gray" draw:display-name="Spotted Gray" draw:style="radial" draw:cx="50%" draw:cy="50%" draw:start-color="#b2b2b2" draw:end-color="#eeeeee" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="0%"/><draw:gradient draw:name="London_20_Mist" draw:display-name="London Mist" draw:style="linear" draw:start-color="#cccccc" draw:end-color="#666666" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Teal_20_to_20_Blue" draw:display-name="Teal to Blue" draw:style="linear" draw:start-color="#50938a" draw:end-color="#5983b0" draw:start-intensity="100%" draw:end-intensity="
 100%" draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Midnight" draw:style="linear" draw:start-color="#000000" draw:end-color="#2a6099" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/><draw:gradient draw:name="Deep_20_Ocean" draw:display-name="Deep Ocean" draw:style="radial" draw:cx="50%" draw:cy="50%" draw:start-color="#00000" draw:end-color="#729fcf" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="0%"/><draw:gradient draw:name="Submarine" draw:style="linear" draw:start-color="#dde8cb" draw:end-color="#b4c7dc" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/><draw:gradient draw:name="Green_20_Grass" draw:display-name="Green Grass" draw:style="linear" draw:start-color="#ffff00" draw:end-color="#81d41a" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Neon_20_Light" draw:display-name="Neon Light" draw:style="ell
 ipsoid" draw:cx="50%" draw:cy="50%" draw:start-color="#127622" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="15%"/><draw:gradient draw:name="Sunshine" draw:style="radial" draw:cx="66%" draw:cy="33%" draw:start-color="#ffbf00" draw:end-color="#ffff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="33%"/><draw:gradient draw:name="Present" draw:style="square" draw:cx="70%" draw:cy="60%" draw:start-color="#813709" draw:end-color="#ff4000" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="72%"/><draw:gradient draw:name="Mahagoni" draw:style="square" draw:cx="50%" draw:cy="50%" draw:start-color="#000000" draw:end-color="#8d281e" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="0%"/></ooo:gradient-table>
+<!-- <?xml version="1.0" encoding="UTF-8"?> --><ooo:gradient-table xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ooo="http://openoffice.org/2004/office"><draw:gradient draw:name="Pastel_20_Bouquet" draw:display-name="Pastel Bouquet" draw:style="linear" draw:start-color="#dde8cb" draw:end-color="#ffd7d7" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Pastel_20_Dream" draw:display-name="Pastel Dream" draw:style="rectangular" draw:cx="50%" draw:cy="50%" draw:start-color="#ffd7d7" draw:end-color="#b4c7dc" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="0%"/><draw:gradient draw:name="Blue_20_Touch" draw:display-name="Blue Touch" draw:style="linear" draw:start-color="#b4c7dc" draw:end-color="#dee6ef" draw:start-intensity
 ="100%" draw:end-intensity="100%" draw:angle="10" draw:border="0%"/><draw:gradient draw:name="Blank_20_with_20_Gray" draw:display-name="Blank with Gray" draw:style="linear" draw:start-color="#ffffff" draw:end-color="#dddddd" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="900" draw:border="75%"/><draw:gradient draw:name="Spotted_20_Gray" draw:display-name="Spotted Gray" draw:style="radial" draw:cx="50%" draw:cy="50%" draw:start-color="#b2b2b2" draw:end-color="#eeeeee" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="0%"/><draw:gradient draw:name="London_20_Mist" draw:display-name="London Mist" draw:style="linear" draw:start-color="#cccccc" draw:end-color="#666666" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Teal_20_to_20_Blue" draw:display-name="Teal to Blue" draw:style="linear" draw:start-color="#50938a" draw:end-color="#5983b0" draw:start-intensity="100%" draw:end-intensity="
 100%" draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Midnight" draw:style="linear" draw:start-color="#000000" draw:end-color="#2a6099" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/><draw:gradient draw:name="Deep_20_Ocean" draw:display-name="Deep Ocean" draw:style="radial" draw:cx="50%" draw:cy="50%" draw:start-color="#00000" draw:end-color="#729fcf" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="0%"/><draw:gradient draw:name="Submarine" draw:style="linear" draw:start-color="#dde8cb" draw:end-color="#b4c7dc" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="0%"/><draw:gradient draw:name="Green_20_Grass" draw:display-name="Green Grass" draw:style="linear" draw:start-color="#ffff00" draw:end-color="#81d41a" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Neon_20_Light" draw:display-name="Neon Light" draw:style="ell
 ipsoid" draw:cx="50%" draw:cy="50%" draw:start-color="#127622" draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0" draw:border="15%"/><draw:gradient draw:name="Sunshine" draw:style="radial" draw:cx="66%" draw:cy="33%" draw:start-color="#ffbf00" draw:end-color="#ffff00" draw:start-intensity="100%" draw:end-intensity="100%" draw:border="33%"/><draw:gradient draw:name="Present" draw:style="square" draw:cx="70%" draw:cy="60%" draw:start-color="#813709" draw:end-color="#ff4000" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="72%"/><draw:gradient draw:name="Mahogany" draw:style="square" draw:cx="50%" draw:cy="50%" draw:start-color="#000000" draw:end-color="#8d281e" draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450" draw:border="0%"/></ooo:gradient-table>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index d6d8c510ec03..3eea6ce8aa4c 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -788,7 +788,7 @@
 #define RID_SVXSTR_GRDT81                                   NC_("RID_SVXSTR_GRDT81", "Neon Light")
 #define RID_SVXSTR_GRDT82                                   NC_("RID_SVXSTR_GRDT82", "Sunshine")
 #define RID_SVXSTR_GRDT83                                   NC_("RID_SVXSTR_GRDT83", "Present")
-#define RID_SVXSTR_GRDT84                                   NC_("RID_SVXSTR_GRDT84", "Mahagoni")
+#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")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 353b97c54c83..0162a333a650 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -202,7 +202,7 @@
 #define RID_SVXSTR_GRDT81_DEF                       "Neon Light"
 #define RID_SVXSTR_GRDT82_DEF                       "Sunshine"
 #define RID_SVXSTR_GRDT83_DEF                       "Present"
-#define RID_SVXSTR_GRDT84_DEF                       "Mahagoni"
+#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"


More information about the Libreoffice-commits mailing list