From ba81662d6a2f87883d00949ca8eb64a744a7d0cf Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Wed, 10 Jul 2024 16:41:49 +0200
Subject: [PATCH] Bump version to 2.5 and update changelog

---
 CHANGELOG.md            | 56 +++++++++++++++++++++++++++++++++++++++++
 novelwriter/__init__.py |  6 ++---
 sample/nwProject.nwx    |  4 +--
 3 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cec85c94b..ed9d91151 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,61 @@
 # novelWriter Changelog
 
+## Version 2.5 [2024-07-10]
+
+### Release Notes
+
+The 2.5 release fixes a number of minor issues from the RC 1 pre-release, and updates most
+translation files. Polish has also been added.
+
+See the website for complete [Release Notes](https://novelwriter.io/releases/release_2_5.html).
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fix an issue with unresponsiveness when switching from Outline View to Tree View with a keyboard
+  shortcut. Issue #1949. PR #1954.
+* Fix an issue with switching focus between editor and viewer when the viewer is hidden.
+  Issue #1950. PR #1954.
+* Fix an issue with first line indentation where it would sometimes indent first paragraph when it
+  should not. Issue #1965. PR #1971.
+
+**Usability**
+
+* Remove the "Apply" button from Preferences as changing theme does not updated the Preferences
+  dialog, which is unexpected behaviour. The Preferences dialog is now also consistent with other
+  settings dialogs. Issue #1951. PR #1954.
+* Improved the error messages when opening a project fails. Issue #1944. PR #1956.
+* Make sure the Project Name is selected and in focus when switching to the New Project Form on the
+  Welcome dialog. Issue #1967. PR #1968.
+
+**Improvements**
+
+* Add first line indentation to Manuscript previews. Issue #1961. PR #1962.
+
+**Internationalisation**
+
+* Norwegian and US English translations updated by @vkbo. PR #1955.
+* German translation updated by Myian (@HeyMyian). PR #1955.
+* Italian translation updated by Lou Cyper (loucyper1). PR #1955.
+* Dutch translation updated by Martijn van der Kleijn (mvdkleijn). PR #1955.
+* Chinese translation updated by @longqzh. PR #1955.
+* Portuguese translation updated by Oli Maia. PR #1955.
+* Japanese translation updated by @hebekeg. PR #1955.
+* French translation updated by Albert Aribaud (@aaribaud). PR #1955.
+* Polish translation added by Anna Maria Polak (@Nauthiz). PR #1955.
+
+**Packaging**
+
+* Rewrote the packaging utilities script. Windows builds are now created in GitHub actions, which
+  is needed for signed packages when this is enabled. PRs #1958 and #1959.
+
+**Documentation**
+
+* Updated the documentation for 2.5. PR #1928.
+
+----
+
 ## Version 2.5 RC 1 [2024-06-22]
 
 ### Release Notes
diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py
index 8a81ae2c7..136232354 100644
--- a/novelwriter/__init__.py
+++ b/novelwriter/__init__.py
@@ -47,9 +47,9 @@
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.5rc1"
-__hexversion__ = "0x020500c1"
-__date__       = "2024-06-22"
+__version__    = "2.5"
+__hexversion__ = "0x020500f0"
+__date__       = "2024-07-10"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index 9c95fb37b..b86de0b85 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="2.5rc1" hexVersion="0x020500c1" fileVersion="1.5" fileRevision="4" timeStamp="2024-06-16 21:29:46">
-  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="1949" autoCount="277" editTime="90875">
+<novelWriterXML appVersion="2.5" hexVersion="0x020500f0" fileVersion="1.5" fileRevision="4" timeStamp="2024-07-10 16:23:02">
+  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="1950" autoCount="277" editTime="90880">
     <name>Sample Project</name>
     <author>Jane Smith</author>
   </project>