Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/ttk' into ttk
Browse files Browse the repository at this point in the history
  • Loading branch information
ElSaico committed Jun 10, 2024
2 parents 0f7b48a + 9be31f6 commit 3a0e49e
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 9 deletions.
12 changes: 7 additions & 5 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first).
---
* We currently test against, and package with, Python 3.11.7, 32-bit.
* We currently test against, and package with, Python 3.11.9, 32-bit.
* As a result, we do not support Windows 7, 8, or 8.1.
* Developers can check the contents of the `.python-version` file
in the source (not distributed with the Windows installer) for the
currently used version.
---
Pre-Release 5.11.1-beta0
Release 5.11.1
===

This is a release candidate for 5.11.1.

This release fixes a bug regarding FDevID files when running from Source in a non-writable location.
This release fixes a bug regarding FDevID files when running from Source in a non-writable location. Additionally,
Deprecation Warnings are now more visible to aid in plugin development.

**Changes and Enhancements**
* Added a check on Git Pushes to check for updated translation strings for developers
* Enabled deprecation warnings to pass to plugins and logs
* Updated Dependencies
* Replaced infi.systray with drop-in replacement simplesystray

**Bug Fixes**
* Fixed a bug that could result in the program not updating or writing FDevID files when running from source in a location where the running user can't write to
Expand Down
12 changes: 12 additions & 0 deletions L10n/ru.strings
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/* prefs.py: Catch & Record Profiler Errors; */
"Error in System Profiler" = "Ошибка в системном профайлере";

/* EDMarketConnector.py: We didn't have the Fleet Carrier callsign when we should have; In files: EDMarketConnector.py:1223; */
"CAPI: Fleet Carrier data incomplete" = "CAPI: Неполная информация о корабле-носителе";

/* EDMarketConnector.py: No data was returned for the Fleet Carrier from the Frontier CAPI; In files: EDMarketConnector.py:1219; */
"CAPI: No Fleet Carrier data returned" = "CAPI: Нет данных о корабле-носителе";

/* prefs.py: Configuration - Enable or disable the Fleet Carrier CAPI calls; In files: prefs.py:475; */
"Enable Fleet Carrier CAPI Queries" = "Включить запросы к CAPI о корабле-носителе";

/* edsm.py:Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:316; */
"Send flight log and CMDR status to EDSM" = "Отправить журнал полетов и статус командира в EDSM";

Expand Down
2 changes: 1 addition & 1 deletion L10n/sr-Latn-BA.strings
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"CAPI: Fleet Carrier data incomplete" = "CAPI: Fleet Carrier podaci nisu kompletni";

/* EDMarketConnector.py: No data was returned for the Fleet Carrier from the Frontier CAPI; In files: EDMarketConnector.py:1219; */
"CAPI: No Fleet Carrier data returned" = "CAPI: Fleet Carrier nisu dobijeni";
"CAPI: No Fleet Carrier data returned" = "CAPI: Fleet Carrier podaci nisu dobijeni";

/* prefs.py: Configuration - Enable or disable the Fleet Carrier CAPI calls; In files: prefs.py:475; */
"Enable Fleet Carrier CAPI Queries" = "Omogući Fleet Carrier CAPI upite";
Expand Down
3 changes: 1 addition & 2 deletions config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
'AbstractConfig',
'config',
'get_update_feed',
'update_feed'
]

import abc
Expand All @@ -53,7 +52,7 @@
# <https://semver.org/#semantic-versioning-specification-semver>
# Major.Minor.Patch(-prerelease)(+buildmetadata)
# NB: Do *not* import this, use the functions appversion() and appversion_nobuild()
_static_appversion = '5.11.1-beta0'
_static_appversion = '5.11.1'
_cached_version: semantic_version.Version | None = None
copyright = '© 2015-2019 Jonathan Harris, 2020-2024 EDCD'

Expand Down
2 changes: 1 addition & 1 deletion update.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def check_for_updates(self) -> None:

def check_appcast(self) -> EDMCVersion | None:
"""
Manually (no Sparkle or WinSparkle) check the update_feed appcast file.
Manually (no Sparkle or WinSparkle) check the get_update_feed() appcast file.
Checks if any listed version is semantically greater than the current
running version.
Expand Down

0 comments on commit 3a0e49e

Please sign in to comment.