summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent BP <laurent.balland-poirier@laposte.net>2017-12-16 00:17:40 +0100
committerLaurent BP <laurent.balland-poirier@laposte.net>2017-12-22 18:19:30 +0100
commitde14f0487118d8ea15db54d94c44d7bd28833c82 (patch)
treea9a5d24e46b9e69e4bc303870dc1376eeb562f43
parentb9b2ab0f9f1ad91bba899068d2be7fc7767f41c9 (diff)
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@libreoffice.org> Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com> Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
-rw-r--r--extras/source/templates/officorr/Modern_business_letter_sans_serif.ottbin14878 -> 11757 bytes
-rw-r--r--extras/source/templates/officorr/Modern_business_letter_serif.ottbin35034 -> 32169 bytes
-rw-r--r--extras/source/templates/offimisc/Businesscard-with-logo.ottbin47161 -> 44988 bytes
-rw-r--r--extras/source/templates/personal/CV.ottbin31411 -> 27396 bytes
-rw-r--r--extras/source/templates/personal/Resume1page.ottbin23877 -> 20105 bytes
-rw-r--r--extras/source/templates/styles/Default.ottbin3803 -> 5650 bytes
-rw-r--r--extras/source/templates/styles/Modern.ottbin4005 -> 5293 bytes
-rw-r--r--sfx2/inc/strings.hxx12
8 files changed, 6 insertions, 6 deletions
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
--- a/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott
+++ b/extras/source/templates/officorr/Modern_business_letter_sans_serif.ott
Binary files 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
--- a/extras/source/templates/officorr/Modern_business_letter_serif.ott
+++ b/extras/source/templates/officorr/Modern_business_letter_serif.ott
Binary files 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
--- a/extras/source/templates/offimisc/Businesscard-with-logo.ott
+++ b/extras/source/templates/offimisc/Businesscard-with-logo.ott
Binary files differ
diff --git a/extras/source/templates/personal/CV.ott b/extras/source/templates/personal/CV.ott
index b622dc129837..203265be4c81 100644
--- a/extras/source/templates/personal/CV.ott
+++ b/extras/source/templates/personal/CV.ott
Binary files differ
diff --git a/extras/source/templates/personal/Resume1page.ott b/extras/source/templates/personal/Resume1page.ott
index 7e9240d5b52b..166d6045102b 100644
--- a/extras/source/templates/personal/Resume1page.ott
+++ b/extras/source/templates/personal/Resume1page.ott
Binary files differ
diff --git a/extras/source/templates/styles/Default.ott b/extras/source/templates/styles/Default.ott
index 29cdda6d1d26..a3519c22b37a 100644
--- a/extras/source/templates/styles/Default.ott
+++ b/extras/source/templates/styles/Default.ott
Binary files differ
diff --git a/extras/source/templates/styles/Modern.ott b/extras/source/templates/styles/Modern.ott
index 922e754c094f..450105994cb3 100644
--- a/extras/source/templates/styles/Modern.ott
+++ b/extras/source/templates/styles/Modern.ott
Binary files 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 "..."