From eecd64c8ef8762113060532cceaefc63e4fc14b1 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Thu, 2 Jul 2020 18:02:45 +0100 Subject: [PATCH 1/6] You need 'npm' installed to update coriolis-data And that's where some other files come from: modules.p, ships.p --- docs/Releasing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Releasing.md b/docs/Releasing.md index b5ca826f..f82e98c3 100644 --- a/docs/Releasing.md +++ b/docs/Releasing.md @@ -58,7 +58,7 @@ Pre-Packaging Steps Before you create a new install each time you should: 1. Ensure the data sourced from coriolis.io is up to date and works: - 1. Update the `coriolis-data` repo. + 1. Update the `coriolis-data` repo. **NB: You will need 'npm' installed for this.** 1. Run `coriolis.py` to update `modules.p` and `ships.p` 1. XXX: Test ? 1. Ensure translations are up to date, see [Translations.md](Translations.md). From 085333c80be34d59af89a33306e11e349d86e664 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 5 Jul 2020 17:27:30 +0100 Subject: [PATCH 2/6] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 32 +++++++++++++++++++ .../new-translation-language.md | 14 ++++++++ 2 files changed, 46 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/new-translation-language.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..a4a26225 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: bug, unconfirmed +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. Windows 10] + - If applicable: Browser [e.g. chrome, safari] + - Version [e.g. 3.99.0.0 - See 'Help > About E:D Market Connector'] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/new-translation-language.md b/.github/ISSUE_TEMPLATE/new-translation-language.md new file mode 100644 index 00000000..65546208 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/new-translation-language.md @@ -0,0 +1,14 @@ +--- +name: New translation language +about: New languages for translations +title: "[Translations] New language - " +labels: Translations +assignees: '' + +--- + +Language: the new translation you'd like to help add. + +**You should only open an issue if you're able to contribute to the new translation yourself.** + +See https://github.com/EDCD/EDMarketConnector/wiki/Translations for guidelines. From 1a8410e9a29caceaa43630f9585181257f0cd9c5 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 5 Jul 2020 19:58:36 +0100 Subject: [PATCH 3/6] Update translations ready for 3.99.2.0 --- L10n/sv-SE.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L10n/sv-SE.strings b/L10n/sv-SE.strings index b97a8858..e539ca99 100644 --- a/L10n/sv-SE.strings +++ b/L10n/sv-SE.strings @@ -446,7 +446,7 @@ "Ships" = "Skepp"; /* Setting to decide which ship outfitting website to link to - either E:D Shipyard or Coriolis. [prefs.py] */ -"Shipyard" = "Webbsida för översikt av skepp"; +"Shipyard" = "Översikt av skepp"; /* Empire rank. [stats.py] */ "Squire" = "Squire"; From 7e838953c98a8c9d995043af23c33c301669e1ed Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 5 Jul 2020 20:01:05 +0100 Subject: [PATCH 4/6] Increase version to 3.99.2.0 --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index ad131ceb..48e0a376 100644 --- a/config.py +++ b/config.py @@ -8,7 +8,7 @@ from sys import platform appname = 'EDMarketConnector' applongname = 'E:D Market Connector' appcmdname = 'EDMC' -appversion = '3.99.1.0' +appversion = '3.99.2.0' copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD' update_feed = 'https://raw.githubusercontent.com/EDCD/EDMarketConnector/releases/edmarketconnector.xml' From 719fa082a95c9adef108ff615367000098f09eac Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 5 Jul 2020 20:04:41 +0100 Subject: [PATCH 5/6] Changelog for 3.99.2.0 --- ChangeLog.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 6ac71e89..e62117ef 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,16 @@ This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first). --- +Pre-Release 3.99.2.0 +=== +Consider this as 'beta2' for the following full '4.0.0.0' release. + + * Added Swedish to the translated languages. Thanks to Gurra. + * Will throw an exception, rather than a Segmentation Fault, if run on Linux + without DISPLAY properly set. + * Corrects setting of WinSparkle (updates checking) options to be under the + new 'EDCD' Registry key. + Pre-Release 3.99.1.0 === Consider this as 'beta1' for the following full '4.0.0.0' release. From 1a22b88d8a467d68d964e91c6c184f60a2419ed5 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Sun, 5 Jul 2020 20:11:37 +0100 Subject: [PATCH 6/6] README.md: Thank Gurra for Swedish translation --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6b92a661..a2c9eb97 100644 --- a/README.md +++ b/README.md @@ -356,6 +356,7 @@ Acknowledgements * Thanks to Armando Ota for the Slovenian translation. * Thanks to Cmdr Mila Strelok for the Spanish translation. * Thanks to Taras Velychko for the Ukranian translation. +* Thanks to Gurra for the Swedish translation. * Thanks to [Athanasius](https://github.com/Athanasius) for the port to Python 3. * Thanks to [Ian Norton](https://github.com/inorton) for plugin support. * Thanks to [Cmdr Anthor](https://github.com/EDSM-NET) and [James Muscat](https://github.com/jamesremuscat) for [EDDN](https://github.com/EDSM-NET/EDDN/wiki).