[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - extras/source sfx2/inc

[Laurent BP]

 extras/source/templates/officorr/Modern_business_letter_sans_serif.ott |binary
 extras/source/templates/officorr/Modern_business_letter_serif.ott      |binary
 extras/source/templates/offimisc/Businesscard-with-logo.ott            |binary
 extras/source/templates/personal/CV.ott                                |binary
 extras/source/templates/personal/Resume1page.ott                       |binary
 extras/source/templates/styles/Default.ott                             |binary
 extras/source/templates/styles/Modern.ott                              |binary
 sfx2/inc/strings.hxx                                                   |   12 +++++-----
 8 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit c678dc5309741097d9b0265f03dd279a8794d256
Author: Laurent BP <laurent.balland-poirier at laposte.net>
Date:   Sat Dec 16 00:17:40 2017 +0100

    tdf#114088 tdf#113795 Improve Writer templates
    
    Main topic was to add Title in meta.xml to get names of templates localized
    Additionnal improvements:
    Businesscard-with-logo
      - set Title in meta.xml
      - remove configuration2 (update manifest.xml)
      - remove unused font
      - remove user defined styles
      - insert field Name instead of Name
      - remove language dependant information
      - links that need to be updated at the begining
    
    Modern business letter serif
      - remove configuration2 and settings.xml (update manifest.xml)
      - remove language dependant information
    
    Modern_business_letter_sans_serif
      - replace Open Sans font with Noto Sans
      - remove unused font
      - remove configuration2 and settings.xml (update manifest.xml)
      - remove language dependant information
    
    CV
      - set Title in meta.xml
      - remove unused font
      - remove configuration2 and settings.xml (update manifest.xml)
      - remove language dependant information
    
    Resume
      - remove unused font
      - remove configuration2 and settings.xml (update manifest.xml)
      - remove language dependant information
      - ODF validator does not accept 0in as first value of style:border-line-width-bottom, but seems valid in ODF 1.2
    http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part1.html#property-style_border-line-width-bottom
    
    Default
       - set Title in meta.xml
       - add thumbnail.png (update manifest.xml)
       - remove language dependant information
    
    Modern
       - set Title in meta.xml
       - add thumbnail.png (update manifest.xml)
       - remove language dependant information
    
    Synchronize Templates names in strings.hxx
    
    Change-Id: I417c8398b0002a26e2f84d7efdaeddc0576f9a8c
    Reviewed-on: https://gerrit.libreoffice.org/46580
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
    Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
    (cherry picked from commit de14f0487118d8ea15db54d94c44d7bd28833c82)
    Reviewed-on: https://gerrit.libreoffice.org/47008
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>

diff --git a/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott b/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott
index f8fbc40b6517..26571ee27137 100644
Binary files a/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott and b/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott differ
diff --git a/extras/source/templates/officorr/Modern_business_letter_serif.ott b/extras/source/templates/officorr/Modern_business_letter_serif.ott
index db218f304581..ce6819f02d68 100644
Binary files a/extras/source/templates/officorr/Modern_business_letter_serif.ott and b/extras/source/templates/officorr/Modern_business_letter_serif.ott differ
diff --git a/extras/source/templates/offimisc/Businesscard-with-logo.ott b/extras/source/templates/offimisc/Businesscard-with-logo.ott
index af3cd607b2b8..3ff8b3528980 100644
Binary files a/extras/source/templates/offimisc/Businesscard-with-logo.ott and b/extras/source/templates/offimisc/Businesscard-with-logo.ott differ
diff --git a/extras/source/templates/personal/CV.ott b/extras/source/templates/personal/CV.ott
index b622dc129837..203265be4c81 100644
Binary files a/extras/source/templates/personal/CV.ott and b/extras/source/templates/personal/CV.ott differ
diff --git a/extras/source/templates/personal/Resume1page.ott b/extras/source/templates/personal/Resume1page.ott
index 7e9240d5b52b..166d6045102b 100644
Binary files a/extras/source/templates/personal/Resume1page.ott and b/extras/source/templates/personal/Resume1page.ott differ
diff --git a/extras/source/templates/styles/Default.ott b/extras/source/templates/styles/Default.ott
index 29cdda6d1d26..a3519c22b37a 100644
Binary files a/extras/source/templates/styles/Default.ott and b/extras/source/templates/styles/Default.ott differ
diff --git a/extras/source/templates/styles/Modern.ott b/extras/source/templates/styles/Modern.ott
index 922e754c094f..450105994cb3 100644
Binary files a/extras/source/templates/styles/Modern.ott and b/extras/source/templates/styles/Modern.ott differ
diff --git a/sfx2/inc/strings.hxx b/sfx2/inc/strings.hxx
index fe7f3d7b15d4..1e319b266e50 100644
--- a/sfx2/inc/strings.hxx
+++ b/sfx2/inc/strings.hxx
@@ -15,20 +15,20 @@
 // Do not translate STR_TEMPLATE_NAME*_DEF names!!
 #define STR_TEMPLATE_NAME1_DEF  "Alizarin"
 #define STR_TEMPLATE_NAME2_DEF  "Beehive"
-#define STR_TEMPLATE_NAME3_DEF  "Blue_Curve"
-#define STR_TEMPLATE_NAME4_DEF  "Blueprint_Plans"
+#define STR_TEMPLATE_NAME3_DEF  "Blue Curve"
+#define STR_TEMPLATE_NAME4_DEF  "Blueprint Plans"
 #define STR_TEMPLATE_NAME5_DEF  "Bright Blue"
-#define STR_TEMPLATE_NAME6_DEF  "Classy_Red"
+#define STR_TEMPLATE_NAME6_DEF  "Classy Red"
 #define STR_TEMPLATE_NAME7_DEF  "DNA"
 #define STR_TEMPLATE_NAME8_DEF  "Focus"
 #define STR_TEMPLATE_NAME9_DEF  "Forestbird"
 #define STR_TEMPLATE_NAME10_DEF "Impress"
 #define STR_TEMPLATE_NAME11_DEF "Inspiration"
 #define STR_TEMPLATE_NAME12_DEF "Lights"
-#define STR_TEMPLATE_NAME13_DEF "LushGreen"
+#define STR_TEMPLATE_NAME13_DEF "Lush Green"
 #define STR_TEMPLATE_NAME14_DEF "Metropolis"
 #define STR_TEMPLATE_NAME15_DEF "Midnightblue"
-#define STR_TEMPLATE_NAME16_DEF "Nature_Illustration"
+#define STR_TEMPLATE_NAME16_DEF "Nature Illustration"
 #define STR_TEMPLATE_NAME17_DEF "Pencil"
 #define STR_TEMPLATE_NAME18_DEF "Piano"
 #define STR_TEMPLATE_NAME19_DEF "Portfolio"
@@ -42,7 +42,7 @@
 #define STR_TEMPLATE_NAME27_DEF "Modern"
 #define STR_TEMPLATE_NAME28_DEF "Modern business letter sans-serif"
 #define STR_TEMPLATE_NAME29_DEF "Modern business letter serif"
-#define STR_TEMPLATE_NAME30_DEF "Businesscard-with-logo"
+#define STR_TEMPLATE_NAME30_DEF "Businesscard with logo"
 
 #define SFX_ST_EDIT             "..."