Bump version to 1.4 final, and update changelog and release notes

vkbo · vkbo · commit 33146f0a5083 · 2021-07-27T23:10:48.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,12 @@
 # novelWriter Changelog
 
-## Version 1.4 RC 1 [2021-07-12]
+## Version 1.4 [2021-07-27]
 
 ### Release Notes
 
-This is a preview release of novelWriter 1.4. It contains some new features and a lot of code
-refactoring. This release is a testing release, and may contain bugs. Please be careful when using
-this version to work on your projects.
-
-Below are the main feature changes of this release.
+This release contains some new features and a lot of code refactoring. Among the main new features
+is paragraph alignment and indentation. Regular line breaks within paragraphs are now also
+supported. The changes are described in more detail below.
 
 #### Internationalisation
 
@@ -50,15 +48,39 @@ A single angle bracket will push the text away from the edge it points away from
 single `>` before the paragraph, or a single `<` after the paragraph, will add indentation on the
 respective side. It's perfectly valid to do this on both sides at the same time.
 
-A double set of angle brackets will push the text all the way towards the opposite aide. Therefore,
+A double set of angle brackets will push the text all the way towards the opposite side. Therefore,
 a double set of `>>` before the paragraph will indicate right alignment, and a double set of `<<`
 after the paragraph will force left alignment. Also here both can be used at the same time, which
 results in the paragraph being centred.
 
 Format menu entries and keyboard shortcuts have been added so that you don't have to memorise these
 codes.
 
-_These Release Notes also include the changes from 1.4 Beta 1._
+_These Release Notes also include the changes from 1.4 Beta 1 and RC 1._
+
+### Detailed Changelog
+
+**Bugfixes**
+
+* The way margins are determined in the paged dialogs used many places, including Preferences, has
+  been improved. These margins would sometimes be set to zero when they shouldn't. PR #834.
+* Dialogs that are non-modal are no longer duplicated when opened multiple times. Instead, the
+  existing dialog is moved to the front. PR #834.
+
+**Internationalisation**
+
+* US English and Norwegian translations have been updated by @vkbo. PR #825.
+* French translations have been updated by @jyhelle. PR #829.
+
+----
+
+## Version 1.4 RC 1 [2021-07-12]
+
+### Release Notes
+
+This is a preview release of novelWriter 1.4. It contains some new features and a lot of code
+refactoring. This release is a testing release, and may contain bugs. Please be careful when using
+this version to work on your projects.
 
 ### Detailed Changelog
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -26,7 +26,7 @@
 # The short X.Y version
 version = "1.4"
 # The full version, including alpha/beta/rc tags
-release = "1.4-rc1"
+release = "1.4"
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/nw/__init__.py b/nw/__init__.py
@@ -61,9 +61,9 @@
 __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
-__version__    = "1.4rc1"
-__hexversion__ = "0x010400c1"
-__date__       = "2021-07-12"
+__version__    = "1.4"
+__hexversion__ = "0x010400f0"
+__date__       = "2021-07-27"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
 __url__        = "https://novelwriter.io"
diff --git a/nw/assets/text/release_notes.htm b/nw/assets/text/release_notes.htm
@@ -2,13 +2,12 @@
 <html>
 <body>
 
-<h2>Release Notes for 1.4 RC 1</h2>
-<p><i>Released on 12 July 2021</i></p>
+<h2>Release Notes for 1.4</h2>
+<p><i>Released on 27 July 2021</i></p>
 
-<p>This is a preview release of novelWriter 1.4. It contains some new features and a lot of code
-refactoring. This release is a testing release, and may contain bugs. Please be careful when using
-this version to work on your projects.</p>
-<p>Below are the main feature changes of this release.</p>
+<p>This release contains some new features and a lot of code refactoring. Among the main new
+features is paragraph alignment and indentation. Regular line breaks within paragraphs are now also
+supported. The changes are described in more detail below.</p>
 
 <h3>Internationalisation</h3>
 <p>Translation files have been added for Simplified Chinese by Qianzhi Long.</p>
@@ -41,7 +40,7 @@ <h3>Text Alignment and Indentation</h3>
 <p>A single angle bracket will push the text away from the edge it points away from. Therefore, a
 single '&gt;' before the paragraph, or a single '&lt;' after the paragraph, will add indentation on
 the respective side. It's perfectly valid to do this on both sides at the same time.</p>
-<p>A double set of angle brackets will push the text all the way towards the opposite aide.
+<p>A double set of angle brackets will push the text all the way towards the opposite side.
 Therefore, a double set of '&gt;&gt;' before the paragraph will indicate right alignment, and a
 double set of '&lt;&lt;' after the paragraph will force left alignment. Also here both can be used
 at the same time, which results in the paragraph being centred.</p>
