From 19badee4524de55f798082e0aae58e33b110a261 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 1 Dec 2016 15:43:41 -0500 Subject: [PATCH 1/3] Slight correction/improvements to French --- docs/_data/ui-text.yml | 8 ++++---- test/_data/ui-text.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/_data/ui-text.yml b/docs/_data/ui-text.yml index 90d232a1..582a48d5 100644 --- a/docs/_data/ui-text.yml +++ b/docs/_data/ui-text.yml @@ -105,7 +105,7 @@ fr: &DEFAULT_FR menu_label : toc_label : "Sur cette page" ext_link_label : "Lien direct" - less_than : "plus petit que" + less_than : "moins de" minute_read : "minute de lecture" share_on_label : "Partager sur" meta_label : @@ -115,8 +115,8 @@ fr: &DEFAULT_FR comments_label : "Laisser un commentaire" comments_title : more_label : "Lire plus" - related_label : "Vous pourriez aimer" - follow_label : "Suivez moi" + related_label : "Vous pourriez aimer aussi" + follow_label : "Contact" feed_label : "Flux" powered_by : "Propulsé par" website_label : "Site" @@ -132,7 +132,7 @@ fr: &DEFAULT_FR comment_form_website_label : "Site web (optionnel)" comment_btn_submit : "Envoyer" comment_btn_submitted : "Envoyé" - comment_success_msg : "Merci pour votre comentaire, il sera visible sur le site une fois approuvé." + comment_success_msg : "Merci pour votre commentaire, il sera visible sur le site une fois approuvé." comment_error_msg : "Désolé, une erreur est survenue lors de la soumission. Vérifiez que les champs obligatoires ont été remplis et réessayez." loading_label : "Chargement..." fr-FR: diff --git a/test/_data/ui-text.yml b/test/_data/ui-text.yml index 90d232a1..582a48d5 100644 --- a/test/_data/ui-text.yml +++ b/test/_data/ui-text.yml @@ -105,7 +105,7 @@ fr: &DEFAULT_FR menu_label : toc_label : "Sur cette page" ext_link_label : "Lien direct" - less_than : "plus petit que" + less_than : "moins de" minute_read : "minute de lecture" share_on_label : "Partager sur" meta_label : @@ -115,8 +115,8 @@ fr: &DEFAULT_FR comments_label : "Laisser un commentaire" comments_title : more_label : "Lire plus" - related_label : "Vous pourriez aimer" - follow_label : "Suivez moi" + related_label : "Vous pourriez aimer aussi" + follow_label : "Contact" feed_label : "Flux" powered_by : "Propulsé par" website_label : "Site" @@ -132,7 +132,7 @@ fr: &DEFAULT_FR comment_form_website_label : "Site web (optionnel)" comment_btn_submit : "Envoyer" comment_btn_submitted : "Envoyé" - comment_success_msg : "Merci pour votre comentaire, il sera visible sur le site une fois approuvé." + comment_success_msg : "Merci pour votre commentaire, il sera visible sur le site une fois approuvé." comment_error_msg : "Désolé, une erreur est survenue lors de la soumission. Vérifiez que les champs obligatoires ont été remplis et réessayez." loading_label : "Chargement..." fr-FR: From 208299a139d3bf802f31a94a5b6d134f57991574 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 1 Dec 2016 15:44:16 -0500 Subject: [PATCH 2/3] Update CHANGELOG and history --- CHANGELOG.md | 10 ++++++++++ docs/_docs/18-history.md | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f76f355..131c4233 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [4.0.10](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.10) + +### Bug Fixes + +- Add Staticman default `path`. [#683](https://github.com/mmistakes/minimal-mistakes/issues/683) + +### Maintenance + +- Slight correction/improvements to French UI text. [#685](https://github.com/mmistakes/minimal-mistakes/pull/685) + ## [4.0.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.9) ### Bug Fixes diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index a6738a38..e6cd23da 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -4,9 +4,19 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -modified: 2016-11-21T16:04:45-05:00 +modified: 2016-12-01T15:44:03-05:00 --- +## [4.0.10](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.10) + +### Bug Fixes + +- Add Staticman default `path`. [#683](https://github.com/mmistakes/minimal-mistakes/issues/683) + +### Maintenance + +- Slight correction/improvements to French UI text. [#685](https://github.com/mmistakes/minimal-mistakes/pull/685) + ## [4.0.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.9) ### Bug Fixes From 9b65e8e0d7636ab43e5b0061b70e41f34ce41827 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 1 Dec 2016 15:46:07 -0500 Subject: [PATCH 3/3] Bump version to 4.0.10 --- docs/_pages/home.md | 2 +- minimal-mistakes-jekyll.gemspec | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/_pages/home.md b/docs/_pages/home.md index f1dd3c5d..af38ea1b 100644 --- a/docs/_pages/home.md +++ b/docs/_pages/home.md @@ -7,7 +7,7 @@ header: cta_label: " Install Now" cta_url: "/docs/quick-start-guide/" caption: -excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.
Latest release v4.0.9

{::nomarkdown} {:/nomarkdown}' +excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.
Latest release v4.0.10

{::nomarkdown} {:/nomarkdown}' feature_row: - image_path: /assets/images/mm-customizable-feature.png alt: "customizable" diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec index 51c2eaeb..96dcbe7c 100644 --- a/minimal-mistakes-jekyll.gemspec +++ b/minimal-mistakes-jekyll.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "minimal-mistakes-jekyll" - spec.version = "4.0.9" + spec.version = "4.0.10" spec.authors = ["Michael Rose"] spec.summary = %q{A flexible two-column Jekyll theme.} diff --git a/package.json b/package.json index 79e89fd7..bae2cd98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minimal-mistakes", - "version": "4.0.9", + "version": "4.0.10", "description": "Minimal Mistakes Jekyll theme npm build scripts", "repository": { "type": "git",