From d0ea15c03b2dff33285a58e644c9c0ce3f494d9c Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sun, 2 Feb 2025 18:05:11 +0100
Subject: [PATCH] Bump version to 2.6.1 and update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2a2755db..b2586cff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,52 @@
 # novelWriter Changelog
 
+## Version 2.6.1 [2025-02-02]
+
+### Release Notes
+
+This is a patch release that fixes an issue with creating new notes from the editor context menu,
+adds an option to turn off the confirmation box that pops up when closing novelWriter, and improves
+the recent project list on the Welcome dialog.
+
+A French version of the user guide is now also available when the localisation is set to French,
+and the French, Latin American Spanish, Norwegian, US English, German and Japanese translations of
+the application have been updated.
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* Fixed an issue where the "Create Note from Tag" would also show up for `@story` references. These
+  should not create new novel documents. The same menu entry was also removed for `@mention`
+  references, as it is not known what category the would belong to. Issue #2212. PR #2215.
+
+**Improvements**
+
+* A setting was added to Preferences to disable the dialog box when exiting novelWriter. It is
+  available under the "Behaviour" section. Issue #2209. PR#2213.
+* Recent projects on the Welcome dialog box are now tracked using their unique ID as well as their
+  path. This means that if a project is moved, it should not show up twice in the list, but the
+  path should be updated. Issue #2217. PR #2218.
+
+**Documentation**
+
+* A French version of the user guide is nov available from the Help menu if the GUi language is set
+  to French. The French translation was contributed by @Karduin. It is currently directly added to
+  the source, but from 2.7 it will be generated automatically in the same way the English user
+  guide is. Discussion #1834. PR #2220.
+
+**Internationalisation**
+
+* French translations are available up to the 2.6 release. That is, the new exit dialog setting is
+  not translated yet. PR #2214.
+* Latin American Spanish, Norwegian, US English, German and Japanese translations are fully
+  updated. PR #2214.
+
+See the [translation activity stream](https://crowdin.com/project/novelwriter/activity-stream) for
+more details.
+
+----
+
 ## Version 2.6 [2025-01-26]
 
 ### Release Notes
diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py
index 84957f84..111444fd 100644
--- a/novelwriter/__init__.py
+++ b/novelwriter/__init__.py
@@ -47,9 +47,9 @@ __license__    = "GPLv3"
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "2.6"
-__hexversion__ = "0x020600f0"
-__date__       = "2025-01-26"
+__version__    = "2.6.1"
+__hexversion__ = "0x020601f0"
+__date__       = "2025-02-02"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index 22ff2391..c2913654 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="2.6" hexVersion="0x020600f0" fileVersion="1.5" fileRevision="4" timeStamp="2025-01-25 21:59:39">
-  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="2149" autoCount="281" editTime="95622">
+<novelWriterXML appVersion="2.6.1" hexVersion="0x020601f0" fileVersion="1.5" fileRevision="4" timeStamp="2025-02-02 17:52:51">
+  <project id="e2be99af-f9bf-4403-857a-c3d1ac25abea" saveCount="2151" autoCount="281" editTime="95629">
     <name>Sample Project</name>
     <author>Jane Smith</author>
   </project>