Skip to content

Commit

Permalink
Merge branch 'stable' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Rixxan committed Aug 26, 2024
2 parents d250fa3 + 9cc4630 commit 438d517
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 4 deletions.
3 changes: 1 addition & 2 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ This is the master changelog for Elite Dangerous Market Connector. Entries are
in the source (not distributed with the Windows installer) for the
currently used version.
---
Release 5.11.3-beta0
Release 5.11.3
===
This is a release candidate for 5.11.3.

This release fixes a bug where an incomplete hand-over from ordereddict to dict types would cause a sender failure.

Expand Down
12 changes: 12 additions & 0 deletions L10n/it.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" = "Errore nel Sistema di Profilazione";

/* 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: dati della Fleet Carrier incompleti";

/* 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: nessun dato della Fleet Carrier ottenuto";

/* prefs.py: Configuration - Enable or disable the Fleet Carrier CAPI calls; In files: prefs.py:475; */
"Enable Fleet Carrier CAPI Queries" = "Abilita le query CAPI per le Fleet Carrier";

/* edsm.py:Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:316; */
"Send flight log and CMDR status to EDSM" = "Invia il registro di volo e lo stato del CMDR a EDSM";

Expand Down
13 changes: 12 additions & 1 deletion L10n/ja.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" = "フライトログとCMDRステータスをEDSMへ送信する";

Expand Down Expand Up @@ -809,4 +821,3 @@

/* ttkHyperlinkLabel.py: Open Element In Selected Provider; */
"Open in {URL}" = "{URL} で開く";

12 changes: 12 additions & 0 deletions L10n/pt-PT.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" = "Erro nas Informações do Sistema";

/* 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: Dados de Transportador de Frota incompletos";

/* 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: Sem dados de Transportador de Frota";

/* prefs.py: Configuration - Enable or disable the Fleet Carrier CAPI calls; In files: prefs.py:475; */
"Enable Fleet Carrier CAPI Queries" = "Ligar Consultas CAPI de Transportador de Frota";

/* edsm.py:Settings>EDSM - Label on checkbox for 'send data'; In files: edsm.py:316; */
"Send flight log and CMDR status to EDSM" = "Enviar registos de voo e estado de CMDR para o EDSM";

Expand Down
2 changes: 1 addition & 1 deletion config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,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.3-beta0'
_static_appversion = '5.11.3'
_cached_version: semantic_version.Version | None = None
copyright = '© 2015-2019 Jonathan Harris, 2020-2024 EDCD'

Expand Down

0 comments on commit 438d517

Please sign in to comment.