diff --git a/CHANGELOG.md b/CHANGELOG.md index e985547..6dfbf21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## 0.7.7 - 2022-10-23 + ### Changed - Translation: updated Spanish translation diff --git a/data/io.github.mightycreak.Diffuse.appdata.xml.in b/data/io.github.mightycreak.Diffuse.appdata.xml.in index 1310e62..1d11417 100644 --- a/data/io.github.mightycreak.Diffuse.appdata.xml.in +++ b/data/io.github.mightycreak.Diffuse.appdata.xml.in @@ -28,10 +28,23 @@ romain@foolstep.com + + +

+ Update translations. +

+

Changed:

+
    +
  • Translation: updated Spanish translation
  • +
  • Translation: updated POT file
  • +
  • Translation: fixed issue with commented string that still needs translation
  • +
+
+

- Add port to Mac OS.. + Add port to Mac OS.

Added:

    diff --git a/data/usr/share/gnome/help/diffuse/C/diffuse.xml b/data/usr/share/gnome/help/diffuse/C/diffuse.xml index 2b1fbf9..b19f8b1 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 e5e6d77..8d5ba05 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 c1125d9..7bd8c33 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 d9622c6..94657e5 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 7e42843..e910bc2 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-10-23 - + 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 96def32..87f053f 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-10-23 - + 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 beb7cf2..0292198 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-10-23 - + 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 52c125a..c4986c2 100644 --- a/data/usr/share/omf/diffuse/diffuse-ru.omf +++ b/data/usr/share/omf/diffuse/diffuse-ru.omf @@ -5,7 +5,7 @@ Derrick Moser Руководство Пользователя Diffuse 2022-10-23 - + Программа Diffuse является графическим инструментом для слияния и сравнения текстовых файлов. manual diff --git a/meson.build b/meson.build index ae31817..2e87548 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('diffuse', - version: '0.7.6', + version: '0.7.7', 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 7d3f294..a74807a 100644 --- a/utils/book2manual.xsl +++ b/utils/book2manual.xsl @@ -1,7 +1,7 @@ - + ]> diff --git a/windows-installer/build.py b/windows-installer/build.py index 89651e6..206dd83 100755 --- a/windows-installer/build.py +++ b/windows-installer/build.py @@ -25,7 +25,7 @@ import platform import subprocess import sys -VERSION = '0.7.6' +VERSION = '0.7.7' PACKAGE = '1' PLATFORM = 'win' + ''.join([c for c in platform.architecture()[0] if c.isdigit()]) INSTALLER = 'diffuse-%s-%s.%s' % (VERSION, PACKAGE, PLATFORM) diff --git a/windows-installer/diffuse.iss b/windows-installer/diffuse.iss index 2b8bfd4..757e1cb 100644 --- a/windows-installer/diffuse.iss +++ b/windows-installer/diffuse.iss @@ -5,7 +5,7 @@ [Setup] AppId=Diffuse AppName={cm:ToolName} -AppVerName=Diffuse 0.7.6 +AppVerName=Diffuse 0.7.7 DefaultDirName={pf}\Diffuse DefaultGroupName=Diffuse UninstallDisplayIcon={app}\diffusew.exe diff --git a/windows-installer/diffuse.new.iss b/windows-installer/diffuse.new.iss index 302d6bc..6429072 100644 --- a/windows-installer/diffuse.new.iss +++ b/windows-installer/diffuse.new.iss @@ -4,7 +4,7 @@ #define MyAppName "Diffuse" #define MyAppGroupName "Diffuse" -#define MyAppVersion "0.7.6" +#define MyAppVersion "0.7.7" #define MyAppPublisher "Diffuse Team" #define MyAppURL "https://github.com/MightyCreak/diffuse/" #define MyAppExeName "diffuse.exe"