Merge branch 'main' into dev

.github/pull_request_template.md

@@ -0,0 +1,25 @@
+<!--
+Please check the following before you make a pull request:
+
+* The branch you are make the pull request from (in your own fork) must
+  have a unique and descriptive name. Do not make a pull request
+  directly from your copy of `main`, `dev` or `testing`.
+* If you are submitting translation files, only submit the files that
+  you have added translations to, not the other .ts files that may have
+  been updated in the process.
+* Make sure your contributions follow the style guide and other
+  requirements mentioned in the CONTRIBUTING.md file in the repository.
+-->
+
+**Summary**:
+
+**Related issue**:
+
+**Checklist**:
+
+* [ ] The header of all files contain a reference to the repository license
+* [ ] The overall test coverage is increased or remains the same as before
+* [ ] All tests are passing
+* [ ] All flake8 checks are passing and the style guide is followed
+* [ ] Documentation (as docstrings) is complete and understandable
+* [ ] Only files that have been actively changed are committed

CONTRIBUTING.md

@@ -25,6 +25,9 @@ either `testing` or `dev` branch.
 * If your contribution is a fix for the latest testing release, branch from the `testing` branch.
 * If your contribution is a new feature, branch from the `dev` branch.
 
+Please do not make your changes on a branch with the same name as any of the above mentioned
+branches. You should make a unique and descriptive branch name in your fork for your changes.
+
 ## Pull Request Process
 
 1. Make sure your code passes all tests and conforms to the style guide. You can check that the

i18n/README.md

@@ -6,6 +6,12 @@ folder at the root of the repository, and the `nw_XX.qm` together with the `proj
 are located in `nw/assets/i18n`. The latter are JSON files translation maps for the novelWriter
 projects, used by the Build Novel Project tool.
 
+**Note**
+
+When making a new translation, or updating an existing one, only commit the `nw_XX.ts` you have
+made changes to. The `qtlupdate` command mentioned below will likely modify all `nw_XX.ts`
+slightly, but please _don't_ commit those changes and add them to the pull request.
+
 ## Qt GUI Localisation
 
 The `.qm` files are the actual files used by the application to translate the GUI into another