From 399fb9b40219cd9d4da0804aa80cde8a2dcef3fc Mon Sep 17 00:00:00 2001 From: Romain Failliot Date: Fri, 15 Apr 2022 13:09:36 -0400 Subject: [PATCH] Prepare files for new release: 0.7.5 --- CHANGELOG.md | 2 +- ...io.github.mightycreak.Diffuse.appdata.xml.in | 17 +++++++++++++++++ data/usr/share/gnome/help/diffuse/C/diffuse.xml | 2 +- .../usr/share/gnome/help/diffuse/cs/diffuse.xml | 2 +- .../usr/share/gnome/help/diffuse/it/diffuse.xml | 2 +- .../usr/share/gnome/help/diffuse/ru/diffuse.xml | 2 +- data/usr/share/omf/diffuse/diffuse-C.omf | 2 +- data/usr/share/omf/diffuse/diffuse-cs.omf | 2 +- data/usr/share/omf/diffuse/diffuse-it.omf | 2 +- data/usr/share/omf/diffuse/diffuse-ru.omf | 4 ++-- meson.build | 2 +- utils/book2manual.xsl | 4 ++-- windows-installer/build.py | 2 +- windows-installer/diffuse.iss | 2 +- windows-installer/diffuse.new.iss | 2 +- 15 files changed, 33 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5208e94..54dc912 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## Unreleased +## 0.7.5 - 2022-04-15 ### Added - Documentation: added release process instructions diff --git a/data/io.github.mightycreak.Diffuse.appdata.xml.in b/data/io.github.mightycreak.Diffuse.appdata.xml.in index 8016010..3965357 100644 --- a/data/io.github.mightycreak.Diffuse.appdata.xml.in +++ b/data/io.github.mightycreak.Diffuse.appdata.xml.in @@ -28,6 +28,23 @@ romain.failliot@foolstep.com + + +

+ Crashfix and French translation. +

+

Added:

+
    +
  • Documentation: added release process instructions
    • +
  • Translation: added French translation
    • +
+

Fixed:

+
    +
  • Fixed #156: Preferences cannot be saved in latest release
    • +
  • Cleanups: use constructors instead of `new()` whenever possible in GTK classes
    • +
+ +

diff --git a/data/usr/share/gnome/help/diffuse/C/diffuse.xml b/data/usr/share/gnome/help/diffuse/C/diffuse.xml index e2d3df7..0f95b3f 100644 --- a/data/usr/share/gnome/help/diffuse/C/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/C/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/gnome/help/diffuse/cs/diffuse.xml b/data/usr/share/gnome/help/diffuse/cs/diffuse.xml index f2fc329..f6fd2e1 100644 --- a/data/usr/share/gnome/help/diffuse/cs/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/cs/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/gnome/help/diffuse/it/diffuse.xml b/data/usr/share/gnome/help/diffuse/it/diffuse.xml index 0ee8c46..1cc612c 100644 --- a/data/usr/share/gnome/help/diffuse/it/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/it/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/gnome/help/diffuse/ru/diffuse.xml b/data/usr/share/gnome/help/diffuse/ru/diffuse.xml index 7a8979a..22afd4d 100644 --- a/data/usr/share/gnome/help/diffuse/ru/diffuse.xml +++ b/data/usr/share/gnome/help/diffuse/ru/diffuse.xml @@ -2,7 +2,7 @@ - + ]> diff --git a/data/usr/share/omf/diffuse/diffuse-C.omf b/data/usr/share/omf/diffuse/diffuse-C.omf index dfafaec..4362c4a 100644 --- a/data/usr/share/omf/diffuse/diffuse-C.omf +++ b/data/usr/share/omf/diffuse/diffuse-C.omf @@ -5,7 +5,7 @@ Derrick Moser Diffuse User's Manual 2022-04-03 - + Diffuse is a graphical tool for merging and comparing text files. manual diff --git a/data/usr/share/omf/diffuse/diffuse-cs.omf b/data/usr/share/omf/diffuse/diffuse-cs.omf index cc6c5cb..36f2399 100644 --- a/data/usr/share/omf/diffuse/diffuse-cs.omf +++ b/data/usr/share/omf/diffuse/diffuse-cs.omf @@ -5,7 +5,7 @@ Derrick Moser Uživatelská příručka programu Diffuse 2022-04-03 - + Diffuse je grafický nástroj pro slučování a porovnávání textových souborů. manual diff --git a/data/usr/share/omf/diffuse/diffuse-it.omf b/data/usr/share/omf/diffuse/diffuse-it.omf index 5e13dfe..64174f6 100644 --- a/data/usr/share/omf/diffuse/diffuse-it.omf +++ b/data/usr/share/omf/diffuse/diffuse-it.omf @@ -5,7 +5,7 @@ Derrick Moser Manuale utente di Diffuse 2022-04-03 - + Diffuse è uno strumento grafico per l'unione e il confronto di file di testo. manual diff --git a/data/usr/share/omf/diffuse/diffuse-ru.omf b/data/usr/share/omf/diffuse/diffuse-ru.omf index 647df9a..79ab9ab 100644 --- a/data/usr/share/omf/diffuse/diffuse-ru.omf +++ b/data/usr/share/omf/diffuse/diffuse-ru.omf @@ -4,8 +4,8 @@ Derrick Moser Derrick Moser Руководство Пользователя Diffuse - 2022-04-03 - + 2022-04-15 + Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов. manual diff --git a/meson.build b/meson.build index c1e9050..05a2205 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('diffuse', - version: '0.7.4', + version: '0.7.5', meson_version: '>= 0.50', license: 'GPL-2.0-or-later', default_options: [ 'warning_level=2' ]) diff --git a/utils/book2manual.xsl b/utils/book2manual.xsl index 1538a63..93ea534 100644 --- a/utils/book2manual.xsl +++ b/utils/book2manual.xsl @@ -1,9 +1,9 @@ - + - + ]>